Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/config/route.js

@@ -35,6 +35,16 @@ const routes = [
 						},
 						component: "home/testx",
 					},
+					{
+						name: "blank",
+						path: "/blank",
+						meta: {
+							title: "控制台",
+							// icon: "el-icon-monitor",
+							perms: ["home_blank"],
+						},
+						component: "home/blank",
+					},
 					{
 						name: "dashboard",
 						path: "/dashboard",
@@ -53,7 +63,7 @@ const routes = [
 							title: "控制台",
 							// icon: "el-icon-monitor",
 							affix: true,
-							perms: ["enm"],
+							perms: ["enmdashboard"],
 						},
 						component: "home/enm_home",
 					},
@@ -2697,6 +2707,39 @@ const routes = [
 				},
 				component: "enm_base/search",
 			},
+			//计算中心
+			{
+				name: "fac_cal",
+				path: "/fac_cal",
+				meta: {
+					title: "计算中心",
+					icon: "el-icon-menu",
+					type: "menu",
+					perms: ["fac_cal"],
+				},
+				children: [
+					{
+						path: "/fac_cal/mpointstat",
+						meta: {
+							title: "计算数据",
+							// icon: "el-icon-postcard",
+							type: "menu",
+							perms: ["mpointstat"],
+						},
+						component: "fac_cal/mpointstat",
+					},
+					{
+						path: "/fac_cal/caltask",
+						meta: {
+							title: "计算任务",
+							// icon: "el-icon-postcard",
+							type: "menu",
+							perms: ["caltask"],
+						},
+						component: "fac_cal/caltask",
+					},
+				]
+			},
 			//基础配置
 			{
 				name: "enm_base",
@@ -2720,7 +2763,7 @@ const routes = [
 						component: "enm_base/team",
 					},
 					{
-						name: "mgruop",
+						name: "mgroup",
 						path: "/enm_base/mgruop",
 						meta: {
 							title: "工段",
@@ -2869,6 +2912,16 @@ const routes = [
 						},
 						component: "sys/role",
 					},
+					{
+						path: "/sys/myschedule",
+						name: "myschedule",
+						meta: {
+							title: "定时策略",
+							type: "menu",
+							perms: ["myschedule"],
+						},
+						component: "sys/myschedule"
+					},
 					{
 						path: "/sys/dict",
 						name: "dict",

src/views/ops/menu.vue

@@ -53,9 +53,9 @@
     <el-form :model="addForm" :rules="rules" ref="addForm" label-width="100px" label-position="right">
       <el-form-item label="类型" prop="type">
         <el-radio-group v-model="addForm.type">
-          <el-radio :label="10">模块</el-radio>
-          <el-radio :label="20">页面</el-radio>
-          <el-radio :label="30">接口</el-radio>
+          <el-radio :value="10">模块</el-radio>
+          <el-radio :value="20">页面</el-radio>
+          <el-radio :value="30">接口</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="名称" prop="name">
@@ -86,6 +86,11 @@
 
 <script>
 import { genTree } from "@/utils/verificate";
+const dForm = {
+        codes: [],
+        type: 10,
+        sort: 1,
+      };
 export default {
   name: "dept",
   data() {
@@ -109,14 +114,7 @@ export default {
       },
 
       //表单数据
-      addForm: {
-        id: "",
-        name: "",
-        codes: [],
-        type: 10,
-        sort: 1,
-        parent: null,
-      },
+      addForm: this.dForm,
       //验证规则
       rules: {
         name: [{ required: true, message: "请输入名称" }],
@@ -154,7 +152,7 @@ export default {
       this.type = "add";
       this.limitedVisible = true;
       this.$nextTick(() => {
-        this.$refs.addForm.resetFields();
+        this.addForm = Object.assign({}, dForm);
       });
     },
     //编辑
@@ -182,7 +180,6 @@ export default {
         //	debugger;
         if (valid) {
           this.isSaveing = true;
-          var res;
           if (this.type === "add") {
             this.$API.system.permission.create
               .req(that.addForm)