diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue index 74eaf8a..7a01320 100644 --- a/ruoyi-ui/src/components/BoardTopNav/index.vue +++ b/ruoyi-ui/src/components/BoardTopNav/index.vue @@ -14,11 +14,14 @@ {{ name }} -
+
{{ - i.sceneName - }} + :command="{router:i.router,name:i.sceneName,sceneId:i.sceneId}"> + + {{ + i.sceneName + }} +
@@ -72,6 +75,9 @@ export default { // }, async mounted() { + if (!this.$store.getters.sceneId) { + this.$router.replace({path: "/board/index"}) + } if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS' || this.$route.name === 'index' || this.$store.getters.sceneId) { } else { if (this.$store.state.user.permissions.includes('business:monitor:index') || this.$store.state.user.permissions.includes('*:*:*')) { @@ -192,4 +198,16 @@ export default { color: #d4d4d4; text-align: center; } + +.el-dropdown-menu { + padding: 0 !important; + border: none !important; +} +.topNavScroll::-webkit-scrollbar { + width: 0px; + height: 0px; +} +.el-dropdown-menu__item:not(.is-disabled):hover span { + color: #053563 !important; +} diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue index f0e9e83..52a8173 100644 --- a/ruoyi-ui/src/views/board/GPS/index.vue +++ b/ruoyi-ui/src/views/board/GPS/index.vue @@ -84,8 +84,8 @@ export default { Chart, vueSeamlessScroll, }, - watch:{ - async $route(to,from){ + watch: { + async $route(to, from) { await this.getData() } }, @@ -145,7 +145,7 @@ export default { }, methods: { async getData() { - if(this.$store.getters.sceneId === null) return + if (this.$store.getters.sceneId === null) return await this.createMap() await this.getAlarmStats() await this.getAubDevice() @@ -198,12 +198,17 @@ export default { position = [e.centerPoint.longitude, e.centerPoint.latitude] } let text = new AMap.Text({ - text: '总数:' + e.deviceCount + (e.abnormalCount ? ('/异常数量:' + e.abnormalCount) : ''), + text: '
' + '总数:' + e.deviceCount + (e.abnormalCount ? ('/异常数量:' + e.abnormalCount) : '') + '
', anchor: 'center', draggable: true, cursor: 'pointer', position: position }); + text.setStyle({ + 'background-color': e.abnormalCount? '#fe0000':'#0055fe', + padding:'4px 12px', + 'font-size':'1vw' + }) map.add(text) }, setPolygon(position, val) { @@ -233,7 +238,7 @@ export default { map.setFitView() }, async getAlarmStats() { - if(this.$store.getters.sceneId === null) return + if (this.$store.getters.sceneId === null) return const {data} = await alarmStats(this.$store.getters.sceneId) let option1 = { ...this.chart1Option, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 56b0001..c3b3837 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE || '智慧物联监控平台' // 网页标题 -const port = process.env.port || process.env.npm_config_port || 8018 // 端口 +const port = process.env.port || process.env.npm_config_port || 80 // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -35,7 +35,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://127.0.0.1:9080`, + target: `http://175.27.215.92:9080`, + // target: `http://10.11.40.120:9080`, // target: `http://10.11.43.111:8080`, changeOrigin: true, pathRewrite: {