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 0000000..9f27182 Binary files /dev/null and b/src/assets/largeScreen/bfz.png differ diff --git a/src/assets/largeScreen/sxt.png b/src/assets/largeScreen/sxt.png new file mode 100644 index 0000000..d45d349 Binary files /dev/null and b/src/assets/largeScreen/sxt.png differ diff --git a/src/router/router.js b/src/router/router.js index b9fcce2..4da058e 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -264,6 +264,15 @@ export const screenRouter = [ open: true }, component: () => 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 @@ + + + + + + + + + + + + + + + + + + + + + {{ + item.deviceName + }} + + + + 暂无监控资源 + + + + + 实时客流 + + + + 人 + + + + + + 实时累计客流 + + + + 人 + + + + + + 实时客流来源 + + {{ item }} + + + + + {{ index + 1 + "." + item.key }} + + + + + + + + + + {{ index + 1 + "." + item.key }} + + + + + + + + + + + + 近七日客流趋势 + + + + 客流年龄结构 + + + + 停留时长分布 + + + + + + + + + + +