Merge branch 'master' of http://47.103.92.60:3003/skyversation/qp_onemap_ui.git

public/index.html

@@ -53,12 +53,12 @@
       /* 滚动条里面的小方块，能向上向下移动 */
       *:hover::-webkit-scrollbar-thumb {
         display: flex;
-        background-color: #808285;
+        background-color: rgb(163, 166, 173, 0.5);
         border-radius: 6px;
       }
 
       *:hover::-webkit-scrollbar-track-piece {
-        background-color: #d1cfcf;;
+        background-color: rgb(209, 207, 207,0);
       }
     }
   </style>

src/router/index.js

@@ -66,6 +66,30 @@ const routes = [
       },
     ],
   },
+  // {
+  //   path: '/example',
+  //   name: 'example',
+  //   component: function () {
+  //     return import('../views/Example.vue')
+  //   },
+  //   children: [ // 子路由配置开始
+  //     {
+  //       path: '/yygl',
+  //       path: 'yygl',
+  //       component: function () {
+  //         return import('../views/yygl/index.vue')
+  //       }
+  //     },
+  //     //应用中心
+  //     {
+  //       path: 'appCenter',
+  //       path: 'appCenter',
+  //       component: function () {
+  //         return import('../views/yygl/appCenter.vue')
+  //       }
+  //     },
+  //   ],
+  // },
 
   /***************** 跳转单页面 ******************/
   // 时空门户

src/views/Root.vue

@@ -3,8 +3,8 @@
     <Header @updateScroll="updateScrollbar"></Header>
     <el-scrollbar ref="pagescrollbar">
       <router-view />
-      <Footer></Footer>
     </el-scrollbar>
+    <Footer></Footer>
   </div>
 </template>
 
@@ -52,9 +52,9 @@ export default {
 
   .el-scrollbar {
     width: 100%;
-    height: calc(100% - 70px);
+    height: calc(100% - 120px);
     box-sizing: border-box;
-    overflow: hidden;
+    overflow: auto;
   }
 }
 </style>

src/views/yygl/appCenter.vue

@@ -1,28 +1,30 @@
 <template>
   <div class="app-center">
-    <!-- 左侧导航栏 -->
-    <div class="sidebar">
-      <div class="sidebar-menu">
-        <div class="menu-item" :class="{'active': menuValue === 1}" @click="handleMenuClick(1)">
-          <el-icon><Menu /></el-icon>
-          <span>应用概览</span>
+    <div class="container">
+        <!-- 左侧导航栏 -->
+        <div class="sidebar">
+        <div class="sidebar-menu">
+            <div class="menu-item" :class="{'active': menuValue === 1}" @click="handleMenuClick(1)">
+            <el-icon><Menu /></el-icon>
+            <span>应用概览</span>
+            </div>
+            <div class="menu-item" :class="{'active': menuValue === 2}" @click="handleMenuClick(2)">
+            <el-icon><Grid /></el-icon>
+            <span>应用管理</span>
+            </div>
+            <div class="menu-item" :class="{'active': menuValue === 3}" @click="handleMenuClick(3)">
+            <el-icon><Monitor /></el-icon>
+            <span>应用监测</span>
+            </div>
         </div>
-        <div class="menu-item" :class="{'active': menuValue === 2}" @click="handleMenuClick(2)">
-          <el-icon><Grid /></el-icon>
-          <span>应用管理</span>
         </div>
-        <div class="menu-item" :class="{'active': menuValue === 3}" @click="handleMenuClick(3)">
-          <el-icon><Monitor /></el-icon>
-          <span>应用监测</span>
-        </div>
-      </div>
-    </div>
 
-    <!-- 右侧主内容区 -->
-    <div class="main-content">
-        <AppOverview v-if="menuValue === 1" />
-        <AppManagement v-if="menuValue === 2" />
-        <AppMonitoring v-if="menuValue === 3" />
+        <!-- 右侧主内容区 -->
+        <div class="main-content">
+            <AppOverview v-if="menuValue === 1" />
+            <AppManagement v-if="menuValue === 2" />
+            <AppMonitoring v-if="menuValue === 3" />
+        </div>
     </div>
   </div>
 </template>
@@ -53,10 +55,17 @@ export default {
 
 <style lang="less" scoped>
 .app-center {
-  display: flex;
   width: 100%;
 //   min-height: 100vh;
-  height: calc(100% - 50px);
+  height: calc(100vh - 120px);
+  background-color: #08224a;
+  color: #ffffff;
+  overflow-x: hidden;
+}
+.container {
+  display: flex;
+  width: 100%;
+  height: 100%;
   background-color: #08224a;
   color: #ffffff;
 }
@@ -101,7 +110,7 @@ export default {
 .main-content {
   flex: 1;
   padding: 20px 30px;
-  overflow-y: auto;
+  overflow: auto;
 }
 
 </style>

src/views/yygl/index.vue

@@ -170,7 +170,8 @@ export default {
 /* 示范应用区域样式 */
 .demo-applications {
   padding: 60px 20px;
-  max-width: 1400px;
+//   max-width: 1400px;
+  width: 80%;
   margin: 0 auto;
 
   .section-title {

src/views/yygl/manage/index.vue

@@ -276,7 +276,7 @@ export default {
 }
 
 .search-input {
-  width: 400px;
+  // width: 400px;
   margin-right: 10px;
 }
 

src/views/yygl/overview/index.vue

@@ -6,16 +6,18 @@
             <!-- 搜索栏 -->
             <div class="search-bar">
                 <el-input
-                placeholder="请输入应用名称关键字"
-                v-model="searchKeyword"
-                class="search-input"
-               
-                >
-                <!-- <template #prepend>
-                    <Search />
-                </template> -->
+                    placeholder="请输入应用名称关键字"
+                    v-model="searchKeyword"
+                    class="search-input"
+                    >
+                    <!-- <template #append>
+                        <el-button type="primary" class="search-btn">搜索</el-button>
+                    </template> -->
+                    
                 </el-input>
+                <el-button type="primary" class="search-btn">搜索</el-button>
             </div>
+            
 
             <!-- 应用范围过滤 -->
             <div class="filter-tabs">
@@ -200,6 +202,9 @@ export default {
     //   color: rgba(255, 255, 255, 0.8);
     // }
   }
+  .search-btn {
+    margin-left: 10px;
+  }
 }
 
 /* 过滤标签样式 */