From c9de65589937fd38870bdff9fc65377c12425411 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Tue, 13 Sep 2022 15:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=8F=E7=9B=AE=20=E6=94=B6=E7=BC=A9=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/profileV2/AlarmManage/index.vue | 26 +- .../profileV2/DeviceManage/EDeviceTable.vue | 14 +- src/views/iot/project/profileV2/ENavMenu.vue | 186 ------------ .../iot/project/profileV2/ENavMenu/index.vue | 280 ++++++++++++++++++ .../profileV2/EnergyManage/EEnergyLoad.vue | 17 ++ .../SafetyTemplate/ELeakageCurrent.vue | 11 +- .../profileV2/SafetyTemplate/index.vue | 9 + src/views/iot/project/profileV2/details.vue | 10 +- 8 files changed, 359 insertions(+), 194 deletions(-) delete mode 100644 src/views/iot/project/profileV2/ENavMenu.vue create mode 100644 src/views/iot/project/profileV2/ENavMenu/index.vue diff --git a/src/views/iot/project/profileV2/AlarmManage/index.vue b/src/views/iot/project/profileV2/AlarmManage/index.vue index 4e9dd8ac..80284dfa 100644 --- a/src/views/iot/project/profileV2/AlarmManage/index.vue +++ b/src/views/iot/project/profileV2/AlarmManage/index.vue @@ -214,7 +214,19 @@ export default { tempType: { type: String, require: true - } + }, + isFoldRight: { + type: Boolean, + default: () => { + return false + } + }, + isShrink: { + type: Boolean, + default: () => { + return false + } + }, }, data() { return { @@ -277,6 +289,12 @@ export default { }; }, watch: { + isFoldRight() { + this.updateEcharts() + }, + isShrink() { + this.updateEcharts() + }, sourceId(val) { if (val !== undefined && val !== null) { this.handleQuery() @@ -287,6 +305,11 @@ export default { this.init(); }, methods: { + updateEcharts() { + if (this.$refs.echartsLineTrend) { + this.$refs.echartsLineTrend.updateEchart() + } + }, handleQuery() { this.pageParams.pageNum = 1; this.time = @@ -325,6 +348,7 @@ export default { ); this.resultOption.xAxis[0].data = result["xAxisData"]; this.resultOption.series[0].data = result["seriesData"]; + this.updateEcharts(); this.$forceUpdate(); }); }, diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue index cbf6c05a..65174f4e 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue @@ -114,10 +114,10 @@ 查看线路列表 - 修改服务指向 - 设备巡检记录 - 设备参数调整 - 内置定时配置 + + 设备参数调整 + @@ -461,6 +461,12 @@ export default { } ); }, + /** + * 跳转 设备 详情 + */ + handleLinkToDeviceDetails(row) { + this.$router.push({ path:'/device/device', query: { 'deviceId': row.deviceId, 'tempType': 'details' } }) + } }, destroyed() { this.closeSocket(); diff --git a/src/views/iot/project/profileV2/ENavMenu.vue b/src/views/iot/project/profileV2/ENavMenu.vue deleted file mode 100644 index fa9d7777..00000000 --- a/src/views/iot/project/profileV2/ENavMenu.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - diff --git a/src/views/iot/project/profileV2/ENavMenu/index.vue b/src/views/iot/project/profileV2/ENavMenu/index.vue new file mode 100644 index 00000000..fc9f17bb --- /dev/null +++ b/src/views/iot/project/profileV2/ENavMenu/index.vue @@ -0,0 +1,280 @@ + + + diff --git a/src/views/iot/project/profileV2/EnergyManage/EEnergyLoad.vue b/src/views/iot/project/profileV2/EnergyManage/EEnergyLoad.vue index 18f7a533..2c3b79af 100644 --- a/src/views/iot/project/profileV2/EnergyManage/EEnergyLoad.vue +++ b/src/views/iot/project/profileV2/EnergyManage/EEnergyLoad.vue @@ -77,6 +77,12 @@ export default { default: () => { return false } + }, + isShrink: { + type: Boolean, + default: () => { + return false + } } }, components: { @@ -274,6 +280,17 @@ export default { this.init(); } }, + isShrink() { + if(this.$refs.echartsLineTwoYearsLoad) { + this.$refs.echartsLineTwoYearsLoad.updateEchart() + } + if (this.$refs.echartsLineTwoWeeksLoad) { + this.$refs.echartsLineTwoWeeksLoad.updateEchart(); + } + if (this.$refs.echartsLineTwoDaysLoad) { + this.$refs.echartsLineTwoDaysLoad.updateEchart(); + } + }, isFoldRight() { if(this.$refs.echartsLineTwoYearsLoad) { this.$refs.echartsLineTwoYearsLoad.updateEchart() diff --git a/src/views/iot/project/profileV2/SafetyTemplate/ELeakageCurrent.vue b/src/views/iot/project/profileV2/SafetyTemplate/ELeakageCurrent.vue index 53e84063..334112c7 100644 --- a/src/views/iot/project/profileV2/SafetyTemplate/ELeakageCurrent.vue +++ b/src/views/iot/project/profileV2/SafetyTemplate/ELeakageCurrent.vue @@ -200,7 +200,13 @@ export default { default: () => { return false } - } + }, + isShrink: { + type: Boolean, + default: () => { + return false + } + }, }, components: { EEchartsLine, @@ -319,6 +325,9 @@ export default { isFoldRight() { this.updateEcharts() }, + isShrink() { + this.updateEcharts() + }, sourceId(val) { if (val !== null && val !== undefined) { this.init(); diff --git a/src/views/iot/project/profileV2/SafetyTemplate/index.vue b/src/views/iot/project/profileV2/SafetyTemplate/index.vue index 0f927364..9f785893 100644 --- a/src/views/iot/project/profileV2/SafetyTemplate/index.vue +++ b/src/views/iot/project/profileV2/SafetyTemplate/index.vue @@ -194,6 +194,12 @@ export default { default: () => { return false } + }, + isShrink: { + type: Boolean, + default: () => { + return false + } } }, components: { EEchartsLine }, @@ -280,6 +286,9 @@ export default { isFoldRight() { this.updateEcharts() }, + isShrink() { + this.updateEcharts() + }, sourceId(val) { if (val !== null && val !== undefined) { this.handleQuery(); diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue index b0856fe4..e1d4598e 100644 --- a/src/views/iot/project/profileV2/details.vue +++ b/src/views/iot/project/profileV2/details.vue @@ -73,6 +73,9 @@ -
+
@@ -131,7 +135,7 @@ import ECensusCards from "./ECensusCards"; import ElDescriptions from "@/components/Edescriptions"; import ElDescriptionsItem from "@/components/Edescriptions/src/descriptions-item"; import ESimpleCard from "@/components/Cards/index"; -import ENavMenu from "./ENavMenu"; +import ENavMenu from "./ENavMenu/index"; import EProjectManage from "./EProjectManage"; import ETodayRatio from "./ETodayRatio"; import ETypeCensus from "./ETypeCensus"; @@ -180,6 +184,7 @@ export default { resultInfo: {}, activeName: "EObjectContainer", activeType: "EObjectContainer", + isShrink: false, activeList: [ { label: "项目信息", @@ -585,6 +590,7 @@ export default { padding: 15px; width: calc(100% - 150px); height: 100%; + width: 100%; } } }