添加中央热水系统相关界面以及修复钱以后的问题

.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 # 开发环境
 # VUE_APP_BASE_API = '/dev-api'
 # 后台
-# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
+VUE_APP_BASE_API = 'http://192.168.1.222:8080'
 # 海湾酒店-云端
-VUE_APP_BASE_API = 'http://106.55.173.225:8090'
+# VUE_APP_BASE_API = 'http://106.55.173.225:8090'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/comprehensiveEnergy/hotPumpLog.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+export const hotWaterList = (data) => {
+    return request({
+        url: "/reportHotWater/list",
+        method: "post",
+        data: data,
+    });
+};
+
+// 导出
+export const hotWaterExport = (data) => {
+    return request({
+        url: "/reportHotWater/export",
+        method: "post",
+        data,
+        responseType: "blob",
+    });
+};
+// 修改
+export const hotWaterEdit = (data) => {
+    return request({
+        url: "/reportHotWater/edit",
+        method: "put",
+        data: data,
+    });
+};

src/api/comprehensiveEnergy/meterRecord.js

@@ -0,0 +1,19 @@
+import request from "@/utils/request";
+
+export const meterReadingsList = (data) => {
+    return request({
+        url: "/reportMeterReadings/list",
+        method: "post",
+        data: data,
+    });
+};
+
+// 导出
+export const meterReadingsExport = (data) => {
+    return request({
+        url: "/reportMeterReadings/export",
+        method: "post",
+        data,
+        responseType: "blob",
+    });
+};

src/api/comprehensiveEnergy/systemEnergy.js

@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export const compreReport = (data) => {
+    return request({
+        url: "/compre/report",
+        method: "post",
+        data,
+    });
+};

src/api/device/gather.js

@@ -8,6 +8,12 @@ export function cpmList(query) {
     params: query,
   });
 }
+export function cpmList2(cpmIds) {
+  return request({
+    url: "/device/cpm/list/" + cpmIds,
+    method: "get",
+  });
+}
 
 // 根据id查询设备采集参数信息
 export function getCPM(cpmId) {

src/api/region.js

@@ -7,6 +7,13 @@ export function spaceTree() {
     method: "get",
   });
 }
+export function floorTree() {
+  return request({
+    url: "/space/floorTree",
+    method: "get",
+  });
+}
+
 
 // 获取区域信息
 export function getAreaList(query) {

src/store/modules/permission.js

@@ -40,6 +40,7 @@ const permission = {
           const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
           rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
+          // 有中央空调
           // 如果动态的路由有中央空调-系统监控-系统监测页面，那就添加一个hidden为true非Layout的大屏页面
           const result = checkRouteArray(
             sidebarRoutes,
@@ -90,6 +91,141 @@ const permission = {
             // console.log("不满足条件");
           }
 
+          // // 风柜
+          // const result2 = sidebarRoutes.find(
+          //   (item) => item.name === "AircAndWindc"
+          // );
+          // if (result2) {
+          //   // 定义要添加的多个路由对象数组
+          //   const additionalRoutes2 = [
+          //     {
+          //       path: "/asSysMonitorDetails",
+          //       name: "asSysMonitorDetails",
+          //       hidden: true,
+          //       component: () =>
+          //         import(
+          //           "@/views/aircAndWindc/awSysMonitor/asSysMonitorDetails"
+          //         ),
+          //       meta: { title: "系统监控", icon: "screen" },
+          //     },
+          //     // 可以继续添加更多路由对象
+          //   ];
+          //   // 循环添加额外的路由对象到各路由数组
+          //   additionalRoutes2.forEach((route) => {
+          //     sidebarRoutes.push(route);
+          //     rewriteRoutes.push(route);
+          //     asyncRoutes.push(route);
+          //   });
+          // } else {
+          //   // console.log("不满足条件");
+          // }
+
+          // // 锅炉
+          // const result3 = sidebarRoutes.find(
+          //   (item) => item.name === "BoilerSys"
+          // );
+          // if (result3) {
+          //   // 定义要添加的多个路由对象数组
+          //   const additionalRoutes3 = [
+          //     {
+          //       path: "/boilerMonitorDetails",
+          //       name: "boilerMonitorDetails",
+          //       hidden: true,
+          //       component: () =>
+          //         import(
+          //           "@/views/boilerSys/boilerMonitor/boilerMonitorDetails"
+          //         ),
+          //       meta: { title: "锅炉监控", icon: "screen" },
+          //     },
+          //     {
+          //       path: "/hotWaterBoilerDetails",
+          //       name: "hotWaterBoilerDetails",
+          //       hidden: true,
+          //       component: () =>
+          //         import(
+          //           "@/views/boilerSys/hotWaterBoiler/hotWaterBoilerDetails"
+          //         ),
+          //       meta: { title: "热水锅炉监控", icon: "screen" },
+          //     },
+          //     {
+          //       path: "/heatingPumpDetails",
+          //       name: "heatingPumpDetails",
+          //       hidden: true,
+          //       component: () =>
+          //         import("@/views/boilerSys/heatingPump/heatingPumpDetails"),
+          //       meta: { title: "采暖泵监控", icon: "screen" },
+          //     },
+          //     {
+          //       path: "/steamHeatingDetails",
+          //       name: "steamHeatingDetails",
+          //       hidden: true,
+          //       component: () =>
+          //         import("@/views/boilerSys/steamHeating/steamHeatingDetails"),
+          //       meta: { title: "蒸汽采暖运行监控", icon: "screen" },
+          //     },
+          //     // 可以继续添加更多路由对象
+          //   ];
+          //   // 循环添加额外的路由对象到各路由数组
+          //   additionalRoutes3.forEach((route) => {
+          //     sidebarRoutes.push(route);
+          //     rewriteRoutes.push(route);
+          //     asyncRoutes.push(route);
+          //   });
+          // } else {
+          //   // console.log("不满足条件");
+          // }
+
+          // 热水
+          const result4 = sidebarRoutes.find(
+            (item) => item.name === "HotWater"
+          );
+          if (result4) {
+            // 定义要添加的多个路由对象数组
+            const additionalRoutes4 = [
+              {
+                path: "/waterMonitorDetails",
+                name: "waterMonitorDetails",
+                hidden: true,
+                component: () =>
+                  import("@/views/hotWater/waterMonitor/waterMonitorDetails"),
+                meta: { title: "热水监控", icon: "screen" },
+              },
+              // 可以继续添加更多路由对象
+            ];
+            // 循环添加额外的路由对象到各路由数组
+            additionalRoutes4.forEach((route) => {
+              sidebarRoutes.push(route);
+              rewriteRoutes.push(route);
+              asyncRoutes.push(route);
+            });
+          } else {
+            // console.log("不满足条件");
+          }
+
+          // // 温度监测
+          // const result5 = sidebarRoutes.find((item) => item.name === "TemSys");
+          // if (result5) {
+          //   // 定义要添加的多个路由对象数组
+          //   const additionalRoutes5 = [
+          //     {
+          //       path: "/temMonitorDeatils",
+          //       name: "temMonitorDeatils",
+          //       hidden: true,
+          //       component: () =>
+          //         import("@/views/temSys/temMonitor/temMonitorDeatils"),
+          //       meta: { title: "温度监测", icon: "screen" },
+          //     },
+          //   ];
+          //   // 循环添加额外的路由对象到各路由数组
+          //   additionalRoutes5.forEach((route) => {
+          //     sidebarRoutes.push(route);
+          //     rewriteRoutes.push(route);
+          //     asyncRoutes.push(route);
+          //   });
+          // } else {
+          //   // console.log("不满足条件");
+          // }
+
           commit("SET_ROUTES", rewriteRoutes);
           commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes));
           commit("SET_DEFAULT_ROUTES", sidebarRoutes);

src/views/hotWater/dataAnalysis/components/analyzeMonth.vue

@@ -153,8 +153,10 @@ export default {
   },
   methods: {
     tableRowStyle({ row, column, rowIndex, columnIndex }) {
+      // console.log("row",row)
+      // console.log("column",column)
       // 如果第1列，修改颜色
-      if (columnIndex === 0) {
+      if (columnIndex === 0 || column.label === '合计') {
         return "background-color:rgb(11 ,100, 201) !important;";
       }
     },
@@ -293,6 +295,15 @@ export default {
           // console.log("Min2", Min2);
           // console.log("Max1", Max1);
           // console.log("Max2", Max2);
+          // 处理y轴文字+单位
+          var yAxisUnit = "";
+          if (this.chType === 1) {
+            yAxisUnit = "吨";
+          } else if (this.chType === 2) {
+            yAxisUnit = "度";
+          } else if (this.chType === 3) {
+            yAxisUnit = "度/吨";
+          }
           this.chartInstance1 = echarts.init(this.$refs.findwater_ref);
           const adapterOption = {
             legend: {
@@ -308,12 +319,24 @@ export default {
                 max: Max1,
                 splitNumber: 10,
                 interval: (Max1 - Min1) / 10,
+                name: yAxisUnit,
+                // 设置 name 的样式
+                nameTextStyle: {
+                  color: "rgba(255, 255, 255, 1)",
+                  fontSize: 12,
+                },
               },
               {
                 min: Min2,
                 max: Max2,
                 splitNumber: 10,
                 interval: (Max2 - Min2) / 10,
+                name: "%",
+                // 设置 name 的样式
+                nameTextStyle: {
+                  color: "rgba(255, 255, 255, 1)",
+                  fontSize: 12,
+                },
               },
             ],
             series: [
@@ -522,6 +545,62 @@ export default {
               width: "1",
             },
           },
+          // 自定义 tooltip 内容
+          formatter: function (params) {
+            var res = params[0].name + "<br/>";
+            for (var i = 0, l = params.length; i < l; i++) {
+              var seriesName = params[i].seriesName;
+              var value = params[i].value;
+              // console.log("打印颜色", params[i].color.colorStops[0].color)
+              var marker =
+                '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' +
+                params[i].color.colorStops[0].color +
+                '"></span>';
+              // 根据不同的seriesName 返回不同的单位
+              if (seriesName.includes("用水量")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "吨" +
+                  "</span><br>";
+              } else if (seriesName.includes("用电量")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "度" +
+                  "</span><br>";
+              } else if (seriesName.includes("单耗")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "度/吨" +
+                  "</span><br>";
+              } else {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "%" +
+                  "</span><br>";
+              }
+            }
+            return res;
+          },
         },
         legend: {
           // 折柱混合的图表，不显示icon，图例就可以根据不同的类型不同
@@ -531,7 +610,7 @@ export default {
             color: "#ffff",
             fontSize: 12, //这里改字体大小
           },
-          left: "56%",
+          left: "center",
           top: "5%",
           //图例距离饼图的距离
           itemGap: 5,
@@ -638,10 +717,27 @@ export default {
             // },
             //折线颜色
             itemStyle: {
-              color: "#db9215",
+              color: "#0b75d3",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#db9215", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "rgba(1, 102, 251, 1)", // 起始颜色
                   },
+                  {
+                    offset: 1,
+                    color: "rgba(1, 102, 251, 0)", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+              borderRadius: [5, 5, 0, 0], // 分别对应左上、右上、右下、左下的圆角半径
             },
           },
           {
@@ -654,10 +750,27 @@ export default {
             barWidth: 10, // 柱子宽度
             //折线颜色
             itemStyle: {
-              color: "#1ab395",
+              color: "#0b75d3",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#1ab395", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "rgba(0, 224, 225, 1)", // 起始颜色
                   },
+                  {
+                    offset: 1,
+                    color: "rgba(0, 224, 225, 0)", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+              borderRadius: [5, 5, 0, 0],
             },
           },
           {
@@ -677,10 +790,27 @@ export default {
             // data: this.data3,
             //折线颜色
             itemStyle: {
-              color: "#e23131",
+              color: "#db9215",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#e23131", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#db9215", // 起始颜色
                   },
+                  {
+                    offset: 1,
+                    color: "#db9215", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+              borderRadius: [5, 5, 0, 0], // 分别对应左上、右上、右下、左下的圆角半径
             },
           },
           {
@@ -701,9 +831,27 @@ export default {
             // data: this.data4,
             //折线颜色
             itemStyle: {
-              color: "#4a98ff",
+              color: "#EE5217", //折线点的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#EE5217", // 起始颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#EE5217", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
               lineStyle: {
-                color: "#4a98ff", //折线的颜色
+                color: "#EE5217", //折线的颜色
               },
             },
           },

src/views/hotWater/dataAnalysis/components/analyzeYear.vue

@@ -120,7 +120,7 @@ export default {
   methods: {
     tableRowStyle({ row, column, rowIndex, columnIndex }) {
       // 如果第1列，修改颜色
-      if (columnIndex === 0) {
+      if (columnIndex === 0 || column.label === "合计") {
         return "background-color:rgb(11 ,100, 201) !important;";
       }
     },
@@ -240,6 +240,15 @@ export default {
           // console.log("Min2", Min2);
           // console.log("Max1", Max1);
           // console.log("Max2", Max2);
+          // 处理y轴文字+单位
+          var yAxisUnit = "";
+          if (this.chType === 1) {
+            yAxisUnit = "吨";
+          } else if (this.chType === 2) {
+            yAxisUnit = "度";
+          } else if (this.chType === 3) {
+            yAxisUnit = "度/吨";
+          }
           this.chartInstance1 = echarts.init(this.$refs.findwater_ref);
           const adapterOption = {
             legend: {
@@ -255,12 +264,24 @@ export default {
                 max: Max1,
                 splitNumber: 10,
                 interval: (Max1 - Min1) / 10,
+                name: yAxisUnit,
+                // 设置 name 的样式
+                nameTextStyle: {
+                  color: "rgba(255, 255, 255, 1)",
+                  fontSize: 12,
+                },
               },
               {
                 min: Min2,
                 max: Max2,
                 splitNumber: 10,
                 interval: (Max2 - Min2) / 10,
+                name: "%",
+                // 设置 name 的样式
+                nameTextStyle: {
+                  color: "rgba(255, 255, 255, 1)",
+                  fontSize: 12,
+                },
               },
             ],
             series: [
@@ -431,6 +452,62 @@ export default {
               width: "1",
             },
           },
+          // 自定义 tooltip 内容
+          formatter: function (params) {
+            var res = params[0].name + "<br/>";
+            for (var i = 0, l = params.length; i < l; i++) {
+              var seriesName = params[i].seriesName;
+              var value = params[i].value;
+              // console.log("打印颜色", params[i].color.colorStops[0].color)
+              var marker =
+                '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' +
+                params[i].color.colorStops[0].color +
+                '"></span>';
+              // 根据不同的seriesName 返回不同的单位
+              if (seriesName.includes("用水量")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "吨" +
+                  "</span><br>";
+              } else if (seriesName.includes("用电量")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "度" +
+                  "</span><br>";
+              } else if (seriesName.includes("单耗")) {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "度/吨" +
+                  "</span><br>";
+              } else {
+                res +=
+                  marker +
+                  seriesName +
+                  ":" +
+                  '<span style="color: #000000; font-weight: bold;margin-left:5px">' +
+                  value +
+                  " " +
+                  "%" +
+                  "</span><br>";
+              }
+            }
+            return res;
+          },
         },
         legend: {
           // 折柱混合的图表，不显示icon，图例就可以根据不同的类型不同
@@ -440,7 +517,7 @@ export default {
             color: "#ffff",
             fontSize: 12, //这里改字体大小
           },
-          left: "56%",
+          left: "center",
           top: "5%",
           //图例距离饼图的距离
           itemGap: 5,
@@ -542,67 +619,55 @@ export default {
             barWidth: 10, // 柱子宽度
             //折线颜色
             itemStyle: {
-              color: "#db9215",
+              color: "#0b75d3",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#db9215", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "rgba(1, 102, 251, 1)", // 起始颜色
                   },
+                  {
+                    offset: 1,
+                    color: "rgba(1, 102, 251, 0)", // 结束颜色
                   },
+                ],
+                global: false, // 缺省为 false
               },
-          {
+              borderRadius: [5, 5, 0, 0], // 分别对应左上、右上、右下、左下的圆角半径
-            type: "bar",
-            // tooltip: {
-            //   valueFormatter: function (value) {
-            //     return value + "吨";
-            //   },
-            // },
-            tooltip: {
-              trigger: "axis",
-              formatter: function (params) {
-                //数据单位格式化
-                var relVal = params[0].name; //x轴名称
-                if (params[0].seriesName == "2022年用水量") {
-                  relVal =
-                    params[0].name +
-                    "<br/>" +
-                    params[0].seriesName +
-                    " : " +
-                    params[0].value +
-                    " 吨";
-                } else if (params[0].seriesName == "用电量") {
-                  relVal =
-                    params[0].name +
-                    "<br/>" +
-                    params[0].seriesName +
-                    " : " +
-                    params[0].value +
-                    " 度";
-                } else if (params[0].seriesName == "耗能") {
-                  relVal =
-                    params[0].name +
-                    "<br/>" +
-                    params[0].seriesName +
-                    " : " +
-                    params[0].value +
-                    " 度/吨";
-                } else {
-                  relVal =
-                    params[0].name +
-                    "<br/>" +
-                    params[0].seriesName +
-                    " : " +
-                    params[0].value +
-                    " 次";
-                }
-                return relVal;
             },
           },
+          {
+            type: "bar",
             barWidth: 10, // 柱子宽度
             //折线颜色
             itemStyle: {
-              color: "#1ab395",
+              color: "#0b75d3",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#1ab395", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "rgba(0, 224, 225, 1)", // 起始颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(0, 224, 225, 0)", // 结束颜色
                   },
+                ],
+                global: false, // 缺省为 false
+              },
+              borderRadius: [5, 5, 0, 0],
             },
           },
           {
@@ -622,10 +687,27 @@ export default {
             // data: this.data3,
             //折线颜色
             itemStyle: {
-              color: "#e23131",
+              color: "#db9215",
-              lineStyle: {
+              // 使用颜色渐变
-                color: "#e23131", //折线的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#db9215", // 起始颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#db9215", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
               },
+              borderRadius: [5, 5, 0, 0], // 分别对应左上、右上、右下、左下的圆角半径
             },
           },
           {
@@ -646,9 +728,27 @@ export default {
             // data: this.data4,
             //折线颜色
             itemStyle: {
-              color: "#4a98ff",
+              color: "#EE5217", //折线点的颜色
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#EE5217", // 起始颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#EE5217", // 结束颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
               lineStyle: {
-                color: "#4a98ff", //折线的颜色
+                color: "#EE5217", //折线的颜色
               },
             },
           },

src/views/hotWater/energyAnalysis/components/energyReport.vue

@@ -11,13 +11,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useWaterRadio > 0">
+          <div class="upText" v-if="isPositive(useWaterRadio)">
-            <i class="el-icon-bottom"></i>
+            <i class="el-icon-top"></i>
-            <span>+{{ useWaterRadio }}</span>
+            <span>{{ useWaterRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useWaterRadio }}</span>
+            <span>{{ useWaterRadio }}</span>
           </div>
         </div>
         <img
@@ -36,13 +36,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useElectRadio > 0">
+          <div class="upText" v-if="isPositive(useElectRadio)">
-            <i class="el-icon-bottom"></i>
+            <i class="el-icon-top"></i>
-            <span>+{{ useElectRadio }}</span>
+            <span>{{ useElectRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useElectRadio }}</span>
+            <span>{{ useElectRadio }}</span>
           </div>
         </div>
         <img
@@ -61,13 +61,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useUnitRadio > 0">
+          <div class="upText" v-if="isPositive(useUnitRadio)">
-            <i class="el-icon-bottom"></i>
+            <i class="el-icon-top"></i>
-            <span>+{{ useUnitRadio }}</span>
+            <span>{{ useUnitRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useUnitRadio }}</span>
+            <span>{{ useUnitRadio }}</span>
           </div>
         </div>
         <img
@@ -250,6 +250,20 @@ export default {
     window.removeEventListener("resize", this.screenAdapter);
   },
   methods: {
+    isPositive(value) {
+      // 检查 value 是否为字符串
+      if (typeof value === "string") {
+        // 提取数字部分并去除百分号
+        const numberPart = value.replace("%", "");
+        // 将提取的字符串转换为数字类型
+        const num = parseFloat(numberPart);
+        return num > 0;
+      } else {
+        // 处理非字符串类型的情况
+        // console.error("传入的值不是字符串类型:", value);
+        return false;
+      }
+    },
     handleEnter(index) {
       this.currentIndex = index;
       this.renderingBroken();
@@ -462,6 +476,31 @@ export default {
     },
     //请求折线图数据
     getChartData() {
+      if ((this.total == 10)) {
+        // 防止数据提交重复
+        console.log("不用请求");
+        if (this.tableData.length > 0) {
+          this.exportData = this.tableData;
+          this.exportData.forEach((item) => {
+            this.brokenData1.push(item.useHotWater);
+            this.brokenData2.push(item.electValue);
+            this.brokenData3.push(item.electWater);
+            this.brokenTime.push(item.curDate);
+          });
+          // 对数组进行反转操作
+          this.brokenData1.reverse();
+          this.brokenData2.reverse();
+          this.brokenData3.reverse();
+          this.brokenTime.reverse();
+          this.renderingBroken();
+        } else {
+          this.brokenData1 = [];
+          this.brokenData2 = [];
+          this.brokenData3 = [];
+          this.brokenTime = [];
+        }
+        this.renderingBroken();
+      } else {
         console.log("图表参数", this.queryParams);
         let timeType = null;
         if (this.dateType == "day") {
@@ -483,7 +522,7 @@ export default {
         }
         let data = {
           type: timeType,
-        page: this.queryParams.pageNum,
+          page: 1,
           limit: this.total,
           startDate: this.queryParams.startTime,
           endDate: this.queryParams.endTime,
@@ -517,9 +556,15 @@ export default {
           }
           this.renderingBroken();
         });
+      }
     },
     renderingBroken() {
       if (this.currentIndex === 0) {
+        this.brokenOption.yAxis.name = "吨";
+        this.brokenOption.yAxis.nameTextStyle = {
+          color: "rgba(255, 255, 255, 1)",
+          fontSize: 12,
+        };
         this.brokenOption.series[0].data = this.brokenData1;
         this.brokenOption.series[0].itemStyle.color = "#d48e17";
         this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -533,6 +578,11 @@ export default {
           },
         ];
       } else if (this.currentIndex === 1) {
+        this.brokenOption.yAxis.name = "度";
+        this.brokenOption.yAxis.nameTextStyle = {
+          color: "rgba(255, 255, 255, 1)",
+          fontSize: 12,
+        };
         this.brokenOption.series[0].data = this.brokenData2;
         this.brokenOption.series[0].itemStyle.color = "#1ab395";
         this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -546,6 +596,11 @@ export default {
           },
         ];
       } else if (this.currentIndex === 2) {
+        this.brokenOption.yAxis.name = "度/吨";
+        this.brokenOption.yAxis.nameTextStyle = {
+          color: "rgba(255, 255, 255, 1)",
+          fontSize: 12,
+        };
         this.brokenOption.series[0].data = this.brokenData3;
         this.brokenOption.series[0].itemStyle.color = "#1f8dee";
         this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -620,12 +675,7 @@ export default {
         import("@/assets/excel/Export2Excel").then((excel) => {
           // 导出的excel表头字段名，需要导出表格字段名
           if (this.building == "所有") {
-            var tHeader = [
+            var tHeader = ["日期", "用水量(吨)", "用电量(度)", "单耗(度/吨)"]; // 导出的excel表头名信息 改参数
-              "日期",
-              "用水量(吨)",
-              "用电量(度)",
-              "单耗(度/吨)",
-            ]; // 导出的excel表头名信息 改参数
             var filterVal = [
               "curDate",
               "useHotWater",
@@ -714,7 +764,7 @@ export default {
         },
 
         grid: {
-          top: "4%",
+          top: "10%",
           left: "3%",
           right: "4%",
           bottom: "5%",

src/views/hotWater/energyAnalysis/components/temReport.vue

@@ -224,6 +224,11 @@ export default {
     },
     //渲染
     renderingBroken() {
+      this.brokenOption.yAxis.name = "℃";
+      this.brokenOption.yAxis.nameTextStyle = {
+        color: "rgba(255, 255, 255, 1)",
+        fontSize: 12,
+      };
       this.brokenOption.series[0].data = this.brokenData1;
       this.brokenOption.series[0].itemStyle.color = "#1f8dee";
       this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -432,7 +437,7 @@ export default {
         },
 
         grid: {
-          top: "4%",
+          top: "10%",
           left: "3%",
           right: "4%",
           bottom: "5%",

src/views/hotWater/energyAnalysis/components/waterReport.vue

@@ -223,6 +223,11 @@ export default {
     },
     //渲染
     renderingBroken() {
+      this.brokenOption.yAxis.name = "%";
+      this.brokenOption.yAxis.nameTextStyle = {
+        color: "rgba(255, 255, 255, 1)",
+        fontSize: 12,
+      };
       this.brokenOption.series[0].data = this.brokenData1;
       this.brokenOption.series[0].itemStyle.color = "#1f8dee";
       this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -432,7 +437,7 @@ export default {
         },
 
         grid: {
-          top: "4%",
+          top: "10%",
           left: "3%",
           right: "4%",
           bottom: "5%",

src/views/hotWater/energyQuery/components/energy.vue

@@ -160,6 +160,11 @@ export default {
     //
     getChartData() {
       if (this.currentIndex === 0) {
+        this.brokenOption.yAxis.name = "吨";
+        this.brokenOption.yAxis.nameTextStyle = {
+          color: "rgba(255, 255, 255, 1)",
+          fontSize: 12,
+        };
         this.brokenOption.series[0].data = this.brokenData1;
         this.brokenOption.series[0].itemStyle.color = "#1f8dee";
         this.brokenOption.series[0].areaStyle.color.colorStops = [
@@ -173,6 +178,11 @@ export default {
           },
         ];
       } else if (this.currentIndex === 1) {
+        this.brokenOption.yAxis.name = "度";
+        this.brokenOption.yAxis.nameTextStyle = {
+          color: "rgba(255, 255, 255, 1)",
+          fontSize: 12,
+        };
         this.brokenOption.series[0].data = this.brokenData2;
         this.brokenOption.series[0].itemStyle.color = "#1ab395";
         this.brokenOption.series[0].areaStyle.color.colorStops = [

src/views/hotWater/waterControl/index.vue

@@ -67,23 +67,22 @@
                 />
                 <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash">运行状态模式:</div>
+                    <div class="ash">开关控制:</div>
                     <div class="white">
-                      <el-select
+                      <el-switch
+                        style="display: block"
                         v-model="item.hotPumpStatus"
-                        placeholder="请选择"
+                        active-color="#13ce66"
+                        active-text="开机"
+                        inactive-text="关机"
                         @change="handleHotPump(item)"
                       >
-                        <el-option
+                      </el-switch>
-                          v-for="item in hotPumpOptions"
+                    </div>
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
                   </div>
                 </div>
+              </div>
+              <div class="control-bottom">
                 <div class="words-li">
                   <div class="ash">故障信息:</div>
                   <el-tag
@@ -96,6 +95,16 @@
                     item.alarmStatus
                   }}</el-tag>
                 </div>
+                <div class="words-li">
+                  <div class="ash">运行状态:</div>
+                  <el-tag
+                    size="mini"
+                    v-if="item.runningStatus === '运行'"
+                    type="success"
+                    >{{ item.runningStatus }}</el-tag
+                  >
+                  <el-tag size="mini" v-else type="danger">不运行</el-tag>
+                </div>
                 <div class="words-li">
                   <div class="ash">实际温度:</div>
                   <div class="white">{{ item.temp }}℃</div>
@@ -123,7 +132,6 @@
                 </div>
               </div>
             </div>
-            </div>
             <!-- 裙楼供水泵、高区供水泵、中厨供水泵 -->
             <div class="monitor-flex-left" v-if="activeName.includes('供水泵')">
               <div class="control-top">
@@ -272,7 +280,7 @@
                   <div class="white">次</div>
                 </div>
                 <div class="words-li">
-                  <div class="white">一次50分钟</div>
+                  <div class="white">总共:{{ item.counterSet * 50 }}分钟</div>
                 </div>
               </div>
             </div>
@@ -336,7 +344,7 @@
                           item.delayTimeSet,
                           item.delayTimeSetId,
                           '回水温度设定延时时间',
-                          'S'
+                          'min'
                         )
                       "
                       @input="handleInput(item)"
@@ -367,6 +375,25 @@
                       </el-switch>
                     </div>
                   </div>
+                  <div class="words-li words-li4">
+                    <div class="ash">最低液位设置值:</div>
+                    <el-input
+                      v-model="item.minSet"
+                      size="mini"
+                      @keyup.enter.native="
+                        handleEnter(
+                          item,
+                          item.minSet,
+                          item.minSetId,
+                          '最低液位设置值',
+                          '%'
+                        )
+                      "
+                      @input="handleInput(item)"
+                      @blur="handleBlur()"
+                    ></el-input>
+                    <div class="white">%</div>
+                  </div>
                 </div>
               </div>
               <div class="control-bottom">
@@ -437,15 +464,131 @@
                 </div>
               </div>
             </div>
-            <!-- 高区、中厨、中区、裙楼 -->
+            <!-- 中厨、裙楼 -->
             <div
               class="monitor-flex-left"
-              v-if="
+              v-if="activeName === '裙楼' || activeName === '中厨'"
-                activeName === '裙楼' ||
+            >
-                activeName === '中厨' ||
+              <div class="control-top">
-                activeName === '高区' ||
+                <img
-                activeName === '中区'
+                  class="monitor-img2"
+                  src="../../../assets/images/startpum.png"
+                />
+                <div class="monitor-words">
+                  <div class="words-li">
+                    <div class="ash" style="letter-spacing: 8px">一键启动:</div>
+                    <div class="white">
+                      <el-switch
+                        style="display: block"
+                        v-model="item.openSwitch"
+                        active-color="#13ce66"
+                        active-text="开启"
+                        inactive-text="停止"
+                        @change="handleAllStart(item)"
+                      >
+                      </el-switch>
+                    </div>
+                  </div>
+                  <!-- <div class="words-li">
+                    <div class="ash">停止:</div>
+                    <div class="white">
+                      <el-switch
+                        style="display: block"
+                        v-model="item.closeSwitch"
+                        active-color="#13ce66"
+                        active-text=""
+                        inactive-text=""
+                        @change="handleAllEnd(item)"
+                      >
+                      </el-switch>
+                    </div>
+                  </div> -->
+                </div>
+              </div>
+              <div class="control-bottom">
+                <div class="words-li words-li3">
+                  <div class="ash">供水温度:</div>
+                  <div class="white">{{ item.temp }}℃</div>
+                </div>
+                <!-- <div class="words-li words-li4">
+                  <div class="ash">供水温度设定:</div>
+                  <el-input
+                    v-model="item.tempSet"
+                    size="mini"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.tempSet,
+                        item.tempSetId,
+                        '供水温度设定',
+                        '℃'
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                  <div class="white">℃</div>
+                </div> -->
+                <div class="words-li words-li3">
+                  <div class="ash">供水压力</div>
+                  <div class="white">{{ item.pressure }}bar</div>
+                </div>
+                <!-- <div class="words-li words-li4">
+                  <div class="ash">温度偏差值:</div>
+                  <el-input
+                    v-model="item.diffValueSet"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.diffValueSet,
+                        item.diffValueSetId,
+                        '温度偏差值',
+                        '℃'
+                      )
                     "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                    size="mini"
+                  ></el-input>
+                  <div class="white">℃</div>
+                </div> -->
+                <div class="words-li words-li3">
+                  <div class="ash">故障信息:</div>
+                  <el-tag
+                    size="mini"
+                    v-if="item.alarmStatus === '无故障'"
+                    type="success"
+                    >{{ item.alarmStatus }}</el-tag
+                  >
+                  <el-tag size="mini" v-else type="danger">{{
+                    item.alarmStatus
+                  }}</el-tag>
+                </div>
+                <!-- <div class="words-li words-li4">
+                  <div class="ash">补水延时时间设定:</div>
+                  <el-input
+                    v-model="item.delayTimeSet"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.delayTimeSet,
+                        item.delayTimeSetId,
+                        '补水延时时间设定',
+                        'S'
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                    size="mini"
+                  ></el-input>
+                  <div class="white">S</div>
+                </div> -->
+              </div>
+            </div>
+            <!-- 高区、中区 -->
+            <div
+              class="monitor-flex-left"
+              v-if="activeName === '高区' || activeName === '中区'"
             >
               <div class="control-top">
                 <img
@@ -563,6 +706,124 @@
                 </div> -->
               </div>
             </div>
+            <!-- 传感器参数设置 -->
+            <div class="monitor-flex-left" v-if="activeName === '传感器参数设置'">
+              <div class="control-bottom">
+                <div class="words-li words-li4">
+                  <div class="ash">上限:</div>
+                  <el-input
+                    v-model="item.engineeringMaxValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.engineeringMaxValue,
+                        item.engineeringMaxValueId,
+                        '上限',
+                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                  <div class="white" v-if="item.name.includes('温度')">℃</div>
+                  <div class="white" v-else-if="item.name.includes('压力')">bar</div>
+                  <div class="white" v-else-if="item.name.includes('液位')">m</div>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">下限:</div>
+                  <el-input
+                    v-model="item.engineeringMinValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.engineeringMinValue,
+                        item.engineeringMinValueId,
+                        '下限',
+                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                  <div class="white" v-if="item.name.includes('温度')">℃</div>
+                  <div class="white" v-else-if="item.name.includes('压力')">bar</div>
+                  <div class="white" v-else-if="item.name.includes('液位')">m</div>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">数字上限:</div>
+                  <el-input
+                    v-model="item.digitalMaxValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.digitalMaxValue,
+                        item.digitalMaxValueId,
+                        '数字上限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">数字下限:</div>
+                  <el-input
+                    v-model="item.digitalMinValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.digitalMinValue,
+                        item.digitalMinValueId,
+                        '数字下限',
+                        ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">校准值:</div>
+                  <el-input
+                    v-model="item.calibrationValue"
+                    size="mini"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.calibrationValue,
+                        item.calibrationValueId,
+                        '校准值',
+                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                  ></el-input>
+                  <div class="white" v-if="item.name.includes('温度')">℃</div>
+                  <div class="white" v-else-if="item.name.includes('压力')">bar</div>
+                  <div class="white" v-else-if="item.name.includes('液位')">m</div>
+                </div>
+                <div class="words-li words-li4">
+                  <div class="ash">当前值:</div>
+                  <div class="white">
+                    <span v-if="item.name.includes('温度')">{{ item.temp }}℃</span>
+                    <span v-else-if="item.name.includes('压力')">{{ item.pressure }}bar</span>
+                    <span v-else-if="item.name.includes('液位')">{{ item.waterLevel }}%</span>
+                    <span v-else>{{ item.temp }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -593,15 +854,7 @@ export default {
           value: 0,
         },
         {
-          label: "制冷",
+          label: "开机",
-          value: 2,
-        },
-        {
-          label: "制热",
-          value: 3,
-        },
-        {
-          label: "热水",
           value: 4,
         },
       ],
@@ -768,13 +1021,31 @@ export default {
               ...item,
               waterLevel: Number(item.waterLevel),
               runningStatus: Number(item.runningStatus) == 0 ? "停止" : "运行", //运行状态
-              hotPumpStatus: item.switchStatus, //热泵开关状态
+              hotPumpStatus:
+                Number(item.switchStatus) === 0
+                  ? false
+                  : Number(item.switchStatus) === 4
+                  ? true
+                  : "", // 热泵开关状态
               switchStatus: Number(item.switchStatus) == 0 ? false : true, //启停控制
               alarmStatus: Number(item.alarmStatus) == 0 ? "无故障" : "故障", //故障状态
               handAutomaticSwitch:
                 Number(item.handAutomaticSwitch) == 1 ? false : true, //手自动状态
               openSwitch: Number(item.openSwitch) == 0 ? false : true, //一键启动
               closeSwitch: Number(item.closeSwitch) == 0 ? false : true, //一键停止
+              // 传感器参数设置相关字段，确保初始化
+              engineeringMaxValue: item.engineeringMaxValue || '',
+              engineeringMaxValueId: item.engineeringMaxValueId || '',
+              engineeringMinValue: item.engineeringMinValue || '',
+              engineeringMinValueId: item.engineeringMinValueId || '',
+              digitalMaxValue: item.digitalMaxValue || '',
+              digitalMaxValueId: item.digitalMaxValueId || '',
+              digitalMinValue: item.digitalMinValue || '',
+              digitalMinValueId: item.digitalMinValueId || '',
+              calibrationValue: item.calibrationValue || '',
+              calibrationValueId: item.calibrationValueId || '',
+              middleValue: item.middleValue || '',
+              middleValueId: item.middleValueId || '',
             };
             // 将处理后的对象添加到 devicesList 中
             this.devicesList.push(deviceItem);
@@ -829,7 +1100,12 @@ export default {
                       waterLevel: Number(item.waterLevel),
                       runningStatus:
                         Number(item.runningStatus) == 0 ? "运行" : "停止", //运行状态
-                      hotPumpStatus: item.switchStatus, //热泵开关状态
+                      hotPumpStatus:
+                        Number(item.switchStatus) === 0
+                          ? false
+                          : Number(item.switchStatus) === 4
+                          ? true
+                          : "未知状态", // 热泵开关状态
                       switchStatus:
                         Number(item.switchStatus) == 0 ? false : true, //启停控制
                       alarmStatus:
@@ -838,6 +1114,19 @@ export default {
                         Number(item.handAutomaticSwitch) == 0 ? false : true, //手自动状态
                       openSwitch: Number(item.openSwitch) == 0 ? false : true, //一键启动
                       closeSwitch: Number(item.closeSwitch) == 0 ? false : true, //一键停止
+                      // 传感器参数设置相关字段，确保初始化
+                      engineeringMaxValue: item.engineeringMaxValue || '',
+                      engineeringMaxValueId: item.engineeringMaxValueId || '',
+                      engineeringMinValue: item.engineeringMinValue || '',
+                      engineeringMinValueId: item.engineeringMinValueId || '',
+                      digitalMaxValue: item.digitalMaxValue || '',
+                      digitalMaxValueId: item.digitalMaxValueId || '',
+                      digitalMinValue: item.digitalMinValue || '',
+                      digitalMinValueId: item.digitalMinValueId || '',
+                      calibrationValue: item.calibrationValue || '',
+                      calibrationValueId: item.calibrationValueId || '',
+                      middleValue: item.middleValue || '',
+                      middleValueId: item.middleValueId || '',
                     };
                     // 将处理后的对象添加到 devicesList 中
                     this.devicesList.push(deviceItem);
@@ -933,26 +1222,10 @@ export default {
     },
     // 设置热泵开关状态
     handleHotPump(item) {
-      // 记录原始状态
-      const originalStatus = item.hotPumpStatus;
-      // 根据 value 值获取对应的 label
-      let statusLabel = "";
-      switch (item.hotPumpStatus) {
-        case 0:
-          statusLabel = "关机";
-          break;
-        case 2:
-          statusLabel = "制冷";
-          break;
-        case 3:
-          statusLabel = "制热";
-          break;
-        case 4:
-          statusLabel = "热水";
-          break;
-      }
       this.$confirm(
-        `确定要切换设备"${item.name}"的状态为:${statusLabel} 吗?"`,
+        `确定要切换设备"${item.name}"的状态为:${
+          item.hotPumpStatus ? "开机" : "关机 吗?"
+        }`,
         "提示",
         {
           confirmButtonText: "确定",
@@ -961,11 +1234,20 @@ export default {
         }
       )
         .then(() => {
-          this.hadleOperationConrol(item.switchStatusId, item.hotPumpStatus);
+          // 这里调用请求函数，示例中只是简单打印信息
+          console.log("请求后台", item.hotPumpStatus);
+          let param = null;
+          if (item.hotPumpStatus) {
+            param = 4;
+          } else {
+            param = 0;
+          }
+          console.log("参数", param);
+          this.hadleOperationConrol(item.switchStatusId, param);
         })
         .catch(() => {
-          // 用户取消操作，恢复状态
+          // 用户取消操作，恢复开关状态
-          item.hotPumpStatus = originalStatus;
+          item.switchStatus = !item.switchStatus;
         });
     },
     // 设置供水泵手自动状态
@@ -1318,9 +1600,9 @@ export default {
               width: 36%;
             }
             .words-li4 {
-              width: 60%;
+              width: 45%;
               .ash {
-                width: 130px;
+                width: 80px;
               }
             }
             .words-li5 {

src/views/region/index.vue

@@ -202,7 +202,7 @@
       :title="dialogTitle"
       :visible.sync="isDialogOpen"
       @close="addExpenseClose"
-      width="700px"
+      width="730px"
       append-to-body
     >
       <el-form
@@ -241,6 +241,7 @@
                   v-model="dialogForm.systemType"
                   placeholder="选择系统类型"
                   clearable
+                  filterable
                 >
                   <el-option
                     v-for="dict in dict.type.sys_type"
@@ -467,6 +468,7 @@
                   v-model="dialogForm.status"
                   placeholder="请选择状态"
                   clearable
+                  filterable
                 >
                   <el-option label="正常" value="0" />
                   <el-option
@@ -475,6 +477,45 @@
                   /> </el-select></el-form-item
             ></el-col>
           </el-row>
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="设备名称" prop="ledgerId">
+                <el-select
+                  v-model="dialogForm.ledgerId"
+                  placeholder="请选择设备类型"
+                  clearable
+                  @change="handleDevice"
+                  filterable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="item in devices"
+                    :key="item.id"
+                    :label="item.deviceName"
+                    :value="item.id"
+                  /> </el-select></el-form-item
+            ></el-col>
+            <el-col :span="12">
+              <el-form-item label="采集点位" prop="cpmId">
+                <el-select
+                  v-model="dialogForm.cpmId"
+                  placeholder="请选择设备类型"
+                  clearable
+                  @change="handleMeter"
+                  filterable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="item in cpmList"
+                    :key="item.id"
+                    :label="item.otherName"
+                    :value="item.id"
+                  />
+                </el-select> </el-form-item
+            ></el-col>
+          </el-row>
         </template>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -508,6 +549,8 @@ import {
   getHouse,
   delHouse,
 } from "@/api/region";
+import { cpmList2 } from "@/api/device/gather";
+import { ledgerList } from "@/api/device/ledger";
 export default {
   name: "region",
   dicts: ["sys_type"],
@@ -531,7 +574,12 @@ export default {
       // 总条数
       total: 0,
       isDialogOpen: false, //楼栋新增修改弹框
-      dialogForm: {},
+      dialogForm: {
+        ledgerId: "",
+        deviceName: "",
+        cpmId: "",
+        cpmName: "",
+      },
       dialogRules: {
         status: [
           { required: true, message: "请选择二维码状态", trigger: "blur" },
@@ -541,6 +589,8 @@ export default {
       isUpdate: false,
       isTableUpdate: false,
       rowId: "", //当前表格列id
+      devices: [], //设备列表
+      cpmList: [], //采集点位列表
     };
   },
   mounted() {
@@ -736,6 +786,7 @@ export default {
         this.dialogTitle = "修改房间";
         this.currentParentId = row.floorId;
         this.getDialogRoom(row.id);
+        this.getDeviceList();
       }
       this.isDialogOpen = true;
     },
@@ -864,6 +915,7 @@ export default {
         this.dialogTitle = "新增楼层";
       } else if (data.nodeType === 3) {
         this.dialogTitle = "新增房间";
+        this.getDeviceList();
       }
       this.isDialogOpen = true;
     },
@@ -892,6 +944,7 @@ export default {
       } else if (data.nodeType === 4) {
         this.dialogTitle = "修改房间";
         this.getDialogRoom(data.id);
+        this.getDeviceList();
       }
       this.isDialogOpen = true;
     },
@@ -1000,6 +1053,18 @@ export default {
             this.dialogForm.status !== null
               ? this.dialogForm.status.toString()
               : null;
+          // // 处理设备类型id和采集参数类型id,字符串"1,2,3"改为["1","2","3"]
+          // this.dialogForm.ledgerId = this.dialogForm.ledgerId
+          //   ? this.dialogForm.ledgerId.split(",")
+          //   : [];
+          // this.dialogForm.cpmId = this.dialogForm.cpmId
+          //   ? this.dialogForm.cpmId.split(",")
+          //   : [];
+
+          // 如果有this.dialogForm.ledgerId，则需要请求采集参数类型
+          if (this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0) {
+            this.getCpmIdList(this.dialogForm.ledgerId);
+          }
         }
       });
     },
@@ -1050,6 +1115,10 @@ export default {
     },
     addSet() {
       if (this.currentLevel === 0) {
+        if (!this.dialogForm.areaName || !this.dialogForm.systemType) {
+          this.$modal.msgWarning("请输入新增数据");
+          return;
+        }
         // 新增区域
         let data = {
           areaName: this.dialogForm.areaName,
@@ -1074,6 +1143,10 @@ export default {
           }
         });
       } else if (this.currentLevel === 1) {
+        if (!this.dialogForm.buildingName) {
+          this.$modal.msgWarning("请输入新增数据");
+          return;
+        }
         // 新增楼栋
         let data = {
           buildingName: this.dialogForm.buildingName,
@@ -1106,6 +1179,10 @@ export default {
           }
         });
       } else if (this.currentLevel === 2) {
+        if (!this.dialogForm.floorName) {
+          this.$modal.msgWarning("请输入新增数据");
+          return;
+        }
         // 新增楼层
         let data = {
           buildingId: this.currentId,
@@ -1134,6 +1211,10 @@ export default {
           }
         });
       } else if (this.currentLevel === 3) {
+        if (!this.dialogForm.houseName) {
+          this.$modal.msgWarning("请输入新增数据");
+          return;
+        }
         // 新增房间
         let data = {
           buildingId: "",
@@ -1148,7 +1229,16 @@ export default {
           usableArea: this.dialogForm.usableArea,
           builtYear: this.dialogForm.builtYear,
           status: this.dialogForm.status,
+          ledgerId:
+            this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0
+              ? this.dialogForm.ledgerId
+              : [],
+          cpmId:
+            this.dialogForm.cpmId && this.dialogForm.cpmId.length > 0
+              ? this.dialogForm.cpmId
+              : [],
         };
+        console.log("新增的参数", data);
         addHouse(data).then((res) => {
           if (res.code == 200) {
             this.$modal.msgSuccess("新增成功");
@@ -1167,6 +1257,10 @@ export default {
       }
     },
     updateAreaData(id) {
+      if (!this.dialogForm.areaName) {
+        this.$modal.msgWarning("请输入修改数据");
+        return;
+      }
       let data = {
         id: id,
         areaName: this.dialogForm.areaName,
@@ -1198,6 +1292,10 @@ export default {
       } else {
         nextId = "";
       }
+      if (!this.dialogForm.buildingName) {
+        this.$modal.msgWarning("请输入修改数据");
+        return;
+      }
       let data = {
         id: id,
         buildingName: this.dialogForm.buildingName,
@@ -1238,6 +1336,10 @@ export default {
       } else {
         nextId = "";
       }
+      if (!this.dialogForm.floorName) {
+        this.$modal.msgWarning("请输入修改数据");
+        return;
+      }
       let data = {
         id: id,
         buildingId: nextId,
@@ -1274,6 +1376,10 @@ export default {
       } else {
         nextId = "";
       }
+      if (!this.dialogForm.houseName) {
+        this.$modal.msgWarning("请输入修改数据");
+        return;
+      }
       let data = {
         id: id,
         buildingId: "",
@@ -1288,6 +1394,14 @@ export default {
         usableArea: this.dialogForm.usableArea,
         builtYear: this.dialogForm.builtYear,
         status: this.dialogForm.status,
+        ledgerId:
+          this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0
+            ? this.dialogForm.ledgerId
+            : [],
+        cpmId:
+          this.dialogForm.cpmId && this.dialogForm.cpmId.length > 0
+            ? this.dialogForm.cpmId
+            : [],
       };
       console.log("修改的参数", data);
       updateHouse(data).then((res) => {
@@ -1306,6 +1420,74 @@ export default {
         }
       });
     },
+    // 查询设备列表
+    getDeviceList() {
+      let data = {
+        pageNum: 1,
+        pageSize: 100000,
+      };
+      ledgerList(data).then((response) => {
+        this.devices = response.rows;
+      });
+    },
+    // 弹框选择设备名称
+    handleDevice(selectedValue) {
+      console.log("选择设备", selectedValue);
+      this.getCpmIdList(selectedValue);
+      // // 通过选中的 value 找到对应的 label
+      // const selectedItem = this.devices.find(
+      //   (item) => item.id === selectedValue
+      // );
+      // if (selectedItem) {
+      //   const selectedLabel = selectedItem.deviceName;
+      //   console.log("选中的 value:", selectedValue);
+      //   console.log("选中的 label:", selectedLabel);
+      //   // 在这里可以进行其他操作，比如发送请求等
+      //   this.dialogForm.ledgerId = selectedValue;
+      //   this.dialogForm.deviceName = selectedLabel;
+      //   // 请求采集位点
+      //   this.getCpmIdList(this.dialogForm.ledgerId);
+      // }
+      // if (!val) {
+      //   console.log("非第一次打开弹框-选择设备类型");
+      //   //清除采集位点
+      //   this.dialogForm.cpmId = "";
+      // } else {
+      //   console.log("第一次打开弹框-默认采集点位");
+      //   this.dialogForm = {
+      //     cpmId: "",
+      //   };
+      // }
+    },
+    //采集参数列表
+    getCpmIdList(ids) {
+      if (ids.length > 0) {
+        cpmList2(ids).then((response) => {
+          this.cpmList = response.rows;
+          console.log("this.cpmList", this.cpmList);
+        });
+      } else {
+        console.log("无值不请求");
+        this.cpmList = [];
+      }
+    },
+    // 弹框选择采集类型
+    handleMeter(selectedValue) {
+      console.log("选择的采集类型", selectedValue);
+      console.log("dialogForm.cpmId", this.dialogForm.cpmId);
+      // // 通过选中的 value 找到对应的 label
+      // const selectedItem = this.cpmList.find(
+      //   (item) => item.id === selectedValue
+      // );
+      // if (selectedItem) {
+      //   const selectedLabel = selectedItem.otherName;
+      //   console.log("选中的 value:", selectedValue);
+      //   console.log("选中的 label:", selectedLabel);
+      //   // 在这里可以进行其他操作，比如发送请求等
+      //   this.dialogForm.cpmId = selectedValue;
+      //   this.dialogForm.cpmName = selectedLabel;
+      // }
+    },
   },
 };
 </script>