From 90c27d2bc1d02ea60c5cfae334e1a0ecc16e4b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Wed, 20 May 2026 14:54:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=93=81=E6=8E=A8=E7=A7=BB?=
=?UTF-8?q?=E5=9B=BE=E6=8A=98=E7=8E=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/quality/report/cpTranChart/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/quality/report/cpTranChart/index.vue b/src/views/quality/report/cpTranChart/index.vue
index ff4472e..886a93f 100644
--- a/src/views/quality/report/cpTranChart/index.vue
+++ b/src/views/quality/report/cpTranChart/index.vue
@@ -187,7 +187,7 @@ export default {
// 从响应数据中提取X轴和Y轴数据
const xAxisData = this.defectList.map(item => item.dataType);
- const yAxisData = this.defectList.map(item => parseFloat(item.dataTitle13.replace('%', '')));
+ const yAxisData = this.defectList.map(item => parseFloat(item.dataTitle19.replace('%', '')));
var option = {
title: {
From e1e6a861f60d5f255c97ade992a4975efb1fd449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E9=94=A6=E8=B4=A4?= <996842803@qq.com>
Date: Thu, 21 May 2026 16:14:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1):?=
=?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=20fea?=
=?UTF-8?q?t(=E7=94=B5=E8=AE=A1=E9=87=8F=E8=AE=BE=E5=A4=87=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF):=20=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E5=8F=96?=
=?UTF-8?q?=E6=B6=88=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 +-
.../WaterManagement/dianMeasurement/index.vue | 142 +++++++++++-------
.../powerUse/Energystatistics/index.vue | 104 +++++++++----
3 files changed, 165 insertions(+), 85 deletions(-)
diff --git a/package.json b/package.json
index 35c1cff..4b406ac 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"sortablejs": "1.10.2",
"swiper": "^5.4.5",
"v-scale-screen": "^1.0.2",
- "vue": "2.6.12",
+ "vue": "^2.6.14",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
@@ -89,7 +89,7 @@
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
- "vue-template-compiler": "2.6.12"
+ "vue-template-compiler": "^2.6.14"
},
"engines": {
"node": ">=8.9",
diff --git a/src/views/energy/WaterManagement/dianMeasurement/index.vue b/src/views/energy/WaterManagement/dianMeasurement/index.vue
index ced9ba4..fa8754e 100644
--- a/src/views/energy/WaterManagement/dianMeasurement/index.vue
+++ b/src/views/energy/WaterManagement/dianMeasurement/index.vue
@@ -71,10 +71,12 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
- >搜索搜索
+
重置重置
+
@@ -88,7 +90,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['energy:ShuiMeasurement:add']"
- >新增新增
+
@@ -98,7 +101,8 @@
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
- >展开/折叠展开/折叠
+
@@ -109,10 +113,11 @@
size="mini"
@click="handleExport"
v-hasPermi="['energy:ShuiMeasurement:export']"
- >导出
+ >导出
+
- 共{{list.length}}条
+ 共{{ list.length }}条
-
-
+
+
-
-
-
+
+
+
修改修改
+
新增新增
+
删除删除
+
@@ -240,7 +248,8 @@
选择采集设备选择采集设备
+
@@ -254,7 +263,7 @@
/>
-
+
-
+
-
+
-
+
-
+
-
+
+ v-for="item in dict.type.electricity_type" :value="item.value+''" :key="item.value+''"
+ :label="item.label">
@@ -296,7 +306,8 @@
v-for="dict in dict.type.monitorStatus"
:key="dict.value"
:label="parseInt(dict.value)"
- >{{ dict.label }}{{ dict.label }}
+
@@ -325,13 +336,15 @@
@@ -348,19 +361,19 @@
>
-
+
-
+
-
+
-
+
-
+
是
@@ -372,7 +385,8 @@
v-for="dict in dict.type.public_share_type"
:key="dict.value"
:label="parseInt(dict.value)"
- >{{ dict.label }}{{ dict.label }}
+
@@ -446,10 +460,12 @@
icon="el-icon-search"
size="mini"
@click="handleQuery1"
- >搜索搜索
+
重置重置
+
@@ -458,7 +474,7 @@
:data="typeList"
@selection-change="handleSelectionChange1"
>
-
+
-
+
{
- this.ShuiMeasurementOptions = [];
- const data = { objid: 0, monitorName: "顶级节点", children: [] };
- data.children = this.handleTree(response.data, "objid", "parentId");
- this.ShuiMeasurementOptions.push(data);
- });
- },
// 取消按钮
cancel() {
this.open = false;
@@ -802,7 +809,8 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => {});
+ .catch(() => {
+ });
},
// 取消按钮-------------------------------------------
/** 选择采集设备操作 */
@@ -863,9 +871,32 @@ export default {
/** 查询部门类型树结构 */
getSubentrySelect() {
subentryTreeSelect().then((response) => {
- this.subentryOptions = response.data;
+ this.setSubentryOptions(response.data, 0);
});
},
+ setSubentryOptions(data, level) {
+ data.forEach(item => {
+ if (item.children && item.children.length > 0) {
+ this.$set(item, 'disabled', true);
+ }
+ if (item.children) {
+ this.setSubentryOptions(item.children, level + 1);
+ }
+ });
+ if (level != 0) return
+ this.subentryOptions = data
+ this.subentryExpandedKeys =[].concat([this.form.subentryId])
+ },
+ handleCheckSubentryOptions(data, checkedStatus) {
+ const isParent = data.children && data.children.length > 0
+ if (isParent) {
+ this.$refs.subentry.setChecked(data.id, false)
+ return
+ }
+ if (checkedStatus.checkedKeys.includes(data.id)) {
+ this.$refs.subentry.setCheckedKeys([data.id])
+ }
+ },
/** 查询业态类型树结构 */
getBusinessSelect() {
businessTreeSelect().then((response) => {
@@ -907,7 +938,7 @@ export default {
this.queryParams.monitorType = 2;
listShuiMeasurement(this.queryParams).then((response) => {
this.ShuiMeasurementOptions = [];
- const data = { objid: 0, monitorName: "顶级节点", children: [] };
+ const data = {objid: 0, monitorName: "顶级节点", children: []};
data.children = this.handleTree(response.data, "objid", "parentId");
this.ShuiMeasurementOptions.push(data);
});
@@ -916,8 +947,8 @@ export default {
getAllTree(objid) {
return treeselect(objid).then((response) => {
this.buildOptions = response.builds;
- this.subentryOptions = response.subentrys;
this.businessOptions = response.business;
+ this.setSubentryOptions(response.subentrys, 0);
return response;
});
},
@@ -930,3 +961,10 @@ export default {
},
};
+
+
diff --git a/src/views/energy/powerUse/Energystatistics/index.vue b/src/views/energy/powerUse/Energystatistics/index.vue
index 9707a0b..dd1c87c 100644
--- a/src/views/energy/powerUse/Energystatistics/index.vue
+++ b/src/views/energy/powerUse/Energystatistics/index.vue
@@ -162,6 +162,20 @@
prop="address"
v-if="columns[2].visible"
/>
+
+
+
+
+
+
+
+
+
+
-
+ http://192.168.58.226:81/ems/powerUse/Energystatistics