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() }) - }, + } } } 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 }, { diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index f5cc8367..b6ef6c6f 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -346,6 +346,7 @@ export function getZwyBusinessList(params) { params, }) } + // 政务云资源列详情 export function getZwyBusinessInfoById(params) { return request({ @@ -354,7 +355,22 @@ export function getZwyBusinessInfoById(params) { params, }) } - +// 视频列表 +export function getZwyVideoList(params) { + return request({ + url: '/act/task/getZwyVideoList', + method: 'get', + params, + }) +} +// 视频详情 +export function getZwyVideoInfoById(params) { + return request({ + url: '/act/task/getZwyVideoInfoById', + method: 'get', + params, + }) +} // 催办 export function treminders(data) { return request({ diff --git a/front/src/assets/newHome/nengli1.png b/front/src/assets/newHome/nengli1.png new file mode 100644 index 00000000..eaa33515 Binary files /dev/null and b/front/src/assets/newHome/nengli1.png differ diff --git a/front/src/assets/newHome/nengli2.png b/front/src/assets/newHome/nengli2.png new file mode 100644 index 00000000..793dd90d Binary files /dev/null and b/front/src/assets/newHome/nengli2.png differ diff --git a/front/src/assets/newHome/nengli3.png b/front/src/assets/newHome/nengli3.png new file mode 100644 index 00000000..fe48150b Binary files /dev/null and b/front/src/assets/newHome/nengli3.png differ diff --git a/front/src/assets/newHome/nengli4.png b/front/src/assets/newHome/nengli4.png new file mode 100644 index 00000000..327b1c52 Binary files /dev/null and b/front/src/assets/newHome/nengli4.png differ 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 @@ }