From 1e3b60eaaa885c2e9f6ec64e92c50c1c66f6b3c7 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 22 Apr 2025 08:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81?=
=?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/styles/vxeTable.scss | 38 ++-
src/views/govern/device/control/index.vue | 2 +-
.../govern/device/control/tabs/trend.vue | 4 +-
src/views/govern/manage/factory.vue | 323 ++++++++++++------
4 files changed, 260 insertions(+), 107 deletions(-)
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index 27f73f7..36c6917 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -43,7 +43,8 @@
.vxe-table--render-default .is--checked.vxe-cell--checkbox,
.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,
.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
-.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon {
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
color: var(--el-color-primary-light-3);
}
@@ -51,12 +52,33 @@
.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,
.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,
.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon {
- color: var(--el-color-primary-light-8);
+.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
+ color: var(--el-color-primary-light-5);
}
-.vxe-table--render-default .vxe-cell--radio.is--checked,
-.vxe-table--render-default .vxe-cell--radio.is--checked .vxe-radio--icon,
-.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon,
-.vxe-button.type--text:not(.is--disabled):hover {
- color: var(--el-color-primary);
+
+// .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
+// color: #fff0;
+// }
+.vxe-table--tooltip-wrapper {
+ z-index: 10000 !important;
+}
+.is--disabled {
+ background-color: var(--vxe-input-disabled-color);
+}
+
+.vxe-modal--wrapper {
+ z-index: 5000 !important;
+}
+.vxe-table--body .vxe-body--row:nth-child(even) {
+ background-color: #f9f9f9;
+ // background-color: var(--el-color-primary-light-9);
+}
+
+.vxe-table--body .vxe-body--row:nth-child(odd) {
+ background-color: #ffffff;
}
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index e577ecb..6d70b19 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -1066,7 +1066,7 @@ const handleClick = async (tab?: any) => {
setTimeout(() => {
trendRef.value && trendRef.value.getTrendRequest(obj)
tableLoading.value = false
- }, 1500)
+ }, 0)
}
//查询实时数据
if (dataSet.value.includes('_realtimedata')) {
diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index df49ccd..ce77811 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -166,7 +166,9 @@ queryByCode(props?.TrendList?.lineType == 0 ? 'apf-harmonic' : 'portable-harmoni
}
})
})
+ init()
})
+
})
const activeName: any = ref()
const deviceData: any = ref([])
@@ -184,7 +186,7 @@ const range = (start: any, end: any, step: any) => {
const trendRequestData = ref()
const getTrendRequest = (val: any) => {
trendRequestData.value = val
- init()
+ // init()
}
//初始化趋势图
const headerRef = ref()
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index f1dc43d..ec29a1c 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -4,21 +4,41 @@