From bb654cea7b1666d5b3c04dbd81a074a5a502cc67 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 31 五月 2024 09:36:40 +0800
Subject: [PATCH] 1、登录页实现登录窗口响应式布局，同时限制最大最小宽高 2、除设备级看板其余看板中点击技术状态以及报修故障图表后打开对应弹窗，并实现与接口联动 3、设备级看板点击保养计划按钮后打开对应弹窗并实现与后端数据联调 4、优化设备级看板折线图样式，将Y轴移至左侧，删除右侧Y轴，设置数据值在图标上的显示

---
 src/views/eam/modules/equipmentNew/EquipmentModal.vue |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 204728d..b6d611e 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -117,8 +117,6 @@
               :wrapperCol="wrapperCol"
               prop="useId"
             >
-            
-            
 
               <j-dict-select-tag
                 allow-clear
@@ -136,14 +134,14 @@
             <a-form-model-item
               label="鏄惁鐢熶骇绾胯澶�"
               :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            prop="isLineEquip"
+              :wrapperCol="wrapperCol"
+              prop="isLineEquip"
             >
               <j-dict-select-tag
                 allow-clear
                 placeholder="璇烽�夋嫨"
                 :triggerChange="true"
-                :disabled="true"
+                :disabled="false"
                 dictCode="is_product"
                 v-model="model.isLineEquip"
               />
@@ -153,14 +151,14 @@
             <a-form-model-item
               label="鏄惁鐢熶骇绾�"
               :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            prop="isLine"
+              :wrapperCol="wrapperCol"
+              prop="isLine"
             >
               <j-dict-select-tag
                 allow-clear
                 placeholder="璇烽�夋嫨"
                 :triggerChange="true"
-                :disabled="true"
+                :disabled="false"
                 dictCode="is_product"
                 v-model="model.isLine"
               />
@@ -1015,13 +1013,13 @@
       validatorRules: {
         num: [
           { required: true, message: '璇疯緭鍏ヨ澶囩紪鍙�!' },
-          { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
+          // { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
           { validator: this.validateNum },
         ],
         name: [
           { required: true, message: '璇疯緭鍏ヨ澶囧悕绉�!' },
-          { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
-          { validator: this.validateName },
+          // { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
+          // { validator: this.validateName },
         ],
         teamId: [
           { required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
@@ -1063,10 +1061,10 @@
           { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
         ],
         workCenterId: [
-          { required: true, message: '璇烽�夋嫨涓績!' },
+          { required: false, message: '璇烽�夋嫨涓績!' },
         ],
         factoryModelId: [
-          { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+          { required: false, message: '璇烽�夋嫨宸ュ尯!' },
         ],
         warrantyStart: [
           { required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
@@ -1087,7 +1085,7 @@
           { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
         ],
         areaId: [
-          { required: true, message: '璇烽�夋嫨宸ユ!' },
+          { required: false, message: '璇烽�夋嫨宸ユ!' },
         ],
       },
       url: {
@@ -1340,7 +1338,7 @@
         var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
         this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
         this.model = Object.assign({}, this.model);
-      }else{
+      } else {
         this.model.nextTechnologyStatusQualificationTime = '';
         this.model = Object.assign({}, this.model);
       }

--
Gitblit v1.9.3