diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue index c4861e5..8741f99 100644 --- a/src/components/ControlPanelDialog.vue +++ b/src/components/ControlPanelDialog.vue @@ -107,7 +107,7 @@ -
{{ $t("angle") }}
+
{{ $t("angle") }}

@@ -162,13 +162,13 @@

-
+
{{ $t("physical central location") }}

-
- +
+ X: @@ -215,9 +215,9 @@

-
+
- + Y: @@ -411,7 +411,7 @@ -1" - type="text" + type="number" v-model="test_monitor_list[monitor_list_current_index].cmh" @update:model-value="changeHeight()" :rules="[ @@ -964,7 +964,7 @@ export default defineComponent({ } }); // $store.commit("setShowMonitorList", monitorList); - // console.log($store.state.show_monitor_list) + // console.log($store.state.show_monitor_list) } if (!setMagic?.success) { $q.notify({ @@ -1000,10 +1000,10 @@ export default defineComponent({ const close_magic_switch = () => { let client = GlobalData.getInstance().getCurrentClient(); magic_switch.value = false; - if(client){ + if (client) { client.setMagicWallList( - JSON.parse(JSON.stringify(test_monitor_list.value)) - ); + JSON.parse(JSON.stringify(test_monitor_list.value)) + ); } upload_magic_switch(); }; @@ -1375,12 +1375,12 @@ export default defineComponent({ multiple.value = false; loading.value = false; if (list_magic) { - JSON.parse(list_magic).forEach((element:any,index:number) => { - if(test_monitor_list.value[index].uuid==element.uuid){ - test_monitor_list.value[index].cmw=element.cmw - test_monitor_list.value[index].cmh=element.cmh + JSON.parse(list_magic).forEach((element: any, index: number) => { + if (test_monitor_list.value[index].uuid == element.uuid) { + test_monitor_list.value[index].cmw = element.cmw; + test_monitor_list.value[index].cmh = element.cmh; } - });; + }); } realtime_upload(last_wall.value, last_percenter.value, 2); }; @@ -2010,15 +2010,15 @@ export default defineComponent({ const wall_dom = wall.value; item.isShow = true; if (wall_dom) { - if(item.cmw==1214){ - item.w=wall_dom.offsetWidth*0.5 - }else{ - item.w=(item.cmw/1214) *(wall_dom.offsetWidth*0.5) + if (item.cmw == 1214) { + item.w = wall_dom.offsetWidth * 0.5; + } else { + item.w = (item.cmw / 1214) * (wall_dom.offsetWidth * 0.5); } - if(item.cmh==684){ - item.h=wall_dom.offsetHeight*0.5 - }else{ - item.h=(item.cmh/684) *(wall_dom.offsetHeight*0.5) + if (item.cmh == 684) { + item.h = wall_dom.offsetHeight * 0.5; + } else { + item.h = (item.cmh / 684) * (wall_dom.offsetHeight * 0.5); } item.InitialH = item.h; item.InitialW = item.w; @@ -2095,11 +2095,16 @@ export default defineComponent({ ); const temp_index = sort_index.value.indexOf(item.uuid); sort_index.value.splice(temp_index, 1); + test_monitor_wall.value.forEach((ele, ind) => { + if (ele.uuid == item.uuid) { + test_monitor_wall.value.splice(ind, 1); + } + }); test_monitor_list.value[item.id].isHide = false; - test_monitor_wall.value[index].isShow = false; + // test_monitor_wall.value[temp_index].isShow = false; multiple_select.value = []; - test_monitor_wall.value.splice(temp_index, 1); realtime_upload(); + current_index.value = -1; }, closeOtherWindows(item: test_monitor, index: number) { current_index.value = index;