diff --git a/src/api/facility.js b/src/api/facility.js index ffdecf0..bb594a6 100644 --- a/src/api/facility.js +++ b/src/api/facility.js @@ -1,4 +1,4 @@ -import http from '@/utils/http' +import request from '../utils/request' import { getToken } from '@/utils/token' import axios from 'axios' @@ -6,7 +6,7 @@ const token = getToken() // * 登录接口获取 token export const login = () => { - return http.get('/api/v1/login', { + return request.get('/api/v1/login', { params: { username: 'admin', password: 'AF7548EEDFF8e737C0E4B2A669497290', @@ -17,26 +17,26 @@ export const login = () => { // * 获取设备信息列表 export const getDeviceListAPI = (params) => { - return http.get( + return request.get( `/api/v1/device/channellist?start=${params.start}&limit=${params.limit}&online=${params.online}&token=${token}` ) } // * 获取视频列表 export const getVideoListAPI = (channel) => { - return http.get( + return request.get( `/api/v1/stream/start?serial=${'32092400002005063063'}&channel=${channel}&timeout=${500}&check_channel_status=${true}&token=${token}` ) } // * 退出登录 export const logoutAPI = () => { - return http.get('/api/v1/logout') + return request.get('/api/v1/logout') } // * 关闭视频流 export const getCloseVideoAPI = (channel) => { - return http.get( + return request.get( `/api/v1/stream/stop?serial=${'32092400002005063063'}&channel=${channel}&token=${token}` ) } diff --git a/src/assets/house-hza/bg-1.png b/src/assets/house-hza/bg-1.png new file mode 100644 index 0000000..ba1b071 Binary files /dev/null and b/src/assets/house-hza/bg-1.png differ diff --git a/src/assets/house-hza/bg-2.png b/src/assets/house-hza/bg-2.png new file mode 100644 index 0000000..58b7f72 Binary files /dev/null and b/src/assets/house-hza/bg-2.png differ diff --git a/src/assets/house-hza/bg-22.png b/src/assets/house-hza/bg-22.png new file mode 100644 index 0000000..7a3eb8e Binary files /dev/null and b/src/assets/house-hza/bg-22.png differ diff --git a/src/assets/house-hza/bg-3.png b/src/assets/house-hza/bg-3.png new file mode 100644 index 0000000..76378fd Binary files /dev/null and b/src/assets/house-hza/bg-3.png differ diff --git a/src/assets/house-hza/bg-4.png b/src/assets/house-hza/bg-4.png new file mode 100644 index 0000000..8c0f63b Binary files /dev/null and b/src/assets/house-hza/bg-4.png differ diff --git a/src/assets/house-hza/bg-5.png b/src/assets/house-hza/bg-5.png new file mode 100644 index 0000000..11f42cd Binary files /dev/null and b/src/assets/house-hza/bg-5.png differ diff --git a/src/assets/house-hza/bg-6.png b/src/assets/house-hza/bg-6.png new file mode 100644 index 0000000..4b09577 Binary files /dev/null and b/src/assets/house-hza/bg-6.png differ diff --git a/src/assets/house-hza/bg10.png b/src/assets/house-hza/bg10.png new file mode 100644 index 0000000..3c0c6a0 Binary files /dev/null and b/src/assets/house-hza/bg10.png differ diff --git a/src/assets/house-hza/bg11.png b/src/assets/house-hza/bg11.png new file mode 100644 index 0000000..8434df7 Binary files /dev/null and b/src/assets/house-hza/bg11.png differ diff --git a/src/assets/house-hza/bg12.png b/src/assets/house-hza/bg12.png new file mode 100644 index 0000000..dd29e21 Binary files /dev/null and b/src/assets/house-hza/bg12.png differ diff --git a/src/assets/house-hza/bg13.png b/src/assets/house-hza/bg13.png new file mode 100644 index 0000000..c1915b9 Binary files /dev/null and b/src/assets/house-hza/bg13.png differ diff --git a/src/assets/house-hza/bg14.png b/src/assets/house-hza/bg14.png new file mode 100644 index 0000000..28e57ee Binary files /dev/null and b/src/assets/house-hza/bg14.png differ diff --git a/src/assets/house-hza/bg15.png b/src/assets/house-hza/bg15.png new file mode 100644 index 0000000..c0b9da9 Binary files /dev/null and b/src/assets/house-hza/bg15.png differ diff --git a/src/assets/house-hza/bg16.png b/src/assets/house-hza/bg16.png new file mode 100644 index 0000000..8f19337 Binary files /dev/null and b/src/assets/house-hza/bg16.png differ diff --git a/src/assets/house-hza/bg17.png b/src/assets/house-hza/bg17.png new file mode 100644 index 0000000..57ef528 Binary files /dev/null and b/src/assets/house-hza/bg17.png differ diff --git a/src/assets/house-hza/bg18.png b/src/assets/house-hza/bg18.png new file mode 100644 index 0000000..097eab1 Binary files /dev/null and b/src/assets/house-hza/bg18.png differ diff --git a/src/assets/house-hza/bg19.png b/src/assets/house-hza/bg19.png new file mode 100644 index 0000000..2ee46f0 Binary files /dev/null and b/src/assets/house-hza/bg19.png differ diff --git a/src/assets/house-hza/bg20.png b/src/assets/house-hza/bg20.png new file mode 100644 index 0000000..def4281 Binary files /dev/null and b/src/assets/house-hza/bg20.png differ diff --git a/src/assets/house-hza/bg21.png b/src/assets/house-hza/bg21.png new file mode 100644 index 0000000..04cdfac Binary files /dev/null and b/src/assets/house-hza/bg21.png differ diff --git a/src/assets/house-hza/bg22.png b/src/assets/house-hza/bg22.png new file mode 100644 index 0000000..db01794 Binary files /dev/null and b/src/assets/house-hza/bg22.png differ diff --git a/src/assets/house-hza/bg7.png b/src/assets/house-hza/bg7.png new file mode 100644 index 0000000..1950d2b Binary files /dev/null and b/src/assets/house-hza/bg7.png differ diff --git a/src/assets/house-hza/bg8.png b/src/assets/house-hza/bg8.png new file mode 100644 index 0000000..9148310 Binary files /dev/null and b/src/assets/house-hza/bg8.png differ diff --git a/src/assets/house-hza/bg9.png b/src/assets/house-hza/bg9.png new file mode 100644 index 0000000..c9c892b Binary files /dev/null and b/src/assets/house-hza/bg9.png differ diff --git a/src/utils/http.js b/src/utils/http.js index ee491f0..b8e020f 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,86 +1,39 @@ import axios from 'axios' +// import { getToken } from '@/utils/token' // * 海康平台 -import vm from '../main' +// const baseURL = 'http://50.146.63.43:15000/' +const baseURL = 'http://50.146.63.43:20000/' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const http = axios.create({ - // baseURL: 'http://50.146.63.43:1129/hjapi', - //baseURL: 'http://121.41.91.94:12002/hjapi', - //baseURL: `http://${window.location.host}/hjapi`, - // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 - baseURL: 'http://50.146.63.43:20000/', - timeout: 50000, - headers: { 'content-type': 'application/json' } + baseURL, + timeout: 30000 }) -// request拦截器 +// todo 封装基本拦截 +// * 请求拦截器 http.interceptors.request.use( (config) => { - // // 是否需要设置 token - // const isToken = (config.headers || {}).isToken === false - // // 是否需要防止数据重复提交 - // if (getToken() && !isToken) { - // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - // } - //防止重复提交 if (config) { + // config.headers['Authorization'] = 'Bearer ' + getToken() return config } }, (error) => { - console.log(error) - Promise.reject(error) + return Promise.reject(error) } ) -// response 拦截器 -// 可以在接口响应后统一处理结果 + +// * 响应拦截器 http.interceptors.response.use( (response) => { - if (response.data) { - switch (response.data.code) { - case 200: - // 如果是返回的文件 - if (response.config.responseType === 'blob') { - return response.data - } - // 兼容服务端返回的字符串数据 - if (typeof response.data === 'string') { - response.data = response.data - ? JSON.parse(response.data) - : response.data - } - return response.data - - case 401: - if (vm.$route.name !== 'login') { - vm.$message.warning({ - content: '身份认证信息已失效，请重新登录。', - duration: 2, - onClose: () => { - vm.$router.push({ name: 'login' }) - } - }) - } else { - return Promise.reject() - } - break - case 403: - vm.$message.warning({ - content: response.data.msg, - duration: 3 - }) - break - case 500: - // 如果是返回的文件 - vm.$message.warning({ - content: response.data.msg, - duration: 3 - }) - return response.data - } + if (response.status !== 200) { + return Promise.reject(response.message) } + return response.data }, (error) => { - console.log('err' + error) // for debug - + if (axios.isCancel(error)) { + console.log(error) + } return Promise.reject(error) } ) diff --git a/src/utils/request.js b/src/utils/request.js index b891777..13a8bd8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,11 +3,10 @@ import vm from '../main' import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - baseURL: 'http://50.146.63.43:1129/hjapi', - //baseURL: 'http://121.41.91.94:12002/hjapi', + // baseURL: 'http://50.146.63.43:1129/hjapi', + // baseURL: 'http://121.41.91.94:12002/hjapi', //baseURL: `http://${window.location.host}/hjapi`, - // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 - // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 + baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 timeout: 50000, headers: { 'content-type': 'application/json' } }) @@ -49,7 +48,7 @@ request.interceptors.response.use( case 401: if (vm.$route.name !== 'login') { - vm.$message.warning({ + vm.$Message.warning({ content: '身份认证信息已失效，请重新登录。', duration: 2, onClose: () => { @@ -61,14 +60,14 @@ request.interceptors.response.use( } break case 403: - vm.$message.warning({ + vm.$Message.warning({ content: response.data.msg, duration: 3 }) break case 500: // 如果是返回的文件 - vm.$message.warning({ + vm.$Message.warning({ content: response.data.msg, duration: 3 }) diff --git a/src/views/buildUse/html.html b/src/views/buildUse/html.html deleted file mode 100644 index 8c02334..0000000 --- a/src/views/buildUse/html.html +++ /dev/null @@ -1,371 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/buildUse/index.vue b/src/views/buildUse/index.vue index b87d64e..eb8e271 100644 --- a/src/views/buildUse/index.vue +++ b/src/views/buildUse/index.vue @@ -118,29 +118,29 @@ 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/icon1.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')})` + return `url(${require('@/assets/building-picture-hza/icon2.png')})` case '7': - return `url(${require('../../assets/building-picture-hza/icon1.png')})` + return `url(${require('@/assets/building-picture-hza/icon1.png')})` case '8': - return `url(${require('../../assets/building-picture-hza/icon1.png')})` + return `url(${require('@/assets/building-picture-hza/icon1.png')})` case '9': - return `url(${require('../../assets/building-picture-hza/icon1.png')})` + return `url(${require('@/assets/building-picture-hza/icon1.png')})` case '10': - return `url(${require('../../assets/building-picture-hza/icon1.png')})` + return `url(${require('@/assets/building-picture-hza/icon1.png')})` case '11': - return `url(${require('../../assets/building-picture-hza/icon1.png')})` + 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/icon1.png')})` } } } diff --git a/src/views/coastalMap/components/actualBuilding.vue b/src/views/coastalMap/components/actualBuilding.vue new file mode 100644 index 0000000..f522472 --- /dev/null +++ b/src/views/coastalMap/components/actualBuilding.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/views/coastalMap/components/actualPeople.vue b/src/views/coastalMap/components/actualPeople.vue new file mode 100644 index 0000000..069dd0c --- /dev/null +++ b/src/views/coastalMap/components/actualPeople.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/src/views/coastalMap/components/buildingInform.vue b/src/views/coastalMap/components/buildingInform.vue index 823c933..d80e3ff 100644 --- a/src/views/coastalMap/components/buildingInform.vue +++ b/src/views/coastalMap/components/buildingInform.vue @@ -7,45 +7,377 @@
-
+
+
地址
+
所在网络
+
所在警务区
+
+ +
+
+
{{ item.place }}
+
+
+ +
+ + + + + +
+
+
房屋结构
+
+ +
+
房屋类型:
+
+
-出租
+
-住宅
+
-商用
+
-空置
+
+
+ +
1-{{ floorlist.length }}楼
+ +
+
+
{{ item.floor1 }}
+
+ {{ item.floor2 }} +
+
+ {{ item.floor3 }} +
+
diff --git a/src/views/coastalMap/components/floorInform.vue b/src/views/coastalMap/components/floorInform.vue new file mode 100644 index 0000000..484be50 --- /dev/null +++ b/src/views/coastalMap/components/floorInform.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/coastalMap/components/keyPerson.vue b/src/views/coastalMap/components/keyPerson.vue index 3124c6b..a49e4c8 100644 --- a/src/views/coastalMap/components/keyPerson.vue +++ b/src/views/coastalMap/components/keyPerson.vue @@ -73,45 +73,38 @@
  • - +
    查看详情
    - -
    - {{ item.type_text }} +
    + {{ item.impUserType }}
    -
    - {{ item.type_text }} +
    + {{ item.impUserType }}
    -
    - {{ item.type_text }} +
    + {{ item.impUserType }}
    -
    人员姓名 :
    -
    联系电话 :
    -
    证件号码 :
    -
    户籍地址 :
    -
    现住地址 :
    +
    人员姓名
    +
    联系电话
    +
    证件号码
    +
    户籍地址
    +
    现住地址
    {{ item.userName }}
    {{ item.phone }}
    -
    +
    {{ item.idCard }}
    -
    +
    {{ item.houseHoldAddress }}
    -
    +
    {{ item.habitationAddress }}
    @@ -126,19 +119,16 @@ import * as echarts from 'echarts' import EleResize from '@/utils/esresize' import { keyPersonnelAPI, MetaImpUserInfo } from '@/api/coastalMap/resource' +// import PersonScroll from './keypersonScroll.vue' export default { name: 'KeyPerson', + // components: { PersonScroll }, data() { return { - // * 模块标题 title_text: '重点人员', - // * 重点人员数据 importpeople: {}, - // * 滚动数据 roll_list: [], - // * 动画开关 animateUp: false, - // * 定时器ID timer: null } }, @@ -216,13 +206,12 @@ export default { async onkeyPersonnelAPI() { const res = await keyPersonnelAPI() this.importpeople = res.data - console.log(this.importpeople, '重点人员数据') }, //重点人员信息(轮播) async onMetaImpUserInfo() { const res = await MetaImpUserInfo() this.roll_list = res.rows - console.log(this.roll_list, '重点人员信息') + console.log(this.roll_list, 'aaaa') } } } diff --git a/src/views/coastalMap/components/policeStatus.vue b/src/views/coastalMap/components/policeStatus.vue index 518bbbe..e21f2d6 100644 --- a/src/views/coastalMap/components/policeStatus.vue +++ b/src/views/coastalMap/components/policeStatus.vue @@ -10,15 +10,9 @@
    -
    -
    1
    -
    -
    -
    2
    -
    -
    -
    3
    -
    +
    1
    +
    2
    +
    3
    @@ -31,17 +25,18 @@
    {{ item.createTime }}
    -
    警情类型 :
    -
    接警单位 :
    -
    事发地址 :
    -
    报警内容 :
    +
    警情类型
    +
    接警单位
    +
    事发地址
    +
    报警内容
    + : {{ item.alarmResponseTypeName }}
    -
    {{ item.alarmResponseUnit }}
    -
    {{ item.alarmAddress }}
    +
    :{{ item.alarmResponseUnit }}
    +
    :{{ item.alarmAddress }}
    {{ item.alarmResponseContent }}
    @@ -69,7 +64,7 @@ export default { return { value: '1', y_data: ['其他纠纷', '家庭纠纷', '其他警情'], // y轴文字 - chart_data: [], // chart表数据 + chart_data: ['145', '29', '101'], // chart表数据 roll_list: [ // { // id: '1', @@ -139,24 +134,17 @@ export default { timer: null } }, - created() { - this.onPoliceStatistics() - this.onMetaAlarmInfo() - }, mounted() { - // this.init_charts() + this.init_charts() this.timer = setInterval(this.scrollAnimate, 1500) }, - watch: { - chart_data: { - handler(newData) { - if (newData) this.init_charts(newData) - }, - immediate: true - } + created() { + this.onPoliceStatistics() + this.onMetaAlarmInfo() }, + methods: { - init_charts(chart_data) { + init_charts() { let charts = document.getElementById('charts_right') let resize_div = document.getElementById('charts_right') let myChart = echarts.init(charts) @@ -200,8 +188,7 @@ export default { }, series: [ { - data: chart_data, - barWidth: '20%', + data: this.chart_data, type: 'bar', showBackground: true, itemStyle: { @@ -209,7 +196,6 @@ export default { colorStops: [ { offset: 0, - barWidth: '30%', color: '#1A416B' // 0% 处的颜色 }, { @@ -248,15 +234,12 @@ 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(res, '警情信息表') + console.log(this.roll_listc, 'oooppp') } } } @@ -292,7 +275,6 @@ 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; @@ -310,47 +292,17 @@ export default { .rank_left_item { width: 3vw; height: 6vh; - 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%; - } + 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%; } - .two { background: url('~@/assets/coastalMap/policeStatus/rank_two.png') no-repeat; @@ -404,8 +356,8 @@ export default { position: absolute; width: 7vw; height: 2vh; - top: 0.5vh; - right: 0.5vw; + top: 0px; + right: 0px; color: #fff; text-align: center; line-height: 2vh; diff --git a/src/views/coastalMap/index.vue b/src/views/coastalMap/index.vue index d2304ad..8d63fd6 100644 --- a/src/views/coastalMap/index.vue +++ b/src/views/coastalMap/index.vue @@ -26,6 +26,7 @@
    +
    @@ -34,21 +35,26 @@
    - + +
    +
    +
    - - -
    + +
    -
    +
    {{ item.text }}
    + @@ -65,7 +72,6 @@ -