From bbcc933f6763569e275ed288c98b40d4883a1d1c Mon Sep 17 00:00:00 2001 From: changtong <2540919286@qq.com> Date: Sat, 21 Dec 2024 14:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E6=97=85=E6=B8=B8=E6=80=81?= =?UTF-8?q?=E5=8A=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/assets/largeScreen/bfz.png | Bin 0 -> 979 bytes src/assets/largeScreen/sxt.png | Bin 0 -> 708 bytes src/router/router.js | 9 + src/views/screen/car-warring.vue | 6 +- src/views/screen/components/MainTitle.vue | 7 + src/views/screen/county-screen.vue | 4 + src/views/screen/gov-service.vue | 2 - src/views/screen/outsideHome copy.vue | 233 ------ src/views/screen/outsideHome.vue | 2 +- src/views/screen/smart-travel.vue | 928 ++++++++++++++++++++++ 11 files changed, 952 insertions(+), 243 deletions(-) create mode 100644 src/assets/largeScreen/bfz.png create mode 100644 src/assets/largeScreen/sxt.png delete mode 100644 src/views/screen/outsideHome copy.vue create mode 100644 src/views/screen/smart-travel.vue diff --git a/config/index.js b/config/index.js index cbd6d44..51985cb 100644 --- a/config/index.js +++ b/config/index.js @@ -12,8 +12,8 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - // target: 'http://127.0.0.1:9990', - target: 'http://60.255.186.185:9024/api', + target: 'http://localhost:9990', + // target: 'http://60.255.186.185:9024/api', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/src/assets/largeScreen/bfz.png b/src/assets/largeScreen/bfz.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2718225911102860f38a04f59ec885cbc274f8 GIT binary patch literal 979 zcmV;^11$WBP)3JxD(IGP7@HXTEvwW#?tF+fha|5zC1J zdsrOC`IG2L9?VL5hPZd^T4*NVjA)OyF+5HfEFxNo&sgR_&8{QuBZgs61jDn|_=HSD zHql7jB3?d<8!ap|#VUX{q-xB=HN=qXNjow!qNO=r^hp%AzrQc7t*r$d4o3h7#X6Ohm3&iE6GvS?p7DN~Z5!a> z*F^r-VOx!XIbOYC?<;HBQBj>FFt(ot^b6{l&#av9GVsu&}ToA|ewL6K0J@!^~#0POVm}3JMCi;o)I}$Kwg4 z@wOU*-?CKr+T6+bYz=#&;#h;AXCHpKVJ0ty$SXVv63J^JtyaqggTV;d{gacE;_mKl z#A2}+s;a7l+S*!yTHWB_;P=+nR$+R2IwlxmM@L7!IXOAey}dmN@0FLAb3UI>N+(#w z(g8vhM4~r~Amnv*b^4*9AsHUt*x2wRUCe7~Y0)n&E&0<)!dK!f<><%XP8O6Uc1dDCiR+4aXJ<#++}!k& z7q_miu2?7(lFF~KQv3p{Ee%{>Q-@op1xjI)@S4DUV_Nl2UZ*_GwpP!%4A%9`RpALUY9ICs! z+nKlyqJ3RL$^t2Etftl(bE2y&wf%8t-E^0vRTCh+ZD}b?}pC)}g1+-4Y z^)KuRiI>UD5XK}XW0;iTgcaiugaKZSNs*PCu0>i%_@H_N(76>n-kWsm8P3$lwtzOq zZd5+g0)-k%VySelKAn{f$PjWxvQ3n+Lw0si4yJN_zxIUW)bupyv1}F&u(Qb;X+v4XbP==3`sdY%wjHMc6ix#`_ z(A?O2HT+lhKD!nRvNl9CIh4|Zd)Pl_b=b5tFM!|R#$A_m>pf&Otcr=^DO01KdQaD; zuDyk=&4BL`X?K$;tU9EtR!LDmRj;E#3}|yNgx^ZucQe&DQ7D|24g;I%zdk zm6B7mUbgaQcq&)+TB(h18p8JSYVt~Hd{e;Xah!oaROMe>xjQS(PR1{hHpO*^isLpL zkGlX`gX1{qWlYXep8TB(X;TxQ<`bE#zD=8bNNv2fmy3;x|Gh-mZHliy^0660I={=e zVl+evtg2X?ZzJXZLW!b0B=*FK7`1a2K9Rl4&QwIk&`|>hf{qVkDiKjpJ-4rjkc;9Q qeY^;|g9?b1IH(G4*6cg}1O5V#z*1V!B)jAQ0000 import("@/views/screen/out-industry.vue") + }, + { + path: "/smart-travel", + name: "smart-travel", + title: "智慧旅游态势", + meta: { + open: true + }, + component: () => import("@/views/screen/smart-travel.vue") } ]; diff --git a/src/views/screen/car-warring.vue b/src/views/screen/car-warring.vue index 8fdfcc8..5698f42 100644 --- a/src/views/screen/car-warring.vue +++ b/src/views/screen/car-warring.vue @@ -302,12 +302,8 @@ export default { // 车流统计 this.sockets.subscribe("TRAFFIC_DATA", (data) => { console.log("车流统计", data); - let trafficData = data.data - if (trafficData.length > 0) { - if (trafficData[0].deviceIp == this.treeItem.deviceIp) { + this.countCarDataByTime([this.treeItem]) - } - } }); }, // 打开查看预警记录 diff --git a/src/views/screen/components/MainTitle.vue b/src/views/screen/components/MainTitle.vue index ecd2ee1..0d10387 100644 --- a/src/views/screen/components/MainTitle.vue +++ b/src/views/screen/components/MainTitle.vue @@ -332,6 +332,10 @@ export default { meumItem: "全域旅游", routerPath: "/global-travel", }, + { + meumItem: "智慧旅游态势", + routerPath: "/smart-travel", + }, ], }, { @@ -418,6 +422,9 @@ export default { case "/global-travel": this.currentName = "全域旅游"; break; + case "/smart-travel": + this.currentName = "智慧旅游态势"; + break; case "/publicService": this.currentName = "广电公服"; break; diff --git a/src/views/screen/county-screen.vue b/src/views/screen/county-screen.vue index f6f8048..4b90367 100644 --- a/src/views/screen/county-screen.vue +++ b/src/views/screen/county-screen.vue @@ -399,6 +399,10 @@ export default { menuItem: "全域旅游", routerPath: "/global-travel", }, + { + menuItem: "智慧旅游态势", + routerPath: "/smart-travel", + }, ], }, { diff --git a/src/views/screen/gov-service.vue b/src/views/screen/gov-service.vue index e108358..d8f7032 100644 --- a/src/views/screen/gov-service.vue +++ b/src/views/screen/gov-service.vue @@ -378,8 +378,6 @@ import vueSeamlessScroll from "vue-seamless-scroll"; import commonModal from "@/views/common-components/common-modal.vue"; import pjList from "./components/gov-service/pjList.vue"; import result from "./components/gov-service/result.vue"; -import { CountTo } from "vue-count-to"; -import { duration } from "moment"; export default { name: "govService", diff --git a/src/views/screen/outsideHome copy.vue b/src/views/screen/outsideHome copy.vue deleted file mode 100644 index 8a92464..0000000 --- a/src/views/screen/outsideHome copy.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - - diff --git a/src/views/screen/outsideHome.vue b/src/views/screen/outsideHome.vue index 8a92464..f79bfd0 100644 --- a/src/views/screen/outsideHome.vue +++ b/src/views/screen/outsideHome.vue @@ -80,7 +80,7 @@ export default { .post("/area/info/getById", this.common.request(params)) .then(res => { if (res.data.code == 200) { - this.videoUrl = res.data.data.map4; + this.videoUrl = res.data.data.videoUrl; } else { this.$Message.error("操作失败"); } diff --git a/src/views/screen/smart-travel.vue b/src/views/screen/smart-travel.vue new file mode 100644 index 0000000..22ffd4d --- /dev/null +++ b/src/views/screen/smart-travel.vue @@ -0,0 +1,928 @@ + + + + +