Merge remote-tracking branch 'origin/master'

psdc-ui/src/api/bigview/bigview.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 /** 8个温度传感器接口*/
 export function     getTemperature(data) {
-    return request.post('/monitor/wdcgq/index/sel1?modelTypeName='+data)
+    return request.post('/indexLook/8wd?modelTypeName='+data)
 }
 /**运行设备工作信息查询接口*/
 export function getDevicesInfo() {

psdc-ui/src/views/analyse/nhdb/index.vue

@@ -25,7 +25,7 @@ const imgSrc = ref('../src/assets/images/策略icon.png')
 const data = reactive({
   celueInfoList:[
     {
-      sceneName:'策略1',
+      sceneName:'电磁锅炉供暖策略',
       data:[
         {
           key: 1,
@@ -75,7 +75,7 @@ const data = reactive({
       ]
     },
     {
-      sceneName:'策略2',
+      sceneName:'空气源热泵供暖策略',
       data:[
         {
           key: 1,
@@ -125,52 +125,52 @@ const data = reactive({
       ]
     },
     {
-      sceneName:'策略3',
+      sceneName:'电磁锅炉水蓄热策略',
       data:[
         {
           key: 1,
           label:'开始执行时间',
-          startTime:'2023-06-05 11:00:00'
+          startTime:'2023-06-05 08:00:00'
         },
         {
           key: 2,
           label:'结束执行时间',
-          startTime:'2023-06-05 13:00:00'
+          startTime:'2023-06-05 12:00:00'
         },
         {
           key: 3,
           label:'执行时长',
-          startTime:'2h'
+          startTime:'4h'
         },
         {
           key: 4,
           label:'单位时间用电',
-          startTime:'6kWh'
+          startTime:'5kWh'
         },
         {
           key: 5,
           label:'执行前室内温度',
-          startTime:'22℃'
+          startTime:'16℃'
         },
         {
           key: 6,
           label:'执行前室外温度',
-          startTime:'15℃'
+          startTime:'13℃'
         },
         {
           key: 7,
           label:'执行后室内温度',
-          startTime:'30℃'
+          startTime:'26℃'
         },
         {
           key: 8,
           label:'执行后室外温度',
-          startTime:'15℃'
+          startTime:'16℃'
         },
         {
           key: 9,
           label:'总用电量',
-          startTime:'12kWh'
+          startTime:'20kWh'
         }
       ]
     },

psdc-ui/src/views/bigview/index.vue

@@ -67,7 +67,7 @@
             <div class="item" v-for="item in wdcgqArr" :key="item.deviceId">
               <div class="dev_name">{{ item.deviceName }}</div>
               <div class="line"></div>
-              <div class="data"><span class="screenNumber">{{ item.deviceTemp}}</span>℃</div>
+              <div class="data"><span class="screenNumber">{{ item.thermometerValue}}</span>℃</div>
             </div>
           </div>
         </div>
@@ -119,7 +119,9 @@ import {getTemperature,getDevicesInfo,getZdb} from '../../api/bigview/bigview'
 
 /** 页面加载时*/
 onMounted(()=>{
-  currentTime();
+  setInterval(()=> {
+    currentTime();
+  }, 1000);
   dcglChartFun();
   kqyrbChartFun();
   frdlChartFun();
@@ -163,7 +165,7 @@ function currentTime() {
 const wdcgqArr = ref([])
 function getWenduFun(){
   getTemperature("温度传感器").then((res)=>{
-    console.log('111',res)
+    console.log('8个温度传感器',res)
     for(let i = 0;i < res.data.length;i++){
       if(res.data[i].deviceTemp == null){
         res.data[i].deviceTemp = '--'