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

* 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs: 端口修改 BUG修改应用资源新增能力集市图标和详情页切换 bug修改 bug修复 BUG修改 BUG修改 # Conflicts: # front/src/utils/request.js # front/src/vab/plugins/permissions.js
2022-07-16 16:22:28 +08:00 · 2022-07-16 16:22:28 +08:00 · c156b52d84
parent 15eb5dbd13 c7f2e1f70a
commit c156b52d84
22 changed files with 840 additions and 618 deletions
--- a/back/src/components/ren-process-detail/src/ren-process-detail.vue
+++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue
@ -1,15 +1,15 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-11 16:30:04
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-06 13:14:02
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-16 15:07:44
 * @Description: 告诉大家这是什么
 -->
 <template>
  <el-card shadow="never" class="aui-card--fill">
    <!-- 流程图 -->
-    <h4>{{ $t('process.flowImage') }}</h4>
-    <img :src="getResourceURL()" class="image">
+    <!-- <h4>{{ $t('process.flowImage') }}</h4>
+    <img :src="getResourceURL()" class="image"> -->
    <!-- 流转详情 -->
    <h4>{{ $t('process.circulation') }}</h4>
    <div class="mod-sys__dict">
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@ -72,16 +72,17 @@ export default {
      })
    },
    getInfo (id) {
-      this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
+      this.$http.get('/demandComment/' + id).then(({ data: res }) => {
        if (res.code !== 0) {
          return this.$message.error(res.msg)
        }
-        this.dataForm = res.data.resourceDTO
-        if (this.dataForm.type != '应用资源') {
-          this.shifoushizujian = false
-        } else {
-          this.shifoushizujian = true
-        }
+        this.dataForm = res.data
+        // this.dataForm = res.data.resourceDTO
+        // if (this.dataForm.type != '应用资源') {
+        //   this.shifoushizujian = false
+        // } else {
+        //   this.shifoushizujian = true
+        // }
        console.log('this.dataForm', this.dataForm)
      })
    }
--- a/back/src/views/modules/activiti/my-todo-task.vue
+++ b/back/src/views/modules/activiti/my-todo-task.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-27 19:34:30
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-23 21:08:01
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-16 11:40:26
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -40,6 +40,17 @@
          align="center"
          width="50"
        ></el-table-column>
+        <!-- <el-table-column label="申请标题" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList && scope.row.params.tAbilityApplicationDTOList[0].title) ||
+              (scope.row.params && scope.row.params.comment) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName)||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column> -->
        <el-table-column label="申请人" header-align="center" align="center">
          <template slot-scope="scope">
            <span>{{
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 10:58:46
+ * @LastEditTime: 2022-07-16 16:01:48
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -46,7 +46,7 @@
    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@ -60,8 +60,7 @@ instance.interceptors.request.use(
  (config) => {
    // debugger
    const token = getAccessToken()
-    if (token)
-      config.headers[tokenName] = token
+    if (token) config.headers[tokenName] = token
    if (
      config.data &&
      config.headers['Content-Type'] ===
@ -93,6 +92,7 @@ instance.interceptors.response.use(
    console.log('接口返回REDIRECT', response.headers.redirect)
    response['Access-Control-Expose-Headers'] = 'redirect'
    const { code, message } = response.data
+    
    if (response.headers.token) {
      setAccessToken(response.headers.token)
    } 
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-01 17:23:11
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-11 16:39:36
+ * @LastEditTime: 2022-07-16 10:57:59
 * @Description: 告诉大家这是什么
 */
 /**
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@ -110,9 +110,24 @@
            :pagination="false"
          >
            <template #bodyCell="{ column, text }">
-              <template v-if="column.dataIndex !== 'name'">
+              <template
+                v-if="
+                  column.dataIndex !== 'name' &&
+                  (column.title === '组件服务' || column.title === '应用资源')
+                "
+              >
                {{ text || 0 }}
              </template>
+              <template
+                v-else-if="
+                  column.dataIndex !== 'name' &&
+                  (column.title === '知识库' ||
+                    column.title === '基础设施' ||
+                    column.title === '数据资源')
+                "
+              >
+                --
+              </template>
            </template>
          </a-table>
        </div>
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@ -182,15 +182,15 @@
    })
  }
  let photoBg = ref([
-    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
    require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
    require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
    require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
  ])
  let photo = ref([
-    require('../../../assets/abilityStatistics/zhishiku.png'),
    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/zhishiku.png'),
    require('../../../assets/abilityStatistics/zujianfuwu.png'),
    require('../../../assets/abilityStatistics/shujuziyuan.png'),
    require('../../../assets/abilityStatistics/jichujianshe.png'),
@ -202,19 +202,19 @@
      // dataLists.value = res.data.data
      res.data.data.map((item) => {
        switch (item.type) {
-          case '知识库':
-            dataLists.value[0] = item
-            break
          case '应用资源':
            dataLists.value[1] = item
            break
-          case '组件服务':
+          case '业务组件':
+            dataLists.value[0] = item
+            break
+          case '图层服务':
            dataLists.value[2] = item
            break
-          case '数据资源':
+          case '开发组件':
            dataLists.value[3] = item
            break
-          case '基础设施':
+          case '智能算法':
            dataLists.value[4] = item
            break
          default:
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-13 10:22:27
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:38:56
+ * @LastEditTime: 2022-07-16 14:27:31
 * @Description: 算法上架
 -->
 <template>
@ -449,6 +449,21 @@
          background: #999;
        }
      }
+      .finish {
+        color: #0087ff;
+        .bg-box {
+          background: #9ccefa;
+          color: #fff;
+          border: 1px solid #9ccefa;
+          span {
+            background: #0087ff;
+            border: 1px solid #0087ff;
+          }
+        }
+        .line {
+          background: #0087ff;
+        }
+      }
      .btn {
        display: flex;
        justify-content: space-around;
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-17 14:11:08
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:34:47
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-16 15:05:16
 * @Description: 上架
 -->
 <template>
@ -111,7 +111,9 @@
            ></upload>
          </div>
          <div class="submit">
-            <a-button type="primary" @click="add(title.name)">添加</a-button>
+            <a-button type="primary" @click="add(title.name)">
+              添加更多
+            </a-button>
          </div>
        </div>
      </template>
@ -598,16 +600,20 @@
  const mockData = ref([])
  const titles = ref(['未关联的应用名称', '已关联的应用名称'])
  const titleName = ref('关联应用')
+  const targetKeys = ref([])
+  // 上一步关联数据
+  const targetKeysBack = ref([])

  const sourceClick = () => {
    mockData.value = []
    visibleAssociatedApplication.value = true
+    props.dataFrom.infoList.forEach((val) => {
+      if (val.attrType === '来源应用' && val.attrValue != '') {
        queryApplicationRelByResourceId({
          referenceId: 0,
        }).then((res) => {
          // console.log(res.data.data.notLinked)
          res.data.data.notLinked.forEach((val, index) => {
-        // console.log(val, index)
            mockData.value.push({
              key: val.id,
              title: val.name,
@ -615,6 +621,27 @@
            })
          })
        })
+        targetKeys.value = []
+        val.attrValue.split(',').forEach((item) => {
+          targetKeys.value.push(item)
+        })
+        console.log(targetKeys.value)
+        // console.log('wowowo')
+      } else if (val.attrType === '来源应用' && val.attrValue == '') {
+        queryApplicationRelByResourceId({
+          referenceId: 0,
+        }).then((res) => {
+          // console.log(res.data.data.notLinked)
+          res.data.data.notLinked.forEach((val, index) => {
+            mockData.value.push({
+              key: val.id,
+              title: val.name,
+              description: val.id,
+            })
+          })
+        })
+      }
+    })
  }
  // 关联组件
  const componentsClick = () => {
@ -622,6 +649,29 @@
    titleName.value = '关联组件'
    mockData.value = []
    visibleAssociatedApplication.value = true
+    props.dataFrom.infoList.forEach((val) => {
+      if (val.attrType === '关联组件信息' && val.attrValue != '') {
+        queryResourceRelByKeyId({
+          keyId: 0,
+          type: '组件服务',
+          referenceName: '',
+        }).then((res) => {
+          // console.log(res.data.data.notLinked)
+          res.data.data.notLinked.forEach((val, index) => {
+            mockData.value.push({
+              key: val.id,
+              title: val.name,
+              description: val.id,
+            })
+          })
+        })
+        targetKeys.value = []
+        val.attrValue.split(',').forEach((item) => {
+          targetKeys.value.push(item)
+        })
+        console.log(targetKeys.value)
+        // console.log('wowowo')
+      } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
        queryResourceRelByKeyId({
          keyId: 0,
          type: '组件服务',
@ -629,7 +679,6 @@
        }).then((res) => {
          // console.log(res.data.data.notLinked)
          res.data.data.notLinked.forEach((val, index) => {
-        // console.log(val, index)
            mockData.value.push({
              key: val.id,
              title: val.name,
@ -638,17 +687,19 @@
          })
        })
      }
-  const targetKeys = ref([])
+    })
+  }
  const selectedKeys = ref([])

  const handleChange = (nextTargetKeys, direction, moveKeys) => {
    console.log('targetKeys: ', nextTargetKeys)
    console.log('direction: ', direction)
    console.log('moveKeys: ', moveKeys)
+    targetKeys.value = moveKeys
  }

  const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
-    console.log('targetSelectedKeys: ', targetSelectedKeys)
+    console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
  }

  const handleOk = (e) => {
@ -724,7 +775,7 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-.put-on-the-shelf {
+  .put-on-the-shelf {
    height: 680px;
    overflow: scroll;
    display: flex;
@ -881,9 +932,9 @@
    & > div:nth-of-type(1) {
      margin-top: 0;
    }
-}
+  }

-.application-Area {
+  .application-Area {
    width: 520px;
    display: grid;
    margin-top: -5px;
@ -909,68 +960,71 @@
      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) {
+    display: none !important;
+  }
 </style>
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@ -126,11 +126,13 @@
      'props.dataList.infoList==============>',
      navList.value.filter((item) => item.name === list.value[0])
    )
+    if (list.value.length > 0) {
      if (navList.value.filter((item) => item.name === list.value[0])[0]) {
        select.value = navList.value.filter(
          (item) => (item.name === '关联应用') | (item.name === list.value[0])
        )[0].key
      }
+    }
    console.log('11111111111111111111111111', list.value, navList.value)
  }
  watch(
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@ -149,11 +149,6 @@
            dataFrom.value.content[1].childrenContent.push(itemContent)
          })
        }
-        let obj = {
-          attrType: '访问地址',
-          attrValue: props.dataList.link || '------',
-        }
-        dataFrom.value.content[0].childrenContent.push(obj)
      }
    }
  )
--- a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
@ -2,16 +2,37 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 15:25:33
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:30:52
+ * @LastEditTime: 2022-07-16 15:59:09
 * @Description: 应用展示  视频播放
 -->
 <template>
  <div class="application-presentation" v-if="flag">
    <detals-title title="应用展示" type="IMAGE&VIDEO"></detals-title>
-    <div class="main" :style="`${img}background-position:center;background-size:cover;`">
+    <div class="box">
+      <div class="left" @click="chagneShow()"></div>
+      <div
+        class="main"
+        :style="`${img}background-position:center;background-size:cover;`"
+        v-if="
+          showArr.length > 0 && showArr[showFlag].attrType == '应用展示视频'
+        "
+      >
        <div class="play" @click="showModal"></div>
      </div>
-    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
+      <div
+        class="main2"
+        v-if="showArr.length > 0 && showArr[showFlag].attrType == '应用图片'"
+      >
+        <a-image :width="700" :src="showArr[showFlag].attrValue" />
+      </div>
+      <div class="right" @click="chagneShow()"></div>
+    </div>
+    <a-modal
+      v-model:visible="visible"
+      title="视频预览"
+      :width="750"
+      destroyOnClose
+    >
      <template #footer></template>
      <div style="width: 100%; display: flex; justify-content: center">
        <div style="width: 100%; height: 100%">
@ -22,10 +43,10 @@
  </div>
 </template>
 <script setup>
-import { ref, reactive, defineProps, watch } from 'vue'
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
-const visible = ref(false)
-const options = reactive({
+  import { ref, reactive, defineProps, watch } from 'vue'
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const visible = ref(false)
+  const options = reactive({
    width: '7.00rem', //播放器宽度
    height: '4.00rem', //播放器高度
    color: '#409eff', //主题色
@ -50,62 +71,54 @@ const options = reactive({
      'pageFullScreen',
      'fullScreen',
    ], //显示所有按钮,
-})
-const showModal = () => {
+  })
+  const showFlag = ref(0)
+  const showArr = ref([])
+  const chagneShow = () => {
+    if (showArr.value.length > 1) {
+      showFlag.value = showFlag.value == 0 ? 1 : 0
+    }
+  }
+  const showModal = () => {
    visible.value = true
-}
-const props = defineProps({
+  }
+  const props = defineProps({
    dataList: { type: Object, default: null },
-})
-const flag = ref(true)
-const img = ref({})
-console.log('111111111111111111111,', props.dataList)
-if (props.dataList.infoList) {
-  let obj = props.dataList.infoList.filter(
-    (item) => item.attrType === '应用展示视频'
-  )[0]
-  console.log('视频==============>', obj)
-  if (!obj) {
+  })
+  const flag = ref(true)
+  const img = ref({})
+  console.log('111111111111111111111,', props.dataList)
+  if (props.dataList.infoList) {
+    showArr.value = props.dataList.infoList.filter(
+      (item) => item.attrType === '应用展示视频' || item.attrType === '应用图片'
+    )
+    console.log('视频==============>', showArr.value)
+    if (showArr.value.length == 0) {
      flag.value = false
-  } else {
-    let imgindex = props.dataList.infoList.filter(
-      (item) => item.attrType === '应用图片'
-    )[0]
-    options.src = obj.attrValue
-    if (imgindex) {
-      img.value = 'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
    }
  }
-}
-watch(
+  watch(
    () => props.dataList,
    (val) => {
      if (val) {
-      let obj = val.infoList.filter(
-        (item) => item.attrType === '应用展示视频'
-      )[0]
-      console.log('视频==============>', obj)
-      if (!obj) {
+        showArr.value = props.dataList.infoList.filter(
+          (item) =>
+            item.attrType === '应用展示视频' || item.attrType === '应用图片'
+        )
+        console.log('视频==============>', showArr.value)
+        if (showArr.value.length == 0) {
          flag.value = false
-      } else {
-        let imgindex = props.dataList.infoList.filter(
-          (item) => item.attrType === '应用图片'
-        )[0]
-        options.src = obj.attrValue
-        if (imgindex) {
-          img.value =
-            'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
        }
      }
    }
-  }
-)
+  )
 </script>
 <style lang="less" scoped>
-.application-presentation {
+  .application-presentation {
    padding: 0.8rem 3rem 0;

    .main {
+      width: 13.14rem;
      height: 3.4rem;
      border-radius: 0.1rem;
      background: url('~@/assets/detailsAll/sf_video_bg.png') no-repeat;
@ -123,5 +136,41 @@ watch(
        cursor: pointer;
      }
    }
-}
+    .main2 {
+      width: 13.14rem;
+      height: 3.4rem;
+      border-radius: 0.1rem;
+      background-size: 100%;
+      margin-top: 0.4rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+  .box {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 0.8rem;
+    .left {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-right: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_previous.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+    .right {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-left: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_next.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+  }
 </style>
--- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
@ -8,7 +8,12 @@
 <template>
  <div class="business-navigation" v-if="navList.length > 0">
    <template v-for="nav in navList" :key="nav.key">
-      <div class="nav" :class="{ select: nav.key == select }" v-if="nav.show" @click="selectNav(nav.key)">
+      <div
+        class="nav"
+        :class="{ select: nav.key == select }"
+        v-if="nav.show"
+        @click="selectNav(nav.key)"
+      >
        {{ nav.name }}
        <span class="line"></span>
      </div>
@ -16,14 +21,14 @@
  </div>
 </template>
 <script setup>
-import { ref, defineProps, watch, getCurrentInstance } from 'vue'
-import { useRouter } from 'vue-router'
-import mybus from '@/myplugins/mybus'
-import { queryPartAppByKeyId2 } from '@/api/home'
-// 获取当前路由地址
-const router = useRouter()
-const keyId = router.currentRoute.value.query.id
-const navList = ref([
+  import { ref, defineProps, watch, getCurrentInstance } from 'vue'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  import { queryPartAppByKeyId2 } from '@/api/home'
+  // 获取当前路由地址
+  const router = useRouter()
+  const keyId = router.currentRoute.value.query.id
+  const navList = ref([
    {
      name: '组件展示',
      key: 'business-presentation',
@ -49,16 +54,16 @@ const navList = ref([
      name: '常见问题',
      key: 'common-problem',
    },
-])
-const props = defineProps({
+  ])
+  const props = defineProps({
    associatedComponents: { type: Array, default: null },
    selectNow: { type: String, default: '' },
    dataList: { type: Object, default: null },
-})
-const select = ref('business-associated-ability')
-const list = ref([])
-// 根据能力id查询是否存在关联应用
-if (keyId) {
+  })
+  const select = ref('business-associated-ability')
+  const list = ref([])
+  // 根据能力id查询是否存在关联应用
+  if (keyId) {
    queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
      console.log('ressssssss', res)
      if (res.data.data.length > 0) {
@ -72,13 +77,12 @@ if (keyId) {
        console.log('navList', navList)
      }
    })
-}
-const selectNav = (key) => {
+  }
+  const selectNav = (key) => {
    select.value = key
-  console.log(key, select.value)
    mybus.emit('flyToView', select.value)
-}
-if (props.dataList.infoList) {
+  }
+  if (props.dataList.infoList) {
    list.value = []
    let arr = [
      '关联应用',
@ -128,14 +132,14 @@ if (props.dataList.infoList) {
      }
    }
    console.log('11111111111111111111111111', list.value, navList.value)
-}
-watch(
+  }
+  watch(
    () => props.selectNow,
    (newValue) => {
      select.value = newValue
    }
-)
-watch(
+  )
+  watch(
    () => props.dataList,
    (val) => {
      if (val) {
@ -192,10 +196,10 @@ watch(
        console.log('11111111111111111111111111', list.value, navList.value)
      }
    }
-)
+  )
 </script>
 <style lang="less" scoped>
-.business-navigation {
+  .business-navigation {
    width: 19.12rem;
    height: 0.84rem;
    line-height: 0.8rem;
@ -228,5 +232,5 @@ watch(
        background: #526aff;
      }
    }
-}
+  }
 </style>
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@ -164,6 +164,9 @@
    businessArea.value = props.dataList.infoList.filter(
      (val) => val.attrType === '应用领域'
    )[0].attrValue
+    let obj = props.dataList.infoList.filter(
+      (val) => val.attrType === '组件类型'
+    )[0]
    if (
      props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0]
    ) {
--- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
@ -96,6 +96,8 @@
        list.value.push(item.attrType)
      } else if (item.attrType === '组件视频介绍') {
        list.value.push('组件展示')
+      } else if (item.attrType === '是否支持试用' && item.attrValue === '是') {
+        list.value.push('组件试用')
      }
    })
    list.value.unshift('关联应用')
@ -111,9 +113,12 @@
        // }
      }
    })
+    if (navList.value.filter((item) => item.name === list.value[0])[0]) {
      select.value = navList.value.filter(
-      (item) => item.name === list.value[0]
+        (item) => (item.name === '关联应用') | (item.name === list.value[0])
+        // (item) => item.name === list.value[0]
      )[0].key
+    }
    console.log('11111111111111111111111111', list.value, navList.value)
  }
  watch(
@ -137,10 +142,15 @@
            list.value.push(item.attrType)
          } else if (item.attrType === '组件视频介绍') {
            list.value.push('组件展示')
+          } else if (
+            item.attrType === '是否支持试用' &&
+            item.attrValue === '是'
+          ) {
+            list.value.push('组件试用')
          }
        })
        list.value.unshift('关联应用')
-        list.value.push('组件试用')
+        // list.value.push('组件试用')
        list.value.push('使用方式')
        navList.value.forEach((item) => {
          console.log(item)
--- a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
@ -49,7 +49,7 @@
  })
  if (props.dataList.infoList) {
    let obj = props.dataList.infoList.filter(
-      (item) => item.attrType === '试用地址'
+      (item) => item.attrType === '是否支持试用' && item.attrValue === '是'
    )[0]
    if (!obj) {
      flag.value = false
@ -94,7 +94,9 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = val.infoList.filter((item) => item.attrType === '试用地址')[0]
+        let obj = val.infoList.filter(
+          (item) => item.attrType === '是否支持试用' && item.attrValue === '是'
+        )[0]
        if (!obj) {
          flag.value = false
        } else {
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@ -82,7 +82,6 @@
  const select = ref('layer-service-associated-ability')
  const selectNav = (key) => {
    select.value = key
-    console.log(key, select.value)
    mybus.emit('flyToView', select.value)
  }
  if (props.dataList.infoList) {
@ -145,9 +144,12 @@
        item.show = true
      }
    })
+    if (navList.value.filter((item) => item.name === list.value[0])[0]) {
      select.value = navList.value.filter(
-      (item) => item.name === list.value[0]
+        (item) => (item.name === '关联应用') | (item.name === list.value[0])
+        // (item) => item.name === list.value[0]
      )[0].key
+    }
    console.log('11111111111111111111111111', list.value, navList.value)
  }
  watch(
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@ -290,7 +290,7 @@
          ? list.value[0].children
              .filter((val) => val.id == list.value[0].checkedList[0])[0]
              .resourceName.concat(
-                list.value[0].checkedList.length > 0
+                list.value[0].checkedList.length > 1
                  ? '等能力申请' + num.value + '个'
                  : '能力申请'
              )
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -50,6 +50,24 @@
      :key="item.index"
    >
      <div class="item" :key="showKey">
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
+            item.type === '应用资源' &&
+            item.infoList &&
+            item.infoList.filter((val) => val.attrType == '应用图片')[0]
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '应用图片')[0]
+                .attrValue
+            "
+          />
+        </div>
        <div
          class="left"
          :class="
@ -78,7 +96,7 @@
              ? 'ywzj'
              : ''
          "
-          v-if="
+          v-else-if="
            selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
          "
        ></div>
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-19 17:18:48
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-05-06 19:11:32
+ * @LastEditTime: 2022-07-16 15:01:48
 * @Description: markdown编辑器
 -->
 <template>
@ -44,7 +44,7 @@
      }
    },
    created() {
-      this.uuidSplice()
+      // this.uuidSplice()
      this.getDevelopmentFile()
    },
    methods: {
@ -92,12 +92,15 @@
        const blob = new Blob([file], {
          type: 'md',
        })
-        let myfile = new File([blob], this.uuidSnum + '.md')
+        if (this.uuidSnum === '') {
+          this.uuidSplice()
+        }
+        let myfile = new File([blob], this.uuidSnum)
        var formData = new FormData()
        const type = pinyin(this.dataFrom.type, {
          pattern: 'initial',
        }).replace(/\s*/g, '')
-        formData.append('fileName', this.uuidSnum + '.md')
+        formData.append('fileName', this.uuidSnum)
        formData.append('type', type)
        formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
        // formData.append('name', this.route.currentRoute.query.id + '.md')
@ -118,22 +121,33 @@
        }
      },
      async getDevelopmentFile() {
+        debugger
+        const uuidParam = this.dataFrom.infoList.filter((item) => {
+          if (item.attrType === '技术文档') {
+            return item
+          }
+        })
+        let uuid = ''
+        if (uuidParam[0].attrValue) {
+          uuid = uuidParam[0].attrValue.split('/')[1].split('.')[0]
+        }
+        this.uuidSnum = uuid
        const type = pinyin(this.dataFrom.type, {
          pattern: 'initial',
        }).replace(/\s*/g, '')
        console.log(type)
        const param = {
          type: type,
-          resourceId: this.uuidSnum,
+          resourceId: uuid,
        }
        const res = await getDevelopmentFile(param)
        this.text = res.data
-        let infoList = {
-          attrType: '技术文档',
-          attrValue: this.text.data,
-          delFlag: 0,
-        }
-        mybus.emit('chageDataFrom', infoList)
+        // let infoList = {
+        //   attrType: '技术文档',
+        //   attrValue: this.text.data,
+        //   delFlag: 0,
+        // }
+        // mybus.emit('chageDataFrom', infoList)
        console.log('res', res)
      },
    },
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@ -68,8 +68,8 @@
      </a-button>
    </div>
  </div>
-  <div class="items">
-    <div class="item" v-for="val in list" :key="val.id">
+  <div class="items" :key="showKey">
+    <div class="item" v-for="(val, valIndex) in list" :key="val.id">
      <div class="item-top" @click="showBottom(val)">
        <div>
          <a-checkbox
@ -89,7 +89,6 @@
          :loading="val.initLoading"
          item-layout="horizontal"
          :data-source="val.children"
-          :key="showKey"
        >
          <template #renderItem="{ item }">
            <a-list-item>
@ -131,7 +130,7 @@
                        title="是否删除该记录?"
                        ok-text="是"
                        cancel-text="否"
-                        @confirm="delOne(item)"
+                        @confirm="delOne(item, valIndex)"
                        @cancel="cancel"
                      >
                        <a-button
@ -453,7 +452,7 @@
    reverseSelectionFalg.value = !reverseSelectionFalg.value
  }
  // 重置
-  const clean = () => {
+  const clean = (index) => {
    name.value = ''
    type.value = ''
    pageNum.value = '1'
@ -463,10 +462,10 @@
    checkedListAll.value = []
    checkAll.value = false
    showKey.value++
-    getList()
+    getList('', index)
  }
  // 获取信息
-  const getList = (type) => {
+  const getList = (type, index) => {
    if (type == 'init') {
      pageNum.value = 1
      pageSize.value = 99999
@ -491,7 +490,7 @@
        val.pageNum = '1'
        val.pageSize = '99999'
      })
-      if (statistics == res.data.data.list.length) {
+      if (statistics != 0 && statistics == res.data.data.list.length) {
        checkAll.value = true
      }
      if (list.value.length == 0) {
@ -501,8 +500,31 @@
        load.value = Number(pageNum.value)
      }
      // console.log('整体页面加载次数===============>', load.value)
+      // 判断是否有已打开项，如果有重新载入之后自动打开
+      debugger
      list.value = res.data.data.list
+      if (index || index === 0) {
+        debugger
+        list.value[index].show = true
+        // console.log('1111', list.value[index])
+        showNew(list.value[index])
+        // showBottom()
+      }
+      // list.value = res.data.data.list
+      console.log(
+        '重新请求值',
+        index,
+        // res.data.data.list[index].show,
+        list.value
+      )
+
      total.value = res.data.data.deptCount
+      console.log(
+        '重新请求值2',
+        index,
+        // res.data.data.list[index].show,
+        list.value
+      )
      showKey.value++
      if (type == 'init' || type == 'changePage') {
        getListByDeptId(list.value[0])
@ -573,11 +595,15 @@
  }
  // 显示资源信息
  const showBottom = (item) => {
+    debugger
    item.show = !item.show
    if (item.show) {
      getListByDeptId(item)
    }
  }
+  const showNew = (item) => {
+    getListByDeptId(item)
+  }
  // 切换页数
  const pageChange = (val) => {
    checkAll.value = false
@ -642,13 +668,13 @@
  }
  // 判断是否全选
  const judgeAll = (item, val) => {
-    // console.log(
-    //   '判断是否全选============>',
-    //   item,
-    //   val,
-    //   list.value,
-    //   checkedList.value
-    // )
+    console.log(
+      '判断是否全选============>',
+      item,
+      val,
+      list.value,
+      checkedList.value
+    )
    if (!val) {
      let all = true
      list.value.map((val) => {
@ -734,7 +760,7 @@
    }
  }

-  const delOne = (item) => {
+  const delOne = (item, index) => {
    // console.log(item)
    sgcDel({
      ids: [item.id],
@ -743,7 +769,8 @@
        message.success('删除成功')
        // console.log('删除申购车列表================>', res)
        mybus.emit('getSgcNum')
-        clean()
+        clean(index)
+        // val.show = true
      }
    })
  }