Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/abilityStatistics/index.vue

@@ -190,7 +190,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block" v-if="!detailFlag">
             <el-pagination @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper"
               :total="total" :page-size="pageSize" :current-page="currentPage">
             </el-pagination>

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

@@ -31,8 +31,8 @@
 
     <div class="algorithm-class">
       <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="algorithmCardPhoto(item.infoList, item)" :width="525" :height="275" :fallback="imgSrc"
+        <a-image :src="algorithmCardPhoto(item)" :width="525" :height="275" :fallback="imgSrc" :preview="false">
-          :preview="false"></a-image>
+        </a-image>
 
         <a-tooltip>
           <template #title>{{ item.name }}</template>
@@ -100,13 +100,10 @@ const pageWithAttrsFunction = () => {
 pageWithAttrsFunction()
 
 //图片显示
-const algorithmCardPhoto = (List, item) => {
+const algorithmCardPhoto = (item) => {
-  let _arr = List && item && List.filter((item) => item.attrType === '应用场景') || []
+  let _arr = item.pic && JSON.parse(item.pic)
-  let obj = _arr[0]
+  let _img = _arr[0] && _arr[0].img || ''
-  if (obj && obj.attrValue != '') {
+  return _img
-    obj = JSON.parse(obj.attrValue)[0].img
-  }
-  return obj || ''
 }
 //跳转详情页
 const detailFunction = (id) => {

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

@@ -30,7 +30,7 @@
     </div>
     <div class="algorithm-class">
       <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="algorithmCardPhoto(item.infoList)" :width="525" :height="275" :fallback="imgSrc"
+        <a-image :src="item.pic" :width="525" :height="275" :fallback="imgSrc"
           :preview="false"></a-image>
 
         <a-tooltip>
@@ -96,16 +96,7 @@ const pageWithAttrsFunction = () => {
   })
 }
 pageWithAttrsFunction()
-//图片显示
+
-const algorithmCardPhoto = (List = []) => {
-  let url = ''
-  List.map((item) => {
-    if (item.attrType === '图层缩略图') {
-      url = item.attrValue
-    }
-  })
-  return url
-}
 //跳转详情页
 const detailFunction = (id) => {
   window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)

front/src/views/instructionManual/components/menuBook.vue

@@ -267,9 +267,12 @@
       })
       window.open(newpage.href, '_blank')
     } else if (data === '资源下架') {
-      window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+      window.sessionStorage.setItem('type', JSON.stringify('apply'))
       const newpage = router.resolve({
         path: '/personalCenter',
+        query: {
+          tabTypeName: '能力上架'
+        }
       })
       window.location.href = newpage.href
     }