diff --git a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
index 086a0ad..01ff709 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
@@ -1,45 +1,46 @@
 <template>
 	<div>
 		<div class="mod-sys__menu">
-			<div class="div_btn">
-				<span style="margin-right:10px">{{ customerName }}</span>
-				<el-button type="default" @click="diaCancel">取消返回</el-button>
-				<!-- <el-button class=""
-                   type="primary"
-                   @click="addShow()">{{"新增" }}</el-button> -->
-				<!-- <el-input v-model="search"
-                  placeholder="请输入内容"></el-input> -->
+			<div class="little-head">
+				<div style="float:right">
+					<span style="margin-right:10px">{{ customerName }}</span>
+					<el-button type="default" @click="diaCancel">取消返回</el-button>
+				</div>
+				<div>工作端</div>
 			</div>
+			<el-form :inline="true" @keyup.enter.native="search()">
+				<el-form-item><el-input v-model="menuName" placeholder="请输入菜单名称" :clearable="true"></el-input></el-form-item>
+				<el-form-item><el-button type="primary" @click="search()">查询</el-button></el-form-item>
+			</el-form>
+
 			<div class="div_btn">
-				<el-button class="" type="primary" @click="useMenu()">开启</el-button>
-				<el-button class="" type="primary" @click="closeMenu()">关闭</el-button>
+				<el-button type="primary" @click="open('')">开启</el-button>
+				<el-button type="primary" @click="close('')">关闭</el-button>
 			</div>
-			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;" @select-all="selectAll" @selection-change="handelSelection">
+			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;" ref="form" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" fixed="left" align="center" width="50" />
+
 				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-				<el-table-column prop="name" label="菜单名称" header-align="center" min-width="150"></el-table-column>
-				<el-table-column prop="icon" label="图标" header-align="center" align="center">
+				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
 					<template slot-scope="scope">
 						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
 					</template>
 				</el-table-column>
-				<el-table-column prop="showFlag" label="菜单类型" header-align="center" align="center">
-					<template slot-scope="scope">
-						基础应用
-					</template>
-				</el-table-column>
+
 				<el-table-column prop="sort" :label="$t('menu.sort')" header-align="center" align="center"></el-table-column>
 				<el-table-column prop="useFlag" :label="$t('menu.status')" header-align="center" align="center">
 					<template slot-scope="scope">
-						<el-tag v-if="scope.row.useFlag === '0'" size="small">{{ $t('menu.status0') }}</el-tag>
-						<el-tag v-else size="small" type="info">{{ $t('menu.status1') }}</el-tag>
+						<el-tag v-if="scope.row.useFlag === '0'" size="small" type="info">{{ $t('menu.status0') }}</el-tag>
+						<el-tag v-else size="small">{{ $t('menu.status1') }}</el-tag>
 					</template>
 				</el-table-column>
+
 				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 					<template slot-scope="scope">
 						<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-						<el-button v-if="scope.row.useFlag === '0'" type="text" size="small" @click="useUpdate(scope.row.id, '1')">开启</el-button>
-						<el-button v-if="scope.row.useFlag === '1'" type="text" size="small" @click="useUpdate(scope.row.id, '0')">关闭</el-button>
+						<el-button type="text" size="small" v-if="scope.row.useFlag == '0'" @click="open(scope.row.id)">{{ '开启' }}</el-button>
+						<el-button type="text" size="small" v-if="scope.row.useFlag == '1'" @click="close(scope.row.id)">{{ '关闭' }}</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -57,6 +58,8 @@ export default {
 	mixins: [mixinViewModule],
 	data() {
 		return {
+			menuName: '',
+			multipleSelection: [],
 			customerId: '', // 客户id，父组件传
 			customerName: '', // 客户名称，父组件传
 
@@ -65,7 +68,7 @@ export default {
 			},
 			search: '',
 			dataList: [],
-			multipleSelection: [],
+			selection: [],
 			selAllFlag: false,
 
 			dataListLoading: false,
@@ -82,30 +85,86 @@ export default {
 	},
 	created() {},
 	methods: {
-		useMenu() {
-			let ids = this.selection.map(item => item.id);
-			this.$http
-				.post('/gov/access/govMenuCustomerRelation/useUpdate', {
-					ids: ids,
-					use: '1'
-				})
-				.then(({ data: res }) => {
-					return this.$message.success('操作成功');
-				});
-			this.query();
+		search() {
+			if (this.menuName != '') {
+				let saveList = [];
+				this.onFuzzyTreeList('name', this.menuName, this.dataList, saveList);
+				this.$refs.form.data = saveList;
+			} else {
+				this.$refs.form.data = this.dataList;
+			}
 		},
-		closeMenu() {
-			let ids = this.selection.map(item => item.id);
-			this.$http
-				.post('/gov/access/govMenuCustomerRelation/useUpdate', {
-					ids: ids,
-					use: '0'
-				})
-				.then(({ data: res }) => {
-					return this.$message.success('操作成功');
+
+		onFuzzyTreeList(key, value, treeList, saveList = []) {
+			return new Promise((resolve, reject) => {
+				treeList.forEach(item => {
+					if (item[key].indexOf(value) > -1) {
+						saveList.push(item);
+					} else {
+						if (item.children && item.children.length > 0) {
+							const _reData = this.onFuzzyTreeList(key, value, item.children, saveList);
+							if (_reData && _reData.length > 0) {
+								saveList.push({
+									...item,
+									children: _reData
+								});
+							}
+						}
+					}
 				});
-			this.query();
+				resolve(saveList);
+			});
 		},
+
+		open(id) {
+			let menuIds = [];
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+
+			let params = {
+				ids: menuIds,
+				use: '1'
+			};
+			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.$message.success('操作成功');
+					this.query();
+				}
+			});
+		},
+		close(id) {
+			let menuIds = [];
+
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+			let params = {
+				ids: menuIds,
+				use: '0'
+			};
+			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.$message.success('操作成功');
+					this.query();
+				}
+			});
+		},
+
 		useUpdate(id, use) {
 			this.$http
 				.post('/gov/access/govMenuCustomerRelation/useUpdate', {
@@ -147,7 +206,7 @@ export default {
 			// }
 		},
 
-		handelSelection(row) {
+		handleSelectionChange(val) {
 			this.multipleSelection = [];
 			val.forEach(element => {
 				this.multipleSelection.push(element.id);
@@ -166,4 +225,8 @@ export default {
 .div_btn {
 	margin: 0 0 20px 0;
 }
+.little-head{
+	border-bottom: dashed 1px #ccc; line-height: 50px;
+	margin-bottom: 20px;
+}
 </style>
diff --git a/epmet-oper-web/src/views/modules/customer/customize/menuDataCustomer.vue b/epmet-oper-web/src/views/modules/customer/customize/menuDataCustomer.vue
index d5468a5..8a74704 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/menuDataCustomer.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/menuDataCustomer.vue
@@ -1,230 +1,228 @@
 <template>
-  <div>
-
-    <div class="mod-sys__menu">
-      <div class="div_btn">
-        <span style="margin-right:10px">{{customerName}}</span>
-        <el-button type="default"
-                   @click="diaCancel">取消返回</el-button>
-        <!-- <el-button class=""
-                   type="primary"
-                   @click="addShow()">{{"新增" }}</el-button> -->
-        <!-- <el-input v-model="search"
-                  placeholder="请输入内容"></el-input> -->
-      </div>
-      <div class="div_btn">
-        <el-button class=""
-                   type="primary"
-                   @click="useMenu()">开启</el-button>
-        <el-button class=""
-                   type="primary"
-                   @click="closeMenu()">关闭</el-button>
-      </div>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                row-key="id"
-                border
-                style="width: 100%;"
-                @select-all="selectAll"
-                @selection-change="handelSelection">
-        <el-table-column
-            type="selection"
-            fixed="left"
-            align="center"
-            width="50"
-        />
-
-        <el-table-column prop="name"
-                         :label="$t('menu.name')"
-                         header-align="center"
-                         min-width="150"></el-table-column>
-        <el-table-column prop="icon"
-                         :label="$t('menu.icon')"
-                         header-align="center"
-                         align="center">
-          <template slot-scope="scope">
-            <svg class="icon-svg"
-                 aria-hidden="true">
-              <use :xlink:href="`#${scope.row.icon}`"></use>
-            </svg>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="sort"
-                         :label="$t('menu.sort')"
-                         header-align="center"
-                         align="center"></el-table-column>
-                <el-table-column prop="useFlag"
-                         :label="$t('menu.status')"
-                         header-align="center"
-                         align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.useFlag === '0'"
-                    size="small">{{ $t('menu.status0') }}</el-tag>
-            <el-tag v-else
-                    size="small"
-                    type="info">{{ $t('menu.status1') }}</el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="150">
-          <template slot-scope="scope">
-            <el-button type="text"
-                       size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="scope.row.useFlag === '0'"
-                       type="text"
-                       size="small"
-                       @click="useUpdate(scope.row.id,'1')">开启</el-button>
-            <el-button v-if="scope.row.useFlag === '1'"
-                       type="text"
-                       size="small"
-                       @click="useUpdate(scope.row.id,'0')">关闭</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-                     ref="addOrUpdate"
-                     @refreshDataList="getDataList"></add-or-update>
-    </div>
-
-
-  </div>
+	<div>
+		<div class="mod-sys__menu">
+			<div class="little-head">
+				<div style="float:right">
+					<span style="margin-right:10px">{{ customerName }}</span>
+					<el-button type="default" @click="diaCancel">取消返回</el-button>
+				</div>
+				<div>工作端</div>
+			</div>
+			<el-form :inline="true" @keyup.enter.native="search()">
+				<el-form-item><el-input v-model="menuName" placeholder="请输入菜单名称" :clearable="true"></el-input></el-form-item>
+				<el-form-item><el-button type="primary" @click="search()">查询</el-button></el-form-item>
+			</el-form>
+			
+			<div class="div_btn">
+				<el-button type="primary" @click="open('')">开启</el-button>
+				<el-button type="primary" @click="close('')">关闭</el-button>
+			</div>
+			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;" ref="form" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" fixed="left" align="center" width="50" />
+				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
+					</template>
+				</el-table-column>
+
+				<el-table-column prop="sort" :label="$t('menu.sort')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="useFlag" :label="$t('menu.status')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.useFlag === '0'" size="small">{{ $t('menu.status0') }}</el-tag>
+						<el-tag v-else size="small" type="info">{{ $t('menu.status1') }}</el-tag>
+					</template>
+				</el-table-column>
+
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button type="text" size="small" v-if="scope.row.useFlag == '0'" @click="open(scope.row.id)">{{ '开启' }}</el-button>
+						<el-button type="text" size="small" v-if="scope.row.useFlag == '1'" @click="close(scope.row.id)">{{ '关闭' }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</div>
 </template>
 
 <script>
-
-import { requestPost } from '@/js/dai/request'
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './menu-customer-add-or-update'
+import { requestPost } from '@/js/dai/request';
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './menu-customer-add-or-update';
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      customerId: '', // 客户id，父组件传
-      customerName: '', // 客户名称，父组件传
-
-      tableParams: {
-        customerId: ''
-      },
-      search: '',
-      dataList: [],
-      selection: [],
-      selAllFlag: false,
-
-      dataListLoading: false,
-
-      mixinViewModuleOptions: {
-        getDataListURL: '/gov/access/menu/customerMenuList'
-      }
-
-    }
-  },
-
-  computed: {
-  },
-  components: {
-    AddOrUpdate
-  },
-  created() {
-
-  },
-  methods: {
-
-    useMenu(){
-      let ids = this.selection.map((item) => item.id);
-      this.$http
-          .post('/gov/access/govMenuCustomerRelation/useUpdate', {
-            ids: ids,
-            use: '1'
-          })
-          .then(({ data: res }) => {
-            return this.$message.success("操作成功");
-          })
-      this.query();
-    },
-    closeMenu(){
-      let ids = this.selection.map((item) => item.id);
-      this.$http
-          .post('/gov/access/govMenuCustomerRelation/useUpdate', {
-            ids: ids,
-            use: '0'
-          })
-          .then(({ data: res }) => {
-            return this.$message.success("操作成功");
-
-          })
-      this.query();
-    },
-    useUpdate(id,use){
-      this.$http
-          .post('/gov/access/govMenuCustomerRelation/useUpdate', {
-            ids: [id],
-            use: use
-          })
-          .then(({ data: res }) => {
-            return this.$message.success("操作成功");
-          })
-      this.query();
-    },
-    query() {
-
-      this.dataListLoading = true
-      this.$http
-          .post('/gov/access/menu/customerMenuList', {
-            customerId: this.customerId,
-            tableName: 'data_menu'
-          })
-          .then(({ data: res }) => {
-            this.dataListLoading = false
-            if (res.code !== 0) {
-              this.dataList = []
-              this.total = 0
-              return this.$message.error(res.msg)
-            }
-            this.dataList = res.data
-          })
-          .catch(() => {
-            this.dataListLoading = false
-          })
-    },
-
-    initData (customerId, customerName) {
-      this.customerId = customerId
-      this.customerName = customerName
-      // if (this.mixinViewModuleOptions.createdIsNeed) {
-      //   console.log(this.customerId+"22222");
-        this.query()
-      // }
-
-    },
-
-    selectAll(selection) {
-      this.selection = selection;
-      if (selection.length > 0) {
-        this.selAllFlag = true;
-      } else {
-        this.selAllFlag = false;
-      }
-    },
-    handelSelection(row){
-      this.selection = row
-    },
-    // 取消
-    diaCancel () {
-      this.$emit('cancleBack')
-    },
-  }
-}
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			menuName: '',
+			multipleSelection: [],
+			customerId: '', // 客户id，父组件传
+			customerName: '', // 客户名称，父组件传
+
+			tableParams: {
+				customerId: ''
+			},
+
+			dataList: [],
+			selection: [],
+			selAllFlag: false,
+
+			dataListLoading: false,
+
+			mixinViewModuleOptions: {
+				getDataListURL: '/gov/access/menu/customerMenuList'
+			}
+		};
+	},
+
+	computed: {},
+	components: {
+		AddOrUpdate
+	},
+	created() {},
+	methods: {
+		search() {
+			if (this.menuName != '') {
+				let saveList = [];
+				this.onFuzzyTreeList('name', this.menuName, this.dataList, saveList);
+				this.$refs.form.data = saveList;
+			} else {
+				this.$refs.form.data = this.dataList;
+			}
+		},
+
+		onFuzzyTreeList(key, value, treeList, saveList = []) {
+			return new Promise((resolve, reject) => {
+				treeList.forEach(item => {
+					if (item[key].indexOf(value) > -1) {
+						saveList.push(item);
+					} else {
+						if (item.children && item.children.length > 0) {
+							const _reData = this.onFuzzyTreeList(key, value, item.children, saveList);
+							if (_reData && _reData.length > 0) {
+								saveList.push({
+									...item,
+									children: _reData
+								});
+							}
+						}
+					}
+				});
+				resolve(saveList);
+			});
+		},
+		
+		open(id) {
+			let menuIds = [];
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+
+			let params = {
+				ids: menuIds,
+				use: '1'
+			};
+			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.query();
+				}
+			});
+		},
+		close(id) {
+			let menuIds = [];
+
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+			let params = {
+				ids: menuIds,
+				use: '0'
+			};
+			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.query();
+				}
+			});
+		},
+		useUpdate(id, use) {
+			this.$http
+				.post('', {
+					ids: [id],
+					use: use
+				})
+				.then(({ data: res }) => {
+					return this.$message.success('操作成功');
+				});
+			this.query();
+		},
+		query() {
+			this.dataListLoading = true;
+			this.$http
+				.post('/gov/access/menu/customerMenuList', {
+					customerId: this.customerId,
+					tableName: 'data_menu'
+				})
+				.then(({ data: res }) => {
+					this.dataListLoading = false;
+					if (res.code !== 0) {
+						this.dataList = [];
+						this.total = 0;
+						return this.$message.error(res.msg);
+					}
+					this.dataList = res.data;
+				})
+				.catch(() => {
+					this.dataListLoading = false;
+				});
+		},
+
+		initData(customerId, customerName) {
+			this.customerId = customerId;
+			this.customerName = customerName;
+			// if (this.mixinViewModuleOptions.createdIsNeed) {
+			//   console.log(this.customerId+"22222");
+			this.query();
+			// }
+		},
+
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.id);
+			});
+			console.log(this.multipleSelection);
+		},
+		// 取消
+		diaCancel() {
+			this.$emit('cancleBack');
+		}
+	}
+};
 </script>
 
 <style>
 .div_btn {
-  margin: 0 0 20px 0;
+	margin: 0 0 20px 0;
+}
+.little-head{
+	border-bottom: dashed 1px #ccc; line-height: 50px;
+	margin-bottom: 20px;
 }
 </style>
diff --git a/epmet-oper-web/src/views/modules/workPc/dataMenu.vue b/epmet-oper-web/src/views/modules/workPc/dataMenu.vue
index 0a947e3..c6fcff1 100644
--- a/epmet-oper-web/src/views/modules/workPc/dataMenu.vue
+++ b/epmet-oper-web/src/views/modules/workPc/dataMenu.vue
@@ -1,129 +1,216 @@
 <template>
-  <el-card shadow="never"
-           class="aui-card--fill">
-    <div class="mod-sys__menu">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-button type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                row-key="id"
-                border
-                :height="tableHeight"
-                style="width: 100%;">
-        <el-table-column prop="name"
-                         :label="$t('menu.name')"
-                         header-align="center"
-                         min-width="150"></el-table-column>
-        <el-table-column prop="icon"
-                         :label="$t('menu.icon')"
-                         header-align="center"
-                         align="center">
-          <template slot-scope="scope">
-            <svg class="icon-svg"
-                 aria-hidden="true">
-              <use :xlink:href="`#${scope.row.icon}`"></use>
-            </svg>
-          </template>
-        </el-table-column>
-        <el-table-column prop="type"
-                         :label="$t('menu.type')"
-                         header-align="center"
-                         align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.type === 0"
-                    size="small">{{ $t('menu.type0') }}</el-tag>
-            <el-tag v-else
-                    size="small"
-                    type="info">{{ $t('menu.type1') }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="sort"
-                         :label="$t('menu.sort')"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="url"
-                         :label="$t('menu.url')"
-                         header-align="center"
-                         align="center"
-                         width="150"
-                         :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="permissions"
-                         :label="$t('menu.permissions')"
-                         header-align="center"
-                         align="center"
-                         width="150"
-                         :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="150">
-          <template slot-scope="scope">
-            <el-button type="text"
-                       size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="showCustomerMenu(scope.row)">{{ '客户配置' }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-                     ref="addOrUpdate"
-                     :tableName="'data_menu'"
-                     @refreshDataList="getDataList"></add-or-update>
-      <!-- 客户菜单配置 -->
-      <customer-add-or-update ref="customerForm"
-                              :menuName="selMenuName"
-                              @refreshDataList="getDataList"></customer-add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__menu">
+			<el-form :inline="true" @keyup.enter.native="search()">
+				<el-form-item><el-input v-model="menuName" placeholder="请输入菜单名称" :clearable="true"></el-input></el-form-item>
+				<el-form-item><el-button type="primary" @click="search()">查询</el-button></el-form-item>
+			</el-form>
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+					<el-button type="primary" @click="open('')">开启</el-button>
+					<el-button type="primary" @click="close('')">关闭</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table
+				@selection-change="handleSelectionChange"
+				v-loading="dataListLoading"
+				ref="form"
+				:data="dataList"
+				row-key="id"
+				border
+				:height="tableHeight"
+				style="width: 100%;"
+			>
+				<el-table-column label="" fixed="left" type="selection" align="center" width="50" />
+				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
+					</template>
+				</el-table-column>
+				<el-table-column prop="type" :label="$t('menu.type')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.type === 0" size="small">{{ $t('menu.type0') }}</el-tag>
+						<el-tag v-else size="small" type="info">{{ $t('menu.type1') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="sort" :label="$t('menu.sort')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="url" :label="$t('menu.url')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column
+					prop="permissions"
+					:label="$t('menu.permissions')"
+					header-align="center"
+					align="center"
+					width="150"
+					:show-overflow-tooltip="true"
+				></el-table-column>
+				<el-table-column prop="showFlag" label="菜单类型" header-align="center" align="center">
+					<template slot-scope="scope">
+						基础应用
+					</template>
+				</el-table-column>
+				<el-table-column prop="type" :label="$t('状态')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.showFlag === 0" size="small" type="info">{{ $t('menu.status0') }}</el-tag>
+						<el-tag v-else size="small">{{ $t('menu.status1') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+						<!-- <el-button type="text" size="small" @click="showCustomerMenu(scope.row)">{{ '客户配置' }}</el-button> -->
+						<el-button type="text" size="small" v-if="scope.row.showFlag == 0" @click="open(scope.row.id)">{{ '开启' }}</el-button>
+						<el-button type="text" size="small" v-if="scope.row.showFlag == 1" @click="close(scope.row.id)">{{ '关闭' }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :tableName="'data_menu'" @refreshDataList="getDataList"></add-or-update>
+			<!-- 客户菜单配置 -->
+			<customer-add-or-update ref="customerForm" :menuName="selMenuName" @refreshDataList="getDataList"></customer-add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './menu-add-or-update'
-import { mapGetters } from 'vuex'
-import CustomerAddOrUpdate from './customer-add-or-update'
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './menu-add-or-update';
+import { mapGetters } from 'vuex';
+import CustomerAddOrUpdate from './customer-add-or-update';
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/gov/access/menu/list',
-        deleteURL: '/gov/access/menu'
-      },
-      customerFormVisible: false,
-      dataForm: { "tableName": 'data_menu' },
-      selMenuName: ''
-    }
-  },
-  components: {
-    AddOrUpdate, CustomerAddOrUpdate
-  },
-  computed: {
-    tableHeight () {
-      // return this.resolution === 'small' ? this.clientHeight - 210 : this.clientHeight - 220
-      return this.clientHeight - 210
-    },
-    ...mapGetters(['clientHeight', 'resolution']),
-  },
-  methods: {
-    showCustomerMenu (row) {
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			menuName: '',
+			multipleSelection: [],
+			mixinViewModuleOptions: {
+				getDataListURL: '/gov/access/menu/list',
+				deleteURL: '/gov/access/menu'
+			},
+			customerFormVisible: false,
+			dataForm: { tableName: 'data_menu' },
+			selMenuName: ''
+		};
+	},
+	components: {
+		AddOrUpdate,
+		CustomerAddOrUpdate
+	},
+	computed: {
+		tableHeight() {
+			// return this.resolution === 'small' ? this.clientHeight - 210 : this.clientHeight - 220
+			return this.clientHeight - 210;
+		},
+		...mapGetters(['clientHeight', 'resolution'])
+	},
+	methods: {
+		search() {
+			if (this.menuName != '') {
+				let saveList = [];
+				this.onFuzzyTreeList('name', this.menuName, this.dataList, saveList);
+				this.$refs.form.data = saveList;
+			} else {
+				this.$refs.form.data = this.dataList;
+			}
+		},
 
-      this.selMenuName = row.name
-      this.$refs['customerForm'].init(row.id)
-    }
-  }
-}
+		onFuzzyTreeList(key, value, treeList, saveList = []) {
+			return new Promise((resolve, reject) => {
+				treeList.forEach(item => {
+					if (item[key].indexOf(value) > -1) {
+						saveList.push(item);
+					} else {
+						if (item.children && item.children.length > 0) {
+							const _reData = this.onFuzzyTreeList(key, value, item.children, saveList);
+							if (_reData && _reData.length > 0) {
+								saveList.push({
+									...item,
+									children: _reData
+								});
+							}
+						}
+					}
+				});
+				resolve(saveList);
+			});
+		},
+		// search() {
+		// 	if (this.menuName == '') {
+		// 		this.getDataList();
+		// 	} else {
+		// 		this.dataList = this.dataList.filter(item => {
+		// 			if (item.name.indexOf(this.menuName) !== -1) return item;
+		// 		});
+		// 	}
+		// },
+		handleSelectionChange(val) {
+			this.multipleSelection = [];
+			val.forEach(element => {
+				this.multipleSelection.push(element.id);
+			});
+			console.log(this.multipleSelection);
+		},
+		showCustomerMenu(row) {
+			this.selMenuName = row.name;
+			this.$refs['customerForm'].init(row.id);
+		},
+		open(id) {
+			console.log('Aa');
+			let menuIds = [];
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+
+			let params = {
+				menuIds: menuIds,
+				flagShow: 1
+			};
+			this.$http.post('/gov/access/menu/updateShow/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.getDataList();
+				}
+			});
+		},
+		close(id) {
+			let menuIds = [];
+
+			if (id != '') {
+				menuIds = [id];
+			} else {
+				if (this.multipleSelection.length > 0) {
+					menuIds = this.multipleSelection;
+				} else {
+					return this.$message.error('请选择菜单');
+				}
+			}
+			let params = {
+				menuIds: menuIds,
+				flagShow: 0
+			};
+			this.$http.post('/gov/access/menu/updateShow/', params).then(({ data: res }) => {
+				console.log(res);
+				if (res.code === 0) {
+					this.getDataList();
+				}
+			});
+		}
+	}
+};
 </script>
+<style>
+.little-head {
+	border-bottom: dashed 1px #ccc;
+	line-height: 50px;
+	margin-bottom: 20px;
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/workPc/menu.vue b/epmet-oper-web/src/views/modules/workPc/menu.vue
index 48a2b33..9f8e5e1 100644
--- a/epmet-oper-web/src/views/modules/workPc/menu.vue
+++ b/epmet-oper-web/src/views/modules/workPc/menu.vue
@@ -13,9 +13,9 @@
 				</el-form-item>
 			</el-form>
 			<el-table
-				@selection-change="handleSelectionChange"
 				v-loading="dataListLoading"
 				ref="form"
+				@selection-change="handleSelectionChange"
 				:data="dataList"
 				row-key="id"
 				border
@@ -204,3 +204,10 @@ export default {
 	}
 };
 </script>
+<style>
+.little-head {
+	border-bottom: dashed 1px #ccc;
+	line-height: 50px;
+	margin-bottom: 20px;
+}
+</style>