From c593a0087a0bbc71c03b06d721ab7fe92b2fd419 Mon Sep 17 00:00:00 2001
From: jiminglei <836545853@qq.com>
Date: Fri, 2 Jun 2023 11:21:09 +0800
Subject: [PATCH 1/3] 11

---
 psdc-ui/src/views/system/cl/index.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue
index 20cd66f..7bf4f2b 100644
--- a/psdc-ui/src/views/system/cl/index.vue
+++ b/psdc-ui/src/views/system/cl/index.vue
@@ -70,9 +70,9 @@
           <el-checkbox-group v-model="data.checkedSblb" @change="handleCheckedCitiesChange">
             <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" label-width="120" style="margin-bottom: 10px">
                <span style="width: 70px;display: inline-block">{{item.deviceName}}</span>
-              <el-input type="number" v-model="item.intemp"  placeholder="进水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
-              <el-input type="number" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
+              <el-input :disabled="item.inTemp" type="number" v-model="item.intemp"  placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input :disabled="item.outTemp" type="number" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input :disabled="item.Temp" type="number" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
             </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="12">-->
@@ -192,6 +192,12 @@ onMounted(()=>{
     for(var i in crr){
       arr=arr.concat(crr[i].children)
     }
+
+    for(let j in arr){
+      arr[j].Temp=!arr[j].Temp
+      arr[j].inTemp=!arr[j].inTemp
+      arr[j].outTemp=!arr[j].outTemp
+    }
     console.log('sblb',arr)
     data.sblb=arr
     var brr = []

From 9b1bfa33967a32f250de91658f1e46303f3f8c04 Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Fri, 2 Jun 2023 11:25:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=B0=83=E6=8E=A7=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/views/control/manual/index.vue | 29 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index cd5e9cf..e22edae 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -42,10 +42,10 @@
         <el-table :data="controlLogList" height="305px">
           <el-table-column label="序号" type="index" :index="indexMethod1" width="60"></el-table-column>
           <el-table-column label="设备名称" align="center" prop="deviceName"/>
-          <el-table-column label="操作内容" align="center" prop="controlValue" width="700"/>
+          <el-table-column label="操作内容" align="center" prop="controlValue" width="700" :formatter="formatControlKeyValue"/>
           <el-table-column label="操作时间" align="center" prop="createTime"/>
           <el-table-column label="操作人员" align="center" prop="createBy"/>
-          <el-table-column label="操作结果" align="center" prop="controlResult"></el-table-column>
+          <el-table-column label="操作结果" align="center" prop="controlContext"  :formatter="formatControlResult"></el-table-column>
         </el-table>
         <el-pagination
             v-model:current-page="currentPage"
@@ -160,6 +160,25 @@ function getControlLogListFun(){
   })
 }
 
+//拼接操作内容
+function formatControlKeyValue(row){
+  // console.log(row)
+  if(!isNaN(row.controlValue)){
+    row.controlValue = row.controlValue + '℃'
+  }
+  return row.controlKey + '：' + row.controlValue
+}
+
+//操作结果样式
+// function formatControlResult(row){
+//   if(row.controlResult == '控制成功'){
+//     return '<span style="color: #14FF00">控制成功</span>';
+//   }
+//   if(row.controlResult == '控制失败'){
+//     return '<span style="color: red">控制失败</span>';
+//   }
+// }
+
 //翻页时不刷新序号
 function indexMethod1(index){
   return index+(currentPage.value-1)*pageSize.value+1
@@ -203,7 +222,7 @@ function selectCeLue(item){
   }
 
   //最终要传参的格式
-  console.log(JSON.stringify(dataArr, null, 4));
+  // console.log(JSON.stringify(dataArr, null, 4));
   SenceControlArr.value = JSON.stringify(dataArr, null, 4)
 }
 //执行
@@ -211,7 +230,9 @@ function confirmClick() {
   ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => {
     drawerIshow.value = false;
     getSenceControl(SenceControlArr.value).then((res)=>{
-      console.log(res)
+      if(res.code == 200){
+        ElMessage.success('策略导入成功')
+      }
     })
   })
 }

From 00e8f6837e2cf99bf69f31ea078fa9bf91953bbf Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Fri, 2 Jun 2023 11:30:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=B0=83=E6=8E=A7=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/views/control/manual/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index e22edae..9215988 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -232,6 +232,7 @@ function confirmClick() {
     getSenceControl(SenceControlArr.value).then((res)=>{
       if(res.code == 200){
         ElMessage.success('策略导入成功')
+        getControlLogListFun()
       }
     })
   })
@@ -284,6 +285,7 @@ function getSetTemperatureFun(item){
   }).then((res)=>{
     if(res.code == 200){
       ElMessage.success('设置温度成功！')
+      getControlLogListFun()
     }
   })