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

# Conflicts:
#	back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

@@ -229,9 +229,6 @@ export default {
               )
             }
           })
-          console.log(this.dataView)
-          console.log(this.dataForm)
-          debugger
         } else {
           const componentType = this.dataForm.infoList.filter(
             (item) => item.attrType === '组件类型'

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -50,14 +50,17 @@
           v-model="inputNo"
           placeholder="请输入退回意见"
         ></el-input>
-        <el-button class="inputBule" @click="agreeOrNot">提交</el-button>
+        <el-button
+          class="inputBule"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >提交</el-button
+        >
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import processModule from '@/mixins/process-module'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
@@ -150,7 +153,8 @@ export default {
       })
     },
     agreeOrNot: debounce(
-      function () {
+      function (data) {
+        console.log(data)
         if (this.agreeOrList === '同意') {
           console.log('this.dataForm.taskId', this.taskId)
           const params = qs.stringify({
@@ -210,10 +214,37 @@ export default {
               })
             })
         }
+        this.tabRemoveHandle(data)
       },
       1000,
       { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
       )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    }
   }
 }
 </script>

front/src/views/capacityOnTheShelf/DevelopmentComponents.vue

@@ -27,6 +27,7 @@
         :refData="refData"
         :dataFrom="dataFrom"
         :videoList="videoList"
+        :imgList="imgList"
         :externalField="[
           '组件名称',
           '组件描述',
@@ -54,7 +55,6 @@
         :dataFrom="dataFrom"
         :fileList="fileList"
         :fileList2="fileList2"
-        :imgList="imgList"
         :configure="bs"
       ></put-on-the-shelf>
     </div>

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -775,7 +775,7 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-  .put-on-the-shelf {
+.put-on-the-shelf {
   height: 680px;
   overflow: scroll;
   display: flex;
@@ -932,9 +932,9 @@
   & > div:nth-of-type(1) {
     margin-top: 0;
   }
-  }
+}
 
-  .application-Area {
+.application-Area {
   width: 520px;
   display: grid;
   margin-top: -5px;
@@ -960,71 +960,74 @@
     background: #0087ff;
     color: #fff;
   }
-  }
+}
 
-  :deep(.ant-image-img) {
+:deep(.ant-image-img) {
   width: 100%;
   height: 100%;
   object-fit: contain;
-  }
+}
 
-  :deep(.ant-modal) {
+:deep(.ant-modal) {
   width: 960px;
-  }
+}
 
-  :deep(.ant-transfer-list) {
+:deep(.ant-transfer-list) {
   width: 39.5%;
   height: 520px;
-  }
+}
 
-  :deep(.ant-transfer-operation) {
+:deep(.ant-transfer-operation) {
   flex-direction: row-reverse;
   margin: 0 30px;
-  }
+}
 
-  :deep(.ant-btn) {
+:deep(.ant-btn) {
   width: 56px;
   height: 40px;
   border-radius: 4px;
-  }
+}
 
-  :deep(.ant-btn:first-child) {
+:deep(.ant-btn:first-child) {
   margin-left: 4px;
-  }
+}
 
-  :deep(.ant-modal-footer) {
+:deep(.ant-modal-footer) {
   border: 0;
-  }
+}
 
-  :deep(.ant-modal-header) {
+:deep(.ant-modal-header) {
   border: 0;
-  }
+}
 
-  :deep(.ant-modal-title) {
+:deep(.ant-modal-title) {
   line-height: 24px;
   font-size: 18px;
   color: #303133;
-  }
+}
 
-  :deep(.ant-transfer-list-header) {
+:deep(.ant-transfer-list-header) {
   background: #f5f7fa;
-  }
+}
 
-  :deep(.ant-transfer-list-header-selected) {
+:deep(.ant-transfer-list-header-selected) {
   display: flex;
   width: 90%;
   flex-direction: row-reverse;
   justify-content: space-between;
   align-items: center;
-  }
+}
 
-  :deep(.ant-transfer-list-header-title) {
+:deep(.ant-transfer-list-header-title) {
   font-size: 16px;
   color: #303133;
   font-weight: 400;
   text-align: left;
-  }
+}
-  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
+:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
   display: none !important;
-  }
+}
+:deep(.ant-upload-list-item-name) {
+  width: 100px;
+}
 </style>

front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue

@@ -89,6 +89,7 @@
     list.value = []
     props.dataList.infoList.map((item) => {
       if (
+        item.attrType === '功能介绍' ||
         item.attrType === '常见问题' ||
         item.attrType === '应用案例' ||
         item.attrType === '应用场景'
@@ -101,6 +102,7 @@
       }
     })
     list.value.unshift('关联应用')
+    list.value.push('使用方式')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {