diff --git a/config/index.js b/config/index.js index ad68692..cbd6d44 100644 --- a/config/index.js +++ b/config/index.js @@ -25,8 +25,8 @@ module.exports = { changeOrigin: true, }, '/socket.io': { - target: 'http://localhost:19990/', - // target: 'http://60.255.185.166:9024/', + // target: 'http://localhost:19990/', + target: 'http://60.255.186.185:9024/', changeOrigin: true, } }, diff --git a/src/router/router.js b/src/router/router.js index 11aacea..ff4a40a 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -221,22 +221,13 @@ export const screenRouter = [ component: () => import("@/views/screen/perimeter-screen.vue") }, { - path: "/out-side", - name: "out-side", - title: "户外屏", + path: "/outsideHome", + name: "outsideHome", + title: "交互屏首页", meta: { open: true }, - component: () => import("@/views/screen/out-side.vue") - }, - { - path: "/out-side-new", - name: "out-side-new", - title: "户外屏-全屏视频", - meta: { - open: true - }, - component: () => import("@/views/screen/out-side-new.vue") + component: () => import("@/views/screen/outsideHome.vue") }, ]; diff --git a/src/views/screen/car-warring.vue b/src/views/screen/car-warring.vue index d6d665c..8fdfcc8 100644 --- a/src/views/screen/car-warring.vue +++ b/src/views/screen/car-warring.vue @@ -287,11 +287,16 @@ export default { // 车流告警 this.sockets.subscribe("TRAFFIC_ALARM", (data) => { console.log("车流告警", data); - let trafficData = data.data - if (trafficData.length > 0) { - if (trafficData[0].deviceIp == this.treeItem.deviceIp) { - + if (data.deviceIp == this.treeItem.deviceIp) { + this.currentAlarm = data; + if (this.currentAlarm.picture) { + this.currentAlarm.picture = JSON.parse( + this.currentAlarm.picture + ); } + this.alarmShow = true; + this.queryCount([this.treeItem]); + this.queryAlarmRecord([this.treeItem]); } }); // 车流统计 diff --git a/src/views/screen/components/MainTitle.vue b/src/views/screen/components/MainTitle.vue index cf72532..1731f9a 100644 --- a/src/views/screen/components/MainTitle.vue +++ b/src/views/screen/components/MainTitle.vue @@ -247,13 +247,13 @@ export default { meumItem: "人流预警", isShowTwon: true, children: [ - { - menuItem: "人流1", - areaCode: "", + { + menuItem: "清华街", + areaCode: "511502000001", }, { - menuItem: "人流2", - areaCode: "", + menuItem: "合江门", + areaCode: "511502000002", }, ], }, @@ -262,12 +262,12 @@ export default { isShowTwon: true, children: [ { - menuItem: "车流1", - areaCode: "", + menuItem: "合江门", + areaCode: "511502000003", }, { - menuItem: "车流2", - areaCode: "", + menuItem: "盐李路", + areaCode: "511502000004", }, ], }, diff --git a/src/views/screen/components/gisMapOfCounty.vue b/src/views/screen/components/gisMapOfCounty.vue index 95cb9e2..78ddcd3 100644 --- a/src/views/screen/components/gisMapOfCounty.vue +++ b/src/views/screen/components/gisMapOfCounty.vue @@ -198,7 +198,7 @@ export default { strokeWeight: 5, path: bound, fillOpacity: 0.8, - fillColor: "#0c3871", + fillColor: "rgba(67, 112, 122,0.55)", strokeColor: "#94c4ce", }) ); @@ -210,10 +210,13 @@ export default { : [new AMap.TileLayer.RoadNet], zoom: this.zoom, zooms: [3, 16], - center: this.center, - viewMode: "3D", - resizeEnable: true, + scrollWheel: true, + center: that.center, + // pitch: 10, // 地图俯仰角度，有效范围 0 度- 83 度 + viewMode: "3D", // 地图模式 + resizeEnable: true, //是否监控地图容器尺寸变化 mapStyle: "amap://styles/darkblue", + features: ["bg", "road", "building", "point"] }); this.map.on("complete", () => { diff --git a/src/views/screen/county-screen.vue b/src/views/screen/county-screen.vue index a127b88..f6f8048 100644 --- a/src/views/screen/county-screen.vue +++ b/src/views/screen/county-screen.vue @@ -322,12 +322,12 @@ export default { isShowTwon: true, children: [ { - menuItem: "人流1", - areaCode: "", + menuItem: "清华街", + areaCode: "511502000001", }, { - menuItem: "人流2", - areaCode: "", + menuItem: "合江门", + areaCode: "511502000002", }, ], }, @@ -336,12 +336,12 @@ export default { isShowTwon: true, children: [ { - menuItem: "车流1", - areaCode: "", + menuItem: "合江门", + areaCode: "511502000003", }, { - menuItem: "车流2", - areaCode: "", + menuItem: "盐李路", + areaCode: "511502000004", }, ], }, diff --git a/src/views/screen/museum-center.vue b/src/views/screen/museum-center.vue index 1b42c90..243df67 100644 --- a/src/views/screen/museum-center.vue +++ b/src/views/screen/museum-center.vue @@ -867,6 +867,11 @@ export default { (res) => { if (res.data.code === 200) { this.collectionList = res.data.data.records + this.collectionList.forEach(item => { + if (item.imageList) { + item.imageList = JSON.parse(item.imageList) + } + }) } else { this.$Message.error("出错了"); } diff --git a/src/views/screen/outsideHome.vue b/src/views/screen/outsideHome.vue new file mode 100644 index 0000000..1d09de7 --- /dev/null +++ b/src/views/screen/outsideHome.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/src/views/screen/person-warring.vue b/src/views/screen/person-warring.vue index 9d5b223..af277fb 100644 --- a/src/views/screen/person-warring.vue +++ b/src/views/screen/person-warring.vue @@ -285,7 +285,17 @@ export default { // 人流密度告警 this.sockets.subscribe("OCCUPANT_DENSITY", (data) => { console.log("人流密度告警", data); - + if (data.deviceIp == this.treeItem.deviceIp) { + this.currentAlarm = data; + if (this.currentAlarm.picture) { + this.currentAlarm.picture = JSON.parse( + this.currentAlarm.picture + ); + } + this.alarmShow = true; + this.queryCount([this.treeItem]); + this.queryAlarmRecord([this.treeItem]); + } }); // 人流密度数据 this.sockets.subscribe("OCCUPANT_DENSITY_DATA", (data) => { diff --git a/static/config.js b/static/config.js index 212e139..273b7e3 100644 --- a/static/config.js +++ b/static/config.js @@ -2,12 +2,12 @@ window.gconfig = { //接口请求路径配置 baseURL: '/api', // 缓存命名空间配置 - localStorageNamespace: "xuyong", + localStorageNamespace: "cuiping", socketDebug: false, - socketPath: "/socket.io/xuyong", - // socketServer: "http://60.255.185.166:9030",//上线配置 + socketPath: "/socket.io/cuiping", + // socketServer: "http://60.255.185.166:9024",//上线配置 // socketServer: "http://localhost:19990",//本地配置 socketServer: "",//本地配置 // 是否开启socket，本地测试可以不开启，防止界面卡 - openSocket: false, + openSocket: true, };