diff --git a/back/src/assets/img/putOnTheShelf/update.png b/back/src/assets/img/putOnTheShelf/update.png
new file mode 100644
index 00000000..baefd1f5
Binary files /dev/null and b/back/src/assets/img/putOnTheShelf/update.png differ
diff --git a/back/src/mixins/process-module.js b/back/src/mixins/process-module.js
index 0d303cd2..95fc3287 100644
--- a/back/src/mixins/process-module.js
+++ b/back/src/mixins/process-module.js
@@ -47,20 +47,31 @@ export default {
       }
     },
     // 获取流程定义的表单路由配置信息
-    getProcDefRouteSet (data, callback) {
-      this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
+    getProcDefRouteSet (data, callback, str) {
+      if (data.resourceName && !data.processDefinitionId) {
+        switch (str) {
+          case '待办':
+            this.$router.push({ name: 'activiti-RoomExamineAdmin' })
+            break
+          case '已办':
+            this.$router.push({ name: 'activiti-RoomExamineAdminDone' })
+            break
         }
-        if (!res.data || !res.data.bizRoute) {
-          return this.$message.error(this.$t('process.routeError'))
-        }
-        var param = {
-          ...data,
-          ...res.data
-        }
-        callback(param)
-      }).catch(() => { })
+      } else {
+        this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          if (!res.data || !res.data.bizRoute) {
+            return this.$message.error(this.$t('process.routeError'))
+          }
+          var param = {
+            ...data,
+            ...res.data
+          }
+          callback(param)
+        }).catch(() => { })
+      }
     },
     getProcDefBizRouteAndProcessInstance (params, callback) {
       this.$http.get('/act/process/getProcDefBizRouteAndProcessInstance', {
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 53dd6b22..a5fe82e1 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -230,7 +230,7 @@
       :close-on-press-escape="false"
       :destroy-on-close="true"
       :before-close="clear"
-      width="50%"
+      width="60%"
     >
       <putOnTheShelf
         ref="putOnTheShelf"
@@ -271,6 +271,7 @@ export default {
       radio: '',
       showPutOnTheShelfFlag: false,
       showPutOnTheShelfFlag2: false,
+      routePath: '',
       submitFrom: {
         type: '组件服务',
         deptId: '',
@@ -300,7 +301,9 @@ export default {
         infoList: [],
         delFlag: 0,
         type: '组件服务',
-        name: ''
+        name: '',
+        deptIds: [],
+        region: true
       },
       // qp: false,
       // 关联应用弹窗
@@ -326,7 +329,7 @@ export default {
     this.dataForm.name = ''
     this.dataForm.type = '组件服务'
     this.$http.get('/sys/user/info').then(res => {
-      console.log('res', res.data.data)
+      console.log('res', res.data.data, !res.data.data.superAdmin, this.$store.state.user.roleIdList)
       this.superAdmin = res.data.data.superAdmin
     })
   },
@@ -391,7 +394,9 @@ export default {
             infoList: [],
             delFlag: 0,
             type: '组件服务',
-            name: ''
+            name: '',
+            deptIds: [],
+            region: true
           }
         )
         .then(({ data: res }) => {
@@ -546,7 +551,9 @@ export default {
               infoList: [],
               delFlag: 0,
               type: '组件服务',
-              name: names
+              name: names,
+              deptIds: [],
+              region: true
             }
           )
           .then(({ data: res }) => {
@@ -623,6 +630,7 @@ export default {
     },
     // 新上架
     clear () {
+      this.$router.push(this.routePath)
       console.log('清空----------------------------------------')
       this.notFilled = []
       this.showPutOnTheShelfFlag = false
@@ -653,6 +661,7 @@ export default {
       })
     },
     showPutOnTheShelfVue () {
+      this.routePath = this.$route.path
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = true
       this.submitFrom.infoList[0].attrValue = this.radio
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index a9886b3c..f5e420a1 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -217,8 +217,8 @@
       :close-on-press-escape='false'
       :destroy-on-close='true'
       :before-close='clear'
-      width="50%">
-      <putOnTheShelf :required="required" :notFilled="notFilled":putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
+      width="60%">
+      <putOnTheShelf :required="required" :notFilled="notFilled" :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -260,7 +260,8 @@ export default {
         creator: '',
         selectType: 0,
         delFlag: 0,
-        type: '应用资源'
+        type: '应用资源',
+        region: true
       },
       qp: false,
       relateApplicationResourceVisible: false,
@@ -270,6 +271,7 @@ export default {
       insertList: [],
       putOnTheShelfList: [],
       showPutOnTheShelfFlag2: false,
+      routePath: '',
       submitFrom: {
         type: '应用资源',
         deptId: '',
@@ -319,7 +321,8 @@ export default {
               delFlag: 0,
               creator: '',
               type: '应用资源',
-              name: ''
+              name: '',
+              region: true
             })
         )
         .then(({ data: res }) => {
@@ -405,7 +408,8 @@ export default {
                 creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names
+                name: names,
+                region: true
               })
           )
           .then(({ data: res }) => {
@@ -591,6 +595,7 @@ export default {
     },
     // 新上架
     clear () {
+      this.$router.push(this.routePath)
       this.notFilled = []
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
@@ -612,6 +617,7 @@ export default {
     },
     // 上架
     showPutOnTheShelf () {
+      this.routePath = this.$route.path
       this.showPutOnTheShelfFlag2 = true
       this.$http.get('/category/getCategoryTree').then(res => {
         this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 98610a23..e2eaba25 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -181,6 +181,7 @@
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
             <el-table-column prop="count" label="总计" min-width="100%">
+            <el-table-column prop="count" label="总计" min-width="100%">
             </el-table-column>
           </el-table>
           <el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
@@ -206,6 +207,7 @@
             <el-table-column prop="ysp" label="云视频" min-width="100%" >
             </el-table-column>
             <el-table-column prop="count" label="总计" min-width="100%">
+            <el-table-column prop="count" label="总计" min-width="100%">
             </el-table-column>
           </el-table>
           <!--明细表-->
@@ -277,7 +279,7 @@ export default {
       provideSelects: [],
       departmentSelects: [],
       departmentSelects1: [],
-      provideSelects1:[],
+      provideSelects1: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
       exportExcelType: '',
@@ -468,7 +470,6 @@ export default {
       this.detailsVisible = false
     },
     handleCurrentChange (val) {
-    
       this.currentPage = val
       // todo
       if (this.departmentId === 3) {
@@ -477,10 +478,8 @@ export default {
       if (this.departmentId === 4) {
         this.getTwoDetail(val)
       }
-
     },
 
-  
     // 组件服务部门发布情况--改为能力上架统计
     getFirstTree (page) {
       if (this.examineStatus == '-1') {
@@ -508,7 +507,6 @@ export default {
           }
         })
         .then((res) => {
-     
           if (res.data.code !== 0) {
             this.tableData =[]
           this.tableDataClone = []
@@ -517,7 +515,33 @@ export default {
           
         }else{
           const result = res.data.data
-        
+          for (let i = 0; i < result.length; i++) {
+            if (!result[i].hasOwnProperty('yyzy')) {
+              result[i].yyzy = 0
+            }
+            if (!result[i].hasOwnProperty('kfzj')) {
+              result[i].kfzj = 0
+            }
+            if (!result[i].hasOwnProperty('znsf')) {
+              result[i].znsf = 0
+            }
+            if (!result[i].hasOwnProperty('tcfw')) {
+              result[i].tcfw = 0
+            }
+            if (!result[i].hasOwnProperty('ywzj')) {
+              result[i].ywzj = 0
+            }
+            if (!result[i].hasOwnProperty('hys')) {
+              result[i].hys = 0
+            }
+            result[i].zj =
+              parseInt(result[i].yyzy) +
+              parseInt(result[i].kfzj) +
+              parseInt(result[i].znsf) +
+              parseInt(result[i].ywzj) +
+              parseInt(result[i].tcfw) +
+              parseInt(result[i].hys)
+          }
           this.tableData = res.data.data
           this.tableDataClone = res.data.data
           this.total = res.data.data.total
@@ -530,7 +554,6 @@ export default {
           })
         }
         })
-        
     },
     // 组件服务部门使用情况列表-改为能力使用统计
     getSecondTree (page) {
@@ -578,8 +601,8 @@ export default {
             endDate: this.endDate,
             resourceName: this.resourceName
 
-          })
-        }
+            })
+          }
         })
     },
     // 点击查看详情
@@ -653,28 +676,26 @@ export default {
         })
         .then((res) => {
           if (res.data.code !== 0) {
-            this.tableData =[]
-          this.tableDataClone = []
-          this.total = 0
-          return this.$message.error("服务器内部异常")
-          
-        }else{
-          this.tableData = res.data.data.list
-          this.tableDataClone = res.data.data.list
-          this.total = res.data.data.total
-          this.exportExcelCondition = qs.stringify({
-            approveStatus: this.status,
-            deptId: this.abilityDepartment,
-            startDate: this.startDate,
-            endDate: this.endDate,
-            resourceName: this.resourceName
-          })
-        }
+            this.tableData = []
+            this.tableDataClone = []
+            this.total = 0
+            return this.$message.error('服务器内部异常')
+          } else {
+            this.tableData = res.data.data.list
+            this.tableDataClone = res.data.data.list
+            this.total = res.data.data.total
+            this.exportExcelCondition = qs.stringify({
+              approveStatus: this.status,
+              deptId: this.abilityDepartment,
+              startDate: this.startDate,
+              endDate: this.endDate,
+              resourceName: this.resourceName
+            })
+          }
         })
     },
     // 能力使用明细
     getTwoDetail (page) {
-
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
@@ -704,31 +725,27 @@ export default {
           }
         })
         .then((res) => {
-        
           if (res.data.code !== 0) {
-            this.tableData =[]
-          this.tableDataClone = []
-          this.total = 0
-          return this.$message.error("服务器内部异常")
-          
-        }else{
-          this.tableData = res.data.data.list
-          this.tableDataClone = res.data.data.list
-          this.total = res.data.data.total
-          this.exportExcelCondition = qs.stringify({
-            approveStatus: this.status,
-            deptId: this.abilityDepartment,
-            startDate: this.startDate,
-            endDate: this.endDate,
-            resourceName: this.resourceName,
-            provideDept: this.provideDepartment
-          })
-        }
-       
+            this.tableData = []
+            this.tableDataClone = []
+            this.total = 0
+            return this.$message.error('服务器内部异常')
+          } else {
+            this.tableData = res.data.data.list
+            this.tableDataClone = res.data.data.list
+            this.total = res.data.data.total
+            this.exportExcelCondition = qs.stringify({
+              approveStatus: this.status,
+              deptId: this.abilityDepartment,
+              startDate: this.startDate,
+              endDate: this.endDate,
+              resourceName: this.resourceName,
+              provideDept: this.provideDepartment
+            })
+          }
         })
     },
-    
- 
+
     handleClick (row) {
       if (this.choseId === 0) {
         if (this.departmentId === 1) {
@@ -757,8 +774,6 @@ export default {
 
     // 根据不同的type查询不同的表格数据
     handleChose (index) {
-    
-   
       this.checked = false
       this.departmentId = index
       this.currentPage = 1
@@ -826,8 +841,8 @@ export default {
     },
     // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
     goToDetail () {
-      this.abilityDepartment=''
-      this.provideDepartment=''
+      this.abilityDepartment = ''
+      this.provideDepartment = ''
 
       this.currentPage = 1
       this.pageSize = 10
@@ -843,8 +858,8 @@ export default {
     },
     // 返回按钮
     goToBack () {
-      this.abilityDepartment=''
-      this.provideDepartment=''
+      this.abilityDepartment = ''
+      this.provideDepartment = ''
 
       this.checked = false
       this.currentPage = 1,
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 941afd35..bfb11a81 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: Light
- * @LastEditTime: 2022-12-06 10:18:28
+ * @LastEditTime: 2022-12-15 10:28:03
  * @Description: 能力申请
 -->
 <template>
@@ -83,11 +83,22 @@
         <!-- <el-table-column prop="businessKey" :label="$t('process.businessKey')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="processInstanceId" :label="$t('running.id')" header-align="center" align="center"></el-table-column> -->
         <el-table-column
+          label="当前审核人"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.assigneeName + (scope.row.synergism ? '('+scope.row.auditTeamName+')':'')
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
           prop="processDefinitionName"
           :label="$t('process.processDefinitionName')"
           header-align="center"
           align="center"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="taskName"
           :label="$t('process.taskName')"
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 4d649f4e..3f4e7f4a 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -81,12 +81,11 @@ js:
        <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
         <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
       </el-radio-group> -->
-    <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
-    <div class="block" v-else-if="type == 'date'">  
-      <el-date-picker v-model="data.note1" type="date" :placeholder="'选择' + name" value-format="yyyy-MM-dd">
-      </el-date-picker>
-    </div>
-    
+      <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
+      <div class="block" v-else-if="type == 'date'">
+        <el-date-picker v-model="data.note1" type="date" :placeholder="'选择' + name" value-format="yyyy-MM-dd">
+        </el-date-picker>
+      </div>
     </div>
 </template>
 <script>
@@ -179,7 +178,7 @@ export default {
           })
         }
         // })
-      } 
+      }
     },
     chekBoxChange (list) {
       let str = ''
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index bf515d18..54a6e5be 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-28 20:09:53
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-20 10:42:37
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -28,7 +28,9 @@
                 <span v-else>{{ val[attr.field] + (attr.company || '') }}</span>
               </p>
               <div class="del">
-                <i class="delImg" @click="del( index)"></i>
+                <i class="updateImg" @click="update(configure.name, index)"></i>
+                <div @click="update(configure.name, index)" style="margin-right:10px;">修改</div>
+                <i class="delImg" @click="del(configure.name, index)"></i>
                 <div @click="del(configure.name, index)">删除</div>
               </div>
             </div>
@@ -171,6 +173,19 @@ export default {
         delFlag: 0
       })
     },
+    update (title, index) {
+      const obj = this.data[index]
+      this.data.splice(index, 1)
+      const str = this.data.length > 0 ? JSON.stringify(this.data) : ''
+      this.$emit('changeInfoList', {
+        attrType: title,
+        attrValue: str,
+        delFlag: 0
+      })
+      this.configure.list.map(val => {
+        val.note1 = obj[val.field]
+      })
+    },
     radioChange (e) {
       console.log(e, 'wewewe')
       this.numType = e.target.value
@@ -242,12 +257,21 @@ export default {
       justify-content: flex-end;
       align-items: center;
 
+      .updateImg {
+        cursor: pointer;
+        display: inline-block;
+        width: 16px;
+        height: 18px;
+        background: url("~@/assets/img/putOnTheShelf/update.png") no-repeat;
+        margin-right: 5px;
+        margin-bottom: 1px;
+      }
       .delImg {
         cursor: pointer;
         display: inline-block;
         width: 16px;
         height: 18px;
-        background: url(~@/assets/img/putOnTheShelf/del.png) no-repeat;
+        background: url("~@/assets/img/putOnTheShelf/del.png") no-repeat;
         margin-right: 5px;
       }
 
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 772ed2ed..254ce7f9 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -1,61 +1,68 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 15:57:25
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-20 09:50:01
  * @Description: 告诉大家这是什么
 -->
 <template>
     <div class="put-on-the-shelf">
-      <div v-for="parent in putOnTheShelfList" :key='parent.id'>
-        <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 != '技术文档') && !(
-              (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 == '服务接口')
-            )">
-              <div class="box">
-                <div>
-                <span class="required" v-if="required.indexOf(item.name) > -1">*</span>
-                {{ item.name }}
+      <div class="left">
+        <a-anchor>
+          <a-anchor-link v-for="parent in putOnTheShelfList" :key="parent.id+'left'" :href="'#'+parent.name" :title="parent.name" />
+        </a-anchor>
+      </div>
+      <div class="right">
+        <div v-for="parent in putOnTheShelfList" :key='parent.id' :id="parent.name">
+          <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 != '技术文档') && !(
+                (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 == '服务接口')
+              )">
+                <div class="box">
+                  <div>
+                  <span class="required" v-if="required.indexOf(item.name) > -1">*</span>
+                  {{ item.name }}
+                </div>
+                <!-- <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"
+                  :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
+                <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
+                  :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
+                <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
+                  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' &&item.name != '上传附件'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
+                  tip="支持.zip类型，大小不超过100M"></upload>
+                  <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx,.zip' :list="item" v-else-if="item.name == '上传附件'" type="附件" btnName="上传附件" :maxCount="1" :dataList="item"
+                  tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"></upload>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :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 :changeField='changeField' :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
+                <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'date'" type="date" :data="item" :name="item.name"></input-select-checkbox>
               </div>
-              <!-- <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"
-                :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
-              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.type == 'file' && item.name !== '使用手册'" type="文件" btnName="上传附件" :maxCount="1"
-                :dataList="item" tip="支持文件类型，大小不超过100M"></upload>
-              <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx' :list="item" v-else-if="item.name == '使用手册'" type="文件" btnName="上传附件" :maxCount="1" :dataList="item" :busType="2"
-                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' &&item.name != '上传附件'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
-                tip="支持.zip类型，大小不超过100M"></upload>
-                <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.pdf,.ppt,.xlsx,.doc,.docx,.zip' :list="item" v-else-if="item.name == '上传附件'" type="附件" btnName="上传附件" :maxCount="1" :dataList="item"
-                tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"></upload>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :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 :changeField='changeField' :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'date'" type="date" :data="item" :name="item.name"></input-select-checkbox>
-            </div>
-              <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='input' || item.type=='textArea') && changeField.indexOf(item.name) == -1">请填写{{item.name}}！</div>
-              <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='select' || item.type=='checkBox' || item.type=='radio') && changeField.indexOf(item.name) == -1">请选择{{item.name}}！</div>
-            </div>
-          </template>
-          <template v-else>
-            <special @submitData="submitData" ref="specialRef" :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
-          </template>
+                <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='input' || item.type=='textArea') && changeField.indexOf(item.name) == -1">请填写{{item.name}}！</div>
+                <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='select' || item.type=='checkBox' || item.type=='radio') && changeField.indexOf(item.name) == -1">请选择{{item.name}}！</div>
+              </div>
+            </template>
+            <template v-else>
+              <special @submitData="submitData" ref="specialRef" :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
+            </template>
+          </div>
         </div>
       </div>
     </div>
@@ -241,13 +248,23 @@ export default {
 </script>
 <style lang='scss' scoped>
 .put-on-the-shelf {
-  height: 500px;
+  // height: 500px;
+  display: flex;
   padding: 0 50px;
-  overflow-y: scroll;
-}
-.put-on-the-shelf::-webkit-scrollbar {
-  width: 0;
+  .left {
+    margin-right: 50px;
+  }
+  .right {
+    height: 500px;
+    overflow-y: scroll;
+  }
+  .right::-webkit-scrollbar {
+    width: 0;
+  }
 }
+// .put-on-the-shelf::-webkit-scrollbar {
+//   width: 0;
+// }
 
 .top {
   color: #333333;
diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index d35d65cf..e49554d9 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -129,9 +129,9 @@ export default {
       data.taskName = name
       data.activityId = data.startUserId
       if (nameSwitch === '待办') {
-        this.getProcDefRouteSet(item, this.forwardHandleUrl)
+        this.getProcDefRouteSet(item, this.forwardHandleUrl, '待办')
       } else {
-        this.getProcDefRouteSet(item, this.forwardDetail)
+        this.getProcDefRouteSet(item, this.forwardDetail, '已办')
       }
     },
     formatNum (num) {
diff --git a/front/src/assets/home/update.png b/front/src/assets/home/update.png
new file mode 100644
index 00000000..baefd1f5
Binary files /dev/null and b/front/src/assets/home/update.png differ
diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue
index 33aaac78..43e43c8c 100644
--- a/front/src/views/abilityStatistics/components/AbilityRanking.vue
+++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue
@@ -138,12 +138,20 @@
   //查看详情方法
   function viewDetails(id) {
     console.log('id=========>', id)
-    router.push({
-      path: '/details',
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/details', // 跳转的页面路由
       query: {
         id: id,
+        hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
   // 获取榜单数据
   const praiseList = ref([])
diff --git a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
index 1e081145..34d63e7b 100644
--- a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
+++ b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
@@ -59,12 +59,20 @@
   //查看详情方法
   function viewDetails(id) {
     console.log('id=========>', id)
-    router.push({
-      path: '/demandDetails',
+    // router.push({
+    //   path: '/demandDetails',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/demandDetails', // 跳转的页面路由
       query: {
         id: id,
+        // hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
   function jumpPage() {
     router.push({
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 6b2ff93a..be695526 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: Light
- * @LastEditTime: 2022-10-26 14:57:25
+ * @LastEditTime: 2022-12-20 11:39:05
  * @Description: 上架
 -->
 <template>
@@ -10,7 +10,7 @@
     <div v-for="title in props.refData.children" :key="title.id">
       <div class="top">
         <div></div>
-        <div    >{{ title.name }}</div>
+        <div>{{ title.name }}</div>
         <div></div>
       </div>
       <template v-if="title.isConfigure">
@@ -42,25 +42,39 @@
             </div> -->
             <div
               style="
-                  font-size: 16px;
-                 display: flex;
+                font-size: 16px;
+                display: flex;
                 float: right;
-                top:0px;
+                top: 0px;
                 margin-right: 28px;
               "
             >
               <!-- <span>{{ title.name }}-{{ index + 1 }}</span> -->
-              <a-popconfirm
-                :title="'是否删除该条' + title.name + '?'"
-                ok-text="是"
-                cancel-text="否"
-                @confirm="del(title.name, index)"
-              >
-                <div class="del">
-                  <i class="delImg"></i>
-                  <div>删除</div>
+              <div class="del">
+                <i class="updateImg" @click="update(title.name, index)"></i>
+                <div
+                  @click="update(title.name, index)"
+                  style="margin-right: 10px"
+                >
+                  修改
                 </div>
-              </a-popconfirm>
+                <a-popconfirm
+                  :title="'是否删除该条' + title.name + '?'"
+                  ok-text="是"
+                  cancel-text="否"
+                  @confirm="del(title.name, index)"
+                >
+                  <i class="delImg"></i>
+                </a-popconfirm>
+                <a-popconfirm
+                  :title="'是否删除该条' + title.name + '?'"
+                  ok-text="是"
+                  cancel-text="否"
+                  @confirm="del(title.name, index)"
+                >
+                  <div>删除</div>
+                </a-popconfirm>
+              </div>
             </div>
             <div
               class="form"
@@ -69,10 +83,9 @@
               )[0].list"
               :key="'key2' + attr.name + index2"
             >
-            
-            <span >{{ attr.name }}:</span>
+              <span>{{ attr.name }}:</span>
               <a-input
-              style="width:280px"
+                style="width: 280px"
                 disabled
                 v-model:value="val[attr.field]"
                 :maxlength="24"
@@ -81,23 +94,22 @@
               />
               <template v-if="attr.type == 'input2'">
                 <a-input
-                style="width:280px"
-                   disabled
+                  style="width: 280px"
+                  disabled
                   :maxLength="1000"
                   v-model:value="val[attr.field]"
                   :placeholder="'请填写' + attr.name"
                 />
               </template>
               <template v-else-if="attr.type == 'textArea'">
-              <a-input
-                style="width:1120px"
-                disabled
-                v-model:value="val[attr.field]"
-                :maxlength="1000"
-                :placeholder="'请填写' + attr.name + ',不超过1000个字符'"
-               
-              />
-            </template>
+                <a-input
+                  style="width: 1120px"
+                  disabled
+                  v-model:value="val[attr.field]"
+                  :maxlength="1000"
+                  :placeholder="'请填写' + attr.name + ',不超过1000个字符'"
+                />
+              </template>
               <!-- <a-textarea
               disabled
                 v-model:value="val[attr.field]"
@@ -113,9 +125,17 @@
                 <a-image :width="85" :height="60" :src="val.img" />
               </span>
             </div>
-            <div style="margin-top:24px;height:1px;border-top: 1px dashed #dddee1; width: 1240px;font-size: 18px;"></div>
+            <div
+              style="
+                margin-top: 24px;
+                height: 1px;
+                border-top: 1px dashed #dddee1;
+                width: 1240px;
+                font-size: 18px;
+              "
+            ></div>
           </div>
-      
+
           <!-- <div style="font-size: 0.18rem; font-weight: 600border-top: 1px dashed grey; width: 1240px;font-size: 18px;">
             <span>{{ title.name }}-{{ data[title.name].length + 1 }}</span>
           </div> -->
@@ -126,9 +146,9 @@
             )[0].list"
             :key="'key3' + val.name + index"
           >
-          <span >{{ val.name }}:</span>
+            <span>{{ val.name }}:</span>
             <a-input
-            style="width:280px"
+              style="width: 280px"
               v-model:value="val.note1"
               :maxlength="24"
               :placeholder="'请填写' + val.name + ',不超过24个字符'"
@@ -136,7 +156,7 @@
             />
             <template v-if="val.type == 'input2'">
               <a-input
-                style="width:280px"
+                style="width: 280px"
                 :maxLength="1000"
                 v-model:value="val.note1"
                 :placeholder="'请填写' + val.name"
@@ -155,14 +175,13 @@
                 }}
               </span>
             </template>
-            <template  v-else-if="val.type == 'textArea'">
+            <template v-else-if="val.type == 'textArea'">
               <a-input
-                style="width:1120px"
+                style="width: 1120px"
                 :showCount="true"
                 v-model:value="val.note1"
                 :maxlength="1000"
                 :placeholder="'请填写' + val.name + ',不超过1000个字符'"
-           
               />
             </template>
             <!-- <a-textarea
@@ -188,24 +207,24 @@
               v-else-if="val.type == 'radio'"
             /> -->
             <div
-            v-else-if="val.type == 'radio'"
-                class="danxuan-Area"
-                id="danxuan-Area"
+              v-else-if="val.type == 'radio'"
+              class="danxuan-Area"
+              id="danxuan-Area"
+            >
+              <div
+                v-for="itemSelect in val.options"
+                :key="itemSelect"
+                class="danxuan-Area-son"
+                @click="radioChangeNew(val, itemSelect)"
+                :class="
+                  val.note1 && val.note1 === itemSelect
+                    ? 'danxuan-Area-down'
+                    : ''
+                "
               >
-                <div
-                  v-for="itemSelect in val.options"
-                  :key="itemSelect"
-                  class="danxuan-Area-son"
-                  @click="radioChangeNew(val, itemSelect)"
-                  :class="
-                    val.note1 && val.note1=== itemSelect
-                      ? 'danxuan-Area-down'
-                      : ''
-                  "
-                >
-                  {{ itemSelect }}
-                </div>
+                {{ itemSelect }}
               </div>
+            </div>
             <upload
               :key="showKey"
               type="图片"
@@ -217,11 +236,19 @@
               v-else-if="val.type == 'image'"
             ></upload>
           </div>
-          <div style="margin-top:24px;height:1px;border-top: 1px dashed #dddee1; width: 1240px;font-size: 18px;"></div>
+          <div
+            style="
+              margin-top: 24px;
+              height: 1px;
+              border-top: 1px dashed #dddee1;
+              width: 1240px;
+              font-size: 18px;
+            "
+          ></div>
           <div class="submit">
             <a-button type="primary" @click="add(title.name)">
               <img
-                style="height: 12px; width: 12px;margin-top: -2px;"
+                style="height: 12px; width: 12px; margin-top: -2px"
                 src="../../../assets/home/zhengjia.png"
                 alt=""
               />
@@ -258,17 +285,23 @@
                 {{ item.name }} :
               </div>
               <div v-if="item.type == 'input' && item.name === '参考价格'">
-              <a-input 
-                :maxLength="1000"
-                v-model:value="item.note1"
-                :placeholder="'请输入' + placeHolderWords(item.name)+',单位为元'"
-                @change="changeIiem(item.name, item.note1)"
-              />
-             <span style="color:red"> (单位为元，*仅用于测算为部门节省资金)</span>
-            </div>
+                <a-input
+                  :maxLength="1000"
+                  v-model:value="item.note1"
+                  :placeholder="
+                    '请输入' + placeHolderWords(item.name) + ',单位为元'
+                  "
+                  @change="changeIiem(item.name, item.note1)"
+                />
+                <span style="color: red">
+                  (单位为元，*仅用于测算为部门节省资金)
+                </span>
+              </div>
               <a-input
                 :maxLength="1000"
-                v-else-if="item.type == 'input' && item.name.indexOf('名称') == -1"
+                v-else-if="
+                  item.type == 'input' && item.name.indexOf('名称') == -1
+                "
                 v-model:value="item.note1"
                 :placeholder="'请输入' + placeHolderWords(item.name)"
                 @change="changeIiem(item.name, item.note1)"
@@ -287,11 +320,11 @@
                 v-model:value="item.note1"
                 :options="item.options"
                 @change="changeIiem(item.name, item.note1)"
-              /> -->  
+              /> -->
               <!-- 接口请求方式  单选框样式改变 -->
               <!-- <div  v-else-if="item.type == 'radio'">ddd </div> -->
               <div
-              v-else-if="item.type == 'radio'"
+                v-else-if="item.type == 'radio'"
                 class="danxuan-Area"
                 id="danxuan-Area"
               >
@@ -343,7 +376,7 @@
                 :placeholder="'请输入' + item.name"
                 @change="changeIiem(item.name, item.note1)"
               />
-              
+
               <upload
                 v-else-if="item.type == 'image'"
                 type="图片"
@@ -416,7 +449,6 @@
                 </div>
               </div>
 
-
               <upload
                 v-else-if="item.type == 'video'"
                 type="视频"
@@ -610,1031 +642,1059 @@
   </div>
 </template>
 <script setup>
-import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
-import { placeHolderWords } from '@/utils/placeHolder'
-import {
-  ref,
-  defineProps,
-  watch,
-  onMounted,
-  defineExpose,
-  defineEmits,
-} from 'vue'
-import mybus from '@/myplugins/mybus'
-import upload from '@/views/components/upload'
-import { message } from 'ant-design-vue'
-import { getUserInfo, getDeptAll } from '@/api/user'
-import {
-  getCategoryTreePage,
-  queryApplicationRelByResourceId,
-  queryResourceRelByKeyId,
-  filesUpload,
-} from '@/api/personalCenter'
-import { useRouter } from 'vue-router'
-const router = useRouter()
-const abilityToType = router.currentRoute.value.query.abilityToType
-const componentTypeValue = router.currentRoute.value.query.componentTypeValue
-const changeField = ref([])
-//选取的数据
-const chooseField = ref([])
-const props = defineProps({
-  // 展示数据
-  refData: { type: Object, default: null },
-  // 表单数据
-  dataFrom: { type: Array, default: null },
-  // 文件回显
-  fileList: { type: Array, default: null },
-  fileList2: { type: Array, default: null },
-  // 压缩包回显
-  packageList: { type: Array, default: null },
-  // 图片回显
-  imgList: { type: Array, default: null },
-  // 视频回显
-  videoList: { type: Array, default: null },
-  // 外部字段
-  externalField: { type: Array, default: null },
-  // 多条的配置
-  configure: { type: Array, default: null },
-  required: { type: Array, default: null },
-  notFilled: { type: Array, default: null },
-  // [{
-  //   name:'计费标准信息',
-  //   list:[
-  //     {
-  //       name:'计费方式',
-  //       type:'radio',
-  //       field:'type',
-  //       options:
-  //         {
-  //           name:'一次性买断',
-  //           value:'1'
-  //         },
-  //         {
-  //           name:'按调用次数',
-  //           value:'2'
-  //         },
-  //         {
-  //           name:'按并发路数',
-  //           value:'3'
-  //         },
-  //         {
-  //           name:'按年计费',
-  //           value:'4'
-  //         }
-  //       ],
-  //       note1:''
-  //     },
-  //     {
-  //       name:'计费标准',
-  //       field:'price',
-  //       type:'number',
-  //       company:'元',
-  //       note1: ''
-  //     },
-  //     {
-  //       name:'计费标准描述',
-  //       field:'desc',
-  //       type:'textArea',
-  //       note1:''
-  //     }
-  //   ]
-  // }]
-})
-const emit = defineEmits(['next', 'back', 'submit', 'preview'])
+  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
+  import { placeHolderWords } from '@/utils/placeHolder'
+  import {
+    ref,
+    defineProps,
+    watch,
+    onMounted,
+    defineExpose,
+    defineEmits,
+  } from 'vue'
+  import mybus from '@/myplugins/mybus'
+  import upload from '@/views/components/upload'
+  import { message } from 'ant-design-vue'
+  import { getUserInfo, getDeptAll } from '@/api/user'
+  import {
+    getCategoryTreePage,
+    queryApplicationRelByResourceId,
+    queryResourceRelByKeyId,
+    filesUpload,
+  } from '@/api/personalCenter'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const abilityToType = router.currentRoute.value.query.abilityToType
+  const componentTypeValue = router.currentRoute.value.query.componentTypeValue
+  const changeField = ref([])
+  //选取的数据
+  const chooseField = ref([])
+  const props = defineProps({
+    // 展示数据
+    refData: { type: Object, default: null },
+    // 表单数据
+    dataFrom: { type: Array, default: null },
+    // 文件回显
+    fileList: { type: Array, default: null },
+    fileList2: { type: Array, default: null },
+    // 压缩包回显
+    packageList: { type: Array, default: null },
+    // 图片回显
+    imgList: { type: Array, default: null },
+    // 视频回显
+    videoList: { type: Array, default: null },
+    // 外部字段
+    externalField: { type: Array, default: null },
+    // 多条的配置
+    configure: { type: Array, default: null },
+    required: { type: Array, default: null },
+    notFilled: { type: Array, default: null },
+    // [{
+    //   name:'计费标准信息',
+    //   list:[
+    //     {
+    //       name:'计费方式',
+    //       type:'radio',
+    //       field:'type',
+    //       options:
+    //         {
+    //           name:'一次性买断',
+    //           value:'1'
+    //         },
+    //         {
+    //           name:'按调用次数',
+    //           value:'2'
+    //         },
+    //         {
+    //           name:'按并发路数',
+    //           value:'3'
+    //         },
+    //         {
+    //           name:'按年计费',
+    //           value:'4'
+    //         }
+    //       ],
+    //       note1:''
+    //     },
+    //     {
+    //       name:'计费标准',
+    //       field:'price',
+    //       type:'number',
+    //       company:'元',
+    //       note1: ''
+    //     },
+    //     {
+    //       name:'计费标准描述',
+    //       field:'desc',
+    //       type:'textArea',
+    //       note1:''
+    //     }
+    //   ]
+    // }]
+  })
+  const emit = defineEmits(['next', 'back', 'submit', 'preview'])
 
-const changeAdd = () => {}
-const data = ref({
-  list: [],
-})
-const showKey = ref(0)
-const numType = ref('一次性买断')
-const radioChange = (e) => {
-  numType.value = e.target.value
-}
-const radioChangeNew = (item,itemSelect) => {
-  if (item.note1) {
-    if (item.note1 === itemSelect) {
-      item.note1 = null
+  const changeAdd = () => {}
+  const data = ref({
+    list: [],
+  })
+  const showKey = ref(0)
+  const numType = ref('一次性买断')
+  const radioChange = (e) => {
+    numType.value = e.target.value
+  }
+  const radioChangeNew = (item, itemSelect) => {
+    if (item.note1) {
+      if (item.note1 === itemSelect) {
+        item.note1 = null
+      } else {
+        item.note1 = itemSelect
+      }
     } else {
       item.note1 = itemSelect
     }
-  } else {
-    item.note1 = itemSelect
-  }
 
-  numType.value =itemSelect
-}
-const changeIiem = (name, value) => {
-  if (value && value !== '' && changeField.value.indexOf(name) == -1) {
-    changeField.value.push(name)
-  } else if (!value || value == '') {
-    if (changeField.value.indexOf(name) > -1) {
-      changeField.value.splice(changeField.value.indexOf(name), 1)
+    numType.value = itemSelect
+  }
+  const changeIiem = (name, value) => {
+    if (value && value !== '' && changeField.value.indexOf(name) == -1) {
+      changeField.value.push(name)
+    } else if (!value || value == '') {
+      if (changeField.value.indexOf(name) > -1) {
+        changeField.value.splice(changeField.value.indexOf(name), 1)
+      }
     }
   }
-}
 
-props.refData.children.map((item) => {
-  if (item.name == '基本信息') {
-    item.children.map((val) => {
-      if (val.name == '能力类型') {
-        val.note1 = abilityToType
-      }
-      if (val.name == '组件类型') {
-        val.note1 = componentTypeValue
-      }
-    })
-  }
-  if (
-    props.configure &&
-    props.configure.filter((val) => val.name === item.name).length > 0
-  ) {
-    item.isConfigure = true
-    data.value[item.name] = []
-  } else {
-    item.isConfigure = false
-  }
-})
-let arr = props.refData.children.filter((item) => {
-  if (props.configure) {
-    if (!item.isConfigure) {
-      return item
-    }
-  } else {
-    return item
-  }
-})
-data.value.list = []
-// 获取字典数据
-arr.forEach((val) => {
-  val.children.forEach((item) => {
-    if (item.isLinkToDic === 'true' && item.linkValue) {
-      getCategoryTreePage({
-        page: 1,
-        limit: 20,
-        dictTypeId: item.linkValue,
-        deFlage: 0,
-      }).then((res) => {
-        if (item.type === 'radio') {
-          item.options = res.data.data.list.map((radio) => radio.dictLabel)
-        } else if (item.type === 'select' || item.type === 'checkBox') {
-          if (item.type === 'checkBox') {
-            if (!item.note2) {
-              item.note2 = []
-            }
-          }
-          item.options = res.data.data.list
+  props.refData.children.map((item) => {
+    if (item.name == '基本信息') {
+      item.children.map((val) => {
+        if (val.name == '能力类型') {
+          val.note1 = abilityToType
         }
-        data.value.list.push(item)
-      })
-    } else if (item.name === '归属部门') {
-      getDeptAll().then((res) => {
-        const dataList = []
-        res.data.data.forEach((element) => {
-          dataList.push({
-            value: element.id,
-            label: element.name,
-          })
-        })
-        item.options = dataList
-        if (!item.note1) {
-          getUserInfo().then(({ data: res1 }) => {
-            item.note1 = res1.data.deptId
-            item.note2 = item.options.filter(
-              (val) => val.value == item.note1
-            )[0]
-
-            data.value.list.push(item)
-          })
-        } else {
-          data.value.list.push(item)
+        if (val.name == '组件类型') {
+          val.note1 = componentTypeValue
         }
       })
     }
-    // else if (item.name === '部门联系人') {
-    //   if (!item.note1) {
-    //     getUserInfo().then(({ data: res1 }) => {
-    //       console.log(res1.data)
-    //       item.note1 = res1.data.realName || ''
-    //     })
-    //     data.value.list.push(item)
-    //   } else {
-    //     data.value.list.push(item)
-    //   }
-    // } else if (item.name === '部门联系人电话') {
-    //   if (!item.note1) {
-    //     getUserInfo().then(({ data: res1 }) => {
-    //       console.log(res1.data)
-    //       item.note1 = res1.data.mobile || ''
-    //     })
-    //     data.value.list.push(item)
-    //   } else {
-    //     data.value.list.push(item)
-    //   }
-    // }
-    else if (item.name === '来源应用') {
-      queryApplicationRelByResourceId({
-        referenceId: 0,
-      }).then((res) => {
-        const dataList = []
-        res.data.data.notLinked.forEach((element) => {
-          dataList.push({
-            value: element.id,
-            label: element.name,
-          })
-        })
-        item.options = dataList
-        data.value.list.push(item)
-      })
-    } else {
-      data.value.list.push(item)
-    }
-  })
-})
-if (props.dataFrom) {
-  props.dataFrom.infoList.forEach((item) => {
     if (
       props.configure &&
-      props.configure.filter((val) => val.name === item.attrType).length > 0
+      props.configure.filter((val) => val.name === item.name).length > 0
     ) {
-      data.value[item.attrType] = JSON.parse(item.attrValue)
-    } else if (item.attrType === '应用领域') {
-      props.refData.children.forEach((val) => {
-        val.children.forEach((child) => {
-          if (child.name === item.attrType) {
-            // 通过;分割成数组
-            child.note2 = item.attrValue.split(';')
-            showKey.value++
+      item.isConfigure = true
+      data.value[item.name] = []
+    } else {
+      item.isConfigure = false
+    }
+  })
+  let arr = props.refData.children.filter((item) => {
+    if (props.configure) {
+      if (!item.isConfigure) {
+        return item
+      }
+    } else {
+      return item
+    }
+  })
+  data.value.list = []
+  // 获取字典数据
+  arr.forEach((val) => {
+    val.children.forEach((item) => {
+      if (item.isLinkToDic === 'true' && item.linkValue) {
+        getCategoryTreePage({
+          page: 1,
+          limit: 20,
+          dictTypeId: item.linkValue,
+          deFlage: 0,
+        }).then((res) => {
+          if (item.type === 'radio') {
+            item.options = res.data.data.list.map((radio) => radio.dictLabel)
+          } else if (item.type === 'select' || item.type === 'checkBox') {
+            if (item.type === 'checkBox') {
+              if (!item.note2) {
+                item.note2 = []
+              }
+            }
+            item.options = res.data.data.list
+          }
+          data.value.list.push(item)
+        })
+      } else if (item.name === '归属部门') {
+        getDeptAll().then((res) => {
+          const dataList = []
+          res.data.data.forEach((element) => {
+            dataList.push({
+              value: element.id,
+              label: element.name,
+            })
+          })
+          item.options = dataList
+          if (!item.note1) {
+            getUserInfo().then(({ data: res1 }) => {
+              item.note1 = res1.data.deptId
+              item.note2 = item.options.filter(
+                (val) => val.value == item.note1
+              )[0]
+
+              data.value.list.push(item)
+            })
+          } else {
+            data.value.list.push(item)
           }
         })
-      })
-      //  item.note1 = item.attrValue.split(';')
-    }
-  })
-}
-//显示富文本
-let showText = ref(false)
-const showTextFunction = () => {
-  showText.value = true
-}
-mybus.on('showTextFunctionEmit', (show) => {
-  showText.value = show
-})
-mybus.off('func')
-const add = (title, addFlag, type) => {
-  let list = props.configure.filter((item) => item.name === title)[0].list
-  let flag = true
-  list.forEach((item) => {
-    if (item.type !== 'number' && !item.note1.length > 0) {
-      flag = false
-    } else if (item.type === 'number' && !item.note1 > 0) {
-      flag = false
-    }
-  })
-  if (flag) {
-    let obj = {}
-    let sfFlag = false
-    list.forEach((item) => {
-      if (item.type === 'input2') {
-        sfFlag = data.value[title].filter(
-          (val) => val.type === numType.value
-        )[0]
-        if (sfFlag) {
-          message.warning('已添加过该类型！')
-          return
-        }
-        obj[item.field] =
-          item.note1 +
-          (numType.value == '一次性买断'
-            ? '元'
-            : numType.value == '按调用次数'
-            ? '元/次'
-            : numType.value == '按并发路数'
-            ? '元/路'
-            : numType.value == '按年计费'
-            ? '元/年'
-            : '')
+      }
+      // else if (item.name === '部门联系人') {
+      //   if (!item.note1) {
+      //     getUserInfo().then(({ data: res1 }) => {
+      //       console.log(res1.data)
+      //       item.note1 = res1.data.realName || ''
+      //     })
+      //     data.value.list.push(item)
+      //   } else {
+      //     data.value.list.push(item)
+      //   }
+      // } else if (item.name === '部门联系人电话') {
+      //   if (!item.note1) {
+      //     getUserInfo().then(({ data: res1 }) => {
+      //       console.log(res1.data)
+      //       item.note1 = res1.data.mobile || ''
+      //     })
+      //     data.value.list.push(item)
+      //   } else {
+      //     data.value.list.push(item)
+      //   }
+      // }
+      else if (item.name === '来源应用') {
+        queryApplicationRelByResourceId({
+          referenceId: 0,
+        }).then((res) => {
+          const dataList = []
+          res.data.data.notLinked.forEach((element) => {
+            dataList.push({
+              value: element.id,
+              label: element.name,
+            })
+          })
+          item.options = dataList
+          data.value.list.push(item)
+        })
       } else {
-        obj[item.field] = item.note1
+        data.value.list.push(item)
       }
     })
-    if (!sfFlag) {
-      data.value[title].push(obj)
-    }
+  })
+  if (props.dataFrom) {
+    props.dataFrom.infoList.forEach((item) => {
+      if (
+        props.configure &&
+        props.configure.filter((val) => val.name === item.attrType).length > 0
+      ) {
+        data.value[item.attrType] = JSON.parse(item.attrValue)
+      } else if (item.attrType === '应用领域') {
+        props.refData.children.forEach((val) => {
+          val.children.forEach((child) => {
+            if (child.name === item.attrType) {
+              // 通过;分割成数组
+              child.note2 = item.attrValue.split(';')
+              showKey.value++
+            }
+          })
+        })
+        //  item.note1 = item.attrValue.split(';')
+      }
+    })
+  }
+  //显示富文本
+  let showText = ref(false)
+  const showTextFunction = () => {
+    showText.value = true
+  }
+  mybus.on('showTextFunctionEmit', (show) => {
+    showText.value = show
+  })
+  mybus.off('func')
+  const add = (title, addFlag, type) => {
+    let list = props.configure.filter((item) => item.name === title)[0].list
+    let flag = true
+    list.forEach((item) => {
+      if (item.type !== 'number' && !item.note1.length > 0) {
+        flag = false
+      } else if (item.type === 'number' && !item.note1 > 0) {
+        flag = false
+      }
+    })
+    if (flag) {
+      let obj = {}
+      let sfFlag = false
+      list.forEach((item) => {
+        if (item.type === 'input2') {
+          sfFlag = data.value[title].filter(
+            (val) => val.type === numType.value
+          )[0]
+          if (sfFlag) {
+            message.warning('已添加过该类型！')
+            return
+          }
+          obj[item.field] =
+            item.note1 +
+            (numType.value == '一次性买断'
+              ? '元'
+              : numType.value == '按调用次数'
+              ? '元/次'
+              : numType.value == '按并发路数'
+              ? '元/路'
+              : numType.value == '按年计费'
+              ? '元/年'
+              : '')
+        } else {
+          obj[item.field] = item.note1
+        }
+      })
+      if (!sfFlag) {
+        data.value[title].push(obj)
+      }
 
+      mybus.emit('chageDataFrom', {
+        attrType: title,
+        attrValue: JSON.stringify(data.value[title]),
+        delFlag: 0,
+      })
+      list.forEach((item) => {
+        item.note1 = ''
+        showKey.value++
+      })
+      if (addFlag) {
+        if (type == '上一步') {
+          emit('back')
+        } else if (type == '下一步') {
+          emit('next')
+        } else if (type == '提交') {
+          emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
+        }
+      }
+    } else {
+      if (!addFlag) {
+        message.warning('请填写完整')
+      } else {
+        list.forEach((item) => {
+          item.note1 = ''
+          showKey.value++
+        })
+        if (type == '上一步') {
+          emit('back')
+        } else if (type == '下一步') {
+          emit('next')
+        } else if (type == '提交') {
+          emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
+        }
+      }
+    }
+  }
+  const del = (title, index) => {
+    data.value[title].splice(index, 1)
     mybus.emit('chageDataFrom', {
       attrType: title,
       attrValue: JSON.stringify(data.value[title]),
       delFlag: 0,
     })
-    list.forEach((item) => {
-      item.note1 = ''
-      showKey.value++
+  }
+  const update = (title, index) => {
+    const obj = data.value[title][index]
+    data.value[title].splice(index, 1)
+    mybus.emit('chageDataFrom', {
+      attrType: title,
+      attrValue: JSON.stringify(data.value[title]),
+      delFlag: 0,
     })
-    if (addFlag) {
-      if (type == '上一步') {
-        emit('back')
-      } else if (type == '下一步') {
-        emit('next')
-      } else if (type == '提交') {
-        emit('submit')
-      } else if (type == '预览') {
-        emit('preview')
-      }
-    }
-  } else {
-    if (!addFlag) {
-      message.warning('请填写完整')
-    } else {
-      list.forEach((item) => {
-        item.note1 = ''
-        showKey.value++
+    props.configure
+      .filter((item) => item.name === title)[0]
+      .list.map((val) => {
+        val.note1 = obj[val.field]
       })
-      if (type == '上一步') {
-        emit('back')
-      } else if (type == '下一步') {
-        emit('next')
-      } else if (type == '提交') {
-        emit('submit')
-      } else if (type == '预览') {
-        emit('preview')
+  }
+  const ApplicationArea = (item, itemson) => {
+    if (item.note2.indexOf(itemson.dictLabel) === -1) {
+      item.note2.push(itemson.dictLabel)
+    } else {
+      item.note2.splice(item.note2.indexOf(itemson.dictLabel), 1)
+    }
+    // 多选判断是否为空
+    if (
+      item.note2.length !== 0 &&
+      changeField.value.indexOf('应用领域') == -1
+    ) {
+      changeField.value.push('应用领域')
+    } else if (item.note2.length == 0) {
+      if (changeField.value.indexOf('应用领域') > -1) {
+        changeField.value.splice(changeField.value.indexOf('应用领域'), 1)
       }
     }
+    mybus.emit('chageDataFrom', {
+      attrType: item.name,
+      attrValue: item.note2.join(';'),
+      delFlag: 0,
+    })
   }
-}
-const del = (title, index) => {
-  data.value[title].splice(index, 1)
-  mybus.emit('chageDataFrom', {
-    attrType: title,
-    attrValue: JSON.stringify(data.value[title]),
-    delFlag: 0,
-  })
-}
-const ApplicationArea = (item, itemson) => {
-  if (item.note2.indexOf(itemson.dictLabel) === -1) {
-    item.note2.push(itemson.dictLabel)
-  } else {
-    item.note2.splice(item.note2.indexOf(itemson.dictLabel), 1)
-  }
-  // 多选判断是否为空
-  if (item.note2.length !== 0 && changeField.value.indexOf('应用领域') == -1) {
-    changeField.value.push('应用领域')
-  } else if (item.note2.length == 0) {
-    if (changeField.value.indexOf('应用领域') > -1) {
-      changeField.value.splice(changeField.value.indexOf('应用领域'), 1)
-    }
-  }
-  mybus.emit('chageDataFrom', {
-    attrType: item.name,
-    attrValue: item.note2.join(';'),
-    delFlag: 0,
-  })
-}
-const danxuanArea = (item, itemSelect, indexSelect) => {
-  if (item.note1) {
-    if (item.note1 === indexSelect) {
-      item.note1 = null
+  const danxuanArea = (item, itemSelect, indexSelect) => {
+    if (item.note1) {
+      if (item.note1 === indexSelect) {
+        item.note1 = null
+      } else {
+        item.note1 = indexSelect
+      }
     } else {
       item.note1 = indexSelect
     }
-  } else {
-    item.note1 = indexSelect
-  }
 
-  changeIiem(itemSelect, indexSelect)
-}
-const danxuanRadio= (item, itemSelect) => {
-  if (item.note1) {
-    if (item.note1 === itemSelect) {
-      item.note1 = null
+    changeIiem(itemSelect, indexSelect)
+  }
+  const danxuanRadio = (item, itemSelect) => {
+    if (item.note1) {
+      if (item.note1 === itemSelect) {
+        item.note1 = null
+      } else {
+        item.note1 = itemSelect
+      }
     } else {
       item.note1 = itemSelect
     }
-  } else {
-    item.note1 = itemSelect
+
+    changeIiem(item.name, item.note1)
   }
-
-  changeIiem(item.name, item.note1)
-}
-// 来源应用
-const visibleAssociatedApplication = ref(false)
-const visibleAssociatedApplicationOther = ref(false)
-const mockData = ref([])
-const mockDataOther = ref([])
-const titles = ref(['未关联的应用名称', '已关联的应用名称'])
-const titleName = ref('来源应用')
-const targetKeys = ref([])
-const targetKeysOther = ref([])
-// 上一步关联数据
-// const targetKeysBack = ref([])
-// 来源应用-back
-const sourceClick = () => {
-  mockData.value = []
-  visibleAssociatedApplication.value = true
-  props.dataFrom.infoList.forEach((val) => {
-    if (val.attrType === '来源应用' && val.attrValue != '') {
-      queryApplicationRelByResourceId({
-        referenceId: 0,
-      }).then((res) => {
-        res.data.data.notLinked.forEach((val, index) => {
-          mockData.value.push({
-            key: val.id,
-            title: val.name,
-            description: val.id,
+  // 来源应用
+  const visibleAssociatedApplication = ref(false)
+  const visibleAssociatedApplicationOther = ref(false)
+  const mockData = ref([])
+  const mockDataOther = ref([])
+  const titles = ref(['未关联的应用名称', '已关联的应用名称'])
+  const titleName = ref('来源应用')
+  const targetKeys = ref([])
+  const targetKeysOther = ref([])
+  // 上一步关联数据
+  // const targetKeysBack = ref([])
+  // 来源应用-back
+  const sourceClick = () => {
+    mockData.value = []
+    visibleAssociatedApplication.value = true
+    props.dataFrom.infoList.forEach((val) => {
+      if (val.attrType === '来源应用' && val.attrValue != '') {
+        queryApplicationRelByResourceId({
+          referenceId: 0,
+        }).then((res) => {
+          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)
-      })
-    } else if (val.attrType === '来源应用' && val.attrValue == '') {
-      queryApplicationRelByResourceId({
-        referenceId: 0,
-      }).then((res) => {
-        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)
+        })
+      } else if (val.attrType === '来源应用' && val.attrValue == '') {
+        queryApplicationRelByResourceId({
+          referenceId: 0,
+        }).then((res) => {
+          res.data.data.notLinked.forEach((val, index) => {
+            mockData.value.push({
+              key: val.id,
+              title: val.name,
+              description: val.id,
+            })
           })
         })
-      })
-    }
-  })
-}
-// 关联组件
-const componentsClick = () => {
-  titles.value = ['未关联的组件名称', '已关联的组件名称']
-  titleName.value = '关联组件'
-  visibleAssociatedApplicationOther.value = true
-  mockDataOther.value = []
-  props.dataFrom.infoList.forEach((val) => {
-    if (val.attrType === '关联组件信息' && val.attrValue != '') {
-      queryResourceRelByKeyId({
-        keyId: 0,
-        type: '组件服务',
-        referenceName: '',
-      }).then((res) => {
-        res.data.data.notLinked.forEach((val, index) => {
-          mockDataOther.value.push({
-            key: val.id,
-            title: val.name,
-            description: val.name,
-          })
-        })
-      })
-      targetKeysOther.value = []
-      val.attrValue.split(',').forEach((item) => {
-        targetKeysOther.value.push(item)
-      })
-    } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
-      queryResourceRelByKeyId({
-        keyId: 0,
-        type: '组件服务',
-        referenceName: '',
-      }).then((res) => {
-        res.data.data.notLinked.forEach((val, index) => {
-          mockDataOther.value.push({
-            key: val.id,
-            title: val.name,
-            description: val.name,
-          })
-        })
-      })
-    }
-  })
-}
-const selectedKeys = ref([])
-const selectedKeysOther = ref([])
-
-const handleChange = (nextTargetKeys, direction, moveKeys) => {
-  if (direction === 'right') {
-    targetKeys.value = moveKeys.filter((item, index) => index === 0)
-  }
-}
-const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {}
-const handleChangeOther = (nextTargetKeys, direction, moveKeys) => {}
-const handleSelectChangeOther = (sourceSelectedKeys, targetSelectedKeys) => {}
-
-const filterOptionTransfer = (inputValue, option) => {
-  return option.description.indexOf(inputValue) > -1
-}
-
-const handleOk = (e) => {
-  visibleAssociatedApplicationOther.value = false
-  visibleAssociatedApplication.value = false
-
-  data.value.list.map((item) => {
-    if (item.name === '来源应用') {
-      item.note1 = targetKeys.value + ''
-    } else if (item.name === '关联组件信息') {
-      item.note1 = targetKeysOther.value + ''
-    }
-  })
-}
-const handleCancel = (e) => {
-  visibleAssociatedApplicationOther.value = false
-  visibleAssociatedApplication.value = false
-}
-
-const showType = ref('')
-const showTypeClick = (e) => {
-  showType.value = e
-}
-showTypeClick('调用接口')
-
-watch(data.value.list, (newProps, oldProps) => {
-  newProps.forEach((val) => {
-    if (
-      props.configure &&
-      props.configure.filter((item) => item.name === val.name).length > 0
-    ) {
-      mybus.emit('chageDataFrom', {
-        attrType: val.name,
-        attrValue: val.note1,
-        delFlag: 0,
-      })
-    } else if (
-      props.externalField &&
-      props.externalField.indexOf(val.name) > -1
-    ) {
-      let note2 = {} //储存归属部门的名字
-      if (val.options) {
-        note2 = val.options.filter((item) => item.value == val.note1)[0]
       }
+    })
+  }
+  // 关联组件
+  const componentsClick = () => {
+    titles.value = ['未关联的组件名称', '已关联的组件名称']
+    titleName.value = '关联组件'
+    visibleAssociatedApplicationOther.value = true
+    mockDataOther.value = []
+    props.dataFrom.infoList.forEach((val) => {
+      if (val.attrType === '关联组件信息' && val.attrValue != '') {
+        queryResourceRelByKeyId({
+          keyId: 0,
+          type: '组件服务',
+          referenceName: '',
+        }).then((res) => {
+          res.data.data.notLinked.forEach((val, index) => {
+            mockDataOther.value.push({
+              key: val.id,
+              title: val.name,
+              description: val.name,
+            })
+          })
+        })
+        targetKeysOther.value = []
+        val.attrValue.split(',').forEach((item) => {
+          targetKeysOther.value.push(item)
+        })
+      } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
+        queryResourceRelByKeyId({
+          keyId: 0,
+          type: '组件服务',
+          referenceName: '',
+        }).then((res) => {
+          res.data.data.notLinked.forEach((val, index) => {
+            mockDataOther.value.push({
+              key: val.id,
+              title: val.name,
+              description: val.name,
+            })
+          })
+        })
+      }
+    })
+  }
+  const selectedKeys = ref([])
+  const selectedKeysOther = ref([])
 
-      mybus.emit('chageDataFromDwon', {
-        attrType: val.name,
-        attrValue: val.note1,
-        delFlag: 0,
-        attrValueTwo: note2,
-      })
-    } else {
-      if (val.name !== '应用领域' && val.name !== '发布端') {
-        if (val.name == '算法介绍视频') {
-          mybus.emit('chageDataFrom', {
-            attrType: val.name,
-            attrValue: val.note1,
-            delFlag: 0,
-            note3: val.note3,
-          })
-        } else {
-          mybus.emit('chageDataFrom', {
-            attrType: val.name,
-            attrValue: val.note1,
-            delFlag: 0,
-          })
+  const handleChange = (nextTargetKeys, direction, moveKeys) => {
+    if (direction === 'right') {
+      targetKeys.value = moveKeys.filter((item, index) => index === 0)
+    }
+  }
+  const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {}
+  const handleChangeOther = (nextTargetKeys, direction, moveKeys) => {}
+  const handleSelectChangeOther = (sourceSelectedKeys, targetSelectedKeys) => {}
+
+  const filterOptionTransfer = (inputValue, option) => {
+    return option.description.indexOf(inputValue) > -1
+  }
+
+  const handleOk = (e) => {
+    visibleAssociatedApplicationOther.value = false
+    visibleAssociatedApplication.value = false
+
+    data.value.list.map((item) => {
+      if (item.name === '来源应用') {
+        item.note1 = targetKeys.value + ''
+      } else if (item.name === '关联组件信息') {
+        item.note1 = targetKeysOther.value + ''
+      }
+    })
+  }
+  const handleCancel = (e) => {
+    visibleAssociatedApplicationOther.value = false
+    visibleAssociatedApplication.value = false
+  }
+
+  const showType = ref('')
+  const showTypeClick = (e) => {
+    showType.value = e
+  }
+  showTypeClick('调用接口')
+
+  watch(data.value.list, (newProps, oldProps) => {
+    newProps.forEach((val) => {
+      if (
+        props.configure &&
+        props.configure.filter((item) => item.name === val.name).length > 0
+      ) {
+        mybus.emit('chageDataFrom', {
+          attrType: val.name,
+          attrValue: val.note1,
+          delFlag: 0,
+        })
+      } else if (
+        props.externalField &&
+        props.externalField.indexOf(val.name) > -1
+      ) {
+        let note2 = {} //储存归属部门的名字
+        if (val.options) {
+          note2 = val.options.filter((item) => item.value == val.note1)[0]
+        }
+
+        mybus.emit('chageDataFromDwon', {
+          attrType: val.name,
+          attrValue: val.note1,
+          delFlag: 0,
+          attrValueTwo: note2,
+        })
+      } else {
+        if (val.name !== '应用领域' && val.name !== '发布端') {
+          if (val.name == '算法介绍视频') {
+            mybus.emit('chageDataFrom', {
+              attrType: val.name,
+              attrValue: val.note1,
+              delFlag: 0,
+              note3: val.note3,
+            })
+          } else {
+            mybus.emit('chageDataFrom', {
+              attrType: val.name,
+              attrValue: val.note1,
+              delFlag: 0,
+            })
+          }
         }
       }
-    }
+    })
   })
-})
-const applicationsChange = (value) => {
-  data.value.list.map((item) => {
-    if (item.name === '来源应用') {
-      item.note1 = value
-    }
+  const applicationsChange = (value) => {
+    data.value.list.map((item) => {
+      if (item.name === '来源应用') {
+        item.note1 = value
+      }
+    })
+  }
+
+  const handleBlur = () => {}
+  const applicationsBlur = () => {}
+
+  const handleFocus = () => {}
+  const applicationsFocus = () => {}
+
+  const filterOption = (input, option) => {
+    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  }
+  defineExpose({
+    add,
   })
-}
-
-const handleBlur = () => {}
-const applicationsBlur = () => {}
-
-const handleFocus = () => {}
-const applicationsFocus = () => {}
-
-const filterOption = (input, option) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-}
-defineExpose({
-  add,
-})
-const applicationsOption = (input, option) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-}
+  const applicationsOption = (input, option) => {
+    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  }
 </script>
 <style></style>
 <style lang="less" scoped>
-:deep(.upload-list-inline .ant-upload .ant-btn) {
-  height: 150px;
-  width: 218px;
-  border: 1px solid rgba(198, 198, 198, 0.5);
-  border-radius: 2px;
-  background: rgba(0, 88, 225, 0.05);
-  color: #0087ff;
-  font-size: 14px;
-}
-
-:deep(.upload-list-inline .ant-upload .ant-btn > span) {
-  background: url('~@/assets/home/yuanjia.png') no-repeat;
-  color: #666666;
-  background-position: center;
-  text-align: center;
-  line-height: 120px;
-  height: 50px;
-}
-// 箭头大小以及位置
-:deep(.ant-select-arrow) {
-  background: url('~@/assets/home/huixia.png') no-repeat;
-  cursor: pointer;
-  margin-top: -4px;
-  margin-right: -4px;
-}
-
-// 隐藏三角
-:deep(.ant-select-arrow .anticon) {
-  vertical-align: top;
-  transition: transform 0.3s;
-  display: none;
-}
-// :deep(.ant-select-arrow :focus) {
-//   background:url('~@/assets/home/huishang.png') no-repeat ;
-// cursor: pointer;
-//   margin-top: -4px;
-//   margin-right: -4px;
-// }
-
-.put-on-the-shelf {
-  margin: 0.15rem 2rem;
-  background: rgb(246, 247, 249, 0.8);
-  height: 846px;
-  overflow: scroll;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .Technical-text {
-    height: 0.3rem;
-    width: 1rem;
-    border: 0.01rem solid #bbd3ef;
-    border-radius: 0.06rem;
-    background: #edf4fc;
+  :deep(.upload-list-inline .ant-upload .ant-btn) {
+    height: 150px;
+    width: 218px;
+    border: 1px solid rgba(198, 198, 198, 0.5);
+    border-radius: 2px;
+    background: rgba(0, 88, 225, 0.05);
     color: #0087ff;
-    font-size: 0.14rem;
-    text-align: center;
-    line-height: 0.3rem;
-  }
-  .Technical-text:hover {
-    cursor: pointer;
-  }
-
-  & > div {
-    padding: 0px 0px 24px 24px;
-    width: 100%;
     font-size: 14px;
+  }
 
-    .top {
-      color: #333333;
-      font-size: 24px;
-    font-weight: bold;
-    margin-top: 22px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-bottom: 0.25rem;
+  :deep(.upload-list-inline .ant-upload .ant-btn > span) {
+    background: url('~@/assets/home/yuanjia.png') no-repeat;
+    color: #666666;
+    background-position: center;
+    text-align: center;
+    line-height: 120px;
+    height: 50px;
+  }
+  // 箭头大小以及位置
+  :deep(.ant-select-arrow) {
+    background: url('~@/assets/home/huixia.png') no-repeat;
+    cursor: pointer;
+    margin-top: -4px;
+    margin-right: -4px;
+  }
 
-      div:first-child,
-      div:last-child {
-        width: 2.45rem;
-        height: 0.02rem;
-        background: #f0f0f0;
-      }
+  // 隐藏三角
+  :deep(.ant-select-arrow .anticon) {
+    vertical-align: top;
+    transition: transform 0.3s;
+    display: none;
+  }
+  // :deep(.ant-select-arrow :focus) {
+  //   background:url('~@/assets/home/huishang.png') no-repeat ;
+  // cursor: pointer;
+  //   margin-top: -4px;
+  //   margin-right: -4px;
+  // }
 
-      div:nth-child(2) {
-        margin: 0 0.3rem;
-      }
+  .put-on-the-shelf {
+    margin: 0.15rem 2rem;
+    background: rgb(246, 247, 249, 0.8);
+    height: 846px;
+    overflow: scroll;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .Technical-text {
+      height: 0.3rem;
+      width: 1rem;
+      border: 0.01rem solid #bbd3ef;
+      border-radius: 0.06rem;
+      background: #edf4fc;
+      color: #0087ff;
+      font-size: 0.14rem;
+      text-align: center;
+      line-height: 0.3rem;
+    }
+    .Technical-text:hover {
+      cursor: pointer;
     }
 
-    .bottom {
-      // margin-top: 0.25rem;
+    & > div {
+      padding: 0px 0px 24px 24px;
+      width: 100%;
+      font-size: 14px;
 
-      .items {
-        background: #fafafa;
-        padding: 0.1rem;
+      .top {
+        color: #333333;
+        font-size: 24px;
+        font-weight: bold;
+        margin-top: 22px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-bottom: 0.25rem;
 
-        p {
-          display: flex;
-          justify-content: space-between;
+        div:first-child,
+        div:last-child {
+          width: 2.45rem;
+          height: 0.02rem;
+          background: #f0f0f0;
+        }
 
-          span:nth-of-type(1) {
-            width: 2rem;
+        div:nth-child(2) {
+          margin: 0 0.3rem;
+        }
+      }
+
+      .bottom {
+        // margin-top: 0.25rem;
+
+        .items {
+          background: #fafafa;
+          padding: 0.1rem;
+
+          p {
+            display: flex;
+            justify-content: space-between;
+
+            span:nth-of-type(1) {
+              width: 2rem;
+            }
+
+            span:nth-of-type(2) {
+              width: 100%;
+              font-weight: 600;
+            }
           }
 
-          span:nth-of-type(2) {
-            width: 100%;
+          p:nth-of-type(1) > span:nth-of-type(1) {
+            font-size: 0.18rem;
             font-weight: 600;
           }
         }
 
-        p:nth-of-type(1) > span:nth-of-type(1) {
-          font-size: 0.18rem;
-          font-weight: 600;
-        }
-      }
-
-      .add {
-        cursor: pointer;
-        margin-top: 0.1rem;
-        font-size: 0.16rem;
-        color: #007efb;
-      }
-
-      .form {
-        min-height: 32px;
-        margin-top: 24px;
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-
-        span:first-child {
-          width: 1.0rem;
+        .add {
+          cursor: pointer;
+          margin-top: 0.1rem;
+          font-size: 0.16rem;
+          color: #007efb;
         }
 
-        :deep(.ant-input-textarea) {
-          width: 1000px;
+        .form {
+          min-height: 32px;
+          margin-top: 24px;
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+
+          span:first-child {
+            width: 1rem;
+          }
+
+          :deep(.ant-input-textarea) {
+            width: 1000px;
+          }
+
+          :deep(.ant-radio-group) {
+            width: 5.2rem;
+          }
+
+          :deep(.ant-input-number) {
+            width: 2rem;
+          }
+
+          :deep(.ant-input) {
+            resize: none;
+            width: 5.2rem;
+          }
+
+          .ant-btn {
+            width: 1.6rem;
+            height: 0.32rem;
+            text-align: center;
+            background: #edf4fc;
+            color: #0087ff;
+            border: 0.01rem solid #bbd3ef;
+            border-radius: 0.06rem;
+          }
         }
 
-        :deep(.ant-radio-group) {
-          width: 5.2rem;
-        }
+        .submit {
+          margin-top: 0.4rem;
+          font-size: 0.14rem;
+          display: flex;
+          justify-content: center;
 
-        :deep(.ant-input-number) {
-          width: 2rem;
-        }
-
-        :deep(.ant-input) {
-          resize: none;
-          width: 5.2rem;
-        }
-
-        .ant-btn {
-          width: 1.6rem;
-          height: 0.32rem;
-          text-align: center;
-          background: #edf4fc;
-          color: #0087ff;
-          border: 0.01rem solid #bbd3ef;
-          border-radius: 0.06rem;
-        }
-      }
-
-      .submit {
-        margin-top: 0.4rem;
-        font-size: 0.14rem;
-        display: flex;
-        justify-content: center;
-
-        .ant-btn {
-          width: 260px;
-          height: 32px;
-          text-align: center;
-          background: #fff;
-          color: #0558e1;
-          border: 1px solid #0558e1;
-          border-radius: 2px;
-          font-size: 14px;
-        }
-        .ant-btn:hover{
-          background: #fff;
-          color: #0558e1;
-          opacity: 0.8;
-        }
-        .ant-btn:active{
-          background: #fff;
-          color: #0558e1;
-          opacity: 0.8
+          .ant-btn {
+            width: 260px;
+            height: 32px;
+            text-align: center;
+            background: #fff;
+            color: #0558e1;
+            border: 1px solid #0558e1;
+            border-radius: 2px;
+            font-size: 14px;
+          }
+          .ant-btn:hover {
+            background: #fff;
+            color: #0558e1;
+            opacity: 0.8;
+          }
+          .ant-btn:active {
+            background: #fff;
+            color: #0558e1;
+            opacity: 0.8;
+          }
         }
       }
     }
-  }
 
-  & > div:nth-of-type(1) {
-    margin-top: 0;
-  }
-}
-.danxuan-Area {
-  display: grid;
-  margin-top: -0.05rem;
-  grid-template-columns: auto auto auto auto auto auto auto auto ;
-  border-left: 1px #0558e1 solid;
-  .danxuan-Area-son {
-    cursor: pointer;
-    min-width: 82px;
-    height: 32px;
-    border-radius: 2px;
-    color: #0558e1;
-    background: #fff;
-    border-right: 1px #0558e1 solid;
-    border-bottom: 1px #0558e1 solid;
-    border-top: 1px #0558e1 solid;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .danxuan-Area-son:hover {
-    color: #fff;
-    background: #0558e1;
-  }
-
-  .danxuan-Area-down {
-    background: #0058e1;
-    color: #fff;
-    // border: 1px #0558e1 solid;
-  }
-}
-
-.application-Area {
-  display: grid;
-  margin-top: -0.05rem;
-  grid-template-columns: auto auto auto auto auto auto;
-
-  .application-Area-son {
-    cursor: pointer;
-    width: 162px;
-    height: 32px;
-    border-radius: 2px;
-    color: #212121;
-    background: rgba(96, 99, 104, 0.1);
-    border: 0.01rem rgba(96, 99, 104, 0.1) solid;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 8px;
-    margin-right: 8px;
-    position: relative;
-    .application-Area-son-son {
-      position: absolute;
-      right: 0px;
-      top: 0px;
-      z-index: 100;
-      width: 16px;
-      height: 16px;
-      background: url('~@/assets/home/kong.png') no-repeat;
-    }
-  }
-  .application-Area-son:hover {
-    opacity: 0.9;
-    color: #0058e1;
-    border: 1px #0558e1 solid;
-  }
-
-  .application-Area-down {
-    opacity: 0.9;
-    color: #0058e1;
-    border: 1px #0558e1 solid;
-    .application-Area-son-son {
-      position: absolute;
-      right: 0px;
-      top: 0px;
-      z-index: 100;
-      width: 16px;
-      height: 16px;
-      background: url('~@/assets/home/duihao.png') no-repeat;
-    }
-  }
-}
-
-:deep(.ant-image-img) {
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-}
-
-:deep(.ant-modal) {
-  width: 9.6rem;
-}
-
-:deep(.ant-transfer-list) {
-  width: 39.5%;
-  height: 5.2rem;
-}
-
-:deep(.ant-transfer-operation) {
-  flex-direction: row-reverse;
-  margin: 0 0.3rem;
-}
-
-:deep(.ant-btn) {
-  width: 0.56rem;
-  height: 0.4rem;
-  border-radius: 0.04rem;
-}
-
-:deep(.ant-btn:first-child) {
-  margin-left: 0.04rem;
-}
-
-:deep(.ant-modal-footer) {
-  border: 0;
-}
-
-:deep(.ant-modal-header) {
-  border: 0;
-}
-
-:deep(.ant-modal-title) {
-  line-height: 0.24rem;
-  font-size: 0.18rem;
-  color: #303133;
-}
-
-:deep(.ant-transfer-list-header) {
-  background: #f5f7fa;
-}
-
-: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) {
-  font-size: 0.16rem;
-  color: #303133;
-  font-weight: 400;
-  text-align: left;
-}
-:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
-  display: none !important;
-}
-:deep(.ant-upload-list-item-name) {
-  width: 1rem;
-}
-
-.del {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  font-size: 0.14rem;
-  margin-left: 0.2rem;
-
-  .delImg {
-    cursor: pointer;
-    display: inline-block;
-    width: 0.16rem;
-    height: 0.18rem;
-    background: url(~@/assets/home/sf_del.png) no-repeat;
-    margin-right: 0.05rem;
-  }
-
-  div {
-    cursor: pointer;
-  }
-}
-.item {
-  position: relative;
-  span:first-child {
-    width: unset;
-  }
-  .box {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-    // margin: 15px 0;
     & > div:nth-of-type(1) {
-      text-align: right;
-      width: 110px;
-      margin-right: 16px;
-      // display: flex;
+      margin-top: 0;
+    }
+  }
+  .danxuan-Area {
+    display: grid;
+    margin-top: -0.05rem;
+    grid-template-columns: auto auto auto auto auto auto auto auto;
+    border-left: 1px #0558e1 solid;
+    .danxuan-Area-son {
+      cursor: pointer;
+      min-width: 82px;
+      height: 32px;
+      border-radius: 2px;
+      color: #0558e1;
+      background: #fff;
+      border-right: 1px #0558e1 solid;
+      border-bottom: 1px #0558e1 solid;
+      border-top: 1px #0558e1 solid;
+      display: flex;
+      justify-content: center;
       align-items: center;
     }
-    .required {
-      color: #e83e48;
-      margin-left: -6px;
-    }
-  }
-
-  :deep(.the-new-release .box .first) {
-    justify-content: center !important;
-
-    padding: 10px 350px 0;
-    button {
-      cursor: pointer;
-      width: 80px;
-      height: 35px;
-      text-align: center;
+    .danxuan-Area-son:hover {
       color: #fff;
-      border: none;
-      border-radius: 6px;
-      background: yellow;
+      background: #0558e1;
     }
-    button:nth-of-type(1) {
-      color: red;
-      background: #e1edfa;
-    }
-    button:nth-of-type(2) {
-      background: yellow;
+
+    .danxuan-Area-down {
+      background: #0058e1;
+      color: #fff;
+      // border: 1px #0558e1 solid;
     }
   }
 
-  .requiredTips {
-    font-size: 14px;
-    color: #e83e48;
-    position: absolute;
-    bottom: -20px;
-    left: 110px;
+  .application-Area {
+    display: grid;
+    margin-top: -0.05rem;
+    grid-template-columns: auto auto auto auto auto auto;
+
+    .application-Area-son {
+      cursor: pointer;
+      width: 162px;
+      height: 32px;
+      border-radius: 2px;
+      color: #212121;
+      background: rgba(96, 99, 104, 0.1);
+      border: 0.01rem rgba(96, 99, 104, 0.1) solid;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 8px;
+      margin-right: 8px;
+      position: relative;
+      .application-Area-son-son {
+        position: absolute;
+        right: 0px;
+        top: 0px;
+        z-index: 100;
+        width: 16px;
+        height: 16px;
+        background: url('~@/assets/home/kong.png') no-repeat;
+      }
+    }
+    .application-Area-son:hover {
+      opacity: 0.9;
+      color: #0058e1;
+      border: 1px #0558e1 solid;
+    }
+
+    .application-Area-down {
+      opacity: 0.9;
+      color: #0058e1;
+      border: 1px #0558e1 solid;
+      .application-Area-son-son {
+        position: absolute;
+        right: 0px;
+        top: 0px;
+        z-index: 100;
+        width: 16px;
+        height: 16px;
+        background: url('~@/assets/home/duihao.png') no-repeat;
+      }
+    }
+  }
+
+  :deep(.ant-image-img) {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
+
+  :deep(.ant-modal) {
+    width: 9.6rem;
+  }
+
+  :deep(.ant-transfer-list) {
+    width: 39.5%;
+    height: 5.2rem;
+  }
+
+  :deep(.ant-transfer-operation) {
+    flex-direction: row-reverse;
+    margin: 0 0.3rem;
+  }
+
+  :deep(.ant-btn) {
+    width: 0.56rem;
+    height: 0.4rem;
+    border-radius: 0.04rem;
+  }
+
+  :deep(.ant-btn:first-child) {
+    margin-left: 0.04rem;
+  }
+
+  :deep(.ant-modal-footer) {
+    border: 0;
+  }
+
+  :deep(.ant-modal-header) {
+    border: 0;
+  }
+
+  :deep(.ant-modal-title) {
+    line-height: 0.24rem;
+    font-size: 0.18rem;
+    color: #303133;
+  }
+
+  :deep(.ant-transfer-list-header) {
+    background: #f5f7fa;
+  }
+
+  :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) {
+    font-size: 0.16rem;
+    color: #303133;
+    font-weight: 400;
+    text-align: left;
+  }
+  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
+    display: none !important;
+  }
+  :deep(.ant-upload-list-item-name) {
+    width: 1rem;
+  }
+
+  .del {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-size: 0.14rem;
+    margin-left: 0.2rem;
+    .updateImg {
+      cursor: pointer;
+      display: inline-block;
+      width: 16px;
+      height: 18px;
+      background: url('~@/assets/home/update.png') no-repeat;
+      margin-right: 5px;
+      margin-bottom: 1px;
+    }
+    .delImg {
+      cursor: pointer;
+      display: inline-block;
+      width: 0.16rem;
+      height: 0.18rem;
+      background: url(~@/assets/home/sf_del.png) no-repeat;
+      margin-right: 0.05rem;
+    }
+    & > span {
+      display: flex;
+    }
+
+    div {
+      cursor: pointer;
+    }
+  }
+  .item {
+    position: relative;
+    span:first-child {
+      width: unset;
+    }
+    .box {
+      display: flex;
+      align-items: center;
+      min-height: 32px;
+      // margin: 15px 0;
+      & > div:nth-of-type(1) {
+        text-align: right;
+        width: 110px;
+        margin-right: 16px;
+        // display: flex;
+        align-items: center;
+      }
+      .required {
+        color: #e83e48;
+        margin-left: -6px;
+      }
+    }
+
+    :deep(.the-new-release .box .first) {
+      justify-content: center !important;
+
+      padding: 10px 350px 0;
+      button {
+        cursor: pointer;
+        width: 80px;
+        height: 35px;
+        text-align: center;
+        color: #fff;
+        border: none;
+        border-radius: 6px;
+        background: yellow;
+      }
+      button:nth-of-type(1) {
+        color: red;
+        background: #e1edfa;
+      }
+      button:nth-of-type(2) {
+        background: yellow;
+      }
+    }
+
+    .requiredTips {
+      font-size: 14px;
+      color: #e83e48;
+      position: absolute;
+      bottom: -20px;
+      left: 110px;
+    }
   }
-}
 </style>
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index 58aa69e9..535c36ab 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -159,7 +159,9 @@
                   text-align: center;
                   cursor: pointer;
                 "
-                @click="downloadFile(formName.enclosure, '申请附件')"
+                @click="
+                  downloadFile(formName.enclosure, formName.enclosureName)
+                "
               >
                 下载
               </button>
@@ -362,6 +364,7 @@
     xhr.responseType = 'blob'
     xhr.send()
     xhr.onload = function () {
+      console.log('下载', path, this.status, navigator)
       if (this.status === 200 || this.status === 304) {
         // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
         if ('msSaveOrOpenBlob' in navigator) {
@@ -379,6 +382,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }
diff --git a/front/src/views/newHome/components/LatestCapabilities.vue b/front/src/views/newHome/components/LatestCapabilities.vue
index 4f83e330..77381fa6 100644
--- a/front/src/views/newHome/components/LatestCapabilities.vue
+++ b/front/src/views/newHome/components/LatestCapabilities.vue
@@ -8,13 +8,13 @@
       <div class="bottom">
         <div class="item" v-for="item in productServiceData" :key="item.id">
           <div class="img" :class="item.imgType"></div>
-          <a-tooltip >
+          <a-tooltip>
             <template #title>{{ item.name }}</template>
             <div class="name">{{ item.name }}</div>
           </a-tooltip>
           <div class="dec">
-                <span>{{ item.deptName }}</span>
-              </div>
+            <span>{{ item.deptName }}</span>
+          </div>
           <div class="text">
             {{ item.description || '暂无描述' }}
           </div>
@@ -81,18 +81,26 @@
       query: {
         // select: '组件服务',
         select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-        orderField:'tdr.create_date'
+        orderField: 'tdr.create_date',
       },
     })
   }
   const selectOne = (id) => {
     console.log('点击===============》', id)
-    router.push({
-      path: '/details',
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/details', // 跳转的页面路由
       query: {
         id: id,
+        hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
 </script>
 <style lang="less" scoped>
@@ -177,15 +185,15 @@
             word-break: break-all;
           }
           .dec {
-              margin: 8px 8px;
-              text-align: center;
-              padding-right: 10px;
-              color: #0058e1;
-              span {
-                background: rgba(0, 88, 225, 0.1);
-                padding: 5px 5px;
-              }
+            margin: 8px 8px;
+            text-align: center;
+            padding-right: 10px;
+            color: #0058e1;
+            span {
+              background: rgba(0, 88, 225, 0.1);
+              padding: 5px 5px;
             }
+          }
           .text {
             width: 100%;
             height: 0.9rem;
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index 4040cc2a..d85c5476 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -48,11 +48,10 @@
               <div class="dec">
                 <span>{{ item.deptName }}</span>
               </div>
-              <a-tooltip >
+              <a-tooltip>
                 <template #title>{{ item.description || '暂无描述' }}</template>
-                <div class="text">{{item.description || '暂无描述'}}</div>
+                <div class="text">{{ item.description || '暂无描述' }}</div>
               </a-tooltip>
-             
             </div>
           </div>
         </div>
@@ -65,302 +64,312 @@
   </div>
 </template>
 <script setup>
-import { ref } from 'vue'
-import { pageWithAttrs } from '@/api/home.js'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-const store = useStore()
-const router = useRouter()
-const select = ref('申请量')
-const selList = ref(['申请量', '收藏量'])
-const list = ref([])
+  import { ref } from 'vue'
+  import { pageWithAttrs } from '@/api/home.js'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  const store = useStore()
+  const router = useRouter()
+  const select = ref('申请量')
+  const selList = ref(['申请量', '收藏量'])
+  const list = ref([])
 
-const paramsGetResources = {
-  districtId: '',
-  pageNum: 1,
-  pageSize: 6,
-  type: '应用资源',
-  name: '',
-  infoList: [],
-  orderField: 'applyCount', // total 综合 visits 浏览量 applyCount 申请量 score 评分  collectCount 收藏量
-  orderType: 'DESC', // ASC 升序  DESC 降序
-}
-const selectChange = (sel) => {
-  select.value = sel
-  switch (select.value) {
-    case '浏览量':
-      paramsGetResources.orderField = 'visits'
-      break
-    case '申请量':
-      paramsGetResources.orderField = 'applyCount'
-      break
-    case '收藏量':
-      paramsGetResources.orderField = 'collectCount'
-      break
-    default:
-      paramsGetResources.orderField = 'total'
-      break
+  const paramsGetResources = {
+    districtId: '',
+    pageNum: 1,
+    pageSize: 6,
+    type: '应用资源',
+    name: '',
+    infoList: [],
+    orderField: 'applyCount', // total 综合 visits 浏览量 applyCount 申请量 score 评分  collectCount 收藏量
+    orderType: 'DESC', // ASC 升序  DESC 降序
+  }
+  const selectChange = (sel) => {
+    select.value = sel
+    switch (select.value) {
+      case '浏览量':
+        paramsGetResources.orderField = 'visits'
+        break
+      case '申请量':
+        paramsGetResources.orderField = 'applyCount'
+        break
+      case '收藏量':
+        paramsGetResources.orderField = 'collectCount'
+        break
+      default:
+        paramsGetResources.orderField = 'total'
+        break
+    }
+    getList()
+  }
+  const getList = () => {
+    pageWithAttrs(paramsGetResources).then((res) => {
+      console.log('查询列表============>', res.data.data.records)
+      res.data.data.records.forEach((val) => {
+        switch (val.type) {
+          case '组件服务':
+            val.imgType = 'zj'
+            break
+          case '应用资源':
+            val.imgType = 'yy'
+            break
+          case '基础设施':
+            val.imgType = 'jc'
+            break
+          case '数据资源':
+            val.imgType = 'sj'
+            break
+          case '知识库':
+            val.imgType = 'zs'
+            break
+          default:
+            val.imgType = 'zj'
+            break
+        }
+      })
+      list.value = res.data.data.records
+    })
   }
   getList()
-}
-const getList = () => {
-  pageWithAttrs(paramsGetResources).then((res) => {
-    console.log('查询列表============>', res.data.data.records)
-    res.data.data.records.forEach((val) => {
-      switch (val.type) {
-        case '组件服务':
-          val.imgType = 'zj'
-          break
-        case '应用资源':
-          val.imgType = 'yy'
-          break
-        case '基础设施':
-          val.imgType = 'jc'
-          break
-        case '数据资源':
-          val.imgType = 'sj'
-          break
-        case '知识库':
-          val.imgType = 'zs'
-          break
-        default:
-          val.imgType = 'zj'
-          break
-      }
-    })
-    list.value = res.data.data.records
-  })
-}
-getList()
 
-function jumpPage() {
-  // 点击内存入store
-  store.commit('home/selectCardsData', {
-    selectCardsnum: '组件服务',
-  })
-  console.log('选中===================>', store.getters['home/selectCardsnum'])
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      // select: '组件服务',
-      select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-      orderField:paramsGetResources.orderField  //根据什么排序
-    },
-  })
-}
-const selectOne = (id) => {
-  console.log('点击===============》', id)
-  router.push({
-    path: '/details',
-    query: {
-      id: id,
-    },
-  })
-}
+  function jumpPage() {
+    // 点击内存入store
+    store.commit('home/selectCardsData', {
+      selectCardsnum: '组件服务',
+    })
+    console.log(
+      '选中===================>',
+      store.getters['home/selectCardsnum']
+    )
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+        orderField: paramsGetResources.orderField, //根据什么排序
+      },
+    })
+  }
+  const selectOne = (id) => {
+    console.log('点击===============》', id)
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/details', // 跳转的页面路由
+      query: {
+        id: id,
+        hiddenBackFlag: true,
+      },
+    })
+    window.open(detailPage.href, '_blank')
+  }
 </script>
 <style lang="less" scoped>
-.popular-ability {
-  height: 6.8rem;
-  background: url('~@/assets/newHome/popular-bg.png') no-repeat;
-  background-size: 100%;
-  display: flex;
-  justify-content: center;
-  .main {
-    width: 13rem;
-    margin-top: 0.78rem;
+  .popular-ability {
+    height: 6.8rem;
+    background: url('~@/assets/newHome/popular-bg.png') no-repeat;
+    background-size: 100%;
     display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    .top {
-      font-size: 0.3rem;
-      color: #fff;
-      text-align: center;
+    justify-content: center;
+    .main {
+      width: 13rem;
+      margin-top: 0.78rem;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
-      justify-content: center;
-      align-items: center;
-      .line {
-        width: 0.34rem;
-        height: 0.03rem;
-        background-color: #fff;
-        margin-top: 0.08rem;
-      }
-    }
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      margin-top: 0.52rem;
-      .left {
+      .top {
+        font-size: 0.3rem;
+        color: #fff;
+        text-align: center;
         display: flex;
         flex-direction: column;
         flex-wrap: wrap;
-        .select {
-          cursor: pointer;
+        justify-content: center;
+        align-items: center;
+        .line {
+          width: 0.34rem;
+          height: 0.03rem;
+          background-color: #fff;
+          margin-top: 0.08rem;
+        }
+      }
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 0.52rem;
+        .left {
           display: flex;
           flex-direction: column;
           flex-wrap: wrap;
-          align-items: center;
-          justify-content: center;
-          width: 1.05rem;
-          height: 2.1rem;
-          background: rgba(255, 255, 255, 0.08);
-          margin-bottom: 0.01rem;
-          border-right: 0.02rem solid rgba(233, 233, 233, 0.3);
-          .img {
-            width: 0.36rem;
-            height: 0.36rem;
-            background-size: 100%;
-          }
-          .fwl {
-            background: url('~@/assets/newHome/fwl-no.png') no-repeat;
-            background-size: contain;
-          }
-          .sgl {
-            background: url('~@/assets/newHome/sgl-no.png') no-repeat;
-            background-size: contain;
-          }
-          .scl {
-            background: url('~@/assets/newHome/scl-no.png') no-repeat;
-            background-size: contain;
-          }
-          .text {
-            color: rgba(255, 255, 255, 0.6);
-            font-size: 0.14rem;
-       
-          }
-        }
-        .select:hover {
-          background: rgba(255, 255, 255, 0.12);
-        }
-        .checked {
-          background: rgba(255, 255, 255, 0.18) !important;
-          border-right: 0.02rem solid #fff;
-        }
-      }
-      .right {
-        cursor: pointer;
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-        margin-left: 0.2rem;
-        .item {
-          width: 3.78rem;
-          height: 2rem;
-          display: flex;
-          .item-left {
-            width: 0.83rem;
-            height: 100%;
+          .select {
+            cursor: pointer;
             display: flex;
-            justify-content: center;
+            flex-direction: column;
+            flex-wrap: wrap;
             align-items: center;
-            background: #eef1f8;
+            justify-content: center;
+            width: 1.05rem;
+            height: 2.1rem;
+            background: rgba(255, 255, 255, 0.08);
+            margin-bottom: 0.01rem;
+            border-right: 0.02rem solid rgba(233, 233, 233, 0.3);
             .img {
-              width: 0.56rem;
-              height: 0.56rem;
+              width: 0.36rem;
+              height: 0.36rem;
               background-size: 100%;
             }
-            .zj {
-              background: url('~@/assets/newHome/popular-zj.png') no-repeat;
+            .fwl {
+              background: url('~@/assets/newHome/fwl-no.png') no-repeat;
               background-size: contain;
             }
-            .yy {
-              background: url('~@/assets/newHome/popular-yy.png') no-repeat;
+            .sgl {
+              background: url('~@/assets/newHome/sgl-no.png') no-repeat;
               background-size: contain;
             }
-            .jc {
-              background: url('~@/assets/newHome/popular-jc.png') no-repeat;
+            .scl {
+              background: url('~@/assets/newHome/scl-no.png') no-repeat;
               background-size: contain;
             }
-            .sj {
-              background: url('~@/assets/newHome/popular-sj.png') no-repeat;
-              background-size: contain;
-            }
-            .zs {
-              background: url('~@/assets/newHome/popular-zs.png') no-repeat;
-              background-size: contain;
-            }
-          }
-          .item-right {
-            width: 100%;
-            height: 100%;
-            background: #fff;
-            .fw {
-              width: 100%;
-              padding-right: 0.1rem;
-              padding-top: 0.03rem;
-              text-align: right;
-              color: 666;
-              font-size: 0.14rem;
-              color: #666;
-            }
-            .name {
-              font-size: 0.18rem;
-              color: #212121;
-              text-align: center;
-              margin-top: 0.05rem;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
-              word-break: break-all;
-            }
-            .dec {
-              margin: 8px 8px;
-              text-align: center;
-              padding-right: 10px;
-              color: #0058e1;
-              span {
-                background: rgba(0, 88, 225, 0.1);
-                padding: 5px 5px;
-              }
-            }
             .text {
-              width: 100%;
-              padding: 0rem 0.03rem;
+              color: rgba(255, 255, 255, 0.6);
               font-size: 0.14rem;
-              color: #212121;
-              line-height: 0.24rem;
-              height: 1rem;
-              word-break: break-all;
-              overflow: hidden;
             }
           }
+          .select:hover {
+            background: rgba(255, 255, 255, 0.12);
+          }
+          .checked {
+            background: rgba(255, 255, 255, 0.18) !important;
+            border-right: 0.02rem solid #fff;
+          }
         }
-        .item:nth-of-type(4),
-        .item:nth-of-type(5),
-        .item:nth-of-type(6) {
-          margin-top: 0.2rem;
-        }
-        .item:hover {
-          border-radius: 0.02rem;
-          border: 0.01rem solid #0058e1;
-          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+        .right {
+          cursor: pointer;
+          display: flex;
+          justify-content: space-between;
+          flex-wrap: wrap;
+          margin-left: 0.2rem;
+          .item {
+            width: 3.78rem;
+            height: 2rem;
+            display: flex;
+            .item-left {
+              width: 0.83rem;
+              height: 100%;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              background: #eef1f8;
+              .img {
+                width: 0.56rem;
+                height: 0.56rem;
+                background-size: 100%;
+              }
+              .zj {
+                background: url('~@/assets/newHome/popular-zj.png') no-repeat;
+                background-size: contain;
+              }
+              .yy {
+                background: url('~@/assets/newHome/popular-yy.png') no-repeat;
+                background-size: contain;
+              }
+              .jc {
+                background: url('~@/assets/newHome/popular-jc.png') no-repeat;
+                background-size: contain;
+              }
+              .sj {
+                background: url('~@/assets/newHome/popular-sj.png') no-repeat;
+                background-size: contain;
+              }
+              .zs {
+                background: url('~@/assets/newHome/popular-zs.png') no-repeat;
+                background-size: contain;
+              }
+            }
+            .item-right {
+              width: 100%;
+              height: 100%;
+              background: #fff;
+              .fw {
+                width: 100%;
+                padding-right: 0.1rem;
+                padding-top: 0.03rem;
+                text-align: right;
+                color: 666;
+                font-size: 0.14rem;
+                color: #666;
+              }
+              .name {
+                font-size: 0.18rem;
+                color: #212121;
+                text-align: center;
+                margin-top: 0.05rem;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 1;
+                -webkit-box-orient: vertical;
+                word-break: break-all;
+              }
+              .dec {
+                margin: 8px 8px;
+                text-align: center;
+                padding-right: 10px;
+                color: #0058e1;
+                span {
+                  background: rgba(0, 88, 225, 0.1);
+                  padding: 5px 5px;
+                }
+              }
+              .text {
+                width: 100%;
+                padding: 0rem 0.03rem;
+                font-size: 0.14rem;
+                color: #212121;
+                line-height: 0.24rem;
+                height: 1rem;
+                word-break: break-all;
+                overflow: hidden;
+              }
+            }
+          }
+          .item:nth-of-type(4),
+          .item:nth-of-type(5),
+          .item:nth-of-type(6) {
+            margin-top: 0.2rem;
+          }
+          .item:hover {
+            border-radius: 0.02rem;
+            border: 0.01rem solid #0058e1;
+            box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+          }
         }
       }
-    }
-    .bottom-btn {
-      cursor: pointer;
-      text-align: center;
-      margin-top: 0.24rem;
-      color: #fff;
-      width: 1rem;
-      height: 0.24rem;
-      line-height: 0.24rem;
-      margin-left: 6rem;
-      span {
-        display: inline-block;
-        width: 0.1rem;
-        height: 0.1rem;
-        background: url('~@/assets/newHome/gd.png') no-repeat;
-        background-size: contain;
+      .bottom-btn {
+        cursor: pointer;
+        text-align: center;
+        margin-top: 0.24rem;
+        color: #fff;
+        width: 1rem;
+        height: 0.24rem;
+        line-height: 0.24rem;
+        margin-left: 6rem;
+        span {
+          display: inline-block;
+          width: 0.1rem;
+          height: 0.1rem;
+          background: url('~@/assets/newHome/gd.png') no-repeat;
+          background-size: contain;
+        }
+      }
+      .bottom-btn:hover {
+        background: rgba(0, 88, 225, 0.1);
       }
-    }
-    .bottom-btn:hover {
-      background: rgba(0, 88, 225, 0.1);
     }
   }
-}
 </style>
diff --git a/front/src/views/newHome/components/RecommendationAbility.vue b/front/src/views/newHome/components/RecommendationAbility.vue
index 1f5dc17d..1b9d6987 100644
--- a/front/src/views/newHome/components/RecommendationAbility.vue
+++ b/front/src/views/newHome/components/RecommendationAbility.vue
@@ -104,12 +104,20 @@
   }
   const selectOne = (id) => {
     console.log('点击===============》', id)
-    router.push({
-      path: '/details',
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/details', // 跳转的页面路由
       query: {
         id: id,
+        hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
 </script>
 <style lang="less" scoped>
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index d02f6d53..7b9def09 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -536,6 +536,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index 23d0f3ab..7436671a 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -157,6 +157,8 @@
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
+      } else {
+        message.warning('下载失败')
       }
     }
   }
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index 9a1d6825..7630e6b2 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue	
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue	
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: Light
- * @LastEditTime: 2022-12-01 14:02:17
+ * @LastEditTime: 2022-12-19 10:54:23
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -35,9 +35,118 @@
           <span>能力描述：{{ props.refObj.dto.description }}</span>
           <span>归属部门：{{ props.refObj.dto.deptName }}</span>
         </p>
-        <p v-for="item in props.refObj.dto.infoList" :key="item.attrType">
-          <span>{{ item.attrType + '：' + item.attrValue }}</span>
-        </p>
+        <template
+          v-for="item in props.refObj.dto.infoList"
+          :key="item.attrType"
+        >
+          <p v-if="arr.indexOf(item.attrType) === -1">
+            <span>{{ item.attrType + '：' + item.attrValue }}</span>
+          </p>
+          <template v-else-if="JSON.parse(item.attrValue)">
+            <div v-if="item.attrType === '算法优势'">
+              <div
+                v-for="(attr, index) in JSON.parse(item.attrValue)"
+                :key="item.attrType + index"
+              >
+                <div>{{ item.attrType + '-' + (index + 1) }}</div>
+                <div>
+                  <span>算法优势名称：{{ attr.name }}</span>
+                </div>
+                <div>
+                  <span>算法优势描述：{{ attr.desc }}</span>
+                </div>
+              </div>
+            </div>
+            <div v-else-if="item.attrType === '应用场景'">
+              <div
+                v-for="(attr, index) in JSON.parse(item.attrValue)"
+                :key="item.attrType + index"
+              >
+                <div>{{ item.attrType + '-' + (index + 1) }}</div>
+                <div>
+                  <span>应用场景名称：{{ attr.name }}</span>
+                </div>
+                <div>
+                  <span>应用场景描述：{{ attr.desc }}</span>
+                </div>
+                <div>
+                  <span>
+                    应用场景图片：
+                    <a-image :width="100" :src="attr.img" />
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div v-else-if="item.attrType === '计费标准信息'">
+              <div
+                v-for="(attr, index) in JSON.parse(item.attrValue)"
+                :key="item.attrType + index"
+              >
+                <div>{{ item.attrType + '-' + (index + 1) }}</div>
+                <div>
+                  <span>计费方式：{{ attr.type }}</span>
+                </div>
+                <div>
+                  <span>计费标准：{{ attr.price }}</span>
+                </div>
+                <div>
+                  <span>计费标准描述：{{ attr.desc }}</span>
+                </div>
+              </div>
+            </div>
+            <div v-else-if="item.attrType === '常见问题'">
+              <div
+                v-for="(attr, index) in JSON.parse(item.attrValue)"
+                :key="item.attrType + index"
+              >
+                <div>{{ item.attrType + '-' + (index + 1) }}</div>
+                <div>
+                  <span>问题：{{ attr.question }}</span>
+                </div>
+                <div>
+                  <span>答复：{{ attr.answer }}</span>
+                </div>
+              </div>
+            </div>
+            <div v-else-if="item.attrType === '功能介绍'">
+              <div
+                v-for="(attr, index) in JSON.parse(item.attrValue)"
+                :key="item.attrType + index"
+              >
+                <div>{{ item.attrType + '-' + (index + 1) }}</div>
+                <div>
+                  <span>功能名称：{{ attr.name }}</span>
+                </div>
+                <div>
+                  <span>功能描述：{{ attr.desc }}</span>
+                </div>
+                <div>
+                  <span>
+                    功能图片：
+                    <a-image :width="100" :src="attr.img" />
+                  </span>
+                </div>
+              </div>
+            </div>
+          </template>
+        </template>
+        <!-- <p v-for="item in props.refObj.dto.infoList" :key="item.attrType">
+          <template v-if="arr.indexOf(item.attrType) === -1">
+            <span>{{ item.attrType + '：' + item.attrValue }}</span>
+          </template>
+          <template v-else-if="item.attrType === '算法优势'">
+            <div
+              v-for="(attr, index) in JSON.parse(item.attrValue)"
+              :key="item.attrType + index"
+            >
+              <div>{{ item.attrType + '-' + (index + 1) }}</div>
+              <div>
+                <span>算法优势名称：{{ attr.name }}</span>
+                <span>算法优势描述：{{ attr.desc }}</span>
+              </div>
+            </div>
+          </template>
+        </p> -->
       </div>
     </div>
   </div>
@@ -52,11 +161,11 @@
   })
   console.log(props.refObj, '=====================================')
   const arr = ['算法优势', '应用场景', '计费标准信息', '常见问题', '功能介绍']
-  if (props.refObj.dto.infoList) {
-    props.refObj.dto.infoList = props.refObj.dto.infoList.filter(
-      (val) => arr.indexOf(val.attrType) == -1
-    )
-  }
+  // if (props.refObj.dto.infoList) {
+  //   props.refObj.dto.infoList = props.refObj.dto.infoList.filter(
+  //     (val) => arr.indexOf(val.attrType) == -1
+  //   )
+  // }
   const endThis = () => {
     endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
       if (res.data.code == 0) {
@@ -104,6 +213,9 @@
     .main {
       background: #eee;
       padding: 0.2rem 0.2rem 0.1rem;
+      div {
+        margin-bottom: 1em;
+      }
       p {
         display: flex;
         justify-content: space-between;