点检方案树demo功能更新

imt-ui/package.json

@@ -70,6 +70,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.8",
     "vue-meta": "^2.4.0",
+    "vue-okr-tree": "^1.0.17",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vue-video-player": "^5.0.2",
@@ -95,7 +96,7 @@
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-vue": "9.0.0",
     "fs-extra": "^8.1.0",
-    "html-webpack-plugin": "^5.6.0",
+    "html-webpack-plugin": "^4.5.2",
     "lint-staged": "12.5.0",
     "runjs": "4.4.2",
     "sass": "1.32.13",

imt-ui/src/views/system/gatewayinfo/GatewayInfoForm.vue

@@ -279,12 +279,13 @@ export default {
         try {
           const res = await GatewayInfoApi.getGatewayInfo(id);
           this.formData = res.data;
-          this.title = "修改机床网关信息";
+          this.dialogTitle = "修改机床网关信息";
         } finally {
           this.formLoading = false;
         }
+      } else {
+        this.dialogTitle = "新增机床网关信息";
       }
-      this.title = "新增机床网关信息";
     },
     /** 提交按钮 */
     async submitForm() {

imt-ui/src/views/system/inspectionPlan/InspectionPlanForm.vue

@@ -4,7 +4,7 @@
     <el-dialog
       :title="dialogTitle"
       :visible.sync="dialogVisible"
-      width="45%"
+      width="55%"
       v-dialogDrag
       append-to-body
     >
@@ -13,12 +13,11 @@
         :model="formData"
         :rules="formRules"
         v-loading="formLoading"
-        label-width="100px"
+        label-width="110px"
       >
         <el-col :span="24">
           <el-form-item
-            v-if="this.formData.parentInspectionId != 0"
+            label="点检方案父节点"
-            label="父节点点检方案"
             prop="parentInspectionId"
           >
             <!-- <el-input
@@ -156,7 +155,10 @@ export default {
           "inspectionPlanId",
           "parentInspectionId"
         );
-        console.log("inspectionOptions:", this.inspectionOptions);
+        this.inspectionOptions.push({
+          inspectionPlanId: 0,
+          inspectionName: "无",
+        });
       });
     },
     /** 转换菜单数据结构 */
@@ -186,12 +188,13 @@ export default {
         } finally {
           this.formLoading = false;
         }
-      }
+      } else {
         this.dialogTitle = "新增点检方案";
         this.$nextTick(() => {
           this.formData.status = CommonStatusEnum.ENABLE;
           this.formData.parentInspectionId = this.pid;
         });
+      }
     },
     /** 提交按钮 */
     async submitForm() {

imt-ui/src/views/system/inspectionPlan/index.vue

@@ -94,7 +94,6 @@
     >
       <el-table-column
         label="基础点检名"
-        align="center"
         prop="inspectionName"
       />
       <el-table-column
@@ -170,6 +169,7 @@
 import * as InspectionPlanApi from "@/api/system/inspection/plan";
 import InspectionPlanForm from "./InspectionPlanForm.vue";
 import { getDictDatas, DICT_TYPE } from "@/utils/dict";
+
 export default {
   name: "InspectionPlan",
   components: {
@@ -188,7 +188,7 @@ export default {
       // 点检方案列表
       list: [],
       // 是否展开，默认全部展开
-      isExpandAll: true,
+      isExpandAll: false,
       // 重新渲染表格状态
       refreshTable: true,
       // 选中行