From 7918e07b6c69793b670432bb3d8b209407757a1d Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 29 Sep 2022 11:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9A=E9=A6=96=E9=A1=B55=E4=B8=AA=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=B1=95=E7=A4=BA=E6=A8=A1=E5=9D=97=E8=A6=81=E8=AE=A9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=83=BD=E6=98=8E=E6=98=BE=E7=9A=84=E6=B8=85?=
 =?UTF-8?q?=E6=A5=9A=E5=8F=AF=E2=80=9C=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E2=80=9D=EF=BC=88=E6=AF=94=E5=A6=82=E5=AD=97=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E5=88=92=E7=BA=BF=E6=88=96=E8=80=85=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=85=A5=E6=97=B6=E2=80=9C=E5=B0=8F=E6=89=8B?=
 =?UTF-8?q?=E2=80=9C=E5=9B=BE=E6=A0=87=E8=A6=81=E6=98=8E=E6=98=BE=E7=AD=89?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 959 ++++++++++--------
 .../components/CapabilityConvergence.vue      | 767 +++++++-------
 .../views/newHome/components/Navigation2.vue  |  85 +-
 front/src/views/newHome/index.vue             |   2 +-
 4 files changed, 966 insertions(+), 847 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 9385c14c..ce792b00 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -1,7 +1,7 @@
 <template>
-<div >
-    <div class='container'>
-         <!-- <div class='container-left'  v-if='homeIsShow'>
+  <div>
+    <div class="container">
+      <!-- <div class='container-left'  v-if='homeIsShow'>
         <div class='left-search'>
             <div>
                 <input type="text" class='input-style' placeholder="请输入部门关键词" v-model="inputTxt">
@@ -22,74 +22,76 @@
            </span>
         </el-tree>
          </div> -->
-           <el-form :inline="true">
-           <!--起始日期 @keyup.enter.native="getDataList()"-->
-         <el-form-item>
-         <el-date-picker
+      <el-form :inline="true">
+        <!--起始日期 @keyup.enter.native="getDataList()"-->
+        <el-form-item>
+          <el-date-picker
             v-model="value1"
             type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            format='yyyy-MM-dd HH:mm:ss'
-            value-format='yyyy-MM-dd HH:mm:ss'
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
-         </el-form-item>
-          <!--审核状态-->
+        </el-form-item>
+        <!--审核状态-->
         <el-form-item>
           <el-select
             v-model="examineStatus"
             placeholder="请选审核状态"
             clearable
           >
-            <el-option
-              label="审核完成"
-              value="1"
-            ></el-option>
-            <el-option
-              label="审核中"
-              value="0"
-            ></el-option>
+            <el-option label="审核完成" value="1"></el-option>
+            <el-option label="审核中" value="0"></el-option>
           </el-select>
         </el-form-item>
-      
-          <!--部门-->
-         <el-form-item>
+
+        <!--部门-->
+        <el-form-item>
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
             clearable
           >
-             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option
+              v-for="item in departmentSelects"
+              :key="item.label"
+              v-bind="item"
+            ></el-option>
           </el-select>
         </el-form-item>
 
-         <!--类型-->
-         <el-form-item>
-          <el-select
-            v-model="abilityType"
-            placeholder="请选择类型"
-            clearable
-          >
-             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in typeOptions" :key="item.name" :label="item.name" :value="item.name" v-bind="item"></el-option>
+        <!--类型-->
+        <el-form-item>
+          <el-select v-model="abilityType" placeholder="请选择类型" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name"
+              v-bind="item"
+            ></el-option>
           </el-select>
         </el-form-item>
-       
+
         <!--操作按钮查询-->
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!--操作按钮重置-->
         <el-form-item>
-          <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
+          <el-button type="primary" @click="resetDataList()">{{
+            $t('reset')
+          }}</el-button>
         </el-form-item>
-        </el-form>
-     <el-card shadow="never" class="aui-card--fill"  v-if='homeIsShow'>
-    <div class="mod-demand__bsdemand">
-       <!--  <div class='top-box'>
+      </el-form>
+      <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
+        <div class="mod-demand__bsdemand">
+          <!--  <div class='top-box'>
             <span class='title'>能力统计</span>
             <div class='title-list-style'>
             <div v-for="(item,index) in titleList" :key='index' class='title-single' :class="{'choseStyle':choseId=== index}" @click="choseBtn(index)">
@@ -98,119 +100,122 @@
            </div>
         </div> -->
 
-         <div class='second-title'>
-            <span style='margin-right:30px' :class="[(departmentId===1 || departmentId===3)?'departmentStyle':'']" @click="handleChose(1)">
-                能力上架统计
+          <div class="second-title">
+            <span
+              style="margin-right: 30px"
+              :class="[
+                departmentId === 1 || departmentId === 3
+                  ? 'departmentStyle'
+                  : ''
+              ]"
+              @click="handleChose(1)"
+            >
+              能力上架统计
             </span>
-            <span  :class="[(departmentId===2 || departmentId===4)?'departmentStyle':'']"  @click="handleChose(2)">
-               能力使用统计
+            <span
+              :class="[
+                departmentId === 2 || departmentId === 4
+                  ? 'departmentStyle'
+                  : ''
+              ]"
+              @click="handleChose(2)"
+            >
+              能力使用统计
             </span>
-         <!--   <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']"  @click="handleChose(3)">
+            <!--   <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']"  @click="handleChose(3)">
                 能力上架明细
             </span>
            <span v-if='this.choseId===0' :class="[departmentId===4?'departmentStyle':'']"  @click="handleChose(4)">
                 能力使用明细
             </span> -->
-            <span  v-if="detailFlag" class="detail-button" @click="goToDetail()">
-               明细
+            <span v-if="detailFlag" class="detail-button" @click="goToDetail()">
+              明细
             </span>
-            <span  v-else class="detail-button" @click="goToBack()">
-               返回
-            </span>
-         </div>
-         <div class='line-style'></div>
-         <!--统计表-->
+            <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
+          </div>
+          <div class="line-style"></div>
+          <!--统计表-->
           <el-table
             :data="tableData"
-            :header-cell-style="{textAlign:'center'}"
-            :cell-style="{textAlign:'center'}"
+            :header-cell-style="{ textAlign: 'center' }"
+            :cell-style="{ textAlign: 'center' }"
             border
-            style="width: 100%" v-show='this.departmentId===1 ||this.departmentId===2'>
-        <el-table-column
-            prop="name"
-            label="部门名称"
-            min-width="100%">
-        </el-table-column>
+            style="width: 100%"
+            v-show="this.departmentId === 1 || this.departmentId === 2"
+          >
+            <el-table-column prop="name" label="部门名称" min-width="100%">
+            </el-table-column>
             <el-table-column label="组件">
-              <el-table-column
-                  prop="znsf"
-                  label="智能算法"
-                  min-width="100%">
+              <el-table-column prop="znsf" label="智能算法" min-width="100%">
+              </el-table-column>
+              <el-table-column prop="tcfw" label="图层服务" min-width="100%">
               </el-table-column>
               <el-table-column
-                  prop="tcfw"
-                  label="图层服务"
-                  min-width="100%">
+                prop="kfzj"
+                label="通用开发组件"
+                min-width="100%"
+              >
               </el-table-column>
               <el-table-column
-                    prop="kfzj"
-                    label="通用开发组件"
-                    min-width="100%">
-                </el-table-column>
-              <el-table-column
-                      prop="ywzj"
-                      label="业务能力组件"
-                      min-width="100%">
+                prop="ywzj"
+                label="业务能力组件"
+                min-width="100%"
+              >
+              </el-table-column>
             </el-table-column>
+            <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column
-                prop="yyzy"
-                label="应用资源"
-                min-width="100%">
+            <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
-            <el-table-column
-                prop="zj"
-                label="总计"
-                min-width="100%">
+          </el-table>
+          <!--明细表-->
+
+          <el-table
+            :data="tableData"
+            style="width: 100%"
+            v-show="this.departmentId === 3 || this.departmentId === 4"
+          >
+            <el-table-column prop="deptName" label="部门" width="180">
             </el-table-column>
-         </el-table>
-        <!--明细表-->
-        
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      v-show='this.departmentId===3 ||this.departmentId===4'
-      >
-      <el-table-column
-        prop="deptName"
-        label="部门"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="resourceName"
-        label="资源名称"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="type"
-        label="类型">
-      </el-table-column>
-      <el-table-column
-        prop="createDate"
-        label="日期">
-      </el-table-column>
-      <el-table-column
-        prop="approveStatus"
-        label="状态">
-      </el-table-column>
-    </el-table>
-    <div class="block">
-    <el-pagination
-      @current-change="handleCurrentChange"
-      layout="total, prev, pager, next, jumper"
-      :total="total"
-      :page-size="5"
-      :current-page="currentPage"
-      >
-    </el-pagination>
+            <el-table-column prop="resourceName" label="资源名称" width="180">
+            </el-table-column>
+            <el-table-column prop="type" label="类型"> </el-table-column>
+            <el-table-column prop="createDate" label="日期"> </el-table-column>
+            <el-table-column prop="approveStatus" label="状态">
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination
+              @current-change="handleCurrentChange"
+              layout="total, prev, pager, next, jumper"
+              :total="total"
+              :page-size="5"
+              :current-page="currentPage"
+            >
+            </el-pagination>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <component-used
+      v-if="UsedIsShow"
+      :tableId="tableId"
+      :fatherId="fatherId"
+      @closeChild2="closeChild2"
+    ></component-used>
+    <component-services
+      v-if="servicesIsShow"
+      :tableId="tableId"
+      :fatherId="fatherId"
+      @closeChild="closeChild"
+    ></component-services>
+    <application-resources
+      v-if="resourcesIsShow"
+      :tableId="tableId"
+      :fatherId="fatherId"
+      @closeApplication="closeApplication"
+    ></application-resources>
   </div>
-    </div>
-  </el-card>
-    </div>
-   <component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild2='closeChild2'></component-used>
-   <component-services v-if='servicesIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-services>
-   <application-resources  v-if='resourcesIsShow'  :tableId='tableId' :fatherId='fatherId' @closeApplication='closeApplication'></application-resources>
-</div>
 </template>
 <script>
 import componentServices from './componentServices.vue'
@@ -224,41 +229,63 @@ export default {
       inputTxt: '',
       tableId: '',
       fatherId: '',
-      treeData: [{
-        label: '一级 1',
-        children: [{
-          label: '二级 1-1',
-          children: [{
-            label: '三级 1-1-1'
-          }]
-        }]
-      }, {
-        label: '一级 2',
-        children: [{
-          label: '二级 2-1',
-          children: [{
-            label: '三级 2-1-1'
-          }]
-        }, {
-          label: '二级 2-2',
-          children: [{
-            label: '三级 2-2-1'
-          }]
-        }]
-      }, {
-        label: '一级 3',
-        children: [{
-          label: '二级 3-1',
-          children: [{
-            label: '三级 3-1-1'
-          }]
-        }, {
-          label: '二级 3-2',
-          children: [{
-            label: '三级 3-2-1'
-          }]
-        }]
-      }],
+      treeData: [
+        {
+          label: '一级 1',
+          children: [
+            {
+              label: '二级 1-1',
+              children: [
+                {
+                  label: '三级 1-1-1'
+                }
+              ]
+            }
+          ]
+        },
+        {
+          label: '一级 2',
+          children: [
+            {
+              label: '二级 2-1',
+              children: [
+                {
+                  label: '三级 2-1-1'
+                }
+              ]
+            },
+            {
+              label: '二级 2-2',
+              children: [
+                {
+                  label: '三级 2-2-1'
+                }
+              ]
+            }
+          ]
+        },
+        {
+          label: '一级 3',
+          children: [
+            {
+              label: '二级 3-1',
+              children: [
+                {
+                  label: '三级 3-1-1'
+                }
+              ]
+            },
+            {
+              label: '二级 3-2',
+              children: [
+                {
+                  label: '三级 3-2-1'
+                }
+              ]
+            }
+          ]
+        }
+      ],
       total: null,
       defaultProps: {
         children: 'children',
@@ -272,45 +299,58 @@ export default {
       resourcesIsShow: false,
       UsedIsShow: false,
       titleList: [
-        { name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, { name: '数据资源', key: 3 }, { name: '知识库', key: 3 }
+        { name: '组件服务', key: 1 },
+        { name: '应用资源', key: 2 },
+        { name: '基础设施', key: 3 },
+        { name: '数据资源', key: 3 },
+        { name: '知识库', key: 3 }
       ],
       tableData: [{ deptName: '部门', resourceNum: 222 }],
-      tableData2: [{ approveStatus: '', createDate: '' ,deptName:'',resourceName:'',type:''}],
-        examineStatus: '0',//审核状态
-       value1:[],//起始时间
-       abilityDepartment:"",//部门
-       abilityType:"",//能力
-       beginTime: '',//开始时间
-       endTime: '',//结束时间
-       typeOptions:[
+      tableData2: [
+        {
+          approveStatus: '',
+          createDate: '',
+          deptName: '',
+          resourceName: '',
+          type: ''
+        }
+      ],
+      examineStatus: '0', // 审核状态
+      value1: [], // 起始时间
+      abilityDepartment: '', // 部门
+      abilityType: '', // 能力
+      beginTime: '', // 开始时间
+      endTime: '', // 结束时间
+      typeOptions: [
         { name: '智能算法', value: 1 },
-        { name: '图层服务', value: 2 }, 
-        { name: '通用开发组件', value: 3 }, 
-        { name: '页面开发组件', value: 4 }, 
-        { name: '应用资源', value: 5 }],//类型备选列表
-        detailFlag:true,//明细返回按钮显示标志位
-        startDate:"",//开始时间
-        endDate:"" // 结束时间
+        { name: '图层服务', value: 2 },
+        { name: '通用开发组件', value: 3 },
+        { name: '页面开发组件', value: 4 },
+        { name: '应用资源', value: 5 }
+      ], // 类型备选列表
+      detailFlag: true, // 明细返回按钮显示标志位
+      startDate: '', // 开始时间
+      endDate: '' // 结束时间
     }
   },
   created () {
- //当前设定的日期时间
-      let d = new Date
-      let year1,month1,day1;
-      [year1,month1,day1] = [d.getFullYear(),d.getMonth(),d.getDate()]
-      let date1 = new Date(year1, month1, day1,7)
-      this.value1.push(date1)
-      //前一天设定的日期时间
-      let year2,month2,day2
-      d.setTime(d.getTime()-24*60*60*1000);
-      [year2,month2,day2] = [d.getFullYear(),d.getMonth(),d.getDate()]
-      let date2 = new Date(year2,month2,day2,7)
-      this.value1.unshift(date2)
+    // 当前设定的日期时间
+    const d = new Date()
+    let year1, month1, day1
+    ;[year1, month1, day1] = [d.getFullYear(), d.getMonth(), d.getDate()]
+    const date1 = new Date(year1, month1, day1, 7)
+    this.value1.push(date1)
+    // 前一天设定的日期时间
+    let year2, month2, day2
+    d.setTime(d.getTime() - 24 * 60 * 60 * 1000)
+    ;[year2, month2, day2] = [d.getFullYear(), d.getMonth(), d.getDate()]
+    const date2 = new Date(year2, month2, day2, 7)
+    this.value1.unshift(date2)
   },
   mounted () {
     this.getFirstTree()
   },
-     computed: {
+  computed: {
     ...mapState(['departmentSelects'])
   },
   methods: {
@@ -332,16 +372,18 @@ export default {
       }
     },
     getTreeName (data) {
-      this.$http.get('/census/center/v3/treeList/', {
-        params: {
-          keywords: data.name,
-          deptId: '1067246875800000066'
-          // pageNo: pageNo || 1,
-          // pageSize: 20
-        }
-      }).then(res => {
-        this.tableData = res.data.data
-      })
+      this.$http
+        .get('/census/center/v3/treeList/', {
+          params: {
+            keywords: data.name,
+            deptId: '1067246875800000066'
+            // pageNo: pageNo || 1,
+            // pageSize: 20
+          }
+        })
+        .then((res) => {
+          this.tableData = res.data.data
+        })
     },
     //  // 获取部门列表
     //     getALLTree () {
@@ -360,157 +402,196 @@ export default {
 
     // 组件服务部门发布情况--改为能力上架统计
     getFirstTree (page) {
-      this.$http.get('/census/center/selectDeptDetailTypeCountList/', {
-        params: {
-          page: page || 1,
-          limit: 5,
-          approveStatus: this.examineStatus,
-          deptId: this.abilityDepartment,
-          params: '',
-          startDate:this.startDate,
-          endDate:this.endDate
-        }
-      }).then(res => {
-        let result= res.data.data
-        for(let i=0;i<result.length;i++){
-               if(!result[i].hasOwnProperty('yyzy') ){
-                 result[i].yyzy= 0
-               }
-          if(!result[i].hasOwnProperty('kfzj') ){
-            result[i].kfzj= 0
+      this.$http
+        .get('/census/center/selectDeptDetailTypeCountList/', {
+          params: {
+            page: page || 1,
+            limit: 5,
+            approveStatus: this.examineStatus,
+            deptId: this.abilityDepartment,
+            params: '',
+            startDate: this.startDate,
+            endDate: this.endDate
           }
-          if(!result[i].hasOwnProperty('znsf') ){
-            result[i].znsf= 0
+        })
+        .then((res) => {
+          const result = res.data.data
+          for (let i = 0; i < result.length; i++) {
+            if (!result[i].hasOwnProperty('yyzy')) {
+              result[i].yyzy = 0
+            }
+            if (!result[i].hasOwnProperty('kfzj')) {
+              result[i].kfzj = 0
+            }
+            if (!result[i].hasOwnProperty('znsf')) {
+              result[i].znsf = 0
+            }
+            if (!result[i].hasOwnProperty('tcfw')) {
+              result[i].tcfw = 0
+            }
+            if (!result[i].hasOwnProperty('ywzj')) {
+              result[i].ywzj = 0
+            }
+            result[i].zj =
+              parseInt(result[i].yyzy) +
+              parseInt(result[i].kfzj) +
+              parseInt(result[i].znsf) +
+              parseInt(result[i].ywzj) +
+              parseInt(result[i].tcfw)
           }
-          if(!result[i].hasOwnProperty('tcfw') ){
-            result[i].tcfw= 0
-          }
-          if(!result[i].hasOwnProperty('ywzj') ){
-            result[i].ywzj= 0
-          }
-          result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
-        }
-        this.tableData = res.data.data
-        this.total = res.data.data.total
-      })
+          this.tableData = res.data.data
+          this.total = res.data.data.total
+        })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
     getSecondTree () {
-      this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
-        params: {
-         // page: page || 1,
-          limit: 5,
-          approveStatus:this.examineStatus,
-          deptId: this.abilityDepartment,
-          params: '',
-          startDate:this.startDate,
-          endDate:this.endDate
-        }
-      }).then(res => {
-        let result= res.data.data
-        for(let i=0;i<result.length;i++){
-          if(!result[i].hasOwnProperty('yyzy') ){
-            result[i].yyzy= 0
+      this.$http
+        .get('/census/center/selectApplyDeptDetailTypeCountList', {
+          params: {
+            // page: page || 1,
+            // limit: 5,
+            approveStatus: this.examineStatus,
+            deptId: this.abilityDepartment,
+            params: '',
+            startDate: this.startDate,
+            endDate: this.endDate
           }
-          if(!result[i].hasOwnProperty('kfzj') ){
-            result[i].kfzj= 0
+        })
+        .then((res) => {
+          const result = res.data.data
+          for (let i = 0; i < result.length; i++) {
+            if (!result[i].hasOwnProperty('yyzy')) {
+              result[i].yyzy = 0
+            }
+            if (!result[i].hasOwnProperty('kfzj')) {
+              result[i].kfzj = 0
+            }
+            if (!result[i].hasOwnProperty('znsf')) {
+              result[i].znsf = 0
+            }
+            if (!result[i].hasOwnProperty('tcfw')) {
+              result[i].tcfw = 0
+            }
+            if (!result[i].hasOwnProperty('ywzj')) {
+              result[i].ywzj = 0
+            }
+            result[i].zj =
+              parseInt(result[i].yyzy) +
+              parseInt(result[i].kfzj) +
+              parseInt(result[i].znsf) +
+              parseInt(result[i].ywzj) +
+              parseInt(result[i].tcfw)
           }
-          if(!result[i].hasOwnProperty('znsf') ){
-            result[i].znsf= 0
-          }
-          if(!result[i].hasOwnProperty('tcfw') ){
-            result[i].tcfw= 0
-          }
-          if(!result[i].hasOwnProperty('ywzj') ){
-            result[i].ywzj= 0
-          }
-          result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
-        }
-        this.tableData = res.data.data
-        this.total = res.data.data.total
-      })
+          this.tableData = res.data.data
+          this.total = res.data.data.total
+        })
     },
     // 能力上架明细
     getOneDetail (page) {
-      this.$http.get('/census/center/selectCensusResourceTable/', {
-        params: {
-          limit: 5,
-         // page: page || 1,
-          approveStatus: this.examineStatus,
-          deptId: this.abilityDepartment,
-          params: '',
-          startDate:this.startDate,
-          endDate:this.endDate
-        }
-      }).then(res => {
-        console.log('111111',this.tableData,res.data.data)
-        this.tableData = res.data.data
-        this.total = res.data.data.total
-      })
+      var passAndReview = '' // 转变"审核完成"字段为通过
+      if (this.examineStatus === '审核完成') {
+        passAndReview = '通过'
+      } else {
+        passAndReview = this.examineStatus
+      }
+      this.$http
+        .get('/census/center/selectCensusResourceTable', {
+          params: {
+            // limit: 5,
+            // page: page || 1,
+            approveStatus: passAndReview,
+            deptId: this.abilityDepartment,
+            type: '',
+            startDate: this.startDate,
+            endDate: this.endDate
+          }
+        })
+        .then((res) => {
+          console.log('111111', this.tableData, res.data.data)
+          this.tableData = res.data.data
+          this.total = res.data.data.total
+        })
     },
     // 能力使用明细
     getTwoDetail (page) {
-      this.$http.get('/census/center/selectCensusApplyTable/', {
-        params: {
-          limit: 5,
-          // page: page || 1,
-          approveStatus: this.examineStatus,
-          deptId: this.abilityDepartment,
-          params: '',
-          startDate:this.startDate,
-          endDate:this.endDate
-        }
-      }).then(res => {
-        this.tableData = res.data.data
-        this.total = res.data.data.total
-      })
+      var passAndReview = '' // 转变"审核完成"字段为通过
+      if (this.examineStatus === '审核完成') {
+        passAndReview = '通过'
+      } else {
+        passAndReview = this.examineStatus
+      }
+      this.$http
+        .get('/census/center/selectCensusApplyTable', {
+          params: {
+            // limit: 5,
+            // page: page || 1,
+            approveStatus: this.examineStatus,
+            deptId: this.abilityDepartment,
+            type: '',
+            startDate: this.startDate,
+            endDate: this.endDate
+          }
+        })
+        .then((res) => {
+          this.tableData = res.data.data
+          this.total = res.data.data.total
+        })
     },
     getReleaseTree (page) {
-      this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
-        params: {
-          limit: 5,
-          // page: page || 1,
-          approveStatus: '',
-          deptId: '',
-          params: '',
-          startDate: ''
-        }
-      }).then(res => {
-        let result= res.data.data
-        for(let i=0;i<result.length;i++){
-          if(!result[i].hasOwnProperty('yyzy') ){
-            result[i].yyzy= 0
+      this.$http
+        .get('/census/center/selectApplyDeptDetailTypeCountList/', {
+          params: {
+            limit: 5,
+            // page: page || 1,
+            approveStatus: '',
+            deptId: '',
+            params: '',
+            startDate: ''
           }
-          if(!result[i].hasOwnProperty('kfzj') ){
-            result[i].kfzj= 0
+        })
+        .then((res) => {
+          const result = res.data.data
+          for (let i = 0; i < result.length; i++) {
+            if (!result[i].hasOwnProperty('yyzy')) {
+              result[i].yyzy = 0
+            }
+            if (!result[i].hasOwnProperty('kfzj')) {
+              result[i].kfzj = 0
+            }
+            if (!result[i].hasOwnProperty('znsf')) {
+              result[i].znsf = 0
+            }
+            if (!result[i].hasOwnProperty('tcfw')) {
+              result[i].tcfw = 0
+            }
+            if (!result[i].hasOwnProperty('ywzj')) {
+              result[i].ywzj = 0
+            }
+            result[i].zj =
+              parseInt(result[i].yyzy) +
+              parseInt(result[i].kfzj) +
+              parseInt(result[i].znsf) +
+              parseInt(result[i].ywzj) +
+              parseInt(result[i].tcfw)
           }
-          if(!result[i].hasOwnProperty('znsf') ){
-            result[i].znsf= 0
-          }
-          if(!result[i].hasOwnProperty('tcfw') ){
-            result[i].tcfw= 0
-          }
-          if(!result[i].hasOwnProperty('ywzj') ){
-            result[i].ywzj= 0
-          }
-          result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
-        }
-        this.tableData = res.data.data
-        this.total = res.data.data.total
-      })
+          this.tableData = res.data.data
+          this.total = res.data.data.total
+        })
     },
     // 应用资源部门使用情况列表
     getUsedTree () {
-      this.$http.get('/census/center/v3/resourceReleaseDetails/', {
-        params: {
-          limit: 5,
-          page: 1,
-          // id:'1067246875800000066',
-          resourceType: '应用资源'
-        }
-      }).then(res => {
-        this.tableData = res.data.data.list
-      })
+      this.$http
+        .get('/census/center/v3/resourceReleaseDetails/', {
+          params: {
+            limit: 5,
+            page: 1,
+            // id:'1067246875800000066',
+            resourceType: '应用资源'
+          }
+        })
+        .then((res) => {
+          this.tableData = res.data.data.list
+        })
     },
     handleClick (row) {
       if (this.choseId === 0) {
@@ -553,34 +634,33 @@ export default {
       this.departmentId = index
       if (index === 1) {
         if (this.choseId === 0) {
-          if(!this.detailFlag){
-            this.detailFlag = !this.detailFlag;
+          if (!this.detailFlag) {
+            this.detailFlag = !this.detailFlag
           }
           this.getFirstTree()
         } else if (this.choseId === 1) {
-          //this.getReleaseTree()
+          // this.getReleaseTree()
         }
       } else if (index === 2) {
         if (this.choseId === 0) {
-          if(!this.detailFlag){
-            this.detailFlag = !this.detailFlag;
+          if (!this.detailFlag) {
+            this.detailFlag = !this.detailFlag
           }
           this.getSecondTree()
         } else {
-          //this.getUsedTree()
+          // this.getUsedTree()
         }
-      }
-      else if (index === 3) {
+      } else if (index === 3) {
         if (this.choseId === 0) {
           this.getOneDetail()
         } else {
-          //this.getUsedTree()
+          // this.getUsedTree()
         }
-      }  else if (index === 4) {
+      } else if (index === 4) {
         if (this.choseId === 0) {
           this.getTwoDetail()
         } else {
-         // this.getUsedTree()
+          // this.getUsedTree()
         }
       }
     },
@@ -603,117 +683,113 @@ export default {
       this.resourcesIsShow = false
       this.handleCurrentChange(1)
     },
-    //明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
-    goToDetail(){
-      this.detailFlag = !this.detailFlag;
-      if(this.departmentId===1){
-       this.handleChose(3);
-       //this.departmentId = 1;
-      }else if(this.departmentId===2){
-       this.handleChose(4);
-       //this.departmentId = 2;
-      }else{
-
+    // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
+    goToDetail () {
+      this.detailFlag = !this.detailFlag
+      if (this.departmentId === 1) {
+        this.handleChose(3)
+        // this.departmentId = 1;
+      } else if (this.departmentId === 2) {
+        this.handleChose(4)
+        // this.departmentId = 2;
+      } else {
       }
     },
-    //返回按钮
-    goToBack(){
-      //departmentId 1，3  2，4 两个值共同判断
-      this.detailFlag = !this.detailFlag;
-      if(this.departmentId===3){
-       this.handleChose(1);
-       //this.departmentId = 1;
-      }else if(this.departmentId===4){
-       this.handleChose(2);
-       //this.departmentId = 2;
-      }else{
-
+    // 返回按钮
+    goToBack () {
+      // departmentId 1，3  2，4 两个值共同判断
+      this.detailFlag = !this.detailFlag
+      if (this.departmentId === 3) {
+        this.handleChose(1)
+        // this.departmentId = 1;
+      } else if (this.departmentId === 4) {
+        this.handleChose(2)
+        // this.departmentId = 2;
+      } else {
       }
     },
-    //点击查询按钮查询数据
-    getDataList(){
-      if(this.value1.length >0){
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss');
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss');
+    // 点击查询按钮查询数据
+    getDataList () {
+      if (this.value1.length > 0) {
+        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
+        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
       }
-      if(this.examineStatus == 0){
-        this.examineStatus = "审核中";
-      }else{
-          this.examineStatus = "审核完成";
+      if (this.examineStatus == 0) {
+        this.examineStatus = '审核中'
+      } else {
+        this.examineStatus = '审核完成'
       }
 
-      if( this.abilityDepartment){
+      if (this.abilityDepartment) {
         this.abilityDepartment = this.abilityDepartment
       } else {
-        this.abilityDepartment = "全部";
+        this.abilityDepartment = ''
       }
 
-      if(this.abilityType){
-       this.abilityType = this.abilityType;
+      if (this.abilityType) {
+        this.abilityType = this.abilityType
       } else {
-        this.abilityType = "全部";
+        this.abilityType = ''
       }
-      console.log('查询参数开始时间1',this.startDate);
-      console.log('查询参数结束时间2',this.endDate);
-      console.log('查询参数审核状态',this.examineStatus);
-      console.log('查询参数部门',this.abilityDepartment);
-      console.log('查询参数类型',this.abilityType);
-      if(this.departmentId===1){
-        if(this.detailFlag){
-          this.handleChose(3);
-          this.detailFlag = !this.detailFlag;
-        }else {
-          this.handleChose(1);
-          this.detailFlag = !this.detailFlag;
+      console.log('查询参数开始时间1', this.startDate)
+      console.log('查询参数结束时间2', this.endDate)
+      console.log('查询参数审核状态', this.examineStatus)
+      console.log('查询参数部门', this.abilityDepartment)
+      console.log('查询参数类型', this.abilityType)
+      if (this.departmentId === 1) {
+        if (this.detailFlag) {
+          this.handleChose(3)
+          this.detailFlag = !this.detailFlag
+        } else {
+          this.handleChose(1)
+          this.detailFlag = !this.detailFlag
         }
-       //this.departmentId = 1;
-      }else if(this.departmentId===2){
-        if(this.detailFlag){
-           this.handleChose(4);
-           this.detailFlag = !this.detailFlag;
-        }else {
-           this.handleChose(2);
-           this.detailFlag = !this.detailFlag;
+        // this.departmentId = 1;
+      } else if (this.departmentId === 2) {
+        if (this.detailFlag) {
+          this.handleChose(4)
+          this.detailFlag = !this.detailFlag
+        } else {
+          this.handleChose(2)
+          this.detailFlag = !this.detailFlag
         }
-      } else if(this.departmentId===3){
-           this.handleChose(3);
-       } else {
-           this.handleChose(4);
-       }
-    
+      } else if (this.departmentId === 3) {
+        this.handleChose(3)
+      } else {
+        this.handleChose(4)
+      }
     },
-    //重置按钮查询数据
-    resetDataList(){
-      this.startDate = "";
-      this.endDate="";
-      this.examineStatus = "审核中";
-      this.abilityDepartment = "全部";
-      this.abilityType ="全部";
-       if(this.departmentId===1){
-        if(this.detailFlag){
-          this.handleChose(3);
-          this.detailFlag = !this.detailFlag;
-        }else {
-          this.handleChose(1);
-          this.detailFlag = !this.detailFlag;
+    // 重置按钮查询数据
+    resetDataList () {
+      this.startDate = ''
+      this.endDate = ''
+      this.examineStatus = '审核中'
+      this.abilityDepartment = ''
+      this.abilityType = ''
+      if (this.departmentId === 1) {
+        if (this.detailFlag) {
+          this.handleChose(3)
+          this.detailFlag = !this.detailFlag
+        } else {
+          this.handleChose(1)
+          this.detailFlag = !this.detailFlag
         }
-       //this.departmentId = 1;
-      }else if(this.departmentId===2){
-        if(this.detailFlag){
-           this.handleChose(4);
-           this.detailFlag = !this.detailFlag;
-        }else {
-           this.handleChose(2);
-           this.detailFlag = !this.detailFlag;
+        // this.departmentId = 1;
+      } else if (this.departmentId === 2) {
+        if (this.detailFlag) {
+          this.handleChose(4)
+          this.detailFlag = !this.detailFlag
+        } else {
+          this.handleChose(2)
+          this.detailFlag = !this.detailFlag
         }
-      }else if(this.departmentId===3){
-           this.handleChose(3);
-       } else {
-           this.handleChose(4);
-       }
-     
+      } else if (this.departmentId === 3) {
+        this.handleChose(3)
+      } else {
+        this.handleChose(4)
+      }
     },
-     // 定义格式化函数：
+    // 定义格式化函数：
     handleTime (time, format) {
       if (time == null || time == undefined || time == '') {
         return ''
@@ -746,7 +822,6 @@ export default {
       })
     }
   }
-
 }
 </script>
 <style lang="scss" scoped>
@@ -843,8 +918,8 @@ input::placeholder {
   font-size: 14px;
   color: #979eb9;
   cursor: pointer;
-  .detail-button{
-   width: 60px;
+  .detail-button {
+    width: 60px;
     height: 30px;
     right: 60px;
     background-color: #0058e1;
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index de1ed9f5..0ecee247 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -2,46 +2,71 @@
   <div class="capability-convergence">
     <div class="main">
       <div class="top">
-        能力汇聚
+        能力分类
         <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)">
+          <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)">
+          <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" v-for="(item, index) in jcList" :key="item.name" :class="index == 2 ? 'name-last' : ''"
-            @click="selectOne2(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in jcList"
+            :key="item.name"
+            :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in sjList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)">
+          <div
+            class="name"
+            v-for="(item, index) in zsList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -51,390 +76,394 @@
   </div>
 </template>
 <script setup>
-import {
-  pageWithAttrs,
-  getDataResource,
-  selectInfrastructureList,
-} from '@/api/home.js'
-import { ref, reactive } from 'vue'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
-import { message, Upload } from 'ant-design-vue'
-import mybus from '@/myplugins/mybus'
-const store = useStore()
-const router = useRouter()
-const zjList = ref([])
-const jcList = ref([])
-const sjList = ref([])
-const yyList = ref([])
-// 知识库模块数据
-const zsList = 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 降序
-}
-console.log('dataShowdev==========================>', whoShow)
-// eslint-disable-next-line no-undef
-const whoShow1 = ref(whoShow)
-const interfaceSuccess = ref(0)
-const object = reactive({
-  yyNum: '',
-  zjNum: '',
-  jcNum: '',
-  sjNum: '',
-  zsNum: '',
-})
-const getAppResources = (type, obj) => {
-  paramsGetResources.type = type
-  if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
-    getDataResource({
-      serviceName: paramsGetResources.name || '', //资源名称
-      orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
-      orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-      pageNum: paramsGetResources.pageNum, //页码
-      pageSize: paramsGetResources.pageSize, //分页大小
-    }).then((res) => {
-      console.log('数据资源==================>', res.data.data)
-      if (whoShow1.value.itShowQingDao) {
-        res.data.data.data.forEach((val) => {
-          val.id = val.guid // id
-          val.name = val.zyname // 名字
-          val.sjlCount = val.sjcczl // 数据量
-          val.applyCount = val.syqk // 申请量
-          val.deptName = val.TGBM // 部门
-          val.createDate = val.fbrq // 发布时间
-          val.description = val.xgxt // 描述
-        })
-        obj.value = res.data.data.data || []
-        object.sjNum = res.data.data.rows
-        // interfaceSuccess.value++
-        // if (interfaceSuccess.value == 5) {
-        //   mybus.emit('chagneNum', object)
-        // }
-      } else if (whoShow1.value.itShowXiHaiAn) {
-        res.data.data.list.forEach((val) => {
-          val.id = val.serviceId // id
-          val.name = val.serviceName // 名字
-          val.sjlCount = val.requestQuantity // 数据量
-          val.applyCount = val.requestCount // 申请量
-          val.deptName = val.departmentName // 部门
-          val.createTime = val.createTime.split('.')[0]
-          val.createDate = val.createTime // 发布时间
-        })
-        obj.value = res.data.data.list || []
-        object.sjNum = res.data.data.total
-        // interfaceSuccess.value++
-        // if (interfaceSuccess.value == 5) {
-        //   mybus.emit('chagneNum', object)
-        // }
-      }
-    })
-  } else {
-    let type = paramsGetResources.type
-    if (type == '基础设施') {
-      jcList.value = []
-      selectInfrastructureList().then((res) => {
-        console.log('基础设施==========>', res.data.data)
-        for (const key in res.data.data) {
-          if (whoShow1.value.itShowXiHaiAn) {
-            if (key === '视频资源') {
+  import {
+    pageWithAttrs,
+    getDataResource,
+    selectInfrastructureList,
+  } from '@/api/home.js'
+  import { ref, reactive } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+  import { message, Upload } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
+  const store = useStore()
+  const router = useRouter()
+  const zjList = ref([])
+  const jcList = ref([])
+  const sjList = ref([])
+  const yyList = ref([])
+  // 知识库模块数据
+  const zsList = 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 降序
+  }
+  console.log('dataShowdev==========================>', whoShow)
+  // eslint-disable-next-line no-undef
+  const whoShow1 = ref(whoShow)
+  const interfaceSuccess = ref(0)
+  const object = reactive({
+    yyNum: '',
+    zjNum: '',
+    jcNum: '',
+    sjNum: '',
+    zsNum: '',
+  })
+  const getAppResources = (type, obj) => {
+    paramsGetResources.type = type
+    if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
+      getDataResource({
+        serviceName: paramsGetResources.name || '', //资源名称
+        orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
+        orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+        pageNum: paramsGetResources.pageNum, //页码
+        pageSize: paramsGetResources.pageSize, //分页大小
+      }).then((res) => {
+        console.log('数据资源==================>', res.data.data)
+        if (whoShow1.value.itShowQingDao) {
+          res.data.data.data.forEach((val) => {
+            val.id = val.guid // id
+            val.name = val.zyname // 名字
+            val.sjlCount = val.sjcczl // 数据量
+            val.applyCount = val.syqk // 申请量
+            val.deptName = val.TGBM // 部门
+            val.createDate = val.fbrq // 发布时间
+            val.description = val.xgxt // 描述
+          })
+          obj.value = res.data.data.data || []
+          object.sjNum = res.data.data.rows
+          // interfaceSuccess.value++
+          // if (interfaceSuccess.value == 5) {
+          //   mybus.emit('chagneNum', object)
+          // }
+        } else if (whoShow1.value.itShowXiHaiAn) {
+          res.data.data.list.forEach((val) => {
+            val.id = val.serviceId // id
+            val.name = val.serviceName // 名字
+            val.sjlCount = val.requestQuantity // 数据量
+            val.applyCount = val.requestCount // 申请量
+            val.deptName = val.departmentName // 部门
+            val.createTime = val.createTime.split('.')[0]
+            val.createDate = val.createTime // 发布时间
+          })
+          obj.value = res.data.data.list || []
+          object.sjNum = res.data.data.total
+          // interfaceSuccess.value++
+          // if (interfaceSuccess.value == 5) {
+          //   mybus.emit('chagneNum', object)
+          // }
+        }
+      })
+    } else {
+      let type = paramsGetResources.type
+      if (type == '基础设施') {
+        jcList.value = []
+        selectInfrastructureList().then((res) => {
+          console.log('基础设施==========>', res.data.data)
+          for (const key in res.data.data) {
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (key === '视频资源') {
+                jcList.value.push({
+                  name: key,
+                  num: res.data.data[key],
+                })
+              }
+            } else {
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
               })
             }
-          } else {
-            jcList.value.push({
-              name: key,
-              num: res.data.data[key],
-            })
           }
-        }
-        // 西海岸-单兵设备、无人机 获取数量
-        if (whoShow1.value.itShowXiHaiAn) {
-          getSoldierData('无人机').then(res => {
-            let { total = 0 } = res.data.data;
-            jcList.value.push({
-              name: '无人机',
-              num: total,
-            })
-          }).catch(err => {
-            console.log('err--无人机---------->', err);
-
-          })
-          getSoldierData('单兵设备').then(res => {
-            let { total = 0 } = res.data.data;
-            jcList.value.push({
-              name: '单兵设备',
-              num: total,
-            })
-          }).catch(err => {
-            console.log('err--单兵设备---------->', err);
-
-          })
-        }
-      })
-    } else {
-      pageWithAttrs(paramsGetResources).then((res) => {
-        console.log('object个数======>', type)
-        obj.value = res.data.data.records
-        switch (type) {
-          case '组件服务':
-            assignmentMethod('zjNum', res)
-            break
-          case '应用资源':
-            assignmentMethod('yyNum', res)
-            break
-          case '基础设施':
-            assignmentMethod('jcNum', res)
-            break
-          case '知识库':
-            assignmentMethod('zsNum', res)
-            break
-        }
-      })
+          // 西海岸-单兵设备、无人机 获取数量
+          if (whoShow1.value.itShowXiHaiAn) {
+            getSoldierData('无人机')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                jcList.value.push({
+                  name: '无人机',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--无人机---------->', err)
+              })
+            getSoldierData('单兵设备')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                jcList.value.push({
+                  name: '单兵设备',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--单兵设备---------->', err)
+              })
+          }
+        })
+      } else {
+        pageWithAttrs(paramsGetResources).then((res) => {
+          console.log('object个数======>', type)
+          obj.value = res.data.data.records
+          switch (type) {
+            case '组件服务':
+              assignmentMethod('zjNum', res)
+              break
+            case '应用资源':
+              assignmentMethod('yyNum', res)
+              break
+            case '基础设施':
+              assignmentMethod('jcNum', res)
+              break
+            case '知识库':
+              assignmentMethod('zsNum', res)
+              break
+          }
+        })
+      }
     }
   }
-}
 
-// todo 获取无人机、单兵设备
-const getSoldierData = (name) => {
-  let _params = {
-    type: name,
-    page: 1,
-    limit: 10,
-  }
-  return new Promise((resolve, reject) => {
-    getSoldierList(_params).then(res => {
-      resolve(res)
-      console.log('res---获取无人机、单兵设备--------->', res);
-      if (res.data.code !== 0) {
-        return message.error(res.data.msg)
-      }
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
-
-const openHref = (item) => {
-  console.log(item.id, 'wowowo')
-  console.log(item.visits, 'wowowo')
-  browsingInsert({ resourceId: item.id }).then((res) => {
-    // console.log(res)
-  })
-  const arrList = ref([])
-  arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
-  if (arrList.value.indexOf(item.id) === -1) {
-    arrList.value.push(item.id)
-    updateVisits({
-      id: item.id,
-      visits: item.visits || '0',
-    }).then(() => {
-      window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
-    })
-  }
-  window.open(item.link)
-  // window.open(
-  //   window.SITE_CONFIG.previewUrl +
-  //     'hisense_office/onlinePreview?url=' +
-  //     btoa(encodeURI(item.fileHref))
-  // )
-}
-const assignmentMethod = (type, res) => {
-  object[type] = res.data.data.total
-  // interfaceSuccess.value++
-  // console.log('object个数======>', object, interfaceSuccess.value, type)
-  // if (interfaceSuccess.value >= 4) {
-  //   mybus.emit('chagneNum', object)
-  // }
-}
-getAppResources('组件服务', zjList)
-getAppResources('应用资源', yyList)
-getAppResources('基础设施', jcList)
-getAppResources('数据资源', sjList)
-getAppResources('知识库', zsList)
-
-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,
-    },
-  })
-}
-const selectOne2 = (name) => {
-  console.log('点击===============》', name)
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
+  // todo 获取无人机、单兵设备
+  const getSoldierData = (name) => {
+    let _params = {
       type: name,
-      select: '基础设施',
-    },
-  })
-}
-const selectOne3 = (name) => {
-  console.log('点击===============》', name)
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      str: name,
-      select: '数据资源',
-    },
-  })
-}
+      page: 1,
+      limit: 10,
+    }
+    return new Promise((resolve, reject) => {
+      getSoldierList(_params)
+        .then((res) => {
+          resolve(res)
+          console.log('res---获取无人机、单兵设备--------->', res)
+          if (res.data.code !== 0) {
+            return message.error(res.data.msg)
+          }
+        })
+        .catch((err) => {
+          reject(err)
+        })
+    })
+  }
+
+  const openHref = (item) => {
+    console.log(item.id, 'wowowo')
+    console.log(item.visits, 'wowowo')
+    browsingInsert({ resourceId: item.id }).then((res) => {
+      // console.log(res)
+    })
+    const arrList = ref([])
+    arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+    if (arrList.value.indexOf(item.id) === -1) {
+      arrList.value.push(item.id)
+      updateVisits({
+        id: item.id,
+        visits: item.visits || '0',
+      }).then(() => {
+        window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+      })
+    }
+    window.open(item.link)
+    // window.open(
+    //   window.SITE_CONFIG.previewUrl +
+    //     'hisense_office/onlinePreview?url=' +
+    //     btoa(encodeURI(item.fileHref))
+    // )
+  }
+  const assignmentMethod = (type, res) => {
+    object[type] = res.data.data.total
+    // interfaceSuccess.value++
+    // console.log('object个数======>', object, interfaceSuccess.value, type)
+    // if (interfaceSuccess.value >= 4) {
+    //   mybus.emit('chagneNum', object)
+    // }
+  }
+  getAppResources('组件服务', zjList)
+  getAppResources('应用资源', yyList)
+  getAppResources('基础设施', jcList)
+  getAppResources('数据资源', sjList)
+  getAppResources('知识库', zsList)
+
+  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,
+      },
+    })
+  }
+  const selectOne2 = (name) => {
+    console.log('点击===============》', name)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: name,
+        select: '基础设施',
+      },
+    })
+  }
+  const selectOne3 = (name) => {
+    console.log('点击===============》', name)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        str: name,
+        select: '数据资源',
+      },
+    })
+  }
 </script>
 <style lang="less" scoped>
-.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;
+  .capability-convergence {
+    height: 7.2rem;
+    background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
+    background-size: 100%;
     display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
+    justify-content: center;
 
-    .top {
-      font-size: 0.3rem;
-      color: #212121;
-      text-align: center;
+    .main {
+      width: 13rem;
+      margin-top: 1.8rem;
       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;
+      .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;
+        }
       }
-    }
 
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      margin-top: 0.4rem;
+      .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;
-        position: relative;
-
-        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;
-          word-break: break-all;
-        }
-
-        .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;
+        .item {
+          width: 2.44rem;
+          height: 3.91rem;
+          font-size: 0.16rem;
+          background-color: #fff;
           border-radius: 0.02rem;
-          text-align: center;
-          margin-top: 0.1rem;
-          margin-left: 0.85rem;
-          position: absolute;
-          bottom: 0.2rem;
+          box-shadow: 0 0.05rem 0.2rem #ccc;
+          position: relative;
+
+          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;
+            word-break: break-all;
+          }
+
+          .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;
+            position: absolute;
+            bottom: 0.2rem;
+          }
+
+          .btn:hover {
+            background: rgba(0, 88, 225, 0.3);
+            color: #000;
+          }
         }
 
-        .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/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index 2516ccef..c765c810 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -1,45 +1,60 @@
 <template>
   <div class="navigation2">
-    <div class="item" @click="jumpPage('组件服务')">
-      <div class="img zj"></div>
-      <div class="name">组件服务</div>
-      <div class="sl">
-        <span class="num">{{ zjNum || 0 }}</span>
-        个
+    <a-tooltip>
+      <template #title>点击进入组件服务</template>
+      <div class="item" @click="jumpPage('组件服务')">
+        <div class="img zj"></div>
+        <div class="name">组件服务</div>
+        <div class="sl">
+          <span class="num">{{ zjNum || 0 }}</span>
+          个
+        </div>
       </div>
-    </div>
-    <div class="item" @click="jumpPage('应用资源')">
-      <div class="img yy"></div>
-      <div class="name">应用资源</div>
-      <div class="sl">
-        <span class="num">{{ yyNum || 0 }}</span>
-        个
+    </a-tooltip>
+    <a-tooltip>
+      <template #title>点击进入应用资源</template>
+      <div class="item" @click="jumpPage('应用资源')">
+        <div class="img yy"></div>
+        <div class="name">应用资源</div>
+        <div class="sl">
+          <span class="num">{{ yyNum || 0 }}</span>
+          个
+        </div>
       </div>
-    </div>
-    <div class="item" @click="jumpPage('基础设施')">
-      <div class="img jc"></div>
-      <div class="name">基础设施</div>
-      <div class="sl">
-        <span class="num">{{ jcNum || 0 }}</span>
-        个
+    </a-tooltip>
+    <a-tooltip>
+      <template #title>点击进入基础设施</template>
+      <div class="item" @click="jumpPage('基础设施')">
+        <div class="img jc"></div>
+        <div class="name">基础设施</div>
+        <div class="sl">
+          <span class="num">{{ jcNum || 0 }}</span>
+          个
+        </div>
       </div>
-    </div>
-    <div class="item" @click="jumpPage('数据资源')">
-      <div class="img sj"></div>
-      <div class="name">数据资源</div>
-      <div class="sl">
-        <span class="num">{{ sjNum || 0 }}</span>
-        项
+    </a-tooltip>
+    <a-tooltip>
+      <template #title>点击进入数据资源</template>
+      <div class="item" @click="jumpPage('数据资源')">
+        <div class="img sj"></div>
+        <div class="name">数据资源</div>
+        <div class="sl">
+          <span class="num">{{ sjNum || 0 }}</span>
+          项
+        </div>
       </div>
-    </div>
-    <div class="item" @click="jumpPage('知识库')">
-      <div class="img zs"></div>
-      <div class="name">知识库</div>
-      <div class="sl">
-        <span class="num">{{ zsNum || 0 }}</span>
-        个
+    </a-tooltip>
+    <a-tooltip>
+      <template #title>点击进入知识库</template>
+      <div class="item" @click="jumpPage('知识库')">
+        <div class="img zs"></div>
+        <div class="name">知识库</div>
+        <div class="sl">
+          <span class="num">{{ zsNum || 0 }}</span>
+          个
+        </div>
       </div>
-    </div>
+    </a-tooltip>
   </div>
 </template>
 <script setup>
diff --git a/front/src/views/newHome/index.vue b/front/src/views/newHome/index.vue
index 3b524c7e..e1942b40 100644
--- a/front/src/views/newHome/index.vue
+++ b/front/src/views/newHome/index.vue
@@ -15,7 +15,7 @@
     <latest-capabilities></latest-capabilities>
     <resource-aggregation></resource-aggregation>
     <recommendation-ability></recommendation-ability>
-    <work-dynamics></work-dynamics>
+    <!-- <work-dynamics></work-dynamics> -->
     <home-footer></home-footer>
   </div>
 </template>