账号密码登录
+ 数字证书登录
+
+
+
+
-
+
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index c7f952b..1e52006 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -1,37 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+ {{ title_text }}
+
+
+
+
+ {{ timeArr.timeText }}
+ {{ timeArr.week }}
+ {{ timeArr.timeTime }}
+
+
+
+ {{ userName }}
+
+
+
+
-
-
-
-
-
- ![]()
-
-
- 登录
-
+
+
-
\ No newline at end of file
diff --git a/src/views/buildUse/index.vue b/src/views/buildUse/index.vue
index b87d64e..a6054e6 100644
--- a/src/views/buildUse/index.vue
+++ b/src/views/buildUse/index.vue
@@ -28,13 +28,17 @@
+
+
+
+
+
+
+
+
+
+
+ {{ title_text }}
+
+
+
+
+ {{ timeArr.timeText }}
+ {{ timeArr.week }}
+ {{ timeArr.timeTime }}
+
+
+
+ {{ userName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ 登录
+
+
+
+
+ 请输入电子数字证书
+
+
+ 登录
+
+
+
@@ -48,11 +52,13 @@ export default {
components: {},
data() {
return {
+ title_text: '射阳沿海治安综合防控平台',
//盒子循环数组
roll_list: [
{
id: '1',
- name: '非法狩猎'
+ name: '非法捕猎',
+ route: '/hunting'
},
{
id: '2',
@@ -73,30 +79,6 @@ export default {
{
id: '6',
name: '建模平台'
- },
- {
- id: '7',
- name: '非法狩猎'
- },
- {
- id: '8',
- name: '非法狩猎'
- },
- {
- id: '9',
- name: '非法狩猎'
- },
- {
- id: '10',
- name: '非法狩猎'
- },
- {
- id: '11',
- name: '非法狩猎'
- },
- {
- id: '12',
- name: '非法狩猎'
}
]
}
@@ -108,6 +90,10 @@ export default {
this.back_change()
},
methods: {
+ // 返回上一级路由
+ deleteto() {
+ this.$router.go(-1)
+ },
timeStart() {
this.timer = setInterval(() => {
this.timeArr = dateFormat(new Date())
@@ -118,30 +104,33 @@ export default {
console.log(id, 'lll')
switch (id) {
case '1':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon9.png')})`
case '2':
- return `url(${require('../../assets/building-picture-hza/icon6.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon6.png')})`
case '3':
- return `url(${require('../../assets/building-picture-hza/icon5.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon5.png')})`
case '4':
- return `url(${require('../../assets/building-picture-hza/icon4.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon4.png')})`
case '5':
- return `url(${require('../../assets/building-picture-hza/icon3.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon3.png')})`
case '6':
- return `url(${require('../../assets/building-picture-hza/icon2.png')})`
- case '7':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
- case '8':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
- case '9':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
- case '10':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
- case '11':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
- case '12':
- return `url(${require('../../assets/building-picture-hza/icon1.png')})`
+ return `url(${require('@/assets/building-picture-hza/icon2.png')})`
+ // case '7':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
+ // case '8':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
+ // case '9':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
+ // case '10':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
+ // case '11':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
+ // case '12':
+ // return `url(${require('@/assets/building-picture-hza/icon1.png')})`
}
+ },
+ turn(path) {
+ this.$router.push(path)
}
}
}
@@ -149,11 +138,13 @@ export default {
diff --git a/src/views/coastalMap/components/actualPeople.vue b/src/views/coastalMap/components/actualPeople.vue
new file mode 100644
index 0000000..1e52e71
--- /dev/null
+++ b/src/views/coastalMap/components/actualPeople.vue
@@ -0,0 +1,231 @@
+
+
-
{{ item.name }}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/buildingInform.vue b/src/views/coastalMap/components/buildingInform.vue
index 823c933..be88c84 100644
--- a/src/views/coastalMap/components/buildingInform.vue
+++ b/src/views/coastalMap/components/buildingInform.vue
@@ -1,51 +1,722 @@
+
-
+
+
+
+ 实有人口
+
+
+
+
+
+ 人户一致
+ {{ housePeople.rhyzCount || 0 }}
+
+
+ 人在户不在
+ {{ housePeople.rhbyzCount || 0 }}
+
+
+ 户在人不在
+ {{ housePeople.hzrbzCount || 0 }}
+
+
+ 境外人员
+ {{ housePeople.jwryCount || 0 }}
+
+
+ 重点人员
+ {{ housePeople.zdryCount || 0 }}
+
+
+ 关爱人员
+ {{ housePeople.garyCount || 0 }}
+
+
+
+
+
+ {{ housePeople.count || 0 }}
+ 总数
+
+
+
+
+
+ 常驻人口
+ {{ housePeople.czryCount || 0 }}
+
+
+
+ 暂住人口
+ {{ housePeople.zzryCount || 0 }}
+
+
+
+ 流动人口
+ {{ housePeople.ldCount || 0 }}
+
+
-
-
-
diff --git a/src/views/coastalMap/components/floorInform.vue b/src/views/coastalMap/components/floorInform.vue
new file mode 100644
index 0000000..2f85918
--- /dev/null
+++ b/src/views/coastalMap/components/floorInform.vue
@@ -0,0 +1,518 @@
+
+ 楼栋信息
+
+
+
+
+
楼栋信息
+
-
+
+
+
+
+ 地址
+ 网络编码
+ 警务区编码
+
+
+ {{ this.houseValue.realAddress }}
+
+
+ {{ buildInfo.policeStationCode || '320924760101' }}
+
+
+ {{ buildInfo.policeDistrictCode || '320924760101' }}
+
+
+
+
+
+
+
+
+
+
+
+ 实有房屋
+ 总数: {{ this.houseValue.count }}
+
+
+
+
+
+
+
+ {{ houseCount.zzCount }}
+ 住宅
+
+
+
+
+
+ {{ houseCount.spCount }}
+ 商铺
+
+
+
+
+
+ {{ houseCount.szlyCount }}
+ 商住两用
+
+
+
+
+
+ {{ houseCount.kzCount }}
+ 空置
+
+
+
+
+ 出租房
+ {{ houseCount.czfCount }}
+
+
+ 群租房
+ {{ houseCount.qzfCount }}
+
+
+
+
+ 房屋结构
+
+
+
+ 房屋类型:
+
+
+ -出租
+ -住宅
+ -商用
+ -空置
+
+
+
+
+
+
+
+
+ {{ key + '楼' }}
+
+ {{ parseInt(item) + '室' }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/flowPopup.vue b/src/views/coastalMap/components/flowPopup.vue
new file mode 100644
index 0000000..41fd30b
--- /dev/null
+++ b/src/views/coastalMap/components/flowPopup.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+ 户室信息
+
+
+
+
+
+
+
+
+
+
+ 地址
+ 所在网格
+ 房屋类型
+ 是否出租
+ 所在警务区
+
+
+
+ {{ roomInfo.homeInfo.address }}
+
+
+ {{ roomInfo.homeInfo.grid || '320924760101' }}
+
+
+ {{ roomInfo.homeInfo.type }}
+
+
+ {{ roomInfo.homeInfo.isRent }}
+
+
+ {{ roomInfo.homeInfo.policeDistrictCode }}
+
+
+
+
+
+ 房主信息
+
+
+
+
+
+
+
+
+
+ 姓名
+ {{ roomInfo.actualUserInfo.userName }}
+
+
+ 联系电话
+ {{ roomInfo.actualUserInfo.phone }}
+
+
+ 证件号码
+ {{ roomInfo.actualUserInfo.idCard }}
+
+
+
+ 户籍地址
+
+ {{ roomInfo.actualUserInfo.houseHoldAddress }}
+
+
+
+
+
+
+
+ 实有人口
+ 3
+
+
+
+ 重点人员
+ 0
+
+
+
+ 户在人不在
+ 0
+
+
+
+
+ -
+
-
+ ++++
+
++{{ item.actualUserTypeCn }}+ +++人员姓名:+联系电话:+证件号码:+户籍地址:+++{{ item.userName }}+{{ item.phone }}++ {{ item.idCard }} +++ {{ item.houseHoldAddress }} ++
+
+
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/housePopup.vue b/src/views/coastalMap/components/housePopup.vue
new file mode 100644
index 0000000..5e1ac1b
--- /dev/null
+++ b/src/views/coastalMap/components/housePopup.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/keyInformantion.vue b/src/views/coastalMap/components/keyInformantion.vue
index bea21df..3b67fd2 100644
--- a/src/views/coastalMap/components/keyInformantion.vue
+++ b/src/views/coastalMap/components/keyInformantion.vue
@@ -3,13 +3,14 @@
+
+
+
+
+
+ 重点人员信息
-
+
+
-
+
+
+
diff --git a/src/views/coastalMap/components/mapBody.vue b/src/views/coastalMap/components/mapBody.vue
index 3b2e481..bd0cf42 100644
--- a/src/views/coastalMap/components/mapBody.vue
+++ b/src/views/coastalMap/components/mapBody.vue
@@ -2,20 +2,196 @@
-
diff --git a/src/views/coastalMap/components/policeDetail.vue b/src/views/coastalMap/components/policeDetail.vue
new file mode 100644
index 0000000..e6df4bf
--- /dev/null
+++ b/src/views/coastalMap/components/policeDetail.vue
@@ -0,0 +1,333 @@
+
+
-
+
+
+
查看轨迹
@@ -19,54 +20,109 @@
-
-
张三
+{{ item.userName }}
-
张三
+{{ item.idCard }}
-
张三
+{{ item.phone }}
-
张三asdasdaasdadasdasdsda
++ {{ item.habitationAddress }} +
-
-
+
张三
++ {{ item.houseHoldAddress }} +
涉毒人员
户籍
现住
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/policePopup.vue b/src/views/coastalMap/components/policePopup.vue
new file mode 100644
index 0000000..76385b8
--- /dev/null
+++ b/src/views/coastalMap/components/policePopup.vue
@@ -0,0 +1,354 @@
+
+
+
+
+ 警情详情
+
+
+
+
+
+
+ 接警信息
+
+
+
+
+
+
+
+
+ 报警人姓名:
+ 报警时间:
+ 接警人姓名:
+ 接警时间:
+ 接警事发地址:
+ 接警内容:
+
+
+
+ {{ policeData.jjxxInformantName }}
+
+
+ {{ policeData.jjxxInformantTime }}
+
+
+ {{ policeData.jjxxPoliceReceiverName }}
+
+
+ {{ policeData.jjxxAlarmResponseTime }}
+
+
+ {{ policeData.jjxxAlarmAddress }}
+
+
+ {{ policeData.jjxxAlarmResponseContent }}
+
+
+
+
+
+ 报警人联系方式:
+ 接警单位:
+ 警情类型:
+
+
+
+ {{ policeData.jjxxInformantPhone }}
+
+
+ {{ policeData.jjxxAlarmResponseUnit }}
+
+
+ {{ policeData.jjxxAlarmResponseTypeName }}
+
+
+
+
+
+
+ 处警信息
+
+
+
+
+
+
+
+
+ 处警单位名称:
+ 处警详细地址:
+ 处警人姓名:
+ 接警时间:
+ 简要案情:
+
+
+
+ {{ policeData.cjxxHandleAlarmUnit }}
+
+
+ {{ policeData.cjxxHandleAlarmAddress }}
+
+
+ {{ policeData.cjxxHandleAlarmUser }}
+
+
+ {{ policeData.jjxxAlarmResponseTime }}
+
+
+ {{ policeData.cjxxHandleAlarmContent }}
+
+
+
+
+
+ 处警时间:
+ 接警单位:
+ 警情类型:
+
+
+
+ {{ policeData.cjxxHandleAlarmTime }}
+
+
+ {{ policeData.jjxxAlarmResponseUnit }}
+
+
+ {{ policeData.jjxxAlarmResponseTypeName }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/coastalMap/components/policeScroll.vue b/src/views/coastalMap/components/policeScroll.vue
deleted file mode 100644
index eac3668..0000000
--- a/src/views/coastalMap/components/policeScroll.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
+
+
+
+
+ 警务室
+
+
+
+
+
+
+
+ 警务室编号:
+ 警务室名称:
+ 警务室地址:
+ 经度:
+ 纬度:
+
+
+
+ {{
+ policeSpread.policeOfficeCode === 'null'
+ ? ''
+ : policeSpread.policeOfficeCode
+ }}
+
+
+ {{ policeSpread.policeOfficeName }}
+
+
+ {{ policeSpread.policeOfficeAddress }}
+
+
+ {{ policeSpread.longitude }}
+
+
+ {{ policeSpread.latitude }}
+
+
+
+
+
+
+ 派出所
+
+
+
+
+
+
+
+ 派出所编号:
+ 派出所名称:
+ 派出所地址:
+ 经度:
+ 纬度:
+
+
+
+ {{ policeSpread.policeStationCode }}
+
+
+ {{ policeSpread.policeStationName }}
+
+
+ {{ policeSpread.policeStationAddress }}
+
+
+ {{ policeSpread.longitude }}
+
+
+ {{ policeSpread.latitude }}
+
+
+
+
+
+
+ 执法记录仪
+
+
+
+
+
+
+
+ 执法记录仪编号:
+ 执法记录仪名称:
+ 监控类型:
+ 经度:
+ 纬度:
+
+
+
+ {{
+ policeSpread.gbsChannelNo === 'null'
+ ? ''
+ : policeSpread.gbsChannelNo
+ }}
+
+
+ {{ policeSpread.deviceName }}
+
+
+ {{
+ policeSpread.monitoringTypeCn ? policeSpread.monitoringTypeCn : ''
+ }}
+
+
+ {{ policeSpread.longitude }}
+
+
+ {{ policeSpread.latitude }}
+
+
+
+
+
+
+ 警车
+
+
+
+
+
+
+
+ 警车车牌:
+ 警车名称:
+ 经度:
+ 纬度:
+
+
+
+ {{ policeSpread.plateNo }}
+
+
+ {{ policeSpread.deviceName }}
+
+
+ {{ policeSpread.longitude }}
+
+
+ {{ policeSpread.latitude }}
+
+
+
+
+
+
+ 350M信息
+
+
+
+
+
+
+
+ 警员编号:
+ 警员姓名:
+ 所属机构:
+ 定位时间:
+ 设备名称:
+ 设备类型:
+
+
+
+
+ {{ policeSpread.police_no }}
+
+
+ {{ policeSpread.police_name }}
+
+
+ {{ policeSpread.org_name }}
+
+
+ {{ policeSpread.gps_updatetime }}
+
+
+ {{ policeSpread.device_name }}
+
+
+ {{ policeSpread.device_main_type }}
+
+
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/coastalMap/components/policeSpread.vue b/src/views/coastalMap/components/policeSpread.vue
index 8edf30d..474546a 100644
--- a/src/views/coastalMap/components/policeSpread.vue
+++ b/src/views/coastalMap/components/policeSpread.vue
@@ -9,6 +9,7 @@
class="police_body_box"
v-for="(item, index) in policeData"
:key="index"
+ @click="handlePolice(item.text)"
>
-
-
-
- 警情类型 :
- 接警单位 :
- 事发地址 :
- 现住地址 :
-
-
- 机动车与机动车
- 射阳公安局
- 建湖县明星路与冠华路交界北边
- 江苏省射阳县海河镇革新村二组113号
-
- 2023-11-30 14:00:00
- {{ item.text }}
@@ -29,7 +30,7 @@ export default {
policeData: [
{ num: '', text: '派出所' },
{ num: '', text: '警务室' },
- { num: '', text: '执法警员' }
+ { num: '', text: '执法警力' }
],
// * 警力分布数据
policeSpreadData: {}
@@ -45,8 +46,11 @@ export default {
this.policeData[0].num = res.data.pcsCount
this.policeData[1].num = res.data.jwsCount
this.policeData[2].num = res.data.zfjyCount
-
- // console.log(res, '警力分布')
+ },
+ // * 调用父组件的点击事件
+ handlePolice(text) {
+ this.$emit('useInitPolice', text)
+ // console.log(text)
}
}
}
diff --git a/src/views/coastalMap/components/policeStatus.vue b/src/views/coastalMap/components/policeStatus.vue
index e21f2d6..8a4a3d3 100644
--- a/src/views/coastalMap/components/policeStatus.vue
+++ b/src/views/coastalMap/components/policeStatus.vue
@@ -10,9 +10,15 @@
@@ -20,25 +26,48 @@
-
1
- 2
- 3
+
+
+ 1
+
+
+ 2
+
+
3
+
-
-
-
-
+
-
+
-
-{{ item.createTime }}+{{ item.jjxxAlarmResponseTime }}-警情类型-接警单位-事发地址-报警内容++ + {{ back.text }} +@@ -53,7 +82,11 @@ // import PoliceScroll from "./policeScroll.vue"; import * as echarts from 'echarts' import EleResize from '@/utils/esresize' -import { PoliceStatisticsAPI, MetaAlarmInfo } from '@/api/coastalMap/resource' +import { + PoliceStatisticsAPI, + postPoliceSituationAPI +} from '@/api/coastalMap/resource' +import bus from '@/utils/bus' export default { name: 'PoliceStatus', @@ -64,87 +97,59 @@ export default { return { value: '1', y_data: ['其他纠纷', '家庭纠纷', '其他警情'], // y轴文字 - chart_data: ['145', '29', '101'], // chart表数据 - roll_list: [ - // { - // id: '1', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-11-24 13:21:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '2', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-11-22 14:20:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '3', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-11-21 09:20:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '4', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-12-03 14:35:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '5', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-12-02 13:21:16', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '6', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-12-04 13:20:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // }, - // { - // id: '7', - // type: '机动车', - // unit: '射阳公安局', - // address: '建湖县明星路与冠华路交界处北边', - // police_time: '2023-11-15 13:23:17', - // now_address: - // '报警人萧婷在建湖县明星路与冠华路交界处北边轿车苏J8MZ63、苏J3KC06相撞。(建湖64号,内线(86158110)) ' - // } - ], + chart_data: [], // chart表数据 + params: { + pageSize: 20, + pageNum: 1 + }, + roll_list: [], animateUp: false, - timer: null + timer: null, + timeflag: true, + // * 警情图标 + policeBack: [ + { + id: 1, + backImg: require('@/assets/police_slices/police_type.png'), + text: '警情类型 :' + }, + { + id: 2, + backImg: require('@/assets/police_slices/police_unit.png'), + text: '接警单位 :' + }, + { + id: 3, + backImg: require('@/assets/police_slices/police_address.png'), + text: '事发地址 :' + }, + { + id: 4, + backImg: require('@/assets/police_slices/police_content.png'), + text: '报警内容 :' + } + ] } }, - mounted() { - this.init_charts() - this.timer = setInterval(this.scrollAnimate, 1500) - }, created() { this.onPoliceStatistics() this.onMetaAlarmInfo() }, - + mounted() { + // this.init_charts() + this.scrollAnimate() + // setInterval(this.scrollAnimate, 3000) + }, + watch: { + chart_data: { + handler(newData) { + if (newData) this.init_charts(newData) + }, + immediate: true + } + }, methods: { - init_charts() { + init_charts(chart_data) { let charts = document.getElementById('charts_right') let resize_div = document.getElementById('charts_right') let myChart = echarts.init(charts) @@ -188,7 +193,8 @@ export default { }, series: [ { - data: this.chart_data, + data: chart_data, + barWidth: '20%', type: 'bar', showBackground: true, itemStyle: { @@ -196,6 +202,7 @@ export default { colorStops: [ { offset: 0, + barWidth: '30%', color: '#1A416B' // 0% 处的颜色 }, { @@ -219,14 +226,16 @@ export default { option && myChart.setOption(option) }, - // 滚动播放 + // * 滚动播放 scrollAnimate() { - this.animateUp = true - setTimeout(() => { - this.roll_list.push(this.roll_list[0]) - this.roll_list.shift() - this.animateUp = false - }, 500) + this.timer = setInterval(() => { + this.animateUp = true + setTimeout(() => { + this.roll_list.push(this.roll_list[0]) + this.roll_list.shift() + this.animateUp = false + }, 500) + }, 3000) }, // eacharts数据 async onPoliceStatistics() { @@ -234,13 +243,37 @@ export default { console.log(res, 'eacharts数据') this.chart_data = res.data.map((item) => item.count) console.log(this.chart_data) + // res.data.forEach((element) => { + // this.y_data.push(element.alarmResponseTypeName) + // }) }, - //警情信息表 + // * 警情信息表 async onMetaAlarmInfo() { - const res = await MetaAlarmInfo() - this.roll_list = res.rows - console.log(this.roll_listc, 'oooppp') + const res = await postPoliceSituationAPI(this.params) + this.roll_list = res.data + console.log(this.roll_list, '警情信息表') + }, + // * 点击详情 + handleOpen(policeData) { + console.log(policeData, '警情数据') + this.$emit('openDetail') + bus.$emit('open', policeData) + }, + // * 监听鼠标事件，移入时停止播放，移除时开始播放 + handleMouseEnter() { + // * 移入时停止滚动 + clearInterval(this.timer) + }, + handleMouseOut() { + // * 移除时开始滚动 + // this.timer = setInterval(this.scrollAnimate, 3000) + // this.animateUp = true + this.scrollAnimate() } + }, + // * 组件销毁后清除定时器 + destroyed() { + clearInterval(this.timer) } } @@ -275,6 +308,7 @@ export default { background-image: url('@/assets/picture/bg_5.png'); background-repeat: no-repeat; background-size: 100% 100%; + .police_status_body_charts { width: 20vw; height: 19vh; @@ -292,17 +326,47 @@ export default { .rank_left_item { width: 3vw; height: 6vh; - color: #ecf4f9; - font-size: 18px; - font-weight: 600; - text-align: center; - line-height: 6vh; - } - .one { - background: url('~@/assets/coastalMap/policeStatus/rank_one.png') - no-repeat; - background-size: 100% 100%; + display: flex; + justify-content: center; + align-items: center; + .one { + color: #ecf4f9; + font-size: 18px; + font-weight: 600; + text-align: center; + line-height: 4vh; + width: 2vw; + height: 4vh; + background: url('~@/assets/coastalMap/policeStatus/rank_one.png') + no-repeat; + background-size: 100% 100%; + } + .two { + color: #ecf4f9; + font-size: 18px; + font-weight: 600; + text-align: center; + line-height: 4vh; + width: 2vw; + height: 4vh; + background: url('~@/assets/coastalMap/policeStatus/rank_two.png') + no-repeat; + background-size: 100% 100%; + } + .three { + color: #ecf4f9; + font-size: 18px; + font-weight: 600; + text-align: center; + line-height: 4vh; + width: 2vw; + height: 4vh; + background: url('~@/assets/coastalMap/policeStatus/rank_three.png') + no-repeat; + background-size: 100% 100%; + } } + .two { background: url('~@/assets/coastalMap/policeStatus/rank_two.png') no-repeat; @@ -330,6 +394,7 @@ export default { width: 20vw; height: 27vh; padding: 0px; + li { margin-left: 2%; margin-right: 2%; @@ -347,6 +412,11 @@ export default { display: flex; justify-content: center; align-items: center; + cursor: pointer; + + &:hover { + filter: brightness(140%); + } .roll_item { display: flex; position: relative; @@ -356,8 +426,8 @@ export default { position: absolute; width: 7vw; height: 2vh; - top: 0px; - right: 0px; + top: 0.5vh; + right: 0.5vw; color: #fff; text-align: center; line-height: 2vh; @@ -365,16 +435,30 @@ export default { .roll_item_left { width: 5vw; height: 12.5vh; + .roll_item_text { + display: flex; + align-items: center; + justify-content: space-around; + width: 5vw; color: #ecf4f9; height: 25%; text-align: center; line-height: 3vh; + + .police_icon { + width: 1vw; + height: 1vw; + // background-color: #fff; + background-repeat: no-repeat; + background-size: 100% 100%; + } } } .roll_item_right { width: 10vw; height: 12.5vh; + .roll_item_value { color: #edf1f7; height: 25%; diff --git a/src/views/coastalMap/components/priority.vue b/src/views/coastalMap/components/priority.vue deleted file mode 100644 index 15f4f64..0000000 --- a/src/views/coastalMap/components/priority.vue +++ /dev/null @@ -1,47 +0,0 @@ - - -- : - {{ item.alarmResponseTypeName }} + {{ item.jjxxAlarmResponseTypeName }} +++ {{ item.jjxxAlarmResponseUnit }}-:{{ item.alarmResponseUnit }}-:{{ item.alarmAddress }}-- {{ item.alarmResponseContent }} ++ {{ item.jjxxAlarmAddress }} +++ {{ item.jjxxAlarmResponseContent }}- - -- - - - - diff --git a/src/views/coastalMap/components/resource.vue b/src/views/coastalMap/components/resource.vue index 44cdb3b..6432e25 100644 --- a/src/views/coastalMap/components/resource.vue +++ b/src/views/coastalMap/components/resource.vue @@ -7,25 +7,25 @@-+-实有人口{{ resourceData.actualUserSyrkCount }}+--流动人口{{ resourceData.actualUserLdrkCount }}+-实有房屋{{ resourceData.countSyfw }}+@@ -37,7 +40,7 @@ export default { }, { backImg: require('@/assets/picture/bg_sea_3.png'), - text: '船只', + text: '船舶', num: '2,362' }, { @@ -57,8 +60,16 @@ export default { this.back[0].num = res.data.gkCount this.back[1].num = res.data.mtCount this.back[2].num = res.data.czCount - this.back[3].num = res.data.cyCount + this.back[3].num = 0 // console.log(res, '涉海要素') + }, + handleUseInit(value) { + if (value === '港口') { + // console.log(value) + this.$emit('useInit') + } else if (value === '码头') { + this.$emit('useInitMato') + } } } } @@ -95,6 +106,8 @@ export default { height: 16vh; background: url('~@/assets/coastalMap/box_back03.png') no-repeat; background-size: 100% 100%; + cursor: pointer; + .sea_body_box { display: flex; flex-direction: column; @@ -104,6 +117,10 @@ export default { height: 6vh; background-repeat: no-repeat; background-size: 100% auto; + &:hover { + filter: brightness(160%); + } + .sea_body_box_num { margin-left: 1vw; color: #00f5ff; diff --git a/src/views/coastalMap/components/unitDetailPop.vue b/src/views/coastalMap/components/unitDetailPop.vue new file mode 100644 index 0000000..3eeb82f --- /dev/null +++ b/src/views/coastalMap/components/unitDetailPop.vue @@ -0,0 +1,196 @@ + + +实有单位@@ -36,6 +36,7 @@ + + diff --git a/src/views/coastalMap/components/seaElement.vue b/src/views/coastalMap/components/seaElement.vue index dcbd131..33e177a 100644 --- a/src/views/coastalMap/components/seaElement.vue +++ b/src/views/coastalMap/components/seaElement.vue @@ -10,8 +10,11 @@ v-for="(item, index) in back" :key="index" :style="{ backgroundImage: `url(${item.backImg}) ` }" + @click="handleUseInit(item.text)" > -{{ item.num }}++ {{ item.num }} +{{ item.text }}++ + + + + diff --git a/src/views/coastalMap/components/unitPopup.vue b/src/views/coastalMap/components/unitPopup.vue new file mode 100644 index 0000000..c09ff38 --- /dev/null +++ b/src/views/coastalMap/components/unitPopup.vue @@ -0,0 +1,264 @@ + + +++实有单位++ ++++++单位名称:+联系电话:+单位类型:+派出所名称:+警务区名称:+经度:+纬度:+法人:+法人联系方式:+单位地址:+++ ++ {{ unitValue.uintName }} +++ {{ unitValue.phone === 'null' ? '' : unitValue.phone }} +++ {{ unitValue.unitTypeName }} +++ {{ unitValue.policeStationName }} +++ {{ unitValue.policeDistrictName }} +++ {{ unitValue.longitude }} +++ {{ unitValue.latitude }} +++ {{ unitValue.legalPerson === 'null' ? '' : unitValue.legalPerson }} +++ {{ unitValue.phone === 'null' ? '' : unitValue.phone }} +++ {{ unitValue.uintAddress }} ++++ + + + + diff --git a/src/views/coastalMap/components/unitWorkInfo.vue b/src/views/coastalMap/components/unitWorkInfo.vue new file mode 100644 index 0000000..8abea74 --- /dev/null +++ b/src/views/coastalMap/components/unitWorkInfo.vue @@ -0,0 +1,249 @@ + + +
+ ++++ ++ + + + + + + + + + + +++ ++ + + + + diff --git a/src/views/coastalMap/index.vue b/src/views/coastalMap/index.vue index 8fe83f4..1377c93 100644 --- a/src/views/coastalMap/index.vue +++ b/src/views/coastalMap/index.vue @@ -27,28 +27,50 @@+ ++++ ++ + + + + + + +++ -- + +-+ -+ +- - - --- - + + ++ + ---> -++ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 8d56d6d..aea7b7c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -5,8 +5,9 @@- - + +{{ item.text }}+ + + + + + + + + + + + + + - - + + + + + + + 射阳沿海治安防控综合平台-+@@ -28,120 +71,225 @@ export default { name: 'Home', data() { return { - play: true + index: 1 } }, - methods: { - toHome() { + toHome(val) { + this.index = val this.$router.push('/home/coastalMap') - this.play = true }, - toVideo() { + toVideo(val) { + this.index = val this.$router.push('/home/videoMonitor') - this.play = true }, - toDevice() { + toDevice(val) { + this.index = val this.$router.push('/home/sensingDevice') - this.play = true }, - toBuild() { - this.play = false - this.$router.push('/home/buildUse') + toBuild(val) { + this.index = val + this.$router.push('/buildUse') + }, + toUtils(val) { + this.index = val + this.$router.push('/developUtils') } } } diff --git a/src/views/hunting/control/components/CardTable.vue b/src/views/hunting/control/components/CardTable.vue new file mode 100644 index 0000000..5ded9b9 --- /dev/null +++ b/src/views/hunting/control/components/CardTable.vue @@ -0,0 +1,121 @@ + ++ + + + +++ + + + + +++ + + + + ++ +++ + + + diff --git a/src/views/hunting/control/index.vue b/src/views/hunting/control/index.vue new file mode 100644 index 0000000..2f2b28c --- /dev/null +++ b/src/views/hunting/control/index.vue @@ -0,0 +1,246 @@ + ++++ +++++ ++++
+ 人员姓名+{{ item.hunterName }}+++
+ 证件号码++ {{ item.idCard }} ++++
+ 涉案类型+{{ item.caseSituation }}+++
+ 户籍地址+{{ item.habitationAddress }}+++
+ 登记时间+{{ item.registrationTime }}++ + + + + + diff --git a/src/views/hunting/home/components/keyPerson.vue b/src/views/hunting/home/components/keyPerson.vue new file mode 100644 index 0000000..9a94bbe --- /dev/null +++ b/src/views/hunting/home/components/keyPerson.vue @@ -0,0 +1,433 @@ + + ++ ++ ++ + ++ + ++ + ++ ++ ++ + ++ ++++新增 ++ 编辑 + ++ 删除 + +撤控 +导入 +导出 ++++ 搜索 + ++ 重置 + +
+ 
+ 
+ 
+ + + ++ + ++ + + ++ + ++ {{ scope.row.idCard }} ++ ++ ++ ++ ++ ++ +撤控 ++ + ++ + + diff --git a/src/views/hunting/home/components/resource.vue b/src/views/hunting/home/components/resource.vue new file mode 100644 index 0000000..362009a --- /dev/null +++ b/src/views/hunting/home/components/resource.vue @@ -0,0 +1,105 @@ + + +++ +
+ {{ title_text }}++ ++++ +++ ++ + ++ +非法狩猎人员+{{ importpeople.ffslryCount }}++++ +++ ++ +{{ item.name }}+{{ item.value }}+++-
+
-
+ ++++
+ + ++非法狩猎+ +++人员姓名 :+联系电话 :+证件号码 :+户籍地址 :+现住地址 :+++{{ item.userName }}+{{ item.phone }}++ {{ item.idCard }} +++ {{ item.houseHoldAddress }} +++ {{ item.habitationAddress }} ++
+
+ ++ + + diff --git a/src/views/hunting/home/components/vehicle.vue b/src/views/hunting/home/components/vehicle.vue new file mode 100644 index 0000000..2d5c709 --- /dev/null +++ b/src/views/hunting/home/components/vehicle.vue @@ -0,0 +1,341 @@ + + +++ +
+ {{ title_text }}+++++{{ resourceData.personCount }}+非法狩猎人员+++{{ resourceData.deviceCount }}+感知设备++ ++ + + diff --git a/src/views/hunting/home/components/warning.vue b/src/views/hunting/home/components/warning.vue new file mode 100644 index 0000000..0e5e0eb --- /dev/null +++ b/src/views/hunting/home/components/warning.vue @@ -0,0 +1,329 @@ + + +++ +
+ {{ title_text }}++ ++++-
+
-
+ ++++
+
+ +++ {{ item.type_text }} +++ {{ item.type_text }} +++ {{ item.type_text }} ++ +++车主姓名 :+证件号码 :+车牌号码 :+抓拍时间 :+滞留时间 :+抓拍地点 :+++{{ item.ownerName }}+{{ item.idCard }}++ {{ item.plateNo }} +++ {{ item.passTime }} ++{{ item.duration }}++ {{ item.deviceAddress }} ++
+
+ ++ + + diff --git a/src/views/hunting/home/index.vue b/src/views/hunting/home/index.vue new file mode 100644 index 0000000..e8e8a22 --- /dev/null +++ b/src/views/hunting/home/index.vue @@ -0,0 +1,364 @@ + +++ +
+ {{ title_text }}++ ++++-
+
-
+ ++++
+
+ ++++人员姓名 :+证件号码 :+抓拍时间 :+滞留时间 :+抓拍地址 :+++{{ item.userName }}+{{ item.idCard }}++ {{ item.passTime }} +++ {{ item.duration }} +++ {{ item.deviceAddress }} ++
+
+ + ++ + + diff --git a/src/views/hunting/hunter/components/Box.vue b/src/views/hunting/hunter/components/Box.vue new file mode 100644 index 0000000..8bdca92 --- /dev/null +++ b/src/views/hunting/hunter/components/Box.vue @@ -0,0 +1,44 @@ + +++ ++ + ++ + + + + + ++ + +++ ++++人员管控+++人员预警+++ + + + + diff --git a/src/views/hunting/hunter/index.vue b/src/views/hunting/hunter/index.vue new file mode 100644 index 0000000..9f62e38 --- /dev/null +++ b/src/views/hunting/hunter/index.vue @@ -0,0 +1,236 @@ + ++++ {{ title }} + ++++ + + + + + + diff --git a/src/views/hunting/warning/Detail.vue b/src/views/hunting/warning/Detail.vue new file mode 100644 index 0000000..03e0863 --- /dev/null +++ b/src/views/hunting/warning/Detail.vue @@ -0,0 +1,78 @@ + ++++++++ {{ hunter.hunterName }}++++ ++{{ hunter.idCard }}+ +{{ hunter.sexCn }}+ +{{ hunter.caseSituation }}++ ++{{ hunter.phone }}+ +{{ hunter.houseHoldRegister }}+ +{{ hunter.houseHoldAddress }}++ ++{{ hunter.habitationAddress }}+ +{{ hunter.controlStatusCn }}+ +{{ hunter.registrationTime }}++++ +基本概况 ++ +涉警信息 ++ +涉案信息 ++ +预警信息 ++ +活动轨迹 ++++++ + +++ +更多++关系成员+ ++ ++ +++ ++ ++ ++ + + diff --git a/src/views/hunting/warning/index.vue b/src/views/hunting/warning/index.vue new file mode 100644 index 0000000..3c6e028 --- /dev/null +++ b/src/views/hunting/warning/index.vue @@ -0,0 +1,268 @@ + ++++
+++++++
++++{{ column.label }}+{{ column.content }}++ + + + + + diff --git a/src/views/map/components/MapContainer.vue b/src/views/map/components/MapContainer.vue index bdcf56c..e8cd3af 100644 --- a/src/views/map/components/MapContainer.vue +++ b/src/views/map/components/MapContainer.vue @@ -11,11 +11,11 @@ import { addSources, addLayers, - addImages, - addDeviceSource, - onClickDevice + addImages + // addDeviceSource, + // onClickDevice } from '@/utils/point' -import { onShowLayer, onHideLayer, onLoadHideLayer } from '@/utils/controlLayer' +// import { onShowLayer, onHideLayer, onLoadHideLayer } from '@/utils/controlLayer' import { getPerceptionDeviceAPI } from '@/api/address' import MapScroll from '../../../components/MapScroll.vue' import MapCheck from './MapCheck.vue' @@ -96,34 +96,34 @@ export default { // todo 地图加载事件 this.mapContainer.on('load', () => { // * 加载时隐藏其余图层 - onLoadHideLayer(this.mapContainer) + // onLoadHideLayer(this.mapContainer) // * 只有在数据完全获取到之后再加载地图事件 - bus.$on('postPerception', (perceptionDevice) => { - // console.log(perceptionDevice) - // * 增加自定义数据源、自定义图层、自定义图片 - addDeviceSource(this.mapContainer, perceptionDevice) - addImages(this.mapContainer) - // ! 自定义数据源需要在加载图层之前调用，否则会报错 - addSources(this.mapContainer) - addLayers(this.mapContainer) - onLoadHideLayer(this.mapContainer) - }) - bus.$on('toggleMark', ({ value, label, layer }) => { - console.log(layer) - onShowLayer(this.mapContainer, value, label) - onHideLayer(this.mapContainer, value, label) - }) + // * 增加自定义数据源、自定义图层、自定义图片 + // addDeviceSource(this.mapContainer, perceptionDevice) + addImages(this.mapContainer) + // ! 自定义数据源需要在加载图层之前调用，否则会报错 + addSources(this.mapContainer) + addLayers(this.mapContainer) + // bus.$on('postPerception', (perceptionDevice) => { + // // console.log(perceptionDevice) + // onLoadHideLayer(this.mapContainer) + // }) + // bus.$on('toggleMark', ({ value, label, layer }) => { + // console.log(layer) + // // onShowLayer(this.mapContainer, value, label) + // // onHideLayer(this.mapContainer, value, label) + // }) // * 延迟 1.5 秒触发事件 setTimeout(() => {}, 15000) }) - // todo 地图移动事件 - this.mapContainer.on('moveend', () => { - let bounds = this.mapContainer.getBounds() - let sw = bounds.getSouthWest() - console.log(sw, '地图移动获取当前视口区域') - }) + // // todo 地图移动事件 + // this.mapContainer.on('moveend', () => { + // let bounds = this.mapContainer.getBounds() + // let sw = bounds.getSouthWest() + // console.log(sw, '地图移动获取当前视口区域') + // }) // todo 图层点击事件 - onClickDevice(this.mapContainer) + // onClickDevice(this.mapContainer) }, // * 获取感知设备 async onGetPerceptionDevice() { diff --git a/src/views/sensingDevice/components/carCatch.vue b/src/views/sensingDevice/components/carCatch.vue index cba1029..446c07d 100644 --- a/src/views/sensingDevice/components/carCatch.vue +++ b/src/views/sensingDevice/components/carCatch.vue @@ -13,7 +13,7 @@+ ++ ++ + ++ + ++ + ++ + ++ ++ ++ ++++人员 +人员 +车辆 +车辆 +++搜索 +重置 ++ ++ + +{{ scope.row.idCard }}+ +非法狩猎 ++ + +重点人经过{{ scope.row.deviceAddress }}+ +临海（双洋）所 ++ +未签收 ++ + +详情 + ++ ++ + +{{ scope.row.idCard }}+ +非法狩猎 ++ + +重点人经过{{ scope.row.deviceAddress }}+ +临海（双洋）所 ++ +未签收 ++ + +详情 + ++ + ++ @@ -51,9 +51,7 @@车辆追踪{{ item.partitionField }}-- 1个小时 -+0{{ item.deviceAddress }}@@ -68,7 +66,7 @@ @@ -52,11 +156,11 @@ export default { background-image: url('@/assets/picture/bg_5.png'); background-size: 100% auto; background-repeat: no-repeat; + } - .people_chart { - width: 20vw; - height: 25vh; - } + #people_chart { + width: 20vw; + height: 25vh; } } diff --git a/src/views/sensingDevice/components/personCatch.vue b/src/views/sensingDevice/components/personCatch.vue index 0b3ee59..9be629e 100644 --- a/src/views/sensingDevice/components/personCatch.vue +++ b/src/views/sensingDevice/components/personCatch.vue @@ -13,19 +13,19 @@人员追踪- {{ item.type_text }} + {{ item.impUserTypeName }}- {{ item.type_text }} + {{ item.impUserTypeName }}- {{ item.type_text }} + {{ item.impUserTypeName }}@@ -36,14 +36,12 @@抓拍地址-{{ item.userName }}+{{ item.ownerName }}{{ item.idCard }}-{{ item.partitionField }}-- 2个小时 -+{{ item.createTime }}+0{{ item.deviceAddress }}@@ -58,7 +56,7 @@ + diff --git a/src/views/sensingDevice/index.vue b/src/views/sensingDevice/index.vue index 0957751..a7e664e 100644 --- a/src/views/sensingDevice/index.vue +++ b/src/views/sensingDevice/index.vue @@ -1,8 +1,9 @@-+ + @@ -64,6 +65,7 @@ import CarLarge from './components/carLarge.vue' // * 车流量 import PersonCatch from './components/personCatch.vue' // * 人脸抓拍 import CarCatch from './components/carCatch.vue' // * 车辆抓拍 import DeviceLive from './components/deviceLive.vue' // * 感知设备弹窗 +import VideoDialog from './components/videoDialog' export default { components: { MapDevice, @@ -73,7 +75,8 @@ export default { CarLarge, PersonCatch, DeviceLive, - CarCatch + CarCatch, + VideoDialog }, data() { return { @@ -106,6 +109,10 @@ export default { this.timeArr = dateFormat(new Date()) // console.log(this.timeArr) }, 1000) + }, + openDialog(val) { + console.log('dialogval', val) + this.$refs.videoDialog.open(val) } }, computed: {} diff --git a/src/views/videoMonitor/components/livePlayer.vue b/src/views/videoMonitor/components/mapPlayer.vue similarity index 98% rename from src/views/videoMonitor/components/livePlayer.vue rename to src/views/videoMonitor/components/mapPlayer.vue index ef0b0de..50cd59e 100644 --- a/src/views/videoMonitor/components/livePlayer.vue +++ b/src/views/videoMonitor/components/mapPlayer.vue @@ -92,7 +92,7 @@ -+ -
+
-