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/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
index a0d3da1..f94b14a 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
@@ -38,19 +38,19 @@
         </a-row>
         <a-row style='width: 100%'>
           <a-col :span='12'>
-            <a-form-model-item label='涓诲崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
+            <a-form-model-item label='鍗曚綅' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
               <!--              <a-input v-model='model.mainUnitId' placeholder='璇疯緭鍏ヤ富鍗曚綅' />-->
               <j-dict-select-tag
                 allow-clear
-                :placeholder="'璇烽�夋嫨涓诲崟浣�'"
+                :placeholder="'璇烽�夋嫨鍗曚綅'"
                 v-model='model.departId'
                 dictCode="mom_base_unit,name,id,del_flag!='1'"
               />
             </a-form-model-item>
           </a-col>
-          <a-col :span='12'>
+<!--          <a-col :span='12'>
             <a-form-model-item label='杈呭崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='auxiliaryUnitId'>
-              <!--              <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />-->
+              &lt;!&ndash;              <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />&ndash;&gt;
               <j-dict-select-tag
                 allow-clear
                 :placeholder="'璇烽�夋嫨杈呭崟浣�'"
@@ -58,7 +58,7 @@
                 dictCode="mom_base_unit,name,id,del_flag!='1'"
               />
             </a-form-model-item>
-          </a-col>
+          </a-col>-->
         </a-row>
         <a-row style='width: 100%'>
           <a-col :span='12'>

--
Gitblit v1.9.3