From 5a9630b08ae608e2248c44271d8c08e140a4487b Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 26 九月 2024 15:55:13 +0800 Subject: [PATCH] update --- src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue index 44422dc..3d09bf0 100644 --- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue +++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue @@ -77,22 +77,22 @@ </a-row> <a-row :gutter="24" v-if="toggleSearchStatus"> - <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绉嶇被"> - <a-select - :value="queryParams.deviceCategory" - mode="multiple" - placeholder="璇烽�夋嫨璁惧绉嶇被" - allow-clear - :maxTagCount="1" - @change="selectChange($event,'deviceCategory')" - > - <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index"> - {{item.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--> +<!-- :value="queryParams.deviceCategory"--> +<!-- mode="multiple"--> +<!-- placeholder="璇烽�夋嫨璁惧绉嶇被"--> +<!-- allow-clear--> +<!-- :maxTagCount="1"--> +<!-- @change="selectChange($event,'deviceCategory')"--> +<!-- >--> +<!-- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">--> +<!-- {{item.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 @@ -177,6 +177,8 @@ </th> <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷 </th> + <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧鍨嬪彿 + </th> <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝</th> <template v-for="(tableHead, index) in tableHeads"> <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th> @@ -219,6 +221,7 @@ {{item.equipmentName}} </td> <td class="tdgu5 kaitou">{{item.equipmentType}}</td> + <td class="tdgu5 kaitou">{{item.equipmentModel}}</td> <td class="tdgu6 kaitou">{{item.shiftSubName}}</td> </template> -- Gitblit v1.9.3