对接收益分析页面

src/api/hotWater/profitAnalysis.js

@@ -0,0 +1,18 @@
+import request from "@/utils/request";
+
+// 顶部
+export function waternErgySum(query) {
+  return request({
+    url: "/hot_water_revenue/energySum",
+    method: "get",
+    params: query,
+  });
+}
+// 数据列表
+export function waterRevenueQuery(query) {
+  return request({
+    url: "/hot_water_revenue/query",
+    method: "get",
+    params: query,
+  });
+}

src/assets/icons/svg/elect.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635796144" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9277" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M799.256365 357.474588c-6.383475-12.76695-12.76695-19.150424-25.533899-19.150425h-191.504243L760.955516 38.300849c6.383475-12.76695 6.383475-31.917374-12.766949-38.300849H467.315677c-12.76695 0-25.533899 6.383475-25.5339 19.150424l-204.271193 510.677983c-6.383475 12.76695 0 31.917374 12.76695 38.300848h140.436445l-153.203395 414.925861c-6.383475 12.76695 0 31.917374 19.150425 38.300849 12.76695 6.383475 25.533899 0 31.917374-6.383475l510.677982-625.580528c0-12.76695 6.383475-25.533899 0-31.917374z" p-id="9278"></path></svg>

src/assets/icons/svg/income.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635839438" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12219" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M851.564767 353.359585c-21.222798-21.222798-46.690155-46.690155-72.157513-67.912953 42.445596-21.222798 72.157513-63.668394 72.157513-110.358549 0-67.912953-67.912953-127.336788-148.559586-127.336788-16.978238 0-33.956477 4.24456-50.934715 8.48912-4.24456 0-8.489119 4.24456-12.733678 4.244559l-25.467358-25.467357c-55.179275-46.690155-127.336788-46.690155-182.516062 0-8.489119 12.733679-16.978238 25.467358-25.467358 33.956476-4.24456 0-8.489119-4.24456-12.733678-4.244559-16.978238-8.489119-33.956477-12.733679-50.934715-12.733679-80.646632 0-148.559585 55.179275-148.559586 127.336787 4.24456 38.201036 21.222798 76.402073 55.179275 97.624871C223.369948 298.180311 197.902591 323.647668 172.435233 344.870466c-80.646632 84.891192-118.847668 174.026943-118.847668 267.407254 0 246.184456 178.271503 407.47772 454.167875 407.47772 110.358549 0 207.98342-25.467358 284.385493-67.912953 118.847668-67.912953 178.271503-182.516062 178.271502-339.564767 0-84.891192-42.445596-174.026943-118.847668-258.918135zM304.01658 344.870466c8.489119-4.24456 16.978238-12.733679 21.222798-16.978238l8.489119-4.24456c21.222798-12.733679 29.711917-33.956477 29.711918-50.934715 0-16.978238-8.489119-33.956477-25.467358-42.445595L320.994819 217.533679c-25.467358-4.24456-38.201036-21.222798-38.201037-38.201037 0-21.222798 25.467358-42.445596 63.668394-42.445595 8.489119 0 12.733679 0 21.222798 4.244559 4.24456 0 4.24456 0 4.24456 4.24456l4.244559 4.244559c29.711917 16.978238 72.157513 4.24456 97.624871-21.222798l4.244559-4.244559c0-4.24456 8.489119-8.489119 12.733679-16.978238 21.222798-21.222798 46.690155-21.222798 67.912953 0 8.489119 8.489119 12.733679 12.733679 12.733679 16.978238l4.24456 4.244559c21.222798 25.467358 63.668394 33.956477 97.62487 16.978239l4.24456-4.24456s4.24456 0 4.244559-4.244559c8.489119-4.24456 12.733679-4.24456 21.222798-4.24456 38.201036 0 63.668394 21.222798 63.668394 42.445596 0 16.978238-16.978238 29.711917-38.201036 38.201036H724.227979c-8.489119 4.24456-12.733679 4.24456-12.733678 4.24456-25.467358 8.489119-42.445596 25.467358-46.690156 46.690155-4.24456 21.222798 8.489119 42.445596 25.467358 55.179275l8.489119 4.244559c8.489119 4.24456 12.733679 8.489119 21.222798 16.978239 25.467358 21.222798 46.690155 38.201036 67.912953 63.668394 63.668394 67.912953 97.62487 135.825907 97.624871 203.73886 0 267.407254-203.73886 322.586528-377.765804 322.586528-178.271503 0-369.276684-84.891192-369.276684-322.586528 0-72.157513 33.956477-144.315026 97.624871-212.22798 21.222798-12.733679 42.445596-33.956477 67.912953-50.934715z" fill="" p-id="12220"></path><path d="M384.663212 633.500518c-21.222798 0-38.201036 16.978238-38.201036 38.201036s16.978238 38.201036 38.201036 38.201037h84.891192v76.402072c0 16.978238 16.978238 33.956477 38.201036 33.956477s38.201036-12.733679 38.201037-33.956477v-76.402072h89.135751c21.222798 0 38.201036-16.978238 38.201036-38.201037s-16.978238-38.201036-38.201036-38.201036h-89.135751v-21.222798h89.135751c21.222798 0 38.201036-16.978238 38.201036-38.201036s-16.978238-38.201036-38.201036-38.201036h-72.157513l72.157513-76.402073c12.733679-12.733679 12.733679-38.201036 0-55.179274-12.733679-12.733679-38.201036-12.733679-50.934715 0L512 480.696373l-72.157513-76.402072c-12.733679-12.733679-38.201036-12.733679-50.934715 0-12.733679 12.733679-12.733679 38.201036 0 55.179274l72.157513 76.402073H384.663212c-21.222798 0-38.201036 16.978238-38.201036 38.201036s16.978238 38.201036 38.201036 38.201036h84.891192v21.222798H384.663212z" fill="" p-id="12221"></path></svg>

src/assets/icons/svg/unit.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635879182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13234" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M156.381564 593.519095h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v206.047179a103.005669 103.005669 0 0 1-103.005669 103.005669h-28.67242a103.005669 103.005669 0 0 1-103.005669-103.005669v-206.047179a103.005669 103.005669 0 0 1 103.005669-103.005669z m334.033694-84.798682h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v309.052847a103.005669 103.005669 0 0 1-103.005669 103.005669h-28.67242a103.005669 103.005669 0 0 1-103.005669-103.005669v-309.017007a103.005669 103.005669 0 0 1 102.969828-103.005669z m333.997853-211.960865h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v515.100026a103.005669 103.005669 0 0 1-102.826466 103.005669h-28.672421a103.005669 103.005669 0 0 1-103.184871-103.005669V399.765217a103.005669 103.005669 0 0 1 103.005669-103.005669z m-39.030332-204.900282L723.557873 20.859186 970.499091 0l-55.015206 241.63682-63.151005-72.648744-313.712116 256.976564a49.639127 49.639127 0 0 1-75.265103-13.081791L392.176379 291.741874l-257.048246 203.574182a49.531606 49.531606 0 0 1-70.713356-8.064118 52.327167 52.327167 0 0 1 7.884915-72.433701l301.956424-240.131518a49.639127 49.639127 0 0 1 74.584133 13.691081L519.23104 308.228516l266.151739-216.476772z" fill="" p-id="13235"></path></svg>

src/assets/icons/svg/water.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635748668" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5697" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C295.2192 1024 119.466667 846.848 119.466667 628.394667 119.466667 482.645333 250.299733 273.2032 512 0 773.700267 273.237333 904.533333 482.679467 904.533333 628.394667 904.533333 846.848 728.7808 1024 512 1024z m-287.675733-340.923733a337.134933 337.134933 0 0 0 213.060266 238.6944 34.577067 34.577067 0 0 0 44.270934-21.162667 34.986667 34.986667 0 0 0-20.992-44.612267 267.502933 267.502933 0 0 1-168.96-189.269333 34.6112 34.6112 0 1 0-67.3792 16.384z" fill="" p-id="5698"></path></svg>

src/views/hotWater/hotPumpLog/index.vue

@@ -152,8 +152,14 @@
       </el-table-column>
       <el-table-column label="8号热泵" v-if="showMorePump">
         <el-table-column prop="tempSetHotPumpEight" label="设定温度℃">
+          <template slot-scope="scope">
+            {{ scope.row.tempSetHotPumpEight }}
+          </template>
         </el-table-column>
         <el-table-column prop="tempRealHotPumpEight" label="实际温度℃">
+          <template slot-scope="scope">
+            {{ scope.row.tempRealHotPumpEight }}
+          </template>
         </el-table-column>
         <el-table-column prop="statusSwitchHotPumpEight" label="设备开关机">
           <template slot-scope="scope">
@@ -169,16 +175,16 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="循环泵" v-if="!showMorePump">
-        <el-table-column prop="statusSwitchHotPumpEight" label="循环泵1运行状态">
+        <el-table-column prop="statusRunCyclePumpOne" label="循环泵1运行状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.statusRunCyclePumpOneStr === 1" type="success">运行</el-tag>
+            <el-tag v-if="scope.row.statusRunCyclePumpOne === 1" type="success">运行</el-tag>
-            <el-tag v-if="scope.row.statusRunCyclePumpOneStr === 0" type="danger">不运行</el-tag>
+            <el-tag v-if="scope.row.statusRunCyclePumpOne === 0" type="danger">不运行</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="statusRunHotPumpEight" label="循环泵2运行状态">
+        <el-table-column prop="statusRunCyclePumpTwo" label="循环泵2运行状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.statusRunCyclePumpTwoStr === 1" type="success">运行</el-tag>
+            <el-tag v-if="scope.row.statusRunCyclePumpTwo === 1" type="success">运行</el-tag>
-            <el-tag v-if="scope.row.statusRunCyclePumpTwoStr === 0" type="danger">不运行</el-tag>
+            <el-tag v-if="scope.row.statusRunCyclePumpTwo === 0" type="danger">不运行</el-tag>
           </template>
         </el-table-column>
       </el-table-column>
@@ -796,7 +802,7 @@ export default {
         tempRealHotPumpSix: "",
         statusSwitchHotPumpSix: "",
         statusRunHotPumpSix: "",
-        
+
         tempSetHotPumpSeven: "",
         tempRealHotPumpSeven: "",
         statusSwitchHotPumpSeven: "",
@@ -808,7 +814,7 @@ export default {
         statusRunHotPumpEight: "",
 
         statusRunCyclePumpOneStr: "",
-        statusRunCyclePumpTwoStr:"",
+        statusRunCyclePumpTwoStr: "",
 
         levelWaterTankOne: "",
         levelWaterTankTwo: "",

src/views/system/menu/index.vue

@@ -578,12 +578,16 @@ export default {
 
   ::v-deep .el-dialog .el-form-item__label {
     width: 120px !important;
+    white-space: nowrap;
   }
   ::v-deep .el-dialog .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: center;
   }
+  ::v-deep .el-dialog .el-form-item__label span {
+    white-space: nowrap;
+  }
 }
 @media (min-width: 2000px) {
   ::v-deep .el-dialog {
@@ -592,11 +596,15 @@ export default {
 
   ::v-deep .el-dialog .el-form-item__label {
     width: 1.2rem !important;
+    white-space: nowrap;
   }
   ::v-deep .el-dialog .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: center;
   }
+  ::v-deep .el-dialog .el-form-item__label span {
+    white-space: nowrap;
+  }
 }
 </style>