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

# Conflicts:
#	src/views/Wgn.vue

src/components/yxgl/table.vue

@@ -71,6 +71,7 @@ export default {
 .table_title {
   font-size: 16px;
 }
+
 .table_more {
   position: absolute;
   top: 20px;

src/router/index.js

@@ -27,6 +27,13 @@ const routes = [
           return import('../views/Wgn.vue')
         },
       },
+      {
+        path: '/sksjyl',
+        name: 'sksjyl',
+        component: function () {
+          return import('../views/wgn/sksj/index.vue')
+        },
+      },
       {
         path: 'skmh',
         component: function () {

src/views/HomePage.vue

@@ -104,7 +104,7 @@
           </div>
           <div class="row">
             <div class="top-list" style="flex-grow: 1;">
-              <div v-for="index in 5" class="list-item">
+              <div v-for="index in 5" :key="index" class="list-item">
                 <template v-if="resourceTop[index - 1] != null">
                   <el-avatar size="small" class="circle-number blue">
                     {{ index }}
@@ -115,7 +115,7 @@
               </div>
             </div>
             <div class="top-list" style="flex-grow: 1;">
-              <div v-for="index in 5" class="list-item">
+              <div v-for="index in 5" :key="index" class="list-item">
                 <template v-if="resourceTop[index + 4] != null">
                   <el-avatar size="small" class="circle-number blue">
                     {{ index + 5 }}
@@ -137,7 +137,7 @@
             <div>委办调用top5</div>
           </div>
           <div class="top-list">
-            <div v-for="index in 5" class="list-item">
+            <div v-for="index in 5" :key="index" class="list-item">
               <template v-if="userTop[index - 1] != null">
                 <el-avatar size="small" class="circle-number blue">
                   {{ index }}
@@ -198,7 +198,7 @@
           </template></el-tab-pane>
       </el-tabs>
       <div class="warp-row">
-        <div v-for="useCaseItem in useCase[activeUseCase]" class="use-case"
+        <div v-for="useCaseItem in useCase[activeUseCase]" :key="useCaseItem.title" class="use-case"
           :style="`background-image: url(${useCaseItem.picture})`">
           <div class="use-case-empty"></div>
           <div class="use-case-text">

src/views/Sksjgl.vue

@@ -297,7 +297,6 @@ export default {
         color: #fff;
         padding: 100px 150px;
         box-sizing: border-box;
-        margin-bottom: 50px;
 
         /* 标题区域 */
         .title-section {

src/views/skmh/index.vue

@@ -750,7 +750,7 @@ export default {
 
 /* 平台数据统计 */
 .stats-section {
-  padding: 40px 20px;
+  padding: 40px 10%;
   .overview-header {
     display: flex;
     justify-content: space-between;
@@ -771,7 +771,7 @@ export default {
     flex-wrap: wrap;
     
     .stat-card {
-      width: 555px;
+      width: 29%;
       height: 150px;
       border-radius: 12px;
       padding: 20px;
@@ -819,7 +819,7 @@ export default {
 
 /* 数据概览 */
 .data-overview {
-  padding: 0 20px 40px;
+  padding: 0 10% 40px;
   
   .overview-header {
     display: flex;
@@ -900,7 +900,7 @@ export default {
 
 /* 设备综合分析比较 */
 .comparison-section {
-  padding: 0 20px 40px;
+  padding: 0 10% 40px;
   
   .chart-card {
     background-color: rgba(30, 41, 59, 0.6);
@@ -928,7 +928,7 @@ export default {
 
 /* 功能演示 */
 .demo-section {
-  padding: 0 20px 100px;
+  padding: 0 10% 100px;
   
  .overview-header {
     display: flex;

src/views/wgn/sksj/index.vue

@@ -5,7 +5,7 @@
                 <el-select
                 v-model="typeValue"
                 placeholder="Select"
-                style="width: 150px"
+                style="width: 150px;background: black;"
                 @change="changType"
                 >
                 <el-option
@@ -15,7 +15,7 @@
                     :value="item.value"
                 />
                 </el-select>
-                <el-input v-if="typeValue != 6" v-model="inputAddress" style="width: 200px;height: 32px;padding: 0px 10px;" placeholder="输入URL地址……" />
+                <el-input v-if="typeValue != 6" v-model="inputAddress" style="max-width: 200px;height: 32px;margin: 0px 10px;background: black;" placeholder="输入URL地址……" />
                 <div style="padding: 0px 10px;" v-if="typeValue == 6">
                     <el-upload
                         ref="uploadRef"

src/views/yygl/manage/index.vue

@@ -155,6 +155,71 @@ export default {
       
       // 应用列表数据
       applications: [
+        {
+          logo: require('@/assets/images/common/app-bg-1.png'),
+          name: '水系统综合管理',
+          version: 'v1.0',
+          isPublic: true,
+          tag: '水务',
+          buff: '市级',
+          status: 'offline',
+          statusText: '在维',
+          usingUnit: '暂无',
+          visitCount: 64,
+          createDate: '2025-10-29 16:10:17'
+        },
+        {
+          logo: require('@/assets/images/common/app-bg-2.png'),
+          name: '虹口区历史脉管理系统开发',
+          version: 'v1.0',
+          isPublic: true,
+          tag: '',
+          buff: '区级',
+          status: 'online',
+          statusText: '在线',
+          usingUnit: '虹口区文旅局',
+          visitCount: 8,
+          createDate: '2025-09-15 18:02:32'
+        },
+        {
+          logo: require('@/assets/images/common/app-bg-3.png'),
+          name: '虹口区智慧环卫监管平台',
+          version: 'v1.0',
+          isPublic: true,
+          tag: '',
+          buff: '街道',
+          status: 'offline',
+          statusText: '在维',
+          usingUnit: '虹口区城管局',
+          visitCount: 14,
+          createDate: '2025-09-15 18:01:57'
+        },
+        {
+          logo: require('@/assets/images/common/app-bg-4.png'),
+          name: '上海市虹口区一网统管平台',
+          version: 'v1.0',
+          isPublic: true,
+          tag: '',
+          buff: '街道',
+          status: 'online',
+          statusText: '在线',
+          usingUnit: '虹口区政府办',
+          visitCount: 15,
+          createDate: '2025-09-15 18:01:09'
+        },
+        {
+          logo: require('@/assets/images/common/u661.png'),
+          name: '上海公共交通服务保障',
+          version: 'v1.0',
+          isPublic: true,
+          tag: '',
+          buff: '社区',
+          status: 'offline',
+          statusText: '在维',
+          usingUnit: '虹口区体育局',
+          visitCount: 13,
+          createDate: '2025-09-15 18:00:22'
+        },
         {
           logo: require('@/assets/images/common/app-bg-1.png'),
           name: '水系统综合管理',
@@ -315,6 +380,8 @@ export default {
 /* 应用列表 */
 .applications-list {
   margin-bottom: 20px;
+  height: 500px;
+  overflow: auto;
 }
 
 .application-item {

src/views/yygl/overview/index.vue

@@ -29,29 +29,30 @@
             </div>
         </div>
       <!-- 应用卡片网格 -->
-      <div class="applications-grid">
-        <div class="application-card" v-for="(app, index) in applications" :key="index">
-          <div class="card-image">
-            <img :src="app.image" :alt="app.name" />
-          </div>
-          <div class="card-content">
-            <div class="app-header">
-              <h3 class="app-name">{{ app.name }}</h3>
-              <span class="app-version">{{ app.version }}</span>
-            </div>
-            <div class="app-tags">
-              <el-tag size="small" type="success">{{ app.status }}</el-tag>
-              <el-tag size="small" v-for="tag in app.tags" :key="tag">{{ tag }}</el-tag>
+      <div class="app-content">
+        <div class="applications-grid">
+          <div class="application-card" v-for="(app, index) in applications" :key="index">
+            <div class="card-image">
+              <img :src="app.image" :alt="app.name" />
             </div>
-            <p class="app-description">{{ app.description }}</p>
-            <div class="app-footer">
-              <span class="app-date">{{ app.date }}</span>
-              <el-button type="primary" size="small" class="visit-button">访问</el-button>
+            <div class="card-content">
+              <div class="app-header">
+                <h3 class="app-name">{{ app.name }}</h3>
+                <span class="app-version">{{ app.version }}</span>
+              </div>
+              <div class="app-tags">
+                <el-tag size="small" type="success">{{ app.status }}</el-tag>
+                <el-tag size="small" v-for="tag in app.tags" :key="tag">{{ tag }}</el-tag>
+              </div>
+              <p class="app-description">{{ app.description }}</p>
+              <div class="app-footer">
+                <span class="app-date">{{ app.date }}</span>
+                <el-button type="primary" size="small" class="visit-button">访问</el-button>
+              </div>
             </div>
           </div>
         </div>
       </div>
-
       <!-- 加载更多按钮 -->
       <!-- <div class="load-more">
         <el-button type="primary" size="medium">查看更多</el-button>
@@ -239,6 +240,11 @@ export default {
     }
   }
 }
+.app-content{
+    // height: 640px;
+    height: calc(100vh - 266px);
+    overflow: auto;
+}
 
 /* 应用卡片网格样式 */
 .applications-grid {