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

src/config/route.js

@@ -2776,6 +2776,17 @@ const routes = [
 						},
 						component: "fac_cal/mpointstat",
 					},
+					{
+						name: "formula",
+						path: "/enm_base/formula",
+						meta: {
+							title: "计算系数",
+							// icon: "el-icon-grid",
+							type: "menu",
+							perms: ["enm_formula"],
+						},
+						component: "enm_base/formulaSetting",
+					},
 					{
 						path: "/fac_cal/caltask",
 						meta: {
@@ -2849,17 +2860,7 @@ const routes = [
 							hidden: true,
 						},
 						component: "enm_rm/logDetail",
-					},
-					{
-						name: "formula",
-						path: "/enm_base/formula",
-						meta: {
-							title: "计算系数",
-							// icon: "el-icon-grid",
-							perms: ["enm_formula"],
-						},
-						component: "enm_base/formulaSetting",
-					},
+					},				
 				],
 			},
 			//每月配置

src/views/ops/server.vue

@@ -59,7 +59,7 @@
             <template #default="scope">
               <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
                 <template #reference>
-                  <el-button v-auth="'ops.delete'" type="danger" size="small">删除</el-button>
+                  <el-button v-auth="'dbback.delete'" type="danger" size="small">删除</el-button>
                 </template>
               </el-popconfirm>
               <!-- <template v-if="scope.row.filepath">