11

psdc-ui/src/views/control/manual/index.vue

@@ -25,7 +25,7 @@
                 </span>
               </el-form-item>
 
-              <el-form-item style="margin-left: 27px" v-for="inputs in item.control_elements" :label="inputs.nowTempRemark" v-if="data.show2">{{inputs.tempValue}}</el-form-item>
+              <el-form-item style="margin-left: 27px" v-for="inputs in item.control_elements" :label="inputs.nowTempRemark" v-if="data.show2">{{inputs.tempValue}}℃</el-form-item>
               <!--              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><input class="tempInput"/></el-form-item>-->
 
               <el-button class="mybtn" type="primary" v-show="item.control_elements.length > 0 ? true : false" :disabled="item.deviceRunstatus == true ? false : true" @click="getSetTemperatureFun1()" v-if="data.show2">设定温度</el-button>
@@ -138,7 +138,7 @@ onMounted(()=>{
 })
 function GetResult(){
   ControlResult().then((res)=>{
-    console.log(res)
+    console.log('执行策略',res)
   if(!res.data){
     radio.value=''
     data.strategyCode=''
@@ -149,6 +149,7 @@ function GetResult(){
   }
   else if(res.data){
     var a =  res.data.strategyRunRes.substring(res.data.strategyRunRes.length-1)
+    console.log(a)
     if(a==0){
       radio.value=res.data.strategyName
       data.strategyCode=res.data.strategyCode
@@ -538,14 +539,14 @@ function controlMsg() {
           if (i >= res.data.length) {
             return; //递归终止条件
           }
-          if(res.data[i]==1){
+          if(res.data[i]=='1'){
             celueItem.scenesList[i].type = 'success';
             celueItem.scenesList[i].icon = 'Check';
           }
-          else if(res.data[i]==0){
+          else if(res.data[i]=='0'){
             celueItem.scenesList[i].type = 'danger';
             celueItem.scenesList[i].icon = 'Close';
-          }else if(res.data[i]==2){
+          }else if(res.data[i]=='2'){
             celueItem.scenesList[i].type = 'warning';
             celueItem.scenesList[i].icon = 'loading';
           }