合并

front/public/static/css/modal.css

@@ -104,3 +104,8 @@
     font-family: 'Alibaba PuHuiTi';
     src: url('~@/assets/home/font/Alibaba-PuHuiTi-Light.otf');
 }
+
+/* 气泡提示框按钮居中 */
+.ant-popover-inner-content .ant-popover-buttons {
+    text-align: center;
+}

front/src/api/home.js

@@ -507,3 +507,12 @@ export function getMaxApplyNum(number) {
     method: 'get',
   })
 }
+
+// 市局-能力广场-算法广场和GIS广场根据区域查询列表
+export function getGisByArea(data) {
+  return request({
+    url: '/resource/getSquareList',
+    method: 'post',
+    data
+  })
+}

front/src/views/capacitySquare/components/algorithm.vue

@@ -9,10 +9,10 @@
         </div>
         <div class="bottom" v-show="selectFlag">
           <span class="light"></span>
-          <div @click="getList('全市')">全市</div>
+          <div @click="changeDeptType('全市')">全市</div>
-          <div @click="getList('市级')">市级</div>
+          <div @click="changeDeptType('市级')">市级</div>
-          <div @click="getList('区级')">区级</div>
+          <div @click="changeDeptType('区级')">区级</div>
-          <div @click="getList('企业')">企业</div>
+          <div @click="changeDeptType('企业')">企业</div>
         </div>
       </div>
       <div class="select">
@@ -22,7 +22,7 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="getList2(val)">
+          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
             {{ val }}
           </div>
         </div>
@@ -47,11 +47,11 @@
 </template>
 <script setup>
 import { getCategoryTreePage } from '@/api/personalCenter'
-import { pageWithAttrs } from '@/api/abilityStatistics'
+import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
 
 
-const type = ref(null)
+const deptType = ref(null)
 const typeName = ref('全市')
 const typeName2 = ref('全部')
 const dictList = ref([])
@@ -71,25 +71,16 @@ getCategoryTreePage({
   })
 })
 const params = {
-  deptIds: [],
-  districtId: '',
-  infoList: [{ attrType: '组件类型', attrValue: '智能算法' }],
-  orderField: 'pin_top',
-  orderType: 'DESC',
   pageNum: 1,
-  pageSize: 9,
+  type: '智能算法',
-  type: '组件服务',
+  area: typeName2.value == '全部' ? '' : typeName2.value,
+  pageSize: 9 // 固定9
 }
-const getList2 = (val) => {
+
+// 切换领域
+const changeAreaFunction = (val) => {
   typeName2.value = val
-  if (val == '全部') {
+  params.area = typeName2.value == '全部' ? '' : typeName2.value;
-    params.infoList = [{ attrType: '组件类型', attrValue: '智能算法' }]
-  } else {
-    params.infoList = [
-      { attrType: '组件类型', attrValue: '智能算法' },
-      { attrType: '应用领域', attrValue: val },
-    ]
-  }
   selectFlag2.value = false
   pageWithAttrsFunction()
 }
@@ -99,24 +90,20 @@ const dataLength = ref(true)
 const isNoMore = ref(false)
 let url = ref('')
 const pageWithAttrsFunction = () => {
-  pageWithAttrs(params).then((res) => {
+  getGisByArea(params).then((res) => {
-    dataList.value = res.data.data.records
+    dataList.value = res.data.data.list
-    if (res.data.data.records.length < 9) {
+    if (res.data.data.list.length < 9) {
       dataLength.value = false
     }
   })
 }
 pageWithAttrsFunction()
+
 //图片显示
 const algorithmCardPhoto = (List, item) => {
-  let obj = List.filter((item) => item.attrType === '应用场景')[0]
+  let _arr = List && item && List.filter((item) => item.attrType === '应用场景') || []
+  let obj = _arr[0]
   if (obj && obj.attrValue != '') {
-    console.log(
-      item.name,
-      item.id,
-      obj.attrValue,
-      '----------------------------'
-    )
     obj = JSON.parse(obj.attrValue)[0].img
   }
   return obj || ''
@@ -137,9 +124,9 @@ const algorithmFunction = (e) => {
     // 当前滚动条已经触底
     isNoMore.value = true
     params.pageNum++
-    pageWithAttrs(params).then((res) => {
+    getGisByArea(params).then((res) => {
-      dataList.value.push(...res.data.data.records)
+      dataList.value.push(...res.data.data.list)
-      if (res.data.data.records.length < 9) {
+      if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })
@@ -148,32 +135,52 @@ const algorithmFunction = (e) => {
   }
 }
 
-const getList = (str) => {
+// 切换区市
+const changeDeptType = (str) => {
   if (str) {
-    algorithmclassDom.scrollTop = 0
+    if (algorithmclassDom) {
+      algorithmclassDom.scrollTop = 0;
+    }
     switch (str) {
       case '全市':
-        type.value = null
+        deptType.value = null
         typeName.value = '全 市'
         break
       case '市级':
-        type.value = 2
+        deptType.value = 2
         typeName.value = '市 级'
         break
       case '区级':
-        type.value = 3
+        deptType.value = 3
         typeName.value = '区 级'
         break
       case '企业':
-        type.value = 4
+        deptType.value = 4
         typeName.value = '企 业'
         break
     }
-    params.pageNum = 1
+    params.pageNum = 1;
+    params.deptType = deptType.value;
   }
   selectFlag.value = false
-  alert('调取接口')
+  getData(str)
-  // getData(str)
+}
+
+const getData = (str) => {
+  getGisByArea(params).then((res) => {
+    const resData = res.data.data || {}
+    if (resData.list.length > 0 && resData.list.length < 9) {
+      algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+    }
+    dataList.value = resData.list || []
+    nextTick(() => {
+      algorithmclassDom = document.querySelector('.algorithm-box')
+      if (str && algorithmclassDom) {
+        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+        algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+      }
+    })
+  })
 }
 
 onMounted(() => {

front/src/views/capacitySquare/components/application.vue

@@ -121,16 +121,19 @@
       type: type.value,
       area: area.value,
     }).then((res) => {
-      if (res.data.data.length < 9) {
+      console.log('res---应用广场--------->', res);
+      
+      if (res.data.data.total.length < 9) {
         dom.removeEventListener('scroll', viewMonitor, true)
       }
-      res.data.data.map((val) => {
+      // appList
+      res.data.data.appList.map((val) => {
         if (!val.pic) {
           val.pic = require('@/assets/capacitySquare/yyzy.jpg')
         }
         val.pic2 = require('@/assets/capacitySquare/yyzy.jpg')
       })
-      data.list.push(...res.data.data)
+      data.list.push(...res.data.data.appList)
       selectFlag.value = false
       nextTick(() => {
         dom = document.querySelector('.item-box')

front/src/views/capacitySquare/components/layer.vue

@@ -9,10 +9,10 @@
         </div>
         <div class="bottom" v-show="selectFlag">
           <span class="light"></span>
-          <div @click="getList('全市')">全市</div>
+          <div @click="changeDeptType('全市')">全市</div>
-          <div @click="getList('市级')">市级</div>
+          <div @click="changeDeptType('市级')">市级</div>
-          <div @click="getList('区级')">区级</div>
+          <div @click="changeDeptType('区级')">区级</div>
-          <div @click="getList('企业')">企业</div>
+          <div @click="changeDeptType('企业')">企业</div>
         </div>
       </div>
       <div class="select">
@@ -22,7 +22,7 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="getList2(val)">
+          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
             {{ val }}
           </div>
         </div>
@@ -46,10 +46,10 @@
 </template>
 <script setup>
 import { getCategoryTreePage } from '@/api/personalCenter'
-import { pageWithAttrs } from '@/api/abilityStatistics'
+import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
 
-const type = ref(null)
+const deptType = ref(null)
 const typeName = ref('全市')
 const typeName2 = ref('全部')
 const dictList = ref([])
@@ -69,43 +69,35 @@ getCategoryTreePage({
   })
 })
 const params = {
-  deptIds: [],
-  districtId: '',
-  infoList: [{ attrType: '组件类型', attrValue: '图层服务' }],
-  orderField: 'deptSort',
-  orderType: 'DESC',
   pageNum: 1,
-  pageSize: 9,
+  type: '图层服务',
-  type: '组件服务',
+  area: typeName2.value == '全部' ? '' : typeName2.value,
+  pageSize: 9 // 固定9
 }
-const getList2 = (val) => {
+
+// 切换领域
+const changeAreaFunction = (val) => {
   typeName2.value = val
-  if (val == '全部') {
+  params.area = typeName2.value == '全部' ? '' : typeName2.value;
-    params.infoList = [{ attrType: '组件类型', attrValue: '图层服务' }]
-  } else {
-    params.infoList = [
-      { attrType: '组件类型', attrValue: '图层服务' },
-      { attrType: '应用领域', attrValue: val },
-    ]
-  }
   selectFlag2.value = false
   pageWithAttrsFunction()
 }
+
 let algorithmclassDom = null
 const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg'))
 const dataLength = ref(true)
 const isNoMore = ref(false)
 const pageWithAttrsFunction = () => {
-  pageWithAttrs(params).then((res) => {
+  getGisByArea(params).then((res) => {
-    dataList.value = res.data.data.records
+    dataList.value = res.data.data.list
-    if (res.data.data.records.length < 9) {
+    if (res.data.data.list.length < 9) {
       dataLength.value = false
     }
   })
 }
 pageWithAttrsFunction()
 //图片显示
-const algorithmCardPhoto = (List) => {
+const algorithmCardPhoto = (List = []) => {
   let url = ''
   List.map((item) => {
     if (item.attrType === '图层缩略图') {
@@ -119,32 +111,51 @@ const detailFunction = (id) => {
   window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
 }
 
-const getList = (str) => {
+const changeDeptType = (str) => {
   if (str) {
+    if(algorithmclassDom) {
       algorithmclassDom.scrollTop = 0
+    }
     switch (str) {
       case '全市':
-        type.value = null
+        deptType.value = null
         typeName.value = '全 市'
         break
       case '市级':
-        type.value = 2
+        deptType.value = 2
         typeName.value = '市 级'
         break
       case '区级':
-        type.value = 3
+        deptType.value = 3
         typeName.value = '区 级'
         break
       case '企业':
-        type.value = 4
+        deptType.value = 4
         typeName.value = '企 业'
         break
     }
-    params.pageNum = 1
+    params.pageNum = 1;
+    params.deptType = deptType.value;
   }
   selectFlag.value = false
-  alert('调取接口')
+  getData(str)
-  // getData(str)
+}
+
+const getData = (str) => {
+  getGisByArea(params).then((res) => {
+    const resData = res.data.data || {}
+    if (resData.list.length > 0 && resData.list.length < 9) {
+      algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+    }
+    dataList.value = resData.list || []
+    nextTick(() => {
+      algorithmclassDom = document.querySelector('.algorithm-box')
+      if (str && algorithmclassDom) {
+        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+        algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+      }
+    })
+  })
 }
 
 const layerFunction = (e) => {
@@ -159,9 +170,9 @@ const layerFunction = (e) => {
     // 当前滚动条已经触底
     isNoMore.value = true
     params.pageNum++
-    pageWithAttrs(params).then((res) => {
+    getGisByArea(params).then((res) => {
-      dataList.value.push(...res.data.data.records)
+      dataList.value.push(...res.data.data.list)
-      if (res.data.data.records.length < 9) {
+      if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })

front/src/views/home/DetailsPageconetent.vue

@@ -752,7 +752,6 @@
     keyongziyuanqingkaungArray,
     shujuziyuanqingkuangArray,
   } from './constantData/showData.js'
-
   export default defineComponent({
     beforeRouteLeave(to, from, next) {
       console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
@@ -771,14 +770,12 @@
         flag.value = value
       }
       const titleName = ref(titleNameArray)
-
       const openMonitor = () => {
         window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
       // 模糊查询
       const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
       const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
-
       // 青岛数据资源页
       const whoShow1 = ref(whoShow)
       // 分页
@@ -821,16 +818,13 @@
         orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
-
       const store = useStore()
       // 用户信息
       const user = ref({
         username: store.getters['user/username'],
         realName: store.getters['user/realName'],
       })
-
       const searchResultListDom = ref(null)
-
       // 读取本地存储查询条件
       let storageSearchInfo = null
       const handleSetSearchData = () => {
@@ -855,7 +849,6 @@
           paramsGetResources.pageSize = storageSearchInfo.pageSize
           paramsGetResources.deptIds = storageSearchInfo.deptIds
           paramsGetResources.districtId = storageSearchInfo.districtId
-
           // 延迟使用，因为还没有返回跟挂载
           nextTick(() => {
             searchResultListDom.value.changeCondition(
@@ -868,7 +861,6 @@
           })
         }
       }
-
       //西海岸查询参数
       let paramsGetResources2 = ref({
         regionId: '70be8c5b664f4bcf869d82f2e8335051',
@@ -903,7 +895,6 @@
           paramsGetResources
         )
       }
-
       // 重置数据
       const chongzhi = (flag) => {
         loading.value = true
@@ -944,7 +935,6 @@
         )
         getAppResources()
       }
-
       //跳转链接
       function dianjitiaozhaun(name) {
         switch (name) {
@@ -958,14 +948,12 @@
             break
         }
       }
-
       // 点击筛选条件回调
       const handleChange = (tag, checked, name) => {
         loading.value = true
         paramsGetResources.pageNum = 1
         currentPage.value = 1
         console.log('点击筛选条件=================>', tag, checked, name)
-
         // 西海岸-智能算法 特殊处理
         if (whoShow1.value.itShowXiHaiAn) {
           if (tag.dict_label == '智能算法' && checked) {
@@ -981,7 +969,6 @@
             }
           }
         }
-
         ListContent.records.forEach((val) => {
           if (!val) {
             return
@@ -990,7 +977,6 @@
             paramsGetResources.infoList = paramsGetResources.infoList.filter(
               (item) => item.attrType !== name
             )
-
             if (
               val.selectedTags &&
               val.selectedTags.indexOf(tag.dict_label) == -1
@@ -1007,7 +993,6 @@
                   1
                 )
             }
-
             // 西海岸-智能算法 特殊处理
             if (whoShow1.value.itShowXiHaiAn) {
               if (
@@ -1055,7 +1040,6 @@
               if (searchValue.value) {
                 paramsGetResources.name = searchValue.value
               }
-
               pageWithAttrs(paramsGetResources).then((res) => {
                 resourceList.data = []
                 resourceList.data = res.data.data.records || []
@@ -1086,7 +1070,6 @@
               val.showShrink = true
               val.shrinkFlag = true
             }
-
             if (storageSearchInfo) {
               let obj = (storageSearchInfo.infoList || []).find(
                 (x) => x.attrType === val.name
@@ -1118,7 +1101,7 @@
                 val.selectedTags.indexOf(selectSubType) == -1
               ) {
                 val.selectedTags = [selectSubType]
-                // changeShrink(queryName.value)
+                changeShrink(queryName.value)
               } else {
                 val.selectedTags &&
                   val.selectedTags.splice(
@@ -1411,7 +1394,6 @@
           }
         }
       }
-
       // 青岛-数据处理
       const getQingDao = (res) => {
         ;((res.data && res.data.data && res.data.data.data) || []).forEach(
@@ -1444,7 +1426,6 @@
         resourceList.data = res.data.data.list || []
         resourceTotal.value = res.data.data.total || ''
       }
-
       let shoppingCartList = ref([])
       // 获取申购车列表
       const getShoppingCartList = (list) => {
@@ -1520,7 +1501,6 @@
           paramsGetResources
         )
       })
-
       mybus.on('changeCondition', (condition) => {
         if (!storageSearchInfo) {
           // 回到第一页，分页页码为1
@@ -1541,7 +1521,6 @@
           paramsGetResources
         )
       })
-
       const pageChange = (val) => {
         console.log('pageChange------------>', val)
         loading.value = true
@@ -1553,7 +1532,6 @@
           paramsGetResources
         )
       }
-
       // 判断是否存在二级类型（首页-能力分类-图层服务）查询条件
       const judgeHasSubSelectType = () => {
         if (selectSubType) {
@@ -1571,18 +1549,16 @@
           let info = { attrType: queryName.value, attrValue: selectSubType }
           paramsGetResources.infoList.push(info)
         }
-        // changeShrink(queryName.value)
+        changeShrink(queryName.value)
         paramsGetResources.type = select
         console.log(
           'paramsGetResources---onMounted--------->',
           paramsGetResources
         )
       }
-
       onMounted(() => {
         // 从本地读取查询条件，赋值
         handleSetSearchData()
-
         listKey2.value++
         // 获取筛选条件
         getNewList()
@@ -1620,7 +1596,6 @@
       watch(currentPageSize, () => {
         console.log('pageSize', currentPageSize.value)
       })
-
       const changeShrink = (name) => {
         console.log('name---changeShrink--------->', name)
         ListContent.records.forEach((val) => {
@@ -1701,7 +1676,6 @@
         visibleAbilitySquare.value = false
         abilitySquareFunctionData.value = '智能算法'
       }
-
       // 存储查询条件到本地 todo
       const saveSearchCodition = () => {
         console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
@@ -1710,7 +1684,6 @@
           JSON.stringify(paramsGetResources)
         )
       }
-
       return {
         listKey,
         ListContent,
@@ -1790,15 +1763,12 @@
     font-family: 'webfont';
     src: url('~@/assets/capacitySquare/webfont.ttf');
   }
-
   .resultListSearchInput-father {
     background: #f3f5f9;
     padding: 0.2rem;
-
     .resultListSearchInput-son {
       background: #fff;
       padding: 0.2rem 0.2rem 0rem 0.3rem;
-
       .hengxian {
         width: 100%;
         height: 0.01rem;
@@ -1807,17 +1777,14 @@
       }
     }
   }
-
   .resultListSearchInput {
     margin-left: 0.1rem;
-
     :deep(.ant-input) {
       width: 4rem;
       height: 0.36rem;
       background: #fff;
       border-radius: 0.04rem;
     }
-
     :deep(.ant-input-search-button) {
       width: 0.8rem;
       height: 0.36rem;
@@ -1829,12 +1796,10 @@
       line-height: 0.34rem;
       margin-left: 0.1rem;
     }
-
     :deep(.ant-input-group-addon) {
       left: 0 !important;
     }
   }
-
   .button-reset {
     border: 0;
     outline: none;
@@ -1849,7 +1814,6 @@
     margin-left: 2.5rem;
     cursor: pointer;
   }
-
   .details-pageconetent {
     height: 100%;
     width: 100%;
@@ -1859,7 +1823,6 @@
     margin-top: 0.67rem;
     position: relative;
     background: rgba(245, 243, 243, 0.3);
-
     .details-pageconetent-left {
       max-height: 6.9rem;
       position: absolute;
@@ -1869,7 +1832,6 @@
       margin-right: 0.17rem;
       overflow: auto;
     }
-
     .top {
       min-height: 7.2rem;
       position: relative;
@@ -1881,33 +1843,26 @@
       justify-content: left;
       margin-left: 2.5rem;
       background: #f3f5f9;
-
       .pagination {
         background: #f3f5f9;
         padding-bottom: 0.6rem;
       }
-
       .jichusheshi {
         height: 4.45rem;
-
         .yunziyuan {
           width: 100%;
           position: relative;
-
           .shuoming {
             position: absolute;
             right: 0.2rem;
             top: 0.15rem;
             font-size: 0.12rem;
           }
-
           .yunziyuan-title {
             display: flex;
             align-items: center;
-
             .tupian {
             }
-
             .title {
               margin-left: 0.1rem;
               font-weight: 600;
@@ -1915,44 +1870,35 @@
               cursor: pointer;
             }
           }
-
           .fenlei {
             display: flex;
             margin-left: 0.2rem;
             margin-right: 0.3rem;
             justify-content: space-between;
           }
-
           .keyongziyuan {
             display: flex;
             justify-content: space-between;
             margin-left: 0.3rem;
             margin-right: 0.3rem;
-
             div {
               display: flex;
-
               div:last-child {
                 font-weight: 600;
               }
             }
           }
         }
-
         .yunziyuan > div {
           margin-bottom: 0.1rem;
         }
-
         .shipin {
           width: 100%;
-
           .shipin-title {
             display: flex;
             align-items: center;
-
             .tupian {
             }
-
             .title {
               margin-left: 0.1rem;
               font-weight: 600;
@@ -1960,58 +1906,47 @@
               cursor: pointer;
             }
           }
-
           .fenlei {
             display: flex;
             margin-left: 0.2rem;
-
             div {
               margin-right: 0.6rem;
             }
-
             .shuzi {
               font-weight: 600;
             }
           }
         }
-
         .shipin > div {
           margin-bottom: 0.1rem;
         }
       }
-
       .jichusheshi > div {
         padding-top: 0.1rem;
         border-radius: 0.04rem;
         margin-bottom: 0.2rem;
         padding-bottom: 0.4rem;
       }
-
       .shujuziyuan {
         display: flex;
         flex-direction: column;
         justify-content: center;
         padding-top: 0.4rem;
-
         .yunziyuan {
           width: 100%;
           position: relative;
-
           .shuoming {
             position: absolute;
             right: 0.2rem;
             top: 0.15rem;
             font-size: 0.12rem;
           }
-
           .yunziyuan-title {
             display: flex;
             align-items: center;
             margin-left: 0.2rem;
-
             .tupian {
             }
-
             .title {
               margin-left: 0.1rem;
               font-weight: 600;
@@ -2019,35 +1954,29 @@
               cursor: pointer;
             }
           }
-
           .fenlei {
             display: flex;
             margin-left: 0.2rem;
             margin-right: 0.3rem;
             justify-content: space-between;
           }
-
           .keyongziyuan {
             display: flex;
             justify-content: space-between;
             margin-left: 0.3rem;
             margin-right: 0.3rem;
-
             div {
               display: flex;
-
               div:last-child {
                 font-weight: 600;
               }
             }
           }
         }
-
         .yunziyuan > div {
           margin-bottom: 0.1rem;
         }
       }
-
       .shujuziyuan > div {
         background: #eaf4ff;
         padding-top: 0.1rem;
@@ -2055,7 +1984,6 @@
         margin-bottom: 0.2rem;
         padding-bottom: 0.4rem;
       }
-
       .top-title {
         display: flex;
         justify-content: space-around;
@@ -2065,47 +1993,39 @@
         color: #000000;
         line-height: 0.34rem;
         margin-bottom: 0.2rem;
-
         .photo {
           display: inline-block;
           height: 0.44rem;
           width: 0.44rem;
           margin-right: 0.1rem;
         }
-
         div {
           padding: 0 0.1rem;
           cursor: pointer;
           display: flex;
           align-items: center;
         }
-
         div:hover {
           color: #0087ff;
         }
-
         .sel {
           font-weight: 600;
           color: #0087ff;
           border-bottom: 0.02rem solid #0087ff;
         }
       }
-
       .top-content-father {
         width: 100%;
         padding: 0 0.2rem 0.2rem 0.2rem;
         background: #f3f5f9;
         margin-bottom: 0.2rem;
-
         .top-content-son {
           background: #fff;
           padding: 0.2rem 0;
         }
-
         .top-content {
           display: flex;
           margin-top: 0rem;
-
           span:nth-child(1) {
             display: inline-block;
             position: relative;
@@ -2114,24 +2034,20 @@
             text-align: center;
             vertical-align: middle;
           }
-
           .leixingsumfather {
             width: 8.1rem;
             display: inline-block;
             height: 0.3014rem;
             overflow: hidden;
           }
-
           .leixingsumfather2 {
             width: 9.2rem;
           }
-
           .leixingsum {
             display: inline-block;
             cursor: pointer;
             text-align: center;
             margin-top: 0.05rem;
-
             .ant-tag-checkable {
               width: 1rem;
               height: 0.25rem;
@@ -2149,13 +2065,11 @@
               text-align: center;
               line-height: 0.14rem;
             }
-
             :deep(.ant-tag-checkable-checked) {
               margin-left: 0.15rem;
               margin-right: 0.15rem;
               text-align: center;
             }
-
             .ant-tag-checkable:active,
             .ant-tag-checkable-checked {
               // width: 0.85rem;
@@ -2167,7 +2081,6 @@
               border-radius: 0.16rem;
             }
           }
-
           .active {
             font-family: Alibaba PuHuiTi;
             font-weight: 500;
@@ -2175,38 +2088,32 @@
             color: #ffffff;
           }
         }
-
         .top-content:nth-child(1) {
           margin-top: 0rem !important;
         }
       }
     }
   }
-
   .shrinkTag {
     width: 0.5rem;
     display: flex;
     justify-content: center;
     align-items: flex-end;
     margin-bottom: 0.05rem;
-
     span {
       cursor: pointer;
     }
   }
-
   .shrink {
     height: unset !important;
     overflow: unset !important;
   }
-
   .talk-monitor {
     position: fixed;
     bottom: 0.5rem;
     right: 0.1rem;
     z-index: 9999;
     cursor: pointer;
-
     i {
       width: 0.64rem;
       height: 0.64rem;
@@ -2215,7 +2122,6 @@
       background-size: cover;
     }
   }
-
   .abilitySquare {
     width: 0.7rem;
     height: 0.7rem;
@@ -2231,11 +2137,9 @@
     right: 0.1rem;
     cursor: pointer;
     background: #e3edfc;
-
     p {
       margin: 0;
     }
-
     p:nth-child(1) {
       height: 0.35rem;
       width: 0.36rem;
@@ -2243,7 +2147,6 @@
       background-size: 100% 100%;
       background-position: center;
     }
-
     ul {
       background: #ffffff;
       font-family: webfont;
@@ -2256,7 +2159,6 @@
       left: -0.62rem;
       padding: 0;
       margin: 0;
-
       li {
         list-style: none;
         color: #0061ec;
@@ -2265,24 +2167,20 @@
         padding-left: 0.4rem;
         border-bottom: 0.01rem solid #dfd9d9;
       }
-
       li:nth-of-type(1) {
         background: url('~@/assets/home/appIcon.png') no-repeat;
         background-position: 0.18rem center;
       }
-
       li:nth-of-type(2) {
         background: url('~@/assets/home/AiIcon.png') no-repeat;
         background-position: 0.18rem center;
       }
-
       li:nth-of-type(3) {
         border-bottom: none;
         background: url('~@/assets/home/GisIcon.png') no-repeat;
         background-position: 0.18rem center;
       }
     }
-
     ul::after {
       content: '';
       position: absolute;
@@ -2293,7 +2191,6 @@
       border: 0.13rem solid;
       border-color: #fff transparent transparent transparent;
     }
-
     ul::before {
       content: '';
       position: absolute;
@@ -2304,26 +2201,21 @@
       border: 0.13rem solid;
       border-color: #dfd9d9 transparent transparent transparent;
     }
-
     @keyframes ulShowTime {
       0% {
         transform: scale(0);
       }
-
       100% {
         transform: scale(0);
       }
     }
   }
-
   .top-content-father {
     width: 10.87rem;
     padding-left: 0.2rem;
-
     .top-content {
       display: flex;
       margin-top: 0.23rem;
-
       span:nth-child(1) {
         display: inline-block;
         position: relative;
@@ -2335,21 +2227,18 @@
         font-size: 0.16rem;
         margin-left: 0.3rem;
       }
-
       .leixingsumfather {
         width: 7.7rem;
         display: inline-block;
         height: 0.3014rem;
         overflow: hidden;
       }
-
       .leixingsum {
         // width: 1rem;
         display: inline-block;
         cursor: pointer;
         text-align: center;
         margin-top: 0.05rem;
-
         .ant-tag-checkable {
           width: 1rem;
           height: 0.25rem;
@@ -2367,13 +2256,11 @@
           text-align: center;
           line-height: 0.14rem;
         }
-
         :deep(.ant-tag-checkable-checked) {
           margin-left: 0.15rem;
           margin-right: 0.15rem;
           text-align: center;
         }
-
         .ant-tag-checkable:active,
         .ant-tag-checkable-checked {
           width: 0.85rem;
@@ -2384,7 +2271,6 @@
           border-radius: 0.16rem;
         }
       }
-
       .active {
         font-family: Alibaba PuHuiTi;
         font-weight: 500;
@@ -2392,12 +2278,10 @@
         color: #ffffff;
       }
     }
-
     .top-content:nth-child(1) {
       margin-top: 0.41rem !important;
     }
   }
-
   :deep(.ant-card-grid) {
     overflow: hidden;
     white-space: nowrap;

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -142,7 +142,7 @@
                   " @click.stop="downloadFile(item, '附件下载')" class="DownloadAttachment">
                     附件下载
                   </a-button>
-                  <a-button v-if="item.approveStatus === '通过'" @click.stop="switchFunction(item)">
+                  <a-button type="primary" v-if="item.approveStatus === '通过'" @click.stop="switchFunction(item)">
                     查看详情
                   </a-button>
                 </div>