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,256 +775,259 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-  .put-on-the-shelf {
+.put-on-the-shelf {
-    height: 680px;
+  height: 680px;
-    overflow: scroll;
+  overflow: scroll;
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    align-items: center;
+  align-items: center;
-    padding: 50px 100px 25px;
+  padding: 50px 100px 25px;
-    .Technical-text {
+  .Technical-text {
-      height: 30px;
+    height: 30px;
-      width: 100px;
+    width: 100px;
-      border: 1px solid #bbd3ef;
+    border: 1px solid #bbd3ef;
-      border-radius: 6px;
+    border-radius: 6px;
-      background: #edf4fc;
+    background: #edf4fc;
-      color: #0087ff;
+    color: #0087ff;
-      font-size: 14px;
+    font-size: 14px;
-      text-align: center;
+    text-align: center;
-      line-height: 30px;
+    line-height: 30px;
-    }
+  }
-    .Technical-text:hover {
+  .Technical-text:hover {
-      cursor: pointer;
+    cursor: pointer;
-    }
-
-    & > div {
-      width: 100%;
-      margin-top: 60px;
-
-      .top {
-        color: #333333;
-        font-size: 22px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-bottom: 25px;
-
-        div:first-child,
-        div:last-child {
-          width: 245px;
-          height: 1px;
-          background: #f0f0f0;
-        }
-
-        div:nth-child(2) {
-          margin: 0 30px;
-        }
-      }
-
-      .bottom {
-        margin-top: 25px;
-
-        .items {
-          background: #fafafa;
-          padding: 10px;
-
-          p {
-            display: flex;
-            justify-content: space-between;
-
-            span:nth-of-type(1) {
-              width: 200px;
-            }
-
-            span:nth-of-type(2) {
-              width: 100%;
-              font-weight: 600;
-            }
-          }
-
-          p:nth-of-type(1) > span:nth-of-type(1) {
-            font-size: 18px;
-            font-weight: 600;
-          }
-
-          .del {
-            display: flex;
-            justify-content: flex-end;
-            align-items: center;
-
-            .delImg {
-              cursor: pointer;
-              display: inline-block;
-              width: 16px;
-              height: 18px;
-              background: url(~@/assets/home/sf_del.png) no-repeat;
-              margin-right: 5px;
-            }
-
-            div {
-              cursor: pointer;
-            }
-          }
-        }
-
-        .add {
-          margin-top: 10px;
-          font-size: 16px;
-          color: #007efb;
-        }
-
-        .form {
-          margin-top: 20px;
-          display: flex;
-          justify-content: flex-start;
-          align-items: center;
-
-          span:first-child {
-            width: 120px;
-          }
-
-          :deep(.ant-input-textarea) {
-            width: 520px;
-          }
-
-          :deep(.ant-radio-group) {
-            width: 520px;
-          }
-
-          :deep(.ant-input-number) {
-            width: 200px;
-          }
-
-          :deep(.ant-input) {
-            resize: none;
-            width: 520px;
-          }
-
-          .ant-btn {
-            width: 160px;
-            height: 32px;
-            text-align: center;
-            background: #edf4fc;
-            color: #0087ff;
-            border: 1px solid #bbd3ef;
-            border-radius: 6px;
-          }
-        }
-
-        .submit {
-          margin-top: 40px;
-          display: flex;
-          justify-content: flex-end;
-
-          .ant-btn {
-            width: 80px;
-            height: 28px;
-            text-align: center;
-            background: #d9ebff;
-            color: #0087ff;
-            border: 1px solid #0087ff;
-            border-radius: 6px;
-          }
-        }
-      }
-    }
-
-    & > div:nth-of-type(1) {
-      margin-top: 0;
-    }
   }
 
-  .application-Area {
+  & > div {
-    width: 520px;
+    width: 100%;
-    display: grid;
+    margin-top: 60px;
-    margin-top: -5px;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
 
-    .application-Area-son {
+    .top {
-      cursor: pointer;
-      font-size: 14px;
-      width: 90px;
-      height: 26px;
-      border-radius: 13px;
       color: #333333;
-      background: #f5f5f5;
+      font-size: 22px;
-      border: 1px #cccccc solid;
       display: flex;
       justify-content: center;
       align-items: center;
-      margin-top: 10px;
+      margin-bottom: 25px;
-      font-weight: 500;
+
+      div:first-child,
+      div:last-child {
+        width: 245px;
+        height: 1px;
+        background: #f0f0f0;
+      }
+
+      div:nth-child(2) {
+        margin: 0 30px;
+      }
     }
 
-    .application-Area-down {
+    .bottom {
-      background: #0087ff;
+      margin-top: 25px;
-      color: #fff;
+
+      .items {
+        background: #fafafa;
+        padding: 10px;
+
+        p {
+          display: flex;
+          justify-content: space-between;
+
+          span:nth-of-type(1) {
+            width: 200px;
+          }
+
+          span:nth-of-type(2) {
+            width: 100%;
+            font-weight: 600;
+          }
+        }
+
+        p:nth-of-type(1) > span:nth-of-type(1) {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .del {
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+
+          .delImg {
+            cursor: pointer;
+            display: inline-block;
+            width: 16px;
+            height: 18px;
+            background: url(~@/assets/home/sf_del.png) no-repeat;
+            margin-right: 5px;
+          }
+
+          div {
+            cursor: pointer;
+          }
+        }
+      }
+
+      .add {
+        margin-top: 10px;
+        font-size: 16px;
+        color: #007efb;
+      }
+
+      .form {
+        margin-top: 20px;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+
+        span:first-child {
+          width: 120px;
+        }
+
+        :deep(.ant-input-textarea) {
+          width: 520px;
+        }
+
+        :deep(.ant-radio-group) {
+          width: 520px;
+        }
+
+        :deep(.ant-input-number) {
+          width: 200px;
+        }
+
+        :deep(.ant-input) {
+          resize: none;
+          width: 520px;
+        }
+
+        .ant-btn {
+          width: 160px;
+          height: 32px;
+          text-align: center;
+          background: #edf4fc;
+          color: #0087ff;
+          border: 1px solid #bbd3ef;
+          border-radius: 6px;
+        }
+      }
+
+      .submit {
+        margin-top: 40px;
+        display: flex;
+        justify-content: flex-end;
+
+        .ant-btn {
+          width: 80px;
+          height: 28px;
+          text-align: center;
+          background: #d9ebff;
+          color: #0087ff;
+          border: 1px solid #0087ff;
+          border-radius: 6px;
+        }
+      }
     }
   }
 
-  :deep(.ant-image-img) {
+  & > div:nth-of-type(1) {
-    width: 100%;
+    margin-top: 0;
-    height: 100%;
-    object-fit: contain;
   }
+}
 
-  :deep(.ant-modal) {
+.application-Area {
-    width: 960px;
+  width: 520px;
-  }
+  display: grid;
+  margin-top: -5px;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
 
-  :deep(.ant-transfer-list) {
+  .application-Area-son {
-    width: 39.5%;
+    cursor: pointer;
-    height: 520px;
+    font-size: 14px;
-  }
+    width: 90px;
-
+    height: 26px;
-  :deep(.ant-transfer-operation) {
+    border-radius: 13px;
-    flex-direction: row-reverse;
+    color: #333333;
-    margin: 0 30px;
+    background: #f5f5f5;
-  }
+    border: 1px #cccccc solid;
-
-  :deep(.ant-btn) {
-    width: 56px;
-    height: 40px;
-    border-radius: 4px;
-  }
-
-  :deep(.ant-btn:first-child) {
-    margin-left: 4px;
-  }
-
-  :deep(.ant-modal-footer) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-header) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-title) {
-    line-height: 24px;
-    font-size: 18px;
-    color: #303133;
-  }
-
-  :deep(.ant-transfer-list-header) {
-    background: #f5f7fa;
-  }
-
-  :deep(.ant-transfer-list-header-selected) {
     display: flex;
-    width: 90%;
+    justify-content: center;
-    flex-direction: row-reverse;
-    justify-content: space-between;
     align-items: center;
+    margin-top: 10px;
+    font-weight: 500;
   }
 
-  :deep(.ant-transfer-list-header-title) {
+  .application-Area-down {
-    font-size: 16px;
+    background: #0087ff;
-    color: #303133;
+    color: #fff;
-    font-weight: 400;
-    text-align: left;
-  }
-  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
-    display: none !important;
   }
+}
+
+:deep(.ant-image-img) {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+:deep(.ant-modal) {
+  width: 960px;
+}
+
+:deep(.ant-transfer-list) {
+  width: 39.5%;
+  height: 520px;
+}
+
+:deep(.ant-transfer-operation) {
+  flex-direction: row-reverse;
+  margin: 0 30px;
+}
+
+:deep(.ant-btn) {
+  width: 56px;
+  height: 40px;
+  border-radius: 4px;
+}
+
+:deep(.ant-btn:first-child) {
+  margin-left: 4px;
+}
+
+:deep(.ant-modal-footer) {
+  border: 0;
+}
+
+:deep(.ant-modal-header) {
+  border: 0;
+}
+
+:deep(.ant-modal-title) {
+  line-height: 24px;
+  font-size: 18px;
+  color: #303133;
+}
+
+:deep(.ant-transfer-list-header) {
+  background: #f5f7fa;
+}
+
+: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) {
+  font-size: 16px;
+  color: #303133;
+  font-weight: 400;
+  text-align: left;
+}
+: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) {