Merge branch 'hi-ucs-xha' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-xha

front/src/views/abilityStatistics/components/Footer.vue

@@ -2,7 +2,7 @@
   <div class="footer">
     <div class="fotter-son">
       <div class="top">
-        <div>青岛市大数据发展管理局建设</div>
+        <div>青岛西海岸新区大数据发展促进局建设</div>
         <div class="shuxian"></div>
         <div>海信网络科技股份有限公司</div>
       </div>
@@ -23,12 +23,12 @@
       value: '政府标识码3702000106',
     },
     {
-      name: '版权所有：青岛市大数据发展管理局',
+      name: '版权所有：青岛西海岸新区大数据发展促进局',
-      value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+      value: '地址：青岛市西海岸新区长江中路369号',
     },
     {
-      name: '电话：0532-8561234',
+      name: '电话：0532-86986596',
-      value: '传真0532-2145122',
+      value: '传真: 0532-86986596',
     },
   ])
 </script>

front/src/views/home/components/AbilityToRecommendBottom.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ability-to-recommend">
     <div class="ability-to-recommend-bottom">
-      <div class="botttomson-son1">青岛市大数据发展管理局</div>
+      <div class="botttomson-son1">青岛西海岸新区大数据发展促进局</div>
       <div class="botttomson-son2">
         <div>
           <p>地址</p>

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -6,32 +6,6 @@
         <span class="line"></span>
       </div>
       <div class="bottom">
-        <div class="item">
-          <div class="zj">组件服务</div>
-          <div
-            class="name"
-            v-for="(item, index) in zjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
-          >
-            {{ index + 1 }}-{{ item.name }}
-          </div>
-          <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
-        </div>
-        <div class="item">
-          <div class="yy">应用资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in yyList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
-          >
-            {{ index + 1 }}-{{ item.name }}
-          </div>
-          <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
-        </div>
         <div class="item">
           <div class="jc">基础设施</div>
           <div class="name">1-J1-党建展示区走廊-北向</div>
@@ -41,6 +15,22 @@
           <div class="name name-last">5-J5-指挥席位东北向</div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
+        <div class="item">
+          <div class="zj">组件服务</div>
+          <div class="name" v-for="(item, index) in zjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne(item.id)">
+            {{ index + 1 }}-{{ item.name }}
+          </div>
+          <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
+        </div>
+        <div class="item">
+          <div class="yy">应用资源</div>
+          <div class="name" v-for="(item, index) in yyList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne(item.id)">
+            {{ index + 1 }}-{{ item.name }}
+          </div>
+          <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
+        </div>
         <div class="item">
           <div class="sj">数据资源</div>
           <div class="name">1-扬尘数据接口</div>
@@ -142,12 +132,14 @@
   background-size: 100%;
   display: flex;
   justify-content: center;
+
   .main {
     width: 13rem;
     margin-top: 1.8rem;
     display: flex;
     flex-direction: column;
     flex-wrap: wrap;
+
     .top {
       font-size: 0.3rem;
       color: #212121;
@@ -157,6 +149,7 @@
       flex-wrap: wrap;
       justify-content: center;
       align-items: center;
+
       .line {
         width: 0.34rem;
         height: 0.03rem;
@@ -164,10 +157,12 @@
         margin-top: 0.08rem;
       }
     }
+
     .bottom {
       display: flex;
       justify-content: space-between;
       margin-top: 0.4rem;
+
       .item {
         width: 2.44rem;
         height: 3.91rem;
@@ -175,6 +170,7 @@
         background-color: #fff;
         border-radius: 0.02rem;
         box-shadow: 0 0.05rem 0.2rem #ccc;
+
         div:nth-of-type(1) {
           height: 1.02rem;
           line-height: 1.02rem;
@@ -183,18 +179,23 @@
           padding-left: 0.15rem;
           background-size: 100%;
         }
+
         .jc {
           background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
         }
+
         .sj {
           background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
         }
+
         .zj {
           background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
         }
+
         .yy {
           background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
         }
+
         .zs {
           background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
         }
@@ -209,13 +210,16 @@
           -webkit-line-clamp: 1;
           -webkit-box-orient: vertical;
         }
+
         .name:hover {
           color: #0058e1;
           cursor: pointer;
         }
+
         .name-last {
           border-bottom: none;
         }
+
         .btn {
           cursor: pointer;
           width: 0.8rem;
@@ -228,11 +232,13 @@
           margin-top: 0.1rem;
           margin-left: 0.85rem;
         }
+
         .btn:hover {
           background: rgba(0, 88, 225, 0.3);
           color: #000;
         }
       }
+
       .item:hover {
         border-radius: 0.02rem;
         border: 0.01rem solid #0058e1;

front/src/views/newHome/components/Footer.vue

@@ -2,7 +2,7 @@
   <div class="footer">
     <div class="fotter-son">
       <div class="top">
-        <div>青岛市大数据发展管理局建设</div>
+        <div>青岛西海岸新区大数据发展促进局建设</div>
         <div class="shuxian"></div>
         <div>海信网络科技股份有限公司</div>
       </div>
@@ -23,12 +23,12 @@
       value: '政府标识码3702000106',
     },
     {
-      name: '版权所有：青岛市大数据发展管理局',
+      name: '版权所有：青岛西海岸新区大数据发展促进局',
-      value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+      value: '地址：青岛市西海岸新区长江中路369号',
     },
     {
-      name: '电话：0532-8561234',
+      name: '电话：0532-86986596',
-      value: '传真0532-2145122',
+      value: '传真: 0532-86986596',
     },
   ])
 </script>

front/src/views/newHome/components/Navigation.vue

@@ -151,9 +151,9 @@
   const store = useStore()
   const router = useRouter()
   const topList = ref([
+    '基础设施',
     '组件服务',
     '应用资源',
-    '基础设施',
     '数据资源',
     // '知识库',
   ])

front/src/views/newHome/components/Navigation2.vue

@@ -1,5 +1,13 @@
 <template>
   <div class="navigation2">
+        <div class="item">
+      <div class="img jc"></div>
+      <div class="name">基础设施</div>
+      <div class="sl">
+        <span class="num">{{ jcNum || 0 }}</span>
+        个
+      </div>
+    </div>
     <div class="item">
       <div class="img zj"></div>
       <div class="name">组件服务</div>
@@ -16,14 +24,6 @@
         个
       </div>
     </div>
-    <div class="item">
-      <div class="img jc"></div>
-      <div class="name">基础设施</div>
-      <div class="sl">
-        <span class="num">{{ jcNum || 0 }}</span>
-        个
-      </div>
-    </div>
     <div class="item">
       <div class="img sj"></div>
       <div class="name">数据资源</div>