diff --git a/back/public/index.html b/back/public/index.html
index 788f8554..3e830a61 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -27,7 +27,7 @@
       'isTab': true,     // 是否通过tab展示内容?
       'iframeURL': ''    // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
     };
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo';  
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/#/vueTemplateDemo';  
     // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo';
     // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo';  
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; 
@@ -72,9 +72,9 @@
     <script>
       
       // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
-
+      window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.243:9796/';
             // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-        window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+        window.SITE_CONFIG['apiURL'] = 'http://15.2.21.243:8888/renren-admin';
       // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
       // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
       // WebSocket地址
diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index ae6c7a55..98b075fb 100644
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@@ -2,7 +2,7 @@ import Cookies from 'js-cookie'
 import qs from 'qs'
 import { deepClone } from '@/utils/form-generator/index'
 export default {
-  data() {
+  data () {
     /* eslint-disable */
     return {
       // 设置属性
@@ -38,19 +38,19 @@ export default {
     }
     /* eslint-enable */
   },
-  created() {
+  created () {
     if (this.mixinViewModuleOptions.createdIsNeed) {
       this.query()
     }
   },
-  activated() {
+  activated () {
     if (this.mixinViewModuleOptions.activatedIsNeed) {
       this.query()
     }
   },
   methods: {
     // 获取数据列表
-    query() {
+    query () {
       this.dataListLoading = true
       this.$http.get(
         this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
@@ -109,11 +109,15 @@ export default {
         }
 
         console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
-        // if (this.dataList[0].type === '组件服务') {
-        //   this.dataList.map(val => {
-        //     val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域')
-        //   })
-        // }
+        if (this.dataList[0].type === '组件服务') {
+          this.dataList.map(val => {
+            val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域' || item.attrType === '组件类型')
+          })
+        } else if (this.dataList[0].type === '应用资源') {
+          this.dataList.map(val => {
+            val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
+          })
+        }
         if (this.mixinViewModuleOptions.requestCallback) {
           this.mixinViewModuleOptions.requestCallback(res.data)
         }
@@ -123,11 +127,11 @@ export default {
       })
     },
     // 多选
-    dataListSelectionChangeHandle(val) {
+    dataListSelectionChangeHandle (val) {
       this.dataListSelections = val
     },
     // 排序
-    dataListSortChangeHandle(data) {
+    dataListSortChangeHandle (data) {
       if (!data.order || !data.prop) {
         this.order = ''
         this.orderField = ''
@@ -138,13 +142,13 @@ export default {
       this.query()
     },
     // 分页, 每页条数
-    pageSizeChangeHandle(val) {
+    pageSizeChangeHandle (val) {
       this.page = 1
       this.limit = val
       this.query()
     },
     // 分页, 当前页
-    pageCurrentChangeHandle(val) {
+    pageCurrentChangeHandle (val) {
       this.page = val
       this.query()
     },
@@ -153,7 +157,7 @@ export default {
       this.query()
     },
     // 新增
-    addOrUpdateHandle(id) {
+    addOrUpdateHandle (id) {
       this.addOrUpdateVisible = true
       this.disabled = false
       this.$nextTick(() => {
@@ -164,7 +168,7 @@ export default {
     },
 
     // 组件服务新增
-    addOrUpdateHandleAI(id) {
+    addOrUpdateHandleAI (id) {
       // const infoList = []
       let showList = []
       this.$http.get('category/getCategoryTree').then(({ data: res }) => {
@@ -222,7 +226,7 @@ export default {
       }, 100)
     },
     // 应用资源新增
-    addOrUpdateHandleServe(id) {
+    addOrUpdateHandleServe (id) {
       // const infoList = []
       let showList = []
       this.$http.get('category/getCategoryTree').then(({ data: res }) => {
@@ -280,7 +284,7 @@ export default {
       }, 100)
     },
     // 修改
-    UpdateHandle(val) {
+    UpdateHandle (val) {
       this.addOrUpdateVisible = true
       this.disabled = false
       const cloneVal = deepClone(val)
@@ -305,7 +309,7 @@ export default {
       })
     },
     // 关闭当前窗口
-    closeCurrentTab(data) {
+    closeCurrentTab (data) {
       var tabName = this.$store.state.contentTabsActiveName
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
       if (this.$store.state.contentTabs.length <= 0) {
@@ -317,7 +321,7 @@ export default {
       }
     },
     // 删除
-    deleteHandle(id) {
+    deleteHandle (id) {
       if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
         return this.$message({
           message: this.$t('prompt.deleteBatch'),
@@ -351,7 +355,7 @@ export default {
       }).catch(() => { })
     },
 
-    deleteHandle2(id) {
+    deleteHandle2 (id) {
       console.log('删除========================》', id, this.dataListSelections)
       const ids = []
       if (id) {
@@ -369,7 +373,7 @@ export default {
       })
     },
     // 导出
-    exportHandle() {
+    exportHandle () {
       var params = qs.stringify({
         token: Cookies.get('ucsToken'),
         ...this.dataForm
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 0cf6f430..ccc5ff7b 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -66,6 +66,38 @@
           header-align="center"
           align="center"
         ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="description"
+          label="组件描述"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptName"
+          label="归属部门"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptContacts"
+          label="部门联系人"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptPhone"
+          label="部门联系人电话"
+          header-align="center"
+          align="center"
+        ></af-table-column>
         <af-table-column
           :show-overflow-tooltip="true"
           width="280"
@@ -74,18 +106,18 @@
           header-align="center"
           align="center"
         ></af-table-column>
-        <template v-if="dataList[0] && dataList[0].infoList">
+        <template v-if="dataList[0] && dataList[0].infoList2">
         <af-table-column
           :show-overflow-tooltip="true"
-          width="300"
-          v-for="(item, index) in dataList[0].infoList"
+          width="280"
+          v-for="(item, index) in dataList[0].infoList2"
           :key="index"
           :label="item.attrType"
           header-align="center"
           align="center"
         >
           <template slot-scope="scope">
-            {{ findValue(scope.row.infoList, item.attrType) }}
+            {{ findValue(scope.row.infoList2, item.attrType) }}
           </template>
         </af-table-column>
         </template>
@@ -94,7 +126,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="150"
+          width="300"
         >
           <template slot-scope="scope">
             <!-- <el-button
@@ -187,10 +219,14 @@
       width="50%"
     >
       <putOnTheShelf
+        ref="putOnTheShelf"
         :putOnTheShelfList="putOnTheShelfList"
         @changeInfoList="changeInfoList"
         :type="radio"
         :typeInput="typeInput"
+        :required="required"
+        :notFilled="notFilled"
+        @submitData="submitData"
       ></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
@@ -211,6 +247,8 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '算法名称', '算法描述', '图层名称', '图层描述', '组件名称', '组件描述', '组件地址', '服务地址', '服务接口', '接口请求方式', '算法类别'],
+      notFilled: [],
       insertList: [],
       putOnTheShelfList: [],
       radio: '',
@@ -300,19 +338,18 @@ export default {
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
             : res.data
-          // this.dataList.map((item, index) => {
-          //   const dataListSinforList = []
-          //   item.infoList.map((itemson, indexson) => {
-          //     if (
-          //       itemson.attrType === '部署位置' ||
-          //       itemson.attrType === '组件类型' ||
-          //       itemson.attrType === '应用领域'
-          //     ) {
-          //       dataListSinforList.push(itemson)
-          //     }
-          //   })
-          //   this.dataList[index].infoList = dataListSinforList
-          // })
+          this.dataList.map((item, index) => {
+            const dataListSinforList = []
+            item.infoList.map((itemson, indexson) => {
+              if (
+                itemson.attrType === '应用领域' ||
+                itemson.attrType === '组件类型'
+              ) {
+                dataListSinforList.push(itemson)
+              }
+            })
+            this.dataList[index].infoList2 = dataListSinforList
+          })
           console.log('this.dataList', this.dataList)
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
@@ -387,19 +424,18 @@ export default {
                 this.mixinViewModuleOptions.requestCallback(res.data)
               }
               this.dataListLoading = false
-              // this.dataList.map((item, index) => {
-              //   const dataListSinforList = []
-              //   item.infoList.map((itemson, indexson) => {
-              //     if (
-              //       itemson.attrType === '部署位置' ||
-              //       itemson.attrType === '组件类型' ||
-              //       itemson.attrType === '应用领域'
-              //     ) {
-              //       dataListSinforList.push(itemson)
-              //     }
-              //   })
-              //   this.dataList[index].infoList = dataListSinforList
-              // })
+              this.dataList.map((item, index) => {
+                const dataListSinforList = []
+                item.infoList.map((itemson, indexson) => {
+                  if (
+                    itemson.attrType === '应用领域' ||
+                    itemson.attrType === '组件类型'
+                  ) {
+                    dataListSinforList.push(itemson)
+                  }
+                })
+                this.dataList[index].infoList2 = dataListSinforList
+              })
             } else {
               this.$message.error('未查询到相关信息')
               this.reset()
@@ -448,6 +484,7 @@ export default {
     // 新上架
     clear () {
       console.log('清空----------------------------------------')
+      this.notFilled = []
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
@@ -490,8 +527,24 @@ export default {
       )
       this.submitFrom.infoList.push(obj)
     },
+    changeAdd () {
+      const arr = []
+      switch (this.radio) {
+        case '智能算法':
+          arr.push('算法优势')
+          arr.push('计费标准信息')
+          break
+        case '开发组件':
+        case '业务组件':
+          arr.push('功能介绍')
+          break
+      }
+      arr.push('应用场景')
+      arr.push('常见问题')
+      this.$refs.putOnTheShelf.submit(arr)
+    },
     submitData () {
-      console.log('提交11111111111===============>', this.putOnTheShelfList)
+      console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
       const arr = []
       this.putOnTheShelfList.map((item) => {
         item.children.map((child) => {
@@ -527,7 +580,7 @@ export default {
                   (item) => item.attrType !== val.name
                 )
               }
-              if (val.note1) {
+              if (val.note1 == '' || val.note1) {
                 switch (val.name) {
                   case '算法名称':
                   case '应用名称':
@@ -603,51 +656,94 @@ export default {
       this.submitFrom.infoList = this.submitFrom.infoList.sort(
         (a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
       )
-      if (this.submitFrom.id) {
-        // 解决编辑无组件类型
-        this.submitFrom.infoList.map((val) => {
-          if (val.attrType === '组件类型') {
-            val.attrValue = this.radio
-          }
+      this.notFilled = []
+      if (!this.submitFrom.name) {
+        this.notFilled.push('算法名称')
+        this.notFilled.push('图层名称')
+        this.notFilled.push('组件名称')
+      }
+      if (!this.submitFrom.description) {
+        this.notFilled.push('算法描述')
+        this.notFilled.push('图层描述')
+        this.notFilled.push('组件描述')
+      }
+      if (!this.submitFrom.shareCondition) {
+        this.notFilled.push('共享条件')
+      }
+      if (!this.submitFrom.deptContacts) {
+        this.notFilled.push('部门联系人')
+      }
+      if (!this.submitFrom.deptPhone) {
+        this.notFilled.push('部门联系人电话')
+      }
+      if (this.radio === '智能算法' && !this.submitFrom.apiUrl) {
+        this.notFilled.push('服务接口')
+      }
+      if (this.radio === '智能算法' && !this.submitFrom.apiMethodType) {
+        this.notFilled.push('接口请求方式')
+      }
+      if (this.radio === '智能算法' && (!this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0].attrValue)) {
+        this.notFilled.push('算法类别')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0].attrValue) {
+        this.notFilled.push('应用领域')
+      }
+      if (this.radio === '图层服务' && (!this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0].attrValue)) {
+        this.notFilled.push('服务地址')
+      }
+      if ((this.radio === '业务组件' || this.radio === '开发组件') && (!this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0].attrValue)) {
+        this.notFilled.push('组件地址')
+      }
+      console.log(this.submitFrom, this.notFilled, '表单验证')
+      if (this.notFilled.length > 0) {
+        this.$message({
+          message: '请填写必填字段！',
+          type: 'warning'
         })
-        console.log('编辑===============>', this.submitFrom)
-        console.log(this.submitFrom.infoList, '===============abc')
-        // 去重
-        const newArr = this.submitFrom.infoList.filter(
-          (element, index, self) => {
-            return (
-              self.findIndex((x) => x.attrType === element.attrType) === index
-            )
-          }
-        )
-        this.submitFrom.infoList = newArr
-        console.log(
-          this.submitFrom.infoList,
-          '====================================wpwpwp'
-        )
-        this.$http
-          .put('/resource/update', this.submitFrom)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              this.$message.error('修改失败!')
-            } else {
-              this.$message.success('修改成功！')
-              this.clear()
-            }
-          })
-          .catch(() => {})
       } else {
-        this.$http
-          .post('/resource/insert?source= b', this.submitFrom)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              this.$message.error('上架失败!')
-            } else {
-              this.$message.success('上架成功！')
-              this.clear()
+        if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+          this.submitFrom.infoList.map((val) => {
+            if (val.attrType === '组件类型') {
+              val.attrValue = this.radio
             }
           })
-          .catch(() => {})
+          console.log('编辑===============>', this.submitFrom)
+          console.log(this.submitFrom.infoList, '===============abc')
+          // 去重
+          const newArr = this.submitFrom.infoList.filter(
+            (element, index, self) => {
+              return (
+                self.findIndex((x) => x.attrType === element.attrType) === index
+              )
+            }
+          )
+          this.submitFrom.infoList = newArr
+          this.$http
+            .put('/resource/update', this.submitFrom)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error('修改失败!')
+              } else {
+                this.$message.success('修改成功！')
+                this.clear()
+              }
+            })
+            .catch(() => {})
+        } else {
+          console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
+          this.$http
+            .post('/resource/insert?source= b', this.submitFrom)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error('上架失败!')
+              } else {
+                this.$message.success('上架成功！')
+                this.clear()
+              }
+            })
+            .catch(() => {})
+        }
       }
     },
     // 新修改
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 37adceac..008dea90 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -61,22 +61,65 @@
           width="50"
         ></el-table-column>
         <el-table-column
+          :show-overflow-tooltip="true"
+          width="280"
           prop="name"
           label="应用名称"
           header-align="center"
           align="center"
         ></el-table-column>
-        <template v-if="dataList[0] && dataList[0].infoList">
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="description"
+          label="应用描述"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptName"
+          label="归属部门"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptContacts"
+          label="部门联系人"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptPhone"
+          label="部门联系人电话"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="shareCondition"
+          label="共享条件"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <template v-if="dataList[0] && dataList[0].infoList2">
           <el-table-column
-            v-for="(item, index) in dataList[0].infoList"
+            v-for="(item, index) in dataList[0].infoList2"
             :key="index"
             :label="item.attrType"
             header-align="center"
             align="center"
             :show-overflow-tooltip="true"
+            width="280"
           >
             <template slot-scope="scope">
-              {{ findValue(scope.row.infoList, item.attrType) }}
+              {{ findValue(scope.row.infoList2, item.attrType) }}
             </template>
           </el-table-column>
         </template>
@@ -85,8 +128,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="94"
-          right="0"
+          width="300"
         >
           <template slot-scope="scope">
             <el-button
@@ -169,7 +211,7 @@
       :destroy-on-close='true'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
+      <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>
@@ -191,6 +233,8 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用状态', '应用类型'],
+      notFilled: [],
       mixinViewModuleOptions: {
         getDataListURL: '/resource/page',
         getDataListIsPage: true,
@@ -282,6 +326,17 @@ export default {
             this.mixinViewModuleOptions.requestCallback(res.data)
           }
           this.dataListLoading = false
+          this.dataList.map((item, index) => {
+            const dataListSinforList = []
+            item.infoList.map((itemson, indexson) => {
+              if (
+                itemson.attrType === '应用领域'
+              ) {
+                dataListSinforList.push(itemson)
+              }
+            })
+            this.dataList[index].infoList2 = dataListSinforList
+          })
         })
         .catch(() => {
           this.dataListLoading = false
@@ -347,6 +402,17 @@ export default {
                 this.mixinViewModuleOptions.requestCallback(res.data)
               }
               this.dataListLoading = false
+              this.dataList.map((item, index) => {
+                const dataListSinforList = []
+                item.infoList.map((itemson, indexson) => {
+                  if (
+                    itemson.attrType === '应用领域'
+                  ) {
+                    dataListSinforList.push(itemson)
+                  }
+                })
+                this.dataList[index].infoList2 = dataListSinforList
+              })
             } else {
               this.$message.error('未查询到相关信息')
               this.reset()
@@ -485,6 +551,7 @@ export default {
     },
     // 新上架
     clear () {
+      this.notFilled = []
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
       this.putOnTheShelfList = []
@@ -517,7 +584,6 @@ export default {
       this.submitFrom.infoList.push(obj)
     },
     submitData () {
-      this.showPutOnTheShelfFlag2 = false
       const arr = []
       this.putOnTheShelfList.map(item => {
         item.children.map(child => {
@@ -537,7 +603,7 @@ export default {
               if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
                 this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
               }
-              if (val.note1) {
+              if (val.note1 || val.note1) {
                 switch (val.name) {
                   case '算法名称':
                   case '应用名称':
@@ -603,37 +669,74 @@ export default {
         })
       })
       this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
-      if (this.submitFrom.id) {
-        // 解决编辑无组件类型
-        this.submitFrom.infoList.map(val => {
-          if (val.attrType === '组件类型') {
-            val.attrValue = this.radio
-          }
+      this.notFilled = []
+      console.log(this.submitFrom, '表单验证')
+      if (!this.submitFrom.name) {
+        this.notFilled.push('应用名称')
+      }
+      if (!this.submitFrom.description) {
+        this.notFilled.push('应用描述')
+      }
+      if (!this.submitFrom.shareCondition) {
+        this.notFilled.push('共享条件')
+      }
+      if (!this.submitFrom.deptContacts) {
+        this.notFilled.push('部门联系人')
+      }
+      if (!this.submitFrom.deptPhone) {
+        this.notFilled.push('部门联系人电话')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0].attrValue) {
+        this.notFilled.push('应用领域')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
+        this.notFilled.push('应用状态')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0].attrValue) {
+        this.notFilled.push('应用类型')
+      }
+      if (this.notFilled.length > 0) {
+        this.$message({
+          message: '请填写必填字段！',
+          type: 'warning'
         })
-        console.log('编辑===============>', this.submitFrom)
-        this.$http
-          .put('/resource/update', this.submitFrom)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              this.$message.error('修改失败!')
-            } else {
-              this.$message.success('修改成功！')
-              this.clear()
-            }
-          })
-          .catch(() => {})
       } else {
-        this.$http
-          .post('/resource/insert?source= b', this.submitFrom)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              this.$message.error('上架失败!')
-            } else {
-              this.$message.success('上架成功！')
-              this.clear()
+        if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+          this.submitFrom.infoList.map(val => {
+            if (val.attrType === '组件类型') {
+              val.attrValue = this.radio
             }
           })
-          .catch(() => {})
+          console.log('编辑===============>', this.submitFrom)
+          this.$http
+            .put('/resource/update', this.submitFrom)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error('修改失败!')
+                this.showPutOnTheShelfFlag2 = false
+              } else {
+                this.$message.success('修改成功！')
+                this.showPutOnTheShelfFlag2 = false
+                this.clear()
+              }
+            })
+            .catch(() => {})
+        } else {
+          this.$http
+            .post('/resource/insert?source= b', this.submitFrom)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error('上架失败!')
+                this.showPutOnTheShelfFlag2 = false
+              } else {
+                this.$message.success('上架成功！')
+                this.showPutOnTheShelfFlag2 = false
+                this.clear()
+              }
+            })
+            .catch(() => {})
+        }
       }
     },
     // 新修改
diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 6b3f8901..9837ee1a 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -4,7 +4,7 @@
     <div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div>
     <div class="basic-information">
       <div class="basic-information-title">
-        <span></span><span>基本信息</span>
+        <span></span><span>基本1111信息</span>
       </div>
       <div class="basic-information-content">
         <p>
@@ -98,7 +98,7 @@
         </div>
       </div>
     </div>
-    <div class="agreeOr" v-if="this.dataForm.taskId">
+    <div class="agreeOr" v-if="taskId">
       <div>
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
           <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
@@ -136,6 +136,7 @@
 
 <script>
 // 引入工作流公共方法
+import bus from '@/views/bus.js'
 import processModule from '@/mixins/process-module'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 import debounce from 'lodash/debounce'
@@ -154,6 +155,7 @@ export default {
       dataForm: [],
       deptName: '',
       dataList: {},
+      taskId: '',
       datalistrighttablelist: [
         '赋能应用名称',
         '应用归属部门',
@@ -242,6 +244,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('AbilityResourcesRemovedInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -271,6 +274,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('AbilityResourcesRemovedInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -324,6 +328,7 @@ export default {
     taskHandleErrorCallback (data) {}
   },
   created () {
+    this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
     this.init()
   },
diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
index 39410b15..a7a8a9fe 100644
--- a/back/src/views/modules/myAgent/AbilityResourceShelf.vue
+++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:45:35
  * @Description: "能力资源上架"
 -->
 <template>
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -165,6 +166,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('abilityResourceShelfInit')
+    bus.$on('abilityResourceShelfInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>
diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
index 1a1154ed..91a1826c 100644
--- a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:48:46
  * @Description: "能力资源下架"
 -->
 <template>
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -165,6 +166,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('AbilityResourcesRemovedInit')
+    bus.$on('AbilityResourcesRemovedInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index ceae9900..cde3984b 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: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:39:01
  * @Description: 能力申请
 -->
 <template>
@@ -118,6 +118,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -155,6 +156,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('competencyApplicationInit')
+    bus.$on('competencyApplicationInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 13153689..b7ce4506 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -83,6 +83,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
@@ -214,6 +215,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('abilityResourceShelfInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -244,6 +246,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('abilityResourceShelfInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index cf5cc2c3..2461154f 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:41:09
+ * @LastEditTime: 2022-07-25 09:42:46
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -29,16 +29,18 @@
               {{ dataForm.content.title || '--' }}</span
             ></span
           >
-          <span class="text"
+          <span class="text" v-if="dataForm.content.applicationSystem"
             >应用系统：<span>{{
               dataForm.content.applicationSystem || '--'
             }}</span></span
           >
-          <span class="text"
+          <span class="text" ></span>
+        </p>
+        <p>
+          <span v-if="dataForm.content.applicationSceneStr"
             >应用场景：<span>
               {{ dataForm.content.applicationSceneStr || '--' }}</span
-            ></span
-          >
+            ></span>
         </p>
         <p>
           <span>
@@ -131,6 +133,7 @@ import processModule from '@/mixins/process-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
+import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -386,6 +389,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('competencyApplicationInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -415,6 +419,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('competencyApplicationInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 4f1b9def..955f18f6 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -16,12 +16,13 @@ js:
 <template>
     <div id="inputSelectCheckbox">
       <!-- input框 -->
-      <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
+      <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" @change="changeIiem(name,data.note1)"/>
       <!-- 下拉框 -->
        <el-select
         v-else-if="(type === 'select' && name !== '归属部门' && name !== '使用方式') || type == 'radio'"
         style="width: 240px"
          v-model:value="data.note1"
+         @change="changeIiem(name,data.note1)"
         :placeholder="'请选择' + name">
         <el-option
           :value="itemSelect.dictLabel"
@@ -36,6 +37,7 @@ js:
          v-model:value="data.note1"
         filterable
         placeholder="请输入关键词"
+         @change="changeIiem(name,data.note1)"
         :loading="loading">
         <el-option
           v-for="(itemSelect) in options"
@@ -73,12 +75,13 @@ js:
         v-model="value"
         :placeholder="'请输入' + name"
         :disabled="true"
+         @change="changeIiem(name,data.note1)"
       />
       <!-- 单选 -->
        <!-- <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'"  v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
+    <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
     </div>
 </template>
 <script>
@@ -92,6 +95,7 @@ export default {
     data: Array,
     name: String,
     value: String,
+    changeField: Array,
     options: {
       type: Array,
       default: null
@@ -108,6 +112,15 @@ export default {
     }
   },
   methods: {
+    changeIiem (name, value) {
+      if (value && value !== '' && this.changeField.indexOf(name) == -1) {
+        this.changeField.push(name)
+      } else if (!value || value == '') {
+        if (this.changeField.indexOf(name) > -1) {
+          this.changeField.splice(this.changeField.indexOf(name), 1)
+        }
+      }
+    },
     selectOptions () {
       if (this.data.isLinkToDic === 'true' && this.data.linkValue) {
         this.$http
@@ -140,7 +153,7 @@ export default {
         //     dataList.push(element)
         //   })
         // this.options = dataList
-        if (!this.data.note1) {
+        if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
             console.log(res.data)
             this.data.note1 = res.data.realName || ''
@@ -154,7 +167,7 @@ export default {
         //     dataList.push(element)
         //   })
         //   this.options = dataList
-        if (!this.data.note1) {
+        if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
             console.log(res.data)
             this.data.note1 = res.data.mobile || ''
@@ -172,6 +185,13 @@ export default {
         }
       })
       this.data.note1 = str
+      if (str !== '' && this.changeField.indexOf('应用领域') == -1) {
+        this.changeField.push('应用领域')
+      } else if (str == '') {
+        if (this.changeField.indexOf('应用领域') > -1) {
+          this.changeField.splice(this.changeField.indexOf('应用领域'), 1)
+        }
+      }
     },
     showTypeClick (e) {
       this.showType = e
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 5fbac752..e6806199 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 16:18:00
+ * @LastEditTime: 2022-07-25 11:20:25
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -33,7 +33,7 @@
               </div>
             </div>
           </div>
-          <div class="add">添加更多{{ configure.name }}</div>
+          <!-- <div class="add">添加更多{{ configure.name }}</div> -->
           <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
             <span>{{ val.name }}</span>
             <a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
@@ -42,7 +42,7 @@
               <a-input
                 v-model:value="val.note1"
                 :placeholder="'请填写' + val.name"
-                style="width: calc(100% - 150px);"
+                style="width: 570px;"
               />
               <span style="width: 2.5rem; padding-left: 0.1rem">
                 {{
@@ -93,7 +93,8 @@ export default {
     }
   },
   methods: {
-    add (title) {
+    add (title, addFlag, submitFlag) {
+      console.log(title, addFlag, submitFlag)
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
@@ -142,10 +143,23 @@ export default {
         })
         list.forEach((item) => {
           item.note1 = ''
+          this.showKey++
         })
-        this.showKey++
+        if (addFlag && submitFlag) {
+          this.$emit('submitData')
+        }
       } else {
-        this.$message.warning('请填写完整')
+        if (!addFlag) {
+          this.$message.warning('请填写完整')
+        } else {
+          list.forEach((item) => {
+            item.note1 = ''
+            this.showKey++
+          })
+          if (submitFlag) {
+            this.$emit('submitData')
+          }
+        }
       }
     },
     del (title, index) {
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index daeda7c2..3467060c 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 15:11:10
+ * @LastEditTime: 2022-07-25 15:57:25
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -21,7 +21,11 @@
                 (showTypeName == 'SDK' && item.name == '接口请求方式') ||
                 (showTypeName == 'SDK' && item.name == '服务接口')
             )">
-              <span >{{ item.name }}</span>
+              <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"
@@ -34,17 +38,20 @@
                 tip="支持视频类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
                 tip="支持.zip类型，大小不超过100M"></upload>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :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 :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :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 == '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>
+              </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 :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
+            <special @submitData="submitData" ref="specialRef" :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
           </template>
         </div>
       </div>
@@ -64,10 +71,13 @@ export default {
   props: {
     type: String,
     putOnTheShelfList: Array,
-    typeInput: String
+    typeInput: String,
+    required: Array,
+    notFilled: Array
   },
   data () {
     return {
+      changeField: [],
       judgmentType: [
         {
           name: '算法优势',
@@ -182,6 +192,21 @@ export default {
     this.defaultContent()
   },
   methods: {
+    // 提交
+    submit (arr) {
+      console.log('提交', arr.length, this.$refs.specialRef)
+      arr.map((val, index) => {
+        if (index === arr.length - 1) {
+          this.$refs.specialRef[index].add(val, true, true)
+        } else {
+          this.$refs.specialRef[index].add(val, true, false)
+        }
+      })
+    },
+    submitData () {
+      // console.log('触发提交')
+      this.$emit('submitData')
+    },
     changeInfoList (obj) {
       this.$emit('changeInfoList', obj)
     },
@@ -241,11 +266,27 @@ export default {
   }
 }
 .item {
-  display: flex;
-  align-items: center;
-  margin: 25px 0;
-  & > span:nth-of-type(1) {
-    width: 105px;
+  position: relative;
+  .box{
+    display: flex;
+    align-items: center;
+    margin: 25px 0;
+    & > div:nth-of-type(1) {
+      width: 105px;
+      display: flex;
+      align-items: center;
+    }
+    .required{
+      color: #f56c6c;
+      margin-right: 3px;
+    }
+  }
+  .requiredTips{
+    font-size: 14px;
+    color: #f56c6c;
+    position: absolute;
+    bottom:-20px;
+    left:110px;
   }
 }
 </style>
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 f40c5dcf..a8645c48 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -15,21 +15,19 @@
             <div v-for="(item, i) in dataInfo.list" :key="i">
                 <!-- 待办 -->
                 <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')"
+                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                     placement="top">
                     <div class="list-item ellipsis">
                         <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
-                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
+                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                     </div>
                 </el-tooltip>
                 <!-- 已办 -->
                 <el-tooltip effect="dark" v-else
-                    :content="`${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : ''}`"
+                    :content="(item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                     placement="top">
                     <div class="list-item ellipsis">
-                        {{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) :
-                                ''}`
-                        }}
+                        {{ (item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                     </div>
                 </el-tooltip>
             </div>
diff --git a/front/.eslintrc.js b/front/.eslintrc.js
index 81701c75..bdbc18cb 100644
--- a/front/.eslintrc.js
+++ b/front/.eslintrc.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:31:29
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-15 16:33:55
+ * @Description: 告诉大家这是什么
+ */
 module.exports = {
   root: true,
   env: {
@@ -15,6 +22,7 @@ module.exports = {
   ignorePatterns: [
     'src/supermap',
     'src/views/home/videoSurveillance',
+    'src/views/vab/*',
     'src/utils/coordinateSystemTransform.js',
   ],
 }
diff --git a/front/package.json b/front/package.json
index a3efb530..592ac777 100644
--- a/front/package.json
+++ b/front/package.json
@@ -5,7 +5,9 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
+    "lint": "eslint --ext .js --ext .jsx --ext .vue src/",
+    "lint:fix": "eslint --fix --ext .js,.vue .",
+    "fix": "eslint src/**/*.*  --fix",
     "clear": "rimraf node_modules&&npm install --registry=https://registry.npm.taobao.org",
     "use:npm": "nrm use npm",
     "use:taobao": "nrm use taobao",
@@ -48,25 +50,25 @@
   },
   "devDependencies": {
     "@turf/turf": "^6.5.0",
-    "@vue/cli-plugin-babel": "^4.5.9",
-    "@vue/cli-plugin-eslint": "^4.5.9",
+    "@vue/cli-plugin-babel": "^4.5.15",
+    "@vue/cli-plugin-eslint": "^4.5.15",
     "@vue/cli-service": "^4.5.9",
     "@vue/compiler-sfc": "^3.1.4",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "babel-eslint": "^11.0.0-beta.2",
-    "body-parser": "^1.19.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "babel-eslint": "^10.1.0",
+    "body-parser": "^1.20.0",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.2",
     "crypto-js": "^4.1.1",
-    "eslint": "^7.30.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.13.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-vue": "^9.1.1",
     "filemanager-webpack-plugin": "^6.1.4",
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.7.1",
     "stylelint": "^13.13.1",
-    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recess-order": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
diff --git a/front/public/index.html b/front/public/index.html
index 116baf3d..624b3039 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 15:09:22
+ * @LastEditTime: 2022-07-22 18:42:44
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -40,9 +40,16 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';
 
+    // 测试环境
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.243:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.243:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.243:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
+    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 西海岸版本
     // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';基础设施
+    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
@@ -52,6 +59,11 @@
     window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
+    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js
index 03fac901..8c72303b 100644
--- a/front/src/api/capabilityCloud.js
+++ b/front/src/api/capabilityCloud.js
@@ -83,14 +83,22 @@ export function dataResourceInfo(params) {
 //能力云图-调用趋势
 export function callTheTrendPort(start, end, params) {
   return request({
-    url: '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' + start + '&end=' + end + '&step=' + params,
+    url:
+      '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' +
+      start +
+      '&end=' +
+      end +
+      '&step=' +
+      params,
     method: 'get',
   })
 }
 //能力云图-调用次数
 export function totalCallsSnum(params) {
   return request({
-    url: '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' + params,
+    url:
+      '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' +
+      params,
     method: 'get',
   })
 }
diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js
index ee70f8b7..204825b6 100644
--- a/front/src/config/default/setting.config.js
+++ b/front/src/config/default/setting.config.js
@@ -50,7 +50,14 @@ const setting = {
   //路由模式，可选值为 history 或 hash
   routerMode: 'hash',
   //不经过token校验的路由
-  routesWhiteList: ['/login', '/register', '/callback', '/404', '/403', '/capabilityCloud'], // 新增统计云图白名单
+  routesWhiteList: [
+    '/login',
+    '/register',
+    '/callback',
+    '/404',
+    '/403',
+    '/capabilityCloud',
+  ], // 新增统计云图白名单
   //加载时显示文字
   loadingText: '正在加载中...',
   //token名称
diff --git a/front/src/main.js b/front/src/main.js
index 0a6b791a..be02ff2a 100644
--- a/front/src/main.js
+++ b/front/src/main.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-21 18:39:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-22 16:03:23
  * @Description: 告诉大家这是什么
  */
 import { createApp } from 'vue'
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index f3b183ff..bb545609 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -2,182 +2,182 @@
  * @author chuzhixin 1204505056@qq.com
  * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
  */
- import { getUserInfo, login, logout } from '@/api/user'
- import {
-   getAccessToken,
-   removeAccessToken,
-   setAccessToken,
- } from '@/utils/accessToken'
- import { title, tokenName } from '@/config'
- import { message, notification } from 'ant-design-vue'
+import { getUserInfo, login, logout } from '@/api/user'
+import {
+  getAccessToken,
+  removeAccessToken,
+  setAccessToken,
+} from '@/utils/accessToken'
+import { title, tokenName } from '@/config'
+import { message, notification } from 'ant-design-vue'
 
- const state = () => ({
-   accessToken: getAccessToken(),
-   username: '',
-   userId: '',
-   avatar: '',
-   role: 0, // 用户管理员权限
- })
- const getters = {
-   accessToken: (state) => state.accessToken,
-   username: (state) => state.username,
-   avatar: (state) => state.avatar,
-   role: (state) => state.role,
-   userId: (state) => state.userId,
- }
- const mutations = {
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 设置accessToken
-    * @param {*} state
-    * @param {*} accessToken
-    */
-   setAccessToken(state, accessToken) {
-     state.accessToken = accessToken
-     setAccessToken(accessToken)
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 设置用户名
-    * @param {*} state
-    * @param {*} username
-    */
-   setUsername(state, username) {
-     state.username = username
-   },
-   // 设置角色
-   setRole(state, role) {
-     state.role = role
-   },
-   // 设置用户userId
-   setUserId(state, id) {
-     state.userId = id
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 设置头像
-    * @param {*} state
-    * @param {*} avatar
-    */
-   setAvatar(state, avatar) {
-     state.avatar = avatar
-   },
- }
- const actions = {
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 登录拦截放行时，设置虚拟角色
-    * @param {*} { commit, dispatch }
-    */
-   setVirtualRoles({ commit, dispatch }) {
-     dispatch('acl/setFull', true, {
-       root: true,
-     })
-     commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
-     commit('setUsername', 'admin(未开启登录拦截)')
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 登录
-    * @param {*} { commit }
-    * @param {*} userInfo
-    */
-   async login({ commit }, userInfo) {
-     const { data } = await login(userInfo)
-     // debugger
-     const accessToken = data.data[tokenName]
-     if (accessToken) {
-       commit('setAccessToken', accessToken)
-       const hour = new Date().getHours()
-       const thisTime =
-         hour < 8
-           ? '早上好'
-           : hour <= 11
-           ? '上午好'
-           : hour <= 13
-           ? '中午好'
-           : hour < 18
-           ? '下午好'
-           : '晚上好'
-       notification.open({
-         message: `欢迎登录${title}`,
-         description: `${thisTime}！`,
-       })
-     } else {
-       message.error(`登录接口异常，未正确返回${tokenName}...`)
-     }
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
-    * @param {*} { commit, dispatch, state }
-    * @returns
-    */
-   async getUserInfo({ commit }) {
-     const { data } = await getUserInfo()
-     if (!data) {
-       message.error(`验证失败，请重新登录...`)
-       return false
-     }
-     // debugger
-     commit('setUsername', data.data.realName)
-     commit('setRole', data.data.roleIdList.length)
-     commit('setUserId', data.data.id)
-     // TODO 获取用户信息，后续执行部分操作
-     // let { username, avatar, roles, ability } = data
-     // if (username && roles && Array.isArray(roles)) {
-     //   dispatch('acl/setRole', roles, {
-     //     root: true,
-     //   })
-     //   if (ability && ability.length > 0)
-     //     dispatch('acl/setAbility', ability, {
-     //       root: true,
-     //     })
-     //   commit('setUsername', username)
-     //   commit('setAvatar', avatar)
-     // } else {
-     //   message.error('用户信息接口异常')
-     // }
-   },
+const state = () => ({
+  accessToken: getAccessToken(),
+  username: '',
+  userId: '',
+  avatar: '',
+  role: 0, // 用户管理员权限
+})
+const getters = {
+  accessToken: (state) => state.accessToken,
+  username: (state) => state.username,
+  avatar: (state) => state.avatar,
+  role: (state) => state.role,
+  userId: (state) => state.userId,
+}
+const mutations = {
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 设置accessToken
+   * @param {*} state
+   * @param {*} accessToken
+   */
+  setAccessToken(state, accessToken) {
+    state.accessToken = accessToken
+    setAccessToken(accessToken)
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 设置用户名
+   * @param {*} state
+   * @param {*} username
+   */
+  setUsername(state, username) {
+    state.username = username
+  },
+  // 设置角色
+  setRole(state, role) {
+    state.role = role
+  },
+  // 设置用户userId
+  setUserId(state, id) {
+    state.userId = id
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 设置头像
+   * @param {*} state
+   * @param {*} avatar
+   */
+  setAvatar(state, avatar) {
+    state.avatar = avatar
+  },
+}
+const actions = {
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 登录拦截放行时，设置虚拟角色
+   * @param {*} { commit, dispatch }
+   */
+  setVirtualRoles({ commit, dispatch }) {
+    dispatch('acl/setFull', true, {
+      root: true,
+    })
+    commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
+    commit('setUsername', 'admin(未开启登录拦截)')
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 登录
+   * @param {*} { commit }
+   * @param {*} userInfo
+   */
+  async login({ commit }, userInfo) {
+    const { data } = await login(userInfo)
+    // debugger
+    const accessToken = data.data[tokenName]
+    if (accessToken) {
+      commit('setAccessToken', accessToken)
+      const hour = new Date().getHours()
+      const thisTime =
+        hour < 8
+          ? '早上好'
+          : hour <= 11
+          ? '上午好'
+          : hour <= 13
+          ? '中午好'
+          : hour < 18
+          ? '下午好'
+          : '晚上好'
+      notification.open({
+        message: `欢迎登录${title}`,
+        description: `${thisTime}！`,
+      })
+    } else {
+      message.error(`登录接口异常，未正确返回${tokenName}...`)
+    }
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 获取用户信息接口 这个接口非常非常重要，如果没有明确底层前逻辑禁止修改此方法，错误的修改可能造成整个框架无法正常使用
+   * @param {*} { commit, dispatch, state }
+   * @returns
+   */
+  async getUserInfo({ commit }) {
+    const { data } = await getUserInfo()
+    if (!data) {
+      message.error(`验证失败，请重新登录...`)
+      return false
+    }
+    // debugger
+    commit('setUsername', data.data.realName)
+    commit('setRole', data.data.roleIdList.length)
+    commit('setUserId', data.data.id)
+    // TODO 获取用户信息，后续执行部分操作
+    // let { username, avatar, roles, ability } = data
+    // if (username && roles && Array.isArray(roles)) {
+    //   dispatch('acl/setRole', roles, {
+    //     root: true,
+    //   })
+    //   if (ability && ability.length > 0)
+    //     dispatch('acl/setAbility', ability, {
+    //       root: true,
+    //     })
+    //   commit('setUsername', username)
+    //   commit('setAvatar', avatar)
+    // } else {
+    //   message.error('用户信息接口异常')
+    // }
+  },
 
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 退出登录
-    * @param {*} { dispatch }
-    */
-   async logout({ dispatch }) {
-     await logout(state.accessToken)
-     await dispatch('resetAll')
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 重置accessToken、roles、ability、router等
-    * @param {*} { commit, dispatch }
-    */
-   async resetAll({ dispatch }) {
-     await dispatch('setAccessToken', '')
-     await dispatch('acl/setFull', false, {
-       root: true,
-     })
-     await dispatch('acl/setRole', [], {
-       root: true,
-     })
-     await dispatch('acl/setAbility', [], {
-       root: true,
-     })
-     removeAccessToken()
-   },
-   /**
-    * @author chuzhixin 1204505056@qq.com
-    * @description 设置token
-    */
-   setAccessToken({ commit }, accessToken) {
-     commit('setAccessToken', accessToken)
-   },
- }
- export default {
-   state,
-   getters,
-   mutations,
-   actions,
- }
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 退出登录
+   * @param {*} { dispatch }
+   */
+  async logout({ dispatch }) {
+    await logout(state.accessToken)
+    await dispatch('resetAll')
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 重置accessToken、roles、ability、router等
+   * @param {*} { commit, dispatch }
+   */
+  async resetAll({ dispatch }) {
+    await dispatch('setAccessToken', '')
+    await dispatch('acl/setFull', false, {
+      root: true,
+    })
+    await dispatch('acl/setRole', [], {
+      root: true,
+    })
+    await dispatch('acl/setAbility', [], {
+      root: true,
+    })
+    removeAccessToken()
+  },
+  /**
+   * @author chuzhixin 1204505056@qq.com
+   * @description 设置token
+   */
+  setAccessToken({ commit }, accessToken) {
+    commit('setAccessToken', accessToken)
+  },
+}
+export default {
+  state,
+  getters,
+  mutations,
+  actions,
+}
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 533020c2..8c28c563 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -35,7 +35,7 @@ const handleCode = (code, msg, res) => {
       message.error(msg || '接口异常')
       break
     case 302:
-      window.location.href = redirect
+      // window.location.href = redirect
       break
   }
 }
@@ -70,7 +70,7 @@ instance.interceptors.request.use(
     if (debounce.some((item) => config.url.includes(item))) {
       //这里写加载动画
     }
-    if (!config.headers.REQUESTURI){
+    if (!config.headers.REQUESTURI) {
       config.headers.REQUESTURI = window.location.href
     }
 
@@ -92,13 +92,13 @@ instance.interceptors.response.use(
     console.log('接口返回REDIRECT', response.headers.redirect)
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
-    
+
     if (response.headers.token) {
       setAccessToken(response.headers.token)
-    } 
+    }
     if (response.headers.redirect) {
       window.location.replace(response.headers.redirect)
-        return
+      return
     }
     if (response.headers.redirect === '/#/login') {
       var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 38f98cdf..e7535f15 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 11:25:28
+ * @LastEditTime: 2022-07-18 18:45:20
  * @Description: 告诉大家这是什么
  */
 /**
diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue
index 97f3dfa6..0a2f1052 100644
--- a/front/src/views/assignCase/components/queryPage.vue
+++ b/front/src/views/assignCase/components/queryPage.vue
@@ -53,10 +53,7 @@
               v-for="(item, index) in contenBox"
               :key="index"
             >
-              <img
-                :src="item.note1"
-                alt=""
-              />
+              <img :src="item.note1" alt="" />
               <h3>{{ item.name }}</h3>
               <p>
                 发布时间
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 0469ef71..0325fb57 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:25
+ * @LastEditTime: 2022-07-25 17:30:32
  * @Description: 应用上架
 -->
 <template>
@@ -35,6 +35,7 @@
           '归属部门',
           '部门联系人',
           '部门联系人电话',
+          '共享条件',
         ]"
       ></put-on-the-shelf>
       <put-on-the-shelf
@@ -60,7 +61,7 @@
         v-else-if="showView === '部署与应用'"
         :refData="refData"
         :dataFrom="dataFrom"
-        :externalField="['共享条件', '共享类型']"
+        :externalField="['共享类型']"
         :configure="bs"
         @submit="submit()"
         @back="back()"
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 63898e7d..8f02f725 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -466,6 +466,7 @@
   import upload from '@/views/components/upload'
   import { message } from 'ant-design-vue'
   import { getUserInfo, getDeptAll } from '@/api/user'
+  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo.vue'
   import {
     getCategoryTreePage,
     queryApplicationRelByResourceId,
diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue
index 8d803656..618d2cee 100644
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-30 17:06:56
+ * @LastEditTime: 2022-07-18 18:49:30
  * @Description: 算法详情页
 -->
 <template>
diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index e7b95446..8e68c6c5 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 13:55:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-22 18:43:37
  * @Description: 应用详情页
 -->
 <template>
@@ -87,16 +87,16 @@
   import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
   import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
   import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
+  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem.vue'
   import ApplicationAbilityTrial from '@/views/detailsAll/components/Application/ApplicationAbilityTrial.vue'
-  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
   import {
     updateVisits,
     selectOne,
     queryPartAppByKeyId,
     browsingInsert,
   } from '@/api/home'
+  import { useRouter } from 'vue-router'
   import mybus from '@/myplugins/mybus'
   const associatedComponents = ref([{ type: '组件服务', dataList: [] }])
   let loading = ref(true)
diff --git a/front/src/views/detailsAll/BusinessDetails.vue b/front/src/views/detailsAll/BusinessDetails.vue
index 51e60e98..d9f9a1cb 100644
--- a/front/src/views/detailsAll/BusinessDetails.vue
+++ b/front/src/views/detailsAll/BusinessDetails.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.gaoyuanwei
  * @Date: 2022-06-20 10:12:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:58:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:49:01
  * @Description: 业务组件详情页
 -->
 <template>
diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue
index 6b0fef8e..41afdee0 100644
--- a/front/src/views/detailsAll/DeveloperComponents.vue
+++ b/front/src/views/detailsAll/DeveloperComponents.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:59:01
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:48:53
  * @Description: 开发组件详情页
 -->
 <template>
diff --git a/front/src/views/detailsAll/LayerService.vue b/front/src/views/detailsAll/LayerService.vue
index 2a0f6708..14deaf44 100644
--- a/front/src/views/detailsAll/LayerService.vue
+++ b/front/src/views/detailsAll/LayerService.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:59:01
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:48:32
  * @Description: 图层服务详情页
 -->
 <template>
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
index da60117d..530234ad 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             word-break: break-all;
             -webkit-box-orient: vertical;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
index e114c8fa..d5457892 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
@@ -38,7 +38,9 @@
     () => props.dataList,
     (val) => {
       if (val) {
-        let obj = val.infoList.filter((item) => item.attrType === '试用地址' && item.attrValue)[0]
+        let obj = val.infoList.filter(
+          (item) => item.attrType === '试用地址' && item.attrValue
+        )[0]
         if (!obj) {
           flag.value = false
         } else {
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 3a1dc63b..588af45f 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -87,16 +87,25 @@
   const deploymentLocation = ref('') //部署位置
   //加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
-    sgcInsert({
-      delFlag: '0',
-      resourceId: props.dataList.id,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
+      console.log('加入申购车==================>', props.dataList)
+      sgcInsert({
+        delFlag: '0',
+        resourceId: props.dataList.id,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   //立即申请
   function toView() {
diff --git a/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue b/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
index ee1d8057..8110e34e 100644
--- a/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
+++ b/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
@@ -73,7 +73,7 @@
 </template>
 <script setup>
   import { ref, onMounted } from 'vue'
-  import { paddleocr,algo } from '@/api/file'
+  import { algo } from '@/api/file'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   const router = useRouter()
@@ -85,10 +85,12 @@
   const imageResult1 = ref('')
   const menuOpenKeys2 = ref(['全文还原'])
   // 图片初始化
-  let responseUrl = ref('static/image/' + router.currentRoute.value.query.exampleImg)
+  let responseUrl = ref(
+    'static/image/' + router.currentRoute.value.query.exampleImg
+  )
   const imgType = router.currentRoute.value.query.exampleImg.split('.')[1]
   const handleChange = (info) => {
-    debugger;
+    debugger
     if (info.file.status !== 'uploading') {
       console.log(info.file, info.fileList)
     }
@@ -111,7 +113,7 @@
         company: router.currentRoute.value.query.company,
         algorithmName: router.currentRoute.value.query.algorithmName,
         data: base64.split('base64,')[1],
-        type: router.currentRoute.value.query.type
+        type: router.currentRoute.value.query.type,
       }
       algo(param).then((res) => {
         // wordValue.value = res.data
diff --git a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
index aaab686f..ff40a564 100644
--- a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
+++ b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
@@ -43,7 +43,7 @@
 </template>
 <script setup>
   import { ref } from 'vue'
-  import { correct,algo } from '@/api/file'
+  import { algo } from '@/api/file'
   import { useRouter } from 'vue-router'
   const router = useRouter()
   // const keyId = router.currentRoute.value.query.id
@@ -58,7 +58,7 @@
       company: router.currentRoute.value.query.company,
       algorithmName: router.currentRoute.value.query.algorithmName,
       data: wordValue.value,
-      type: router.currentRoute.value.query.type
+      type: router.currentRoute.value.query.type,
     }
     // correct(param).then((res) => {
     //   // wordContent.value = res.data.data
@@ -72,7 +72,7 @@
     //     errorWordContent.value = val.value
     //   })
     // })
-    algo(param).then(res=>{
+    algo(param).then((res) => {
       errorWord.value = res.data.data.text_data
     })
   }
diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
index 0de7ad16..df6cd215 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
@@ -6,7 +6,7 @@
  * @Description: 应用详情
 -->
 <template>
-  <div class="algorithm-on-trial" v-if="flag && whoShow1.itShowQingDao">
+  <div class="algorithm-on-trial" v-if="flag">
     <detals-title title="应用详情" type="PROBATION"></detals-title>
     <div class="main">
       <div class="main-left">
@@ -60,13 +60,13 @@
     password2: '',
   })
   if (props.dataList.infoList) {
-    let obj = props.dataList.applyState
-    if (obj !== '通过') {
+    let obj = props.dataList.approveStatus
+    if (obj !== '通过' && whoShow1.value.itShowQingDao) {
       flag.value = false
     } else {
       dataFrom.value.link = props.dataList.link
       props.dataList.infoList.map((item) => {
-        if (item.attrType == '试用用户名') {
+        if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
           dataFrom.value.number = item.attrValue
         } else if (item.attrType == '试用密码') {
           dataFrom.value.password2 = item.attrValue
@@ -110,13 +110,13 @@
     () => props.dataList,
     (val) => {
       if (val) {
-        let obj = props.dataList.applyState
+        let obj = props.dataList.approveStatus
         if (obj !== '通过') {
           flag.value = false
         } else {
           dataFrom.value.link = props.dataList.link
           props.dataList.infoList.map((item) => {
-            if (item.attrType == '试用用户名') {
+            if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
               dataFrom.value.number = item.attrValue
             } else if (item.attrType == '试用密码') {
               dataFrom.value.password2 = item.attrValue
diff --git a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
index 026fffab..c4168a11 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
@@ -16,127 +16,125 @@
         </div>
       </div>
     </div>
-    <div v-else class="no-data">
-      暂无数据
-    </div>
+    <div v-else class="no-data">暂无数据</div>
   </div>
 </template>
 
 <script setup>
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import { ref, defineProps, watch } from 'vue'
-const flag = ref(true)
-let dataFrom = ref([])
-const props = defineProps({
-  dataList: { type: Object, default: null },
-})
-if (props.dataList.infoList) {
-  let obj = props.dataList.infoList.filter(
-    (item) => item.attrType === '常见问题'
-  )[0]
-  if (!obj) {
-    flag.value = false
-  } else {
-    obj.attrValue = JSON.parse(obj.attrValue)
-    obj.attrValue.map((item) => {
-      let params = {
-        title: item.question,
-        answer: item.answer,
-      }
-      dataFrom.value.push(params)
-    })
-  }
-}
-watch(
-  () => props.dataList,
-  (val) => {
-    if (val) {
-      let obj = val.infoList.filter((item) => item.attrType === '常见问题')[0]
-      if (!obj) {
-        flag.value = false
-      } else {
-        obj.attrValue = JSON.parse(obj.attrValue)
-        obj.attrValue.map((item) => {
-          let params = {
-            title: item.question,
-            answer: item.answer,
-          }
-          dataFrom.value.push(params)
-        })
-      }
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import { ref, defineProps, watch } from 'vue'
+  const flag = ref(true)
+  let dataFrom = ref([])
+  const props = defineProps({
+    dataList: { type: Object, default: null },
+  })
+  if (props.dataList.infoList) {
+    let obj = props.dataList.infoList.filter(
+      (item) => item.attrType === '常见问题'
+    )[0]
+    if (!obj) {
+      flag.value = false
+    } else {
+      obj.attrValue = JSON.parse(obj.attrValue)
+      obj.attrValue.map((item) => {
+        let params = {
+          title: item.question,
+          answer: item.answer,
+        }
+        dataFrom.value.push(params)
+      })
     }
   }
-)
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        let obj = val.infoList.filter((item) => item.attrType === '常见问题')[0]
+        if (!obj) {
+          flag.value = false
+        } else {
+          obj.attrValue = JSON.parse(obj.attrValue)
+          obj.attrValue.map((item) => {
+            let params = {
+              title: item.question,
+              answer: item.answer,
+            }
+            dataFrom.value.push(params)
+          })
+        }
+      }
+    }
+  )
 </script>
 
 <style lang="less" scoped>
-.cpmmon-problem {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 160px;
-  background: #f7f8fa;
+  .cpmmon-problem {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 160px;
+    background: #f7f8fa;
 
-  .content {
-    width: 1300px;
-    margin: 20px 0px;
-    background: #ffffff;
-    padding: 40px;
+    .content {
+      width: 1300px;
+      margin: 20px 0px;
+      background: #ffffff;
+      padding: 40px;
 
-    .content-son {
-      font-size: 20px;
-      margin-bottom: 60px;
+      .content-son {
+        font-size: 20px;
+        margin-bottom: 60px;
 
-      .content-top {
-        display: flex;
-        align-items: center;
-        margin-bottom: 20px;
-        line-height: 20px;
-      }
+        .content-top {
+          display: flex;
+          align-items: center;
+          margin-bottom: 20px;
+          line-height: 20px;
+        }
 
-      .content-bottom {
-        display: flex;
-        line-height: 34px;
-        color: #666666;
-      }
+        .content-bottom {
+          display: flex;
+          line-height: 34px;
+          color: #666666;
+        }
 
-      .content-top,
-      .content-bottom {
-        div:last-child {
-          width: calc(100% - 54px);
+        .content-top,
+        .content-bottom {
+          div:last-child {
+            width: calc(100% - 54px);
+          }
+        }
+
+        .top-img {
+          width: 34px;
+          height: 30px;
+          background: url('~@/assets/detailsAll/sf_top_img.png') no-repeat;
+          background-position: center;
+          background-size: cover;
+          margin-right: 20px;
+        }
+
+        .bottom-img {
+          width: 34px;
+          height: 30px;
+          background: url('~@/assets/detailsAll/sf_bottom_img.png') no-repeat;
+          ackground-size: cover;
+          background-position: center;
+          margin-right: 20px;
         }
       }
 
-      .top-img {
-        width: 34px;
-        height: 30px;
-        background: url('~@/assets/detailsAll/sf_top_img.png') no-repeat;
-        background-position: center;
-        background-size: cover;
-        margin-right: 20px;
-      }
-
-      .bottom-img {
-        width: 34px;
-        height: 30px;
-        background: url('~@/assets/detailsAll/sf_bottom_img.png') no-repeat;
-        ackground-size: cover;
-        background-position: center;
-        margin-right: 20px;
+      .content-son:last-child {
+        margin-bottom: 0px;
       }
     }
 
-    .content-son:last-child {
-      margin-bottom: 0px;
+    .no-data {
+      background: transparent !important;
+      color: #212121;
+      text-align: center;
+      padding: 0.5rem 0;
+      font-size: 0.2rem;
     }
   }
-
-  .no-data {
-    background: transparent !important; 
-    color: #212121;
-    text-align: center;
-    padding: 0.5rem 0;
-    font-size: 0.2rem;
-  }
-}
 </style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
index 2bfed3a9..0503a752 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@@ -104,9 +104,8 @@
       }
     })
     if (
-      props.dataList.link &&
       whoShow1.value.itShowQingDao &&
-      props.dataList.applyState === '通过'
+      props.dataList.approveStatus === '通过'
     ) {
       list.value.push('应用详情')
     }
@@ -152,9 +151,8 @@
           }
         })
         if (
-          props.dataList.link &&
           whoShow1.value.itShowQingDao &&
-          props.dataList.applyState === '通过'
+          props.dataList.approveStatus === '通过'
         ) {
           list.value.push('应用详情')
         }
diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
index e62b74a9..fde98caf 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@@ -38,11 +38,11 @@
     englishTitle: 'DEPARTMENT&ERVICE',
     content: [
       {
-        childrenTitle: '归属部门信息',
+        childrenTitle: '归属部门',
         childrenContent: [],
       },
       {
-        childrenTitle: '服务商信息',
+        childrenTitle: '服务商',
         childrenContent: [],
       },
     ],
@@ -54,17 +54,17 @@
   })
   if (props.dataList.infoList) {
     let obj = {
-      attrType: '部门名称',
+      attrType: '归属部门',
       attrValue: props.dataList.deptName || '------',
     }
     dataFrom.value.content[0].childrenContent[0] = obj
     let deptContacts = {
-      attrType: '部门联系人',
+      attrType: '联系人',
       attrValue: props.dataList.deptContacts || '------',
     }
     dataFrom.value.content[0].childrenContent[1] = deptContacts
     let deptPhone = {
-      attrType: '部门联系电话',
+      attrType: '联系人电话',
       attrValue: props.dataList.deptPhone || '------',
     }
     dataFrom.value.content[0].childrenContent[2] = deptPhone
@@ -85,11 +85,13 @@
           }
         } else if (item.attrType === '服务商联系人') {
           dataFrom.value.content[1].childrenContent[1] = item
+          dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
           if (dataFrom.value.content[1].childrenContent[1].attrValue == '') {
             dataFrom.value.content[1].childrenContent[1].attrValue = '------'
           }
         } else if (item.attrType === '服务商联系电话') {
           dataFrom.value.content[1].childrenContent[2] = item
+          dataFrom.value.content[1].childrenContent[2].attrType = '联系人电话'
           if (dataFrom.value.content[1].childrenContent[2].attrValue == '') {
             dataFrom.value.content[1].childrenContent[2].attrValue = '------'
           }
@@ -106,17 +108,17 @@
         // dataFrom.value.content[0].childrenContent = []
         // dataFrom.value.content[1].childrenContent = []
         let obj = {
-          attrType: '部门名称',
+          attrType: '归属部门',
           attrValue: props.dataList.deptName || '------',
         }
         dataFrom.value.content[0].childrenContent[0] = obj
         let deptContacts = {
-          attrType: '部门联系人',
+          attrType: '联系人',
           attrValue: props.dataList.deptContacts || '------',
         }
         dataFrom.value.content[0].childrenContent[1] = deptContacts
         let deptPhone = {
-          attrType: '部门联系电话',
+          attrType: '联系人电话',
           attrValue: props.dataList.deptPhone || '------',
         }
         dataFrom.value.content[0].childrenContent[2] = deptPhone
@@ -140,6 +142,7 @@
               }
             } else if (item.attrType === '服务商联系人') {
               dataFrom.value.content[1].childrenContent[1] = item
+              dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
               if (
                 dataFrom.value.content[1].childrenContent[1].attrValue == ''
               ) {
@@ -148,6 +151,8 @@
               }
             } else if (item.attrType === '服务商联系电话') {
               dataFrom.value.content[1].childrenContent[2] = item
+              dataFrom.value.content[1].childrenContent[2].attrType =
+                '联系人电话'
               if (
                 dataFrom.value.content[1].childrenContent[2].attrValue == ''
               ) {
@@ -155,9 +160,9 @@
                   '------'
               }
             }
-          } else if (item.attrType === '部门联系人') {
+          } else if (item.attrType === '联系人') {
             deptContacts.attrValue = item.attrValue || '------'
-          } else if (item.attrType === '部门联系人电话') {
+          } else if (item.attrType === '联系人电话') {
             deptPhone.attrValue = item.attrValue || '------'
           }
         })
@@ -187,11 +192,10 @@
         height: 1.5rem;
         width: 6.2rem;
         border-radius: 0.2rem;
-        background: linear-gradient(
-          to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
         padding: 0 0.3rem;
         display: flex;
         flex-direction: column;
diff --git a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
index d5a97180..ccee9b56 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 15:25:33
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-16 16:58:16
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-16 17:03:24
  * @Description: 应用展示  视频播放
 -->
 <template>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 6f0205e8..d2216eec 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:18:54
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-21 18:17:30
  * @Description: 算法详情页头部
 -->
 <template>
@@ -90,16 +90,25 @@
   const applicationArea = ref('')
   // // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
-    sgcInsert({
-      delFlag: '0',
-      resourceId: props.dataList.id,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
+      console.log('加入申购车==================>', props.dataList)
+      sgcInsert({
+        delFlag: '0',
+        resourceId: props.dataList.id,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // // 立即申请
   function toView() {
diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
index 97d3419c..99b15adf 100644
--- a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;
diff --git a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue
index 508dd68b..3446025f 100644
--- a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue
@@ -159,6 +159,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 1.2rem;
diff --git a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
index 46a57003..44669056 100644
--- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 14:54:01
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-15 18:24:39
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-16 16:43:19
  * @Description: 应用详情页导航
 -->
 <template>
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 123ae579..3ba478df 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -87,16 +87,25 @@
   const componentType = ref('') //组件类型
   // // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
-    sgcInsert({
-      delFlag: '0',
-      resourceId: props.dataList.id,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
+      console.log('加入申购车==================>', props.dataList)
+      sgcInsert({
+        delFlag: '0',
+        resourceId: props.dataList.id,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // // 立即申请
   function toView() {
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
index 97d3419c..99b15adf 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
index cd6aa39a..a8132abe 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@@ -60,7 +60,7 @@
         childrenTitle: '归属部门',
         childrenContent: [
           {
-            attrType: '归属部门名称',
+            attrType: '归属部门',
             attrValue: '------',
           },
           {
@@ -74,10 +74,10 @@
         ],
       },
       {
-        childrenTitle: '服务商信息',
+        childrenTitle: '服务商',
         childrenContent: [
           {
-            attrType: '服务商名称',
+            attrType: '服务商',
             attrValue: '------',
           },
           {
@@ -226,11 +226,10 @@
         height: 1.8rem;
         width: 6.6rem;
         border-radius: 0.2rem;
-        background: linear-gradient(
-          to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
         padding: 0 0.3rem;
         display: flex;
         align-items: center;
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperPresentation.vue b/front/src/views/detailsAll/components/Developer/DeveloperPresentation.vue
index d1fa2b43..822cd6f5 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperPresentation.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperPresentation.vue
@@ -8,11 +8,28 @@
 <template>
   <div class="application-presentation" v-if="flag">
     <detals-title title="组件展示" type="IMAGE&VIDEO"></detals-title>
-    <div
-      class="main"
-      :style="`${img}background-position:center;background-size:cover;`"
-    >
-      <div class="play" @click="showModal"></div>
+    <div class="box">
+      <div class="left" @click="chagneShow()"></div>
+      <div
+        class="main"
+        :style="`${img}background-position:center;background-size:cover;`"
+        v-if="
+          showArr.length > 0 && showArr[showFlag].attrType == '组件视频介绍'
+        "
+      >
+        <div class="play" @click="showModal"></div>
+      </div>
+      <div
+        class="main2"
+        v-if="showArr.length > 0 && showArr[showFlag].attrType == '组件图片'"
+      >
+        <a-image
+          :width="700"
+          :height="340"
+          :src="showArr[showFlag].attrValue"
+        />
+      </div>
+      <div class="right" @click="chagneShow()"></div>
     </div>
     <a-modal
       v-model:visible="visible"
@@ -59,6 +76,13 @@
       'fullScreen',
     ], //显示所有按钮,
   })
+  const showFlag = ref(0)
+  const showArr = ref([])
+  const chagneShow = () => {
+    if (showArr.value.length > 1) {
+      showFlag.value = showFlag.value == 0 ? 1 : 0
+    }
+  }
   const showModal = () => {
     visible.value = true
   }
@@ -69,42 +93,63 @@
   const img = ref({})
   console.log('111111111111111111111,', props.dataList)
   if (props.dataList.infoList) {
+    showArr.value = props.dataList.infoList.filter(
+      (item) => item.attrType === '组件视频介绍' || item.attrType === '组件图片'
+    )
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '组件视频介绍'
     )[0]
-    console.log('视频==============>', obj)
-    if (!obj) {
+    console.log('视频==============>', showArr.value)
+    if (showArr.value.length == 0) {
       flag.value = false
     } else {
-      let imgindex = props.dataList.infoList.filter(
-        (item) => item.attrType === '组件图片'
-      )[0]
-      options.src = obj.attrValue
-      if (imgindex) {
-        img.value = 'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+      if (obj) {
+        options.src = obj.attrValue
       }
     }
+    // if (!obj) {
+    //   flag.value = false
+    // } else {
+    //   let imgindex = props.dataList.infoList.filter(
+    //     (item) => item.attrType === '组件图片'
+    //   )[0]
+    //   options.src = obj.attrValue
+    //   if (imgindex) {
+    //     img.value = 'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+    //   }
+    // }
   }
   watch(
     () => props.dataList,
     (val) => {
       if (val) {
+        showArr.value = props.dataList.infoList.filter(
+          (item) =>
+            item.attrType === '组件视频介绍' || item.attrType === '组件图片'
+        )
         let obj = val.infoList.filter(
           (item) => item.attrType === '组件视频介绍'
         )[0]
-        console.log('视频==============>', obj)
-        if (!obj) {
+        console.log('视频==============>', showArr.value)
+        if (showArr.value.length == 0) {
           flag.value = false
         } else {
-          let imgindex = props.dataList.infoList.filter(
-            (item) => item.attrType === '组件图片'
-          )[0]
-          options.src = obj.attrValue
-          if (imgindex) {
-            img.value =
-              'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+          if (obj) {
+            options.src = obj.attrValue
           }
         }
+        // if (!obj) {
+        //   flag.value = false
+        // } else {
+        //   let imgindex = props.dataList.infoList.filter(
+        //     (item) => item.attrType === '组件图片'
+        //   )[0]
+        //   options.src = obj.attrValue
+        //   if (imgindex) {
+        //     img.value =
+        //       'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+        //   }
+        // }
       }
     }
   )
@@ -113,6 +158,7 @@
   .application-presentation {
     padding: 0.8rem 3rem 0;
     .main {
+      width: 13.14rem;
       height: 3.4rem;
       border-radius: 0.1rem;
       background: url('~@/assets/detailsAll/sf_video_bg.png') no-repeat;
@@ -129,5 +175,47 @@
         cursor: pointer;
       }
     }
+    .main2 {
+      width: 13.14rem;
+      height: 3.4rem;
+      border-radius: 0.1rem;
+      background-size: 100%;
+      margin-top: 0.4rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+  .box {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 0.8rem;
+    .left {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-right: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_previous.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+    .right {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-left: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_next.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+  }
+
+  :deep(.ant-image-img) {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
   }
 </style>
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index de247e25..752b715d 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -82,16 +82,25 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
-    sgcInsert({
-      delFlag: '0',
-      resourceId: props.dataList.id,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
+      console.log('加入申购车==================>', props.dataList)
+      sgcInsert({
+        delFlag: '0',
+        resourceId: props.dataList.id,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // 立即申请
   function toView() {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
index 97d3419c..99b15adf 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index 88bbc7e5..5f3175cd 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -82,16 +82,25 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
-    sgcInsert({
-      delFlag: '0',
-      resourceId: props.dataList.id,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
+      console.log('加入申购车==================>', props.dataList)
+      sgcInsert({
+        delFlag: '0',
+        resourceId: props.dataList.id,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // 立即申请
   function toView() {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index 8ad4b92e..ae406496 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -247,11 +247,10 @@
       .content-left {
         height: 1.8rem;
         width: 6.2rem;
-        background: linear-gradient(
-          to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
         border-radius: 0.1rem;
         margin-right: 0.6rem;
         box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
@@ -310,11 +309,10 @@
       .content-right {
         height: 1.8rem;
         width: 6.2rem;
-        background: linear-gradient(
-          to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
+          no-repeat;
+        background-position: center;
+        background-size: 100% 100%;
         border-radius: 0.1rem;
         box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
         display: flex;
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 367c147d..c6643333 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -104,7 +104,7 @@
                 />
               </div>
             </div>
-            <!-- <div
+            <div
               class="top-content"
               v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
             >
@@ -127,7 +127,7 @@
                   </a-checkable-tag>
                 </div>
               </div>
-            </div> -->
+            </div>
           </div>
         </template>
       </div>
@@ -324,7 +324,7 @@
                 />
               </div>
             </div>
-            <!-- <div class="top-content" v-if="Cardsname == '组件服务'">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
@@ -344,7 +344,7 @@
                   </a-checkable-tag>
                 </div>
               </div>
-            </div> -->
+            </div>
           </div>
         </template>
       </div>
@@ -1034,7 +1034,8 @@
                   loading.value = false
                 } else {
                   resourceTotal.value = res.data.data.total || ''
-                  getShoppingCartList(res.data.data.records)
+                  resourceList.data = res.data.data.records || []
+                  // getShoppingCartList(res.data.data.records)
                 }
               })
             }
@@ -1111,7 +1112,8 @@
                 loading.value = false
               } else {
                 resourceTotal.value = res.data.data.total || ''
-                getShoppingCartList(res.data.data.records)
+                resourceList.data = res.data.data.records || []
+                // getShoppingCartList(res.data.data.records)
               }
             })
           }
@@ -1129,12 +1131,12 @@
         }).then((res) => {
           console.log('申购车列表================>', res.data.data.records)
           shoppingCartList.value = res.data.data.records
-          list.map((item) => {
-            item.isInShoppingCart = false
-            item.isInShoppingCart = shoppingCartList.value.some((item2) => {
-              return item.id === item2.resourceId
-            })
-          })
+          // list.map((item) => {
+          //   item.isInShoppingCart = false
+          //   item.isInShoppingCart = shoppingCartList.value.some((item2) => {
+          //     return item.id === item2.resourceId
+          //   })
+          // })
           console.log('经过过滤后的列表信息', list)
           resourceList.data = list
         })
diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue
index bab19889..fd66bb38 100644
--- a/front/src/views/home/algorithmCompare.vue
+++ b/front/src/views/home/algorithmCompare.vue
@@ -57,13 +57,22 @@
                 :id="data.title"
                 :title="data.title"
                 :ref="data.title"
+                v-if="
+                  !(
+                    data.title == '算法优势' ||
+                    data.title == '应用场景' ||
+                    data.title == '应用案例' ||
+                    data.title == '常见问题' ||
+                    data.title == '计费标准信息'
+                  )
+                "
               >
                 {{ data.title }}
               </div>
               <!-- 算法优势 -->
-              <div class="group-data" v-if="data.groupName">
-                <!-- <compare-group-view :dataList="data.groupList"></compare-group-view> -->
-                <div v-if="data.groupList.length > 0">
+              <!-- <div class="group-data" v-if="data.groupName"> -->
+              <!-- <compare-group-view :dataList="data.groupList"></compare-group-view> -->
+              <!-- <div v-if="data.groupList.length > 0">
                   <div
                     class="group-box"
                     v-for="(data, i) in data.groupList"
@@ -97,11 +106,10 @@
                 </div>
                 <div v-if="data.groupList.length == 0" class="no-data">
                   暂无数据
-                </div>
-              </div>
+                </div> -->
+              <!-- </div> -->
               <div
                 class="flex-row-start row-tr"
-                v-else
                 v-for="(rowData, j) in data.list"
                 :key="j"
                 :class="j == data.list.length - 1 ? 'border-bottom' : ''"
@@ -235,51 +243,51 @@
         key: '算法介绍视频',
       },
     ],
-    算法优势: [
-      {
-        text: '算法优势名称',
-        key: 'name',
-      },
-      {
-        text: '算法优势描述',
-        key: 'desc',
-      },
-    ],
-    应用场景: [
-      {
-        text: '场景名称',
-        key: '场景名称',
-      },
-      {
-        text: '场景描述',
-        key: '场景描述',
-      },
-    ],
-    应用案例: [
-      {
-        text: '关联应用',
-      },
-      {
-        text: '算法需求背景',
-      },
-      {
-        text: '算法应用期望达成效果',
-      },
-    ],
-    计费标准信息: [
-      {
-        text: '是否收费',
-      },
-      {
-        text: '计费方式',
-      },
-      {
-        text: '计费描述',
-      },
-      // {
-      //     text: '计费标准信息', key: ''
-      // },
-    ],
+    // 算法优势: [
+    //   {
+    //     text: '算法优势名称',
+    //     key: 'name',
+    //   },
+    //   {
+    //     text: '算法优势描述',
+    //     key: 'desc',
+    //   },
+    // ],
+    // 应用场景: [
+    //   {
+    //     text: '场景名称',
+    //     key: '场景名称',
+    //   },
+    //   {
+    //     text: '场景描述',
+    //     key: '场景描述',
+    //   },
+    // ],
+    // 应用案例: [
+    //   {
+    //     text: '关联应用',
+    //   },
+    //   {
+    //     text: '算法需求背景',
+    //   },
+    //   {
+    //     text: '算法应用期望达成效果',
+    //   },
+    // ],
+    // 计费标准信息: [
+    //   {
+    //     text: '是否收费',
+    //   },
+    //   {
+    //     text: '计费方式',
+    //   },
+    //   {
+    //     text: '计费描述',
+    //   },
+    //   // {
+    //   //     text: '计费标准信息', key: ''
+    //   // },
+    // ],
     使用方式: [
       {
         text: '服务接口',
@@ -311,14 +319,14 @@
         text: '服务商联系电话',
       },
     ],
-    常见问题: [
-      {
-        text: '常见问题',
-      },
-      {
-        text: '回答',
-      },
-    ],
+    // 常见问题: [
+    //   {
+    //     text: '常见问题',
+    //   },
+    //   {
+    //     text: '回答',
+    //   },
+    // ],
   }
   // 左侧导航
   const leftNav = ref([])
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 3a488731..c58a256b 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -151,6 +151,7 @@
                   :headers="headers"
                   @change="handleChange"
                   :before-upload="beforeUpload"
+                  :maxCount="1"
                 >
                   <a-button
                     style="
@@ -172,6 +173,10 @@
                   <span style="font-size: 14px; color: #999">
                     支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件
                   </span>
+                  <div v-if="fileList.length < 1">
+                    <plus-outlined />
+                    <div style="margin-top: 8px">上传限一个文件</div>
+                  </div>
                 </a-upload>
               </a-form-item>
 
@@ -421,8 +426,17 @@
             }
             if (!applyAll) {
               let ids = []
+              let falgNum = 0
+              let sxt = true
               formName.system = []
               console.log('list==================', list.value)
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    falgNum++
+                  }
+                })
+              })
               list.value.map((val) => {
                 val.arr.map((item) => {
                   if (item.type !== '基础设施') {
@@ -430,6 +444,7 @@
                       resourceId: item.resourceId,
                       resourceName: item.resourceName,
                     })
+                    falgNum++
                     console.log(item.id)
                     if (item.id) {
                       ids.push(item.id)
@@ -451,8 +466,14 @@
                       // applySuccess.value = false
                       console.log('摄像头申请================>', res)
                       if (item.id) {
-                        sgcDel({ ids: [item.id] }).then((res) => {
-                          if (res.data.msg === 'success') {
+                        sgcDel({ ids: [item.id] }).then((res1) => {
+                          if (res1.data.msg === 'success') {
+                            if (falgNum == 0 && sxt) {
+                              message.success(
+                                '申请提交成功，请到消息中心查看！'
+                              )
+                              sxt = false
+                            }
                             mybus.emit('getSgcNum')
                             router.push({
                               path: '/DetailsPageconetent',
@@ -463,6 +484,10 @@
                           }
                         })
                       } else {
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+                          message.success('申请提交成功，请到消息中心查看！')
+                          sxt = false
+                        }
                         router.push({
                           path: '/DetailsPageconetent',
                           query: {
diff --git a/front/src/views/home/components/CompareGroupView.vue b/front/src/views/home/components/CompareGroupView.vue
index afc7c516..7803c74c 100644
--- a/front/src/views/home/components/CompareGroupView.vue
+++ b/front/src/views/home/components/CompareGroupView.vue
@@ -1,54 +1,59 @@
 <template>
-    <div>
-        <div v-if="groupArray.length > 0">
-            <div class="group-box" v-for="(data, i) in groupArray" :key="i">
-                <div class="flex-row-start row-tr" v-for="(item, j) in Object.keys(data)" :key="j"
-                    :class="j == Object.keys(data).length - 1 ? 'border-bottom' : ''">
-                    <div class="td-name">{{ item }}</div>
-                    <div class="flex-row-start">
-                        <div class="td" v-for="(d, k) in data[item]" :key="k">{{ d || '--' }}</div>
-                    </div>
-                </div>
+  <div>
+    <div v-if="groupArray.length > 0">
+      <div class="group-box" v-for="(data, i) in groupArray" :key="i">
+        <div
+          class="flex-row-start row-tr"
+          v-for="(item, j) in Object.keys(data)"
+          :key="j"
+          :class="j == Object.keys(data).length - 1 ? 'border-bottom' : ''"
+        >
+          <div class="td-name">{{ item }}</div>
+          <div class="flex-row-start">
+            <div class="td" v-for="(d, k) in data[item]" :key="k">
+              {{ d || '--' }}
             </div>
+          </div>
         </div>
-        {{ '哈啊哈哈哈哈' + groupArray.length }}
-        <div v-if="groupArray.length == 0" class="no-data">暂无数据</div>
+      </div>
     </div>
-
+    {{ '哈啊哈哈哈哈' + groupArray.length }}
+    <div v-if="groupArray.length == 0" class="no-data">暂无数据</div>
+  </div>
 </template>
 
 <script>
-import { defineComponent, ref, onMounted, getCurrentInstance, computed, watch, nextTick } from 'vue'
-export default {
-    props: ["dataList"],
+  import { ref, watch, nextTick } from 'vue'
+  export default {
+    props: ['dataList'],
     setup(props) {
-        let groupArray = ref([])
-        watch(
-            () => {
-                return props.dataList
-            },
-            (newVal) => {
-                console.log('newVal------------>', newVal);
-                groupArray = ref([])
-                newVal.map(v => {
-                    groupArray.value.push(v)
-                })
-                groupArray.value = groupArray.value.splice(0)
-                nextTick(() => {
-                    console.log('groupArray---子组件--------->', groupArray.value);
-                })
-            },
-            {
-                deep: true,
-                immediate: true
-            }
-        )
-
-        return {
-            groupArray,
+      let groupArray = ref([])
+      watch(
+        () => {
+          return props.dataList
+        },
+        (newVal) => {
+          console.log('newVal------------>', newVal)
+          groupArray = ref([])
+          newVal.map((v) => {
+            groupArray.value.push(v)
+          })
+          groupArray.value = groupArray.value.splice(0)
+          nextTick(() => {
+            console.log('groupArray---子组件--------->', groupArray.value)
+          })
+        },
+        {
+          deep: true,
+          immediate: true,
         }
-    }
-}
+      )
+
+      return {
+        groupArray,
+      }
+    },
+  }
 </script>
 
 <!-- <script setup>
@@ -79,44 +84,43 @@ nextTick(() => {
 </script> -->
 
 <style lang="less" scoped>
-.group-box {
+  .group-box {
     margin-bottom: 20px;
-}
+  }
 
-.border {
+  .border {
     border: 1px solid #dddee1;
     border-bottom: none;
     border-right: none;
-}
+  }
 
-
-.row-tr {
+  .row-tr {
     border: 1px solid #dddee1;
     border-right: none;
     border-bottom: none;
-}
+  }
 
-.no-border-right {
+  .no-border-right {
     border: 1px solid #dddee1;
     border-right: none;
-}
+  }
 
-.flex-row-start {
+  .flex-row-start {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-}
+  }
 
-.td-name {
+  .td-name {
     border-right: 1px solid #dddee1;
     height: 50px;
     line-height: 50px;
     text-align: center;
     width: 200px;
     font-size: 14px;
-}
+  }
 
-.td {
+  .td {
     border-right: 1px solid #dddee1;
     height: 50px;
     line-height: 50px;
@@ -128,18 +132,18 @@ nextTick(() => {
     word-wrap: break-all;
     word-break: normal;
     overflow: hidden;
-}
+  }
 
-.border-bottom {
+  .border-bottom {
     border-bottom: 1px solid #dddee1;
-}
+  }
 
-.no-data {
+  .no-data {
     height: 100px;
     width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
     border: 1px solid #dddee1;
-}
-</style>
\ No newline at end of file
+  }
+</style>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 8e68f09a..36fd4337 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -465,7 +465,7 @@
     border-radius: 0.05rem;
     position: absolute;
     top: 0.45rem;
-    right: 3.1rem;
+    right: 2.9rem;
     overflow-y: scroll;
     .bottom {
       cursor: pointer;
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 749ffc71..cb4ddee6 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -293,7 +293,7 @@
                 "
               >
                 {{
-                  item.shareCondition == '免批申请' ? '立即申请' : '立即申请'
+                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -589,7 +589,6 @@
       // 加入申购车
       const addShoppingCart = (item, index) => {
         console.log('item===============>', item)
-        mybus.emit('changeSelcted', index)
         if (flag.value && item.id) {
           flag.value = false
           sgcInsert({
@@ -600,6 +599,7 @@
             console.log(res)
             message.success('添加申购车成功！')
             mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
             flag.value = true
           })
         }
@@ -789,7 +789,7 @@
     },
     beforeUnmount() {
       mybus.off('chongzhi')
-      mybus.emit('changeSelcted')
+      // mybus.emit('changeSelcted')
     },
   }
 </script>
diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js
index 69218b34..4c344a63 100644
--- a/front/src/views/home/constantData/showData.js
+++ b/front/src/views/home/constantData/showData.js
@@ -1,68 +1,68 @@
 export const titleNameArray = [
-    {
-        photo: require('@/assets/newHome/banner-zj.png'),
-        name: '组件服务',
-    },
-    {
-        photo: require('@/assets/newHome/banner-yy.png'),
-        name: '应用资源',
-    },
-    {
-        photo: require('@/assets/newHome/banner-jc.png'),
-        name: '基础设施',
-    },
-    {
-        photo: require('@/assets/newHome/banner-sj.png'),
-        name: '数据资源',
-    },
-    {
-        photo: require('@/assets/newHome/banner-zs.png'),
-        name: '知识库',
-    },
+  {
+    photo: require('@/assets/newHome/banner-zj.png'),
+    name: '组件服务',
+  },
+  {
+    photo: require('@/assets/newHome/banner-yy.png'),
+    name: '应用资源',
+  },
+  {
+    photo: require('@/assets/newHome/banner-jc.png'),
+    name: '基础设施',
+  },
+  {
+    photo: require('@/assets/newHome/banner-sj.png'),
+    name: '数据资源',
+  },
+  {
+    photo: require('@/assets/newHome/banner-zs.png'),
+    name: '知识库',
+  },
 ]
 
 // 模糊查询
 export const keyongziyuanqingkaungArray = [
-    {
-        name: 'CPU/核：',
-        value: 2102,
-    },
-    {
-        name: '内存/T：',
-        value: 6.68,
-    },
-    {
-        name: '存储/T：',
-        value: 2102,
-    },
-    {
-        name: 'RDS for Mysql/G：',
-        value: 982.82,
-    },
-    {
-        name: 'RDS for SqlServer/G：',
-        value: 997.17,
-    },
+  {
+    name: 'CPU/核：',
+    value: 2102,
+  },
+  {
+    name: '内存/T：',
+    value: 6.68,
+  },
+  {
+    name: '存储/T：',
+    value: 2102,
+  },
+  {
+    name: 'RDS for Mysql/G：',
+    value: 982.82,
+  },
+  {
+    name: 'RDS for SqlServer/G：',
+    value: 997.17,
+  },
 ]
 
 export const shujuziyuanqingkuangArray = [
-    {
-        name: '已上线目录：',
-        value: 10372,
-        danwei: '条',
-    },
-    {
-        name: '已发布服务：',
-        value: 1080,
-        danwei: '条',
-    },
-    {
-        name: '已发布接口：',
-        value: 976,
-        danwei: '条',
-    },
-    {
-        name: '更新时间：',
-        value: '2022-05-06',
-    },
-]
\ No newline at end of file
+  {
+    name: '已上线目录：',
+    value: 10372,
+    danwei: '条',
+  },
+  {
+    name: '已发布服务：',
+    value: 1080,
+    danwei: '条',
+  },
+  {
+    name: '已发布接口：',
+    value: 976,
+    danwei: '条',
+  },
+  {
+    name: '更新时间：',
+    value: '2022-05-06',
+  },
+]
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index b42ce15f..fe18730d 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -2,13 +2,20 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <!-- 头部基本信息 -->
-    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
+    <application-top-details
+      :dataList="detailInfoObj"
+      :navList="navList"
+    ></application-top-details>
 
     <!-- 导航 -->
     <div :class="{ fixed: scrollTop >= 600 }">
       <div class="application-navigation">
         <template v-for="nav in navList" :key="nav.key">
-          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
+          <div
+            class="nav"
+            :class="{ selectNow: nav.key == selectNow }"
+            @click="selectNav(nav.key)"
+          >
             {{ nav.name }}
             <span class="line"></span>
           </div>
@@ -17,7 +24,10 @@
     </div>
 
     <!-- 组合能力 -->
-    <div id="integration-combination-ability" class="combination-ability scrollBox">
+    <div
+      id="integration-combination-ability"
+      class="combination-ability scrollBox"
+    >
       <div class="title-1">
         <DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle>
       </div>
@@ -50,9 +60,17 @@
           </div>
         </div>
         <div class="content-card flex-row-start">
-          <div class="right-item content-card-item" v-for="(use, i) in useWayShowList" :key="i">
+          <div
+            class="right-item content-card-item"
+            v-for="(use, i) in useWayShowList"
+            :key="i"
+          >
             <div class="card-title title">{{ use.title }}</div>
-            <div class="card-text" v-for="(d, k) in Object.keys(use.info)" :key="k">
+            <div
+              class="card-text"
+              v-for="(d, k) in Object.keys(use.info)"
+              :key="k"
+            >
               {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
             </div>
           </div>
@@ -61,390 +79,403 @@
     </div>
 
     <!-- 常见问题-->
-    <application-common-problem :dataList="detailInfoObj" id="common-problem" class="scrollBox">
-    </application-common-problem>
+    <application-common-problem
+      :dataList="detailInfoObj"
+      id="common-problem"
+      class="scrollBox"
+    ></application-common-problem>
 
     <home-footer></home-footer>
   </div>
 </template>
 
 <script setup>
-import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
-import HomeFooter from '@/views/newHome/components/Footer'
-import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
-import { useRouter } from 'vue-router'
-import { getIntegrationDetail } from '@/api/home'
-import mybus from '@/myplugins/mybus'
+  import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import { ref, onMounted, onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { getIntegrationDetail } from '@/api/home'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
+  const router = useRouter()
+  const scrollTop = ref(0)
+  const domArr = ref([])
+  const id = router.currentRoute.value.query.id
+  document.documentElement.style.transition = 'all 0.3s ease'
+  document.documentElement.scrollTop = 0
+  document.body.style.transition = 'all 0.3s ease'
+  document.body.scrollTop = 0
+  mybus.on('flyToView', (id) => {
+    let top =
+      document.querySelector('#' + id) &&
+      document.querySelector('#' + id).offsetTop - 50
+    document.documentElement.scrollTop = top
+    document.body.scrollTop = top
+  })
 
-const router = useRouter()
-const scrollTop = ref(0)
-const domArr = ref([])
-const id = router.currentRoute.value.query.id
-document.documentElement.style.transition = 'all 0.3s ease'
-document.documentElement.scrollTop = 0
-document.body.style.transition = 'all 0.3s ease'
-document.body.scrollTop = 0
-mybus.on('flyToView', (id) => {
-  let top = document.querySelector('#' + id) && document.querySelector('#' + id).offsetTop - 50;
-  document.documentElement.scrollTop = top
-  document.body.scrollTop = top
-})
-
-const navList = ref([
-  {
-    name: '组合能力',
-    key: 'integration-combination-ability',
-  },
-  {
-    name: '使用方式',
-    key: 'integration-use-way',
-  },
-  {
-    name: '常见问题',
-    key: 'common-problem',
-  },
-])
-
-const selectNow = ref('integration-combination-ability')
-
-const useWayShowList = ref([
-  {
-    title: '归属部门',
-    info: {
-      deptUser: '部门联系人',
-      mobile: '联系人电话',
+  const navList = ref([
+    {
+      name: '组合能力',
+      key: 'integration-combination-ability',
     },
-  },
-  {
-    title: '服务商',
-    info: {
-      providerUser: '服务商联系人',
-      providerMobile: '联系人电话',
+    {
+      name: '使用方式',
+      key: 'integration-use-way',
     },
-  },
-])
+    {
+      name: '常见问题',
+      key: 'common-problem',
+    },
+  ])
 
-const combineList = ref([
-  {
-    title: '基础设施',
-    list: []
-  },
-  {
-    title: '组件服务',
-    list: []
-  },
-  {
-    title: '数据资源',
-    list: []
-  },
-])
-const detailInfoObj = ref({})
+  const selectNow = ref('integration-combination-ability')
 
-onMounted(() => {
-  window.addEventListener('scroll', () => {
-    domArr.value = document.querySelectorAll('.scrollBox')
-    scrollTop.value =
-      document.documentElement.scrollTop || document.body.scrollTop
-    for (let i = 0; i < domArr.value.length; i++) {
-      if (i === 0) {
-        if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
-          selectNow.value = domArr.value[i].id
-        }
-      } else if (i == domArr.value.length - 1) {
-        if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
-          selectNow.value = domArr.value[i].id
-        }
-      } else {
-        if (
-          scrollTop.value >= domArr.value[i].offsetTop - 50 &&
-          scrollTop.value <= domArr.value[i + 1].offsetTop - 50
-        ) {
-          selectNow.value = domArr.value[i].id
+  const useWayShowList = ref([
+    {
+      title: '归属部门',
+      info: {
+        deptUser: '部门联系人',
+        mobile: '联系人电话',
+      },
+    },
+    {
+      title: '服务商',
+      info: {
+        providerUser: '服务商联系人',
+        providerMobile: '联系人电话',
+      },
+    },
+  ])
+
+  const combineList = ref([
+    {
+      title: '基础设施',
+      list: [],
+    },
+    {
+      title: '组件服务',
+      list: [],
+    },
+    {
+      title: '数据资源',
+      list: [],
+    },
+  ])
+  const detailInfoObj = ref({})
+
+  onMounted(() => {
+    window.addEventListener('scroll', () => {
+      domArr.value = document.querySelectorAll('.scrollBox')
+      scrollTop.value =
+        document.documentElement.scrollTop || document.body.scrollTop
+      for (let i = 0; i < domArr.value.length; i++) {
+        if (i === 0) {
+          if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
+            selectNow.value = domArr.value[i].id
+          }
+        } else if (i == domArr.value.length - 1) {
+          if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
+            selectNow.value = domArr.value[i].id
+          }
+        } else {
+          if (
+            scrollTop.value >= domArr.value[i].offsetTop - 50 &&
+            scrollTop.value <= domArr.value[i + 1].offsetTop - 50
+          ) {
+            selectNow.value = domArr.value[i].id
+          }
         }
       }
-    }
-  })
-})
-
-const selectNav = (key) => {
-  selectNow.value = key
-  mybus.emit('flyToView', selectNow.value)
-}
-
-// 融合服务--详情
-const getIntegrationServicesDeatil = (id) => {
-  getIntegrationDetail(id).then(res => {
-    if (res.data.code !== 0) {
-      return message.error(res.data.msg)
-    }
-    detailInfoObj.value = res.data.data || {}
-    // 资源属性
-    let fuseAttrList = res.data.data.fuseAttrList || []
-    // 融合关系
-    let fuseResourceList = res.data.data.fuseResourceList || []
-    let questionValue = fuseAttrList.find(v => v.attrType === '常见问题') || {}
-    let questionObj = {
-      attrType: '常见问题',
-      attrValue: questionValue.attrValue || "[]"
-    }
-    let areaObj = {
-      attrType: '应用领域',
-      attrValue: detailInfoObj.value.applicationArea
-    }
-    combineList.value.map(item => {
-      let arr = (fuseResourceList.filter(v => v.resource && v.resource.type == item.title) || []).map(d => d.resource.name)
-      item.list = arr;
-      return item
     })
-    detailInfoObj.value.infoList = []
-    detailInfoObj.value.infoList.push(questionObj)
-    detailInfoObj.value.infoList.push(areaObj)
-  }, err => {
-    message.error(err)
   })
-}
-getIntegrationServicesDeatil(id)
 
-function handleOpenUrl(type) {
-  let obj = (detailInfoObj.value.fuseAttrList || []).find(v => v.attrType == type) || {};
-  let url = obj.attrValue || '';
-  if (!obj.attrValue) {
-    return message.error('错误的文档链接地址！')
+  const selectNav = (key) => {
+    selectNow.value = key
+    mybus.emit('flyToView', selectNow.value)
   }
-  window.open(
-    window.SITE_CONFIG.previewUrl +
-    'hisense_office/onlinePreview?url=' +
-    btoa(encodeURI(url))
-  )
-}
 
-onBeforeUnmount(() => {
-  mybus.off('flyToView')
-})
+  // 融合服务--详情
+  const getIntegrationServicesDeatil = (id) => {
+    getIntegrationDetail(id).then(
+      (res) => {
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+        detailInfoObj.value = res.data.data || {}
+        // 资源属性
+        let fuseAttrList = res.data.data.fuseAttrList || []
+        // 融合关系
+        let fuseResourceList = res.data.data.fuseResourceList || []
+        let questionValue =
+          fuseAttrList.find((v) => v.attrType === '常见问题') || {}
+        let questionObj = {
+          attrType: '常见问题',
+          attrValue: questionValue.attrValue || '[]',
+        }
+        let areaObj = {
+          attrType: '应用领域',
+          attrValue: detailInfoObj.value.applicationArea,
+        }
+        combineList.value.map((item) => {
+          let arr = (
+            fuseResourceList.filter(
+              (v) => v.resource && v.resource.type == item.title
+            ) || []
+          ).map((d) => d.resource.name)
+          item.list = arr
+          return item
+        })
+        detailInfoObj.value.infoList = []
+        detailInfoObj.value.infoList.push(questionObj)
+        detailInfoObj.value.infoList.push(areaObj)
+      },
+      (err) => {
+        message.error(err)
+      }
+    )
+  }
+  getIntegrationServicesDeatil(id)
+
+  function handleOpenUrl(type) {
+    let obj =
+      (detailInfoObj.value.fuseAttrList || []).find(
+        (v) => v.attrType == type
+      ) || {}
+    let url = obj.attrValue || ''
+    if (!obj.attrValue) {
+      return message.error('错误的文档链接地址！')
+    }
+    window.open(
+      window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
+    )
+  }
+
+  onBeforeUnmount(() => {
+    mybus.off('flyToView')
+  })
 </script>
 
 <style lang="less" scoped>
-.flex-row-between {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.flex-row-start {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.flex-row-center {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-}
-
-
-.IntegrationServicesDetails {
-  .fixed {
-    position: fixed !important;
-    z-index: 2000;
-    top: 0;
-    left: 0;
-  }
-
-  .fixed2>div:nth-of-type(3) {
-    margin-top: 0.84rem;
-  }
-
-  .application-navigation {
-    width: 19.12rem;
-    height: 0.84rem;
-    line-height: 0.8rem;
+  .flex-row-between {
     display: flex;
-    justify-content: space-around;
-    font-size: 0.24rem;
-    color: #666;
-    background: #fff;
-    padding: 0 3rem;
-    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
-    position: relative;
-
-    .nav {
-      cursor: pointer;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      align-items: center;
-
-      .line {
-        width: 0.4rem;
-        height: 0.04rem;
-      }
-    }
-
-    .selectNow {
-      color: #526aff;
-
-      .line {
-        background: #526aff;
-      }
-    }
-  }
-}
-
-.use-way {
-  padding: 0.8rem 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .title-1 {
-    margin-bottom: 0.3rem;
-  }
-
-
-
-  .left {
-    .btn {
-      padding: 10px 20px;
-      color: #526aff;
-      background: #fff;
-      border-radius: 50px;
-      margin: 10px;
-      font-size: 0.2rem;
-      width: 150px;
-      text-align: center;
-      cursor: pointer;
-    }
-
-    .btn-box {
-      display: flex;
-      flex-direction: column;
-      align-items: flex-end;
-    }
-  }
-
-  .content {
-    display: flex;
-    width: 13rem;
+    flex-direction: row;
+    align-items: center;
     justify-content: space-between;
+  }
 
-    .word-bg {
-      background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+  .flex-row-start {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+  }
+
+  .flex-row-center {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .IntegrationServicesDetails {
+    .fixed {
+      position: fixed !important;
+      z-index: 2000;
+      top: 0;
+      left: 0;
     }
 
-    .content-card {
-      height: 1.5rem;
-      width: 6.2rem;
-      border-radius: 0.2rem;
-      background: linear-gradient(to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
-      padding: 0 0.3rem;
+    .fixed2 > div:nth-of-type(3) {
+      margin-top: 0.84rem;
+    }
+
+    .application-navigation {
+      width: 19.12rem;
+      height: 0.84rem;
+      line-height: 0.8rem;
       display: flex;
-      justify-content: center;
+      justify-content: space-around;
+      font-size: 0.24rem;
+      color: #666;
+      background: #fff;
+      padding: 0 3rem;
+      box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+      position: relative;
 
-      .card-title {
-        font-size: 0.26rem;
-        color: #212956;
-        margin-bottom: 0.2rem;
-        line-height: 0.26rem;
+      .nav {
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+
+        .line {
+          width: 0.4rem;
+          height: 0.04rem;
+        }
       }
 
-      .content-card-item {
-        width: 50%;
+      .selectNow {
+        color: #526aff;
 
-        .card-text {
-          margin-right: 0.2rem;
-          color: rgba(33, 41, 86, 0.8);
-          font-size: 0.2rem;
-          max-width: 2.8rem;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-        }
-
-        div:first-child {
-          display: block;
+        .line {
+          background: #526aff;
         }
       }
     }
   }
-}
 
-.combination-ability {
-  padding: 0.8rem 0;
-  background: rgb(247, 248, 250);
-
-  .title-1 {
-    margin-bottom: 0.3rem;
-  }
-
-  .combine-content {
-    width: 13rem;
-    margin: 0 auto;
-  }
-
-  .combine-item {
-    margin: 0 0.1rem;
-    width: 4.28rem;
+  .use-way {
+    padding: 0.8rem 0;
     display: flex;
     flex-direction: column;
     align-items: center;
-    border: 1px solid #e4e6f5;
-    border-radius: 0.1rem;
-    padding: 0.1rem 0;
-    cursor: pointer;
-    height: 2.5rem;
 
-    &:hover {
-      border-radius: 0.02rem;
-      border: 0.01rem solid #0058e1;
-      box-shadow: 0rem 0.08rem 0.2rem rgb(0 88 225 / 30%);
+    .title-1 {
+      margin-bottom: 0.3rem;
     }
 
-    .title {
+    .left {
+      .btn {
+        padding: 10px 20px;
+        color: #526aff;
+        background: #fff;
+        border-radius: 50px;
+        margin: 10px;
+        font-size: 0.2rem;
+        width: 150px;
+        text-align: center;
+        cursor: pointer;
+      }
+
+      .btn-box {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+      }
+    }
+
+    .content {
+      display: flex;
+      width: 13rem;
+      justify-content: space-between;
+
+      .word-bg {
+        background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+      }
+
+      .content-card {
+        height: 1.5rem;
+        width: 6.2rem;
+        border-radius: 0.2rem;
+        background: linear-gradient(
+          to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4)
+        );
+        padding: 0 0.3rem;
+        display: flex;
+        justify-content: center;
+
+        .card-title {
+          font-size: 0.26rem;
+          color: #212956;
+          margin-bottom: 0.2rem;
+          line-height: 0.26rem;
+        }
+
+        .content-card-item {
+          width: 50%;
+
+          .card-text {
+            margin-right: 0.2rem;
+            color: rgba(33, 41, 86, 0.8);
+            font-size: 0.2rem;
+            max-width: 2.8rem;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+          }
+
+          div:first-child {
+            display: block;
+          }
+        }
+      }
+    }
+  }
+
+  .combination-ability {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+    .title-1 {
+      margin-bottom: 0.3rem;
+    }
+
+    .combine-content {
+      width: 13rem;
+      margin: 0 auto;
+    }
+
+    .combine-item {
+      margin: 0 0.1rem;
+      width: 4.28rem;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      border: 1px solid #e4e6f5;
+      border-radius: 0.1rem;
+      padding: 0.1rem 0;
+      cursor: pointer;
+      height: 2.5rem;
+
+      &:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgb(0 88 225 / 30%);
+      }
+
+      .title {
+        color: #212121;
+        text-align: center;
+        padding: 0.2rem 0;
+        font-size: 0.22rem;
+        text-align: center;
+      }
+    }
+
+    .name-box {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      width: 100%;
+    }
+
+    .no-data {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: center;
+      font-size: 0.16rem;
+      color: #666;
+      text-align: center;
+    }
+
+    .name-text {
+      font-size: 0.16rem;
       color: #212121;
+      line-height: 0.3rem;
+      height: 0.3rem;
       text-align: center;
-      padding: 0.2rem 0;
-      font-size: .22rem;
-      text-align: center;
+      width: 50%;
+      box-sizing: border-box;
     }
-
   }
-
-  .name-box {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    width: 100%;
-  }
-
-  .no-data {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: center;
-    font-size: 0.16rem;
-    color: #666;
-    text-align: center;
-  }
-
-  .name-text {
-    font-size: 0.16rem;
-    color: #212121;
-    line-height: 0.3rem;
-    height: 0.3rem;
-    text-align: center;
-    width: 50%;
-    box-sizing: border-box;
-  }
-
-}
 </style>
diff --git a/front/src/views/instructionManual/components/abilityDocTree.vue b/front/src/views/instructionManual/components/abilityDocTree.vue
index b1874596..a88e101a 100644
--- a/front/src/views/instructionManual/components/abilityDocTree.vue
+++ b/front/src/views/instructionManual/components/abilityDocTree.vue
@@ -56,7 +56,7 @@
     clickData: {
       type: Object,
       default: () => {
-        title: ''
+        ''
       },
     },
   })
diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue
index 10350124..b21d0231 100644
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@@ -4,21 +4,40 @@
     <div id="container" class="content-menu">
       <div class="rela">
         <div class="left">
-          <div class="first-title-text" v-for="(data, i) in titleList" :key="i" @click="changeName(data)"
-            :style="{ color: data.name === titleData.name ? '#0058e1' : '' }">
+          <div
+            class="first-title-text"
+            v-for="(data, i) in titleList"
+            :key="i"
+            @click="changeName(data)"
+            :style="{ color: data.name === titleData.name ? '#0058e1' : '' }"
+          >
             <div class="img" :class="data.className"></div>
             {{ data.name }}
           </div>
-          <abilityDocTree :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
+          <abilityDocTree
+            :dataList="treeArray"
+            @treeClick="treeClick"
+            :clickData="clickData"
+          ></abilityDocTree>
         </div>
         <div class="right">
-          <div class="new-menu-box" style="height: 100%" v-if="titleData.name === '新手指引'">
+          <div
+            class="new-menu-box"
+            style="height: 100%"
+            v-if="titleData.name === '新手指引'"
+          >
             <!-- 新手指引 -->
             <a-empty description="新手指引" />
           </div>
-          <div v-else style="height:100%">
-            <iframe name="iframeName" width="1000" height="100%" id="iframeId" :frameborder="0"
-              :src="doc_base_url + clickData.doc"></iframe>
+          <div v-else style="height: 100%">
+            <iframe
+              name="iframeName"
+              width="1000"
+              height="100%"
+              id="iframeId"
+              :frameborder="0"
+              :src="doc_base_url + clickData.doc"
+            ></iframe>
           </div>
         </div>
       </div>
@@ -26,199 +45,199 @@
   </div>
 </template>
 <script setup>
-import HomeHeader from '@/views/home/components/header'
-import abilityDocTree from './components/abilityDocTree'
-import { ref, reactive, onMounted, nextTick, watch } from 'vue'
-import { Empty, message } from 'ant-design-vue'
-import { getDevelopDocTree } from '@/api/home'
-import flatten from '@turf/flatten'
+  import HomeHeader from '@/views/home/components/header'
+  import abilityDocTree from './components/abilityDocTree'
+  import { ref, onMounted } from 'vue'
+  import { message } from 'ant-design-vue'
+  import { getDevelopDocTree } from '@/api/home'
+  // import flatten from '@turf/flatten'
 
-const titleList = ref([
-  {
-    name: '新手指引',
-    className: 'newGuide',
-  },
-  {
-    name: '技术文档',
-    className: 'doc',
-  },
-])
-const titleData = ref(titleList.value[0])
-const clickData = ref({})
-const treeArray = ref([])
-const treeArrayCopy = ref([])
-let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
+  const titleList = ref([
+    {
+      name: '新手指引',
+      className: 'newGuide',
+    },
+    {
+      name: '技术文档',
+      className: 'doc',
+    },
+  ])
+  const titleData = ref(titleList.value[0])
+  const clickData = ref({})
+  const treeArray = ref([])
+  const treeArrayCopy = ref([])
+  let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+  let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
 
-const treeClick = (item) => {
-  clickData.value = item
-  console.log('clickData------------>', item)
-  titleData.value = titleList.value[1]
-}
-
-const getTreeData = () => {
-  getDevelopDocTree({})
-    .then((res) => {
-      console.log('res------文档树------>', res)
-      if (res.data.code !== 0) {
-        return message.error(res.data.msg)
-      }
-      treeArray.value = res.data.data || []
-      treeArrayCopy.value = JSON.parse(JSON.stringify(treeArray.value))
-    })
-    .catch((err) => {
-      message.error(err)
-    })
-}
-
-const changeName = (item) => {
-  titleData.value = item
-  if (item.name == '新手指引') {
-    clickData.value = {}
+  const treeClick = (item) => {
+    clickData.value = item
+    console.log('clickData------------>', item)
+    titleData.value = titleList.value[1]
   }
-  if (item.name == '技术文档') {
-    if (!clickData.value.title) {
-      clickData.value = {}
-      treeArray.value = []
-      treeArrayCopy.value.map((val, i) => {
-        let obj = Object.assign({}, val, {
-          title: val.title,
-          show:
-            (i === 0 && val.children && val.children.length > 0) ||
-              typeList.includes(val.title)
-              ? true
-              : false,
-          children: [],
-        })
-        formData(val.children, obj)
-        treeArray.value.push(obj)
+
+  const getTreeData = () => {
+    getDevelopDocTree({})
+      .then((res) => {
+        console.log('res------文档树------>', res)
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+        treeArray.value = res.data.data || []
+        treeArrayCopy.value = JSON.parse(JSON.stringify(treeArray.value))
       })
-      getFirstData(treeArrayCopy.value[0] || {})
+      .catch((err) => {
+        message.error(err)
+      })
+  }
+
+  const changeName = (item) => {
+    titleData.value = item
+    if (item.name == '新手指引') {
+      clickData.value = {}
+    }
+    if (item.name == '技术文档') {
+      if (!clickData.value.title) {
+        clickData.value = {}
+        treeArray.value = []
+        treeArrayCopy.value.map((val, i) => {
+          let obj = Object.assign({}, val, {
+            title: val.title,
+            show:
+              (i === 0 && val.children && val.children.length > 0) ||
+              typeList.includes(val.title)
+                ? true
+                : false,
+            children: [],
+          })
+          formData(val.children, obj)
+          treeArray.value.push(obj)
+        })
+        getFirstData(treeArrayCopy.value[0] || {})
+      }
     }
   }
-}
 
-const formData = (children = [], dataItem) => {
-  children.map((item, index) => {
-    let _obj = Object.assign({}, item, {
-      title: item.title,
-      show:
-        (index === 0 && item.children && item.children.length > 0) ||
+  const formData = (children = [], dataItem) => {
+    children.map((item, index) => {
+      let _obj = Object.assign({}, item, {
+        title: item.title,
+        show:
+          (index === 0 && item.children && item.children.length > 0) ||
           typeList.includes(item.title)
-          ? true
-          : false,
-      children: [],
+            ? true
+            : false,
+        children: [],
+      })
+      if (item.children && item.children.length > 0) {
+        formData(item.children, _obj)
+      }
+      dataItem.children.push(_obj)
     })
-    if (item.children && item.children.length > 0) {
-      formData(item.children, _obj)
-    }
-    dataItem.children.push(_obj)
-  })
-}
-
-const getFirstData = (firstObj = {}) => {
-  if (firstObj && firstObj.children && firstObj.children.length > 0) {
-    getFirstData(firstObj.children[0])
-  } else {
-    clickData.value = firstObj
   }
-}
 
-onMounted(() => {
-  getTreeData()
-})
+  const getFirstData = (firstObj = {}) => {
+    if (firstObj && firstObj.children && firstObj.children.length > 0) {
+      getFirstData(firstObj.children[0])
+    } else {
+      clickData.value = firstObj
+    }
+  }
+
+  onMounted(() => {
+    getTreeData()
+  })
 </script>
 
 <style scoped lang="less">
-.menu-box {
-  // overflow: hidden;
-  height: 100%;
-}
-
-.first-title-text {
-  cursor: pointer;
-  font-size: 18px;
-  color: #333;
-  padding-bottom: 10px;
-  display: flex;
-  align-items: center;
-
-  &:hover {
-    color: #0058e1;
+  .menu-box {
+    // overflow: hidden;
+    height: 100%;
   }
-}
 
-.content-menu {
-  width: 1240px;
-  display: flex;
-  justify-content: flex-start;
-  margin: 0 auto;
-  margin-top: 74px;
-  box-sizing: border-box;
-  position: fixed;
-  left: 50%;
-  bottom: 0;
-  transform: translateX(-50%);
-  top: 0.6rem;
-  top: 0;
-}
+  .first-title-text {
+    cursor: pointer;
+    font-size: 18px;
+    color: #333;
+    padding-bottom: 10px;
+    display: flex;
+    align-items: center;
 
-.left {
-  width: 240px;
-  padding: 20px;
-  height: 600px;
-  margin-right: 20px;
-  background: rgba(244, 245, 248, 0.8);
-  overflow-y: scroll;
-  position: absolute;
-  top: 10px;
-  left: 0;
-}
+    &:hover {
+      color: #0058e1;
+    }
+  }
 
-.right {
-  width: 870px;
-  height: calc(100% - 20px);
+  .content-menu {
+    width: 1240px;
+    display: flex;
+    justify-content: flex-start;
+    margin: 0 auto;
+    margin-top: 74px;
+    box-sizing: border-box;
+    position: fixed;
+    left: 50%;
+    bottom: 0;
+    transform: translateX(-50%);
+    top: 0.6rem;
+    top: 0;
+  }
 
-  position: absolute;
-  top: 10px;
-  left: 260px;
-}
+  .left {
+    width: 240px;
+    padding: 20px;
+    height: 600px;
+    margin-right: 20px;
+    background: rgba(244, 245, 248, 0.8);
+    overflow-y: scroll;
+    position: absolute;
+    top: 10px;
+    left: 0;
+  }
 
-.sidebar {
-  right: 0 !important;
-}
+  .right {
+    width: 870px;
+    height: calc(100% - 20px);
 
-.content {
-  right: 16rem !important;
-  left: 0 !important;
-}
+    position: absolute;
+    top: 10px;
+    left: 260px;
+  }
 
-.img {
-  height: 20px;
-  width: 20px;
-  margin-right: 8px;
-}
+  .sidebar {
+    right: 0 !important;
+  }
 
-.doc {
-  background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
-  background-size: 100%;
-}
+  .content {
+    right: 16rem !important;
+    left: 0 !important;
+  }
 
-.newGuide {
-  background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
-  background-size: 100%;
-}
+  .img {
+    height: 20px;
+    width: 20px;
+    margin-right: 8px;
+  }
 
-.new-menu-box {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+  .doc {
+    background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
+    background-size: 100%;
+  }
 
-.rela {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
+  .newGuide {
+    background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .new-menu-box {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .rela {
+    width: 100%;
+    height: 100%;
+    position: relative;
+  }
 </style>
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index ed186af5..66fd5bc3 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -100,7 +100,7 @@
       query: {
         select: type,
         tecHnosphere: '',
-        appLiCation: ''
+        appLiCation: '',
       },
     })
   }
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 91e224dd..c24845cb 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 17:25:45
+ * @LastEditTime: 2022-07-25 15:07:05
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -132,8 +132,20 @@
                 </div>
               </div>
               <div class="ability-bottom">
-                <div class="dec">位置：{{ val.nodeName }}</div>
-                <!-- <div class="result">申请结果：{{ val.content || '--' }}</div> -->
+                <div class="dec2">位置：{{ val.nodeName }}</div>
+                <div class="result" v-if="item.approveStatus == '通过'">
+                  申请结果：{{
+                    '列表地址：' +
+                    backUrl +
+                    'resource/getApplyCameraList/' +
+                    item.instanceId +
+                    ';' +
+                    '视频流地址：' +
+                    backUrl +
+                    '/resource/hls/getHls/?channelId=' +
+                    val.channelId
+                  }}
+                </div>
               </div>
             </div>
           </div>
@@ -144,6 +156,7 @@
 </template>
 <script setup>
   import { ref, defineProps } from 'vue'
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
   const props = defineProps({
     refObj: { type: Object, default: null },
   })
@@ -334,6 +347,16 @@
                   -webkit-box-orient: vertical;
                   word-break: break-all;
                 }
+                .dec2 {
+                  width: 7rem;
+                  height: 0.22rem;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  display: -webkit-box;
+                  -webkit-line-clamp: 1;
+                  -webkit-box-orient: vertical;
+                  word-break: break-all;
+                }
                 .result:hover {
                   color: #0058e1;
                   cursor: pointer;
diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue
index cc2f7180..a3fff65e 100644
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@@ -236,8 +236,8 @@
           checked: false,
           resourceId: val.resourceId,
           createDate: val.createDate,
-          updateDate: val.updateDate, 
-           ...getObj(val, val.resourceDTO ? 'resourceDTO' : 'fuseDTO')
+          updateDate: val.updateDate,
+          ...getObj(val, val.resourceDTO ? 'resourceDTO' : 'fuseDTO'),
         }
         if (checkedList.value.indexOf(val.resourceId) == -1) {
           checkAll.value = false
@@ -250,8 +250,8 @@
   }
 
   function getObj(val, typeStr) {
-    let typeObj = val[typeStr] || {};
-    console.log('typeObj------------>', typeObj);
+    let typeObj = val[typeStr] || {}
+    console.log('typeObj------------>', typeObj)
     return {
       name: typeObj.name,
       type: typeObj.type,
@@ -464,4 +464,4 @@
   .name:hover {
     color: #0087ff;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue
index cbf4345e..db6fb3da 100644
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@@ -39,7 +39,9 @@
       <a-list-item>
         <a-skeleton avatar :title="false" :loading="!!item.loading" active>
           <a-list-item-meta
-            :description="item.description || '--'"
+            :description="
+              tabList[tabIndex] != '知识库' ? item.description || '--' : ''
+            "
             style="position: relative"
           >
             <template #title>