From f360cde8ff0b28ba677a4693cf45f47f206dd746 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 21 五月 2025 17:52:54 +0800
Subject: [PATCH] 1、设备管理中设备属性的字段显隐权限调整到设备状态字段 2、设备日志添加批量导出功能
---
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 47 ++++++++++-------------------------------------
1 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index a5ab8df..2a7cd3f 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -38,42 +38,15 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="6" :sm="6">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
v-model="dates" :allowClear="false"/>
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_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-col :md="6" :sm="6">
+ <a-form-item label="璁惧灞炴��">
+ <j-dict-select-tag v-model="queryParam.attribute" dictCode="equipment_attribute"/>
</a-form-item>
</a-col>
</a-row>
@@ -123,11 +96,11 @@
</th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
- <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
+ <th class="thgu dong4 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧缂栧彿
</th>
<th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
</th>
- <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
+ <th class="thgu dong6 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧绫诲瀷
</th>
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -659,13 +632,13 @@
.table tbody tr .tdgu4 {
position: sticky;
- left: 250px;
+ left: 300px;
z-index: 2;
}
.table tbody tr .tdgu5 {
position: sticky;
- left: 412px;
+ left: 462px;
z-index: 2;
}
@@ -708,12 +681,12 @@
.table2 thead .equipname .dong5 {
z-index: 5;
- left: 250px;
+ left: 300px;
}
.table2 thead .equipname .dong6 {
z-index: 5;
- left: 412px;
+ left: 462px;
}
#Efficiency {
--
Gitblit v1.9.3