From 6b143f2f7569eaf8a16b483e0bc2270da8d12f7f Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 14 Dec 2022 15:56:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/sys/AuditTeam.vue | 432 +++++++++++++++++++++++ back/src/views/modules/sys/role.vue | 6 +- 2 files changed, 435 insertions(+), 3 deletions(-) create mode 100644 back/src/views/modules/sys/AuditTeam.vue diff --git a/back/src/views/modules/sys/AuditTeam.vue b/back/src/views/modules/sys/AuditTeam.vue new file mode 100644 index 00000000..07f10f7f --- /dev/null +++ b/back/src/views/modules/sys/AuditTeam.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/back/src/views/modules/sys/role.vue b/back/src/views/modules/sys/role.vue index 72da927a..d08cb4dd 100644 --- a/back/src/views/modules/sys/role.vue +++ b/back/src/views/modules/sys/role.vue @@ -73,12 +73,12 @@ export default { AddOrUpdate }, methods: { - resetHandle() { - this.dataForm.name = ''; + resetHandle () { + this.dataForm.name = '' this.$nextTick(() => { this.getDataList() }) - }, + } } } From 1e6707711e3af987b1f67c83a4c15e46ac75c1de Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 15 Dec 2022 10:17:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/workBench/components/bottom-view.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index d52be568..e3adf2d0 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -61,8 +61,8 @@ export default { }, { title: '单位', - key: 'deptContacts', - dataIndex: 'deptContacts', + key: 'deptName', + dataIndex: 'deptName', width: 144 }, { From 44d96c81543c85e2aa4494fc47aef57eb508f2e2 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 15 Dec 2022 16:55:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E6=B7=BB=E5=8A=A0=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 31 ++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index cb9a0779..3cbf33ee 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -345,7 +345,22 @@ label="预约部门" v-bind="validateInfos.dept" > - + + + + {{ item.label }} + + @@ -796,6 +811,7 @@ selectByChannelCode, } from '@/api/videoSurveillance' import { getCameraByCondition } from '@/api/file' + import { getDeptAll } from '@/api/user' import { getUser, getEnkeUsers, @@ -853,6 +869,16 @@ 'fullScreen', ], //显示所有按钮, }) + const deptList = ref([]) + getDeptAll().then((res) => { + deptList.value = [] + res.data.data.map((val) => { + deptList.value.push({ + value: val.name, + label: val.name, + }) + }) + }) const meetingList = ref([]) const meetingPagination = ref({ total: 0, @@ -2839,6 +2865,9 @@ }