From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样,需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题

---
 src/views/eam/RepairOrderFinishedReport.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/RepairOrderFinishedReport.vue b/src/views/eam/RepairOrderFinishedReport.vue
index a7eef6d..595f531 100644
--- a/src/views/eam/RepairOrderFinishedReport.vue
+++ b/src/views/eam/RepairOrderFinishedReport.vue
@@ -54,9 +54,9 @@
             :md="8"
             :sm="24"
           >
-            <a-form-item label="璁惧缂栫爜">
+            <a-form-item label="缁熶竴缂栫爜">
               <a-input
-                placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+                placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
                 v-model="queryParam.equipmentNum"
               ></a-input>
             </a-form-item>
@@ -101,13 +101,13 @@
           <a-menu-item
             key="2"
             @click="handleAddPre(false)"
-          ><a-icon type="copy" />鍙傜収淇濅慨鏁呴殰鍗�</a-menu-item>
+          ><a-icon type="copy" />鍙傜収鏁呴殰鎶ヤ慨鍗�</a-menu-item>
         </a-menu>
         <a-button
           type="primary"
           icon="plus"
         >鏂板</a-button>
-      </a-dropdown> 
+      </a-dropdown>
       <a-button
         type="primary"
         icon="plus"
@@ -365,6 +365,7 @@
       ref='approvalModalForm'
       @ok='approvalModalFormOk'
       @cancel='approvalModalFormOk'
+      @loadData = "loadData"
     ></approvel-modal>
   </a-card>
 </template>
@@ -373,9 +374,9 @@
 import { getAction } from '@/api/manage'
 import '@/assets/less/TableExpand.less'
 import { putAction } from '../../api/manage'
-import RepairOrderModal from './modules/repairorderfinished/RepairOrderFinishedReportModel.vue'
+import RepairOrderModal from './modules/repairorderfinished/RepairOrderFinishedReportModel'
 import RepairOrderActualMaterialList from './repairOrderFinishedReport/RepairOrderActualMaterialReport.vue'
-import RepairOrderActualWorkHoursList from './repairOrderFinishedReport/RepairOrderActualHoursReport.vue'
+import RepairOrderActualWorkHoursList from './repairOrderFinishedReport/RepairOrderActualHoursReport'
 import RepairOrderFaultAnalysisList from './repairOrderFinishedReport/RepairOrderFaultAnalysisReport.vue'
 import RepairOrderDetailList from './repairOrderFinishedReport/RepairOrderDetailReport.vue'
 import FaultDescriptionList from './FaultDescriptionList'
@@ -419,7 +420,7 @@
           dataIndex: 'num'
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'equipmentNum'
         },
@@ -512,7 +513,7 @@
         },
         {
           /*鏂板瀛楁闇�瑕佷慨鏀�*/
-          title: '濮斿鍗曚綅',
+          title: '澶栧鍗曚綅',
           align: "center",
           dataIndex: 'outsourcingUnitName'
         },

--
Gitblit v1.9.3