11

psdc-ui/src/views/system/cl/index.vue

@@ -30,7 +30,7 @@
             <el-table-column label="操作" align="center" prop="handle">
               <template v-slot="scope">
                 <el-button type="primary" size="small" icon="Edit" v-hasPermi="['system:cl:edit']" @click="handleXg(scope.row)">修改</el-button>
-                <el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.sceneId)">删除</el-button>
+                <el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.sceneCode)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -68,7 +68,8 @@
           <el-checkbox :indeterminate="data.isIndeterminate" v-model="data.checkAll" @change="handleCheckAllChange">全选</el-checkbox>
           <div style="margin: 15px 0;"></div>
           <el-checkbox-group v-model="data.checkedSblb" @change="handleCheckedCitiesChange">
-            <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" style="margin-bottom: 10px">{{item.deviceName}}
+            <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" label-width="120" style="margin-bottom: 10px">
+               {{item.deviceName}}
               <el-input v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
               <el-input v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
               <el-input v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
@@ -339,6 +340,7 @@ const timingForm = reactive({
 const timingForm1 = reactive({
   sceneName:'',
   sceneRemark:'',
+  sceneCode:'',
   deviceVos:[]
   // deviceId:'',
   // temp:'',
@@ -380,11 +382,11 @@ function submitForm() {
     }
     tempCheckedSblb.push(tempItem);
     timingForm.deviceVos=tempCheckedSblb
-
+    deviceInfo.intemp=''
+    deviceInfo.outtemp=''
+    deviceInfo.temp=''
   });
   console.log(timingForm)
-  open.value = false;
-
   postNew(timingForm).then((res)=>{
     console.log(res)
     ElMessage({type:"success",message:'新增成功！'})
@@ -397,14 +399,39 @@ function submitForm() {
         timingForm.sceneRemark='',
         timingForm.deviceVos=[]
   })
-
+  data.checkedSblb=[];
+  data.isIndeterminate=false
+  open.value = false;
 };
 function cancel() {
-  open.value = false;
+  let tempCheckedSblb = [];
-  data.checkedSblb=[];
+  data.checkedSblb.forEach(item => {
+    let tempItem = {
+      deviceId: item,
+      intemp: '',
+      outtemp: '',
+      temp: ''
+    };
+    // 根据 item 从 data.sblb 中找到对应的设备信息
+    let deviceInfo = data.sblb.find(sblbItem => sblbItem.deviceId === item);
+    if (deviceInfo) {
+      tempItem.intemp = deviceInfo.intemp;
+      tempItem.outtemp = deviceInfo.outtemp;
+      tempItem.temp = deviceInfo.temp;
+    }
+    tempCheckedSblb.push(tempItem);
+    deviceInfo.intemp=''
+    deviceInfo.outtemp=''
+    deviceInfo.temp=''
+  });
       timingForm.sceneName='',
       timingForm.sceneRemark='',
-      timingForm.deviceVos=[]
+      timingForm.deviceVos=[];
+
+  data.checkedSblb=[];
+  data.isIndeterminate=false
+  open.value = false;
+
 };
 function handleXg(dat) {
   open1.value = true;
@@ -419,20 +446,15 @@ function handleXg(dat) {
     var deviceId = data.sblb[i].deviceId
     for (let j = 0;j < dat.deviceVos.length ;j++ ) {
       if ( deviceId === dat.deviceVos[j].deviceId){
-        console.log("data.sblb[i].intemp   " + data.sblb[i].intemp);
-        console.log("b.intemp   " + dat.deviceVos[j].intemp);
         data.sblb[i].intemp = dat.deviceVos[j].intemp;
         data.sblb[i].outtemp = dat.deviceVos[j].outtemp;
         data.sblb[i].temp = dat.deviceVos[j].temp;
       }
     }
   }
-  console.log("---------------------------------")
-  console.log(data.sblb)
-
-
   timingForm1.sceneName=dat.sceneName
   timingForm1.sceneRemark=dat.sceneRemark
+  timingForm1.sceneCode = dat.sceneCode
 
 
 };
@@ -441,7 +463,6 @@ function submitForm1() {
   data.checkedSblb1.forEach(item => {
     let tempItem = {
       deviceId: item,
-      deviceName: '',
       intemp: '',
       outtemp: '',
       temp: ''
@@ -449,50 +470,65 @@ function submitForm1() {
     // 根据 item 从 data.sblb 中找到对应的设备信息
     let deviceInfo = data.sblb.find(sblbItem => sblbItem.deviceId === item);
     if (deviceInfo) {
-      tempItem.deviceName = deviceInfo.deviceName;
       tempItem.intemp = deviceInfo.intemp;
       tempItem.outtemp = deviceInfo.outtemp;
       tempItem.temp = deviceInfo.temp;
-
     }
     tempCheckedSblb.push(tempItem);
-    data.postData=tempCheckedSblb
+     timingForm1.deviceVos=tempCheckedSblb
   });
-  console.log(tempCheckedSblb)
+
-
+  console.log(timingForm1)
-  // open1.value = false;
+  postXg(timingForm1).then((res)=>{
-  // console.log(timingForm1)
+    console.log(res)
-  // postXg({
+    ElMessage({type:"success",message:'修改成功！'})
-  //   'sceneId':timingForm1.sceneId,
+    getXl().then((res)=>{
-  //   'sceneValue':timingForm1.temp
+      console.log(res)
-  // }).then((res)=>{
+      data.queryParams=res.data
-  //   console.log(res)
+    })
-  //   ElMessage({type:"success",message:'修改成功！'})
+    handleQuery()
-  //   handleQuery()
+  })
-  // })
+  open1.value = false;
+  timingForm1.sceneName=''
+  timingForm1.sceneRemark=''
+  timingForm1.sceneCode=''
+  timingForm1.deviceVos=[]
+  for(let i in data.sblb) {
+    data.sblb[i].temp = ''
+    data.sblb[i].intemp = ''
+    data.sblb[i].outtemp = ''
+  }
 };
 function cancel1() {
   open1.value = false;
-  timingForm1.sceneId=''
   timingForm1.sceneName=''
-  timingForm1.deviceId=''
+  timingForm1.sceneRemark=''
-  timingForm1.outtemp=''
+  timingForm1.sceneCode=''
-  timingForm1.intemp=''
+  timingForm1.deviceVos=[]
-  timingForm1.temp=''
+for(let i in data.sblb){
+  data.sblb[i].temp=''
+  data.sblb[i].intemp=''
+  data.sblb[i].outtemp=''
+}
+
+
 };
-function handleDel(sceneId) {
+function handleDel(sceneCode) {
   ElMessageBox.confirm("是否确认删除此策略？", "提示",{
     confirmButtonText: "确认",
     cancelButtonText: "取消",
     type: "warning"
   }).then(() => {
-    console.log(sceneId)
+    console.log(sceneCode)
     postDel({
-      "sceneId":sceneId,
+      "sceneCode":sceneCode
-      "sceneCode":null
     }).then((res) => {
       console.log(res)
       ElMessage({type:"success",message:'删除成功！'})
+      getXl().then((res)=>{
+        console.log(res)
+        data.queryParams=res.data
+      })
       handleQuery()
     });
   })
@@ -505,6 +541,7 @@ const { queryParams } = toRefs(data);
 </script>
 
 <style scoped lang="scss">
+
 .dev_control_table{
   position: relative;
   width: 100%;