From 24e65b1e9c6aa65f7784ff5b4cb3a47d6d73af89 Mon Sep 17 00:00:00 2001
From: letsgocoding <sdxt_0802@163.com>
Date: 星期三, 12 三月 2025 17:39:14 +0800
Subject: [PATCH] !108 !107 网关标识 Merge pull request !108 from letsgocoding/develop1.0
---
zhitan-vue/src/views/powerquality/power/index.vue | 29 -------
zhitan-vue/src/assets/styles/sidebar.scss | 12 ++-
zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue | 30 -------
zhitan-vue/src/layout/components/TagsView/index.vue | 16 ++--
zhitan-vue/src/views/poweranalysis/perPassu/index.vue | 2
zhitan-vue/src/views/powerquality/load/index.vue | 12 ++
zhitan-vue/src/views/deepanalysis/deepAnalysis.vue | 8 +-
zhitan-vue/src/components/Echarts/LineChart.vue | 2
zhitan-vue/src/views/poweranalysis/pariPassu/index.vue | 2
zhitan-vue/src/components/BaseCard/BaseCard.vue | 35 +++++---
zhitan-vue/src/views/index.vue | 2
zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue | 12 +-
zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue | 29 -------
zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue | 11 ++
zhitan-vue/src/components/BaseCard/index.vue | 5
zhitan-vue/src/views/modelconfiguration/collectindicator/collectIndicator.vue | 8 +
16 files changed, 77 insertions(+), 138 deletions(-)
diff --git a/zhitan-vue/src/assets/styles/sidebar.scss b/zhitan-vue/src/assets/styles/sidebar.scss
index c5a8670..4cdd9cf 100644
--- a/zhitan-vue/src/assets/styles/sidebar.scss
+++ b/zhitan-vue/src/assets/styles/sidebar.scss
@@ -78,6 +78,7 @@
.svg-icon {
margin-right: 16px;
+ font-size: 14px;
}
.el-menu {
@@ -124,12 +125,13 @@
.sub-menu-title-noDropdown,
.el-sub-menu__title {
&:hover {
- background-color: rgba(0, 0, 0, 0.06) !important;
+ background-color: rgba(0, 0, 0, 0.2) !important;
}
}
& .theme-dark .is-active > .el-sub-menu__title {
color: $base-menu-color-active !important;
+ background-color: rgba(0, 0, 0, 0.2) !important;
}
& .nest-menu .el-sub-menu > .el-sub-menu__title,
@@ -360,7 +362,7 @@
.svg-icon {
margin-right: 16px;
- font-size: 16px;
+ font-size: 14px;
color: #C3C3C3;
}
@@ -412,8 +414,10 @@
}
}
- & .theme-dark .is-active > .el-sub-menu__title {
- // color: $base-menu-color-active !important;
+
+ & .theme-light .is-active > .el-sub-menu__title {
+ color: $--color-primary !important;
+ // background-color: #eaeff8 !important;
}
& .nest-menu .el-sub-menu > .el-sub-menu__title,
diff --git a/zhitan-vue/src/components/BaseCard/BaseCard.vue b/zhitan-vue/src/components/BaseCard/BaseCard.vue
index f0bc7f3..f5b431e 100644
--- a/zhitan-vue/src/components/BaseCard/BaseCard.vue
+++ b/zhitan-vue/src/components/BaseCard/BaseCard.vue
@@ -5,8 +5,13 @@
</div>
<div class="mycard-content">
<div class="data-box" v-if="props.tabArray.length > 0">
- <div v-for="(item, i) in props.tabArray" :key="i" class="li-box" :class="isActive == item.value ? 'is-li' : ''"
- @click="changeActive(item.value)">
+ <div
+ v-for="(item, i) in props.tabArray"
+ :key="i"
+ class="li-box"
+ :class="isActive == item.value ? 'is-li' : ''"
+ @click="changeActive(item.value)"
+ >
{{ item.label }}
</div>
</div>
@@ -16,7 +21,7 @@
</template>
<script setup>
-const emit = defineEmits();
+const emit = defineEmits()
const props = defineProps({
title: {
type: String,
@@ -30,16 +35,16 @@
type: Array,
default: () => [],
},
-});
+})
const data = reactive({
isActive: "DAY",
-});
-const { isActive } = toRefs(data);
-changeActive(isActive.value);
+})
+const { isActive } = toRefs(data)
+changeActive(isActive.value)
function changeActive(value) {
- isActive.value = value;
- emit("changeActive", isActive.value);
+ isActive.value = value
+ emit("changeActive", isActive.value)
}
</script>
@@ -55,19 +60,19 @@
align-items: center;
height: 3.7037vh; //40
padding-left: 2.1354vw; //41px;
- background: url('../../assets/images/basecard/title_bg.png') no-repeat;
+ background: url("../../assets/images/basecard/title_bg.png") no-repeat;
background-size: auto 100%;
.name {
font-family: YouSheBiaoTiHei;
- font-size: 1.2500vw; //24px;
+ font-size: 1.25vw; //24px;
color: #fff;
}
}
.mycard-content {
border: 1px solid;
- border-image: linear-gradient(0deg, #0A3C86, #000) 1;
+ border-image: linear-gradient(0deg, #0a3c86, #000) 1;
background: linear-gradient(0deg, rgba(18, 111, 216, 0.2) 0%, rgba(18, 111, 216, 0) 100%);
position: relative;
@@ -82,7 +87,7 @@
z-index: 1;
.li-box {
- border: 1px solid #2E86EA;
+ border: 1px solid #2e86ea;
cursor: pointer;
text-align: center;
padding: 0.3704vh 0.3125vw;
@@ -90,8 +95,8 @@
}
.is-li {
- background: #2E86EA;
- border: 1px solid #2E86EA;
+ background: #2e86ea;
+ border: 1px solid #2e86ea;
}
}
}
diff --git a/zhitan-vue/src/components/BaseCard/index.vue b/zhitan-vue/src/components/BaseCard/index.vue
index 398a771..f434aeb 100644
--- a/zhitan-vue/src/components/BaseCard/index.vue
+++ b/zhitan-vue/src/components/BaseCard/index.vue
@@ -8,8 +8,7 @@
</template>
<script setup>
-defineProps(['title'])
-
+defineProps(["title"])
</script>
<style lang="scss" scoped>
@@ -20,7 +19,7 @@
border-radius: 10px 10px 10px 10px;
border: 1px solid #22408c;
padding-bottom: 10px;
-
+
.mycard-title {
display: flex;
justify-content: flex-start;
diff --git a/zhitan-vue/src/components/Echarts/LineChart.vue b/zhitan-vue/src/components/Echarts/LineChart.vue
index c4c0de6..ef9af8b 100644
--- a/zhitan-vue/src/components/Echarts/LineChart.vue
+++ b/zhitan-vue/src/components/Echarts/LineChart.vue
@@ -59,7 +59,7 @@
name: item.name,
type: props.chartType, // 鏍规嵁浼犲叆绫诲瀷娓叉煋
data: item.data,
- barWidth: "16",
+ barWidth: props.chartData.barWidth || "16",
itemStyle: {
borderRadius: [15, 15, 0, 0],
},
diff --git a/zhitan-vue/src/layout/components/TagsView/index.vue b/zhitan-vue/src/layout/components/TagsView/index.vue
index 926a7b1..2041c96 100644
--- a/zhitan-vue/src/layout/components/TagsView/index.vue
+++ b/zhitan-vue/src/layout/components/TagsView/index.vue
@@ -234,7 +234,7 @@
<style lang="scss" scoped>
.themeDark {
.tags-view-container {
- height: 56px;
+ height: 52px;
width: 100%;
background: #1a235d;
// border-bottom: 1px solid #d8dce5;
@@ -244,12 +244,12 @@
display: inline-block;
position: relative;
cursor: pointer;
- height: 36px;
- line-height: 36px;
+ height: 32px;
+ line-height: 30px;
border: 1px solid #5278f5;
color: #fff;
// background: #3271eb;
- padding: 0 14px;
+ padding: 0 12px;
font-size: 14px;
margin-left: 6px;
margin-top: 10px;
@@ -304,7 +304,7 @@
.themeLight {
.tags-view-container {
- height: 56px;
+ height: 52px;
width: 100%;
background: #fff;
// border-bottom: 1px solid #d8dce5;
@@ -314,12 +314,12 @@
display: inline-block;
position: relative;
cursor: pointer;
- height: 36px;
- line-height: 36px;
+ height: 32px;
+ line-height: 30px;
border: 1px solid #d8dce5;
color: #495060;
background: #fff;
- padding: 0 14px;
+ padding: 0 12px;
font-size: 14px;
margin-left: 6px;
margin-top: 10px;
diff --git a/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue b/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
index c04cb0b..bb5525d 100644
--- a/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
+++ b/zhitan-vue/src/views/costAnalysis/cost-trend-analysis.vue
@@ -85,6 +85,7 @@
:chartData="{
title: item.accumulationLabel,
chartType: 'bar',
+ barWidth: '10',
xAxis: item.accumulationKeyList,
series: [
{
@@ -275,34 +276,5 @@
width: 100%;
margin-top: 12px;
padding-bottom: 24px;
-}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
}
</style>
diff --git a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
index 1c82358..99b33ce 100644
--- a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
+++ b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
@@ -263,33 +263,4 @@
width: 100%;
height: 100% !important;
}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
-}
</style>
diff --git a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
index 2686774..d471ba5 100644
--- a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
+++ b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
@@ -44,10 +44,10 @@
</el-form>
</div>
<div class="display-buttons">
- <div class="display-btn" @click="activeKey = 1" :class="{ 'active-display-btn': activeKey === 1 }">
+ <div class="display-btn" @click="switchBtnType(1)" :class="{ 'active-display-btn': activeKey === 1 }">
鍥惧舰
</div>
- <div class="display-btn" @click="activeKey = 2" :class="{ 'active-display-btn': activeKey === 2 }">
+ <div class="display-btn" @click="switchBtnType(2)" :class="{ 'active-display-btn': activeKey === 2 }">
鏁版嵁
</div>
</div>
@@ -132,6 +132,13 @@
queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:00:00")
getElectricityMeter({ modelId: queryParams.value.nodeId })
}
+
+function switchBtnType(e) {
+ activeKey.value = e
+ if (e === 1) {
+ getList()
+ }
+}
const LineChartRef = ref()
function getList() {
loading.value = true
diff --git a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
index c4b13c4..13b56e8 100644
--- a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
+++ b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
@@ -297,11 +297,11 @@
.card-list {
display: flex;
justify-content: space-between;
- padding: 18px;
+ padding-top: 12px;
.card-list-item {
width: 24%;
- height: 167px;
+ height: 160px;
background: #223386;
border-radius: 5px 5px 5px 5px;
border: 1px solid #4868b7;
@@ -364,11 +364,11 @@
.card-list {
display: flex;
justify-content: space-between;
- padding: 18px;
+ padding-top: 12px;
.card-list-item {
width: 24%;
- height: 167px;
+ height: 160px;
background: #fff;
border-radius: 5px 5px 5px 5px;
border: 1px solid #e8e8e8;
diff --git a/zhitan-vue/src/views/index.vue b/zhitan-vue/src/views/index.vue
index 168b68f..84f2c80 100644
--- a/zhitan-vue/src/views/index.vue
+++ b/zhitan-vue/src/views/index.vue
@@ -495,7 +495,7 @@
},
grid: {
top: "45",
- left: "7%",
+ left: "2%",
right: "5%",
bottom: "10",
containLabel: true,
diff --git a/zhitan-vue/src/views/modelconfiguration/collectindicator/collectIndicator.vue b/zhitan-vue/src/views/modelconfiguration/collectindicator/collectIndicator.vue
index 38c0dc4..6b9fab2 100644
--- a/zhitan-vue/src/views/modelconfiguration/collectindicator/collectIndicator.vue
+++ b/zhitan-vue/src/views/modelconfiguration/collectindicator/collectIndicator.vue
@@ -14,11 +14,11 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
<el-form-item style="float: right">
- <el-button type="primary" icon="plus" @click="handleAdd">鏂板</el-button>
+ <el-button type="primary" icon="plus" @click="handleDialog('add')">鏂板</el-button>
</el-form-item>
</el-form>
</div>
@@ -39,6 +39,7 @@
<dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
</template>
</el-table-column>
+ <el-table-column prop="gatewayKey" label="缃戝叧鏍囪瘑" align="center" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" width="180" align="center" show-overflow-tooltip>
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleEdit(scope.row.id)"> 淇敼 </el-button>
@@ -74,6 +75,9 @@
<el-option v-for="dict in sys_device_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
+ <el-form-item label="缃戝叧鏍囪瘑" prop="gatewayKey">
+ <el-input v-model="form.gatewayKey" placeholder="璇疯緭鍏ョ綉鍏虫爣璇�" clearable />
+ </el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
diff --git a/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue b/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
index 7b72456..a1221a9 100644
--- a/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/pariPassu/index.vue
@@ -228,7 +228,7 @@
color: ["#2979ff", "#19be6b", "#ff9900", "#fa3534"],
grid: {
top: "45",
- left: "7%",
+ left: "4%",
right: "5%",
bottom: "10",
containLabel: true,
diff --git a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
index 5e601e6..b37d75a 100644
--- a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
@@ -227,7 +227,7 @@
color: ["#2979ff", "#19be6b", "#ff9900", "#fa3534"],
grid: {
top: "45",
- left: "7%",
+ left: "4%",
right: "5%",
bottom: "10",
containLabel: true,
diff --git a/zhitan-vue/src/views/powerquality/load/index.vue b/zhitan-vue/src/views/powerquality/load/index.vue
index a386abe..108cbf6 100644
--- a/zhitan-vue/src/views/powerquality/load/index.vue
+++ b/zhitan-vue/src/views/powerquality/load/index.vue
@@ -57,10 +57,10 @@
</el-form>
</div>
<div class="display-buttons">
- <div class="display-btn" @click="activeKey = 1" :class="{ 'active-display-btn': activeKey === 1 }">
+ <div class="display-btn" @click="switchBtnType(1)" :class="{ 'active-display-btn': activeKey === 1 }">
鍥惧舰
</div>
- <div class="display-btn" @click="activeKey = 2" :class="{ 'active-display-btn': activeKey === 2 }">
+ <div class="display-btn" @click="switchBtnType(2)" :class="{ 'active-display-btn': activeKey === 2 }">
鏁版嵁
</div>
</div>
@@ -168,6 +168,14 @@
queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
getElectricityMeter({ nodeId: queryParams.value.nodeId })
}
+
+function switchBtnType(e) {
+ activeKey.value = e
+ if (e === 1) {
+ getList()
+ }
+}
+
const LineChartRef = ref()
function getList() {
loading.value = true
diff --git a/zhitan-vue/src/views/powerquality/power/index.vue b/zhitan-vue/src/views/powerquality/power/index.vue
index 37d5bba..b4d22d7 100644
--- a/zhitan-vue/src/views/powerquality/power/index.vue
+++ b/zhitan-vue/src/views/powerquality/power/index.vue
@@ -299,33 +299,4 @@
width: 100%;
height: 100% !important;
}
-.display-buttons {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 16px;
- margin-right: 16px;
- .display-btn,
- .active-display-btn {
- width: 78px;
- height: 34px;
- background: #fff;
- color: #409eff;
- border: 2px solid #409eff;
- border-radius: 4px;
- margin-left: 10px;
- text-align: center;
- line-height: 31px;
- font-size: 14px;
- font-weight: 400;
- cursor: pointer;
- &:hover {
- opacity: 0.9;
- }
- }
- .active-display-btn {
- background: #409eff;
- color: #fff;
- }
-}
</style>
diff --git a/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue b/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
index 23b7d46..36a9aa2 100644
--- a/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
+++ b/zhitan-vue/src/views/realtimemonitor/realtimemonitor/realtimemonitor.vue
@@ -231,7 +231,6 @@
padding: 0 10px;
.title {
- font-size: 14px;
color: rgba(255, 255, 255, 0.8);
font-family: OPPOSans, OPPOSans;
font-weight: 500;
@@ -327,9 +326,9 @@
}
&-li {
- width: 240px;
- margin-right: 10px;
- margin-top: 16px;
+ width: 18%;
+ min-width: 190px;
+ margin: 1%;
border-radius: 5px;
border: 1px solid #ebebeb;
margin-bottom: 5px;
@@ -339,7 +338,6 @@
padding: 0 10px;
.title {
- font-size: 14px;
color: #676767;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
@@ -351,11 +349,10 @@
}
.num {
- font-size: 22px;
+ font-size: 24px;
color: #3271eb;
font-family: OPPOSans, OPPOSans;
font-weight: 800;
- font-size: 32px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -368,6 +365,7 @@
text-align: left;
font-style: normal;
text-transform: none;
+ font-size: 14px;
}
}
--
Gitblit v1.9.3