@@ -298,8 +298,8 @@
Date: Wed, 8 Mar 2023 11:40:05 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E6=B8=85=E5=B1=8F=E6=9C=AA=E5=8F=8A=E6=97=B6=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ControlPanelDialog.vue | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index e2dc2c9..c50a7c0 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1493,6 +1493,13 @@ export default defineComponent({
});
});
}
+ if(a.length==0){
+ console.log(123)
+ test_monitor_list.value.forEach((ele) => {
+ ele.isHide = false;
+ })
+ test_monitor_wall.value=[]
+ }
};
const sub_x = () => {
const wall_dom = wall.value;
@@ -1713,6 +1720,7 @@ export default defineComponent({
sort_index.value = [];
old_sort_index = [];
last_wall.value = [];
+ last_percenter.value=1
let client = GlobalData.getInstance().getCurrentClient();
if (client) {
const settings = await GlobalData.getInstance()
From 45c30349a04d845481259c3928de9d7199f66eb6 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 11:40:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E6=B8=85=E5=B1=8F=E6=9C=AA=E5=8F=8A=E6=97=B6=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ControlPanelDialog.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index e2dc2c9..6bf1149 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1493,6 +1493,12 @@ export default defineComponent({
});
});
}
+ if(a.length==0){
+ test_monitor_list.value.forEach((ele) => {
+ ele.isHide = false;
+ })
+ test_monitor_wall.value=[]
+ }
};
const sub_x = () => {
const wall_dom = wall.value;
@@ -1713,6 +1719,7 @@ export default defineComponent({
sort_index.value = [];
old_sort_index = [];
last_wall.value = [];
+ last_percenter.value=1
let client = GlobalData.getInstance().getCurrentClient();
if (client) {
const settings = await GlobalData.getInstance()
@@ -2009,8 +2016,6 @@ export default defineComponent({
monitor_list_current_index.value = -1;
}
}
- console.log(item)
- console.log(test_monitor_wall.value)
}
},
From ea5f50ff8e2da791e0b00fb02061d76b3c88e0f8 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 11:58:05 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=90=88=E5=B9=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ControlPanelDialog.vue | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index 57821b8..6bf1149 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1494,10 +1494,6 @@ export default defineComponent({
});
}
if(a.length==0){
-<<<<<<< HEAD
-=======
- console.log(123)
->>>>>>> b2f88140799e0867e7ee99aaa09fe88f841aa673
test_monitor_list.value.forEach((ele) => {
ele.isHide = false;
})
From 549b06f756f39f29ab8e8f1376c604f12e28aece Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 14:14:58 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E5=8A=A0?=
=?UTF-8?q?=E5=BC=80=E7=AA=97=E9=81=BF=E5=85=8D=E6=98=BE=E7=A4=BA=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ControlPanelDialog.vue | 28 +++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index 6bf1149..49dcb5f 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1292,9 +1292,11 @@ export default defineComponent({
((item.currenty + item.h / 2) / wall_dom?.offsetHeight) * 2160
);
}
- test_monitor_wall.value=ordination(JSON.parse(JSON.stringify(test_monitor_wall.value)))
+ test_monitor_wall.value = ordination(
+ JSON.parse(JSON.stringify(test_monitor_wall.value))
+ );
realtime_upload();
- item.active=true
+ item.active = true;
};
const exceedrange = (item: test_monitor) => {
const wall_dom = wall.value;
@@ -1482,7 +1484,7 @@ export default defineComponent({
);
item.angle = element.angle;
item.isShow = true;
- item.active=false;
+ item.active = false;
test_monitor_wall.value.push(JSON.parse(JSON.stringify(item)));
sort_index.value.push(test_monitor_list.value[element.index].uuid);
@@ -1493,11 +1495,11 @@ export default defineComponent({
});
});
}
- if(a.length==0){
+ if (a.length == 0) {
test_monitor_list.value.forEach((ele) => {
ele.isHide = false;
- })
- test_monitor_wall.value=[]
+ });
+ test_monitor_wall.value = [];
}
};
const sub_x = () => {
@@ -1719,7 +1721,7 @@ export default defineComponent({
sort_index.value = [];
old_sort_index = [];
last_wall.value = [];
- last_percenter.value=1
+ last_percenter.value = 1;
let client = GlobalData.getInstance().getCurrentClient();
if (client) {
const settings = await GlobalData.getInstance()
@@ -1774,7 +1776,7 @@ export default defineComponent({
});
$store.commit("setShowMonitorList", []);
loading.value = false;
- } else if (a && wall_dom) {
+ } else if (a && wall_dom) {
a.forEach((element) => {
let item: test_monitor = new test_monitor(0, "0", 0, 0, 0);
extend(true, item, test_monitor_list.value[element.index]);
@@ -1798,7 +1800,7 @@ export default defineComponent({
);
item.angle = element.angle;
item.isShow = true;
- item.active=false
+ item.active = false;
test_monitor_wall.value.push(JSON.parse(JSON.stringify(item)));
last_wall.value.push(JSON.parse(JSON.stringify(item)));
sort_index.value.push(
@@ -1815,6 +1817,13 @@ export default defineComponent({
current_index.value = -1;
}
}
+ if (a.length == 0) {
+ test_monitor_list.value.forEach((ele) => {
+ ele.isHide = false;
+ });
+ sort_index.value = [];
+ test_monitor_wall.value = [];
+ }
}
}
},
@@ -2017,7 +2026,6 @@ export default defineComponent({
}
}
}
-
},
onDragEnter(e: DragEvent, index: string) {
From 9e7acc248212f394f59bb90ed5f0141087e4dae9 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 15:35:15 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E6=89=93?=
=?UTF-8?q?=E5=BC=80=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=E5=8F=98=E9=87=8F=EF=BC=8C=E5=A4=9A=E9=80=89=E5=AF=B9?=
=?UTF-8?q?=E9=BD=90=E5=AE=8C=E6=B8=85=E7=A9=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ControlPanelDialog.vue | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index 49dcb5f..73f8ce6 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1743,6 +1743,9 @@ export default defineComponent({
offsetWidth.value = wall_dom.offsetWidth;
getpx();
}
+ test_monitor_list.value.forEach((element) => {
+ element.isHide = false;
+ });
if (response && settings) {
const a = response?.config.windows;
output_length.value =
@@ -1771,9 +1774,7 @@ export default defineComponent({
multiple.value = false;
last_wall.value = [];
sort_index.value = [];
- test_monitor_list.value.forEach((element) => {
- element.isHide = false;
- });
+
$store.commit("setShowMonitorList", []);
loading.value = false;
} else if (a && wall_dom) {
@@ -2213,7 +2214,7 @@ export default defineComponent({
tep_item.currenty = item.currenty;
}
});
-
+ multiple_select.value=[]
realtime_upload();
},
alignBottom() {
@@ -2224,6 +2225,7 @@ export default defineComponent({
tep_item.currenty = item.currenty + item.h - tep_item.h;
}
});
+ multiple_select.value=[]
realtime_upload();
},
alignRight() {
@@ -2234,7 +2236,7 @@ export default defineComponent({
tep_item.currentx = item.currentx + item.w - tep_item.w;
}
});
-
+ multiple_select.value=[]
realtime_upload();
},
alignLeft() {
@@ -2245,6 +2247,7 @@ export default defineComponent({
tep_item.currentx = item.currentx;
}
});
+ multiple_select.value=[]
realtime_upload();
},
testLog(a: any) {