From fe333b5a71b621e848520c13dd046f2ee0b42b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8B=AC=E6=A0=91=E7=9A=84=E9=A3=8E?= <2167228784@qq.com> Date: Fri, 8 Dec 2023 10:09:16 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/facility.js | 12 +- .../{bg_导航@2x.png => bg_瀵艰埅@2x.png} | Bin .../{底座@2x.png => 搴曞骇@2x.png} | Bin ...{bg_12／hover.png => bg_12锛廻over.png} | Bin ...reset(1).png => icon_but锛弐eset(1).png} | Bin ...but／reset.png => icon_but锛弐eset.png} | Bin ...2x(1).png => icon_but锛弐eset@2x(1).png} | Bin ...reset@2x.png => icon_but锛弐eset@2x.png} | Bin ...杩借釜_瑙嗛鍥炴斁_slices.zip} | Bin .../{直播@2x.png => 鐩存挱@2x.png} | Bin ..._涉海_1@2x.png => bg_娑夋捣_1@2x.png} | Bin ..._涉海_2@2x.png => bg_娑夋捣_2@2x.png} | Bin ..._涉海_3@2x.png => bg_娑夋捣_3@2x.png} | Bin ..._涉海_4@2x.png => bg_娑夋捣_4@2x.png} | Bin ...@2x.png => bg_娴佸姩浜哄彛@2x.png} | Bin ...ddle@2x.png => bg_寮圭獥_middle@2x.png} | Bin ...hover@2x.png => bg_浜哄憳_hover@2x.png} | Bin ...员_nor@2x.png => bg_浜哄憳_nor@2x.png} | Bin .../{bg_信息@2x.png => bg_淇℃伅@2x.png} | Bin .../{bg_导航@2x.png => bg_瀵艰埅@2x.png} | Bin ...人口.png => bg_瀹炴湁浜哄彛.png} | Bin ...@2x.png => bg_瀹炴湁浜哄彛@2x.png} | Bin ...单位.png => bg_瀹炴湁鍗曚綅.png} | Bin ...@2x.png => bg_瀹炴湁鍗曚綅@2x.png} | Bin ...房屋.png => bg_瀹炴湁鎴垮眿.png} | Bin ...@2x.png => bg_瀹炴湁鎴垮眿@2x.png} | Bin ...png => bg_璀﹀姏鍒嗗竷_hover@2x.png} | Bin ...x.png => bg_璀﹀姏鍒嗗竷_nor@2x.png} | Bin ...png => bg_鏌ョ湅杞ㄨ抗_hover@2x.png} | Bin ...x.png => bg_鏌ョ湅杞ㄨ抗_nor@2x.png} | Bin ...人员.png => bg_閲嶇偣浜哄憳.png} | Bin ...@2x.png => bg_閲嶇偣浜哄憳@2x.png} | Bin ...png => but_鏌ョ湅杞ㄨ抗锛廳ef.png} | Bin ... => but_鏌ョ湅杞ㄨ抗锛廳ef@2x.png} | Bin ...png => but_鏌ョ湅杞ㄨ抗锛弒el.png} | Bin ... => but_鏌ョ湅杞ㄨ抗锛弒el@2x.png} | Bin .../{icon_播放.png => icon_鎾斁.png} | Bin ...on_播放@2x.png => icon_鎾斁@2x.png} | Bin .../{icon_暂停.png => icon_鏆傚仠.png} | Bin ...on_暂停@2x.png => icon_鏆傚仠@2x.png} | Bin ...紡鏃ュ巻2锛忕嚎鍨婡2x(1).png} | Bin ...闈紡鏃ュ巻2锛忕嚎鍨婡2x.png} | Bin ...闈紡鏃ュ巻2锛忕嚎锟絖1).png} | Bin ...晫闈紡鏃ュ巻2锛忕嚎锟絖png} | Bin .../picture/{弹窗.png => 寮圭獥.png} | Bin .../{弹窗@2x.png => 寮圭獥@2x.png} | Bin .../picture/{底座.png => 搴曞骇.png} | Bin .../{底座@2x.png => 搴曞骇@2x.png} | Bin .../{编组 20@2x.png => 缂栫粍 20@2x.png} | Bin .../picture/{编组 9.png => 缂栫粍 9.png} | Bin .../{编组 9@2x.png => 缂栫粍 9@2x.png} | Bin .../picture/{编组.png => 缂栫粍.png} | Bin .../{编组@2x.png => 缂栫粍@2x.png} | Bin ...份(1).png => 鍒嗙粍澶囦唤(1).png} | Bin ...份(2).png => 鍒嗙粍澶囦唤(2).png} | Bin ...份(3).png => 鍒嗙粍澶囦唤(3).png} | Bin ...2x(1).png => 鍒嗙粍澶囦唤@2x(1).png} | Bin ...2x(2).png => 鍒嗙粍澶囦唤@2x(2).png} | Bin ...2x(3).png => 鍒嗙粍澶囦唤@2x(3).png} | Bin ...份@2x.png => 鍒嗙粍澶囦唤@2x.png} | Bin ...ng => 鎾掔偣_娌挎捣瑙嗛(1).png} | Bin ...ng => 鎾掔偣_娌挎捣瑙嗛(2).png} | Bin ...=> 鎾掔偣_娌挎捣瑙嗛@2x(1).png} | Bin ...=> 鎾掔偣_娌挎捣瑙嗛@2x(2).png} | Bin ...ng => 鎾掔偣_娌挎捣瑙嗛@2x.png} | Bin ...点_起点.png => 鎾掔偣_璧风偣.png} | Bin ...点@2x.png => 鎾掔偣_璧风偣@2x.png} | Bin ...点_线路.png => 鎾掔偣_绾胯矾.png} | Bin ...路@2x.png => 鎾掔偣_绾胯矾@2x.png} | Bin ...8(1).png => 鎾斁 鎾斁 08(1).png} | Bin ...8(2).png => 鎾斁 鎾斁 08(2).png} | Bin ...8(3).png => 鎾斁 鎾斁 08(3).png} | Bin ...放 08.png => 鎾斁 鎾斁 08.png} | Bin ...).png => 鎾斁 鎾斁 08@2x(1).png} | Bin ...).png => 鎾斁 鎾斁 08@2x(2).png} | Bin ...).png => 鎾斁 鎾斁 08@2x(3).png} | Bin ...8@2x.png => 鎾斁 鎾斁 08@2x.png} | Bin .../picture/{直播.png => 鐩存挱.png} | Bin .../{直播@2x.png => 鐩存挱@2x.png} | Bin .../picture/{矩形.png => 鐭╁舰.png} | Bin .../{矩形@2x.png => 鐭╁舰@2x.png} | Bin src/utils/http.js | 81 ++++++++++--- src/utils/request.js | 10 +- src/views/coastalMap/components/keyPerson.vue | 47 +++++--- .../coastalMap/components/policeStatus.vue | 110 +++++++++++++----- src/views/coastalMap/index.vue | 13 ++- src/views/home/index.vue | 38 +++--- src/views/videoMonitor/index.vue | 48 +++++--- 88 files changed, 239 insertions(+), 120 deletions(-) rename src/assets/building-picture-hza/{bg_导航@2x.png => bg_瀵艰埅@2x.png} (100%) rename src/assets/building-picture-hza/{底座@2x.png => 搴曞骇@2x.png} (100%) rename src/assets/icon-hza/{bg_12／hover.png => bg_12锛廻over.png} (100%) rename src/assets/icon-hza/{icon_but／reset(1).png => icon_but锛弐eset(1).png} (100%) rename src/assets/icon-hza/{icon_but／reset.png => icon_but锛弐eset.png} (100%) rename src/assets/icon-hza/{icon_but／reset@2x(1).png => icon_but锛弐eset@2x(1).png} (100%) rename src/assets/icon-hza/{icon_but／reset@2x.png => icon_but锛弐eset@2x.png} (100%) rename src/assets/icon-hza/{感知设备_人员追踪_视频回放_slices.zip => 鎰熺煡璁惧_浜哄憳杩借釜_瑙嗛鍥炴斁_slices.zip} (100%) rename src/assets/icon-hza/{直播@2x.png => 鐩存挱@2x.png} (100%) rename src/assets/picture/{bg_涉海_1@2x.png => bg_娑夋捣_1@2x.png} (100%) rename src/assets/picture/{bg_涉海_2@2x.png => bg_娑夋捣_2@2x.png} (100%) rename src/assets/picture/{bg_涉海_3@2x.png => bg_娑夋捣_3@2x.png} (100%) rename src/assets/picture/{bg_涉海_4@2x.png => bg_娑夋捣_4@2x.png} (100%) rename src/assets/picture/{bg_流动人口@2x.png => bg_娴佸姩浜哄彛@2x.png} (100%) rename src/assets/picture/{bg_弹窗_middle@2x.png => bg_寮圭獥_middle@2x.png} (100%) rename src/assets/picture/{bg_人员_hover@2x.png => bg_浜哄憳_hover@2x.png} (100%) rename src/assets/picture/{bg_人员_nor@2x.png => bg_浜哄憳_nor@2x.png} (100%) rename src/assets/picture/{bg_信息@2x.png => bg_淇℃伅@2x.png} (100%) rename src/assets/picture/{bg_导航@2x.png => bg_瀵艰埅@2x.png} (100%) rename src/assets/picture/{bg_实有人口.png => bg_瀹炴湁浜哄彛.png} (100%) rename src/assets/picture/{bg_实有人口@2x.png => bg_瀹炴湁浜哄彛@2x.png} (100%) rename src/assets/picture/{bg_实有单位.png => bg_瀹炴湁鍗曚綅.png} (100%) rename src/assets/picture/{bg_实有单位@2x.png => bg_瀹炴湁鍗曚綅@2x.png} (100%) rename src/assets/picture/{bg_实有房屋.png => bg_瀹炴湁鎴垮眿.png} (100%) rename src/assets/picture/{bg_实有房屋@2x.png => bg_瀹炴湁鎴垮眿@2x.png} (100%) rename src/assets/picture/{bg_警力分布_hover@2x.png => bg_璀﹀姏鍒嗗竷_hover@2x.png} (100%) rename src/assets/picture/{bg_警力分布_nor@2x.png => bg_璀﹀姏鍒嗗竷_nor@2x.png} (100%) rename src/assets/picture/{bg_查看轨迹_hover@2x.png => bg_鏌ョ湅杞ㄨ抗_hover@2x.png} (100%) rename src/assets/picture/{bg_查看轨迹_nor@2x.png => bg_鏌ョ湅杞ㄨ抗_nor@2x.png} (100%) rename src/assets/picture/{bg_重点人员.png => bg_閲嶇偣浜哄憳.png} (100%) rename src/assets/picture/{bg_重点人员@2x.png => bg_閲嶇偣浜哄憳@2x.png} (100%) rename src/assets/picture/{but_查看轨迹／def.png => but_鏌ョ湅杞ㄨ抗锛廳ef.png} (100%) rename src/assets/picture/{but_查看轨迹／def@2x.png => but_鏌ョ湅杞ㄨ抗锛廳ef@2x.png} (100%) rename src/assets/picture/{but_查看轨迹／sel.png => but_鏌ョ湅杞ㄨ抗锛弒el.png} (100%) rename src/assets/picture/{but_查看轨迹／sel@2x.png => but_鏌ョ湅杞ㄨ抗锛弒el@2x.png} (100%) rename src/assets/picture/{icon_播放.png => icon_鎾斁.png} (100%) rename src/assets/picture/{icon_播放@2x.png => icon_鎾斁@2x.png} (100%) rename src/assets/picture/{icon_暂停.png => icon_鏆傚仠.png} (100%) rename src/assets/picture/{icon_暂停@2x.png => icon_鏆傚仠@2x.png} (100%) rename src/assets/picture/{icon／界面／日历2／线型@2x(1).png => icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x(1).png} (100%) rename src/assets/picture/{icon／界面／日历2／线型@2x.png => icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x.png} (100%) rename src/assets/picture/{icon／界面／日历2／线�_1).png => icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖1).png} (100%) rename src/assets/picture/{icon／界面／日历2／线�_png => icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖png} (100%) rename src/assets/picture/{弹窗.png => 寮圭獥.png} (100%) rename src/assets/picture/{弹窗@2x.png => 寮圭獥@2x.png} (100%) rename src/assets/picture/{底座.png => 搴曞骇.png} (100%) rename src/assets/picture/{底座@2x.png => 搴曞骇@2x.png} (100%) rename src/assets/picture/{编组 20@2x.png => 缂栫粍 20@2x.png} (100%) rename src/assets/picture/{编组 9.png => 缂栫粍 9.png} (100%) rename src/assets/picture/{编组 9@2x.png => 缂栫粍 9@2x.png} (100%) rename src/assets/picture/{编组.png => 缂栫粍.png} (100%) rename src/assets/picture/{编组@2x.png => 缂栫粍@2x.png} (100%) rename src/assets/picture/{分组备份(1).png => 鍒嗙粍澶囦唤(1).png} (100%) rename src/assets/picture/{分组备份(2).png => 鍒嗙粍澶囦唤(2).png} (100%) rename src/assets/picture/{分组备份(3).png => 鍒嗙粍澶囦唤(3).png} (100%) rename src/assets/picture/{分组备份@2x(1).png => 鍒嗙粍澶囦唤@2x(1).png} (100%) rename src/assets/picture/{分组备份@2x(2).png => 鍒嗙粍澶囦唤@2x(2).png} (100%) rename src/assets/picture/{分组备份@2x(3).png => 鍒嗙粍澶囦唤@2x(3).png} (100%) rename src/assets/picture/{分组备份@2x.png => 鍒嗙粍澶囦唤@2x.png} (100%) rename src/assets/picture/{撒点_沿海视频(1).png => 鎾掔偣_娌挎捣瑙嗛(1).png} (100%) rename src/assets/picture/{撒点_沿海视频(2).png => 鎾掔偣_娌挎捣瑙嗛(2).png} (100%) rename src/assets/picture/{撒点_沿海视频@2x(1).png => 鎾掔偣_娌挎捣瑙嗛@2x(1).png} (100%) rename src/assets/picture/{撒点_沿海视频@2x(2).png => 鎾掔偣_娌挎捣瑙嗛@2x(2).png} (100%) rename src/assets/picture/{撒点_沿海视频@2x.png => 鎾掔偣_娌挎捣瑙嗛@2x.png} (100%) rename src/assets/picture/{撒点_起点.png => 鎾掔偣_璧风偣.png} (100%) rename src/assets/picture/{撒点_起点@2x.png => 鎾掔偣_璧风偣@2x.png} (100%) rename src/assets/picture/{撒点_线路.png => 鎾掔偣_绾胯矾.png} (100%) rename src/assets/picture/{撒点_线路@2x.png => 鎾掔偣_绾胯矾@2x.png} (100%) rename src/assets/picture/{播放 播放 08(1).png => 鎾斁 鎾斁 08(1).png} (100%) rename src/assets/picture/{播放 播放 08(2).png => 鎾斁 鎾斁 08(2).png} (100%) rename src/assets/picture/{播放 播放 08(3).png => 鎾斁 鎾斁 08(3).png} (100%) rename src/assets/picture/{播放 播放 08.png => 鎾斁 鎾斁 08.png} (100%) rename src/assets/picture/{播放 播放 08@2x(1).png => 鎾斁 鎾斁 08@2x(1).png} (100%) rename src/assets/picture/{播放 播放 08@2x(2).png => 鎾斁 鎾斁 08@2x(2).png} (100%) rename src/assets/picture/{播放 播放 08@2x(3).png => 鎾斁 鎾斁 08@2x(3).png} (100%) rename src/assets/picture/{播放 播放 08@2x.png => 鎾斁 鎾斁 08@2x.png} (100%) rename src/assets/picture/{直播.png => 鐩存挱.png} (100%) rename src/assets/picture/{直播@2x.png => 鐩存挱@2x.png} (100%) rename src/assets/picture/{矩形.png => 鐭╁舰.png} (100%) rename src/assets/picture/{矩形@2x.png => 鐭╁舰@2x.png} (100%) diff --git a/src/api/facility.js b/src/api/facility.js index bb594a6..ffdecf0 100644 --- a/src/api/facility.js +++ b/src/api/facility.js @@ -1,4 +1,4 @@ -import request from '../utils/request' +import http from '@/utils/http' import { getToken } from '@/utils/token' import axios from 'axios' @@ -6,7 +6,7 @@ const token = getToken() // * 登录接口获取 token export const login = () => { - return request.get('/api/v1/login', { + return http.get('/api/v1/login', { params: { username: 'admin', password: 'AF7548EEDFF8e737C0E4B2A669497290', @@ -17,26 +17,26 @@ export const login = () => { // * 获取设备信息列表 export const getDeviceListAPI = (params) => { - return request.get( + return http.get( `/api/v1/device/channellist?start=${params.start}&limit=${params.limit}&online=${params.online}&token=${token}` ) } // * 获取视频列表 export const getVideoListAPI = (channel) => { - return request.get( + return http.get( `/api/v1/stream/start?serial=${'32092400002005063063'}&channel=${channel}&timeout=${500}&check_channel_status=${true}&token=${token}` ) } // * 退出登录 export const logoutAPI = () => { - return request.get('/api/v1/logout') + return http.get('/api/v1/logout') } // * 关闭视频流 export const getCloseVideoAPI = (channel) => { - return request.get( + return http.get( `/api/v1/stream/stop?serial=${'32092400002005063063'}&channel=${channel}&token=${token}` ) } diff --git a/src/assets/building-picture-hza/bg_导航@2x.png b/src/assets/building-picture-hza/bg_瀵艰埅@2x.png similarity index 100% rename from src/assets/building-picture-hza/bg_导航@2x.png rename to src/assets/building-picture-hza/bg_瀵艰埅@2x.png diff --git a/src/assets/building-picture-hza/底座@2x.png b/src/assets/building-picture-hza/搴曞骇@2x.png similarity index 100% rename from src/assets/building-picture-hza/底座@2x.png rename to src/assets/building-picture-hza/搴曞骇@2x.png diff --git a/src/assets/icon-hza/bg_12／hover.png b/src/assets/icon-hza/bg_12锛廻over.png similarity index 100% rename from src/assets/icon-hza/bg_12／hover.png rename to src/assets/icon-hza/bg_12锛廻over.png diff --git a/src/assets/icon-hza/icon_but／reset(1).png b/src/assets/icon-hza/icon_but锛弐eset(1).png similarity index 100% rename from src/assets/icon-hza/icon_but／reset(1).png rename to src/assets/icon-hza/icon_but锛弐eset(1).png diff --git a/src/assets/icon-hza/icon_but／reset.png b/src/assets/icon-hza/icon_but锛弐eset.png similarity index 100% rename from src/assets/icon-hza/icon_but／reset.png rename to src/assets/icon-hza/icon_but锛弐eset.png diff --git a/src/assets/icon-hza/icon_but／reset@2x(1).png b/src/assets/icon-hza/icon_but锛弐eset@2x(1).png similarity index 100% rename from src/assets/icon-hza/icon_but／reset@2x(1).png rename to src/assets/icon-hza/icon_but锛弐eset@2x(1).png diff --git a/src/assets/icon-hza/icon_but／reset@2x.png b/src/assets/icon-hza/icon_but锛弐eset@2x.png similarity index 100% rename from src/assets/icon-hza/icon_but／reset@2x.png rename to src/assets/icon-hza/icon_but锛弐eset@2x.png diff --git a/src/assets/icon-hza/感知设备_人员追踪_视频回放_slices.zip b/src/assets/icon-hza/鎰熺煡璁惧_浜哄憳杩借釜_瑙嗛鍥炴斁_slices.zip similarity index 100% rename from src/assets/icon-hza/感知设备_人员追踪_视频回放_slices.zip rename to src/assets/icon-hza/鎰熺煡璁惧_浜哄憳杩借釜_瑙嗛鍥炴斁_slices.zip diff --git a/src/assets/icon-hza/直播@2x.png b/src/assets/icon-hza/鐩存挱@2x.png similarity index 100% rename from src/assets/icon-hza/直播@2x.png rename to src/assets/icon-hza/鐩存挱@2x.png diff --git a/src/assets/picture/bg_涉海_1@2x.png b/src/assets/picture/bg_娑夋捣_1@2x.png similarity index 100% rename from src/assets/picture/bg_涉海_1@2x.png rename to src/assets/picture/bg_娑夋捣_1@2x.png diff --git a/src/assets/picture/bg_涉海_2@2x.png b/src/assets/picture/bg_娑夋捣_2@2x.png similarity index 100% rename from src/assets/picture/bg_涉海_2@2x.png rename to src/assets/picture/bg_娑夋捣_2@2x.png diff --git a/src/assets/picture/bg_涉海_3@2x.png b/src/assets/picture/bg_娑夋捣_3@2x.png similarity index 100% rename from src/assets/picture/bg_涉海_3@2x.png rename to src/assets/picture/bg_娑夋捣_3@2x.png diff --git a/src/assets/picture/bg_涉海_4@2x.png b/src/assets/picture/bg_娑夋捣_4@2x.png similarity index 100% rename from src/assets/picture/bg_涉海_4@2x.png rename to src/assets/picture/bg_娑夋捣_4@2x.png diff --git a/src/assets/picture/bg_流动人口@2x.png b/src/assets/picture/bg_娴佸姩浜哄彛@2x.png similarity index 100% rename from src/assets/picture/bg_流动人口@2x.png rename to src/assets/picture/bg_娴佸姩浜哄彛@2x.png diff --git a/src/assets/picture/bg_弹窗_middle@2x.png b/src/assets/picture/bg_寮圭獥_middle@2x.png similarity index 100% rename from src/assets/picture/bg_弹窗_middle@2x.png rename to src/assets/picture/bg_寮圭獥_middle@2x.png diff --git a/src/assets/picture/bg_人员_hover@2x.png b/src/assets/picture/bg_浜哄憳_hover@2x.png similarity index 100% rename from src/assets/picture/bg_人员_hover@2x.png rename to src/assets/picture/bg_浜哄憳_hover@2x.png diff --git a/src/assets/picture/bg_人员_nor@2x.png b/src/assets/picture/bg_浜哄憳_nor@2x.png similarity index 100% rename from src/assets/picture/bg_人员_nor@2x.png rename to src/assets/picture/bg_浜哄憳_nor@2x.png diff --git a/src/assets/picture/bg_信息@2x.png b/src/assets/picture/bg_淇℃伅@2x.png similarity index 100% rename from src/assets/picture/bg_信息@2x.png rename to src/assets/picture/bg_淇℃伅@2x.png diff --git a/src/assets/picture/bg_导航@2x.png b/src/assets/picture/bg_瀵艰埅@2x.png similarity index 100% rename from src/assets/picture/bg_导航@2x.png rename to src/assets/picture/bg_瀵艰埅@2x.png diff --git a/src/assets/picture/bg_实有人口.png b/src/assets/picture/bg_瀹炴湁浜哄彛.png similarity index 100% rename from src/assets/picture/bg_实有人口.png rename to src/assets/picture/bg_瀹炴湁浜哄彛.png diff --git a/src/assets/picture/bg_实有人口@2x.png b/src/assets/picture/bg_瀹炴湁浜哄彛@2x.png similarity index 100% rename from src/assets/picture/bg_实有人口@2x.png rename to src/assets/picture/bg_瀹炴湁浜哄彛@2x.png diff --git a/src/assets/picture/bg_实有单位.png b/src/assets/picture/bg_瀹炴湁鍗曚綅.png similarity index 100% rename from src/assets/picture/bg_实有单位.png rename to src/assets/picture/bg_瀹炴湁鍗曚綅.png diff --git a/src/assets/picture/bg_实有单位@2x.png b/src/assets/picture/bg_瀹炴湁鍗曚綅@2x.png similarity index 100% rename from src/assets/picture/bg_实有单位@2x.png rename to src/assets/picture/bg_瀹炴湁鍗曚綅@2x.png diff --git a/src/assets/picture/bg_实有房屋.png b/src/assets/picture/bg_瀹炴湁鎴垮眿.png similarity index 100% rename from src/assets/picture/bg_实有房屋.png rename to src/assets/picture/bg_瀹炴湁鎴垮眿.png diff --git a/src/assets/picture/bg_实有房屋@2x.png b/src/assets/picture/bg_瀹炴湁鎴垮眿@2x.png similarity index 100% rename from src/assets/picture/bg_实有房屋@2x.png rename to src/assets/picture/bg_瀹炴湁鎴垮眿@2x.png diff --git a/src/assets/picture/bg_警力分布_hover@2x.png b/src/assets/picture/bg_璀﹀姏鍒嗗竷_hover@2x.png similarity index 100% rename from src/assets/picture/bg_警力分布_hover@2x.png rename to src/assets/picture/bg_璀﹀姏鍒嗗竷_hover@2x.png diff --git a/src/assets/picture/bg_警力分布_nor@2x.png b/src/assets/picture/bg_璀﹀姏鍒嗗竷_nor@2x.png similarity index 100% rename from src/assets/picture/bg_警力分布_nor@2x.png rename to src/assets/picture/bg_璀﹀姏鍒嗗竷_nor@2x.png diff --git a/src/assets/picture/bg_查看轨迹_hover@2x.png b/src/assets/picture/bg_鏌ョ湅杞ㄨ抗_hover@2x.png similarity index 100% rename from src/assets/picture/bg_查看轨迹_hover@2x.png rename to src/assets/picture/bg_鏌ョ湅杞ㄨ抗_hover@2x.png diff --git a/src/assets/picture/bg_查看轨迹_nor@2x.png b/src/assets/picture/bg_鏌ョ湅杞ㄨ抗_nor@2x.png similarity index 100% rename from src/assets/picture/bg_查看轨迹_nor@2x.png rename to src/assets/picture/bg_鏌ョ湅杞ㄨ抗_nor@2x.png diff --git a/src/assets/picture/bg_重点人员.png b/src/assets/picture/bg_閲嶇偣浜哄憳.png similarity index 100% rename from src/assets/picture/bg_重点人员.png rename to src/assets/picture/bg_閲嶇偣浜哄憳.png diff --git a/src/assets/picture/bg_重点人员@2x.png b/src/assets/picture/bg_閲嶇偣浜哄憳@2x.png similarity index 100% rename from src/assets/picture/bg_重点人员@2x.png rename to src/assets/picture/bg_閲嶇偣浜哄憳@2x.png diff --git a/src/assets/picture/but_查看轨迹／def.png b/src/assets/picture/but_鏌ョ湅杞ㄨ抗锛廳ef.png similarity index 100% rename from src/assets/picture/but_查看轨迹／def.png rename to src/assets/picture/but_鏌ョ湅杞ㄨ抗锛廳ef.png diff --git a/src/assets/picture/but_查看轨迹／def@2x.png b/src/assets/picture/but_鏌ョ湅杞ㄨ抗锛廳ef@2x.png similarity index 100% rename from src/assets/picture/but_查看轨迹／def@2x.png rename to src/assets/picture/but_鏌ョ湅杞ㄨ抗锛廳ef@2x.png diff --git a/src/assets/picture/but_查看轨迹／sel.png b/src/assets/picture/but_鏌ョ湅杞ㄨ抗锛弒el.png similarity index 100% rename from src/assets/picture/but_查看轨迹／sel.png rename to src/assets/picture/but_鏌ョ湅杞ㄨ抗锛弒el.png diff --git a/src/assets/picture/but_查看轨迹／sel@2x.png b/src/assets/picture/but_鏌ョ湅杞ㄨ抗锛弒el@2x.png similarity index 100% rename from src/assets/picture/but_查看轨迹／sel@2x.png rename to src/assets/picture/but_鏌ョ湅杞ㄨ抗锛弒el@2x.png diff --git a/src/assets/picture/icon_播放.png b/src/assets/picture/icon_鎾斁.png similarity index 100% rename from src/assets/picture/icon_播放.png rename to src/assets/picture/icon_鎾斁.png diff --git a/src/assets/picture/icon_播放@2x.png b/src/assets/picture/icon_鎾斁@2x.png similarity index 100% rename from src/assets/picture/icon_播放@2x.png rename to src/assets/picture/icon_鎾斁@2x.png diff --git a/src/assets/picture/icon_暂停.png b/src/assets/picture/icon_鏆傚仠.png similarity index 100% rename from src/assets/picture/icon_暂停.png rename to src/assets/picture/icon_鏆傚仠.png diff --git a/src/assets/picture/icon_暂停@2x.png b/src/assets/picture/icon_鏆傚仠@2x.png similarity index 100% rename from src/assets/picture/icon_暂停@2x.png rename to src/assets/picture/icon_鏆傚仠@2x.png diff --git a/src/assets/picture/icon／界面／日历2／线型@2x(1).png b/src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x(1).png similarity index 100% rename from src/assets/picture/icon／界面／日历2／线型@2x(1).png rename to src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x(1).png diff --git a/src/assets/picture/icon／界面／日历2／线型@2x.png b/src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x.png similarity index 100% rename from src/assets/picture/icon／界面／日历2／线型@2x.png rename to src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎鍨婡2x.png diff --git a/src/assets/picture/icon／界面／日历2／线�_1).png b/src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖1).png similarity index 100% rename from src/assets/picture/icon／界面／日历2／线�_1).png rename to src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖1).png diff --git a/src/assets/picture/icon／界面／日历2／线�_png b/src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖png similarity index 100% rename from src/assets/picture/icon／界面／日历2／线�_png rename to src/assets/picture/icon锛忕晫闈紡鏃ュ巻2锛忕嚎锟絖png diff --git a/src/assets/picture/弹窗.png b/src/assets/picture/寮圭獥.png similarity index 100% rename from src/assets/picture/弹窗.png rename to src/assets/picture/寮圭獥.png diff --git a/src/assets/picture/弹窗@2x.png b/src/assets/picture/寮圭獥@2x.png similarity index 100% rename from src/assets/picture/弹窗@2x.png rename to src/assets/picture/寮圭獥@2x.png diff --git a/src/assets/picture/底座.png b/src/assets/picture/搴曞骇.png similarity index 100% rename from src/assets/picture/底座.png rename to src/assets/picture/搴曞骇.png diff --git a/src/assets/picture/底座@2x.png b/src/assets/picture/搴曞骇@2x.png similarity index 100% rename from src/assets/picture/底座@2x.png rename to src/assets/picture/搴曞骇@2x.png diff --git a/src/assets/picture/编组 20@2x.png b/src/assets/picture/缂栫粍 20@2x.png similarity index 100% rename from src/assets/picture/编组 20@2x.png rename to src/assets/picture/缂栫粍 20@2x.png diff --git a/src/assets/picture/编组 9.png b/src/assets/picture/缂栫粍 9.png similarity index 100% rename from src/assets/picture/编组 9.png rename to src/assets/picture/缂栫粍 9.png diff --git a/src/assets/picture/编组 9@2x.png b/src/assets/picture/缂栫粍 9@2x.png similarity index 100% rename from src/assets/picture/编组 9@2x.png rename to src/assets/picture/缂栫粍 9@2x.png diff --git a/src/assets/picture/编组.png b/src/assets/picture/缂栫粍.png similarity index 100% rename from src/assets/picture/编组.png rename to src/assets/picture/缂栫粍.png diff --git a/src/assets/picture/编组@2x.png b/src/assets/picture/缂栫粍@2x.png similarity index 100% rename from src/assets/picture/编组@2x.png rename to src/assets/picture/缂栫粍@2x.png diff --git a/src/assets/picture/分组备份(1).png b/src/assets/picture/鍒嗙粍澶囦唤(1).png similarity index 100% rename from src/assets/picture/分组备份(1).png rename to src/assets/picture/鍒嗙粍澶囦唤(1).png diff --git a/src/assets/picture/分组备份(2).png b/src/assets/picture/鍒嗙粍澶囦唤(2).png similarity index 100% rename from src/assets/picture/分组备份(2).png rename to src/assets/picture/鍒嗙粍澶囦唤(2).png diff --git a/src/assets/picture/分组备份(3).png b/src/assets/picture/鍒嗙粍澶囦唤(3).png similarity index 100% rename from src/assets/picture/分组备份(3).png rename to src/assets/picture/鍒嗙粍澶囦唤(3).png diff --git a/src/assets/picture/分组备份@2x(1).png b/src/assets/picture/鍒嗙粍澶囦唤@2x(1).png similarity index 100% rename from src/assets/picture/分组备份@2x(1).png rename to src/assets/picture/鍒嗙粍澶囦唤@2x(1).png diff --git a/src/assets/picture/分组备份@2x(2).png b/src/assets/picture/鍒嗙粍澶囦唤@2x(2).png similarity index 100% rename from src/assets/picture/分组备份@2x(2).png rename to src/assets/picture/鍒嗙粍澶囦唤@2x(2).png diff --git a/src/assets/picture/分组备份@2x(3).png b/src/assets/picture/鍒嗙粍澶囦唤@2x(3).png similarity index 100% rename from src/assets/picture/分组备份@2x(3).png rename to src/assets/picture/鍒嗙粍澶囦唤@2x(3).png diff --git a/src/assets/picture/分组备份@2x.png b/src/assets/picture/鍒嗙粍澶囦唤@2x.png similarity index 100% rename from src/assets/picture/分组备份@2x.png rename to src/assets/picture/鍒嗙粍澶囦唤@2x.png diff --git a/src/assets/picture/撒点_沿海视频(1).png b/src/assets/picture/鎾掔偣_娌挎捣瑙嗛(1).png similarity index 100% rename from src/assets/picture/撒点_沿海视频(1).png rename to src/assets/picture/鎾掔偣_娌挎捣瑙嗛(1).png diff --git a/src/assets/picture/撒点_沿海视频(2).png b/src/assets/picture/鎾掔偣_娌挎捣瑙嗛(2).png similarity index 100% rename from src/assets/picture/撒点_沿海视频(2).png rename to src/assets/picture/鎾掔偣_娌挎捣瑙嗛(2).png diff --git a/src/assets/picture/撒点_沿海视频@2x(1).png b/src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x(1).png similarity index 100% rename from src/assets/picture/撒点_沿海视频@2x(1).png rename to src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x(1).png diff --git a/src/assets/picture/撒点_沿海视频@2x(2).png b/src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x(2).png similarity index 100% rename from src/assets/picture/撒点_沿海视频@2x(2).png rename to src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x(2).png diff --git a/src/assets/picture/撒点_沿海视频@2x.png b/src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x.png similarity index 100% rename from src/assets/picture/撒点_沿海视频@2x.png rename to src/assets/picture/鎾掔偣_娌挎捣瑙嗛@2x.png diff --git a/src/assets/picture/撒点_起点.png b/src/assets/picture/鎾掔偣_璧风偣.png similarity index 100% rename from src/assets/picture/撒点_起点.png rename to src/assets/picture/鎾掔偣_璧风偣.png diff --git a/src/assets/picture/撒点_起点@2x.png b/src/assets/picture/鎾掔偣_璧风偣@2x.png similarity index 100% rename from src/assets/picture/撒点_起点@2x.png rename to src/assets/picture/鎾掔偣_璧风偣@2x.png diff --git a/src/assets/picture/撒点_线路.png b/src/assets/picture/鎾掔偣_绾胯矾.png similarity index 100% rename from src/assets/picture/撒点_线路.png rename to src/assets/picture/鎾掔偣_绾胯矾.png diff --git a/src/assets/picture/撒点_线路@2x.png b/src/assets/picture/鎾掔偣_绾胯矾@2x.png similarity index 100% rename from src/assets/picture/撒点_线路@2x.png rename to src/assets/picture/鎾掔偣_绾胯矾@2x.png diff --git a/src/assets/picture/播放 播放 08(1).png b/src/assets/picture/鎾斁 鎾斁 08(1).png similarity index 100% rename from src/assets/picture/播放 播放 08(1).png rename to src/assets/picture/鎾斁 鎾斁 08(1).png diff --git a/src/assets/picture/播放 播放 08(2).png b/src/assets/picture/鎾斁 鎾斁 08(2).png similarity index 100% rename from src/assets/picture/播放 播放 08(2).png rename to src/assets/picture/鎾斁 鎾斁 08(2).png diff --git a/src/assets/picture/播放 播放 08(3).png b/src/assets/picture/鎾斁 鎾斁 08(3).png similarity index 100% rename from src/assets/picture/播放 播放 08(3).png rename to src/assets/picture/鎾斁 鎾斁 08(3).png diff --git a/src/assets/picture/播放 播放 08.png b/src/assets/picture/鎾斁 鎾斁 08.png similarity index 100% rename from src/assets/picture/播放 播放 08.png rename to src/assets/picture/鎾斁 鎾斁 08.png diff --git a/src/assets/picture/播放 播放 08@2x(1).png b/src/assets/picture/鎾斁 鎾斁 08@2x(1).png similarity index 100% rename from src/assets/picture/播放 播放 08@2x(1).png rename to src/assets/picture/鎾斁 鎾斁 08@2x(1).png diff --git a/src/assets/picture/播放 播放 08@2x(2).png b/src/assets/picture/鎾斁 鎾斁 08@2x(2).png similarity index 100% rename from src/assets/picture/播放 播放 08@2x(2).png rename to src/assets/picture/鎾斁 鎾斁 08@2x(2).png diff --git a/src/assets/picture/播放 播放 08@2x(3).png b/src/assets/picture/鎾斁 鎾斁 08@2x(3).png similarity index 100% rename from src/assets/picture/播放 播放 08@2x(3).png rename to src/assets/picture/鎾斁 鎾斁 08@2x(3).png diff --git a/src/assets/picture/播放 播放 08@2x.png b/src/assets/picture/鎾斁 鎾斁 08@2x.png similarity index 100% rename from src/assets/picture/播放 播放 08@2x.png rename to src/assets/picture/鎾斁 鎾斁 08@2x.png diff --git a/src/assets/picture/直播.png b/src/assets/picture/鐩存挱.png similarity index 100% rename from src/assets/picture/直播.png rename to src/assets/picture/鐩存挱.png diff --git a/src/assets/picture/直播@2x.png b/src/assets/picture/鐩存挱@2x.png similarity index 100% rename from src/assets/picture/直播@2x.png rename to src/assets/picture/鐩存挱@2x.png diff --git a/src/assets/picture/矩形.png b/src/assets/picture/鐭╁舰.png similarity index 100% rename from src/assets/picture/矩形.png rename to src/assets/picture/鐭╁舰.png diff --git a/src/assets/picture/矩形@2x.png b/src/assets/picture/鐭╁舰@2x.png similarity index 100% rename from src/assets/picture/矩形@2x.png rename to src/assets/picture/鐭╁舰@2x.png diff --git a/src/utils/http.js b/src/utils/http.js index b8e020f..ee491f0 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,39 +1,86 @@ import axios from 'axios' -// import { getToken } from '@/utils/token' // * 海康平台 -// const baseURL = 'http://50.146.63.43:15000/' -const baseURL = 'http://50.146.63.43:20000/' +import vm from '../main' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const http = axios.create({ - baseURL, - timeout: 30000 + // 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' } }) -// todo 封装基本拦截 -// * 请求拦截器 +// request拦截器 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) => { - return Promise.reject(error) + console.log(error) + Promise.reject(error) } ) - -// * 响应拦截器 +// response 拦截器 +// 可以在接口响应后统一处理结果 http.interceptors.response.use( (response) => { - if (response.status !== 200) { - return Promise.reject(response.message) + 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 + } } - return response.data }, (error) => { - if (axios.isCancel(error)) { - console.log(error) - } + console.log('err' + error) // for debug + return Promise.reject(error) } ) diff --git a/src/utils/request.js b/src/utils/request.js index 1edf84d..8cea286 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,10 +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://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/', //外网 timeout: 50000, headers: { 'content-type': 'application/json' } }) @@ -48,7 +48,7 @@ request.interceptors.response.use( case 401: if (vm.$route.name !== 'login') { - vm.$Message.warning({ + vm.$message.warning({ content: '身份认证信息已失效，请重新登录。', duration: 2, onClose: () => { @@ -60,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/coastalMap/components/keyPerson.vue b/src/views/coastalMap/components/keyPerson.vue index a49e4c8..3124c6b 100644 --- a/src/views/coastalMap/components/keyPerson.vue +++ b/src/views/coastalMap/components/keyPerson.vue @@ -73,38 +73,45 @@
  • - +
    查看详情
    -
    - {{ item.impUserType }} + +
    + {{ item.type_text }}
    -
    - {{ item.impUserType }} +
    + {{ item.type_text }}
    -
    - {{ item.impUserType }} +
    + {{ item.type_text }}
    -
    人员姓名
    -
    联系电话
    -
    证件号码
    -
    户籍地址
    -
    现住地址
    +
    人员姓名 :
    +
    联系电话 :
    +
    证件号码 :
    +
    户籍地址 :
    +
    现住地址 :
    {{ item.userName }}
    {{ item.phone }}
    -
    +
    {{ item.idCard }}
    -
    +
    {{ item.houseHoldAddress }}
    -
    +
    {{ item.habitationAddress }}
    @@ -119,16 +126,19 @@ 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 } }, @@ -206,12 +216,13 @@ 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, 'aaaa') + console.log(this.roll_list, '重点人员信息') } } } diff --git a/src/views/coastalMap/components/policeStatus.vue b/src/views/coastalMap/components/policeStatus.vue index e21f2d6..518bbbe 100644 --- a/src/views/coastalMap/components/policeStatus.vue +++ b/src/views/coastalMap/components/policeStatus.vue @@ -10,9 +10,15 @@
    -
    1
    -
    2
    -
    3
    +
    +
    1
    +
    +
    +
    2
    +
    +
    +
    3
    +
    @@ -25,18 +31,17 @@
    {{ item.createTime }}
    -
    警情类型
    -
    接警单位
    -
    事发地址
    -
    报警内容
    +
    警情类型 :
    +
    接警单位 :
    +
    事发地址 :
    +
    报警内容 :
    - : {{ item.alarmResponseTypeName }}
    -
    :{{ item.alarmResponseUnit }}
    -
    :{{ item.alarmAddress }}
    +
    {{ item.alarmResponseUnit }}
    +
    {{ item.alarmAddress }}
    {{ item.alarmResponseContent }}
    @@ -64,7 +69,7 @@ export default { return { value: '1', y_data: ['其他纠纷', '家庭纠纷', '其他警情'], // y轴文字 - chart_data: ['145', '29', '101'], // chart表数据 + chart_data: [], // chart表数据 roll_list: [ // { // id: '1', @@ -134,17 +139,24 @@ export default { timer: null } }, - mounted() { - this.init_charts() - this.timer = setInterval(this.scrollAnimate, 1500) - }, created() { this.onPoliceStatistics() this.onMetaAlarmInfo() }, - + mounted() { + // this.init_charts() + this.timer = setInterval(this.scrollAnimate, 1500) + }, + 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 +200,8 @@ export default { }, series: [ { - data: this.chart_data, + data: chart_data, + barWidth: '20%', type: 'bar', showBackground: true, itemStyle: { @@ -196,6 +209,7 @@ export default { colorStops: [ { offset: 0, + barWidth: '30%', color: '#1A416B' // 0% 处的颜色 }, { @@ -234,12 +248,15 @@ 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') + // console.log(res, '警情信息表') } } } @@ -275,6 +292,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 +310,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; @@ -356,8 +404,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; diff --git a/src/views/coastalMap/index.vue b/src/views/coastalMap/index.vue index 8fe83f4..d2304ad 100644 --- a/src/views/coastalMap/index.vue +++ b/src/views/coastalMap/index.vue @@ -160,9 +160,9 @@ export default { async onGetResource() { const res = await getResourceAPI() this.resourceData = res.data - // console.log(this.resourceData) + // console.log(this.resourceData, '获取资源概况') }, - // * 获取重点人员 + // * 获取重点人员 - 图例数据 async onGetKeyPersonnel() { const res = await keyPersonnelAPI() console.log(res, '重点人员数据待更新') @@ -329,6 +329,7 @@ export default { flex-direction: column; justify-content: space-between; align-items: center; + cursor: pointer; .point_icon { width: 4vw; @@ -340,6 +341,10 @@ export default { justify-content: center; align-items: center; + &:hover { + filter: brightness(140%); + } + .icon_body { width: 1.2vw; height: 4vh; @@ -354,6 +359,10 @@ export default { text-align: center; line-height: 2vh; font-size: 1rem; + + &:hover { + filter: brightness(140%); + } } } } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 8d56d6d..e72206f 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -5,7 +5,7 @@
    射阳沿海治安防控综合平台
    --> -
    +
    @@ -16,7 +16,7 @@
    感知设备
    -
    建模应用
    +
    建模应用
    @@ -27,36 +27,26 @@ export default { // eslint-disable-next-line vue/multi-word-component-names name: 'Home', data() { - return { - play: true - } + return {} }, - methods: { toHome() { this.$router.push('/home/coastalMap') - this.play = true }, toVideo() { this.$router.push('/home/videoMonitor') - this.play = true }, toDevice() { this.$router.push('/home/sensingDevice') - this.play = true - }, - toBuild() { - this.play = false - this.$router.push('/home/buildUse') } } }