From 49a74a67140e814bb70efcde61b37d4750448e6a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 14 五月 2024 16:39:01 +0800
Subject: [PATCH] 1、设备加工工件报表页面调整表格唯一标识字段由equipmentId调整为id以试图解决项目服务器上表格数据混乱问题 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析页面调整设备类型、驱动类型、设备级别以及设备种类页面组件为多选下拉菜单

---
 src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue |   78 +++++++++++++++++++++++++++++++++------
 1 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
index 3f41c4e..07795c1 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" style="display: flex;flex-direction: column">
 
     <!-- 鏌ヨ鍖哄煙 -->
     <!--<div class="table-page-search-wrapper">-->
@@ -48,7 +48,7 @@
       <!--<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>-->
     <!--</div>-->
 
-    <div class="equipmentList">
+    <div class="equipmentList" id="DeviceList">
       <!--<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
         <!--<i class="anticon anticon-info-circle ant-alert-icon"></i>宸查�夋嫨&nbsp;<a style="font-weight: 600">{{-->
         <!--selectedRowKeys.length }}</a>椤�&nbsp;&nbsp;-->
@@ -56,18 +56,39 @@
       <!--</div>-->
 
       <a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
-               :pagination="false" :loading="loading"
-      style="height: 100%; overflow-y: scroll;">
+               :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
+        <template slot="equipmentId" slot-scope="text, record">
+          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+        </template>
+        <template slot="equipmentName" slot-scope="text, record">
+          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+        </template>
+        <template slot="oporationDict" slot-scope="text, record">
+          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+        </template>
+        <template slot="equipmentStatus" slot-scope="text">
+          <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
+        </template>
+        <template slot="collecttime" slot-scope="text, record">
+          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+        </template>
+        <template slot="action" slot-scope="text, record">
+          <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
+            <a>鐘舵�佸弽棣�</a>
+          </a-popconfirm>
+        </template>
       </a-table>
+
     </div>
   </a-card>
 </template>
 
 <script>
+  import { postAction } from '@/api/manage'
 
   export default {
     name: 'EquipmentLayout',
-    components: {},
+    components: {   },
     data() {
       return {
         loading:false,
@@ -79,25 +100,49 @@
             title: '璁惧ID',
             align: "center",
             dataIndex: 'equipmentId',
+            scopedSlots: {customRender: 'equipmentId'},
+            width:210
           },
           {
             title: '璁惧鍚嶇О',
             align: "center",
             dataIndex: 'equipmentName',
+            scopedSlots: {customRender: 'equipmentName'},
+            width:300
           },
           {
             title: '鐘舵��',
             align: "center",
             dataIndex: 'oporationDict',
+            scopedSlots: {customRender: 'oporationDict'},
+            width:200
+          },
+          {
+            title: '璁惧寮傚父',
+            align: "center",
+            dataIndex: 'equipmentStatus',
+            scopedSlots: {customRender: 'equipmentStatus'},
+            width:200
           },
           {
             title: '閲囬泦鏃堕棿',
             align: "center",
             dataIndex: 'collecttime',
             defaultSortOrder:'descend',
-            sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1}
+            sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
+            scopedSlots: {customRender: 'collecttime'},
+            width:350
           },
+          {
+            title: '鎿嶄綔',
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 150,
+            fixed:'right'
+          }
         ],
+        scrollY:465,
       }
     },
     props: { dataSource: {
@@ -108,38 +153,47 @@
     watch: {
     },
     methods: {
-    }
+      handleWindowResize(){
+        const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0,-2)
+        const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0,-2)
+        this.scrollY = boxHeight - tableHeadHeight
+      },
+    },
+    mounted(){
+      window.addEventListener('resize',this.handleWindowResize)
+      this.handleWindowResize()
+    },
   }
 </script>
 <style scoped>
+  .equipmentList{
+    flex: 1;
+    overflow: hidden;
+  }
+
   @media screen and (min-width: 1920px){
     .equipmentList{
       height: 640px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1680px) and (max-width: 1920px){
     .equipmentList{
       height: 640px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1400px) and (max-width: 1680px){
     .equipmentList{
       height: 493px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1280px) and (max-width: 1400px){
     .equipmentList{
       height: 493px!important;
-      overflow: scroll;
     }
   }
   @media screen and (max-width: 1280px){
     .equipmentList{
       height: 394px!important;
-      overflow: scroll;
     }
   }
 

--
Gitblit v1.9.3