From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题

---
 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index bccdd0f..2a5c4e1 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -1,20 +1,20 @@
 <template>
-  <div :bordered="false" class="device_list">
+  <div class="device_list">
     <!-- 鏌ヨ鍖哄煙 -->
-    <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
+    <div style="background-color: #fff" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
+        <a-row :gutter="24" style="width: 100%;">
           <a-col :md="7" :sm="7">
             <a-form-item label="鏃堕棿">
               <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="4">
+          <a-col :md="5" :sm="5">
             <a-form-item label="璁惧缂栧彿">
               <a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" v-model="queryParams.equipmentId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="4" :xs="4">
+          <a-col :md="5" :sm="5" :xs="5">
             <a-form-item label="璁惧鍚嶇О">
               <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
             </a-form-item>
@@ -23,7 +23,6 @@
             <a-space>
               <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
               <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
-              <a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠$悊')" icon="download">瀵煎嚭</a-button>
             </a-space>
           </a-col>
           <!--<a-col :md="2" :sm="3" :xs="3">-->
@@ -43,16 +42,17 @@
     <div class="table-operator" style="display: inline;">
       <a-button  @click="handleAdd" type="primary" icon="plus">鏂板
       </a-button>
+      <a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠$悊')" icon="download">瀵煎嚭</a-button>
       <!--<a-button v-has="'user.add'"  @click="handleAddXIU" type="primary" icon="plus">浼戠彮鏂板-->
       <!--</a-button>-->
     </div>
 
     <!-- table鍖哄煙-begin -->
-    <div id="DeviceList">
+    <div id="DeviceList" style="flex: 1;overflow: hidden">
       <a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
-               :scroll="{x:1000}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+               :dataSource="dataSource" :pagination="ipagination" :loading="loading"
                :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-               @change="handleTableChange">
+               @change="handleTableChange" :scroll="{x:'max-content',y:scrollY}">
         <span slot="action" slot-scope="text, record">
         <a @click="handleEdit(record)">缂栬緫</a>
             <a-divider type="vertical" />
@@ -128,28 +128,45 @@
         queryParamEquip:{},
         queryParamPeople:{},
         dataStartsoucre:[],
+        scrollY:465,
+        /* 鍒嗛〉鍙傛暟 */
+        ipagination:{
+          current: 1,
+          pageSize: 30,
+          pageSizeOptions: ['30', '50', '100'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
         columns: [
           {
             title: '璁惧缂栧彿',
             align: 'center',
-            dataIndex: 'equipmentId'
+            dataIndex: 'equipmentId',
+            width:250
           },
           {
             title: '璁惧鍚嶇О',
             align: 'center',
             dataIndex: 'equipmentName',
             defaultSortOrder:'descend',
-            sorter: (a, b) => {return a.equipmentName>b.equipmentName?1:-1}
+            sorter: (a, b) => {return a.equipmentName>b.equipmentName?1:-1},
+            width:250
           },
           {
             title: '缁翠慨绫诲瀷',
             align: 'center',
-            dataIndex: 'mdcRepairTypeDictText'
+            dataIndex: 'mdcRepairTypeDictText',
+            width:250
           },
           {
             title: '寮�濮嬫椂闂�',
             align: 'center',
             dataIndex: 'startTime',
+            width:250
             // scopedSlots:{customRender:'startTime'},
             // customRender:(text,row,index) => {
             //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -158,14 +175,16 @@
           {
             title: '缁撴潫鏃堕棿',
             align: 'center',
-            dataIndex: 'endTime'
+            dataIndex: 'endTime',
+            width:250
           },
           {
             title: '鎿嶄綔',
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
-            width: 150
+            width: 150,
+            fixed:'right'
           }
         ],
         url: {
@@ -559,9 +578,25 @@
           exclude_inputs: true
         });
       },
+
+      /**
+       * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+       */
+      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 - 50
+      }
     },
     created() {
       this.queryParam.typeTree = "1"
+    },
+    mounted(){
+      window.addEventListener('resize',this.handleWindowResize)
+      this.handleWindowResize()
+    },
+    beforeDestroy(){
+      window.removeEventListener('resize',this.handleWindowResize)
     }
   }
 </script>
@@ -569,34 +604,35 @@
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 
+  .device_list{
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+  }
+
   @media screen and (min-width: 1920px){
     .device_list{
       height: 811px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1680px) and (max-width: 1920px){
     .device_list{
       height: 811px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1400px) and (max-width: 1680px){
     .device_list{
       height: 663px!important;
-      overflow: scroll;
     }
   }
   @media screen and (min-width: 1280px) and (max-width: 1400px){
     .device_list{
       height: 564px!important;
-      overflow: scroll;
     }
   }
   @media screen and (max-width: 1280px){
     .device_list{
       height: 564px!important;
-      overflow: scroll;
     }
   }
 </style>

--
Gitblit v1.9.3