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

src/config/route.js

@@ -2339,6 +2339,49 @@ const routes = [
           },
         ]
       },
+      //考试
+      {
+        "name": "edu",
+        "path": "/edu",
+        "meta": {
+          "title": "培训考试",
+          "icon": "el-icon-notebook",
+          "type": "menu",
+          "perms": ["edu"]
+        },
+        "children": [
+          {
+            "name": "question",
+            "path": "/edu/question",
+            "meta": {
+              "title": "题库",
+              "icon": "el-icon-notebook",
+              "perms": ["question"]
+            },
+            "component": "edu/question"
+          },
+          {
+            "name": "paper",
+            "path": "/edu/paper",
+            "meta": {
+              "title": "试卷库",
+              "icon": "el-icon-notebook",
+              "perms": ["paper"]
+            },
+            "component": "edu/paper"
+          },
+          {
+            "name": "exam",
+            "path": "/edu/exam",
+            "meta": {
+              "title": "在线考试",
+              "icon": "el-icon-notebook",
+              "perms": ["exam"]
+            },
+            "component": "edu/exam"
+          }
+        ]
+      },
       {
             "path": "/enm_base/search",
             "name": "search",

src/views/edu/exam.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        <h2>question</h2>
+    </div>
+</template>

src/views/edu/paper.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        <h2>question</h2>
+    </div>
+</template>

src/views/edu/question.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        <h2>question</h2>
+    </div>
+</template>

src/views/enp/pfk.vue

@@ -2,6 +2,14 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="table_add"
+					v-auth="'drain.create'"
+				></el-button>
+			</div>
+			<div class="right-panel">
 				<el-input
 					style="margin-right: 5px"
 					v-model="query.search"
@@ -14,14 +22,6 @@
 					@click="handleQuery"
 				></el-button>
 			</div>
-			<div class="right-panel">
-				<el-button
-					type="primary"
-					icon="el-icon-plus"
-					@click="table_add"
-					v-auth="'mgroup.create'"
-				></el-button>
-			</div>
 		</el-header>
 		<el-main class="nopadding">
 			<scTable
@@ -50,8 +50,8 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="类型" prop="cate">
-					<template #default="scope">
+					<template #default="scope"
-						<el-tag>{{ cate_[scope.row.cate] }}</el-tag>
+						>{{ drainTypeEnum[scope.row.cate]?.text }}
 					</template>
 				</el-table-column>
 				<el-table-column label="高度" prop="height"></el-table-column>
@@ -95,7 +95,7 @@
 							link
 							size="small"
 							@click="table_equip(scope.row)"
-							v-auth="'mgroup.update'"
+							v-auth="'drain.update'"
 							type="primary"
 							>设备</el-button
 						>
@@ -104,7 +104,7 @@
 							link
 							size="small"
 							@click="table_edit(scope.row)"
-							v-auth="'mgroup.update'"
+							v-auth="'drain.update'"
 							type="primary"
 							>编辑</el-button
 						>
@@ -117,7 +117,7 @@
 								<el-button
 									link
 									size="small"
-									v-auth="'mgroup.delete'"
+									v-auth="'drain.delete'"
 									type="danger"
 									>删除</el-button
 								>
@@ -234,6 +234,7 @@
 </template>
 <script>
 import saveDialog from "./pfk_form.vue";
+import { drainTypeEnum } from "@/utils/enum.js";
 export default {
 	name: "dept",
 	components: {
@@ -241,6 +242,7 @@ export default {
 	},
 	data() {
 		return {
+			drainTypeEnum,
 			apiObj: this.$API.enp.drain.list,
 			apiObj2: null,
 			query: {},
@@ -260,11 +262,6 @@ export default {
 			drain_number: "",
 			selection: [],
 			level_: { 10: "主要排放口", 20: "次要排放口" },
-			cate_: {
-				product: "生产工艺",
-				mtrans: "物料输送",
-				mstore: "物料储存",
-			},
 			visible: false,
 			options: [],
 			visibleEquip: false,

src/views/enp/pfk_form.vue

@@ -60,12 +60,10 @@
 						></el-input-number>
 					</el-form-item>
 					<el-form-item label="处理量">
-						<el-input-number
+						<el-input
 							v-model="form.treatment_capacity"
-							:min="1"
-							controls-position="right"
 							style="width: 100%"
-						></el-input-number>
+						></el-input>
 					</el-form-item>
 					<el-form-item label="最低限值">
 						<el-input-number