diff --git a/src/config/route.js b/src/config/route.js index fa716293..a49596e4 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -10,7 +10,8 @@ const routes = [ "meta": { "title": "工作台", "icon": "el-icon-home-filled", - "type": "menu" + "type": "menu", + "perms": ["home"] }, "children": [ //首页 @@ -227,17 +228,6 @@ const routes = [ }, "component": "enm_limestone/handoverLog" }, - { - "name": "limestone_logDetail", - "path": "/enm_limestone/logDetail", - "meta": { - "title": "日志详情", - "icon": "el-icon-document-copy", - "perms": ["enm_limestone"], - "hidden": true - }, - "component": "enm_limestone/logDetail" - }, ] }, //原料磨 @@ -301,17 +291,6 @@ const routes = [ }, "component": "enm_rm/handoverLog" }, - { - "name": "logDetail", - "path": "/enm_rm/logDetail", - "meta": { - "title": "日志详情", - "icon": "el-icon-document-copy", - "perms": ["enm_rm"], - "hidden": true - }, - "component": "enm_rm/logDetail" - }, ] }, //原料磨——基础 @@ -2378,7 +2357,27 @@ const routes = [ "perms": ["enm_base"] }, "component": "enm_base/material" - } + }, + { + "name": "logDetail", + "path": "/enm_rm/logDetail", + "meta": { + "title": "日志详情", + "icon": "el-icon-document-copy", + "hidden": true + }, + "component": "enm_rm/logDetail" + }, + { + "name": "formula", + "path": "/enm_base/formula", + "meta": { + "title": "计算公式", + "icon": "el-icon-grid", + "perms": ["enm_base"] + }, + "component": "enm_base/formulaSetting" + }, ] }, //每月配置 diff --git a/src/router/index.js b/src/router/index.js index 65e8bee7..7d46d67d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -114,9 +114,8 @@ router.sc_getMenu = () => { userMenu = treeFilter(userRoutes, node => { return node.meta.perms ? node.meta.perms.filter(item => permissions.indexOf(item) > -1).length > 0 : true }); - // let userMenu = checkRoute(userRoutes, permissions) - // var menu = [...userMenu, ...apiMenu] - return userMenu + let menus = checkRoute(userMenu, permissions) + return menus } //转换 @@ -229,19 +228,21 @@ function checkRoute(routes, perms) { } } } - } - else if (routes[i].children) { - for (var m = 0; m < routes[i].children.length; m++) { - let child = routes[i].children[m] - console.log(m, child) - if (child.meta && child.meta.perms) { - let has = hasPerm(child.meta.perms, perms) - if (!has) { - routes[i].children.splice(m, 1) - } - } + }else{ + routes.splice(i, 1) } - } + // else if (routes[i].children) { + // for (var m = 0; m < routes[i].children.length; m++) { + // let child = routes[i].children[m] + // console.log(m, child) + // if (child.meta && child.meta.perms) { + // let has = hasPerm(child.meta.perms, perms) + // if (!has) { + // routes[i].children.splice(m, 1) + // } + // } + // } + // } } return routes } diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index a7f3b02a..a61a0630 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -1,1410 +1,1792 @@ \ No newline at end of file + diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue new file mode 100644 index 00000000..ee993b56 --- /dev/null +++ b/src/views/bigScreen/index_enm_ly.vue @@ -0,0 +1,1198 @@ + + + diff --git a/src/views/em/ecate.vue b/src/views/em/ecate.vue index 8832f9e4..b479e502 100644 --- a/src/views/em/ecate.vue +++ b/src/views/em/ecate.vue @@ -1,126 +1,180 @@ \ No newline at end of file + diff --git a/src/views/em/ecate_form.vue b/src/views/em/ecate_form.vue new file mode 100644 index 00000000..2a7ec819 --- /dev/null +++ b/src/views/em/ecate_form.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index a8e945ce..a9756578 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -160,7 +160,10 @@ - + - + - + - @@ -243,21 +249,19 @@ label="影响测点编号" label-width="100" > - - + - +