From 962ab8841db65040a4d0046a488de6f5795b2bbd Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 13 Jul 2022 10:11:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/Application-resources.vue    |  22 +++
 .../myAgent/demo/ability-resource-shelf.vue   | 150 +-----------------
 .../capacityOnTheShelf/BusinessComponent.vue  |   4 +-
 3 files changed, 30 insertions(+), 146 deletions(-)
 create mode 100644 back/src/views/modules/myAgent/demo/Application-resources.vue

diff --git a/back/src/views/modules/myAgent/demo/Application-resources.vue b/back/src/views/modules/myAgent/demo/Application-resources.vue
new file mode 100644
index 00000000..bf310a87
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/Application-resources.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="wrapper"></div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {},
+  data () {
+    return {}
+  },
+  watch: {},
+  computed: {},
+  methods: {},
+  created () {},
+  mounted () {}
+}
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+</style>
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 5681064c..9581bda4 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -8,150 +8,9 @@
         :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
       >
         <div v-if="shifoushizujian">
-          <el-form-item label="应用名称">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="应用名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="应用描述">
-            <el-tooltip
-              effect="dark"
-              :content="dataForm.description"
-              placement="top"
-              popper-class="kuandukuandukuandu"
-            >
-              <el-input
-                v-model="dataForm.description"
-                :disabled="fieldDisabled"
-                placeholder="应用描述"
-              ></el-input>
-            </el-tooltip>
-          </el-form-item>
-          <el-form-item label="部门联系人">
-            <el-input
-              v-model="dataForm.deptContacts"
-              :disabled="fieldDisabled"
-              placeholder="部门联系人"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享类型">
-            <el-input
-              v-model="dataForm.shareType"
-              :disabled="fieldDisabled"
-              placeholder="共享类型"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享方式">
-            <el-input
-              v-model="dataForm.shareMode"
-              :disabled="fieldDisabled"
-              placeholder="共享方式"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享条件">
-            <el-input
-              v-model="dataForm.shareCondition"
-              :disabled="fieldDisabled"
-              placeholder="共享方条件"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="访问地址">
-            <el-input
-              v-model="dataForm.link"
-              :disabled="fieldDisabled"
-              placeholder="访问地址"
-            ></el-input>
-          </el-form-item>
+          <Applicationresources></Applicationresources>
         </div>
-        <div v-if="!shifoushizujian">
-          <el-form-item label="组件名称" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="组件名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="算法名称" v-if="nameNotShow">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="算法名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="应用描述" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.description"
-              :disabled="fieldDisabled"
-              placeholder="应用描述"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="算法描述" v-if="nameNotShow">
-            <el-input
-              v-model="dataForm.description"
-              :disabled="fieldDisabled"
-              placeholder="算法描述"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="部门联系人" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.deptContacts"
-              :disabled="fieldDisabled"
-              placeholder="部门联系人"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享类型">
-            <el-input
-              v-model="dataForm.shareType"
-              :disabled="fieldDisabled"
-              placeholder="共享类型"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="共享方式"
-            v-if="coverageNotShow && algorithmShow"
-          >
-            <el-input
-              v-model="dataForm.shareMode"
-              :disabled="fieldDisabled"
-              placeholder="共享方式"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享条件">
-            <el-input
-              v-model="dataForm.shareCondition"
-              :disabled="fieldDisabled"
-              placeholder="共享方条件"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="服务接口" v-if="coverageNotShow">
-            <el-input
-              v-model="dataForm.apiUrl"
-              :disabled="fieldDisabled"
-              placeholder="服务接口"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="接口请求方式" v-if="coverageNotShow">
-            <el-input
-              v-model="dataForm.apiMethodType"
-              :disabled="fieldDisabled"
-              placeholder="接口请求方式"
-            ></el-input>
-          </el-form-item>
-        </div>
-        <el-form-item
-          v-for="item in dataForm.infoList"
-          :key="item.index"
-          :label="item.attrType"
-          :disabled="fieldDisabled"
-        >
-          <el-input
-            v-model="item.attrValue"
-            :placeholder="item.attrType"
-            :disabled="fieldDisabled"
-          ></el-input>
-        </el-form-item>
+        <div v-if="!shifoushizujian">22222</div>
         <el-form-item
           v-if="dataForm.enclosure"
           label="申请附件"
@@ -176,10 +35,13 @@
 
 <script>
 import processModule from '@/mixins/process-module'
+import Applicationresources from './Application-resources.vue'
 export default {
   // 注入公共方法
   mixins: [processModule],
-  components: {},
+  components: {
+    Applicationresources
+  },
   props: {
     // fromList: {
     //   // type: Array,
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 42f6ceba..558d590d 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -298,7 +298,7 @@
   }
   init()
   mybus.on('chageDataFrom', (obj) => {
-    if (obj.attrType == '使用手册' && obj.attrValue != null) {
+    if (obj.attrType == '技术文档' && obj.attrValue != null) {
       shiyongshouce.value = obj
     }
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -310,7 +310,7 @@
     dataFrom.value.infoList.push(obj)
     if (shiyongshouce.value.attrValue) {
       dataFrom.value.infoList.map((syscitem, syscindex) => {
-        if (syscitem.attrType == '使用手册') {
+        if (syscitem.attrType == '技术文档') {
           dataFrom.value.infoList[syscindex] = shiyongshouce.value
         }
       })

From 70b5e91a78aa882a910437a98221d9a4f40dbe9f Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 13 Jul 2022 11:23:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/putOnTheShelf/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index d063a3dc..7e6c279f 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -11,8 +11,8 @@
         <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'>
-              <span v-if="item.name != '来源应用' && item.name != '关联组件信息'">{{ item.name }}</span>
+            <div v-for="item in child.children" :key="item.id" class='item' v-show="item.name != '来源应用' && item.name != '关联组件信息' && item.name != '技术文档'">
+              <span >{{ item.name }}</span>
               <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload> -->
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1"

From cbe9efa5eae323ae86b744c5619b5f9e7e8bca5e Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 13 Jul 2022 11:43:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2ico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/favicon.ico | Bin 9662 -> 9662 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/front/public/favicon.ico b/front/public/favicon.ico
index d5af474560f11c40cd361f7baf1e913a87be8556..dbd1d0ec5b8dfdd7997de0e036690a9c96d253a0 100644
GIT binary patch
literal 9662
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
WApQCHE3Hjq|6id0um9g`;J*RmQ=td|

literal 9662
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


From 22f1091532fa7be48d08f42524d230198bce08d4 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 13 Jul 2022 14:30:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/Application-resources.vue    |   2 +-
 .../myAgent/demo/ResourcesAndServices.vue     | 165 ++++++++++++++++++
 .../myAgent/demo/ability-resource-shelf.vue   |  64 +++----
 3 files changed, 198 insertions(+), 33 deletions(-)
 create mode 100644 back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

diff --git a/back/src/views/modules/myAgent/demo/Application-resources.vue b/back/src/views/modules/myAgent/demo/Application-resources.vue
index bf310a87..c060a4f5 100644
--- a/back/src/views/modules/myAgent/demo/Application-resources.vue
+++ b/back/src/views/modules/myAgent/demo/Application-resources.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="wrapper"></div>
+  <div class="wrapper">22222222222222</div>
 </template>
 
 <script>
diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
new file mode 100644
index 00000000..224c6d96
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="wrapper">
+    <el-form :model="dataView">
+      <div v-for="(item, index) in dataView.children" :key="item">
+        <div class="dataTitle">{{ item.name }}</div>
+        <el-form-item
+          v-for="itemson in item.children[0].children"
+          :key="itemson.name"
+          :label="itemson.name"
+        >
+          <el-input v-model="itemson.note1"></el-input>
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {
+    dataForm: {
+      type: Object
+    },
+    insertList: {
+      type: Array
+    }
+  },
+  data () {
+    return {
+      dataList: [],
+      dataView: []
+    }
+  },
+  watch: {
+    dataList (item) {
+      if (item) {
+        this.dataList = item
+      }
+    },
+    insertList (val) {
+      if (val) {
+        if (this.dataForm.type === '应用资源') {
+          this.dataView = val.filter(
+            (item) => item.name === this.dataForm.type + '一'
+          )[0]
+        } else {
+          const componentType = this.dataForm.infoList.filter(
+            (item) => item.attrType === '组件类型'
+          )
+          this.dataView = val.filter(
+            (item) => item.name === this.dataForm.type + '一'
+          )[0]
+          this.dataView = this.dataView.children.filter(
+            (item) => item.name === componentType[0].attrValue
+          )[0]
+          this.dataForm.infoList.map((item, index) => {
+            this.dataView.children.map((itemView, indexView) => {
+              console.log('itemView', itemView)
+              itemView.children.map((itemViewSon, indexViewSon) => {
+                console.log('itemViewSon', itemViewSon)
+                itemViewSon.children.map((itemSon, indexSon) => {
+                  console.log('itemSon', itemSon)
+                  if (itemSon.name.indexOf('描述') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.description
+                  } else if (itemSon.name.indexOf('名称') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.name
+                  } else if (itemSon.name.indexOf('共享条件') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.shareCondition
+                  } else if (itemSon.name.indexOf('共享方式') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.shareMode
+                  } else if (itemSon.name.indexOf('共享类型') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.shareType
+                  } else if (itemSon.name.indexOf('部门联系人') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.deptContacts
+                  } else if (itemSon.name.indexOf('属部门') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.deptId
+                  } else if (itemSon.name.indexOf('部门联系人电话') != -1) {
+                    this.dataView.children[indexView].children[0].children[
+                      indexSon
+                    ].note1 = this.dataForm.deptPhone
+                  } else if (itemSon.name === item.attrType) {
+                    this.dataView.children[indexView].children[
+                      indexViewSon
+                    ].children[indexSon].note1 = item.attrValue
+                  }
+                })
+              })
+              // .children.map((itemSon, indexSon) => {
+              //   // if (itemSon.name.indexOf('描述') != -1) {
+              //   //   debugger
+              //   //   this.dataView.children[indexView].children[0].children[
+              //   //     itemSon.name.indexOf('描述')
+              //   //   ].note1 = this.dataForm.description
+              //   //   // } else if (itemSon.name.indexOf('名称')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.name
+              //   //   // } else if (itemSon.name.indexOf('共享条件')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.shareCondition
+              //   //   // } else if (itemSon.name.indexOf('共享方式')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.shareMode
+              //   //   // } else if (itemSon.name.indexOf('共享类型')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.shareType
+              //   //   // } else if (itemSon.name.indexOf('部门联系人')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.deptContacts
+              //   //   // } else if (itemSon.name.indexOf('属部门')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.deptId
+              //   //   // } else if (itemSon.name.indexOf('部门联系人电话')) {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = this.dataForm.deptPhone
+              //   //   // } else {
+              //   //   //   this.dataView.children[indexView].children[0].children[
+              //   //   //     indexSon
+              //   //   //   ].note1 = item.attrValue
+              //   //   // }
+              //   // } else if (itemSon.name === item.attrType) {
+              //   // }
+              // })
+            })
+          })
+          console.log(
+            'valvalvalvalvalvalvalvalvalvalval',
+            this.dataForm,
+            this.dataView
+          )
+        }
+      }
+    }
+  },
+  computed: {},
+  methods: {},
+  created () {},
+  mounted () {}
+}
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+</style>
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 9581bda4..435dbd6b 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -10,7 +10,12 @@
         <div v-if="shifoushizujian">
           <Applicationresources></Applicationresources>
         </div>
-        <div v-if="!shifoushizujian">22222</div>
+        <div v-if="flagShow">
+          <ResourcesAndServices
+            :dataForm="dataForm"
+            :insertList="insertList"
+          ></ResourcesAndServices>
+        </div>
         <el-form-item
           v-if="dataForm.enclosure"
           label="申请附件"
@@ -36,11 +41,13 @@
 <script>
 import processModule from '@/mixins/process-module'
 import Applicationresources from './Application-resources.vue'
+import ResourcesAndServices from './ResourcesAndServices.vue'
 export default {
   // 注入公共方法
   mixins: [processModule],
   components: {
-    Applicationresources
+    Applicationresources,
+    ResourcesAndServices
   },
   props: {
     // fromList: {
@@ -52,59 +59,48 @@ export default {
   },
   data () {
     return {
+      flagShow: false,
       // processVisible: true,
       visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
-      dataForm: [],
+      dataForm: {},
       id: '',
       shifoushizujian: true,
       coverageNotShow: true,
       nameNotShow: false,
-      algorithmShow: true
+      algorithmShow: true,
+      insertList: []
     }
   },
   watch: {},
   computed: {},
   methods: {
+    getInfo (id) {
+      this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
+        this.dataForm = res.data.resourceDTO
+        if (this.dataForm) {
+          console.log('this.dataForm', this.dataForm)
+          this.flagShow = true
+        }
+      })
+    },
+    methodsThree () {
+      this.$http.get('/category/getCategoryTree').then((res) => {
+        this.insertList = res.data.data
+      })
+    },
     init () {
       this.visible = true
-      // this.getInfo(this.$router.currentRoute.params.params.params.resourceDTO.id)
-      // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
-      // this.id=this.$router.currentRoute
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields()
         // if (this.dataForm.id) {
         // 如业务KEY已存在，不允许编辑
         this.fieldDisabled = true
         // this.id = this.$router.currentRoute.businessKey
-        this.getInfo(this.$router.currentRoute.params.businessKey)
         console.log('id', this.$router.currentRoute.params.businessKey)
         // }
       })
-    },
-    getInfo (id) {
-      this.$http.get('/resourceMountApply/' + 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
-          this.dataForm.infoList.forEach((val) => {
-            if (val.attrValue === '图层服务') {
-              this.coverageNotShow = false
-            } else if (val.attrValue === '智能算法') {
-              this.nameNotShow = true
-              this.algorithmShow = false
-              console.log(this.nameNotShow, 'wowowo')
-            }
-          })
-        } else {
-          this.shifoushizujian = true
-        }
-        console.log('this.dataForm', this.dataForm)
-      })
     }
   },
   created () {
@@ -123,7 +119,11 @@ export default {
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
   },
-  mounted () {}
+  mounted () {
+    const businessKey = this.$router.currentRoute.params.businessKey
+    this.getInfo(businessKey)
+    this.methodsThree()
+  }
 }
 </script>
 <style lang="scss">