diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue index 75de284..8459ea0 100644 --- a/src/pages/shells/index/index.vue +++ b/src/pages/shells/index/index.vue @@ -48,7 +48,7 @@
-
+
{{selectType === 'en-us' ? menu.en_title : menu.zh_title}} @@ -167,7 +167,7 @@ export default { }, created () { this._sysMenuBuild() - // this._queryHead() + this._queryHead() // this.timer = setInterval(() => { // this._queryHead() // }, this.itime) @@ -195,11 +195,12 @@ export default { handleSelect (key) { this.dropdown = false this.menus.map(el => { - if (el.router === '' && el.index === key) { - this.$router.push({ path: el.children[0].router }) - } - if (key === '5' || key === '7') { - this.$router.push({ path: el.router }) + if (el.index === key) { + if (el.index === '5' || el.index === '7') { + this.$router.push({ path: el.router }) + } else { + this.$router.push({ path: el.children[0].router }) + } } }) }, diff --git a/static/Magic4/HMI_JavaApp_Map.html b/static/Magic4/HMI_JavaApp_Map.html index a5fb6e4..e348b4f 100644 --- a/static/Magic4/HMI_JavaApp_Map.html +++ b/static/Magic4/HMI_JavaApp_Map.html @@ -98,6 +98,9 @@ padding: 0 30px; background: transparent; overflow: hidden; + } + #topIframe { + background-color: transparent; } diff --git a/static/Magic4/HMI_Map2.html b/static/Magic4/HMI_Map2.html index a764fc9..3799a1c 100644 --- a/static/Magic4/HMI_Map2.html +++ b/static/Magic4/HMI_Map2.html @@ -2,9 +2,7 @@ - - @@ -1281,23 +1279,34 @@ Title -
- - - - - -
-
- +

地图

+
+
+ + + + + +
+
+ +
\ No newline at end of file diff --git a/static/Magic4/images/bg-task-r1.png b/static/Magic4/images/bg-task-r1.png new file mode 100644 index 0000000..99b36ec Binary files /dev/null and b/static/Magic4/images/bg-task-r1.png differ diff --git a/static/Magic4/images/bg-task-r2.png b/static/Magic4/images/bg-task-r2.png new file mode 100644 index 0000000..4aba5de Binary files /dev/null and b/static/Magic4/images/bg-task-r2.png differ