diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..431ea0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,6 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://111.198.10.15:11808"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..431ea0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,6 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://111.198.10.15:11808"' }) diff --git a/src/assets/eryuan/new1.png b/src/assets/eryuan/new1.png new file mode 100644 index 0000000..024fdf8 --- /dev/null +++ b/src/assets/eryuan/new1.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..431ea0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,6 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://111.198.10.15:11808"' }) diff --git a/src/assets/eryuan/new1.png b/src/assets/eryuan/new1.png new file mode 100644 index 0000000..024fdf8 --- /dev/null +++ b/src/assets/eryuan/new1.png Binary files differ diff --git a/src/assets/eryuan/newB1.png b/src/assets/eryuan/newB1.png new file mode 100644 index 0000000..a5a9d27 --- /dev/null +++ b/src/assets/eryuan/newB1.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..431ea0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,6 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://111.198.10.15:11808"' }) diff --git a/src/assets/eryuan/new1.png b/src/assets/eryuan/new1.png new file mode 100644 index 0000000..024fdf8 --- /dev/null +++ b/src/assets/eryuan/new1.png Binary files differ diff --git a/src/assets/eryuan/newB1.png b/src/assets/eryuan/newB1.png new file mode 100644 index 0000000..a5a9d27 --- /dev/null +++ b/src/assets/eryuan/newB1.png Binary files differ diff --git a/src/assets/eryuan/newB2.png b/src/assets/eryuan/newB2.png new file mode 100644 index 0000000..597a0b5 --- /dev/null +++ b/src/assets/eryuan/newB2.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..431ea0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,6 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://111.198.10.15:11808"' }) diff --git a/src/assets/eryuan/new1.png b/src/assets/eryuan/new1.png new file mode 100644 index 0000000..024fdf8 --- /dev/null +++ b/src/assets/eryuan/new1.png Binary files differ diff --git a/src/assets/eryuan/newB1.png b/src/assets/eryuan/newB1.png new file mode 100644 index 0000000..a5a9d27 --- /dev/null +++ b/src/assets/eryuan/newB1.png Binary files differ diff --git a/src/assets/eryuan/newB2.png b/src/assets/eryuan/newB2.png new file mode 100644 index 0000000..597a0b5 --- /dev/null +++ b/src/assets/eryuan/newB2.png Binary files differ diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue index 7257b03..f92949a 100644 --- a/src/views/dashboard/components/mapPicture.vue +++ b/src/views/dashboard/components/mapPicture.vue @@ -3,14 +3,18 @@
+
{{ item.name }}
-
-
+
+ +
当日通行人数:{{ data.value.count }}
-
-
+ + +
+
@@ -39,80 +43,110 @@ backgroundSize: '100%' // width: '70%' } + const newTab1Img = { + backgroundImage: 'url(' + require('@/assets/eryuan/new1.png') + ')', + backgroundColor: '#304156', + backgroundRepeat: 'no-repeat', + backgroundSize: '100%', + width: '800px', + height: '894px' + } + const newTabB1Img = { + backgroundImage: 'url(' + require('@/assets/eryuan/newB1.png') + ')', + backgroundColor: '#304156', + backgroundRepeat: 'no-repeat', + backgroundSize: '100%', + width: '800px', + height: '894px' + } + const newTabB2Img = { + backgroundImage: 'url(' + require('@/assets/eryuan/newB2.png') + ')', + backgroundColor: '#304156', + backgroundRepeat: 'no-repeat', + backgroundSize: '100%', + width: '800px', + height: '894px' + } const cover1 = { - top: '188px', + top: '223px', marginLeft: '368px', fontSize: '20px' } const cover2 = { - top: '216px', - marginLeft: '323px', + top: '392px', + marginLeft: '255px', fontSize: '18px' } return { tabList: [ - { name: 'B1', label: 'B1层', style: tab1Img, cover: cover1, + { name: 'B1', label: 'B1层', style: newTabB1Img, cover: cover1, data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-l-loc', tclass: 'tip1-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-m-loc', tclass: 'tip1-m-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-r-loc', tclass: 'tip1-r-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-r-loc1', tclass: 'tip1-r-loc1' } + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B1东南门', tclass: 't1', fClass: 'f1' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B1屏蔽机房', tclass: 't2', fClass: 'f2' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B1电梯厅门', tclass: 't3', fClass: 'f3' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B1西北门', tclass: 't4', fClass: 'f4' } ] }, - { name: 'B2', label: 'B2层', style: tab1Img, cover: cover1, + { name: 'B2', label: 'B2层', style: newTabB2Img, cover: cover1, data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-l-loc', tclass: 'tip1-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-m-loc', tclass: 'tip1-m-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-r-loc', tclass: 'tip1-r-loc' } + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B2西北门', tclass: 'B2t1', fClass: 'B2f1' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B2东北门', tclass: 'B2t2', fClass: 'B2f2' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B2电梯门东', tclass: 'B2t3', fClass: 'B2f3' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: 'B2东南门', tclass: 'B2t4', fClass: 'B2f4' } ] }, - { name: 'B3', label: 'B3层', style: tab1Img, cover: cover1, + // { name: 'B3', label: 'B3层', style: tab1Img, cover: cover1, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-l-loc', tclass: 'tip1-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-m-loc', tclass: 'tip1-m-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-r-loc', tclass: 'tip1-r-loc' } + // ] + // }, + { name: '一', label: '一层', style: newTab1Img, cover: cover2, data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-l-loc', tclass: 'tip1-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-m-loc', tclass: 'tip1-m-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab1-r-loc', tclass: 'tip1-r-loc' } - ] - }, - { name: '二', label: '二层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab2-l-loc', tclass: 'tip2-l-loc' } - ] }, - { name: '三', label: '三层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } - ] }, - { name: '四', label: '四层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab2-l-loc', tclass: 'tip2-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab4-l-loc', tclass: 'tip4-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab4-r-loc', tclass: 'tip4-r-loc' } - ] }, - { name: '五', label: '五层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } - ] }, - { name: '六', label: '六层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } - ] }, - { name: '七', label: '七层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } - ] }, - { name: '八', label: '八层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } - ] }, - { name: '九', label: '九层', style: tab2Img, cover: cover2, - data: [ - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, - { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + { value: { count: '-', normal: '0', abnormal: '0' }, text: '一层西北角', tclass: 'onet1', fClass: 'onef1' }, + { value: { count: '-', normal: '0', abnormal: '0' }, text: '一层东南角', tclass: 'onet2', fClass: 'onef2' } ] } + // { name: '二', label: '二层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab2-l-loc', tclass: 'tip2-l-loc' } + // ] }, + // { name: '三', label: '三层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] }, + // { name: '四', label: '四层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab2-l-loc', tclass: 'tip2-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab4-l-loc', tclass: 'tip4-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab4-r-loc', tclass: 'tip4-r-loc' } + // ] }, + // { name: '五', label: '五层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] }, + // { name: '六', label: '六层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] }, + // { name: '七', label: '七层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] }, + // { name: '八', label: '八层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] }, + // { name: '九', label: '九层', style: tab2Img, cover: cover2, + // data: [ + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-l-loc', tclass: 'tip3-l-loc' }, + // { value: { count: '-', normal: '0', abnormal: '0' }, pclass: 'point-tab3-r-loc', tclass: 'tip3-r-loc' } + // ] } ], activeName: 'B1', tab1: { @@ -169,61 +203,96 @@ // 获取当日数据 peopleCountByDevice(listQuery).then(response => { const data = response.data - for (const tab of this.tabList) { - if (tab.name === '三' || tab.name === '五' || tab.name === '六' || tab.name === '七' || tab.name === '八' || tab.name === '九') { - tab.data[0].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '8') !== -1 - })[0].count - tab.data[1].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9') !== -1 - })[0].count - } else if (tab.name === '四') { - tab.data[0].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '信展') !== -1 - })[0].count - tab.data[1].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '8') !== -1 - })[0].count - tab.data[2].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9') !== -1 - })[0].count - } else if (tab.name === 'B1') { - tab.data[0].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '8') !== -1 - })[0].count - tab.data[1].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9号西闸机') !== -1 - })[0].count - tab.data[2].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9号东闸机') !== -1 - })[0].count - tab.data[3].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9号西-1') !== -1 - })[0].count - } else if (tab.name === '二') { - if (data.filter(item => { - return item.deviceName.indexOf(tab.label) !== -1 - }).length !== 0) { - tab.data[0].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label) !== -1 - })[0].count - } - } else if (tab.name === 'B2' || tab.name === 'B3') { - if (data.filter(item => { - return item.deviceName.indexOf(tab.label) !== -1 - }).length !== 0) { - tab.data[0].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '8') !== -1 - })[0].count - tab.data[1].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9号西闸机') !== -1 - })[0].count - tab.data[2].value.count = data.filter(item => { - return item.deviceName.indexOf(tab.label + '9号东闸机') !== -1 - })[0].count - } + // for (const tab of this.tabList) { + // if (tab.name === '三' || tab.name === '五' || tab.name === '六' || tab.name === '七' || tab.name === '八' || tab.name === '九') { + // tab.data[0].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '8') !== -1 + // })[0].count + // tab.data[1].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9') !== -1 + // })[0].count + // } else if (tab.name === '四') { + // tab.data[0].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '信展') !== -1 + // })[0].count + // tab.data[1].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '8') !== -1 + // })[0].count + // tab.data[2].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9') !== -1 + // })[0].count + // } else if (tab.name === 'B1') { + // tab.data[0].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '8') !== -1 + // })[0].count + // tab.data[1].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9号西闸机') !== -1 + // })[0].count + // tab.data[2].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9号东闸机') !== -1 + // })[0].count + // tab.data[3].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9号西-1') !== -1 + // })[0].count + // } else if (tab.name === '二') { + // if (data.filter(item => { + // return item.deviceName.indexOf(tab.label) !== -1 + // }).length !== 0) { + // tab.data[0].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label) !== -1 + // })[0].count + // } + // } else if (tab.name === 'B2' || tab.name === 'B3') { + // if (data.filter(item => { + // return item.deviceName.indexOf(tab.label) !== -1 + // }).length !== 0) { + // tab.data[0].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '8') !== -1 + // })[0].count + // tab.data[1].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9号西闸机') !== -1 + // })[0].count + // tab.data[2].value.count = data.filter(item => { + // return item.deviceName.indexOf(tab.label + '9号东闸机') !== -1 + // })[0].count + // } + // } + // } + data.forEach(item => { + // ---------------------------------------------------B1------------------------------------------------------------ + if (item.deviceName === 'B1东南门') { + this.tabList[0].data[0].value.count = item.count } - } + if (item.deviceName === 'B1屏蔽机房') { + this.tabList[0].data[1].value.count = item.count + } + if (item.deviceName === 'B1电梯厅门') { + this.tabList[0].data[2].value.count = item.count + } + if (item.deviceName === 'B1西北门') { + this.tabList[0].data[3].value.count = item.count + } + // -------------------------------------------------B2------------------------------- + if (item.deviceName === 'B2西北门') { + this.tabList[1].data[0].value.count = item.count + } + if (item.deviceName === 'B2东北门') { + this.tabList[1].data[1].value.count = item.count + } + if (item.deviceName === 'B2电梯门东') { + this.tabList[1].data[2].value.count = item.count + } + if (item.deviceName === 'B2东南门') { + this.tabList[1].data[3].value.count = item.count + } + // -----------------------------------------------一层------------------------------ + if (item.deviceName === '一层西北角') { + this.tabList[2].data[0].value.count = item.count + } + if (item.deviceName === '一层东南角') { + this.tabList[2].data[1].value.count = item.count + } + }) }) // 获取七日数据 @@ -240,6 +309,7 @@