From 48c7400a736ffd8715322a562fa26059f49390ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Wed, 27 Mar 2024 16:20:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug:=E5=80=BC=E7=8F=AD?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E6=B8=85=E9=99=A4=E4=B8=8A=E6=AC=A1=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=97=B6=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ModifyDutyInformationTable.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue index 27befccc..1cee7337 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue @@ -133,6 +133,13 @@ export default { return this.visible; }, set(bool) { + //关闭弹窗组件,清空数据 + if(!bool) { + this.dayShift = []; + this.graveyardShift = []; + this.peopleList = []; + } + this.$emit("close", bool); }, }, @@ -269,7 +276,7 @@ export default { // console.log("%c [ data ]-202-「ModifyDutyInformationTable.vue」", "font-size:15px; background:#9afce6; color:#deffff;", data, this.value2); const closeMessage = loadingMessage({ - message: "正在保存值班信息111...", + message: "正在保存值班信息...", }); if (!this.data) { From e62aec829f82a6fa6d268cc6a9ffb55e81677ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Wed, 27 Mar 2024 16:50:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug:=E7=99=BD=E5=A4=A9?= =?UTF-8?q?=E5=80=BC=E7=8F=AD=E4=B8=8E=E6=99=9A=E4=B8=8A=E5=80=BC=E7=8F=AD?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=90=8C=E6=97=B6=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E6=99=9A=E4=B8=8A=E5=80=BC=E7=8F=AD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=99=BD=E5=A4=A9=E5=80=BC=E7=8F=AD=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E4=BA=BA=E5=91=98=E4=BB=8E=E6=99=9A?= =?UTF-8?q?=E4=B8=8A=E5=80=BC=E7=8F=AD=E4=B8=AD=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dutyOfficer/components/ModifyDutyInformationTable.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue index 1cee7337..85965cdb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue @@ -27,7 +27,7 @@

{{ item.name }}

@@ -41,7 +41,7 @@

{{ item.name }}

@@ -178,7 +178,9 @@ export default { this[this.active].push(item); }, - removeDutyPerson(item) { + removeDutyPerson(item, activeCheck) { + if(activeCheck != this.active) return; + const index = this[this.active].findIndex( (_item) => _item.id === item.id ); From 4695a12a1a2a00624d24402a67b16c140075ea46 Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Thu, 28 Mar 2024 11:20:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat=20=20=E5=BC=B9=E7=AA=97=E8=92=99?= =?UTF-8?q?=E5=B1=82=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialog/index.vue | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 3b868f4d..7a574411 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -1,40 +1,23 @@ @@ -336,6 +241,7 @@ import testDeviceInfo from "@screen/testData/infoBoard.js"; import WgtTitle from "@screen/pages/perception/widgets/title"; import InfoBoard from "@screen/mixins/InfoBoard"; +import { initSearch } from "@screen/utils/enum/common.js" export default { name: "Device", @@ -519,18 +425,18 @@ export default { this.____getIotBoard(); }, - ____onSearchDevice(){ + ____onSearchDevice() { this.____getIotBoard(); }, - ____resetForm(){ + ____resetForm() { this.form = { selectedDirection: "", status: ["0", "1"], - stakeFrom: [55, 378], - stakeTo: [208, 153] + stakeFrom: initSearch.startStakeMark, + stakeTo: initSearch.endStakeMark } }, - ____onResetSearchDevice(){ + ____onResetSearchDevice() { this.____resetForm(); this.____initDirection(); this.____getIotBoard(); @@ -548,10 +454,10 @@ export default { let stakeFrom = this.form.stakeFrom[0] * 1000 + this.form.stakeFrom[1]; let stakeTo = this.form.stakeTo[0] * 1000 + this.form.stakeTo[1]; let statusForm = _.cloneDeep(this.form.status); - if(statusForm.includes("0")){ + if (statusForm.includes("0")) { statusForm.push(null) - } - + } + if (IS_TESTING) { let res = testDeviceList; res.data.forEach((item) => { @@ -574,10 +480,10 @@ export default { item.otherConfig = JSON.parse(item.otherConfig); } item.iotDeviceId = item.iotDeviceId || "null_" + item.id; - + let stakeThis = +item?.stakeMark?.replace(/[K\+]/g, "") || -1; - if(stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)){ + if (stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)) { this.boardSizeDic[item.otherConfig.screenSize].list.push(item); } if (!this.selectedSize) { @@ -612,11 +518,11 @@ export default { this.isHideCtt = false; }); }) - .catch((err) => {}); + .catch((err) => { }); } }, ____onAddTemplate() { - + // if(selectedSize){ // fontSize = "64px" // } @@ -798,7 +704,7 @@ export default { }, // 接收子组件form表单 修改 - receiveForm(form) { + receiveForm(form) { console.log(form, "接收子组件form表单 修改"); this.contentList.splice(this.index_, 1, form); this.$forceUpdate(); @@ -812,11 +718,11 @@ export default { if (this.checkedDeviceIds.length == 0) { return; } - - this.selectedDevices = _.filter(this.boardSizeDic[this.selectedSize].list, (item)=>{ + + this.selectedDevices = _.filter(this.boardSizeDic[this.selectedSize].list, (item) => { return this.checkedDeviceIds.includes(item.iotDeviceId) }); - + // this.____forkDeviceInfo(this.selectedDevices); }, @@ -1037,11 +943,14 @@ export default { };