diff --git a/config/index.js b/config/index.js index 065082d..b1bf80d 100644 --- a/config/index.js +++ b/config/index.js @@ -12,16 +12,16 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - // target: 'http://192.168.111.200: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': '' } }, '/localImage': { - target: 'http://60.255.186.185:9024/', - // target: 'http://localhost:9990/', + // target: 'http://60.255.186.185:9024/', + target: 'http://localhost:9990/', changeOrigin: true, }, '/socket.io': { diff --git a/src/router/router.js b/src/router/router.js index 4cd3655..5905445 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -83,7 +83,7 @@ export const screenRouter = [ path: "/publicService", name: "publicService", title: "广电公服", - component: () => import("@/views/screen/public-service.vue") + component: () => import("@/views/screen/public-service-scggfw.vue") }, { path: "/duty-system", @@ -270,6 +270,15 @@ export const screenRouter = [ open: true }, component: () => import("@/views/screen/smart-travel.vue") + }, + { + path: "/test", + name: "test", + title: "test", + meta: { + open: true + }, + component: () => import("@/views/screen/test.vue") } ]; diff --git a/src/views/screen/public-service-scggfw.vue b/src/views/screen/public-service-scggfw.vue new file mode 100644 index 0000000..9286d3f --- /dev/null +++ b/src/views/screen/public-service-scggfw.vue @@ -0,0 +1,1765 @@ + + + + + diff --git a/src/views/screen/public-service.vue b/src/views/screen/public-service.vue index 84c9679..c5cc9b6 100644 --- a/src/views/screen/public-service.vue +++ b/src/views/screen/public-service.vue @@ -6,7 +6,6 @@ @@ -213,7 +212,10 @@ {{ item.name }} - + {{ item.post }} @@ -229,7 +231,11 @@
监控视频:
- +
@@ -360,6 +366,7 @@ import commonModal from "@/views/common-components/common-modal.vue"; import LivePlayer from "@liveqing/liveplayer"; import CommonLivePlayer from "@/views/common-components/common-live-player.vue"; import "echarts-liquidfill/src/liquidFill.js"; +import { logger } from "xgplayer-hls"; export default { name: "publicService", components: { @@ -423,6 +430,7 @@ export default { btnState: 0, deviceState: false, pointsState: false, + defaultImage: require("@/assets/largeScreen/df.jpg") }; }, watch: {}, @@ -495,6 +503,10 @@ export default { computed: {}, watch: {}, methods: { + imgerr(e) { + console.log(e); + e.target.src = this.defaultImage; + }, // 获取数据 initDataInfo(type, callback) { let params = { diff --git a/src/views/screen/test.vue b/src/views/screen/test.vue new file mode 100644 index 0000000..db5f96d --- /dev/null +++ b/src/views/screen/test.vue @@ -0,0 +1,45 @@ + +