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/DailyMaintenanceStandardList.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 38a7ee1..1959e41 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鍛ㄦ湡鎬т繚鍏绘爣鍑�"
+    title="浜岀骇淇濆吇鏍囧噯"
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
@@ -28,10 +28,10 @@
             :md='8'
             :sm='24'
           >
-            <a-form-item label='璁惧鍚嶇О'>
+            <a-form-item label='缁熶竴缂栧彿'>
               <a-input
-                placeholder='璇疯緭鍏ヨ澶囧悕绉�'
-                v-model='queryParam.name'
+                placeholder='璇疯緭鍏ョ粺涓�缂栧彿'
+                v-model='queryParam.equipmentNum'
               ></a-input>
             </a-form-item>
           </a-col>
@@ -113,6 +113,7 @@
         <a-button
           type="primary"
           icon="import"
+          v-has="'dailyMaintenanceStandard:import'"
         >瀵煎叆</a-button>
       </a-upload>
     </div>
@@ -458,8 +459,8 @@
       /* 鍒嗛〉鍙傛暟 */
       ipagination: {
         current: 1,
-        pageSize: 5,
-        pageSizeOptions: ['5', '10', '50'],
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
         },
@@ -468,7 +469,7 @@
         total: 0
       },
       maintenanceStandardId: '-1',
-      queryParam: { type: 'daily' }
+      queryParam: { type: 'daily', maintenanceType: '2' }
     }
   },
   computed: {
@@ -588,7 +589,7 @@
 
     searchReset() {
       this.maintenanceStandardId = '-1'
-      this.queryParam = { type: 'daily' }
+      this.queryParam = { type: 'daily', maintenanceType: '2' }
       this.loadData(1);
     },
   }

--
Gitblit v1.9.3