From 90163aa9e33e88881192c40529597d781c4453b5 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 14 Jun 2022 11:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/components/Footer.vue   |  10 +-
 .../components/AbilityToRecommendBottom.vue   |   2 +-
 .../components/CapabilityConvergence.vue      | 360 +++++++++---------
 front/src/views/newHome/components/Footer.vue |  10 +-
 .../views/newHome/components/Navigation.vue   |   2 +-
 .../views/newHome/components/Navigation2.vue  |  16 +-
 6 files changed, 203 insertions(+), 197 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/Footer.vue b/front/src/views/abilityStatistics/components/Footer.vue
index 4609ed53..9782aad6 100644
--- a/front/src/views/abilityStatistics/components/Footer.vue
+++ b/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: '版权所有：青岛市大数据发展管理局',
-      value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+      name: '版权所有：青岛西海岸新区大数据发展促进局',
+      value: '地址：青岛市西海岸新区长江中路369号',
     },
     {
-      name: '电话：0532-8561234',
-      value: '传真0532-2145122',
+      name: '电话：0532-86986596',
+      value: '传真: 0532-86986596',
     },
   ])
 </script>
diff --git a/front/src/views/home/components/AbilityToRecommendBottom.vue b/front/src/views/home/components/AbilityToRecommendBottom.vue
index 415e85bc..68fa2f23 100644
--- a/front/src/views/home/components/AbilityToRecommendBottom.vue
+++ b/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>
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 8d1bbaff..204c47c1 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/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>
@@ -78,167 +68,183 @@
   </div>
 </template>
 <script setup>
-  import { pageWithAttrs } from '@/api/home.js'
-  import { ref } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  const store = useStore()
-  const router = useRouter()
-  const zjList = ref([])
-  const yyList = ref([])
-  // const jcList = ref([])
-  const paramsGetResources = {
-    districtId: '',
-    pageNum: 1,
-    pageSize: 5,
-    type: '',
-    name: '',
-    infoList: [],
-    orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-    orderType: 'DESC', // ASC 升序  DESC 降序
-  }
-  const getAppResources = (type, obj) => {
-    paramsGetResources.type = type
-    pageWithAttrs(paramsGetResources).then((res) => {
-      console.log('查询列表============>', res.data.data.records)
-      obj.value = res.data.data.records
-    })
-  }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  // getAppResources('基础设施', jcList)
+import { pageWithAttrs } from '@/api/home.js'
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+const store = useStore()
+const router = useRouter()
+const zjList = ref([])
+const yyList = ref([])
+// const jcList = ref([])
+const paramsGetResources = {
+  districtId: '',
+  pageNum: 1,
+  pageSize: 5,
+  type: '',
+  name: '',
+  infoList: [],
+  orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+  orderType: 'DESC', // ASC 升序  DESC 降序
+}
+const getAppResources = (type, obj) => {
+  paramsGetResources.type = type
+  pageWithAttrs(paramsGetResources).then((res) => {
+    console.log('查询列表============>', res.data.data.records)
+    obj.value = res.data.data.records
+  })
+}
+getAppResources('组件服务', zjList)
+getAppResources('应用资源', yyList)
+// getAppResources('基础设施', jcList)
 
-  function jumpPage(type) {
-    // 点击内存入store
-    store.commit('home/selectCardsData', {
-      selectCardsnum: type,
-    })
-    console.log(
-      '选中===================>',
-      store.getters['home/selectCardsnum']
-    )
-    // router.push({ path: '/DetailsPageconetent' })
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        select: type,
-      },
-    })
-  }
-  const selectOne = (id) => {
-    console.log('点击===============》', id)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
+function jumpPage(type) {
+  // 点击内存入store
+  store.commit('home/selectCardsData', {
+    selectCardsnum: type,
+  })
+  console.log(
+    '选中===================>',
+    store.getters['home/selectCardsnum']
+  )
+  // router.push({ path: '/DetailsPageconetent' })
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      select: type,
+    },
+  })
+}
+const selectOne = (id) => {
+  console.log('点击===============》', id)
+  router.push({
+    path: '/details',
+    query: {
+      id: id,
+    },
+  })
+}
 </script>
 <style lang="less" scoped>
-  .capability-convergence {
-    height: 7.2rem;
-    background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
-    background-size: 100%;
+.capability-convergence {
+  height: 7.2rem;
+  background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
+  background-size: 100%;
+  display: flex;
+  justify-content: center;
+
+  .main {
+    width: 13rem;
+    margin-top: 1.8rem;
     display: flex;
-    justify-content: center;
-    .main {
-      width: 13rem;
-      margin-top: 1.8rem;
+    flex-direction: column;
+    flex-wrap: wrap;
+
+    .top {
+      font-size: 0.3rem;
+      color: #212121;
+      text-align: center;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
-      .top {
-        font-size: 0.3rem;
-        color: #212121;
-        text-align: center;
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        justify-content: center;
-        align-items: center;
-        .line {
-          width: 0.34rem;
-          height: 0.03rem;
-          background-color: #0058e1;
-          margin-top: 0.08rem;
+      justify-content: center;
+      align-items: center;
+
+      .line {
+        width: 0.34rem;
+        height: 0.03rem;
+        background-color: #0058e1;
+        margin-top: 0.08rem;
+      }
+    }
+
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 0.4rem;
+
+      .item {
+        width: 2.44rem;
+        height: 3.91rem;
+        font-size: 0.16rem;
+        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;
+          font-size: 0.2rem;
+          color: #fff;
+          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;
+        }
+       .name {
+          height: 0.47rem;
+          line-height: 0.47rem;
+          margin: 0 0.16rem;
+          border-bottom: 0.01rem solid #e9e9e9;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -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;
+          height: 0.24rem;
+          border: 0.01rem solid #0058e1;
+          font-size: 0.14rem;
+          color: #0058e1;
+          border-radius: 0.02rem;
+          text-align: center;
+          margin-top: 0.1rem;
+          margin-left: 0.85rem;
+        }
+
+        .btn:hover {
+          background: rgba(0, 88, 225, 0.3);
+          color: #000;
         }
       }
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 0.4rem;
-        .item {
-          width: 2.44rem;
-          height: 3.91rem;
-          font-size: 0.16rem;
-          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;
-            font-size: 0.2rem;
-            color: #fff;
-            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;
-          }
-          .name {
-            height: 0.47rem;
-            line-height: 0.47rem;
-            margin: 0 0.16rem;
-            border-bottom: 0.01rem solid #e9e9e9;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -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;
-            height: 0.24rem;
-            border: 0.01rem solid #0058e1;
-            font-size: 0.14rem;
-            color: #0058e1;
-            border-radius: 0.02rem;
-            text-align: center;
-            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;
-          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-        }
+
+      .item:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
       }
     }
   }
+}
 </style>
diff --git a/front/src/views/newHome/components/Footer.vue b/front/src/views/newHome/components/Footer.vue
index 4609ed53..9782aad6 100644
--- a/front/src/views/newHome/components/Footer.vue
+++ b/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: '版权所有：青岛市大数据发展管理局',
-      value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+      name: '版权所有：青岛西海岸新区大数据发展促进局',
+      value: '地址：青岛市西海岸新区长江中路369号',
     },
     {
-      name: '电话：0532-8561234',
-      value: '传真0532-2145122',
+      name: '电话：0532-86986596',
+      value: '传真: 0532-86986596',
     },
   ])
 </script>
diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue
index cf809279..5d0fb477 100644
--- a/front/src/views/newHome/components/Navigation.vue
+++ b/front/src/views/newHome/components/Navigation.vue
@@ -151,9 +151,9 @@
   const store = useStore()
   const router = useRouter()
   const topList = ref([
+    '基础设施',
     '组件服务',
     '应用资源',
-    '基础设施',
     '数据资源',
     // '知识库',
   ])
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index 32941d6a..427913c1 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/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>