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

# Conflicts:
#	src/views/rwgl/Index.vue

src/components/AppVue/Header.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="header">
-    <div class="logo">青浦区“一张图”区级节点</div>
+    <div class="logo">
+      <img src="/static/images/logo.png" style="width: 24px;height: 24px;vertical-align: middle;" alt="" />
+      青浦区“一张图”区级节点
+    </div>
     <div class="userdropdown">
       <User />
     </div>
@@ -53,7 +56,7 @@ export default {
 }
 #header {
   width: 100vw;
-  height: 70px;
+  height: 44px;
   background: linear-gradient(180deg, #2c2f74, #494d98);
   color: #ffffff;
   margin: 0 auto;
@@ -62,12 +65,14 @@ export default {
   z-index: 999;
   .logo {
     display: inline-block;
-    height: 70px;
+    height: 44px;
     // width: 200px;
-    padding: 0 20px;
+    // padding: 0 20px;
+    padding: 0 20px 0px 20px;
     text-align: center;
-    line-height: 70px;
-    font-size: 24px;
+    line-height: 44px;
+    font-size: 18px;
+    font-weight: bold;
   }
 
   .menu {
@@ -75,22 +80,31 @@ export default {
     .menu_ul {
       li {
         display: inline-block;
-        height: 50px;
+        height: 24px;
         width: fit-content;
-        line-height: 50px;
+        line-height: 24px;
         text-align: center;
         cursor: pointer;
-        margin: 10px 20px;
-        font-size: 20px;
-        font-weight: bold;
+        // margin: 10px 20px;
+        padding: 10px 20px;
+        font-size: 16px;
+        // font-weight: bold;
       }
 
       li:hover {
-        color: #00bbff;
+        // color: #00bbff;
+        color: #fff;
+        font-weight: bold;
+        border-radius: 4px;
+        background: linear-gradient(97deg, #1586FF 12%, #0E5AF4 90%);
       }
 
       li.active {
-        color: #00bbff;
+        // color: #00bbff;
+        color: #fff;
+        font-weight: bold;
+        border-radius: 4px;
+        background: linear-gradient(97deg, #1586FF 12%, #0E5AF4 90%);
       }
     }
   }
@@ -100,7 +114,7 @@ export default {
   width: 150px;
   display: flex;
   align-items: center;
-  height: 70px;
+  height: 44px;
   justify-content: center;
   cursor: pointer;
   border: 0;

src/views/Yxgl.vue

@@ -1,8 +1,8 @@
 <template>
   <el-affix :offset="0">
-    <div style="height: 70px;width: 100vw;background: #08224a;"></div>
+    <div style="height: 44px;width: 100vw;background: #08224a;"></div>
   </el-affix>
-  <el-affix :offset="70">
+  <el-affix :offset="44">
   <div id="yxgl_box">
     <el-menu
       :default-active="menuActive"

src/views/rwgl/Index.vue

@@ -1,21 +1,21 @@
 <template>
   <el-affix :offset="0">
-    <div style="height: 70px; width: 100vw; background: #08224a"></div>
+    <div style="height: 44px;width: 100vw;background: #08224a;"></div>
   </el-affix>
-  <el-affix :offset="70">
-    <div class="blue-background">
-      <div class="lighter-container">
-        <div class="left-row">
-          <div>
-            <span>状态：</span>
-            <el-tag
-              size="large"
-              :effect="focusTaskStatus.includes('all') ? 'dark' : ''"
-              type="primary"
-              @click="changeTaskStatus()"
-              style="cursor: pointer; margin: 10px 5px"
-            >
-              全部
+  <el-affix :offset="44">
+  <div class="blue-background">
+    <div class="lighter-container">
+      <div class="left-row">
+        <div>
+          <span>状态：</span>
+          <el-tag size="large" :effect="focusTaskStatus.includes('all') ? 'dark' : ''" type="primary"
+            @click="changeTaskStatus()" style="cursor: pointer;margin: 10px 5px;">
+            全部
+          </el-tag>
+          <template v-for="status in taskStatus" :key="status.index">
+            <el-tag size="large" :effect="focusTaskStatus.includes(status.index) ? 'dark' : ''" type="primary"
+              @click="changeTaskStatus(status)" style="cursor: pointer;margin: 10px 5px;">
+              {{ status.name }}
             </el-tag>
             <template v-for="status in taskStatus" :key="status.index">
               <el-tag

src/views/yygl/appCenter.vue

@@ -1,8 +1,8 @@
 <template>
   <el-affix :offset="0">
-  <div style="height: 70px;width: 100vw;background: #08224a;"></div>
+  <div style="height: 44px;width: 100vw;background: #08224a;"></div>
   </el-affix>
-  <el-affix :offset="70">
+  <el-affix :offset="44">
   <div class="app-center">
     <div class="container">
       <!-- 左侧导航栏 -->

src/views/yygl/index.vue

@@ -186,9 +186,9 @@ export default {
       });
     },
     handleTabsOpenPage(item){
-        // if(item.url){
-        //   window.open(item.url);
-        // }
+        if(item.url){
+          window.open(item.url);
+        }
     }
 
   }

src/views/yygl/manage/index.vue

@@ -554,7 +554,7 @@ export default {
   display: flex;
   align-items: center;
   // flex: 1;
-  width: 400px;
+  width: 410px;
   gap: 15px;
 }
 

src/views/yygl/overview/index.vue

@@ -65,7 +65,7 @@
                   type="primary"
                   size="small"
                   class="visit-button"
-                  @click="handleVisit"
+                  @click="handleOpenPage(app)"
                   >访问</el-button
                 >
               </div>
@@ -124,15 +124,10 @@ export default {
       this.getDmsTagSName();
       this.getDmsDataList();
     },
-    handleVisit() {
-      // http://localhost:2027/fileView?url=/proxy_dms/static/1_青浦大数据中心一张图功能表20240531.xlsx
-      // http://localhost:2027/fileView?url=/proxy_dms/static/test.geojson
-      // window.open(
-      //   "fileView?url=" +
-      //     this.curUrl +
-      //     "/static/1_青浦大数据中心一张图功能表20240531.xlsx",
-      //   "_blank"
-      // );
+    handleOpenPage(param) {
+      if(param.c_url){
+          window.open(param.c_url);
+      }
     },
     getDmsTagSName() {
       let requestParams = {
@@ -299,7 +294,7 @@ export default {
 }
 .app-content{
     // height: 640px;
-    height: calc(100vh - 266px);
+    height: calc(100vh - 160px);
     overflow: auto;
     padding-right: 20px;
 }