From 8f1658f2eb8e80189cc12ff994443abec7e36e6c Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 12 Oct 2022 17:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/config/basicConfig.js             |    7 +-
 .../views/modules/sys/menu-add-or-update.vue  |   13 +-
 front/public/static/config/basicConfig.js     |    4 +-
 .../components/ResourceAggregation.vue        | 1089 +++++-----
 .../home/components/searchResultList.vue      | 1846 +++++++++--------
 .../views/newHome/components/Navigation2.vue  |    8 +-
 .../newHome/components/PopularAbility.vue     |    6 +-
 7 files changed, 1555 insertions(+), 1418 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index fb5e785c..9608ff60 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-12 13:40:14
+ * @LastEditTime: 2022-10-12 15:25:01
  * @Description: 告诉大家这是什么
  */
 var _global = {}
@@ -11,7 +11,7 @@ var CONFIGITEM = {
   // version: 'xihaian', // 西海岸
   // version: 'test', // 测试
   // version: 'frp', // 内网穿透
-  version: 'dev', // 开发
+  version: 'xihaian', // 开发
   vNum: 'v0.8.7.2',
   configData: {
     // 青岛市大数据局
@@ -25,7 +25,8 @@ var CONFIGITEM = {
       previewUrl: 'http://10.134.135.9:9796/',
       // apiURL: 'http://10.134.135.9:8888/renren-admin',
       // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
-      apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
+      apiURL: 'http://192.168.124.236:8888/renren-admin',
+      // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
       websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
     },
     // 测试
diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue
index 4df7fa18..ed7ddd49 100644
--- a/back/src/views/modules/sys/menu-add-or-update.vue
+++ b/back/src/views/modules/sys/menu-add-or-update.vue
@@ -33,9 +33,13 @@
       <el-form-item prop="sort" :label="$t('menu.sort')">
         <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
       </el-form-item>
+      <!-- 授权标识 -->
       <el-form-item prop="permissions" :label="$t('menu.permissions')">
         <el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
       </el-form-item>
+      <el-form-item prop="site" label="站点标识">
+        <el-input v-model="dataForm.site" placeholder="请输入站点标识(1为共享门户,0为后台管理)"></el-input>
+      </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
         <el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
           <div class="mod-sys__menu-icon-inner">
@@ -77,6 +81,7 @@ export default {
         name: '',
         pid: '0',
         parentName: '',
+        site: 0,
         url: '',
         permissions: '',
         sort: 0,
@@ -98,14 +103,14 @@ export default {
   },
   watch: {
     'dataForm.type' (val) {
-      this.$refs['dataForm'].clearValidate()
+      this.$refs.dataForm.clearValidate()
     }
   },
   methods: {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
         this.iconList = getIconList()
         console.log('iconList', this.iconList)
         this.dataForm.parentName = this.$t('menu.parentNameDefault')
@@ -159,7 +164,7 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
         if (!valid) {
           return false
         }
@@ -178,7 +183,7 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
   }
 }
 </script>
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 5072b016..b67b249c 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -2,13 +2,13 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-11 10:46:03
+ * @LastEditTime: 2022-10-12 15:29:29
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  //version: 'xihaian', // 西海岸
+  // version: 'xihaian', // 西海岸
   version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   //version: 'test', // 测试
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 64c3021b..018e14a8 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -11,9 +11,12 @@
           <div v-for="item in dataList.dataList" :key="item.name">
             <div v-if="item.type !== '资源汇聚总量'" class="content-left">
               <div class="name">
-                <span class="name-photo" :style="{
-                  backgroundImage: `url(${item.photo}) `,
-                }"></span>
+                <span
+                  class="name-photo"
+                  :style="{
+                    backgroundImage: `url(${item.photo}) `,
+                  }"
+                ></span>
                 <span class="name-text">{{ item.type }}</span>
               </div>
               <div class="organization-value">
@@ -52,579 +55,591 @@
   </div>
 </template>
 <script setup>
-import { ref, onMounted, watch } from 'vue'
-import { selectTotal } from '@/api/home'
-import {
-  // numberOfResourcesByCategory,
-  sourceDepartmentStatistics,
-} from '@/api/abilityStatistics.js'
-// import { zywMessage } from '@/api/home'
-import * as echarts from 'echarts'
-import { message } from 'ant-design-vue'
-//各类资源汇聚量
-let dataList = ref({
-  title: '各类资源汇聚量',
-  dataList: [],
-})
-// let photo = ref([
-//   require('../../../assets/abilityStatistics/banner-jc.png'),
-//   require('../../../assets/abilityStatistics/banner-sj.png'),
-//   require('../../../assets/abilityStatistics/banner-zj.png'),
-//   require('../../../assets/abilityStatistics/banner-yy.png'),
-//   require('../../../assets/abilityStatistics/banner-zs.png'),
-// ])
-// let name = ref([])
-// 获取数据资源数据
-// const findZywMessage = () => {
-//   zywMessage().then((res) => {
-//     const { data } = res.data
-//     dataSourceNum.value = data.sxmlcount || 0
-//     snum()
-//   })
-// }
-//各类资源数目接口
-// function snum() {
-//   numberOfResourcesByCategory().then((res) => {
-//     dataList.value.dataList = res.data.data
-//     res.data.data.map((item, index) => {
-//       // if (dataList.value.dataList[index].type === '数据资源') {
-//       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
-//       // }
-//       dataList.value.dataList[index].organization = '个'
-//       dataList.value.dataList[index].photo = photo.value[index]
-//     })
-//   })
-// }
-selectTotal().then((res) => {
-  console.log('selectTotal===============>', res)
-  if(res.data.code !== 0) {
-    return message.error(res.data.msg)
-  }
-  let imgObj = {
-    '组件服务': require('../../../assets/abilityStatistics/banner-zj.png'),
-    '应用资源': require('../../../assets/abilityStatistics/banner-yy.png'),
-    '基础设施': require('../../../assets/abilityStatistics/banner-jc.png'),
-    '数据资源': require('../../../assets/abilityStatistics/banner-sj.png'),
-    '知识库': require('../../../assets/abilityStatistics/banner-zs.png'),
-  }
-  res.data.data.total.forEach((val) => {
-    let _obj = {
-      organization: '个',
-      type: val.type,
-      photo: val.type && imgObj[val.type],
-      amount: val.count,
+  import { ref, onMounted, watch } from 'vue'
+  import { selectTotal } from '@/api/home'
+  import {
+    // numberOfResourcesByCategory,
+    sourceDepartmentStatistics,
+  } from '@/api/abilityStatistics.js'
+  // import { zywMessage } from '@/api/home'
+  import * as echarts from 'echarts'
+  import { message } from 'ant-design-vue'
+  //各类资源汇聚量
+  let dataList = ref({
+    title: '各类资源汇聚量',
+    dataList: [],
+  })
+  // let photo = ref([
+  //   require('../../../assets/abilityStatistics/banner-jc.png'),
+  //   require('../../../assets/abilityStatistics/banner-sj.png'),
+  //   require('../../../assets/abilityStatistics/banner-zj.png'),
+  //   require('../../../assets/abilityStatistics/banner-yy.png'),
+  //   require('../../../assets/abilityStatistics/banner-zs.png'),
+  // ])
+  // let name = ref([])
+  // 获取数据资源数据
+  // const findZywMessage = () => {
+  //   zywMessage().then((res) => {
+  //     const { data } = res.data
+  //     dataSourceNum.value = data.sxmlcount || 0
+  //     snum()
+  //   })
+  // }
+  //各类资源数目接口
+  // function snum() {
+  //   numberOfResourcesByCategory().then((res) => {
+  //     dataList.value.dataList = res.data.data
+  //     res.data.data.map((item, index) => {
+  //       // if (dataList.value.dataList[index].type === '数据资源') {
+  //       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
+  //       // }
+  //       dataList.value.dataList[index].organization = '项'
+  //       dataList.value.dataList[index].photo = photo.value[index]
+  //     })
+  //   })
+  // }
+  selectTotal().then((res) => {
+    console.log('selectTotal===============>', res)
+    if (res.data.code !== 0) {
+      return message.error(res.data.msg)
     }
-    if (val.type == '基础设施') {
-      if (uavAndIndividualSoldier.num) {
-        _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
+    let imgObj = {
+      组件服务: require('../../../assets/abilityStatistics/banner-zj.png'),
+      应用资源: require('../../../assets/abilityStatistics/banner-yy.png'),
+      基础设施: require('../../../assets/abilityStatistics/banner-jc.png'),
+      数据资源: require('../../../assets/abilityStatistics/banner-sj.png'),
+      知识库: require('../../../assets/abilityStatistics/banner-zs.png'),
+    }
+    res.data.data.total.forEach((val) => {
+      let _obj = {
+        organization: '项',
+        type: val.type,
+        photo: val.type && imgObj[val.type],
+        amount: val.count,
       }
-    }
-    dataList.value.dataList.push(_obj)
-    // switch (val.type) {
-    //   case '组件服务':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '组件服务',
-    //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '应用资源':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '应用资源',
-    //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '基础设施':
-    //     if (uavAndIndividualSoldier.num) {
-    //       val.count = val.count - 0 + uavAndIndividualSoldier.num
-    //     }
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '基础设施',
-    //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '数据资源':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '数据资源',
-    //       photo: require('../../../assets/abilityStatistics/banner-sj.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '知识库':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '知识库',
-    //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    // }
+      if (val.type == '基础设施') {
+        if (uavAndIndividualSoldier.num) {
+          _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
+        }
+      }
+      if (val.type == '知识库') {
+        _obj.organization = '条'
+      }
+      dataList.value.dataList.push(_obj)
+      // switch (val.type) {
+      //   case '组件服务':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '组件服务',
+      //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '应用资源':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '应用资源',
+      //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '基础设施':
+      //     if (uavAndIndividualSoldier.num) {
+      //       val.count = val.count - 0 + uavAndIndividualSoldier.num
+      //     }
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '基础设施',
+      //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '数据资源':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '数据资源',
+      //       photo: require('../../../assets/abilityStatistics/banner-sj.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '知识库':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '知识库',
+      //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      // }
+    })
+    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    dataList.value.dataList.sort((a, b) => {
+      return arr.indexOf(a.type) - arr.indexOf(b.type)
+    })
   })
-  let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-  dataList.value.dataList.sort((a, b) => {
-    return arr.indexOf(a.type) - arr.indexOf(b.type)
-  })
-})
-let datas = ref([])
-let laiyuanDataList = ref([])
-// let dataSourceNum = ref(0)
-let bumenSum = ref([])
+  let datas = ref([])
+  let laiyuanDataList = ref([])
+  // let dataSourceNum = ref(0)
+  let bumenSum = ref([])
 
-//能力统计-来源部门统计接口
-const sourceDepartment = () => {
-  sourceDepartmentStatistics().then((res) => {
-    // datas.value = res.data.data.deptTypeCount
-    bumenSum.value = res.data.data.deptCount
-    for (const key in res.data.data.deptTypeCount) {
-      datas.value.push({
-        name: key,
-        value: res.data.data.deptTypeCount[key],
-      })
-    }
-    let fanwei = ref([])
-    for (const key in res.data.data.deptTotalCount) {
-      laiyuanDataList.value.push({
-        name: res.data.data.deptTotalCount[key],
-        value: res.data.data.deptTotalCount[key],
-        fanwei: '',
-      })
-      fanwei.value.push(key)
-      fanwei.value.map((item, index) => {
-        if (index + 1 < fanwei.value.length) {
-          laiyuanDataList.value[index].fanwei =
-            item + '-' + fanwei.value[index + 1]
-        } else {
-          laiyuanDataList.value[index].fanwei = item + '以上'
-        }
-      })
-    }
-    console.log('laiyuanDataList.value', laiyuanDataList.value)
-  })
-}
-//来源部门饼图
-let leftDom = ref(0)
-const pieCharti = (dataLists) => {
-  leftDom.value += 'a'
-  echarts.init(document.getElementById('left')).dispose()
-  let chartDom = document.getElementById('left')
-  let myChart = echarts.init(chartDom)
-  let option
-  let index = -1
-  option = {
-    title: {
-      // text: '区级占比',
-      x: 'center',
-      y: '35%',
-      textStyle: {
-        fontWeight: 'normal',
-        fontSize: 16,
-      },
-    },
-    tooltip: {
-      show: true,
-      trigger: 'item',
-      formatter: '{b}: {c} ({d}%)',
-    },
-    legend: {
-      icon: 'emptyCircle',
-      height: 3,
-      itemGap: 40,
-      // orient: 'horizontal',
-      bottom: 0,
-      formatter: function (name) {
-        if (index < 4) {
-          index += 1
-        }
-        let dom = ref()
-        datas.value.map((item) => {
-          if (item.name == name) {
-            dom.value = name + '  ' + item.value
+  //能力统计-来源部门统计接口
+  const sourceDepartment = () => {
+    sourceDepartmentStatistics().then((res) => {
+      // datas.value = res.data.data.deptTypeCount
+      bumenSum.value = res.data.data.deptCount
+      for (const key in res.data.data.deptTypeCount) {
+        datas.value.push({
+          name: key,
+          value: res.data.data.deptTypeCount[key],
+        })
+      }
+      let fanwei = ref([])
+      for (const key in res.data.data.deptTotalCount) {
+        laiyuanDataList.value.push({
+          name: res.data.data.deptTotalCount[key],
+          value: res.data.data.deptTotalCount[key],
+          fanwei: '',
+        })
+        fanwei.value.push(key)
+        fanwei.value.map((item, index) => {
+          if (index + 1 < fanwei.value.length) {
+            laiyuanDataList.value[index].fanwei =
+              item + '-' + fanwei.value[index + 1]
+          } else {
+            laiyuanDataList.value[index].fanwei = item + '以上'
           }
         })
-        return dom.value
+      }
+      console.log('laiyuanDataList.value', laiyuanDataList.value)
+    })
+  }
+  //来源部门饼图
+  let leftDom = ref(0)
+  const pieCharti = (dataLists) => {
+    leftDom.value += 'a'
+    echarts.init(document.getElementById('left')).dispose()
+    let chartDom = document.getElementById('left')
+    let myChart = echarts.init(chartDom)
+    let option
+    let index = -1
+    option = {
+      title: {
+        // text: '区级占比',
+        x: 'center',
+        y: '35%',
+        textStyle: {
+          fontWeight: 'normal',
+          fontSize: 16,
+        },
       },
-    },
-    series: [
-      {
-        center: ['50%', '40%'],
-        type: 'pie',
-        selectedMode: 'single',
-        radius: ['50%', '30%'],
-        color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
-        top: '0',
-        label: {
-          normal: {
-            show: false,
-            position: 'inner',
-            formatter: '{d}%',
+      tooltip: {
+        show: true,
+        trigger: 'item',
+        formatter: '{b}: {c} ({d}%)',
+      },
+      legend: {
+        icon: 'emptyCircle',
+        height: 3,
+        itemGap: 40,
+        // orient: 'horizontal',
+        bottom: 0,
+        formatter: function (name) {
+          if (index < 4) {
+            index += 1
+          }
+          let dom = ref()
+          datas.value.map((item) => {
+            if (item.name == name) {
+              dom.value = name + '  ' + item.value
+            }
+          })
+          return dom.value
+        },
+      },
+      series: [
+        {
+          center: ['50%', '40%'],
+          type: 'pie',
+          selectedMode: 'single',
+          radius: ['50%', '30%'],
+          color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
+          top: '0',
+          label: {
+            normal: {
+              show: false,
+              position: 'inner',
+              formatter: '{d}%',
 
-            // textStyle: {
-            //   color: '#fff',
-            //   fontWeight: 'bold',
-            //   fontSize: 14,
-            // },
-          },
-        },
-        labelLine: {
-          normal: {
-            show: false,
-          },
-        },
-        data: dataLists,
-      },
-      {
-        type: 'pie',
-        center: ['50%', '40%'],
-        radius: ['58%', '50%'],
-        itemStyle: {
-          normal: {
-            color: '#c2c7d6',
-          },
-          emphasis: {
-            color: '#ADADAD',
-          },
-        },
-        label: {
-          normal: {
-            position: 'inner',
-            formatter: '{c}',
-            textStyle: {
-              color: '#777777',
-              fontWeight: 'bold',
-              fontSize: 14,
+              // textStyle: {
+              //   color: '#fff',
+              //   fontWeight: 'bold',
+              //   fontSize: 14,
+              // },
             },
           },
-        },
-        // data: dataLists,
-      },
-    ],
-  }
-
-  option && myChart.setOption(option)
-}
-//来源部门漏斗图
-const funnelPlot = (dataList) => {
-  // 排序
-  let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
-  // 真实数据
-  dataList.sort((a, b) => {
-    return Number(a.value) - Number(b.value)
-  })
-  
-  let _arr = dataList.map(v => v.fanwei) || arrCopy;
-  // 数据配置形成金字塔形状固定
-  let chartData = _arr.map((v, i) => {
-    return {
-      name: v,
-      value: 10 + 10 * i,
-    }
-  })
-
-  let newArr = [];
-  dataList.map(v => {
-    if (v.value && Number(v.value > 0)) {
-      newArr.push({
-        name: v.fanwei,
-        value: v.value
-      })
-    }
-  })
-  console.log('============》', dataList)
-  echarts.init(document.getElementById('right')).dispose()
-  let chartDom = document.getElementById('right')
-  let myChart = echarts.init(chartDom)
-  let option = {
-    tooltip: {
-      trigger: 'item',
-      formatter: function (info) {
-        let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
-        let dom = ref()
-        dom.value =
-          '部门数<br/>' + (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个'
-        console.log('name', info.data)
-        return dom.value
-      },
-    },
-    grid: {
-      height: '65%',
-      width: '45%',
-      left: '20%',
-      bottom: 30,
-    },
-    xAxis: {
-      show: false,
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-    },
-    yAxis: {
-      show: false,
-      type: 'value',
-      min: 0,
-      max: 20,
-    },
-    series: [
-      {
-        name: '部门数',
-        type: 'funnel',
-        left: '28%',
-        right: '35%',
-        top: '15%',
-        bottom: '10%',
-        minSize: '0%',
-        maxSize: '100%',
-        sort: 'ascending',
-        label: {
-          show: true,
-          formatter: function (info) {
-            let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
-            let dom = ref()
-            dom.value = (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个';
-            console.log('name', info.data)
-            return dom.value
+          labelLine: {
+            normal: {
+              show: false,
+            },
           },
-          rich: {
-            b: {
-              fontSize: 14
-            }
-          }
+          data: dataLists,
         },
-        labelLine: {
-          length: 40,
-          lineStyle: {
-            width: 1,
-            type: 'solid'
-          }
-        },
-        itemStyle: {
-          borderColor: '#fff',
-          borderWidth: 1,
-        },
-        emphasis: {
+        {
+          type: 'pie',
+          center: ['50%', '40%'],
+          radius: ['58%', '50%'],
+          itemStyle: {
+            normal: {
+              color: '#c2c7d6',
+            },
+            emphasis: {
+              color: '#ADADAD',
+            },
+          },
           label: {
-            fontSize: 20,
+            normal: {
+              position: 'inner',
+              formatter: '{c}',
+              textStyle: {
+                color: '#777777',
+                fontWeight: 'bold',
+                fontSize: 14,
+              },
+            },
           },
+          // data: dataLists,
         },
-        data: chartData,
-      }
-    ],
-  }
+      ],
+    }
 
-  option && myChart.setOption(option)
-}
-onMounted(() => {
-  // findZywMessage()
-  // snum()
-  sourceDepartment()
-})
-watch(
-  datas,
-  (value) => {
-    pieCharti(value)
-  },
-  { deep: true }
-)
-watch(
-  laiyuanDataList,
-  (value) => {
-    funnelPlot(value)
-    console.log(value, '   laiyuanDataList')
-  },
-  { deep: true }
-)
+    option && myChart.setOption(option)
+  }
+  //来源部门漏斗图
+  const funnelPlot = (dataList) => {
+    // 排序
+    let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
+    // 真实数据
+    dataList.sort((a, b) => {
+      return Number(a.value) - Number(b.value)
+    })
+
+    let _arr = dataList.map((v) => v.fanwei) || arrCopy
+    // 数据配置形成金字塔形状固定
+    let chartData = _arr.map((v, i) => {
+      return {
+        name: v,
+        value: 10 + 10 * i,
+      }
+    })
+
+    let newArr = []
+    dataList.map((v) => {
+      if (v.value && Number(v.value > 0)) {
+        newArr.push({
+          name: v.fanwei,
+          value: v.value,
+        })
+      }
+    })
+    console.log('============》', dataList)
+    echarts.init(document.getElementById('right')).dispose()
+    let chartDom = document.getElementById('right')
+    let myChart = echarts.init(chartDom)
+    let option = {
+      tooltip: {
+        trigger: 'item',
+        formatter: function (info) {
+          let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+          let dom = ref()
+          dom.value =
+            '部门数<br/>' +
+            (_obj.fanwei || '--') +
+            ' : ' +
+            (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+            '项'
+          console.log('name', info.data)
+          return dom.value
+        },
+      },
+      grid: {
+        height: '65%',
+        width: '45%',
+        left: '20%',
+        bottom: 30,
+      },
+      xAxis: {
+        show: false,
+        type: 'category',
+        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+      },
+      yAxis: {
+        show: false,
+        type: 'value',
+        min: 0,
+        max: 20,
+      },
+      series: [
+        {
+          name: '部门数',
+          type: 'funnel',
+          left: '28%',
+          right: '35%',
+          top: '15%',
+          bottom: '10%',
+          minSize: '0%',
+          maxSize: '100%',
+          sort: 'ascending',
+          label: {
+            show: true,
+            formatter: function (info) {
+              let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+              let dom = ref()
+              dom.value =
+                (_obj.fanwei || '--') +
+                ' : ' +
+                (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+                '项'
+              console.log('name', info.data)
+              return dom.value
+            },
+            rich: {
+              b: {
+                fontSize: 14,
+              },
+            },
+          },
+          labelLine: {
+            length: 40,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+            },
+          },
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 1,
+          },
+          emphasis: {
+            label: {
+              fontSize: 20,
+            },
+          },
+          data: chartData,
+        },
+      ],
+    }
+
+    option && myChart.setOption(option)
+  }
+  onMounted(() => {
+    // findZywMessage()
+    // snum()
+    sourceDepartment()
+  })
+  watch(
+    datas,
+    (value) => {
+      pieCharti(value)
+    },
+    { deep: true }
+  )
+  watch(
+    laiyuanDataList,
+    (value) => {
+      funnelPlot(value)
+      console.log(value, '   laiyuanDataList')
+    },
+    { deep: true }
+  )
 </script>
 <style lang="less" scoped>
-@font-face {
-  font-family: 'num-typeface';
-  src: url('~@/assets/newHome/font/num-typeface.otf');
-}
-
-@font-face {
-  font-family: 'text-typeface';
-  src: url('~@/assets/newHome/font/text-typeface.otf');
-}
-
-.num {
-  font-family: num-typeface;
-  font-size: 32px;
-  font-weight: 600;
-  margin-right: 5px;
-}
-
-.hengxian {
-  height: 3px;
-  width: 30px;
-  border-radius: 1px;
-  margin-top: 6px;
-  background: #0058e1;
-}
-
-.resource-aggregation {
-  font-size: 18px;
-  font-family: text-typeface;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  background: #f3f5f9;
-  padding-bottom: 60px;
-
-  .resource-aggregation-left {
-    background: #fff;
-    border: 1px solid #e6e9ed;
-    border-radius: 2px;
-    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-    width: 360px;
-    height: 397px;
-    padding: 20px;
-    padding-top: 64px;
-    position: relative;
-
-    .title {
-      position: absolute;
-      top: 20px;
-      font-size: 18px;
-      color: #212121;
-    }
-
-    .content {
-      .content-son {
-        .content-left {
-          margin-bottom: 8px;
-          height: 56px;
-          width: 320px;
-          background: #f1f4fb;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          border-radius: 1px;
-
-          .name {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .name-photo {
-              margin-left: 10px;
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              margin-right: 11px;
-            }
-          }
-
-          .organization-value {
-            margin-right: 16px;
-
-            .num {
-              font-size: 26px;
-            }
-
-            span:nth-child(2) {
-              font-size: 16px;
-            }
-          }
-        }
-      }
-    }
+  @font-face {
+    font-family: 'num-typeface';
+    src: url('~@/assets/newHome/font/num-typeface.otf');
   }
 
-  .resource-aggregation-right {
-    background: #fff;
-    border: 1px solid #e6e9ed;
-    border-radius: 2px;
-    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-    margin-left: 20px;
-    width: 920px;
-    height: 397px;
-    padding: 64px;
-    overflow: hidden;
-    position: relative;
+  @font-face {
+    font-family: 'text-typeface';
+    src: url('~@/assets/newHome/font/text-typeface.otf');
+  }
+
+  .num {
+    font-family: num-typeface;
+    font-size: 32px;
+    font-weight: 600;
+    margin-right: 5px;
+  }
+
+  .hengxian {
+    height: 3px;
+    width: 30px;
+    border-radius: 1px;
+    margin-top: 6px;
+    background: #0058e1;
+  }
+
+  .resource-aggregation {
+    font-size: 18px;
+    font-family: text-typeface;
+    width: 100%;
     display: flex;
-    padding-left: 120px;
+    justify-content: center;
+    background: #f3f5f9;
+    padding-bottom: 60px;
 
-    .title {
-      position: absolute;
-      top: 20px;
-      left: 20px;
-      font-size: 18px;
-      color: #212121;
-    }
-
-    .bumensnum {
-      width: 100px;
-      position: absolute;
-      left: 20px;
-      height: 313px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: 66px;
-      background: rgba(0, 88, 225, 0.1);
-      border-right: 1px solid rgba(0, 88, 225, 0.5);
+    .resource-aggregation-left {
+      background: #fff;
+      border: 1px solid #e6e9ed;
       border-radius: 2px;
+      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+      width: 360px;
+      height: 397px;
+      padding: 20px;
+      padding-top: 64px;
+      position: relative;
 
-      .bumensnum-photo {
-        height: 50px;
-        width: 50px;
-        background: url('~@/assets/abilityStatistics/bumenzongshu.png') no-repeat;
-        margin-bottom: 30px;
+      .title {
+        position: absolute;
+        top: 20px;
+        font-size: 18px;
+        color: #212121;
       }
 
-      p {
-        margin-top: 18px;
-        color: #0058e1;
+      .content {
+        .content-son {
+          .content-left {
+            margin-bottom: 8px;
+            height: 56px;
+            width: 320px;
+            background: #f1f4fb;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-radius: 1px;
 
-        .num {
-          font-size: 30px;
-        }
+            .name {
+              display: flex;
+              justify-content: center;
+              align-items: center;
 
-        span:last-child {
-          font-size: 16px;
+              .name-photo {
+                margin-left: 10px;
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 11px;
+              }
+            }
+
+            .organization-value {
+              margin-right: 16px;
+
+              .num {
+                font-size: 26px;
+              }
+
+              span:nth-child(2) {
+                font-size: 16px;
+              }
+            }
+          }
         }
       }
     }
 
-    .content {
-      width: 779px;
-      height: 313px;
-      display: flex;
+    .resource-aggregation-right {
+      background: #fff;
+      border: 1px solid #e6e9ed;
+      border-radius: 2px;
+      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+      margin-left: 20px;
+      width: 920px;
+      height: 397px;
+      padding: 64px;
+      overflow: hidden;
       position: relative;
-      background: #f1f4fb;
+      display: flex;
+      padding-left: 120px;
 
-      .left {
-        width: 373px;
-        height: 313px;
-      }
-
-      .center {
-        height: 240px;
-        width: 1px;
-        margin-top: 31px;
-        background: #d0d4de;
-      }
-
-      .right {
-        width: 406px;
-        height: 313px;
-      }
-
-      .right-son1 {
+      .title {
         position: absolute;
-        top: 10px;
-        left: 52.5%;
+        top: 20px;
+        left: 20px;
+        font-size: 18px;
+        color: #212121;
       }
 
-      .right-son2 {
+      .bumensnum {
+        width: 100px;
         position: absolute;
-        top: 10px;
-        left: 70.5%;
+        left: 20px;
+        height: 313px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding-top: 66px;
+        background: rgba(0, 88, 225, 0.1);
+        border-right: 1px solid rgba(0, 88, 225, 0.5);
+        border-radius: 2px;
+
+        .bumensnum-photo {
+          height: 50px;
+          width: 50px;
+          background: url('~@/assets/abilityStatistics/bumenzongshu.png')
+            no-repeat;
+          margin-bottom: 30px;
+        }
+
+        p {
+          margin-top: 18px;
+          color: #0058e1;
+
+          .num {
+            font-size: 30px;
+          }
+
+          span:last-child {
+            font-size: 16px;
+          }
+        }
+      }
+
+      .content {
+        width: 779px;
+        height: 313px;
+        display: flex;
+        position: relative;
+        background: #f1f4fb;
+
+        .left {
+          width: 373px;
+          height: 313px;
+        }
+
+        .center {
+          height: 240px;
+          width: 1px;
+          margin-top: 31px;
+          background: #d0d4de;
+        }
+
+        .right {
+          width: 406px;
+          height: 313px;
+        }
+
+        .right-son1 {
+          position: absolute;
+          top: 10px;
+          left: 52.5%;
+        }
+
+        .right-son2 {
+          position: absolute;
+          top: 10px;
+          left: 70.5%;
+        }
       }
     }
   }
-}
 </style>
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index c32a2f60..96d345a2 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,106 +6,159 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-        cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
-          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></IntegrationServiceOrder>
+        <IntegrationServiceOrder
+          ref="integrationServiceOrderDom"
+          v-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></IntegrationServiceOrder>
         <ul v-else>
-          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
-            item.show &&
-            item.name !== '评分' &&
-            selectCardsname !== '数据资源'
-          ">
+          <li
+            v-for="(item, i) in selList"
+            :key="i"
+            @click="changeCondition(item)"
+            v-show="
+              item.show &&
+              item.name !== '评分' &&
+              selectCardsname !== '数据资源'
+            "
+          >
             {{ item.name }}
-            <span class="arrow" :class="
-              orderObj.orderType == 'ASC' &&
-              orderObj.orderField == item.value
-                ? 'down'
-                : ''
-            "></span>
+            <span
+              class="arrow"
+              :class="
+                orderObj.orderType == 'ASC' && orderObj.orderField == item.value
+                  ? 'down'
+                  : ''
+              "
+            ></span>
           </li>
         </ul>
       </div>
-
     </div>
-    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
+    <div
+      class="result-list"
+      v-for="(item, index) in resourceList.data"
+      :key="item.index"
+    >
       <div class="item" :key="showKey">
-        <div class="left" style="display: flex; align-items: center" v-if="
-          item.type === '应用资源' &&
-          item.infoList &&
-          item.infoList.filter((val) => val.attrType == '应用图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
+            item.type === '应用资源' &&
+            item.infoList &&
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '应用图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" style="display: flex; align-items: center" v-else-if="
-          (selectCardsname === '融合服务' ||
-            selectCardsname === '赋能场景') &&
-          item.fuseAttrList &&
-          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (selectCardsname === '融合服务' ||
+              selectCardsname === '赋能场景') &&
+            item.fuseAttrList &&
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" :class="
-          item.type == '应用资源'
-            ? 'yyzy'
-            : !item.type
-            ? 'sjzy'
-            : !item.infoList ||
-              !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-            ? 'znsf'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '智能算法'
-            ? 'znsf'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '图层服务'
-            ? 'tcfw'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '开发组件'
-            ? 'kfzj'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '业务组件'
-            ? 'ywzj'
-            : ''
-        " @click="toView('details', item)" v-else-if="
-          selectCardsname !== '基础设施' &&
-          selectCardsname !== '融合服务' &&
-          selectCardsname !== '赋能场景'
-        "></div>
+        <div
+          class="left"
+          :class="
+            item.type == '应用资源'
+              ? 'yyzy'
+              : !item.type
+              ? 'sjzy'
+              : !item.infoList ||
+                !item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '智能算法'
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '图层服务'
+              ? 'tcfw'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '开发组件'
+              ? 'kfzj'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '业务组件'
+              ? 'ywzj'
+              : ''
+          "
+          @click="toView('details', item)"
+          v-else-if="
+            selectCardsname !== '基础设施' &&
+            selectCardsname !== '融合服务' &&
+            selectCardsname !== '赋能场景'
+          "
+        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="
-          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></div>
+        <div
+          class="left rhfw"
+          v-else-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <!-- 已申请--通过 -->
-              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
+              <svg
+                t="1652322568870"
+                class="icon"
+                viewBox="0 0 3072 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3062"
+                width="40"
+                height="40"
+                v-if="
                   item.applyState == '已申请' && item.approveStatus == '通过'
-                " style="margin-left: 10px; min-width: 40px">
+                "
+                style="margin-left: 10px; min-width: 40px"
+              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06" p-id="3063"></path>
+                  fill="#d81e06"
+                  p-id="3063"
+                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06" p-id="3064"></path>
+                  fill="#d81e06"
+                  p-id="3064"
+                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06" p-id="3065"></path>
+                  fill="#d81e06"
+                  p-id="3065"
+                ></path>
               </svg>
               <!-- 审核中 -->
               <!-- <svg
@@ -151,19 +204,28 @@
               </span> -->
             </span>
             <div class="header-right">
-              <div v-if="
-                selectCardsname === '融合服务' ||
-                selectCardsname === '赋能场景'
-              " class="label-content">
-                <template v-if="
-                  item.fuseAttrList &&
-                  item.fuseAttrList.filter(
-                    (val) => val.attrType == '应用领域'
-                  )[0]
-                ">
-                  <span class="label" v-for="(data, index) in item.fuseAttrList
-                  .filter((val) => val.attrType == '应用领域')[0]
-                  .attrValue.split(';')" :key="index">
+              <div
+                v-if="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                class="label-content"
+              >
+                <template
+                  v-if="
+                    item.fuseAttrList &&
+                    item.fuseAttrList.filter(
+                      (val) => val.attrType == '应用领域'
+                    )[0]
+                  "
+                >
+                  <span
+                    class="label"
+                    v-for="(data, index) in item.fuseAttrList
+                      .filter((val) => val.attrType == '应用领域')[0]
+                      .attrValue.split(';')"
+                    :key="index"
+                  >
                     {{ data }}
                   </span>
                 </template>
@@ -181,15 +243,21 @@
             </div>
           </div>
           <div class="dec">
-            <div v-if="
-              selectCardsname !== '融合服务' &&
-              selectCardsname !== '赋能场景' &&
-              selectCardsname !== '基础设施'
-            ">
+            <div
+              v-if="
+                selectCardsname !== '融合服务' &&
+                selectCardsname !== '赋能场景' &&
+                selectCardsname !== '基础设施'
+              "
+            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
+          <div
+            v-if="selectCardsname !== '基础设施'"
+            style="margin-top: 0.1rem"
+            class="description"
+          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -198,26 +266,32 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <!-- <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   浏览量：{{ item.visits || 0 }}次
-                </div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景' &&
-                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                ">
+                </div> -->
+                <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景' &&
+                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                  "
+                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div v-if="
-                  selectCardsname === '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <div
+                  v-if="
+                    selectCardsname === '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -227,41 +301,77 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template v-if="
-                  (selectCardsname == '组件服务' &&
-                    item.infoList.filter(
-                      (val) => val.attrType == '外部服务地址'
-                    ).length === 0) ||
-                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                ">
-                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
+                <template
+                  v-if="
+                    (selectCardsname == '组件服务' &&
+                      item.infoList.filter(
+                        (val) => val.attrType == '外部服务地址'
+                      ).length === 0) ||
+                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                  "
+                >
+                  <span
+                    class="shopping-down"
+                    v-if="item.isInShoppingCart"
+                  ></span>
+                  <span
+                    class="shopping-on"
+                    v-else
+                    @click.stop="addShoppingCart(item, index)"
+                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
-                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
+                <span
+                  class="sc-down"
+                  v-if="item.isCollect == 'false'"
+                  @click.stop="addCollect(item)"
+                ></span>
+                <span
+                  class="sc-on"
+                  v-if="item.isCollect == 'true'"
+                  @click.stop="addCollect(item)"
+                ></span>
               </div>
-              <div class="shopping pk" :key="pk" v-show="
-                cardType == '组件服务' && findComponentName(item, '智能算法')
-              ">
-                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
+              <div
+                class="shopping pk"
+                :key="pk"
+                v-show="
+                  cardType == '组件服务' && findComponentName(item, '智能算法')
+                "
+              >
+                <span
+                  class="pk-on"
+                  @click.stop="goComparePk(item, index)"
+                ></span>
               </div>
-              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
+              <a-button
+                type="primary"
+                @click.stop="toView('details', item)"
+                v-if="!whoShow1.itShowBaoTou"
+              >
                 查看详情
               </a-button>
-              <a-button style="margin-left: 10px" v-show="
-                selectCardsname === '融合服务' ||
-                selectCardsname === '赋能场景'
-              " @click.stop="handleAKeyApplication(item)">
+              <a-button
+                style="margin-left: 10px"
+                v-show="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                @click.stop="handleAKeyApplication(item)"
+              >
                 一键申请
               </a-button>
-              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
-                cardType == '组件服务' ||
-                (cardType == '应用资源' && whoShow1.itShowQingDao)
-              ">
+              <a-button
+                type="primary"
+                @click.stop="toView('apply', item)"
+                v-show="
+                  cardType == '组件服务' ||
+                  (cardType == '应用资源' && whoShow1.itShowQingDao)
+                "
+              >
                 {{
-                item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -274,7 +384,12 @@
         </div>
       </div>
     </div>
-    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
+    <a-modal
+      v-model:visible="visible"
+      title="视频预览"
+      :width="750"
+      destroyOnClose
+    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -285,816 +400,817 @@
   </div>
 </template>
 <script>
-import { ref, reactive } from 'vue'
-import { message } from 'ant-design-vue'
-import { useRouter } from 'vue-router'
-import { getUser, sgcInsert } from '@/api/home'
-import { scInsert, scDel } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
-import { getHls } from '@/api/home.js'
-import IntegrationServiceOrder from './integrationServiceOrder.vue';
-import ComponentServiceTag from './ComponentServiceTag.vue';
-export default {
-  name: '',
-  props: {
-    resourceList: {
-      type: Object,
-      default: () => { },
+  import { ref, reactive } from 'vue'
+  import { message } from 'ant-design-vue'
+  import { useRouter } from 'vue-router'
+  import { getUser, sgcInsert } from '@/api/home'
+  import { scInsert, scDel } from '@/api/personalCenter'
+  import mybus from '@/myplugins/mybus'
+  import { getHls } from '@/api/home.js'
+  import IntegrationServiceOrder from './integrationServiceOrder.vue'
+  import ComponentServiceTag from './ComponentServiceTag.vue'
+  export default {
+    name: '',
+    props: {
+      resourceList: {
+        type: Object,
+        default: () => {},
+      },
+      resourceTotal: {
+        type: String,
+        default: '0',
+      },
+      selectCardsname: {
+        type: String,
+        default: '应用资源',
+      },
     },
-    resourceTotal: {
-      type: String,
-      default: '0',
+    components: {
+      IntegrationServiceOrder,
+      ComponentServiceTag,
     },
-    selectCardsname: {
-      type: String,
-      default: '应用资源',
-    },
-  },
-  components: {
-    IntegrationServiceOrder,
-    ComponentServiceTag,
-  },
-  setup(props, context) {
-    const whoShow1 = whoShow
-    const showKey = ref(0)
-    let shoppingKey = ref(1)
-    let orderObj = reactive({
-      orderField: '',
-      orderType: '',
-    })
-    const integrationServiceOrderDom = ref(null)
-    // 购物车id列表
-    const selList = ref([
-      { name: '发布时间', value: 'tdr.create_date', show: true },
-      { name: '浏览量', value: 'visits', show: true },
-      { name: '申请量', value: 'applyCount', show: true },
-      { name: '收藏量', value: 'collectCount', show: true },
-      { name: '评分', value: 'score', show: true },
-    ])
-    // 西海岸-去掉浏览量
-    if (whoShow1.itShowXiHaiAn) {
-      selList.value = selList.value.filter(v => v.name !== '浏览量')
-    }
-    if (props.selectCardsname === '基础设施') {
-      selList.value.map((val) => (val.show = false))
-    } else if (props.selectCardsname === '数据资源') {
-      selList.value.map(
-        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-      )
-    }
-    const findComponentName = (list, name) => {
-      if (list.infoList) {
-        return list.infoList.find((item) => {
-          if (item.attrType === '组件类型') {
-            return item.attrValue === name
-          }
-        })
+    setup(props, context) {
+      const whoShow1 = whoShow
+      const showKey = ref(0)
+      let shoppingKey = ref(1)
+      let orderObj = reactive({
+        orderField: '',
+        orderType: '',
+      })
+      const integrationServiceOrderDom = ref(null)
+      // 购物车id列表
+      const selList = ref([
+        { name: '发布时间', value: 'tdr.create_date', show: true },
+        { name: '浏览量', value: 'visits', show: true },
+        { name: '申请量', value: 'applyCount', show: true },
+        { name: '收藏量', value: 'collectCount', show: true },
+        { name: '评分', value: 'score', show: true },
+      ])
+      // 西海岸-去掉浏览量
+      // if (whoShow1.itShowXiHaiAn) {
+      selList.value = selList.value.filter((v) => v.name !== '浏览量')
+      // }
+      if (props.selectCardsname === '基础设施') {
+        selList.value.map((val) => (val.show = false))
+      } else if (props.selectCardsname === '数据资源') {
+        selList.value.map(
+          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+        )
       }
-    }
-
-    // 西海岸--智能算法--列表增加标签显示
-    const showTagArray = ['已落地', '需要计算支持']
-    const getTagList = (item) => {
-      let _arr = item.infoList.filter((x) => showTagArray.includes(x.attrValue)) || []
-      let tagArray = _arr.map(v => v.attrValue)
-      return tagArray
-    }
-    console.log('this.resourceList', props.resourceList.data)
-    props.resourceList.data.map((val) => {
-      if (val.infoList) {
-        let obj = val.infoList.filter(
-          (item) => item.attrType == '组件类型'
-        )[0]
-        if (obj) {
-          switch (obj.attrValue) {
-            case '智能算法':
-              val.applicationType = 'znsf'
-              break
-            case '图层服务':
-              val.applicationType = 'tcfw'
-              break
-            case '开发组件':
-              val.applicationType = 'kfzj'
-              break
-            case '业务组件':
-              val.applicationType = 'ywzj'
-              break
-          }
-          console.log('obj', val.applicationType)
-        }
-      }
-    })
-    showKey.value++
-    const selData = ref('total')
-    const flag = ref(true)
-    // userId
-    const userId = ref('')
-    getUser().then((res) => {
-      console.log('getUser============>', res)
-      userId.value = res.data.data.id
-    })
-    const resultList = [1, 2, 3, 4]
-    const router = useRouter()
-    const cardType = router.currentRoute.value.query.select
-    const onSearch = (searchValue) => {
-      console.log('use value', searchValue)
-      console.log('or use this.value', searchValue.value)
-    }
-    function toView(type, item) {
-      if (props.selectCardsname == '数据资源') {
-        if (whoShow1.itShowQingDao) {
-          window.open(
-            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-            item.guid
-          )
-        } else {
-          window.open(
-            'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-          )
-        }
-      } else if (props.selectCardsname === '融合服务') {
-        context.emit('saveSearchCodition')
-        // 打包模式
-        router.push({
-          path: '/packagingDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else if (props.selectCardsname === '赋能场景') {
-        router.push({
-          path: '/integrationServicesDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else {
-        if (type === 'apply') {
-          // 外部服务地址跳转到外部
-          const webUrl = item.infoList.filter(
-            (val) => val.attrType == '外部服务地址'
-          )[0]?.attrValue
-          if (webUrl) {
-            window.open(webUrl)
-          } else {
-            if (
-              !(
-                props.selectCardsname === '应用资源' ||
-                props.selectCardsname === '组件服务'
-              ) ||
-              whoShow1.itShowBaoTou
-            ) {
-              return
+      const findComponentName = (list, name) => {
+        if (list.infoList) {
+          return list.infoList.find((item) => {
+            if (item.attrType === '组件类型') {
+              return item.attrValue === name
             }
-            // 内部跳转申请页面
-            console.log('一键申请===================>', item)
-            localStorage.setItem(
-              'applyList',
-              JSON.stringify([
-                {
-                  arr: [
-                    {
-                      delFlag: item.delFlag,
-                      description: item.description,
-                      resourceId: item.id,
-                      resourceName: item.name,
-                      time: item.createDate,
-                      type: item.type,
-                      componentType:
-                        (item.infoList.filter(
-                          (val) => val.attrType == '组件类型'
-                        )[0] &&
-                          item.infoList.filter(
-                            (val) => val.attrType == '组件类型'
-                          )[0].attrValue) ||
-                        '',
-                    },
-                  ],
-                  deptId: item.deptId,
-                  deptName: item.deptName,
-                },
-              ])
-            )
-            router.push({
-              path: '/apply',
-            })
+          })
+        }
+      }
+
+      // 西海岸--智能算法--列表增加标签显示
+      const showTagArray = ['已落地', '需要计算支持']
+      const getTagList = (item) => {
+        let _arr =
+          item.infoList.filter((x) => showTagArray.includes(x.attrValue)) || []
+        let tagArray = _arr.map((v) => v.attrValue)
+        return tagArray
+      }
+      console.log('this.resourceList', props.resourceList.data)
+      props.resourceList.data.map((val) => {
+        if (val.infoList) {
+          let obj = val.infoList.filter(
+            (item) => item.attrType == '组件类型'
+          )[0]
+          if (obj) {
+            switch (obj.attrValue) {
+              case '智能算法':
+                val.applicationType = 'znsf'
+                break
+              case '图层服务':
+                val.applicationType = 'tcfw'
+                break
+              case '开发组件':
+                val.applicationType = 'kfzj'
+                break
+              case '业务组件':
+                val.applicationType = 'ywzj'
+                break
+            }
+            console.log('obj', val.applicationType)
           }
-        } else {
+        }
+      })
+      showKey.value++
+      const selData = ref('total')
+      const flag = ref(true)
+      // userId
+      const userId = ref('')
+      getUser().then((res) => {
+        console.log('getUser============>', res)
+        userId.value = res.data.data.id
+      })
+      const resultList = [1, 2, 3, 4]
+      const router = useRouter()
+      const cardType = router.currentRoute.value.query.select
+      const onSearch = (searchValue) => {
+        console.log('use value', searchValue)
+        console.log('or use this.value', searchValue.value)
+      }
+      function toView(type, item) {
+        if (props.selectCardsname == '数据资源') {
+          if (whoShow1.itShowQingDao) {
+            window.open(
+              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+                item.guid
+            )
+          } else {
+            window.open(
+              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+            )
+          }
+        } else if (props.selectCardsname === '融合服务') {
           context.emit('saveSearchCodition')
+          // 打包模式
           router.push({
-            path: '/details',
+            path: '/packagingDetails',
             query: {
               id: item.id,
             },
           })
-        }
-      }
-    }
-    // 加入申购车
-    const addShoppingCart = (item, index) => {
-      console.log('item===============>', item)
-      if (flag.value && item.id) {
-        flag.value = false
-        sgcInsert({
-          delFlag: '0',
-          resourceId: item.id,
-          // userId: userId.value,
-        }).then((res) => {
-          console.log(res)
-          message.success('添加申购车成功！')
-          mybus.emit('getSgcNum')
-          mybus.emit('changeSelcted', index)
-          flag.value = true
-        })
-      }
-      shoppingKey.value++
-      // 查询申购车中已有id,用于过滤图标
-    }
-    // 添加收藏
-    const addCollect = (item) => {
-      console.log('收藏===============>', item, flag.value)
-      if (flag.value && item.id) {
-        flag.value = false
-        if (item.isCollect == 'true') {
-          scDel([item.id]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('取消成功')
-              item.isCollect = 'false'
-              item.collectCount--
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
-            }
+        } else if (props.selectCardsname === '赋能场景') {
+          router.push({
+            path: '/integrationServicesDetails',
+            query: {
+              id: item.id,
+            },
           })
         } else {
-          scInsert([
-            {
-              resourceId: item.id,
-            },
-          ]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('添加收藏成功！')
-              item.isCollect = 'true'
-              item.collectCount++
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
+          if (type === 'apply') {
+            // 外部服务地址跳转到外部
+            const webUrl = item.infoList.filter(
+              (val) => val.attrType == '外部服务地址'
+            )[0]?.attrValue
+            if (webUrl) {
+              window.open(webUrl)
+            } else {
+              if (
+                !(
+                  props.selectCardsname === '应用资源' ||
+                  props.selectCardsname === '组件服务'
+                ) ||
+                whoShow1.itShowBaoTou
+              ) {
+                return
+              }
+              // 内部跳转申请页面
+              console.log('一键申请===================>', item)
+              localStorage.setItem(
+                'applyList',
+                JSON.stringify([
+                  {
+                    arr: [
+                      {
+                        delFlag: item.delFlag,
+                        description: item.description,
+                        resourceId: item.id,
+                        resourceName: item.name,
+                        time: item.createDate,
+                        type: item.type,
+                        componentType:
+                          (item.infoList.filter(
+                            (val) => val.attrType == '组件类型'
+                          )[0] &&
+                            item.infoList.filter(
+                              (val) => val.attrType == '组件类型'
+                            )[0].attrValue) ||
+                          '',
+                      },
+                    ],
+                    deptId: item.deptId,
+                    deptName: item.deptName,
+                  },
+                ])
+              )
+              router.push({
+                path: '/apply',
+              })
             }
+          } else {
+            context.emit('saveSearchCodition')
+            router.push({
+              path: '/details',
+              query: {
+                id: item.id,
+              },
+            })
+          }
+        }
+      }
+      // 加入申购车
+      const addShoppingCart = (item, index) => {
+        console.log('item===============>', item)
+        if (flag.value && item.id) {
+          flag.value = false
+          sgcInsert({
+            delFlag: '0',
+            resourceId: item.id,
+            // userId: userId.value,
+          }).then((res) => {
+            console.log(res)
+            message.success('添加申购车成功！')
+            mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
+            flag.value = true
           })
         }
+        shoppingKey.value++
+        // 查询申购车中已有id,用于过滤图标
       }
-    }
-
-    /**更换查询条件
-     * val: 排序字段值
-     * isFromFather: 是否来自父组件传值
-     */
-    const changeCondition = (item, isFromFather = false) => {
-      console.log('item, isFromFather------------>', item, isFromFather);
-      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
-      if (isFromFather) {
-        newType = item.orderType;
-      }
-      orderObj.orderField = item.value;
-      orderObj.orderType = newType;
-      let _index = selList.value.findIndex(x => x.value == item.value)
-      if (_index > -1) {
-        selList.value[_index].orderType = newType
-      }
-      selList.value = selList.value.splice(0);
-      mybus.emit('changeCondition', orderObj)
-    }
-
-    // 融合服务--一键申请
-    const handleAKeyApplication = (item) => {
-      let _applyList = []
-      let fuseResourceList = item.fuseResourceList || []
-      let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
-      let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
-      jcssArray = jcssArray.map((v) => {
-        v = Object.assign(v, v.resource)
-        return v
-      })
-      let jcss = [
-        {
-          arr: [
-            {
-              description: '',
-              note1: JSON.stringify(jcssArray),
-              resourceId: '1522550195055828996',
-              resourceName: '摄像头列表',
-              type: '基础设施',
-            },
-          ],
-          deptId: '',
-          deptName: '',
-        },
-      ]
-      if (infrastructure) {
-        jcss[0].deptId = infrastructure.deptId
-        jcss[0].deptName = infrastructure.deptName
-      }
-      otherArray.map((v) => {
-        let resource = v.resource || {}
-        let obj = {
-          arr: [
-            {
-              delFlag: resource.delFlag,
-              description: resource.description,
-              resourceId: resource.id,
-              resourceName: resource.name,
-              time: resource.createDate,
-              type: resource.type,
-            },
-          ],
-          deptId: resource.deptId,
-          deptName: resource.deptName,
+      // 添加收藏
+      const addCollect = (item) => {
+        console.log('收藏===============>', item, flag.value)
+        if (flag.value && item.id) {
+          flag.value = false
+          if (item.isCollect == 'true') {
+            scDel([item.id]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('取消成功')
+                item.isCollect = 'false'
+                item.collectCount--
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          } else {
+            scInsert([
+              {
+                resourceId: item.id,
+              },
+            ]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('添加收藏成功！')
+                item.isCollect = 'true'
+                item.collectCount++
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          }
         }
-        _applyList.push(obj)
-      })
-      _applyList = jcss.concat(_applyList)
-      localStorage.setItem('applyList', JSON.stringify(_applyList))
-      router.push({
-        path: '/apply',
-        query: {
-          integrationServicesId: item.id,
-        },
-      })
-    }
-    
-    mybus.on('chongzhi', (typeObj) => {
-      if (!typeObj) {
-        selData.value = 'total'
       }
-      if (
-        typeObj &&
-        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
-      ) {
-        integrationServiceOrderDom.value.reset &&
-          integrationServiceOrderDom.value.reset()
-      }
-    })
 
-    let videoUrl = ref('')
-    const options = reactive({
-      width: '700px', //播放器宽度
-      height: '400px', //播放器高度
-      color: '#409eff', //主题色
-      title: '', //视频名称
-      src: '', //视频源
-      type: 'm3u8', // 视频源类型
-      muted: false, //静音
-      webFullScreen: false,
-      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-      autoPlay: true, //自动播放
-      loop: false, //循环播放
-      mirror: false, //镜像画面
-      ligthOff: false, //关灯模式
-      volume: 0.3, //默认音量大小
-      control: true, //是否显示控制
-      controlBtns: [
-        'audioTrack',
-        'quality',
-        'speedRate',
-        'volume',
-        'setting',
-        'pip',
-        'pageFullScreen',
-        'fullScreen',
-      ], //显示所有按钮,
-    })
-    let visible = ref(false)
-    // 打开视频预览
-    const openVideo = (item) => {
-      videoUrl.value = ''
-      const param = {
-        key: item.link,
+      /**更换查询条件
+       * val: 排序字段值
+       * isFromFather: 是否来自父组件传值
+       */
+      const changeCondition = (item, isFromFather = false) => {
+        console.log('item, isFromFather------------>', item, isFromFather)
+        let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC'
+        if (isFromFather) {
+          newType = item.orderType
+        }
+        orderObj.orderField = item.value
+        orderObj.orderType = newType
+        let _index = selList.value.findIndex((x) => x.value == item.value)
+        if (_index > -1) {
+          selList.value[_index].orderType = newType
+        }
+        selList.value = selList.value.splice(0)
+        mybus.emit('changeCondition', orderObj)
       }
-      getHls(param).then((res) => {
-        console.log('获取视频地址===============>', res)
-        // videoUrl.value = res.data.data
-        options.src = res.data.data
-        visible.value = true
+
+      // 融合服务--一键申请
+      const handleAKeyApplication = (item) => {
+        let _applyList = []
+        let fuseResourceList = item.fuseResourceList || []
+        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
+        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
+        jcssArray = jcssArray.map((v) => {
+          v = Object.assign(v, v.resource)
+          return v
+        })
+        let jcss = [
+          {
+            arr: [
+              {
+                description: '',
+                note1: JSON.stringify(jcssArray),
+                resourceId: '1522550195055828996',
+                resourceName: '摄像头列表',
+                type: '基础设施',
+              },
+            ],
+            deptId: '',
+            deptName: '',
+          },
+        ]
+        if (infrastructure) {
+          jcss[0].deptId = infrastructure.deptId
+          jcss[0].deptName = infrastructure.deptName
+        }
+        otherArray.map((v) => {
+          let resource = v.resource || {}
+          let obj = {
+            arr: [
+              {
+                delFlag: resource.delFlag,
+                description: resource.description,
+                resourceId: resource.id,
+                resourceName: resource.name,
+                time: resource.createDate,
+                type: resource.type,
+              },
+            ],
+            deptId: resource.deptId,
+            deptName: resource.deptName,
+          }
+          _applyList.push(obj)
+        })
+        _applyList = jcss.concat(_applyList)
+        localStorage.setItem('applyList', JSON.stringify(_applyList))
+        router.push({
+          path: '/apply',
+          query: {
+            integrationServicesId: item.id,
+          },
+        })
+      }
+
+      mybus.on('chongzhi', (typeObj) => {
+        if (!typeObj) {
+          selData.value = 'total'
+        }
+        if (
+          typeObj &&
+          (typeObj.type === '融合服务' || typeObj.type === '打包模式')
+        ) {
+          integrationServiceOrderDom.value.reset &&
+            integrationServiceOrderDom.value.reset()
+        }
       })
-    }
-    // 算法对比跳转
-    const goComparePk = (item) => {
-      router.push({
-        path: '/algorithmCompare',
-        query: {
-          id: item.id,
-        },
+
+      let videoUrl = ref('')
+      const options = reactive({
+        width: '700px', //播放器宽度
+        height: '400px', //播放器高度
+        color: '#409eff', //主题色
+        title: '', //视频名称
+        src: '', //视频源
+        type: 'm3u8', // 视频源类型
+        muted: false, //静音
+        webFullScreen: false,
+        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+        autoPlay: true, //自动播放
+        loop: false, //循环播放
+        mirror: false, //镜像画面
+        ligthOff: false, //关灯模式
+        volume: 0.3, //默认音量大小
+        control: true, //是否显示控制
+        controlBtns: [
+          'audioTrack',
+          'quality',
+          'speedRate',
+          'volume',
+          'setting',
+          'pip',
+          'pageFullScreen',
+          'fullScreen',
+        ], //显示所有按钮,
       })
-    }
-    return {
-      onSearch,
-      resultList,
-      toView,
-      addShoppingCart,
-      changeCondition,
-      selData,
-      selList,
-      addCollect,
-      cardType,
-      findComponentName,
-      shoppingKey,
-      openVideo,
-      videoUrl,
-      options,
-      visible,
-      goComparePk,
-      whoShow1,
-      showKey,
-      handleAKeyApplication,
-      integrationServiceOrderDom,
-      orderObj,
-      getTagList,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('chongzhi')
-    // mybus.emit('changeSelcted')
-  },
-}
+      let visible = ref(false)
+      // 打开视频预览
+      const openVideo = (item) => {
+        videoUrl.value = ''
+        const param = {
+          key: item.link,
+        }
+        getHls(param).then((res) => {
+          console.log('获取视频地址===============>', res)
+          // videoUrl.value = res.data.data
+          options.src = res.data.data
+          visible.value = true
+        })
+      }
+      // 算法对比跳转
+      const goComparePk = (item) => {
+        router.push({
+          path: '/algorithmCompare',
+          query: {
+            id: item.id,
+          },
+        })
+      }
+      return {
+        onSearch,
+        resultList,
+        toView,
+        addShoppingCart,
+        changeCondition,
+        selData,
+        selList,
+        addCollect,
+        cardType,
+        findComponentName,
+        shoppingKey,
+        openVideo,
+        videoUrl,
+        options,
+        visible,
+        goComparePk,
+        whoShow1,
+        showKey,
+        handleAKeyApplication,
+        integrationServiceOrderDom,
+        orderObj,
+        getTagList,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('chongzhi')
+      // mybus.emit('changeSelcted')
+    },
+  }
 </script>
 <style scoped lang="less">
-#search-result-list-container {
-  width: 1088px;
-  padding: 0 20px;
-  background: #f3f5f9;
+  #search-result-list-container {
+    width: 1088px;
+    padding: 0 20px;
+    background: #f3f5f9;
 
-  .detail-content {
-    // 超出
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 130px;
-    display: inline-block;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    // margin: 11px 0 20px;
-    // background: #e5f2ff;
-    // padding-left: 20px;
-    display: flex;
-    align-items: center;
-    position: relative;
-
-    .circle {
-      width: 16px;
-      height: 16px;
-      border-radius: 50%;
-      background-color: #0087ff;
-      text-align: center;
-      color: #fff;
-      line-height: 16px;
-      margin-right: 21px;
+    .detail-content {
+      // 超出
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 130px;
+      display: inline-block;
     }
 
-    .result {
-      font-size: 14px;
-      font-weight: 500;
-      color: #212121;
+    .shai-xuan {
+      width: 1047px;
+      height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-      span {
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      ul {
-        display: flex;
+      .result {
+        font-size: 14px;
+        font-weight: 500;
+        color: #212121;
 
-        li {
-          width: 90px;
-          height: 12px;
-          text-align: center;
-          cursor: pointer;
+        span {
+          font-size: 18px;
+          color: #0087ff;
+        }
+      }
+
+      .condition {
+        position: absolute;
+        right: 20px;
+        top: 10px;
+
+        ul li {
+          list-style-type: none;
+        }
+
+        ul {
           display: flex;
-          justify-content: center;
-          align-items: center;
 
-          .arrow {
-            display: inline-block;
-            width: 12px;
+          li {
+            width: 90px;
             height: 12px;
-            background: url('~@/assets/newHome/arrow.png');
-            margin-left: 10px;
-          }
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-          .down {
-            background: url('~@/assets/newHome/down.png');
-            margin-top: 6px;
+            .arrow {
+              display: inline-block;
+              width: 12px;
+              height: 12px;
+              background: url('~@/assets/newHome/arrow.png');
+              margin-left: 10px;
+            }
+
+            .down {
+              background: url('~@/assets/newHome/down.png');
+              margin-top: 6px;
+            }
           }
         }
       }
     }
-  }
 
-  .result-list {
-    width: 1048px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-    border-top: 1px rgba(150, 144, 144, 0.3) solid;
-    padding: 10px 0;
-
-    .item {
-      width: 100%;
-      margin-top: 10px;
+    .result-list {
+      width: 1048px;
       display: flex;
-      align-items: center;
+      flex-direction: column;
+      flex-wrap: wrap;
+      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+      border-top: 1px rgba(150, 144, 144, 0.3) solid;
+      padding: 10px 0;
 
-      .left {
-        display: inline-block;
-        width: 120px;
-        height: 110px;
-        margin-right: 16px;
-      }
-
-      .right {
+      .item {
         width: 100%;
-      }
-
-      .yyzy {
-        background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .sjzy {
-        background: url('~@/assets/home/sjzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .znsf {
-        background: url('~@/assets/home/znsf_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .tcfw {
-        background: url('~@/assets/home/tcfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .kfzj {
-        background: url('~@/assets/home/kfzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .ywzj {
-        background: url('~@/assets/home/ywzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .rhfw {
-        background: url('~@/assets/home/rhfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .jcss {
-        background: url('~@/assets/home/sxt_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .header {
+        margin-top: 10px;
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        margin: 0 10px 0 0;
 
-        .header-right {
+        .left {
+          display: inline-block;
+          width: 120px;
+          height: 110px;
+          margin-right: 16px;
+        }
+
+        .right {
+          width: 100%;
+        }
+
+        .yyzy {
+          background: url('~@/assets/home/yyzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .sjzy {
+          background: url('~@/assets/home/sjzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .znsf {
+          background: url('~@/assets/home/znsf_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .tcfw {
+          background: url('~@/assets/home/tcfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .kfzj {
+          background: url('~@/assets/home/kfzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .ywzj {
+          background: url('~@/assets/home/ywzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .rhfw {
+          background: url('~@/assets/home/rhfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .jcss {
+          background: url('~@/assets/home/sxt_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .header {
           display: flex;
-          font-size: 14px;
-          color: #212121;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
 
-          span {
+          .header-right {
+            display: flex;
             font-size: 14px;
             color: #212121;
+
+            span {
+              font-size: 14px;
+              color: #212121;
+            }
+
+            div {
+              margin-right: 24px;
+            }
+
+            .label-content {
+              flex: 1;
+              display: flex;
+              justify-content: flex-end;
+
+              .label {
+                padding: 0.01rem 0.1rem;
+                margin-right: 0.1rem;
+                border-radius: 0.13rem;
+                background: #0087ff;
+                color: #fff;
+              }
+            }
           }
 
+          .header-right:last-child {
+            div {
+              margin-right: 16px;
+            }
+          }
+
+          span {
+            font-size: 20px;
+            font-weight: 600;
+            // color: #0087ff;
+          }
+        }
+
+        .dec {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // white-space: nowrap;
+          color: #0058e1;
+          display: flex;
+          margin-top: 10px;
+
           div {
-            margin-right: 24px;
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
           }
 
-          .label-content {
+          div:nth-child(2) {
+            max-width: 200px;
+            display: -webkit-box;
+            /*设置为弹性盒子*/
+            -webkit-line-clamp: 1;
+            /*最多显示3行*/
+            overflow: hidden;
+            /*超出隐藏*/
+            text-overflow: ellipsis;
+            /*超出显示为省略号*/
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .btn {
+          display: flex;
+          justify-content: space-between;
+          font-size: 14px;
+          margin: 5px 0;
+
+          // .left {
+          //   width: 600px;
+          //   display: flex;
+          //   justify-content: space-between;
+          //   flex-wrap: wrap;
+          //   & > div {
+          //     width: 300px;
+          //     & > span {
+          //       color: #0087ff;
+          //       font-weight: 600;
+          //     }
+          //   }
+          // }
+          .right {
             flex: 1;
             display: flex;
             justify-content: flex-end;
+            margin: 0 10px;
+            align-items: center;
 
-            .label {
-              padding: 0.01rem 0.1rem;
-              margin-right: 0.1rem;
-              border-radius: 0.13rem;
-              background: #0087ff;
-              color: #fff;
+            .shopping {
+              span {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 10px;
+                margin-top: 5px;
+              }
+
+              .shopping-on {
+                background: url('~@/assets/newHome/shopping-on.png');
+                cursor: pointer;
+              }
+
+              .shopping-down {
+                background: url('~@/assets/newHome/shopping-down.png');
+              }
             }
-          }
-        }
 
-        .header-right:last-child {
-          div {
-            margin-right: 16px;
-          }
-        }
-
-        span {
-          font-size: 20px;
-          font-weight: 600;
-          // color: #0087ff;
-        }
-      }
-
-      .dec {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        // white-space: nowrap;
-        color: #0058e1;
-        display: flex;
-        margin-top: 10px;
-
-        div {
-          margin-right: 10px;
-          background: rgba(0, 88, 225, 0.1);
-          padding-left: 10px;
-          padding-right: 10px;
-        }
-
-        div:nth-child(2) {
-          max-width: 200px;
-          display: -webkit-box;
-          /*设置为弹性盒子*/
-          -webkit-line-clamp: 1;
-          /*最多显示3行*/
-          overflow: hidden;
-          /*超出隐藏*/
-          text-overflow: ellipsis;
-          /*超出显示为省略号*/
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
-      }
-
-      .btn {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-        margin: 5px 0;
-
-        // .left {
-        //   width: 600px;
-        //   display: flex;
-        //   justify-content: space-between;
-        //   flex-wrap: wrap;
-        //   & > div {
-        //     width: 300px;
-        //     & > span {
-        //       color: #0087ff;
-        //       font-weight: 600;
-        //     }
-        //   }
-        // }
-        .right {
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
-
-          .shopping {
-            span {
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
+              background: url('~@/assets/newHome/pk-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
-              background: url('~@/assets/newHome/shopping-down.png');
-            }
-          }
-
-          .pk-on {
-            display: inline-block;
-            height: 32px;
-            width: 32px;
-            margin-left: 10px;
-            margin-right: 10px;
-            margin-top: 5px;
-            background: url('~@/assets/newHome/pk-on.png');
-            cursor: pointer;
-          }
-
-          .sc {
-            // margin-top: 4px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-
-            .sc-down {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-down.png');
-            }
-
-            .sc-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-on.png');
-            }
-          }
-
-          .ant-btn {
-            background: transparent;
-            background: #0058e1;
-            color: white;
-            width: 80px;
-            height: 32px;
-            font-weight: 600;
-            border-radius: 2px;
-            text-align: center;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 10px;
-          }
-
-          .ant-btn:last-child {
-            background: #0058e1;
-            color: white;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-        align-items: center;
-
-        &>div {
-          display: flex;
-          align-items: center;
-
-          &>div {
-            margin: 0 10px;
-          }
-        }
-
-        .pingfen {
-          :deep(span) {
-            display: flex;
-            align-items: center;
-
-            :deep(ul) {
+            .sc {
+              // margin-top: 4px;
+              cursor: pointer;
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
-                margin-right: 4px;
+              .sc-down {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-down.png');
+              }
+
+              .sc-on {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-on.png');
+              }
+            }
+
+            .ant-btn {
+              background: transparent;
+              background: #0058e1;
+              color: white;
+              width: 80px;
+              height: 32px;
+              font-weight: 600;
+              border-radius: 2px;
+              text-align: center;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-left: 10px;
+            }
+
+            .ant-btn:last-child {
+              background: #0058e1;
+              color: white;
+            }
+          }
+        }
+
+        .bottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10px;
+          align-items: center;
+
+          & > div {
+            display: flex;
+            align-items: center;
+
+            & > div {
+              margin: 0 10px;
+            }
+          }
+
+          .pingfen {
+            :deep(span) {
+              display: flex;
+              align-items: center;
+
+              :deep(ul) {
+                display: flex;
+                align-items: center;
+
+                :deep(.ant-rate-star:not(:last-child)) {
+                  margin-right: 4px;
+                }
               }
             }
           }
         }
       }
-    }
 
-    .item:nth-of-type(1) {
-      margin-top: 0;
+      .item:nth-of-type(1) {
+        margin-top: 0;
+      }
     }
   }
-}
 
-.description {
-  max-width: 990px;
-  height: 52px;
-  font-size: 14px;
-  line-height: 18px;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  /*最多显示3行*/
-  overflow: hidden;
-  /*超出隐藏*/
-  text-overflow: ellipsis;
-  /*超出显示为省略号*/
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
+  .description {
+    max-width: 990px;
+    height: 52px;
+    font-size: 14px;
+    line-height: 18px;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    /*最多显示3行*/
+    overflow: hidden;
+    /*超出隐藏*/
+    text-overflow: ellipsis;
+    /*超出显示为省略号*/
+    -webkit-box-orient: vertical;
+    word-break: break-all;
+  }
 </style>
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index c765c810..08310675 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -7,7 +7,7 @@
         <div class="name">组件服务</div>
         <div class="sl">
           <span class="num">{{ zjNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -18,7 +18,7 @@
         <div class="name">应用资源</div>
         <div class="sl">
           <span class="num">{{ yyNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -29,7 +29,7 @@
         <div class="name">基础设施</div>
         <div class="sl">
           <span class="num">{{ jcNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -51,7 +51,7 @@
         <div class="name">知识库</div>
         <div class="sl">
           <span class="num">{{ zsNum || 0 }}</span>
-          个
+          条
         </div>
       </div>
     </a-tooltip>
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index f9b7ef49..2baeff7a 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -32,9 +32,9 @@
               <div class="img" :class="item.imgType"></div>
             </div>
             <div class="item-right">
-              <div class="fw" v-if="select == '浏览量'">
+              <!-- <div class="fw" v-if="select == '浏览量'">
                 {{ select }}:{{ item.visits }}
-              </div>
+              </div> -->
               <div class="fw" v-if="select == '申请量'">
                 {{ select }}:{{ item.applyCount }}
               </div>
@@ -139,7 +139,7 @@
       path: '/DetailsPageconetent',
       query: {
         // select: '组件服务',
-        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
       },
     })
   }