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

# Conflicts:
#	front/src/views/personalCenter/components/MyBrowse.vue

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -19,7 +19,7 @@ js:
       <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
       <!-- 下拉框 -->
        <el-select
-        v-else-if="(type === 'select' && name !== '归属部门') || type == 'radio'"
+        v-else-if="(type === 'select' && name !== '归属部门' && name !== '使用方式') || type == 'radio'"
         style="width: 240px"
          v-model:value="data.note1"
         :placeholder="'请选择' + name">
@@ -45,6 +45,20 @@ js:
         {{ itemSelect.name }}
         </el-option>
       </el-select>
+      <el-select
+        v-else-if="(type === 'select' && name === '使用方式')"
+       style="width: 240px"
+         v-model:value="data.note1"
+        :placeholder="'请选择' + name"
+        @change="showTypeClick"
+        >
+        <el-option
+          :value="itemSelect.dictLabel"
+          v-for="(itemSelect, indexSelect) in options"
+          :key="indexSelect">
+        {{ itemSelect.dictLabel }}
+        </el-option>
+      </el-select>
       <!-- 多选 -->
       <div
         v-else-if="type === 'checkBox'"
@@ -89,7 +103,8 @@ export default {
       valueCheckBox: [],
       // 单选数据
       regionSelect: '',
-      showKey: 0
+      showKey: 0,
+      showType: ''
     }
   },
   methods: {
@@ -157,6 +172,11 @@ export default {
         }
       })
       this.data.note1 = str
+    },
+    showTypeClick (e) {
+      this.showType = e
+      console.log(e)
+      this.$emit('show-type', this.showType)
     }
   },
   created () {
@@ -172,6 +192,7 @@ export default {
   },
   mounted () {
     this.selectOptions()
+    this.showTypeClick('调用接口')
   }
 }
 </script>

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

@@ -11,7 +11,16 @@
         <div v-for='child in parent.children' :key='child.id'>
           <template v-if='judgmentType.filter(item => item.name==child.name).length === 0'>
             <div class="top">{{child.name}}</div>
-            <div v-for="item in child.children" :key="item.id" class='item' v-show="item.name != '来源应用' && item.name != '关联组件信息' && item.name != '技术文档'">
+            <div v-for="item in child.children" :key="item.id" class='item' v-show="(item.name != '来源应用' && item.name != '关联组件信息' && item.name != '技术文档') && !(
+              (showTypeName == '调用接口' && item.name == '平台地址') ||
+                (showTypeName == '调用接口' && item.name == 'SDK安装包') ||
+                (showTypeName == '平台对接' && item.name == 'SDK安装包') ||
+                (showTypeName == '平台对接' && item.name == '接口请求方式') ||
+                (showTypeName == '平台对接' && item.name == '服务接口') ||
+                (showTypeName == 'SDK' && item.name == '平台地址') ||
+                (showTypeName == 'SDK' && item.name == '接口请求方式') ||
+                (showTypeName == 'SDK' && item.name == '服务接口')
+            )">
               <span >{{ item.name }}</span>
               <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload> -->
@@ -23,10 +32,12 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
+              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
+                tip="支持.zip类型，大小不超过100M"></upload>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options" @show-type="showType"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
@@ -163,15 +174,39 @@ export default {
             }
           ]
         }
-      ]
+      ],
+      showTypeName: ''
     }
   },
+  mounted () {
+    this.defaultContent()
+  },
   methods: {
     changeInfoList (obj) {
       this.$emit('changeInfoList', obj)
     },
     goToRichText () {
 
+    },
+    // 默认显示--调用接口
+    defaultContent () {
+      this.putOnTheShelfList.forEach((item) => {
+        if (item.name === '部署与使用') {
+          item.children.forEach((itemChild) => {
+            if (itemChild.name === '使用方式') {
+              itemChild.children.forEach((itemChilds) => {
+                if (itemChilds.name === '使用方式') {
+                  itemChilds.note1 = '调用接口'
+                }
+              })
+            }
+          })
+        }
+      })
+    },
+    showType (data) {
+      this.showTypeName = data
+      console.log(data, this.showTypeName, '传过来的showType')
     }
   }
 }

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

@@ -600,6 +600,7 @@
   const titleName = ref('关联应用')
 
   const sourceClick = () => {
+    mockData.value = []
     visibleAssociatedApplication.value = true
     queryApplicationRelByResourceId({
       referenceId: 0,
@@ -619,7 +620,7 @@
   const componentsClick = () => {
     titles.value = ['未关联的组件名称', '已关联的组件名称']
     titleName.value = '关联组件'
-
+    mockData.value = []
     visibleAssociatedApplication.value = true
     queryResourceRelByKeyId({
       keyId: 0,
@@ -723,7 +724,7 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-  .put-on-the-shelf {
+.put-on-the-shelf {
   height: 680px;
   overflow: scroll;
   display: flex;
@@ -880,9 +881,9 @@
   & > div:nth-of-type(1) {
     margin-top: 0;
   }
-  }
+}
 
-  .application-Area {
+.application-Area {
   width: 520px;
   display: grid;
   margin-top: -5px;
@@ -908,68 +909,68 @@
     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;
-  }
+}
 </style>

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

@@ -23,7 +23,13 @@
       <div class="title">审批详情</div>
       <template v-for="item in dataSource.data" :key="item">
         <div class="oddNumbers">子单号:{{ item[0] }}</div>
-        <a-table :dataSource="item[1]" :columns="columns" />
+        <a-table :dataSource="item[1]" :columns="columns">
+          <template #bodyCell="{ column, text }">
+            <template v-if="column.dataIndex === 'name'">
+              <a>{{ text }}</a>
+            </template>
+          </template>
+        </a-table>
       </template>
     </div>
   </div>
@@ -183,14 +189,12 @@
         } else {
           shifoushizujian.value = false
           console.log(res.data.data.resourceDTO)
-          debugger
           res.data.data.resourceDTO.infoList.forEach((val) => {
             console.log(val, '111111111111111111111111')
             if (val.attrValue === '智能算法') {
               nameNotShow.value = true
               algorithmShow.value = false
               console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
-              debugger
             }
           })
         }
@@ -268,6 +272,13 @@
     text-align: center;
     font-size: 16px;
   }
+  :deep(.ant-table-tbody) > tr > .ant-table-cell:nth-child(5) {
+    width: 110px;
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
   .oddNumbers {
     margin-bottom: 0.05rem;
   }

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

@@ -409,6 +409,13 @@
       span {
         margin-right: 0.3rem;
       }
+      .name {
+        max-width: 11rem;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
   }
   .ant-list::-webkit-scrollbar {