应用资源和组件服务调换位置

front/src/global/GlobalConfig.js

@@ -505,3 +505,6 @@ export const RECOURCE_G_ICON = {
   resourceProtection:
     '/src/assets/resourceManageMap/pic/point-resettlement-circle.png',
 }
+
+// 能力集市-默认选中tab
+export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源'

front/src/views/capacitySquare/index.vue

@@ -26,6 +26,8 @@
   import layer from './components/layer.vue'
   import application from './components/application.vue'
   import { useRouter } from 'vue-router'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
   const show = ref('algorithm')
@@ -47,7 +49,8 @@
     const newpage = router.resolve({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
     window.location.href = newpage.href

front/src/views/home/DetailsPageconetent.vue

@@ -787,36 +787,36 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
-  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-  import {
+import {
   selectDicStoreAll,
   pageWithAttrs,
   getDataResource,
   getIntegrationServicesList,
   getCountByFuzzyQuery,
-  } from '@/api/home.js'
+} from '@/api/home.js'
-  import { getSgcList } from '@/api/personalCenter'
+import { getSgcList } from '@/api/personalCenter'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
+import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
+import searchResultList from '@/views/home/components/searchResultList.vue'
-  import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
+import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
-  // 数据资源引用
+// 数据资源引用
-  import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
+import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-  // 基础设施引用
+// 基础设施引用
-  import infrastructurePage from '@/views/home/infrastructurePage.vue'
+import infrastructurePage from '@/views/home/infrastructurePage.vue'
-  import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  import {
+import {
   titleNameArray,
   keyongziyuanqingkaungArray,
   shujuziyuanqingkuangArray,
-  } from './constantData/showData.js'
+} from './constantData/showData.js'
 
-  export default defineComponent({
+export default defineComponent({
   setup() {
     //会议室传的标识6
     const flag = ref('')
@@ -1011,10 +1011,7 @@
               attrValue: tag.dict_label,
             })
           } else {
-              val.selectedTags.splice(
+            val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
-                val.selectedTags.indexOf(tag.dict_label),
-                1
-              )
           }
         }
       })
@@ -1277,11 +1274,7 @@
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
-                console.log(
+              console.log('查询列表============>', resourceList, res.data.data)
-                  '查询列表============>',
-                  resourceList,
-                  res.data.data
-                )
               resourceList.data = []
               videoList.data = []
               if (Cardsname.value === '基础设施') {
@@ -1535,9 +1528,7 @@
       router.currentRoute.value.query.appLiCation = ''
       tecHnosphere = router.currentRoute.value.query.tecHnosphere
       appLiCation = router.currentRoute.value.query.appLiCation
-        let newQuery = JSON.parse(
+      let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
-          JSON.stringify(router.currentRoute.value.query)
-        )
       Cardsname.value = name
       console.log(
         '更改前url中的select=====================>',
@@ -1675,14 +1666,14 @@
     mybus.off('changePage')
     mybus.off('changeInfo')
   },
-  })
+})
 </script>
 <style lang="less" scoped>
-  @font-face {
+@font-face {
   font-family: 'webfont';
   src: url('~@/assets/capacitySquare/webfont.ttf');
-  }
+}
-  .resultListSearchInput-father {
+.resultListSearchInput-father {
   background: #f3f5f9;
   padding: 0.2rem;
 
@@ -1699,9 +1690,9 @@
       margin-top: 0.2rem;
     }
   }
-  }
+}
 
-  .resultListSearchInput {
+.resultListSearchInput {
   margin-left: 0.1rem;
 
   :deep(.ant-input) {
@@ -1726,9 +1717,9 @@
   :deep(.ant-input-group-addon) {
     left: 0 !important;
   }
-  }
+}
 
-  .button-reset {
+.button-reset {
   border: 0;
   outline: none;
   width: 0.8rem;
@@ -1741,9 +1732,9 @@
   line-height: 0.34rem;
   margin-left: 2.5rem;
   cursor: pointer;
-  }
+}
 
-  .details-pageconetent {
+.details-pageconetent {
   height: 100%;
   width: 100%;
   display: flex;
@@ -2073,9 +2064,9 @@
       }
     }
   }
-  }
+}
 
-  .shrinkTag {
+.shrinkTag {
   width: 0.5rem;
   display: flex;
   justify-content: center;
@@ -2085,14 +2076,14 @@
   span {
     cursor: pointer;
   }
-  }
+}
 
-  .shrink {
+.shrink {
   height: unset !important;
   overflow: unset !important;
-  }
+}
 
-  .talk-monitor {
+.talk-monitor {
   position: fixed;
   bottom: 0.5rem;
   right: 0.1rem;
@@ -2106,8 +2097,8 @@
     background: url('~@/assets/home/icon-talk.png');
     background-size: cover;
   }
-  }
+}
-  .abilitySquare {
+.abilitySquare {
   width: 0.7rem;
   height: 0.7rem;
   border-radius: 0.04rem;
@@ -2195,9 +2186,9 @@
       transform: scale(0);
     }
   }
-  }
+}
 
-  .top-content-father {
+.top-content-father {
   width: 10.87rem;
   padding-left: 0.2rem;
 
@@ -2284,13 +2275,13 @@
   .top-content:nth-child(1) {
     margin-top: 0.41rem !important;
   }
-  }
+}
 
-  :deep(.ant-card-grid) {
+:deep(.ant-card-grid) {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   -webkit-line-clamp: 1;
   word-break: break-all;
-  }
+}
 </style>

front/src/views/home/apply.vue

@@ -199,6 +199,8 @@ import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
 import mybus from '@/myplugins/mybus'
 import { sgcDel, getApplyForm } from '@/api/personalCenter'
 import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
 export default {
   name: '',
   props: {},
@@ -336,6 +338,17 @@ export default {
     const resetFields = () => {
       window.history.go(-1)
     }
+
+    // 跳转到能力集市
+    const jumpToDetailsPageconetent = () => {
+      router.push({
+        path: '/DetailsPageconetent',
+        query: {
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        },
+      })
+    }
+
     const processStartHandle = () => {
       debugger
       formRef.value.validate().then(() => {
@@ -408,12 +421,7 @@ export default {
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                            router.push({
+                            jumpToDetailsPageconetent()
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
                           }
                         })
                       } else {
@@ -421,12 +429,7 @@ export default {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                        router.push({
+                        jumpToDetailsPageconetent()
-                          path: '/DetailsPageconetent',
-                          query: {
-                            select: '组件服务',
-                          },
-                        })
                       }
                     })
                   }
@@ -450,12 +453,7 @@ export default {
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                          router.push({
+                          jumpToDetailsPageconetent()
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
                         }
                       })
                     } else {
@@ -463,12 +461,7 @@ export default {
                       if (Object.keys(integrationServicesItemInfo).length > 0) {
                         updateIntegrationServiceAction()
                       }
-                      router.push({
+                      jumpToDetailsPageconetent()
-                        path: '/DetailsPageconetent',
-                        query: {
-                          select: '组件服务',
-                        },
-                      })
                     }
                   } else {
                     message.error('申请失败！')
@@ -483,12 +476,7 @@ export default {
             // 单兵设备为了演示 添加  不做处理
             if (list.value[0].arr[0].type == '单兵设备') {
               message.success('单兵设备申请提交成功！')
-              router.push({
+              jumpToDetailsPageconetent()
-                path: '/DetailsPageconetent',
-                query: {
-                  select: '组件服务',
-                },
-              })
             } else {
               let ids = []
               let falgNum = 0
@@ -550,12 +538,7 @@ export default {
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                            router.push({
+                            jumpToDetailsPageconetent()
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
                           }
                         })
                       } else {
@@ -563,12 +546,7 @@ export default {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                        router.push({
+                        jumpToDetailsPageconetent()
-                          path: '/DetailsPageconetent',
-                          query: {
-                            select: '组件服务',
-                          },
-                        })
                       }
                     })
                   }
@@ -588,12 +566,7 @@ export default {
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                          router.push({
+                          jumpToDetailsPageconetent()
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
                         }
                       })
                     } else {
@@ -601,12 +574,7 @@ export default {
                       if (Object.keys(integrationServicesItemInfo).length > 0) {
                         updateIntegrationServiceAction()
                       }
-                      router.push({
+                      jumpToDetailsPageconetent()
-                        path: '/DetailsPageconetent',
-                        query: {
-                          select: '组件服务',
-                        },
-                      })
                     }
                   } else {
                     message.error('申请失败！')
@@ -619,12 +587,7 @@ export default {
             applyAllApplication(formName).then((res) => {
               if (res.data.code == 0) {
                 message.success('申请提交成功，请到消息中心查看！')
-                router.push({
+                jumpToDetailsPageconetent()
-                  path: '/DetailsPageconetent',
-                  query: {
-                    select: '组件服务',
-                  },
-                })
               } else {
                 message.error('申请失败！')
               }
@@ -663,9 +626,7 @@ export default {
               processDefinitionKey: processDefinitionKey,
               businessKey: businessKey,
             })
-            updateInstanceId(params).then(
+            updateInstanceId(params).then(() => {})
-              () => {}
-            )
           }
         })
         .catch(() => {})
@@ -786,7 +747,8 @@ export default {
 
     // 融合服务-更新 todo
     const updateIntegrationServiceAction = () => {
-      let _applyCount = Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+      let _applyCount =
+        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
       let _data = Object.assign({}, integrationServicesItemInfo.value, {
         applyCount: _applyCount,
       })

front/src/views/home/components/header.vue

@@ -131,43 +131,28 @@
   import { getSgcTotal } from '@/api/home'
   import Cookies from 'js-cookie'
   import mybus from '@/myplugins/mybus'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   const store = useStore()
   const router = useRouter()
   const route = useRoute()
-  // const navListManagement = ref([
+
-  //   { name: '共享门户', key: 'home' },
-  //   { name: '能力集市', key: 'DetailsPageconetent' },
-  //   { name: '能力云图', key: 'capabilityCloud' },
-  //   { name: '能力统计', key: 'abilityStatistics' },
-  //   { name: '开发指南', key: 'developmentGuide' },
-  //   { name: '需求中心', key: 'demandCenter' },
-  //   // { name: '个人中心', key: 'personalCenter' },
-  //   { name: '区市站点', key: 'mapTest' },
-  //   // { name: '后台管理', key: 'houtaiguanli' },
-  //   { name: '赋能案例', key: 'assignCase' },
-  // ])
   const whoShow1 = whoShow
   const user = ref({
     username: store.getters['user/username'],
   })
-  // user.username.value = store.getters(['user/username'])
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   console.log('navListManagement------------>', navListManagement)
 
-  // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   console.log('navList------------>', navList)
 
   const props = defineProps({
     showView: { type: String, default: '' },
   })
-  // // 获取用户信息
+  
-  // getUser().then((res) => {
-  //   user.value = res.data.data
-  //   // console.log('user===============>', user.value)
-  // })
   // 退出登录
   const logout = async () => {
     await store.dispatch('user/logout')
@@ -208,7 +193,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
         break
@@ -217,11 +203,6 @@
           path: '/capabilityCloud',
         })
         break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
       case '技术文档':
         router.push({
           path: '/instructionManual',

front/src/views/home/constantData/showData.js

@@ -1,12 +1,12 @@
 export const titleNameArray = [
-  {
-    photo: require('@/assets/newHome/banner-zj.png'),
-    name: '组件服务',
-  },
   {
     photo: require('@/assets/newHome/banner-yy.png'),
     name: '应用资源',
   },
+  {
+    photo: require('@/assets/newHome/banner-zj.png'),
+    name: '组件服务',
+  },
   {
     photo: require('@/assets/newHome/banner-jc.png'),
     name: '基础设施',

front/src/views/home/latestAbility.vue

@@ -35,6 +35,8 @@
   import { useRouter } from 'vue-router'
   import { ref } from 'vue'
   import { selectNewest } from '@/api/home'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   export default {
     name: 'latestAbility',
     components: {},
@@ -45,7 +47,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
       }

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

@@ -118,6 +118,7 @@
   import TheOverallProcess from './TheOverallProcess.vue'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const router = useRouter()
   const seviceList = ref([
     {
@@ -255,7 +256,8 @@
       const newpage = router.resolve({
         path: '/DetailsPageconetent',
         query: {
-          select: '组件服务',
+          // select: '组件服务',
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
         },
       })
       window.location.href = newpage.href

front/src/views/newHome/components/LatestCapabilities.vue

@@ -32,6 +32,7 @@
   import { ref } from 'vue'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const productServiceData = ref([])
@@ -76,7 +77,8 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/PopularAbility.vue

@@ -61,6 +61,7 @@
   import { pageWithAttrs } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const select = ref('浏览量')
@@ -134,11 +135,11 @@
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/RecommendationAbility.vue

@@ -47,6 +47,7 @@
   import { selectRecommend } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   let dataList = ref([])
@@ -94,7 +95,7 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }

front/src/views/newHome/components/WorkDynamics.vue

@@ -255,24 +255,14 @@
   const toView = () => {
     window.open(newpage.href, '_blank')
   }
-  // const toApply = () => {
+  
-  //   window.open(applypage.href, '_blank')
-  // }
   getList()
-  // dataList.value.map((item, index) => {
+ 
-  //   dataList.value[index].tupian = tupain.value[index]
-  //   console.log('item', item, dataList.value)
-  // })
   function jumpPage() {
-    // 点击内存入store
-    // store.commit('WorkDynList', {
-    //   selectCardsnum: '组件服务',
-    // })
     console.log(
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/WorkDynList',
     })