bug修改

2022-07-16 15:25:49 +08:00 · 2022-07-16 15:25:49 +08:00 · c9cda03deb
parent 4568d28b6a
commit c9cda03deb
9 changed files with 552 additions and 465 deletions
--- 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/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/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@ -598,16 +598,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 +619,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 +647,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 +677,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,7 +685,8 @@
          })
        })
      }
-  const targetKeys = ref([])
+    })
+  }
  const selectedKeys = ref([])

  const handleChange = (nextTargetKeys, direction, moveKeys) => {
@ -648,7 +696,7 @@
  }

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

  const handleOk = (e) => {
--- 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/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>
@ -75,7 +80,6 @@ if (keyId) {
  }
  const selectNav = (key) => {
    select.value = key
-  console.log(key, select.value)
    mybus.emit('flyToView', select.value)
  }
  if (props.dataList.infoList) {
--- 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(