Forráskód Böngészése

Merge branch 'MicroFunction' of http://47.103.92.60:3003/skyversation/qp_onemap_ui

DESKTOP-6LTVLN7\Liumouren 3 hete
szülő
commit
8f7c17e191

+ 4 - 0
src/components/yxgl/EchartsDome.vue

@@ -82,6 +82,10 @@ export default {
         },
       });
       chartInstance.setOption(mergedOption, true);
+      // 添加resize事件监听
+      window.addEventListener("resize", () => {
+        chartInstance.resize();
+      });
     },
   },
 };

+ 8 - 0
src/store/index.js

@@ -11,6 +11,14 @@ export default createStore({
     DMSTypes: ["appstatus"],
     // appstatus: 应用状态
     DmsTypesMap: localStorage.getItem("DmsTypesMap") ? JSON.parse(localStorage.getItem("DmsTypesMap")) : {},
+    menuList: [
+      { path: "/", label: "首页" },
+      { path: "/sksjgl", label: "时空数据管理" },
+      // { path: "/skmh/scene", label: "二维GIS引擎"},
+      { path: "/skmh", label: "时空门户" },
+      { path: "/wgn", label: "微功能" },
+      { path: "/yygl", label: "应用管理" },
+      { path: "/yxgl", label: "运行管理" },],
     sksjgl: {},
     skmh: {},
     wgn: {},

+ 10 - 9
src/views/Root.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main">
-    <Header @updateScroll="updateScrollbar"></Header>
+    <Header />
     <el-scrollbar ref="pagescrollbar">
       <router-view />
     </el-scrollbar>
@@ -30,16 +30,17 @@ export default {
     };
   },
   components: {
-    Header: defineAsyncComponent(() =>
-      import("@/components/AppVue/Header.vue")
-    ),
-    Footer: defineAsyncComponent(() => import("@/components/AppVue/Footer.vue"))
+    Header: defineAsyncComponent(() => import("@/components/AppVue/Header.vue")),
+    Footer: defineAsyncComponent(() => import("@/components/AppVue/Footer.vue")),
   },
-  methods: {
-    updateScrollbar() {
-      this.$refs.pagescrollbar.setScrollTop(0)
-    }
+  watch: {
+    $route(to, from) {
+      this.$nextTick(() => {
+        this.$refs.pagescrollbar.setScrollTop(0);
+      });
+    },
   },
+  methods: {},
 };
 </script>
 

+ 7 - 7
src/views/Wgn.vue

@@ -3,7 +3,7 @@
     <el-backtop target=".wgn_box" :right="20" :bottom="70" />
     <div class="server_title">
       <el-image
-        style="width: 824px; height: calc(100vh - 70px)"
+        style="width: 43vw; height: calc(100vh - 120px)"
         src="static/images/wgn_title.png"
         fit="cover"
       />
@@ -19,7 +19,7 @@
     </div>
     <div class="server_list_box">
       <div class="server_list_box_title">微功能列表</div>
-      <el-affix :offset="0">
+      <el-affix :offset="80">
         <div class="server_list_box_search">
           <el-input
             v-model="searchStr"
@@ -332,15 +332,15 @@ export default {
   align-items: center;
 }
 .server_title_text {
-  width: calc(100vw - 824px);
-  height: calc(100vh - 70px);
+  width: calc(77vw - 200px);
+  height: calc(100vh - 120px);
   background-color: #1c2631;
   color: #fff;
-  padding: 0 160px 0 60px;
   display: flex;
   flex-direction: column;
   justify-content: center;
   overflow: hidden;
+  padding: 0 100px;
   &_title {
     font-size: 64px;
     font-weight: bold;
@@ -370,7 +370,7 @@ export default {
     z-index: 1;
   }
   &_title {
-    margin-top: 100px;
+    margin: 100px 0;
     font-size: 35px;
     font-weight: bold;
     position: relative;
@@ -386,7 +386,7 @@ export default {
     }
   }
   &_search {
-    margin-top: 100px;
+    // margin-top: 100px;
     font-size: 25px;
     display: flex;
     flex-wrap: nowrap;

+ 1 - 1
src/views/Yxgl.vue

@@ -124,7 +124,7 @@ export default {
 }
 iframe {
   width: 100%;
-  height: calc(100% - 10px);
+  height: calc(100%);
   background: #08224a;
 }
 </style>