From aea4f4e5c00ff76a6e71b3912b4892abb9ec486c Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 31 Aug 2022 14:18:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnnounceResident/AppAnnounceResident/components/Add.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue index 6f7e403c..d5d52c2e 100644 --- a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue +++ b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue @@ -91,6 +91,12 @@
{{ form.examines.length ? '重新选择' : '选择' }}
+ + + 男 + 女 + +
From f50166c2978ab33d07c1660a91dbdf332411a07e Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 31 Aug 2022 14:24:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAnnounceResident/components/Detail.vue | 84 +------------------ .../AppAnnounceWeChat/components/Detail.vue | 84 +------------------ 2 files changed, 4 insertions(+), 164 deletions(-) diff --git a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue index 7396255c..61176b59 100644 --- a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue +++ b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue @@ -67,15 +67,9 @@ - - + - - + Date: Wed, 31 Aug 2022 14:36:50 +0800 Subject: [PATCH 3/4] 31006 --- packages/bigscreen/designer/components/Layout.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index 131c06b6..f9cc3d31 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -919,6 +919,7 @@ export default { flex: 1; padding: 0 10px; background: #0A0B0D; + overflow-y: auto; .layout-left__right--item { margin-top: 10px; From 564a4e57d8b4a9801613b5952c1c26e04fb191fd Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 31 Aug 2022 15:16:35 +0800 Subject: [PATCH 4/4] 31001 --- .../bigscreen/designer/components/Add.vue | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue index 8ae09c65..7b0184c7 100644 --- a/packages/bigscreen/designer/components/Add.vue +++ b/packages/bigscreen/designer/components/Add.vue @@ -152,6 +152,7 @@ methods: { getInfo() { let {id} = this.$route.query + if (!id) return this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenProjectDetailById?id=${id}`).then(res => { if (res?.data) { this.form = { @@ -182,7 +183,6 @@ onStatusChange (id) { this.instance.post(`${this.urlPrefix}/appdiylargescreen/enableLargeScreen?id=${id}`).then(res => { if (res.code === 0) { - this.getInfo() this.$message.success('操作成功') } }) @@ -207,12 +207,28 @@ if (ids.indexOf(e.id) < 0) { this.tableData.push({ title: e.title, - id: e.id + id: e.id, + status: '1' }) } else { const index = this.tableData.findIndex(v => v.id === e.id) this.$set(this.tableData[index], 'title', e.title) } + + this.$nextTick(() => { + if (this.$route.query.id) { + const ids = this.tableData.map(v => v.id).join(',') + const names = this.tableData.map(v => v.name).join(',') + this.instance.post(`${this.urlPrefix}/appdiylargescreen/addOrUpdateLargeScreenProject`, { + ...this.form, + relationLsIds: ids, + relationLsNames: names + }).then(res => { + if (res.code == 0) { + } + }) + } + }) }, add() {