diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/modules/menu0.js b/src/router/modules/menu0.js index dc2d4fd..3a62b17 100644 --- a/src/router/modules/menu0.js +++ b/src/router/modules/menu0.js @@ -273,6 +273,37 @@ meta: { title: '能源数据', icon: '', permission: ['/energy/list'] } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + // permission: ['/asset'], // 权限名称 + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '', permission: [''] } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '', permission: [''] } + }, + { + path: '/visitList', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '', permission: [''] } + } + ] } // { // path: 'security', diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/modules/menu0.js b/src/router/modules/menu0.js index dc2d4fd..3a62b17 100644 --- a/src/router/modules/menu0.js +++ b/src/router/modules/menu0.js @@ -273,6 +273,37 @@ meta: { title: '能源数据', icon: '', permission: ['/energy/list'] } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + // permission: ['/asset'], // 权限名称 + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '', permission: [''] } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '', permission: [''] } + }, + { + path: '/visitList', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '', permission: [''] } + } + ] } // { // path: 'security', diff --git a/src/views/backstage/messageList.vue b/src/views/backstage/messageList.vue new file mode 100644 index 0000000..b679470 --- /dev/null +++ b/src/views/backstage/messageList.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/modules/menu0.js b/src/router/modules/menu0.js index dc2d4fd..3a62b17 100644 --- a/src/router/modules/menu0.js +++ b/src/router/modules/menu0.js @@ -273,6 +273,37 @@ meta: { title: '能源数据', icon: '', permission: ['/energy/list'] } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + // permission: ['/asset'], // 权限名称 + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '', permission: [''] } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '', permission: [''] } + }, + { + path: '/visitList', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '', permission: [''] } + } + ] } // { // path: 'security', diff --git a/src/views/backstage/messageList.vue b/src/views/backstage/messageList.vue new file mode 100644 index 0000000..b679470 --- /dev/null +++ b/src/views/backstage/messageList.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/backstage/personList.vue b/src/views/backstage/personList.vue new file mode 100644 index 0000000..afbcf9b --- /dev/null +++ b/src/views/backstage/personList.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/modules/menu0.js b/src/router/modules/menu0.js index dc2d4fd..3a62b17 100644 --- a/src/router/modules/menu0.js +++ b/src/router/modules/menu0.js @@ -273,6 +273,37 @@ meta: { title: '能源数据', icon: '', permission: ['/energy/list'] } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + // permission: ['/asset'], // 权限名称 + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '', permission: [''] } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '', permission: [''] } + }, + { + path: '/visitList', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '', permission: [''] } + } + ] } // { // path: 'security', diff --git a/src/views/backstage/messageList.vue b/src/views/backstage/messageList.vue new file mode 100644 index 0000000..b679470 --- /dev/null +++ b/src/views/backstage/messageList.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/backstage/personList.vue b/src/views/backstage/personList.vue new file mode 100644 index 0000000..afbcf9b --- /dev/null +++ b/src/views/backstage/personList.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/views/backstage/visitList.vue b/src/views/backstage/visitList.vue new file mode 100644 index 0000000..1c6935c --- /dev/null +++ b/src/views/backstage/visitList.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 6c81d9b..a29418b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,9 @@ { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, + // { path: '/messageList', component: () => import('@/views/backstage/messageList'), hidden: true }, + // { path: '/personList', component: () => import('@/views/backstage/personList'), hidden: true }, + // { path: '/visitList', component: () => import('@/views/backstage/visitList'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, diff --git a/src/router/modules/menu.js b/src/router/modules/menu.js index 9292a60..907a6ea 100644 --- a/src/router/modules/menu.js +++ b/src/router/modules/menu.js @@ -15,7 +15,7 @@ path: '/caseList', name: 'CaseList', component: () => import('@/views/case/caseList'), - meta: { title: '安防事件管理', icon: ''} + meta: { title: '安防事件管理', icon: '' } }, { path: '/caseLevelList', @@ -263,6 +263,36 @@ meta: { title: '能源数据', icon: '' } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '' } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '' } + }, + { + path: '/visitAdmin', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '' } + } + ] } // { // path: 'security', diff --git a/src/router/modules/menu0.js b/src/router/modules/menu0.js index dc2d4fd..3a62b17 100644 --- a/src/router/modules/menu0.js +++ b/src/router/modules/menu0.js @@ -273,6 +273,37 @@ meta: { title: '能源数据', icon: '', permission: ['/energy/list'] } } ] + }, + { + path: 'backstage', + component: Layout, + redirect: '/backstage', + name: 'Backstage', + meta: { + title: '', + // permission: ['/asset'], // 权限名称 + icon: 'icon-config' // 图标 + }, + children: [ + { + path: '/messageList', + name: 'MessageList', + component: () => import('@/views/backstage/messageList'), + meta: { title: '消息后台', icon: '', permission: [''] } + }, + { + path: '/personList', + name: 'PersonList', + component: () => import('@/views/backstage/personList'), + meta: { title: '人员管理后台', icon: '', permission: [''] } + }, + { + path: '/visitList', + name: 'VisitList', + component: () => import('@/views/backstage/visitList'), + meta: { title: '访客申请后台', icon: '', permission: [''] } + } + ] } // { // path: 'security', diff --git a/src/views/backstage/messageList.vue b/src/views/backstage/messageList.vue new file mode 100644 index 0000000..b679470 --- /dev/null +++ b/src/views/backstage/messageList.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/backstage/personList.vue b/src/views/backstage/personList.vue new file mode 100644 index 0000000..afbcf9b --- /dev/null +++ b/src/views/backstage/personList.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/views/backstage/visitList.vue b/src/views/backstage/visitList.vue new file mode 100644 index 0000000..1c6935c --- /dev/null +++ b/src/views/backstage/visitList.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue index 611b058..86eee06 100644 --- a/src/views/popup/board.vue +++ b/src/views/popup/board.vue @@ -10,7 +10,7 @@ @@ -121,7 +120,9 @@ staffCode: '0', gender: '' }, + personName: '', point: [], + selectObj: {}, listQuery: { facePicUrl: '', // 图片url personName: '', // 人员名称 @@ -133,15 +134,6 @@ }, personNameList: [ // { - // "personName": "郑嘉辉", - // "personNo": "TV11326", - // "personPicture": "", - // "personType": "", - // "picUri": "", - // "serverIndexCode": "", - // "staffCode": "" - // }, - // { // "personName": "郑11", // "personNo": "TV11326", // "personPicture": "", @@ -269,8 +261,18 @@ }, // 赋值select参数 handlePerson(person) { + // this.personNameList.map(item => { + // if (item.personName === this.listQuery.personName) { + // this.listQuery.facePicUrl = item.personPicture + // this.listQuery.gender = item.gender + // return + // } + // }) + this.personNameList.map(item => { - if (item.personName === this.listQuery.personName) { + if (item.staffCode === person) { + this.personName = item.personName + // this.listQuery.personName = item.personName this.listQuery.facePicUrl = item.personPicture this.listQuery.gender = item.gender return @@ -309,7 +311,9 @@ spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - hikPic(this.listQuery).then(response => { + const postData = Object.assign(this.listQuery, { 'personName': this.personName }) + console.log(postData) + hikPic(postData).then(response => { loading.close() if (response.code === 200) { // this.list = response.data @@ -330,7 +334,7 @@ this.listQuery.cameraIndexCodes = '' this.listQuery.startTime = getDate(0, 'DATE') + ' 00:00:00' this.listQuery.endTime = getDate(0, 'SECOND') - this.listQuery.minSimilarity = '' + this.listQuery.minSimilarity = '50' this.listQuery.timeRange = [getDate(0, 'DATE') + ' 00:00:00', getDate(0, 'SECOND')] }, // 轨迹上墙 @@ -351,6 +355,7 @@ }, // 搜索 search() { + console.log(this.listQuery) this.$refs.ruleForm.validate((valid) => { if (valid) { this.fetchData()