From d17ae463e87fb97ec24012063945ae4b69bb2ae3 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 25 Jun 2024 08:43:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/xbot/AppTaskAi/components/TaskAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xbot/AppTaskAi/components/TaskAdd.vue b/packages/xbot/AppTaskAi/components/TaskAdd.vue index 03219766..57a74c19 100644 --- a/packages/xbot/AppTaskAi/components/TaskAdd.vue +++ b/packages/xbot/AppTaskAi/components/TaskAdd.vue @@ -116,7 +116,7 @@
{{item.areaName}} - +
From f7976b60229861e65f46896d053fb8c9b8bb5301 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 25 Jun 2024 09:05:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E8=8F=9C=E5=8D=95=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/AppMenuManager/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/AppMenuManager/list.vue b/packages/core/AppMenuManager/list.vue index ad6d97eb..5d7a806c 100644 --- a/packages/core/AppMenuManager/list.vue +++ b/packages/core/AppMenuManager/list.vue @@ -163,7 +163,7 @@ export default { }, addMenu(row) { this.dialog = true - this.form = {parentId: row.id} + this.form = {parentId: row.id, status: 1} this.selected = row }, handleEdit(row) { From eca9fc8196acd938ce84f4539ce3c8190fb81f70 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 25 Jun 2024 09:15:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/AppMenuManager/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/AppMenuManager/list.vue b/packages/core/AppMenuManager/list.vue index 5d7a806c..97148720 100644 --- a/packages/core/AppMenuManager/list.vue +++ b/packages/core/AppMenuManager/list.vue @@ -48,7 +48,7 @@ - From 892979ef1a4b90828b34b4c12b2c236960c982ce Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 25 Jun 2024 09:22:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=82=E8=BD=BD=E5=88=86=E5=B1=8F?= =?UTF-8?q?=E6=89=80=E9=9C=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/designer/viewport.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bigscreen/designer/viewport.vue b/packages/bigscreen/designer/viewport.vue index 055847c1..bf562ec4 100644 --- a/packages/bigscreen/designer/viewport.vue +++ b/packages/bigscreen/designer/viewport.vue @@ -405,9 +405,9 @@ export default { this.closePage() }, save() { - const {did: id} = this.$route.query, {dashboard} = this + const {did: id, id: pid} = this.$route.query, {dashboard} = this this.instance.post(`/app/appdiylargescreen/addOrUpdateLargeScreen`, { - id, + id, pid, config: JSON.stringify({ config: this.componentList, dashboard, From c0667636a5da8e2d518c47612101109f4aeeebca Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 25 Jun 2024 09:39:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8C=82=E8=BD=BD=E5=88=86=E5=B1=8F?= =?UTF-8?q?=E6=89=80=E9=9C=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/designer/viewport.vue | 10 +++------- packages/core/AppMenuManager/list.vue | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/bigscreen/designer/viewport.vue b/packages/bigscreen/designer/viewport.vue index bf562ec4..ba4857f4 100644 --- a/packages/bigscreen/designer/viewport.vue +++ b/packages/bigscreen/designer/viewport.vue @@ -395,13 +395,9 @@ export default { } }) }, - back(params) { - if (!!params) { - const {id} = this.$route.query - this.$router.push({hash: "#add", params, query: {id}}) - } else { - this.$router.back() - } + back() { + const {id} = this.$route.query + this.$router.push({hash: "#add", params, query: {id}}) this.closePage() }, save() { diff --git a/packages/core/AppMenuManager/list.vue b/packages/core/AppMenuManager/list.vue index 97148720..a01af7b0 100644 --- a/packages/core/AppMenuManager/list.vue +++ b/packages/core/AppMenuManager/list.vue @@ -163,7 +163,7 @@ export default { }, addMenu(row) { this.dialog = true - this.form = {parentId: row.id, status: 1} + this.form = {parentId: row.id, status: "1"} this.selected = row }, handleEdit(row) {