From 5330eb812cdcc02cace0648b008092b24c6e2236 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 17:44:50 +0800
Subject: [PATCH] 1、利用率走势分析和利用率分段分析页面优化表格数据加载方式，实现滚动条触底加载，解决数据量较大时网页请求速度慢问题 2、报警分析页面调整图表样式，更换表格组件为ant-design表格 3、登录页面登录后若用户密码为初始密码或密码已过期则出现修改密码弹窗
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 7331180..a68adbb 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -17,31 +17,31 @@
/>
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="鐝埗">
- <a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"
- @change="initShiftSubList" :allowClear="allowClear">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="鐝">
- <a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"
- :allowClear="allowClearSu">
- <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
+ <!--<a-col :md="5" :sm="5" :xs="5">-->
+ <!--<a-form-item label="鐝埗">-->
+ <!--<a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"-->
+ <!--@change="initShiftSubList" :allowClear="allowClear">-->
+ <!--<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">-->
+ <!--{{ em.label }}-->
+ <!--</a-select-option>-->
+ <!--</a-select>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col :md="5" :sm="5" :xs="5">-->
+ <!--<a-form-item label="鐝">-->
+ <!--<a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"-->
+ <!--:allowClear="allowClearSu">-->
+ <!--<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">-->
+ <!--{{ em.label }}-->
+ <!--</a-select-option>-->
+ <!--</a-select>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
<a-col :md="8" :sm="8" :xs="8">
<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="searchReset" icon="reload">閲嶇疆</a-button>-->
<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-space>
</a-col>
@@ -54,8 +54,7 @@
<div class="container" id="EfficiencyShift" style="margin-top: 20px;">
<div class="table2">
<a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
- :scroll="{ x: 1500, y: false }">
-
+ :scroll="{ x: 3000, y: false }">
</a-table>
</div>
</div>
@@ -117,22 +116,22 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- },
- fixed: 'left'
+ }
+ // fixed: 'left'
},
{
title: '璁惧缁熶竴缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
- width: 120,
- fixed: 'left'
+ width: 120
+ // fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
width: 150,
- dataIndex: 'equipmentName',
- fixed: 'left'
+ dataIndex: 'equipmentName'
+ // fixed: 'left'
},
{
title: '璁惧鍨嬪彿',
--
Gitblit v1.9.3