From 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 九月 2024 14:56:50 +0800
Subject: [PATCH] 1、设备管理页面设备种类字段改成重要程度字段；新增设备异常状态字段，若表格记录的设备状态不为正常时，则标红此表格记录 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析新增按照重要程度字段查询表格数据；左侧树数据新增参数key，用来过滤异常状态设备 3、设备利用率页面新增设备型号字段

---
 src/views/eam/EquipmentListOfTester.vue |   87 +++++++++++++++++++++++++++++++++----------
 1 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index b4069a9..63ca641 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -97,12 +97,17 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-tree-select
+              <!-- <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 :tree-data="treeData"
                 placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
                 tree-default-expand-all
+                v-model="queryParam.manageId"
+              /> -->
+              <j-dict-select-tag
+                dictCode="sys_depart,depart_name,id"
+                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
                 v-model="queryParam.manageId"
               />
             </a-form-item>
@@ -113,12 +118,17 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-tree-select
+              <!-- <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 :tree-data="treeData"
                 placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 tree-default-expand-all
+                v-model="queryParam.useId"
+              /> -->
+              <j-dict-select-tag
+                dictCode="sys_depart,depart_name,id"
+                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 v-model="queryParam.useId"
               />
             </a-form-item>
@@ -329,13 +339,14 @@
         :customRow="clickThenSelect"
         @change="handleTableChange"
       >
-      <template
+        <template
           slot="technologyStatus"
           slot-scope="text,record"
-          >
+        >
           <a
             href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)">{{record.technologyStatus_dictText}}</a>
+            @click="handleTechnologyStatus(record)"
+          >{{record.technologyStatus_dictText}}</a>
         </template>
         <template
           slot="htmlSlot"
@@ -465,6 +476,26 @@
             class="error"
           >鍚�</span>
         </span>
+
+        <span
+          slot="name"
+          slot-scope="text"
+        >
+          <j-ellipsis
+            :value="text"
+            :length="8"
+          />
+        </span>
+
+        <template
+          slot="num"
+          slot-scope="text,record"
+        >
+          <a
+            href="javascript:;"
+            @click="handleDetail(record)"
+          >{{record.num}}</a>
+        </template>
 
         <span
           slot="action"
@@ -645,6 +676,7 @@
 import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
 import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
 import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
+import JEllipsis from '@/components/jeecg/JEllipsis'
 export default {
   name: "EquipmentList",
   mixins: [JeecgListMixin, mixinDevice],
@@ -668,6 +700,7 @@
     DailyMaintenanceList,
     SecondMaintenanceList,
     ThirdMaintenanceList,
+    JEllipsis
   },
   data() {
     return {
@@ -696,14 +729,21 @@
           dataIndex: 'isLineEquip_dictText',
         },
         {
+          title: '鍏抽敭璁惧鏍囪瘑',
+          align: "center",
+          dataIndex: 'specificEquipment_dictText',
+        },
+        {
           title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'num',
+          scopedSlots: { customRender: 'num' },
         },
         {
           title: '璁惧鍚嶇О',
           align: "center",
           dataIndex: 'name',
+          scopedSlots: { customRender: 'name' },
         },
         {
           title: '鍨嬪彿',
@@ -725,26 +765,26 @@
           align: "center",
           dataIndex: 'useId_dictText',
         },
-        {
-          title: '缁存姢閮ㄩ棬',
-          align: "center",
-          dataIndex: 'manageId_dictText',
-        },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
+        // {
+        //   title: '缁存姢閮ㄩ棬',
+        //   align: "center",
+        //   dataIndex: 'manageId_dictText',
+        // },
+        // {
+        //   title: '缁翠慨鐝粍',
+        //   align: "center",
+        //   dataIndex: 'teamId_dictText',
+        // },
         {
           title: 'ABC鏍囪瘑',
           align: "center",
           dataIndex: 'equipmentImportanceId',
         },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
+        // {
+        //   title: '鍏抽敭璁惧鏍囪瘑',
+        //   align: "center",
+        //   dataIndex: 'specificEquipment_dictText',
+        // },
         {
           title: '鎶�鏈姸鎬�',
           align: "center",
@@ -755,6 +795,11 @@
           title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
           align: "center",
           dataIndex: 'technologyStatusVerificationType_dictText',
+        },
+        {
+          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
+          align: "center",
+          dataIndex: 'nextTechnologyStatusQualificationTime',
         },
         {
           title: '鐢熶骇绾跨紪鍙�',
@@ -911,7 +956,7 @@
         },
       ],
       url: {
-        list: "/eam/equipment/getEquipmentList",
+        list: "/eam/equipment/getEquipmentTZList",
         delete: "/eam/equipment/delete",
         deleteBatch: "/eam/equipment/deleteBatch",
         active: "/eam/equipment/active",

--
Gitblit v1.9.3