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/efficiencyReport/EfficiencyList.vue | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index cc8458f..f7227f6 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -6,7 +6,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="5" :sm="5">
+ <a-col :md="4" :sm="4">
<a-form-item label="璁惧绫诲瀷">
<a-select placeholder="璇烽�夋嫨璁惧绫诲瀷" :triggerChange="true" v-model="queryParam.equipmentType"
:allowClear="true">
@@ -16,7 +16,7 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5">
+ <a-col :md="4" :sm="4">
<a-form-item label="椹卞姩绫诲瀷">
<a-auto-complete
v-model="queryParam.driveType"
@@ -32,16 +32,37 @@
v-model="dates" :allowClear="false"/>
</a-form-item>
</a-col>
- <a-col :md="8" :sm="8"
- style="display: flex;align-items: flex-start;-webkit-align-items: flex-start;justify-content: space-between;">
- <!--<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="exportExcel" icon="download">瀵煎嚭</a-button>-->
- <!--<a-button type="primary" icon="printer" v-print="'#Efficiency'" v-has="'efficiency:print'">鎵撳嵃-->
- <!--</a-button>-->
- <!--</a-space>-->
- <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;margin-left: 24px">
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="璁惧绾у埆">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="璁惧绉嶇被">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category"
+ v-model="queryParam.deviceCategory"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24" type="flex" align="middle">
+ <a-col :md="24" :sm="24" :xs="24"
+ style="display: flex;justify-content: space-between;align-items: flex-start">
+ <div>
+ <a-space style="margin-right: 20px">
+ <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="exportExcel" icon="download">瀵煎嚭</a-button>
+ <a-button type="primary" icon="printer" v-print="'#Efficiency'"
+ v-has="'efficiency:print'">鎵撳嵃
+ </a-button>
+ </a-space>
+ <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+ @change="efficiencyOptionsOnChange"/>
+ </div>
+ <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
<td v-for="(item, index) in identifying">{{item.title}}</td>
</tr>
@@ -49,26 +70,22 @@
<td style="text-align:center;" v-for="(item, index) in identifying">
<div class="identifyingclass" :style="{background: item.color}"></div>
</td>
- <!--<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #e8ff37;display:inline-block"></div></td>-->
- <!--<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #99ff4e;display:inline-block"></div></td>-->
</tr>
</table>
</a-col>
- </a-row>
- <a-row :gutter="24" type="flex" align="middle">
- <a-col :md="6" :sm="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="exportExcel" icon="download">瀵煎嚭</a-button>
- <a-button type="primary" icon="printer" v-print="'#Efficiency'" v-has="'efficiency:print'">鎵撳嵃
- </a-button>
- </a-space>
- </a-col>
- <a-col :md="18" :sm="18">
- <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
- @change="efficiencyOptionsOnChange"/>
- </a-col>
+ <!--<a-col :md="6" :sm="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="exportExcel" icon="download">瀵煎嚭</a-button>-->
+ <!--<a-button type="primary" icon="printer" v-print="'#Efficiency'" v-has="'efficiency:print'">鎵撳嵃-->
+ <!--</a-button>-->
+ <!--</a-space>-->
+ <!--</a-col>-->
+ <!--<a-col :md="18" :sm="18">-->
+ <!--<a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"-->
+ <!--@change="efficiencyOptionsOnChange"/>-->
+ <!--</a-col>-->
</a-row>
</a-form>
</div>
--
Gitblit v1.9.3