Ver código fonte

首页->供热面积修改成“实供面积”总面积修改成“联网面积”
将两个面积调换位置,加一个供热率:实供面积/联网面积

yanglzh 2 anos atrás
pai
commit
46b54e1e6e

+ 10 - 5
src/views/heating/home/index.vue

@@ -132,12 +132,15 @@ export default defineComponent({
           icon: map,
           iconDark: map1,
           title: '供热面积',
-          contentTitle1: '供热面积',
+          contentTitle1: '联网面积',
           val1: '',
           unit1: '万㎡',
-          contentTitle2: '面积',
+          contentTitle2: '实供面积',
           val2: '',
           unit2: '万㎡',
+          contentTitle3: '供热率',
+          val3: '',
+          unit3: '',
         },
         {
           icon: fire,
@@ -150,7 +153,7 @@ export default defineComponent({
           val2: '',
           unit2: 'GJ/㎡',
           contentTitle3: '供热功率',
-          val3: '-',
+          val3: '',
           unit3: 'W',
         },
         {
@@ -210,9 +213,11 @@ export default defineComponent({
           heatingArea,
           unitConsumption,
           unitConsumptionTotal,
+          heatRate,
         } = res.data;
-        state.dataOne[0].val1 = heatingArea;
-        state.dataOne[0].val2 = forRealArea;
+        state.dataOne[0].val1 = forRealArea;
+        state.dataOne[0].val2 = heatingArea;
+        state.dataOne[0].val3 = heatRate;
 
         state.dataOne[1].val1 = unitConsumptionTotal;
         state.dataOne[1].val2 = unitConsumption;

+ 8 - 4
src/views/heating/monitor/loopSupervision/heatStationDetail.vue

@@ -95,12 +95,15 @@ export default defineComponent({
           icon: map,
           iconDark: map1,
           title: '供热面积',
-          contentTitle1: '供热面积',
+          contentTitle1: '联网面积',
           val1: '0',
           unit1: '㎡',
-          contentTitle2: '面积',
+          contentTitle2: '实供面积',
           val2: '0',
           unit2: '㎡',
+          contentTitle3: '供热率',
+          val3: '',
+          unit3: '',
         },
         {
           icon: fire,
@@ -162,8 +165,9 @@ export default defineComponent({
         code: route.query.code
       }).then((res: any) => {
         let data = res
-        state.dataOne[0].val1 = data.heatingArea //供暖面积
-        state.dataOne[0].val2 = data.forRealArea //实供面积
+        state.dataOne[0].val1 = data.forRealArea
+        state.dataOne[0].val2 = data.heatingArea
+        state.dataOne[0].val2 = data.heatRate
         state.dataOne[1].val1 = data.unitConsumptionTotal //总热耗
         state.dataOne[1].val2 = data.unitConsumption //热单耗
         state.dataOne[2].val1 = data.elctricConsumptionTotal //总电量

+ 8 - 4
src/views/heating/monitor/loopSupervision/loopDetail.vue

@@ -107,12 +107,15 @@ export default defineComponent({
           icon: map,
           iconDark: map1,
           title: '供热面积',
-          contentTitle1: '供热面积',
+          contentTitle1: '联网面积',
           val1: '0',
           unit1: '㎡',
-          contentTitle2: '面积',
+          contentTitle2: '实供面积',
           val2: '0',
           unit2: '㎡',
+          contentTitle3: '供热率',
+          val3: '',
+          unit3: '',
         },
         {
           icon: fire,
@@ -183,8 +186,9 @@ export default defineComponent({
         code: route.query.code
       }).then((res: any) => {
         let data = res
-        state.dataOne[0].val1 = data.heatingArea //供暖面积
-        state.dataOne[0].val2 = data.forRealArea //实供面积
+        state.dataOne[0].val1 = data.forRealArea
+        state.dataOne[0].val2 = data.heatingArea
+        state.dataOne[0].val2 = data.heatRate
         state.dataOne[1].val1 = data.unitConsumptionTotal //总热耗
         state.dataOne[1].val2 = data.unitConsumption //热单耗
         state.dataOne[2].val1 = data.elctricConsumptionTotal //总电量