From 1cea7aae7925b7a5d45d019b7b99c6015023cd10 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Fri, 25 Oct 2024 15:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E6=96=B9=E6=A1=88=E6=A0=91de?=
 =?UTF-8?q?mo=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 imt-ui/package.json                           |  3 ++-
 .../system/gatewayinfo/GatewayInfoForm.vue    |  5 ++--
 .../inspectionPlan/InspectionPlanForm.vue     | 23 +++++++++++--------
 .../src/views/system/inspectionPlan/index.vue |  4 ++--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/imt-ui/package.json b/imt-ui/package.json
index 2011261..70757d5 100644
--- a/imt-ui/package.json
+++ b/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",
diff --git a/imt-ui/src/views/system/gatewayinfo/GatewayInfoForm.vue b/imt-ui/src/views/system/gatewayinfo/GatewayInfoForm.vue
index 7f72bca..6b28fa5 100644
--- a/imt-ui/src/views/system/gatewayinfo/GatewayInfoForm.vue
+++ b/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() {
diff --git a/imt-ui/src/views/system/inspectionPlan/InspectionPlanForm.vue b/imt-ui/src/views/system/inspectionPlan/InspectionPlanForm.vue
index e052a9d..9b8f831 100644
--- a/imt-ui/src/views/system/inspectionPlan/InspectionPlanForm.vue
+++ b/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;
+        });
       }
-      this.dialogTitle = "新增点检方案";
-      this.$nextTick(() => {
-        this.formData.status = CommonStatusEnum.ENABLE;
-        this.formData.parentInspectionId = this.pid;
-      });
     },
     /** 提交按钮 */
     async submitForm() {
diff --git a/imt-ui/src/views/system/inspectionPlan/index.vue b/imt-ui/src/views/system/inspectionPlan/index.vue
index 58a35a6..cb8e165 100644
--- a/imt-ui/src/views/system/inspectionPlan/index.vue
+++ b/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,
       // 选中行