From 90f214c94a70514cfd92c88949dca895e66b2687 Mon Sep 17 00:00:00 2001 From: jiminglei <836545853@qq.com> Date: Tue, 30 May 2023 16:20:40 +0800 Subject: [PATCH] 11 --- psdc-ui/src/views/system/cl/index.vue | 117 +++++++++++++++++--------- 1 file changed, 77 insertions(+), 40 deletions(-) diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue index 25c2968..95b7d1c 100644 --- a/psdc-ui/src/views/system/cl/index.vue +++ b/psdc-ui/src/views/system/cl/index.vue @@ -30,7 +30,7 @@ @@ -68,7 +68,8 @@ 全选
- {{item.deviceName}} + + {{item.deviceName}} @@ -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; - data.checkedSblb=[]; + 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); + 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) - - // open1.value = false; - // console.log(timingForm1) - // postXg({ - // 'sceneId':timingForm1.sceneId, - // 'sceneValue':timingForm1.temp - // }).then((res)=>{ - // console.log(res) - // ElMessage({type:"success",message:'修改成功!'}) - // handleQuery() - // }) + + console.log(timingForm1) + postXg(timingForm1).then((res)=>{ + console.log(res) + ElMessage({type:"success",message:'修改成功!'}) + getXl().then((res)=>{ + console.log(res) + data.queryParams=res.data + }) + 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.outtemp='' - timingForm1.intemp='' - timingForm1.temp='' + 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 handleDel(sceneId) { +function handleDel(sceneCode) { ElMessageBox.confirm("是否确认删除此策略?", "提示",{ confirmButtonText: "确认", cancelButtonText: "取消", type: "warning" }).then(() => { - console.log(sceneId) + console.log(sceneCode) postDel({ - "sceneId":sceneId, - "sceneCode":null + "sceneCode":sceneCode }).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);