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

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

@@ -36,8 +36,8 @@
           <div class="add">添加更多{{ configure.name }}</div>
           <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
             <span>{{ val.name }}</span>
-            <!-- <a-input v-model:value="val.note1" ::maxlength="24" placeholder="'请填写' + val.name + ',不超过24个字符'"
-              v-if="val.type == 'input'"/> -->
+            <a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
+              v-if="val.type == 'input'"/>
             <template v-if="val.type == 'input2'">
               <a-input
                 v-model:value="val.note1"

front/src/views/capacityOnTheShelf/Algorithm.vue

@@ -46,6 +46,7 @@
         :refData="refData"
         :dataFrom="dataFrom"
         :fileList="fileList"
+        :packageList="packageList"
         :imgList="imgList"
         :externalField="['接口服务', '接口请求方式']"
         :configure="bs"
@@ -197,6 +198,7 @@
   const navList = ref([])
   const navList2 = ref([])
   const fileList = ref({})
+  const packageList = ref({})
   const imgList = ref({})
   const videoList = ref({})
   const data = ref({})
@@ -310,6 +312,18 @@
           key: val.name,
         })
         navList2.value.push(val.name)
+        if (val.name === '部署与使用') {
+          console.log(val, '部署与使用')
+          val.children.forEach((valChild) => {
+            if (valChild.name === '使用方式') {
+              valChild.children.forEach((valChilds) => {
+                if (valChilds.name === '使用方式') {
+                  valChilds.note1 = '调用接口'
+                }
+              })
+            }
+          })
+        }
       })
       data.value = res.data.data.children
       refData.value = data.value.filter(
@@ -342,6 +356,9 @@
   mybus.on('chageFileList', (obj) => {
     fileList.value = obj
   })
+  mybus.on('chagePackageList', (obj) => {
+    packageList.value = obj
+  })
   mybus.on('chageImgList', (obj) => {
     imgList.value = obj
   })
@@ -432,10 +449,15 @@
         background: #999;
       }
     }
-      .finish {
-        color: #0087ff;
-        .bg-box {
-          background: #9ccefa;
+    .btn {
+      display: flex;
+      justify-content: space-around;
+      padding: 10px 350px 0;
+      button {
+        cursor: pointer;
+        width: 80px;
+        height: 35px;
+        text-align: center;
         color: #fff;
         border: 1px solid #9ccefa;
         span {
@@ -446,12 +468,22 @@
       .line {
         background: #0087ff;
       }
+      button:nth-of-type(1) {
+        color: #0087ff;
+        background: #e1edfa;
+      }
+      button:nth-of-type(2) {
+        background: #01c5dc;
+      }
+    }
+    .first {
+      justify-content: space-around;
     }
   }
   .btn {
     display: flex;
-      justify-content: space-around;
-      padding: 10px 350px 0;
+    justify-content: space-between;
+    padding: 10px 400px 0;
     button {
       cursor: pointer;
       width: 80px;
@@ -471,7 +503,7 @@
     }
   }
   .first {
-      justify-content: space-around;
+    justify-content: center;
   }
 }
 </style>

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

@@ -117,7 +117,23 @@
       </template>
       <template v-else>
         <div class="bottom">
-          <div class="form" v-for="item in title.children" :key="item.id">
+          <div
+            class="form"
+            v-for="item in title.children"
+            :key="item.id"
+            v-show="
+              !(
+                (showType == '调用接口' && item.name == '平台地址') ||
+                (showType == '调用接口' && item.name == 'SDK安装包') ||
+                (showType == '平台对接' && item.name == 'SDK安装包') ||
+                (showType == '平台对接' && item.name == '接口请求方式') ||
+                (showType == '平台对接' && item.name == '服务接口') ||
+                (showType == 'SDK' && item.name == '平台地址') ||
+                (showType == 'SDK' && item.name == '接口请求方式') ||
+                (showType == 'SDK' && item.name == '服务接口')
+              )
+            "
+          >
             <span>{{ item.name }}</span>
             <a-input
               v-if="item.type == 'input'"
@@ -176,6 +192,15 @@
               :list="props.fileList2"
               tip="支持文件类型，大小不超过100M"
             ></upload>
+            <upload
+              v-else-if="item.type == 'package'"
+              type="压缩包"
+              btnName="上传安装包"
+              :maxCount="1"
+              :data="item"
+              :list="props.packageList"
+              tip="支持.zip类型"
+            ></upload>
             <div
               class="Technical-text"
               v-else-if="item.type == 'richText'"
@@ -212,7 +237,22 @@
               请选择关联组件
             </a-button>
             <a-select
-              v-else-if="item.type == 'select' && item.name !== '归属部门'"
+              v-else-if="item.type == 'select' && item.name == '使用方式'"
+              style="width: 240px"
+              v-model:value="item.note1"
+              :placeholder="'请选择' + item.name"
+              @change="showTypeClick"
+            >
+              <a-select-option
+                v-for="(itemSelect, indexSelect) in item.options"
+                :key="indexSelect"
+                :value="itemSelect.dictLabel"
+              >
+                {{ itemSelect.dictLabel }}
+              </a-select-option>
+            </a-select>
+            <a-select
+              v-else-if="item.type == 'select'"
               style="width: 240px"
               v-model:value="item.note1"
               :placeholder="'请选择' + item.name"
@@ -309,6 +349,8 @@
     // 文件回显
     fileList: { type: Array, default: null },
     fileList2: { type: Array, default: null },
+    // 压缩包回显
+    packageList: { type: Array, default: null },
     // 图片回显
     imgList: { type: Array, default: null },
     // 视频回显
@@ -623,6 +665,13 @@
     visibleAssociatedApplication.value = false
   }
 
+  const showType = ref('')
+  const showTypeClick = (e) => {
+    showType.value = e
+    console.log(e, 'showType', showType.value)
+  }
+  showTypeClick('调用接口')
+
   watch(data.value.list, (newProps, oldProps) => {
     // console.log(newProps, oldProps)
     newProps.forEach((val) => {

front/src/views/components/upload/index.vue

@@ -76,6 +76,8 @@
         file.type === 'application/msword' ||
         file.type ===
           'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    } else if (props.type === '压缩包') {
+      flag = file.type === 'application/x-zip-compressed'
     }
     console.log(flag)
     if (!flag) {
@@ -115,6 +117,8 @@
         } else {
           mybus.emit('chageFileList', fileList.value)
         }
+      } else if (props.type === '压缩包') {
+        mybus.emit('chagePackageList', fileList.value)
       } else if (props.type === '视频') {
         mybus.emit('chageVideoList', fileList.value)
       }

front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue

@@ -8,10 +8,10 @@
       ></DetalsTitle>
     </div>
     <div class="content" v-for="item in dataFrom.content" :key="item.title">
-      <div class="content-left">
+      <div class="content-left" v-if="item.titleType === '调用接口'">
         <div class="left">
           <div class="content-left-title">
-            <span>{{ item.title }}</span>
+            <span>{{ item.title }}：{{ item.titleType }}</span>
           </div>
           <div class="content-left-content">
             <p>
@@ -29,7 +29,41 @@
         </div>
         <div class="right">
           <div @click="technical()">技术文档</div>
-          <div @click="technicalNew()">新手指引</div>
+          <!-- <div @click="technicalNew()">新手指引</div> -->
+          <!-- <div @click="SDKClick()">SDK安装包</div> -->
+        </div>
+      </div>
+      <div class="content-left" v-else-if="item.titleType === '平台对接'">
+        <div class="left">
+          <div class="content-left-title">
+            <span>{{ item.title }}：{{ item.titleType }}</span>
+          </div>
+          <div class="content-left-content">
+            <p>
+              <span>{{ item.linkPlatform.name }}</span>
+              <a-tooltip>
+                <template #title>{{ item.linkPlatform.value }}</template>
+                <span>{{ item.linkPlatform.value }}</span>
+              </a-tooltip>
+            </p>
+          </div>
+        </div>
+        <div class="right">
+          <div @click="technical()">技术文档</div>
+          <!-- <div @click="technicalNew()">新手指引</div> -->
+          <!-- <div @click="SDKClick()">SDK安装包</div> -->
+        </div>
+      </div>
+      <div class="content-left" v-else-if="item.titleType === 'SDK'">
+        <div class="left">
+          <div class="content-left-title">
+            <span>{{ item.title }}：{{ item.titleType }}</span>
+          </div>
+        </div>
+        <div class="right">
+          <div @click="technical()">技术文档</div>
+          <!-- <div @click="technicalNew()">新手指引</div> -->
+          <div @click="SDKClick()">SDK安装包</div>
         </div>
       </div>
       <div class="content-right">
@@ -98,13 +132,19 @@
   let dataFrom = ref({
     title: '使用方式',
     englishTitle: 'USAGE',
+    SDK: '',
     content: [
       {
-        title: '组件地址',
+        title: '使用方式',
+        titleType: '',
         link: {
           name: '服务接口：',
           value: '',
         },
+        linkPlatform: {
+          name: '平台地址：',
+          value: '',
+        },
         postMethod: {
           name: '请求方式：',
           value: '',
@@ -151,7 +191,7 @@
       dataFrom.value.content[0].facilitator.value = props.dataList.deptName
       dataFrom.value.content[0].people.value = props.dataList.deptContacts
       dataFrom.value.content[0].phone.value = props.dataList.deptPhone
-      dataFrom.value.content[0].postMethod.value = val.apiMethodType
+      dataFrom.value.content[0].postMethod.value = props.dataList.apiMethodType
       console.log('dataList', props.dataList)
       props.dataList.infoList.map((item) => {
         if (item.attrType === '组件地址') {
@@ -163,8 +203,13 @@
         } else if (item.attrType === '服务商联系电话') {
           dataFrom.value.content[0].phone2.value = item.attrValue || '--'
         } else if (item.attrType === '服务接口') {
-          debugger
           dataFrom.value.content[0].link.value = item.attrValue || '--'
+        } else if (item.attrType === '平台地址') {
+          dataFrom.value.content[0].linkPlatform.value = item.attrValue || '--'
+        } else if (item.attrType === 'SDK安装包') {
+          dataFrom.value.SDK = item.attrValue || '--'
+        } else if (item.attrType === '使用方式') {
+          dataFrom.value.content[0].titleType = item.attrValue || '--'
         }
       })
     }
@@ -203,8 +248,14 @@
             } else if (item.attrType === '服务商联系电话') {
               dataFrom.value.content[0].phone2.value = item.attrValue || '--'
             } else if (item.attrType === '服务接口') {
-              debugger
               dataFrom.value.content[0].link.value = item.attrValue || '--'
+            } else if (item.attrType === '平台地址') {
+              dataFrom.value.content[0].linkPlatform.value =
+                item.attrValue || '--'
+            } else if (item.attrType === 'SDK安装包') {
+              dataFrom.value.SDK = item.attrValue || '--'
+            } else if (item.attrType === '使用方式') {
+              dataFrom.value.content[0].titleType = item.attrValue || '--'
             }
           })
         }
@@ -257,6 +308,19 @@
       message.error('暂未上传使用手册')
     }
   }
+  function SDKClick() {
+    let obj = props.dataList.infoList.filter(
+      (item) => item.attrType === 'SDK安装包'
+    )[0]
+    if (obj) {
+      window.open(dataFrom.value.SDK)
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('SDK安装包')
+    }
+  }
 </script>
 
 <style lang="less" scoped>
@@ -282,6 +346,7 @@
       box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
       display: flex;
       align-items: center;
+      justify-content: space-between;
       padding: 0 0.35rem;
 
       .left {