From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分,与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw

---
 src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstructionModal.vue |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstructionModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstructionModal.vue
index 3263783..31a61aa 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstructionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstructionModal.vue
@@ -30,11 +30,18 @@
         <a-row :gutter="24">
           <a-col :span="24">
             <a-form-item
-              :labelCol="{span:3}"
-              :wrapperCol="{span:21}"
+              :labelCol="{span:4}"
+              :wrapperCol="{span:18}"
               label="鏂囦欢绫诲瀷"
             >
-              <a-radio-group
+              <j-dict-select-tag
+                allow-clear
+                placeholder="璇烽�夋嫨鏂囨。绫诲瀷"
+                :triggerChange="true"
+                dictCode="mom_eam_document_type,name,id, del_flag!='1'"
+                v-decorator="['fileType', validatorRules.fileType ]"
+              />
+              <!-- <a-radio-group
                 v-for="(item,index) in fileTypes"
                 :key="index"
                 button-style="solid"
@@ -45,7 +52,7 @@
                 <a-radio-button :value="item.value">
                   {{item.text}}
                 </a-radio-button>
-              </a-radio-group>
+              </a-radio-group> -->
 
             </a-form-item>
           </a-col>
@@ -300,18 +307,18 @@
     handleCancel() {
       this.close();
     },
-    initFileTypes() {
-      ajaxGetDictItems("common_upload_type", null).then((res) => {
-        if (res.success) {
-          this.fileTypes = res.result;
-        }
-      })
-    },
+    // initFileTypes() {
+    //   ajaxGetDictItems("common_upload_type", null).then((res) => {
+    //     if (res.success) {
+    //       this.fileTypes = res.result;
+    //     }
+    //   })
+    // },
 
   },
 
   created() {
-    this.initFileTypes();
+    // this.initFileTypes();
     const token = Vue.ls.get(ACCESS_TOKEN);
     const tenantid = Vue.ls.get(TENANT_ID)
     this.headers = {

--
Gitblit v1.9.3