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

front/src/views/home/DetailsPageconetent.vue

@@ -6,7 +6,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
-      <detailsPageInfrastructureTree v-show="flag != '6'" />
+      <detailsPageInfrastructureTree v-if="flag != '6'" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="resultListSearchInput-father">
@@ -127,7 +127,7 @@
         </template>
       </div>
       <searchResultList
-        v-show="resourceList.data && resourceList.data.length > 0"
+        v-if="resourceList.data && resourceList.data.length > 0"
         :resourceList="resourceList"
         :key="listKey2"
         :resourceTotal="resourceTotal"
@@ -1873,7 +1873,7 @@
             query: newQuery,
           })
           .then(() => {
-            tagFlag.value = false
+            // tagFlag.value = false
             chongzhi(true)
             getNewList()
           })

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

@@ -69,11 +69,11 @@
           class="left"
           style="display: flex; align-items: center"
           v-else-if="
-            (item.type === '组件服务' &&
-              item.infoList &&
-              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]) ||
-            item.infoList.filter((val) => val.attrType == '组件图片')[0] ||
-            item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
+            item.type === '组件服务' &&
+            item.infoList &&
+            (item.infoList.filter((val) => val.attrType == '图层缩略图')[0] ||
+              item.infoList.filter((val) => val.attrType == '组件图片')[0] ||
+              item.infoList.filter((val) => val.attrType == '算法效果图片')[0])
           "
         >
           <a-image
@@ -304,6 +304,7 @@
           <div class="dec">
             <div
               v-if="
+                item.infoList &&
                 item.infoList.filter((val) => val.attrType == '组件类型')[0]
               "
             >

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -140,7 +140,7 @@
       mybus.on('getDeptList', () => {
         init()
       })
-
+      init()
       const onSelect = async (item, val, child) => {
         console.log('item--------onSelect---->', item)
         console.log('val------onSelect------>', val)

front/src/views/home/infrastructureApplication.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-29 17:28:02
+ * @LastEditTime: 2022-11-30 11:55:51
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -340,11 +340,14 @@
     if (item.approveStatus == '通过') {
       dataList.selectItem = item
       getVideoUrl(item.cameraInfo)
+      return
+    } else if (item.backToFirst == 'true') {
+      message.info('请到个人中心查看详情')
     } else {
-      dataList.selectItem = {}
       message.info('请耐心等待审核通过')
-      showVisible.value = false
     }
+    dataList.selectItem = {}
+    showVisible.value = false
   }
   const handleOk = () => {
     console.log('id', instanceId.value)

front/src/views/home/infrastructurePage.vue

@@ -1577,6 +1577,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1595,6 +1596,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1623,6 +1625,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1633,6 +1636,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1661,6 +1665,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1710,6 +1715,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1751,6 +1757,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1802,6 +1809,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,

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

@@ -59,6 +59,7 @@
           v-for="item in contentList.data"
           :key="item.index"
         >
+          <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
           <div class="content-body-title">
             <span>
               申请单号：{{
@@ -152,6 +153,7 @@
               height="80"
               v-if="
                 item.processDefinitionName != '能力资源下架' &&
+                item.approveStatus !== '不通过' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
               "
               style="position: absolute; top: 20px; left: -850px"
@@ -1081,6 +1083,16 @@
         height: 150px;
         border-bottom: #cccccc 1px solid;
         position: relative;
+        .withdraw {
+          width: 0.675rem;
+          height: 0.3rem;
+          background: url('~@/assets/home/withdraw.png') no-repeat;
+          background-size: 100%;
+          position: absolute;
+          top: 0.3rem;
+          left: 0.87rem;
+          transform: rotate(-30deg);
+        }
 
         .content-body-title {
           min-width: 100px;