From 80c7f25d75c1cc827d44047b63aca7dfda958f8d Mon Sep 17 00:00:00 2001
From: jiminglei <836545853@qq.com>
Date: Tue, 30 May 2023 14:37:44 +0800
Subject: [PATCH] 11
---
psdc-ui/src/views/system/cl/index.vue | 214 ++++++++++++++++++--------
1 file changed, 150 insertions(+), 64 deletions(-)
diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue
index ef91d88..25c2968 100644
--- a/psdc-ui/src/views/system/cl/index.vue
+++ b/psdc-ui/src/views/system/cl/index.vue
@@ -22,15 +22,14 @@
-
+
-
-
-
+
+
+
- 修改
+ 修改
删除
@@ -61,13 +60,18 @@
+
+
+
+
+
全选
{{item.deviceName}}
-
-
-
+
+
+
@@ -120,13 +124,27 @@
-
-
-
-
-
+
+
+ 全选
+
+
+ {{item.deviceName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -137,11 +155,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -197,15 +215,22 @@ onMounted(()=>{
const data = reactive({
checkAll: false,
checkedSblb: [],
+ checkAll1: false,
+ checkedSblb1: [],
sblb: [],
AllName:[],
isIndeterminate: false,
+ isIndeterminate1: false,
total:'',
timingList:[],
queryParams: '',
sceneCode:0,
dateRange:[],
+ postData:[],
});
+// const wat = watch(()=> data.sblb,(val) =>{
+// console.log(val)
+// })
//改变
function changeSl(){
console.log(data.sceneCode)
@@ -251,7 +276,17 @@ function handleCheckedCitiesChange(value) {
let checkedCount = value.length;
data.checkAll = checkedCount === data.sblb.length;
data.isIndeterminate = checkedCount > 0 && checkedCount < data.sblb.length;
- console.log(data.checkedSblb)
+}
+function handleCheckAllChange1(val) {
+ data.checkedSblb1 = val ? data.AllName : [];
+ data.isIndeterminate1 = false;
+ console.log(data.checkedSblb1)
+}
+
+function handleCheckedCitiesChange1(value) {
+ let checkedCount = value.length;
+ data.checkAll1 = checkedCount === data.sblb.length;
+ data.isIndeterminate1 = checkedCount > 0 && checkedCount < data.sblb.length;
}
/** 数据表格处理 */
@@ -298,19 +333,17 @@ const title1= ref();
const activeName = ref('1')
const timingForm = reactive({
sceneName:'',
- sceneCode:'',
- deviceId:'',
- temp:'',
- intemp:'',
- outtemp:''
+ sceneRemark:'',
+ deviceVos:[]
})
const timingForm1 = reactive({
sceneName:'',
- sceneCode:'',
- deviceId:'',
- temp:'',
- intemp:'',
- outtemp:''
+ sceneRemark:'',
+ deviceVos:[]
+ // deviceId:'',
+ // temp:'',
+ // intemp:'',
+ // outtemp:''
})
// const watchTime = watch(()=> timingForm.executeTime, (val) => {
@@ -329,8 +362,29 @@ function handleAdd() {
title.value = "新增策略";
};
function submitForm() {
- open.value = false;
+ let tempCheckedSblb = [];
+ 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);
+ timingForm.deviceVos=tempCheckedSblb
+
+ });
console.log(timingForm)
+ open.value = false;
+
postNew(timingForm).then((res)=>{
console.log(res)
ElMessage({type:"success",message:'新增成功!'})
@@ -339,51 +393,83 @@ function submitForm() {
console.log(res)
data.queryParams=res.data
})
- timingForm.sceneCode='',
timingForm.sceneName='',
- timingForm.deviceId='',
- timingForm.temp='',
- timingForm.intemp='',
- timingForm.outtemp=''
+ timingForm.sceneRemark='',
+ timingForm.deviceVos=[]
})
};
function cancel() {
open.value = false;
- timingForm.sceneCode='',
+ data.checkedSblb=[];
timingForm.sceneName='',
- timingForm.deviceId='',
- timingForm.temp='',
- timingForm.intemp='',
- timingForm.outtemp=''
+ timingForm.sceneRemark='',
+ timingForm.deviceVos=[]
};
-function handleXg(sceneId,sceneName,deviceId,sceneValue,sceneContext) {
+function handleXg(dat) {
open1.value = true;
title1.value = "修改策略";
- console.log(sceneId)
- timingForm1.sceneId=sceneId
- timingForm1.sceneName=sceneName
- timingForm1.deviceId=deviceId
- timingForm1.temp=sceneValue
- // if(sceneContext=='出水温度'){
- // timingForm1.outtemp=sceneValue
- // }else if (sceneContext=='进水温度'){
- // timingForm1.intemp=sceneValue
- // }else{
- // timingForm1.temp=sceneValue
- // }
+ console.log(dat)
+ var arr = []
+ for(let i in dat.deviceVos){
+ arr.push(dat.deviceVos[i].deviceId)
+ }
+ data.checkedSblb1=arr
+ for (let i = 0;i < data.sblb.length ;i++ ){
+ 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
+
+
};
function submitForm1() {
- open1.value = false;
- console.log(timingForm1)
- postXg({
- 'sceneId':timingForm1.sceneId,
- 'sceneValue':timingForm1.temp
- }).then((res)=>{
- console.log(res)
- ElMessage({type:"success",message:'修改成功!'})
- handleQuery()
- })
+ let tempCheckedSblb = [];
+ data.checkedSblb1.forEach(item => {
+ let tempItem = {
+ deviceId: item,
+ deviceName: '',
+ intemp: '',
+ outtemp: '',
+ temp: ''
+ };
+ // 根据 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
+ });
+ console.log(tempCheckedSblb)
+
+ // open1.value = false;
+ // console.log(timingForm1)
+ // postXg({
+ // 'sceneId':timingForm1.sceneId,
+ // 'sceneValue':timingForm1.temp
+ // }).then((res)=>{
+ // console.log(res)
+ // ElMessage({type:"success",message:'修改成功!'})
+ // handleQuery()
+ // })
};
function cancel1() {
open1.value = false;