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/DeviceParamThresholdManagement.vue |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/mdc/base/DeviceParamThresholdManagement.vue b/src/views/mdc/base/DeviceParamThresholdManagement.vue
index c049b5e..d2f43f5 100644
--- a/src/views/mdc/base/DeviceParamThresholdManagement.vue
+++ b/src/views/mdc/base/DeviceParamThresholdManagement.vue
@@ -67,6 +67,7 @@
         bordered
         size="middle"
         rowKey="id"
+        :scroll="{x:'max-content',y:600}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -116,6 +117,18 @@
         name: 'DeviceParamThresholdManagement',
         description: '杩欐槸璁惧鍙傛暟闃堝�肩鐞嗛〉闈�',
         queryParam: {},
+        /* 鍒嗛〉鍙傛暟 */
+        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: '#',
@@ -131,32 +144,32 @@
             title: '涓枃鍚�',
             align: 'center',
             dataIndex: 'chineseName',
-            width: 120
+            width: 350
             // sorter: true
           },
           {
             title: '鑻辨枃鍚�',
             align: 'center',
-            width: 150,
+            width: 350,
             dataIndex: 'englishName'
           },
           {
             title: '椹卞姩绫诲瀷',
             align: 'center',
-            width: 180,
+            width: 350,
             dataIndex: 'controlSystemType'
           },
           {
             title: '闃堝�间笂闄�',
             align: 'center',
-            width: 120,
+            width: 270,
             dataIndex: 'maxThreshold'
             // scopedSlots: {customRender: "avatarslot"}
           },
           {
             title: '闃堝�间笅闄�',
             align: 'center',
-            width: 80,
+            width: 270,
             dataIndex: 'minThreshold'
             // sorter: true
           },
@@ -165,7 +178,8 @@
             dataIndex: 'action',
             scopedSlots: { customRender: 'action' },
             align: 'center',
-            width: 120
+            fixed: 'right',
+            width: 150
           }
         ],
         driveTypeList: [],
@@ -191,6 +205,9 @@
       handleAdd: function() {
         this.$refs.modalForm.add()
         this.$refs.modalForm.title = '鏂板'
+
+        // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶
+        this.$refs.modalForm.removeValidate()
       },
 
       handleMenuClick(e) {

--
Gitblit v1.9.3