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 @@ @@ -13,12 +13,11 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="100px" + label-width="110px" >