From 9c991756eb3b3bcb52ec7094e3708dacacbc3d99 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 3 Aug 2022 12:10:56 +0800
Subject: [PATCH 1/6] 784bug

---
 .../activiti/demo/abilitydemandapply.vue      | 177 ++++++++++++++++-
 .../views/modules/activiti/demo/comments.vue  | 183 +++++++++++++++++-
 .../activiti/demo/putaway-process3.vue        | 126 ++++++------
 .../myAgent/demo/ability-resource-shelf.vue   | 127 ++++++------
 .../myAgent/demo/competency-application.vue   | 124 ++++++------
 .../src/views/demandCenter/demandDetails.vue  |   2 +-
 6 files changed, 550 insertions(+), 189 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index 94acd632..f1b96feb 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -64,25 +64,55 @@
       </el-form-item>
     </el-form>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+     <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
   data () {
     return {
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: {
@@ -94,7 +124,13 @@ export default {
         system: '',
         scene: '',
         basis: ''
-      }
+      },
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
     }
   },
   created () {
@@ -113,6 +149,8 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   computed: {
     dataRule () {
@@ -164,6 +202,128 @@ export default {
         })
         .catch(() => {})
     },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
     // 启动流程出错回调
     startProcessErrorCallback (data) {
       console.log(data)
@@ -173,3 +333,12 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
+  }
+}
+</style>
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index fe6f3ddd..a21fb7cf 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -17,18 +17,49 @@
       </el-form>
     </div>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+    <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
+
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -44,12 +75,19 @@ export default {
   data () {
     return {
       // processVisible: true,
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: [],
       id: '',
-      shifoushizujian: true
+      shifoushizujian: true,
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
+
     }
   },
   watch: {},
@@ -85,6 +123,128 @@ export default {
         // }
         console.log('this.dataForm', this.dataForm)
       })
+    },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
     }
   },
   created () {
@@ -102,14 +262,21 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   mounted () {}
 }
 </script>
-<style lang="scss">
-  .kuandukuandukuandu{
-    max-width:1500px;
+<style lang="scss" >
+.kuandukuandukuandu {
+  max-width: 1500px;
+}
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
   }
-.wrapper {
 }
 </style>
diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 659b4720..c489b1f9 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -106,7 +106,7 @@
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
-          >拒绝</el-button
+          >驳回</el-button
         >
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
@@ -229,68 +229,76 @@ export default {
       function (data) {
         this.dataForm.taskId = this.$route.params.taskId
         if (this.dialogType === '同意') {
-          console.log('this.dataForm', this.dataForm)
-          const params = qs.stringify({
-            taskId: this.dataForm.taskId,
-            comment: this.input
-          })
-          console.log(params)
-          this.$http
-            .post('/act/task/complete?' + params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('AbilityResourcesRemovedInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  this.dialogVisible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '拒绝') {
-          const params = qs.stringify({
-            taskId: this.dataForm.taskId,
-            comment: this.input
-          })
-          this.$http
-            .post('/act/task/backToFirst?', params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('AbilityResourcesRemovedInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
-        // this.getDataList(data)
       },
       1000,
       { leading: true, trailing: false }
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 ea3cbc07..35539d3d 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -201,69 +201,78 @@ export default {
     agreeOrNot: debounce(
       function (data) {
         if (this.dialogType === '同意') {
-          console.log('this.dataForm', this.dataForm)
-          const params = qs.stringify({
-            taskId: this.taskId,
-            comment: this.input
-          })
-          console.log(params)
-          this.$http
-            .post('/act/task/complete?' + params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('abilityResourceShelfInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  this.dialogVisible = false
-                  this.input = ''
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('abilityResourceShelfInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    this.input = ''
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '驳回') {
-          const params = qs.stringify({
-            taskId: this.taskId,
-            comment: this.input
-          })
-          this.$http
-            // .post('/act/task/endProcess?', params)
-            .post('/act/task/backToFirst?', params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('abilityResourceShelfInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.taskId,
+              comment: this.input
             })
+            this.$http
+            // .post('/act/task/endProcess?', params)
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('abilityResourceShelfInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
       },
       1000,
       { leading: true, trailing: false }
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 4bfc3885..51e77c7a 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -380,68 +380,76 @@ export default {
     agreeOrNot: debounce(
       function (data) {
         if (this.dialogType === '同意') {
-          console.log('this.dataForm', this.dataForm)
-          const params = qs.stringify({
-            taskId: this.dataForm.taskId,
-            comment: this.input
-          })
-          console.log(params)
-          this.$http
-            .post('/act/task/complete?' + params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('competencyApplicationInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  this.dialogVisible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('competencyApplicationInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '驳回') {
-          const params = qs.stringify({
-            taskId: this.dataForm.taskId,
-            comment: this.input
-          })
-          this.$http
-            .post('/act/task/backToFirst?', params)
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                this.$message.error(res.msg)
-                if (this.callbacks.taskHandleErrorCallback) {
-                  this.callbacks.taskHandleErrorCallback(res)
-                }
-                return
-              }
-              bus.$emit('competencyApplicationInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('competencyApplicationInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
-        // this.getDataList(data)
       },
       1000,
       { leading: true, trailing: false }
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index 67c8f99b..97a3c31c 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -299,7 +299,7 @@
       if (res.data.code == '0') {
         demandCommentApply({ id: res.data.data.id }).then((res1) => {
           if (res1.data.code == '0') {
-            message.success('提交评价成功，请注意查看消息通知！')
+            message.success('提交评论成功，请注意查看消息通知！')
             myComment.value = ''
             evaluateList()
           }

From dee93f83b92218c7bdbbc2b5c541ff60e83af5d3 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 3 Aug 2022 12:58:51 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/menu/jcss.png                | Bin 0 -> 1377 bytes
 front/src/assets/menu/sevice-bg.png           | Bin 0 -> 4343 bytes
 front/src/assets/menu/sjzy.png                | Bin 0 -> 1512 bytes
 front/src/assets/menu/yyzy.png                | Bin 0 -> 1493 bytes
 front/src/assets/menu/zjfw.png                | Bin 0 -> 1578 bytes
 .../instructionManual/components/menuBook.vue | 271 +++++++++++++++++-
 front/src/views/instructionManual/index.vue   |  47 ++-
 7 files changed, 275 insertions(+), 43 deletions(-)
 create mode 100644 front/src/assets/menu/jcss.png
 create mode 100644 front/src/assets/menu/sevice-bg.png
 create mode 100644 front/src/assets/menu/sjzy.png
 create mode 100644 front/src/assets/menu/yyzy.png
 create mode 100644 front/src/assets/menu/zjfw.png

diff --git a/front/src/assets/menu/jcss.png b/front/src/assets/menu/jcss.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e9dab0bbe87eb3074ea41a5135ca2bc5c964e44
GIT binary patch
literal 1377
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_$;M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?p^1XIrJkXw
zp^1f|j)IYap|QS!vA&_PuAz~Yfu)t9sR9%z0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tIJh1&#2`yp;U%
zVok7eUtcTFyyB9?yyR3*7h5Hu0eYF4DOSd=#+Gh|u9gNaCeDV2t}c$2&XyJiCMJ&N
z7Uq_gW-c(jF8Rr&xv6<2Fuf@Vy^c8bf>J_m0nlcb)S}F?)D*X({9FaFkF7FsyTu%*
zc~HG6xZPrbQ?EYIG5Vl*MT%#b5HRt8nDA5!<iOK?Y927L7XeeXws!Sp1_s7!o-U3d
z6}R5ZIH>L7D0BS&I#I8b?netIJaKxmO`ZK_^OT@GzAk3=Ie%FF__8)z1{4KH33_pv
zdnu{%ZCM&n=3OYX_T$_$*Q)k@|7M>5Z11-X_kZ1aX8wET_p)c^yBUwo2=w5TVx6{V
zg5Scl4LnvIkFy<RT$c3wm_ExveMeILO?F48vy&v|Gcg}IugJ;UX!3i0#JpLWmw(6`
ztaZ+qb~F9bvSs2mx33&=JkcAlvVzO+;c7XPz5Db&Oj@4Df8{h+u5nbJ!_*ZIlcbOA
z@{UyWvOBn9<+}b4Et@WCec}3*n|1r(+WAi93)Ii2WiT9%<Ni3enCn(Yx|c*wmF5?g
zRV&%&EMU=T;tBOwR@!o~Cnft-gGxTfs<nqTS1)M#(emu?t<>Fq?b0h)Uf1PS&ojP|
z5*V#4W$-z=<2hr=^DA2$xb^vtan7EbIMrN$Rq%txMv0es_B{7GC)a!SJbiw1$L-hd
zAzL_Oe=;bq5;ys$HAyPvQc~k7b2mTj9bpr8ieFD~o-VMQZ_bVhmh8P&@2@;#e(&M*
zEMSgzTewr(4n;YE6roK<d94;t6OKEku};}J^Y&T+b%t#^DPkheLWE9jnx<^L+$!GV
u@cEC1A9#WkmRUtE`0+m=(8F*)6A#1c;{Q_o+UioELeJCH&t;ucLK6Ub!|-+h

literal 0
HcmV?d00001

diff --git a/front/src/assets/menu/sevice-bg.png b/front/src/assets/menu/sevice-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..95974faaabb4bcc353cc825c0221c1c5e08f2fc3
GIT binary patch
literal 4343
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

literal 0
HcmV?d00001

diff --git a/front/src/assets/menu/sjzy.png b/front/src/assets/menu/sjzy.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6a8b8ad524b09fb082b888d46c41ba8d639bde2
GIT binary patch
literal 1512
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_$;M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?p^1XIrJkXw
zp^1f|j)IYap|QS!vA&_PuAz~Yfu)t9sR9%z0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tIJh1&#2`yp;U%
zVok7eUtcTFyyB9?yyR3*7h5Hu0eYF4DOM(y7A~%qE`|m!CeDV2t}c#_Mi!Q)=59ca
znSrCFBTTPLesXDUYF-IUZwf-M5l+3Jl#p8hwAm%KD6=dz#jPkmR{`u}t4y43adyLL
z9#n4%ZnqfV)T<A4j6Nt{k>VL91WY_2COp*wIq-C!ng>kmMZi=&b6(Oe1_q{BPZ!6K
zid%1P_<Do{iX146*UA!eRB3A!auKQ3%nd3K)GbPE+#MCtvPHZn<MKUME<w(wTkM->
zv~r8Hxf<y9Oz2whqB|-hQ-W>cix91!zv3&H+izEYPu?UjlY9T!-Ouk>7T>S_es87%
z&*4Q^uUr#dyD3a#MZkqw+ACE0=V+BYGU)oq7XBg6RV(QAg!U*KzW+JG8Q)~Ir{y2o
zYOvGRrSo{i)fLAXL!Jc(h{j2C%{r`jeB-T;VNcSEjNg3b30-jIlTBWs#B-TnTeICS
zbfnFfyw#|An5VWQ?PA$%JLzLP9{;+v-rYQl$8h_HqegzRt9bwV>ak9JsCG-h<$7Au
zqh~V5ex<(M?o(*lwl(wZvAQjay6gPiw;wUNm$t{`&Za4AXDI3}4DZ%Fy5q(B!iqLE
zp{}1TbB%WJtliOYc~z9|!>U8=B^@)?-^kTi;eAB!QMAh3)2CUlJz$(BwCcTaO-Iy~
zd)+rya~AUc(0gRHQB&wd>qe&Jw%=9GYAP1`kJ2})t38|7QQ6k(8GZcYg*$qdYXY-Q
zS7;TnZTV-sD4+4TPxVb#Z^!R}ZvsMApNMozE~(x9?ZNV#*{>tL9W~pdr_Em4bE3M@
z(dOcPm1xJUw+=7cE-ZK3n|o8+M!nm|0<^!n&pDEG=G02QIAuBM4;pci+Z2+ykMO&e
zGTF4&&Nvdg#P)pk?g<CCwbXrm`aS91Qx0pfl`dxInO}rC8?MUj=sWP)uKmxO_&FWw
zy4L@6mi>RezORr+>eufN#j5;2^{#N$SU=-^U1V9z{{O@M{>2s@@)dpVdY+CC-_LMz
g%wD_TJ`)ea9{bboGw(j%0xEkwUHx3vIVCg!0OeFax&QzG

literal 0
HcmV?d00001

diff --git a/front/src/assets/menu/yyzy.png b/front/src/assets/menu/yyzy.png
new file mode 100644
index 0000000000000000000000000000000000000000..10de2b03874598d55dd05f873a67291fd983b1da
GIT binary patch
literal 1493
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_$;M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?p^1XIrJkXw
zp^1f|j)IYap|QS!vA&_PuAz~Yfu)t9sR9%z0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tIJh1&#2`yp;U%
zVok7eUtcTFyyB9?yyR3*7h5Hu0eYF4DON^qPDW;i7On;^CeDV2t}af-&X%r*PR=H#
z&gL$TrY<nOF8Rr&xv6<2Fuf@Vy>2-5f>J_m0nlcb)S}F?)D*X({9FaFkF7FsyTuu&
zc~HG6xZUD{Q?EYIG5Vl*MT%#b5HRt8nDA5!<iOK?Y927L7XefC(O>7kGB7ZCdAc};
zRNQ)V!`EYqqs;M-wPvSJ=<r<9+kIhavq;H}V1XBkFE4NldbJ;oW=*`i_C|96d$bLw
z-rYruOEf+#6JurFndUlok%m%mwefbb>bd)z>k}j9)!v%<{AQ}+{|^r*)*k!#{mka`
zXN;@7Rz}!{+JvQxnq9DZbDX6pgMY5aeIxh6ImeQ}Zm&y}VR!!WQY1sT%5d$UY)N5@
zre|4fSx)@RLY|iLAHN`!s^D+6cj=wic74g-HynOlyAyWts&dMcZPDzrj_`-hoppG^
z{k1$*Z>%?VIEgNsZMJdYmlkn@;PrDVn%yqSI7-;2#~xYo)+XiJB%aTE&Y0_cWyoCo
zpZP}CXW37y&(Aoz$aO=xMXTG(a`C(e>SZmwOJ2|Jxe@(yXUqnD3B!3Sa!;IeT^n*p
z^}?Dn`<5<k)_K6(rTY8}$D3(&Uve$moBZWHr#o106gNNJ;}W<oO8)&Rl~wiiw&xy{
z9>}m}JtZ~&<@-awjpn{~EnB?hwXs;NXsJT1eottPaofkeOMK(beUG-O^qk#!an0Ku
zecC^I?UsDFkg?gVuQO`zg31?1jhAd}nQr&CE0M|6!tZzZ#)fNERjs+PwI|m*n%-d9
z)v!L4$GExQtnu7p=EZ{S7cU=U_;&L5w6A6!`Q?3&PTH&Ol+2vZn_=7*a^Ze=c!lfr
z4eZlDoJ<Ufd#J*vEdSNbP<3_XQsolK+^OH*f12`A+omPY=BwrYu)gw?*|kicx8CqN
z{^XRgk<j_4n>S0Cgw<)sx%}^YIVsl5e%2u$@j%w7SgU{c9qL&m7&2tv&G-~`_&%th
N^>p=fS?83{1OTJIIqLub

literal 0
HcmV?d00001

diff --git a/front/src/assets/menu/zjfw.png b/front/src/assets/menu/zjfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..2affd86be363c369b619563cb2648a4186ad2163
GIT binary patch
literal 1578
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_$;M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?p^1XIrJkXw
zp^1f|j)IYap|QS!vA&_PuAz~Yfu)t9sR9%z0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tIJh1&#2`yp;U%
zVok7eUtcTFyyB9?yyR3*7h5Hu0eYF4DZs!qw{&zia4~Q(aW*t`b#XE`H??$gax^!y
zFflQ5Gll7O$xklLP0cHT=}kfCb;YR{loE0afHu3N7G;*DrnnX5=PH1GY?X=IElxPi
zgX&Ge?G~U<aQH(X=oo!ayduRjObD2GKumb51#;l&J~a=R*o%Ov`pb>bDGUru^F3W0
zLn>~)xp6XEI8o-<N6*V5Nn7$nqmMof*uI$ER-;4RmA@(Kpqx_IY1daroBs*Ni5%1t
zDs**W<rnpL;urh+Adp|~Ro(`@gKpikdhUzQYg9ZpZKle%3F3BB)MnoQeJ1~2xmxb2
zZMoT2y?oiTddn7UxH$8}51DTX%j@=cM{69{o#C}%#r4M$*A~8d^&@!BvB_bqQGLue
zdbhZn`&`%B(aUsfwq(ZsFOQAuW=fgPH)P#yAg^EODJ7M`+?TLe?{v8DoKHXZe7+Y`
z`daYZ>-0qqdo6loXY|gui`~f7G&3(X@Q`iHf#X%oGdas2YD{}*{m&%9{rn;AIY(t#
z`FK;x&N}9Vx}Pd7QSmxn^y&t4%$0Rtc(#b$E{T76P(Akl0)x<Scirof<t;5nyNems
zO78FKPv2_pCj3lb*T<;Ith%?lxXxeh+qC8Lz89aC)%N+X+-CW3=`7=?EJfuRoMy`X
zrazW>hgEMA6`j-R%JoD}?LxKBs~cO~!_TVDZhpR_tG(j!_BOF(dA6+_>M`lRqIVyA
zv#(Wd@=j;*t+UUpJF~;;_F~^6=II~xUTrh)Z&Um`=Sr%<^kw|UN_vmve=P96xpLhs
z_fwMh-McwOk{J2}H$Cp3l*Q9>R{Y!7#on@!Ymds6m#lW1pT+jZ@&A@+gEaHHo|W64
z?}^i2cffM@&*X^WpKPy=bMDz1ZGI+3-SoSCBiFb8(yZ$3zx`@`zjxL!@4MwD`z)-8
z^?I||*Rq~%3$z!{(k=;<j+AlV$?14%)!g1)r|*P4Qd`B#5fr*M)UnuYXK;CffWA<R
z;qiB&y4slv?tIG)Lft25%1-XK^0#f2nQb7Xc&5WHI{dFiV-L?KjVcz+S9^Wt+$v<Y
xtoq6!F+Fjw*zUAR_DgU7@5^L2dc2;2nZZQ$OT(pmE1!W%Z%<c0mvv4FO#qG=R89Z@

literal 0
HcmV?d00001

diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index ce9ed800..7748e61e 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -9,7 +9,10 @@
                 </div>
                 <div class="list-box">
                     <div class="list-item" v-for="(item, i) in seviceList" :key="i">
-                        <div class="item-name">{{ item.name }}</div>
+                        <div class="item-name">
+                            <div class="icon-name" :style="{ 'background-image': `url(${item.imgIcon || ''})` }"></div>
+                            {{ item.name }}
+                        </div>
                         <div class="name-box">
                             <div class="item-v" v-for="(v, j) in item.list" :key="j">{{ v }}</div>
                         </div>
@@ -17,7 +20,6 @@
                     </div>
                 </div>
             </div>
-            <!-- imgList -->
             <div class="img-box" v-for="(item, i) in imgList" :key="i">
                 <div class="title">
                     <div class="text">{{ item.name }}</div>
@@ -25,49 +27,101 @@
                 </div>
                 <div class="img-bg" :class="item.className" :style="{ 'background-image': `url(${item.bgImg || ''})` }">
                 </div>
-                <div v-if="item.btnText" class="btn">{{ item.btnText }} >></div>
+                <div v-if="item.btnText" class="btn" @click="item.btnAction && item.btnAction()">{{ item.btnText }} >>
+                </div>
             </div>
         </div>
+        <a-modal v-model:visible="visible" @ok="handleOk" class="shangjia-class" @cancel="handlecancel">
+            <div class="ant-modal-title" id="vcDialogTitle1">
+                <div class="showBg"></div>
+                能力上架申请
+            </div>
+            <div class="ability-to-type">
+                <div class="title">能力类型选择</div>
+                <div class="ability-to-type-content">
+                    <div v-for="item in abilityToType" :key="item" @click="abilityToTypeFunction(item)" :class="
+                        abilityToTypeFunctionData == item
+                            ? 'ability-to-type-down'
+                            : ''
+                    ">
+                        {{ item }}
+                    </div>
+                </div>
+            </div>
+            <div class="component-type" v-if="abilityToTypeFunctionData == '组件服务'">
+                <div class="title">组件类型选择</div>
+                <div class="component-type-content">
+                    <a-radio-group v-model:value="componentTypeValue">
+                        <a-radio @click="componentTypeValueFunction(item)" v-for="item in componentType" :key="item"
+                            :value="item">
+                            {{ item }}
+                        </a-radio>
+                    </a-radio-group>
+                </div>
+            </div>
+        </a-modal>
+
     </div>
 </template>
 <script setup>
 import HomeHeader from '@/views/home/components/header'
 import HomeFooter from '@/views/newHome/components/Footer'
 import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
 
 const seviceList = ref(
     [
         {
             name: '组件服务',
+            imgIcon: require('../../../assets/menu/zjfw.png'),
             list: ['智能算法', '图层服务', '开发组件', '业务组件'],
         },
         {
             name: '应用资源',
+            imgIcon: require('../../../assets/menu/yyzy.png'),
             list: ['办公系统', '业务系统', '门户网站', '大屏看板', '小程序', '公众号'],
         },
         {
-            name: '组件服务',
+            name: '基础设施',
+            imgIcon: require('../../../assets/menu/jcss.png'),
             list: ['视频资源', '云资源', '感知资源'],
         },
         {
-            name: '组件服务',
+            name: '数据资源',
+            imgIcon: require('../../../assets/menu/sjzy.png'),
             list: ['政务信息资源'],
         },
     ]
 )
 
 const imgList = ref([
+    {
+        name: '总体流程',
+        bgImg: require('../../../assets/menu/process.png'),
+        className: 'process-img',
+    },
     {
         name: '能力上架',
         bgImg: require('../../../assets/menu/shelves.png'),
         btnText: '立即上架',
-        className: 'shelves-img'
+        className: 'shelves-img',
+        btnAction: () => {
+            showModal()
+        }
     },
     {
         name: '能力申请',
         bgImg: require('../../../assets/menu/apply.png'),
         btnText: '立即申请',
-        className: 'apply-img'
+        className: 'apply-img',
+        btnAction: () => {
+            const newpage = router.resolve({
+                path: '/addApplication', // 跳转的页面路由
+            })
+            window.open(newpage.href, '_blank')
+        },
     },
     {
         name: '需求发布',
@@ -83,6 +137,75 @@ const imgList = ref([
     },
 ])
 
+//能力上架弹窗
+function handlecancel() {
+    abilityToTypeFunctionData.value = '组件服务'
+    componentTypeValue.value = ''
+}
+let abilityToTypeFunctionData = ref('组件服务')
+function abilityToTypeFunction(item) {
+    abilityToTypeFunctionData.value = item
+}
+let abilityToType = ref(['组件服务', '应用资源'])
+let componentType = ref([
+    '智能算法',
+    '图层服务',
+    '开发组件',
+    // '办公组件',
+    '业务组件',
+    // '其他',
+])
+const visible = ref(false)
+const showModal = () => {
+    visible.value = true
+}
+
+let componentTypeValueOld = ref('')
+function componentTypeValueFunction(item) {
+    if (componentTypeValueOld.value != item) {
+        componentTypeValue.value = item
+        componentTypeValueOld.value = item
+    } else {
+        componentTypeValue.value = ''
+    }
+}
+let componentTypeValue = ref('')
+const handleOk = (e) => {
+    let snum = ref({})
+    if (abilityToTypeFunctionData.value == '组件服务') {
+        if (!componentTypeValue.value || componentTypeValue.value == '') {
+            message.error('请选择组件类型！')
+            return
+        } else if (
+            componentTypeValue.value === '智能算法' ||
+            componentTypeValue.value === '开发组件' ||
+            componentTypeValue.value === '业务组件' ||
+            componentTypeValue.value === '图层服务'
+        ) {
+            snum.value = {
+                abilityToType: abilityToTypeFunctionData.value,
+                componentTypeValue: componentTypeValue.value,
+            }
+        } else {
+            message.error('功能开发中！')
+            return
+        }
+    } else {
+        snum.value = {
+            abilityToType: abilityToTypeFunctionData.value,
+        }
+    }
+    const applypage = router.resolve({
+        path: '/nenglishangjia', // 跳转的页面路由
+        query: snum.value,
+    })
+    window.open(applypage.href, '_blank')
+    visible.value = false
+    abilityToTypeFunctionData.value = '组件服务'
+    componentTypeValue.value = ''
+    console.log(e)
+}
+
 </script>
 
 
@@ -93,7 +216,7 @@ const imgList = ref([
 }
 
 .title {
-    margin-bottom: 20px;
+    margin-bottom: 35px;
 
     .text {
         padding: 20px 0;
@@ -152,6 +275,8 @@ const imgList = ref([
         height: 350px;
         margin: 0 auto;
     }
+
+
 }
 
 .img-bg {
@@ -161,31 +286,26 @@ const imgList = ref([
 
 .process-img {
     height: 855px;
-    background-image: url('../../../assets/menu/process.png');
 }
 
 .shelves-img {
     height: 497px;
     width: 1107px;
     margin: 0 auto;
-    background-image: url('../../../assets/menu/shelves.png');
 }
 
 .apply-img {
     height: 752px;
-    background-image: url('../../../assets/menu/apply.png');
 }
 
 .demand-img {
     height: 525px;
     width: 1300px;
     margin: 0 auto;
-    background-image: url('../../../assets/menu/demand.png');
 }
 
 .down-img {
     height: 544px;
-    background-image: url('../../../assets/menu/down.png');
 }
 
 .list-box {
@@ -209,6 +329,9 @@ const imgList = ref([
             font-size: 20px;
             text-align: center;
             padding: 20px 0 10px 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
         }
 
         .name-box {
@@ -218,17 +341,135 @@ const imgList = ref([
             flex-wrap: wrap;
         }
 
+        .icon-name {
+            width: 30px;
+            height: 30px;
+            background-size: 100% 100%;
+            margin-right: 4px;
+        }
+
         .item-v {
             min-width: 100px;
             color: #fff;
             font-size: 20px;
             text-align: center;
             padding: 10px;
-            border: 1px solid rgba(255, 255, 255, 0.4);
             border-radius: 6px;
-            background: rgba(255, 255, 255, 0.2);
             margin: 0 16px 20px 16px;
+            background: url('../../../assets/menu/sevice-bg.png');
+            background-size: 100% 100%;
         }
     }
 }
+</style>
+
+<style lang="less" scoped>
+.shangjia-class {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    margin-left: -2.6rem;
+    margin-top: -1.44rem;
+    font-size: 0.14rem;
+    font-weight: 500;
+
+    .ant-radio-inner {
+        height: 0.16rem;
+        width: 0.16rem;
+    }
+
+    .ant-radio-inner::after {
+        background-color: unset;
+        background: url('~@/assets/personalCenter/xuanzhong.png') no-repeat;
+        background-size: cover;
+        background-position: center;
+    }
+
+    .ant-modal-content {
+        border-radius: 0.1rem;
+
+        .ability-to-type,
+        .component-type {
+            display: flex;
+            margin-top: 0.2rem;
+
+            .title {
+                white-space: nowrap;
+                margin-right: 0.2rem;
+                display: flex;
+                align-items: center;
+                height: 0.26rem;
+            }
+
+            .component-type-content {
+                width: 100%;
+                height: unset;
+                border: unset;
+                background: unset;
+
+                .ant-radio-group {
+                    display: grid;
+                    grid-template-columns: 1fr 1fr 1fr;
+                    grid-gap: 0.15rem;
+                }
+            }
+        }
+
+        .ability-to-type {
+            .ability-to-type-content {
+                display: grid;
+                grid-template-columns: 1fr 1fr 1fr;
+                height: unset;
+                border: unset;
+                background: unset;
+
+                div {
+                    margin-right: 0.15rem;
+                    cursor: pointer;
+                    font-size: 0.14rem;
+                    width: 0.9rem;
+                    height: 0.26rem;
+                    border-radius: 0.13rem;
+                    color: #333333;
+                    background: #f5f5f5;
+                    border: 0.01rem #cccccc solid;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    font-weight: 500;
+                }
+
+                .ability-to-type-down {
+                    background: #0087ff;
+                    color: #fff;
+                }
+            }
+        }
+    }
+
+    .ant-modal-title {
+        display: flex;
+        align-items: center;
+    }
+
+    .ant-modal-footer {
+        border: 0;
+        text-align: center;
+        padding-bottom: 0.2rem;
+
+        button {
+            margin-right: 0.2rem;
+            border-radius: 0.08rem;
+        }
+    }
+
+    .showBg {
+        height: 0.24rem;
+        width: 0.24rem;
+        background: url('~@/assets/home/shenqing.png') no-repeat;
+        background-size: cover;
+        background-position: center;
+        margin-right: 0.1rem;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue
index cb4c45b6..b7956605 100644
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@@ -1,28 +1,25 @@
 <template>
   <home-header></home-header>
   <div class="menu-container">
-    <div class="menu-box">
-      <div id="container" class="content-menu">
-        <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="img" :class="data.className"></div>
-            {{ data.name }}
-          </div>
-          <abilityDocTree :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
+    <div id="container" class="content-menu">
+      <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="img" :class="data.className"></div>
+          {{ data.name }}
         </div>
-        <!-- 技术文档 -->
-        <div class="right" v-if="titleData.name !== '新手指引'">
-          <div style="height: 100%">
-            <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
-              :src="doc_base_url + clickData.doc"></iframe>
-          </div>
+        <abilityDocTree :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
+      </div>
+      <!-- 技术文档 -->
+      <div class="right" v-if="titleData.name !== '新手指引'">
+        <div style="height: 100%">
+          <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
+            :src="doc_base_url + clickData.doc"></iframe>
         </div>
       </div>
-      <menuBook v-if="titleData.name === '新手指引'"></menuBook>
     </div>
+    <menuBook v-if="titleData.name === '新手指引'"></menuBook>
   </div>
-
   <!-- <home-footer></home-footer> -->
 </template>
 <script setup>
@@ -133,7 +130,6 @@ onMounted(() => {
 
 <style scoped lang="less">
 .menu-box {
-  // overflow: hidden;
   height: 100%;
 }
 
@@ -153,6 +149,8 @@ onMounted(() => {
 .menu-container {
   width: 100%;
   padding-top: 0.74rem;
+  min-height: 1000px;
+  position: relative;
 }
 
 .content-menu {
@@ -161,12 +159,6 @@ onMounted(() => {
   justify-content: flex-start;
   margin: 0 auto;
   box-sizing: border-box;
-  // position: fixed;
-  // left: 50%;
-  // bottom: 0;
-  // transform: translateX(-50%);
-  // top: 0.6rem;
-  // top: 0;
 }
 
 .left {
@@ -175,13 +167,13 @@ onMounted(() => {
   margin-right: 20px;
   background: rgba(244, 245, 248, 1);
   overflow-y: scroll;
-  position: fixed;
+  position: absolute;
   top: 200px;
-  left: 90px;
+  left: 85px;
 }
 
 .right {
-  width: 1300px;
+  width: 1400px;
   height: calc(100% - 20px);
   position: absolute;
   top: 10px;
@@ -226,5 +218,4 @@ onMounted(() => {
   height: 100%;
   position: relative;
 }
-
 </style>

From bba86294dfcf2d995423b58fb2d76da6a708e05e Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 3 Aug 2022 13:36:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/menu/new-bg.png              | Bin 0 -> 2949 bytes
 .../components/abilityDocTree.vue             | 236 +++++++++---------
 front/src/views/instructionManual/index.vue   |  63 +++--
 3 files changed, 157 insertions(+), 142 deletions(-)
 create mode 100644 front/src/assets/menu/new-bg.png

diff --git a/front/src/assets/menu/new-bg.png b/front/src/assets/menu/new-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b3c5ef9fd61ac0816586e9b2ddacb92866326e9
GIT binary patch
literal 2949
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

literal 0
HcmV?d00001

diff --git a/front/src/views/instructionManual/components/abilityDocTree.vue b/front/src/views/instructionManual/components/abilityDocTree.vue
index a88e101a..3523542d 100644
--- a/front/src/views/instructionManual/components/abilityDocTree.vue
+++ b/front/src/views/instructionManual/components/abilityDocTree.vue
@@ -1,159 +1,147 @@
 <template>
   <div class="list-box">
-    <div
-      class="list-item"
-      v-for="(item, i) in newDataList"
-      :key="i"
-      @click.stop="showChildren(item)"
-    >
+    <div class="list-item" v-for="(item, i) in newDataList" :key="i" @click.stop="showChildren(item)">
       <a-tooltip placement="top" :title="item.title" arrow-point-at-center>
-        <div
-          :class="[
-            newClickData.title === item.title ? 'select' : '',
-            level === 1 ? 'parent' : '',
-            judgeLeaf(item) ? 'leaf' : '',
-          ]"
-          class="list-text"
-        >
+        <div :class="[
+          newClickData.title === item.title ? 'select' : '',
+          level === 1 ? 'parent' : '',
+          judgeLeaf(item) ? 'leaf' : '',
+        ]" class="list-text">
           {{ item.title }}
           <DownOutlined v-show="!item.show && !judgeLeaf(item)" />
           <UpOutlined v-show="item.show && !judgeLeaf(item)" />
         </div>
       </a-tooltip>
       <div style="margin-left: 10px" v-if="!judgeLeaf(item) && item.show">
-        <abilityDocTree
-          :dataList="item.children"
-          @tree-click="handleTreeItem"
-          :clickData="newClickData"
-          :level="newLevel + 1"
-        ></abilityDocTree>
+        <abilityDocTree :dataList="item.children" @tree-click="handleTreeItem" :clickData="newClickData"
+          :level="newLevel + 1"></abilityDocTree>
       </div>
     </div>
   </div>
 </template>
 <script setup>
-  import {
-    defineComponent,
-    onMounted,
-    ref,
-    watch,
-    defineProps,
-    nextTick,
-  } from 'vue'
-  import { getDevelopDocTree } from '@/api/home'
-  import { message } from 'ant-design-vue'
-  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+import {
+  defineComponent,
+  onMounted,
+  ref,
+  watch,
+  defineProps,
+  nextTick,
+} from 'vue'
+import { getDevelopDocTree } from '@/api/home'
+import { message } from 'ant-design-vue'
+import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
 
-  const props = defineProps({
-    dataList: {
-      type: Array,
-      default: () => [],
+const props = defineProps({
+  dataList: {
+    type: Array,
+    default: () => [],
+  },
+  level: {
+    type: Number,
+    default: 1,
+  },
+  clickData: {
+    type: Object,
+    default: () => {
+      ''
     },
-    level: {
-      type: Number,
-      default: 1,
-    },
-    clickData: {
-      type: Object,
-      default: () => {
-        ''
-      },
-    },
-  })
+  },
+})
 
-  // 数组
-  const newDataList = ref(props.dataList)
-  // 级别
-  const newLevel = ref(props.level)
+// 数组
+const newDataList = ref(props.dataList)
+// 级别
+const newLevel = ref(props.level)
 
-  const newClickData = ref(props.clickData)
+const newClickData = ref(props.clickData)
 
-  // 判断是不是叶子节点
-  const judgeLeaf = (item) => {
-    if (item.children && item.children.length > 0) {
-      return false
+// 判断是不是叶子节点
+const judgeLeaf = (item) => {
+  if (item.children && item.children.length > 0) {
+    return false
+  } else {
+    return true
+  }
+}
+
+const showChildren = (item) => {
+  if (!(item.children && item.children.length > 0)) {
+    if (newClickData.value.title !== '') {
+      handleTreeItem(item)
     } else {
-      return true
+      handleTreeItem({ title: '' })
     }
   }
+  if (item.children && item.children.length > 0) {
+    item.show = !item.show
+  }
+}
 
-  const showChildren = (item) => {
-    if (!(item.children && item.children.length > 0)) {
-      if (newClickData.value.title !== '') {
-        handleTreeItem(item)
-      } else {
-        handleTreeItem({ title: '' })
-      }
-    }
-    if (item.children && item.children.length > 0) {
-      item.show = !item.show
+watch(
+  () => props.dataList,
+  (val) => {
+    if (val) {
+      newDataList.value = val
     }
   }
+)
 
-  watch(
-    () => props.dataList,
-    (val) => {
-      if (val) {
-        newDataList.value = val
-      }
+watch(
+  () => props.clickData,
+  (val) => {
+    if (val) {
+      newClickData.value = val
     }
-  )
-
-  watch(
-    () => props.clickData,
-    (val) => {
-      if (val) {
-        newClickData.value = val
-      }
-    }
-  )
-
-  const emit = defineEmits(['treeClick'])
-  const handleTreeItem = (item) => {
-    emit('tree-click', item)
   }
+)
+
+const emit = defineEmits(['treeClick'])
+const handleTreeItem = (item) => {
+  emit('tree-click', item)
+}
 </script>
 <style lang="less" scoped>
-  .list-text {
-    font-size: 16px;
-    color: #333;
-    padding: 10px 0;
-    cursor: pointer;
-    padding-left: 10px;
-    border-bottom: 1px solid #ccc;
-    overflow: hidden;
-    /*文本不会换行*/
-    white-space: nowrap;
-    /*当文本溢出包含元素时，以省略号表示超出的文本*/
-    text-overflow: ellipsis;
+.list-text {
+  font-size: 16px;
+  color: #333;
+  padding: 10px 0;
+  cursor: pointer;
+  padding-left: 10px;
+  border-bottom: 1px solid #ccc;
+  overflow: hidden;
+  /*文本不会换行*/
+  white-space: nowrap;
+  /*当文本溢出包含元素时，以省略号表示超出的文本*/
+  text-overflow: ellipsis;
 
-    &:hover {
-      color: #0058e1;
-      cursor: pointer;
-    }
-  }
-
-  .parent {
-    margin-bottom: 10px;
-    background: rgba(0, 135, 225, 0.1);
-    color: #333;
-
-    &:hover {
-      color: #fff;
-      background: #0058e1;
-      cursor: pointer;
-    }
-  }
-
-  .leaf {
-    font-size: 14px;
-    color: #555;
-    cursor: pointer;
-  }
-
-  .select {
+  &:hover {
     color: #0058e1;
-    font-weight: 600;
     cursor: pointer;
   }
+}
+
+.parent {
+  margin-bottom: 10px;
+  background: rgba(0, 135, 225, 0.1);
+  color: #333;
+
+  &:hover {
+    color: #fff;
+    background: #0058e1;
+    cursor: pointer;
+  }
+}
+
+.leaf {
+  font-size: 14px;
+  color: #555;
+  cursor: pointer;
+}
+
+.select {
+  color: #0058e1;
+  font-weight: 600;
+  cursor: pointer;
+}
 </style>
diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue
index b7956605..b7617fcd 100644
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@@ -3,13 +3,18 @@
   <div class="menu-container">
     <div id="container" class="content-menu">
       <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="img" :class="data.className"></div>
-          {{ data.name }}
+        <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
+          @click="changeName({ name: '技术文档' })">
+          技术文档
         </div>
-        <abilityDocTree :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
+        <abilityDocTree style="max-height:400px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
       </div>
+
+      <div class="first-title-text new-guide-box" :style="{ color: '新手指引' === titleData.name ? '#0058e1' : '' }"
+        @click="changeName({ name: '新手指引' })">
+        <div class="guide-text">新手指引</div>
+      </div>
+
       <!-- 技术文档 -->
       <div class="right" v-if="titleData.name !== '新手指引'">
         <div style="height: 100%">
@@ -146,6 +151,10 @@ onMounted(() => {
   }
 }
 
+.doc {
+  font-weight: bold;
+}
+
 .menu-container {
   width: 100%;
   padding-top: 0.74rem;
@@ -163,22 +172,45 @@ onMounted(() => {
 
 .left {
   width: 200px;
-  padding: 20px;
-  margin-right: 20px;
-  background: rgba(244, 245, 248, 1);
-  overflow-y: scroll;
+  padding-left: 10px;
+  padding-top: 10px;
+  background: #f4f5f8;
   position: absolute;
-  top: 200px;
+  top: 300px;
   left: 85px;
+  max-height: 400px;
+}
+
+.new-guide-box {
+  position: absolute;
+  top: 300px;
+  right: 205px;
+  width: 74px;
+  height: 136px;
+  background: url('~@/assets/menu/new-bg.png') no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  padding-bottom: 0;
+}
+
+.guide-text {
+  width: 25px;
+  text-align: center;
+  word-wrap: break-word;
+  font-size: 20px;
+  color: #0058e1;
 }
 
 .right {
-  width: 1400px;
+  width: 1300px;
   height: calc(100% - 20px);
   position: absolute;
-  top: 10px;
-  left: 300px;
   min-height: 600px;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
 .sidebar {
@@ -196,11 +228,6 @@ onMounted(() => {
   margin-right: 8px;
 }
 
-.doc {
-  background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
-  background-size: 100%;
-}
-
 .newGuide {
   background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
   background-size: 100%;

From e271d2fe945d54e1315879f6a0b4e778ccb4c36f Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 3 Aug 2022 14:05:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?789=E3=80=81790bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |    2 +-
 .../modules/ability/bsabilityservice.vue      |    2 +-
 .../home/components/searchResultList.vue      | 2016 +++++++++--------
 3 files changed, 1082 insertions(+), 938 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index fc55d089..11b91214 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -154,7 +154,7 @@
               >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >开发文档</el-button
+              >技术文档</el-button
             >
             <el-button
               type="text"
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 56412788..f72ee2c8 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -149,7 +149,7 @@
               >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >开发文档</el-button
+              >技术文档</el-button
             >
             <el-button
               type="text"
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 7e97ba24..70ae9509 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,100 +6,187 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-            cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'">
-          <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
+        <ul
+          v-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        >
+          <li
+            v-for="(item, i) in orderList"
+            :key="item.value"
+            @click="changeOrder(i, item.value, item.orderType)"
+          >
             {{ item.name }}
-            <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
+            <span
+              class="arrow"
+              :class="item.orderType == 'ASC' ? 'down' : ''"
+            ></span>
           </li>
         </ul>
         <ul v-else>
-          <li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="
-            item.show &&
-            item.name !== '评分' &&
-            selectCardsname !== '数据资源'
-          ">
+          <li
+            v-for="item in selList"
+            :key="item.value"
+            @click="changeCondition(item.value)"
+            v-show="
+              item.show &&
+              item.name !== '评分' &&
+              selectCardsname !== '数据资源'
+            "
+          >
             {{ item.name }}
-            <span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
+            <span
+              class="arrow"
+              :class="item.value == selData ? 'down' : ''"
+            ></span>
           </li>
         </ul>
       </div>
     </div>
-    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
+    <div
+      class="result-list"
+      v-for="(item, index) in resourceList.data"
+      :key="item.index"
+    >
       <div class="item" :key="showKey">
-        <div class="left" style="display: flex; align-items: center" v-if="
-          item.type === '应用资源' &&
-          item.infoList &&
-          item.infoList.filter((val) => val.attrType == '应用图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
+            item.type === '应用资源' &&
+            item.infoList &&
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '应用图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" style="display: flex;
-          align-items: center"
-          v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
-          <a-image :width="106" :preview="false"
-            :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (selectCardsname === '融合服务' ||
+              selectCardsname === '赋能场景') &&
+            item.fuseAttrList &&
+            item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" :class="
-          item.type == '应用资源'
-            ? 'yyzy'
-            : !item.type
+        <div
+          class="left"
+          :class="
+            item.type == '应用资源'
+              ? 'yyzy'
+              : !item.type
               ? 'sjzy'
               : !item.infoList ||
                 !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                ? 'znsf'
-                : item.infoList &&
-                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                    .attrValue == '智能算法'
-                  ? 'znsf'
-                  : item.infoList &&
-                    item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                      .attrValue == '图层服务'
-                    ? 'tcfw'
-                    : item.infoList &&
-                      item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                        .attrValue == '开发组件'
-                      ? 'kfzj'
-                      : item.infoList &&
-                        item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                          .attrValue == '业务组件'
-                        ? 'ywzj'
-                        : ''
-        " v-else-if="
-  selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景'
-"></div>
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '智能算法'
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '图层服务'
+              ? 'tcfw'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '开发组件'
+              ? 'kfzj'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '业务组件'
+              ? 'ywzj'
+              : ''
+          "
+          v-else-if="
+            selectCardsname !== '基础设施' &&
+            selectCardsname !== '融合服务' &&
+            selectCardsname !== '赋能场景'
+          "
+        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"></div>
+        <div
+          class="left rhfw"
+          v-else-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
-                style="margin-left: 10px">
+              <svg
+                t="1652322568870"
+                class="icon"
+                viewBox="0 0 3072 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3062"
+                width="40"
+                height="40"
+                v-if="item.applyState == '通过'"
+                style="margin-left: 10px; min-width: 40px"
+              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06" p-id="3063"></path>
+                  fill="#d81e06"
+                  p-id="3063"
+                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06" p-id="3064"></path>
+                  fill="#d81e06"
+                  p-id="3064"
+                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06" p-id="3065"></path>
+                  fill="#d81e06"
+                  p-id="3065"
+                ></path>
               </svg>
             </span>
             <div class="header-right">
-              <div v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'" class="label-content">
-                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
-                  <span class="label"
-                    v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
-                    :key="index">
+              <div
+                v-if="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                class="label-content"
+              >
+                <template
+                  v-if="
+                    item.fuseAttrList &&
+                    item.fuseAttrList.filter(
+                      (val) => val.attrType == '应用领域'
+                    )[0]
+                  "
+                >
+                  <span
+                    class="label"
+                    v-for="(data, index) in item.fuseAttrList
+                      .filter((val) => val.attrType == '应用领域')[0]
+                      .attrValue.split(';')"
+                    :key="index"
+                  >
                     {{ data }}
                   </span>
                 </template>
@@ -131,13 +218,21 @@
             >
               <span>{{ item.shareType || '--' }}</span>
             </div> -->
-            <div v-if="
-              selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' && selectCardsname !== '基础设施'
-            ">
+            <div
+              v-if="
+                selectCardsname !== '融合服务' &&
+                selectCardsname !== '赋能场景' &&
+                selectCardsname !== '基础设施'
+              "
+            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
+          <div
+            v-if="selectCardsname !== '基础设施'"
+            style="margin-top: 0.1rem"
+            class="description"
+          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -146,26 +241,32 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景' &&
-                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                ">
+                <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景' &&
+                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                  "
+                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div v-if="
-                  selectCardsname === '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <div
+                  v-if="
+                    selectCardsname === '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -184,28 +285,59 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template v-if="
-                  selectCardsname == '组件服务' ||
-                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                ">
-                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
+                <template
+                  v-if="
+                    selectCardsname == '组件服务' ||
+                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                  "
+                >
+                  <span
+                    class="shopping-down"
+                    v-if="item.isInShoppingCart"
+                  ></span>
+                  <span
+                    class="shopping-on"
+                    v-else
+                    @click="addShoppingCart(item, index)"
+                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
-                <span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
+                <span
+                  class="sc-down"
+                  v-if="item.isCollect == 'false'"
+                  @click="addCollect(item)"
+                ></span>
+                <span
+                  class="sc-on"
+                  v-if="item.isCollect == 'true'"
+                  @click="addCollect(item)"
+                ></span>
               </div>
-              <div class="shopping pk" :key="pk" v-show="
-                cardType == '组件服务' && findComponentName(item, '智能算法')
-              ">
+              <div
+                class="shopping pk"
+                :key="pk"
+                v-show="
+                  cardType == '组件服务' && findComponentName(item, '智能算法')
+                "
+              >
                 <span class="pk-on" @click="goComparePk(item, index)"></span>
               </div>
-              <a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
+              <a-button
+                type="primary"
+                @click="toView('details', item)"
+                v-if="!whoShow1.itShowBaoTou"
+              >
                 查看详情
               </a-button>
-              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"
-                @click="handleAKeyApplication(item)">
+              <a-button
+                style="margin-left: 10px"
+                v-show="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                @click="handleAKeyApplication(item)"
+              >
                 一键申请
               </a-button>
               <!-- <a-button
@@ -216,12 +348,16 @@
               >
                 免费试用
               </a-button> -->
-              <a-button type="primary" @click="toView('apply', item)" v-show="
-                cardType == '组件服务' ||
-                (cardType == '应用资源' && whoShow1.itShowQingDao)
-              ">
+              <a-button
+                type="primary"
+                @click="toView('apply', item)"
+                v-show="
+                  cardType == '组件服务' ||
+                  (cardType == '应用资源' && whoShow1.itShowQingDao)
+                "
+              >
                 {{
-                    item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -234,7 +370,12 @@
         </div>
       </div>
     </div>
-    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
+    <a-modal
+      v-model:visible="visible"
+      title="视频预览"
+      :width="750"
+      destroyOnClose
+    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -245,919 +386,922 @@
   </div>
 </template>
 <script>
-import { ref, reactive } from 'vue'
-import { message } from 'ant-design-vue'
-import { useRouter } from 'vue-router'
-import { getUser, sgcInsert } from '@/api/home'
-import { scInsert, scDel } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
-import { getHls } from '@/api/home.js'
-export default {
-  name: '',
-  // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
-  props: {
-    resourceList: {
-      type: Object,
-      default: () => { },
-    },
-    resourceTotal: {
-      type: String,
-      default: '0',
-    },
-    selectCardsname: {
-      type: String,
-      default: '组件服务',
-    },
-  },
-  computed: {
-    dataList() {
-      const newArr = []
-      for (let i = 0; i < this.resourceList.data.length; i++) {
-        let arr = [
-          {
-            name: '应用名称',
-            value: '',
-          },
-          {
-            name: '应用ID',
-            value: '',
-            dataResourceId: '',
-          },
-          {
-            name: '应用领域',
-            value: '',
-          },
-          {
-            name: '组件类型',
-            value: '',
-          },
-          {
-            name: '技术领域',
-            value: '',
-          },
-          {
-            name: '共享类型',
-            value: '',
-          },
-          {
-            name: '共享条件',
-            value: '',
-          },
-        ]
-        arr.map((item) => {
-          if (item.name === '应用名称') {
-            item.value = this.resourceList.data[i].name
-          }
-          if (item.name === '应用ID') {
-            item.value = this.resourceList.data[i].id
-            item.dataResourceId =
-              this.resourceList.data[i].infoList[0].dataResourceId
-          }
-          if (item.name === '应用领域') {
-            this.resourceList.data[i].infoList.map((aa) => {
-              aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
-            })
-          }
-          if (item.name === '组件类型') {
-            this.resourceList.data[i].infoList.map((aa) => {
-              aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
-            })
-          }
-          if (item.name === '技术领域') {
-            this.resourceList.data[i].infoList.map((aa) => {
-              aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
-            })
-          }
-          if (item.name === '共享类型') {
-            this.resourceList.data[i].infoList.map((aa) => {
-              aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
-            })
-          }
-          if (item.name === '共享条件') {
-            this.resourceList.data[i].infoList.map((aa) => {
-              aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
-            })
-          }
-        })
-        newArr.push(arr)
-      }
-      console.log(
-        'dataList======================>',
-        newArr,
-        this.resourceList
-      )
-      return newArr
-    },
-    isShoppingCartOrNot() {
-      return ''
-    },
-  },
-  components: {},
-  setup(props) {
-    // eslint-disable-next-line no-undef
-    const whoShow1 = whoShow
-    const showKey = ref(0)
-    let shoppingKey = ref(1)
-    // 融合服务排序
-    const orderList = ref([
-      {
-        value: 'collectCount',
-        name: '收藏量',
-        orderType: 'DESC',
+  import { ref, reactive } from 'vue'
+  import { message } from 'ant-design-vue'
+  import { useRouter } from 'vue-router'
+  import { getUser, sgcInsert } from '@/api/home'
+  import { scInsert, scDel } from '@/api/personalCenter'
+  import mybus from '@/myplugins/mybus'
+  import { getHls } from '@/api/home.js'
+  export default {
+    name: '',
+    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
+    props: {
+      resourceList: {
+        type: Object,
+        default: () => {},
       },
-      {
-        value: 'create_date',
-        name: '发布时间',
-        orderType: 'DESC',
+      resourceTotal: {
+        type: String,
+        default: '0',
       },
-      {
-        value: 'update_date',
-        name: '更新时间',
-        orderType: 'DESC',
+      selectCardsname: {
+        type: String,
+        default: '组件服务',
       },
-    ])
-    // 购物车id列表
-    const selList = ref([
-      { name: '发布时间', value: 'tdr.create_date', show: true },
-      { name: '浏览量', value: 'visits', show: true },
-      { name: '申请量', value: 'applyCount', show: true },
-      { name: '收藏量', value: 'collectCount', show: true },
-      { name: '评分', value: 'score', show: true },
-    ])
-    if (props.selectCardsname === '基础设施') {
-      selList.value.map((val) => (val.show = false))
-    } else if (props.selectCardsname === '数据资源') {
-      selList.value.map(
-        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-      )
-    }
-    const findComponentName = (list, name) => {
-      if (list.infoList) {
-        return list.infoList.find((item) => {
-          if (item.attrType === '组件类型') {
-            return item.attrValue === name
-          }
-        })
-      }
-    }
-    console.log('this.resourceList', props.resourceList.data)
-    props.resourceList.data.map((val) => {
-      if (val.infoList) {
-        let obj = val.infoList.filter(
-          (item) => item.attrType == '组件类型'
-        )[0]
-        if (obj) {
-          switch (obj.attrValue) {
-            case '智能算法':
-              val.applicationType = 'znsf'
-              break
-            case '图层服务':
-              val.applicationType = 'tcfw'
-              break
-            case '开发组件':
-              val.applicationType = 'kfzj'
-              break
-            case '业务组件':
-              val.applicationType = 'ywzj'
-              break
-          }
-          console.log('obj', val.applicationType)
-        }
-      }
-    })
-    showKey.value++
-    const selData = ref('total')
-    const flag = ref(true)
-    // userId
-    const userId = ref('')
-    getUser().then((res) => {
-      console.log('getUser============>', res)
-      userId.value = res.data.data.id
-    })
-    const resultList = [1, 2, 3, 4]
-    const router = useRouter()
-    const cardType = router.currentRoute.value.query.select
-    const onSearch = (searchValue) => {
-      console.log('use value', searchValue)
-      console.log('or use this.value', searchValue.value)
-    }
-    function toView(type, item) {
-      debugger
-      if (props.selectCardsname == '数据资源') {
-        if (whoShow1.itShowQingDao) {
-          window.open(
-            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-            item.guid
-          )
-        } else {
-          window.open(
-            'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-          )
-        }
-      } else if (props.selectCardsname === '融合服务') {
-        // 打包模式
-        router.push({
-          path: '/packagingDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else if (props.selectCardsname === '赋能场景') {
-        router.push({
-          path: '/integrationServicesDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else {
-        if (type === 'apply') {
-          console.log('一键申请===================>', item)
-          localStorage.setItem(
-            'applyList',
-            JSON.stringify([
-              {
-                arr: [
-                  {
-                    delFlag: item.delFlag,
-                    description: item.description,
-                    resourceId: item.id,
-                    resourceName: item.name,
-                    time: item.createDate,
-                    type: item.type,
-                    componentType:
-                      (item.infoList.filter(
-                        (val) => val.attrType == '组件类型'
-                      )[0] &&
-                        item.infoList.filter(
-                          (val) => val.attrType == '组件类型'
-                        )[0].attrValue) ||
-                      '',
-                  },
-                ],
-                deptId: item.deptId,
-                deptName: item.deptName,
-              },
-            ])
-          )
-          router.push({
-            path: '/apply',
+    },
+    computed: {
+      dataList() {
+        const newArr = []
+        for (let i = 0; i < this.resourceList.data.length; i++) {
+          let arr = [
+            {
+              name: '应用名称',
+              value: '',
+            },
+            {
+              name: '应用ID',
+              value: '',
+              dataResourceId: '',
+            },
+            {
+              name: '应用领域',
+              value: '',
+            },
+            {
+              name: '组件类型',
+              value: '',
+            },
+            {
+              name: '技术领域',
+              value: '',
+            },
+            {
+              name: '共享类型',
+              value: '',
+            },
+            {
+              name: '共享条件',
+              value: '',
+            },
+          ]
+          arr.map((item) => {
+            if (item.name === '应用名称') {
+              item.value = this.resourceList.data[i].name
+            }
+            if (item.name === '应用ID') {
+              item.value = this.resourceList.data[i].id
+              item.dataResourceId =
+                this.resourceList.data[i].infoList[0].dataResourceId
+            }
+            if (item.name === '应用领域') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '组件类型') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '技术领域') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '共享类型') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
+              })
+            }
+            if (item.name === '共享条件') {
+              this.resourceList.data[i].infoList.map((aa) => {
+                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
+              })
+            }
           })
-        } else {
-          console.log(
-            '111111111111111111===========>',
-            router,
-            props.selectCardsname
-          )
+          newArr.push(arr)
+        }
+        console.log(
+          'dataList======================>',
+          newArr,
+          this.resourceList
+        )
+        return newArr
+      },
+      isShoppingCartOrNot() {
+        return ''
+      },
+    },
+    components: {},
+    setup(props) {
+      // eslint-disable-next-line no-undef
+      const whoShow1 = whoShow
+      const showKey = ref(0)
+      let shoppingKey = ref(1)
+      // 融合服务排序
+      const orderList = ref([
+        {
+          value: 'collectCount',
+          name: '收藏量',
+          orderType: 'DESC',
+        },
+        {
+          value: 'create_date',
+          name: '发布时间',
+          orderType: 'DESC',
+        },
+        {
+          value: 'update_date',
+          name: '更新时间',
+          orderType: 'DESC',
+        },
+      ])
+      // 购物车id列表
+      const selList = ref([
+        { name: '发布时间', value: 'tdr.create_date', show: true },
+        { name: '浏览量', value: 'visits', show: true },
+        { name: '申请量', value: 'applyCount', show: true },
+        { name: '收藏量', value: 'collectCount', show: true },
+        { name: '评分', value: 'score', show: true },
+      ])
+      if (props.selectCardsname === '基础设施') {
+        selList.value.map((val) => (val.show = false))
+      } else if (props.selectCardsname === '数据资源') {
+        selList.value.map(
+          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+        )
+      }
+      const findComponentName = (list, name) => {
+        if (list.infoList) {
+          return list.infoList.find((item) => {
+            if (item.attrType === '组件类型') {
+              return item.attrValue === name
+            }
+          })
+        }
+      }
+      console.log('this.resourceList', props.resourceList.data)
+      props.resourceList.data.map((val) => {
+        if (val.infoList) {
+          let obj = val.infoList.filter(
+            (item) => item.attrType == '组件类型'
+          )[0]
+          if (obj) {
+            switch (obj.attrValue) {
+              case '智能算法':
+                val.applicationType = 'znsf'
+                break
+              case '图层服务':
+                val.applicationType = 'tcfw'
+                break
+              case '开发组件':
+                val.applicationType = 'kfzj'
+                break
+              case '业务组件':
+                val.applicationType = 'ywzj'
+                break
+            }
+            console.log('obj', val.applicationType)
+          }
+        }
+      })
+      showKey.value++
+      const selData = ref('total')
+      const flag = ref(true)
+      // userId
+      const userId = ref('')
+      getUser().then((res) => {
+        console.log('getUser============>', res)
+        userId.value = res.data.data.id
+      })
+      const resultList = [1, 2, 3, 4]
+      const router = useRouter()
+      const cardType = router.currentRoute.value.query.select
+      const onSearch = (searchValue) => {
+        console.log('use value', searchValue)
+        console.log('or use this.value', searchValue.value)
+      }
+      function toView(type, item) {
+        debugger
+        if (props.selectCardsname == '数据资源') {
+          if (whoShow1.itShowQingDao) {
+            window.open(
+              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+                item.guid
+            )
+          } else {
+            window.open(
+              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+            )
+          }
+        } else if (props.selectCardsname === '融合服务') {
+          // 打包模式
           router.push({
-            path: '/details',
+            path: '/packagingDetails',
             query: {
               id: item.id,
             },
           })
-        }
-      }
-    }
-    // 加入申购车
-    const addShoppingCart = (item, index) => {
-      console.log('item===============>', item)
-      if (flag.value && item.id) {
-        flag.value = false
-        sgcInsert({
-          delFlag: '0',
-          resourceId: item.id,
-          // userId: userId.value,
-        }).then((res) => {
-          console.log(res)
-          message.success('添加申购车成功！')
-          mybus.emit('getSgcNum')
-          mybus.emit('changeSelcted', index)
-          flag.value = true
-        })
-      }
-      shoppingKey.value++
-      // 查询申购车中已有id,用于过滤图标
-    }
-    // 添加收藏
-    const addCollect = (item) => {
-      console.log('收藏===============>', item, flag.value)
-      if (flag.value && item.id) {
-        flag.value = false
-        if (item.isCollect == 'true') {
-          scDel([item.id]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('取消成功')
-              item.isCollect = 'false'
-              item.collectCount--
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
-            }
+        } else if (props.selectCardsname === '赋能场景') {
+          router.push({
+            path: '/integrationServicesDetails',
+            query: {
+              id: item.id,
+            },
           })
         } else {
-          scInsert([
-            {
-              resourceId: item.id,
-            },
-          ]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('添加收藏成功！')
-              item.isCollect = 'true'
-              item.collectCount++
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
-            }
+          if (type === 'apply') {
+            console.log('一键申请===================>', item)
+            localStorage.setItem(
+              'applyList',
+              JSON.stringify([
+                {
+                  arr: [
+                    {
+                      delFlag: item.delFlag,
+                      description: item.description,
+                      resourceId: item.id,
+                      resourceName: item.name,
+                      time: item.createDate,
+                      type: item.type,
+                      componentType:
+                        (item.infoList.filter(
+                          (val) => val.attrType == '组件类型'
+                        )[0] &&
+                          item.infoList.filter(
+                            (val) => val.attrType == '组件类型'
+                          )[0].attrValue) ||
+                        '',
+                    },
+                  ],
+                  deptId: item.deptId,
+                  deptName: item.deptName,
+                },
+              ])
+            )
+            router.push({
+              path: '/apply',
+            })
+          } else {
+            console.log(
+              '111111111111111111===========>',
+              router,
+              props.selectCardsname
+            )
+            router.push({
+              path: '/details',
+              query: {
+                id: item.id,
+              },
+            })
+          }
+        }
+      }
+      // 加入申购车
+      const addShoppingCart = (item, index) => {
+        console.log('item===============>', item)
+        if (flag.value && item.id) {
+          flag.value = false
+          sgcInsert({
+            delFlag: '0',
+            resourceId: item.id,
+            // userId: userId.value,
+          }).then((res) => {
+            console.log(res)
+            message.success('添加申购车成功！')
+            mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
+            flag.value = true
           })
         }
+        shoppingKey.value++
+        // 查询申购车中已有id,用于过滤图标
       }
-    }
-    // 更换查询条件
-    const changeCondition = (val) => {
-      selData.value = selData.value == val ? 'total' : val
-      const orderType = selData.value == val ? 'ASC' : 'DESC'
-      mybus.emit('changeCondition', {
-        orderField: val,
-        orderType: orderType,
-      })
-      console.log('选择===========》', val, selData.value)
-    }
-
-    // 融合服务--排序
-    const changeOrder = (i, val, type) => {
-      let newType = type === 'DESC' ? 'ASC' : 'DESC'
-      orderList.value[i].orderType = newType
-      mybus.emit('changeCondition', {
-        orderField: val,
-        orderType: newType,
-      })
-    }
-
-    // 融合服务--一键申请
-    // 一键申请
-    const handleAKeyApplication = (item ) => {
-      let _applyList = [];
-      let fuseResourceList = item.fuseResourceList || []
-      let jcssArray = fuseResourceList.filter(v => v.type === '基础设施')
-      let otherArray = fuseResourceList.filter(v => v.type !== '基础设施')
-      jcssArray = jcssArray.map(v => {
-        v = Object.assign(v, v.resource)
-        return v
-      })
-      let jcss = [
-        {
-          arr: [
-            {
-              description: '',
-              note1: JSON.stringify(jcssArray),
-              resourceId: '1522550195055828996',
-              resourceName: '摄像头列表',
-              type: '基础设施',
-            },
-          ],
-          deptId: '',
-          deptName: '',
-        },
-      ]
-      if (infrastructure) {
-        jcss[0].deptId = infrastructure.deptId
-        jcss[0].deptName = infrastructure.deptName
-      }
-      otherArray.map((v) => {
-        let resource = v.resource || {}
-        console.log('resource------------>', resource);
-        let obj = {
-          arr: [
-            {
-              delFlag: resource.delFlag,
-              description: resource.description,
-              resourceId: resource.id,
-              resourceName: resource.name,
-              time: resource.createDate,
-              type: resource.type,
-            },
-          ],
-          deptId: resource.deptId,
-          deptName: resource.deptName,
+      // 添加收藏
+      const addCollect = (item) => {
+        console.log('收藏===============>', item, flag.value)
+        if (flag.value && item.id) {
+          flag.value = false
+          if (item.isCollect == 'true') {
+            scDel([item.id]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('取消成功')
+                item.isCollect = 'false'
+                item.collectCount--
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          } else {
+            scInsert([
+              {
+                resourceId: item.id,
+              },
+            ]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('添加收藏成功！')
+                item.isCollect = 'true'
+                item.collectCount++
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          }
         }
-        _applyList.push(obj)
-      })
-      _applyList = jcss.concat(_applyList)
-      localStorage.setItem('applyList', JSON.stringify(_applyList))
-      router.push({
-        path: '/apply',
-      })
-    }
-
-    // const handleAKeyApplication = (item) => {
-    //   let _applyList = []
-    //     ; (item.fuseResourceList || []).map((v) => {
-    //       let resource = v.resource || {}
-    //       let obj = {
-    //         arr: [
-    //           {
-    //             delFlag: resource.delFlag,
-    //             description: resource.description,
-    //             resourceId: resource.id,
-    //             resourceName: resource.name,
-    //             time: resource.createDate,
-    //             type: resource.type,
-    //           },
-    //         ],
-    //         deptId: resource.deptId,
-    //         deptName: resource.deptName,
-    //       }
-    //       _applyList.push(obj)
-    //     })
-
-    //   localStorage.setItem('applyList', JSON.stringify(_applyList))
-    //   router.push({
-    //     path: '/apply',
-    //   })
-    // }
-
-    mybus.on('chongzhi', (typeObj) => {
-      console.log('typeObj------------>', typeObj)
-      if (!typeObj) {
-        selData.value = 'total'
       }
-      if (typeObj && (typeObj.type === '融合服务' || typeObj.type === '赋能场景')) {
-        orderList.value = [
+      // 更换查询条件
+      const changeCondition = (val) => {
+        selData.value = selData.value == val ? 'total' : val
+        const orderType = selData.value == val ? 'ASC' : 'DESC'
+        mybus.emit('changeCondition', {
+          orderField: val,
+          orderType: orderType,
+        })
+        console.log('选择===========》', val, selData.value)
+      }
+
+      // 融合服务--排序
+      const changeOrder = (i, val, type) => {
+        let newType = type === 'DESC' ? 'ASC' : 'DESC'
+        orderList.value[i].orderType = newType
+        mybus.emit('changeCondition', {
+          orderField: val,
+          orderType: newType,
+        })
+      }
+
+      // 融合服务--一键申请
+      // 一键申请
+      const handleAKeyApplication = (item) => {
+        let _applyList = []
+        let fuseResourceList = item.fuseResourceList || []
+        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
+        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
+        jcssArray = jcssArray.map((v) => {
+          v = Object.assign(v, v.resource)
+          return v
+        })
+        let jcss = [
           {
-            value: 'collectCount',
-            name: '收藏量',
-            orderType: 'DESC',
-          },
-          {
-            value: 'create_date',
-            name: '发布时间',
-            orderType: 'DESC',
-          },
-          {
-            value: 'update_date',
-            name: '更新时间',
-            orderType: 'DESC',
+            arr: [
+              {
+                description: '',
+                note1: JSON.stringify(jcssArray),
+                resourceId: '1522550195055828996',
+                resourceName: '摄像头列表',
+                type: '基础设施',
+              },
+            ],
+            deptId: '',
+            deptName: '',
           },
         ]
+        if (infrastructure) {
+          jcss[0].deptId = infrastructure.deptId
+          jcss[0].deptName = infrastructure.deptName
+        }
+        otherArray.map((v) => {
+          let resource = v.resource || {}
+          console.log('resource------------>', resource)
+          let obj = {
+            arr: [
+              {
+                delFlag: resource.delFlag,
+                description: resource.description,
+                resourceId: resource.id,
+                resourceName: resource.name,
+                time: resource.createDate,
+                type: resource.type,
+              },
+            ],
+            deptId: resource.deptId,
+            deptName: resource.deptName,
+          }
+          _applyList.push(obj)
+        })
+        _applyList = jcss.concat(_applyList)
+        localStorage.setItem('applyList', JSON.stringify(_applyList))
+        router.push({
+          path: '/apply',
+        })
       }
-    })
-    let videoUrl = ref('')
-    const options = reactive({
-      width: '700px', //播放器宽度
-      height: '400px', //播放器高度
-      color: '#409eff', //主题色
-      title: '', //视频名称
-      src: '', //视频源
-      type: 'm3u8', // 视频源类型
-      muted: false, //静音
-      webFullScreen: false,
-      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-      autoPlay: true, //自动播放
-      loop: false, //循环播放
-      mirror: false, //镜像画面
-      ligthOff: false, //关灯模式
-      volume: 0.3, //默认音量大小
-      control: true, //是否显示控制
-      controlBtns: [
-        'audioTrack',
-        'quality',
-        'speedRate',
-        'volume',
-        'setting',
-        'pip',
-        'pageFullScreen',
-        'fullScreen',
-      ], //显示所有按钮,
-    })
-    let visible = ref(false)
-    // 打开视频预览
-    const openVideo = (item) => {
-      videoUrl.value = ''
-      const param = {
-        key: item.link,
+
+      // const handleAKeyApplication = (item) => {
+      //   let _applyList = []
+      //     ; (item.fuseResourceList || []).map((v) => {
+      //       let resource = v.resource || {}
+      //       let obj = {
+      //         arr: [
+      //           {
+      //             delFlag: resource.delFlag,
+      //             description: resource.description,
+      //             resourceId: resource.id,
+      //             resourceName: resource.name,
+      //             time: resource.createDate,
+      //             type: resource.type,
+      //           },
+      //         ],
+      //         deptId: resource.deptId,
+      //         deptName: resource.deptName,
+      //       }
+      //       _applyList.push(obj)
+      //     })
+
+      //   localStorage.setItem('applyList', JSON.stringify(_applyList))
+      //   router.push({
+      //     path: '/apply',
+      //   })
+      // }
+
+      mybus.on('chongzhi', (typeObj) => {
+        console.log('typeObj------------>', typeObj)
+        if (!typeObj) {
+          selData.value = 'total'
+        }
+        if (
+          typeObj &&
+          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
+        ) {
+          orderList.value = [
+            {
+              value: 'collectCount',
+              name: '收藏量',
+              orderType: 'DESC',
+            },
+            {
+              value: 'create_date',
+              name: '发布时间',
+              orderType: 'DESC',
+            },
+            {
+              value: 'update_date',
+              name: '更新时间',
+              orderType: 'DESC',
+            },
+          ]
+        }
+      })
+      let videoUrl = ref('')
+      const options = reactive({
+        width: '700px', //播放器宽度
+        height: '400px', //播放器高度
+        color: '#409eff', //主题色
+        title: '', //视频名称
+        src: '', //视频源
+        type: 'm3u8', // 视频源类型
+        muted: false, //静音
+        webFullScreen: false,
+        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+        autoPlay: true, //自动播放
+        loop: false, //循环播放
+        mirror: false, //镜像画面
+        ligthOff: false, //关灯模式
+        volume: 0.3, //默认音量大小
+        control: true, //是否显示控制
+        controlBtns: [
+          'audioTrack',
+          'quality',
+          'speedRate',
+          'volume',
+          'setting',
+          'pip',
+          'pageFullScreen',
+          'fullScreen',
+        ], //显示所有按钮,
+      })
+      let visible = ref(false)
+      // 打开视频预览
+      const openVideo = (item) => {
+        videoUrl.value = ''
+        const param = {
+          key: item.link,
+        }
+        getHls(param).then((res) => {
+          console.log('获取视频地址===============>', res)
+          // videoUrl.value = res.data.data
+          options.src = res.data.data
+          visible.value = true
+        })
       }
-      getHls(param).then((res) => {
-        console.log('获取视频地址===============>', res)
-        // videoUrl.value = res.data.data
-        options.src = res.data.data
-        visible.value = true
-      })
-    }
-    // 算法对比跳转
-    const goComparePk = (item) => {
-      router.push({
-        path: '/algorithmCompare',
-        query: {
-          id: item.id,
-        },
-      })
-    }
-    return {
-      onSearch,
-      resultList,
-      toView,
-      addShoppingCart,
-      changeCondition,
-      selData,
-      selList,
-      addCollect,
-      cardType,
-      findComponentName,
-      shoppingKey,
-      openVideo,
-      videoUrl,
-      options,
-      visible,
-      goComparePk,
-      whoShow1,
-      showKey,
-      orderList,
-      handleAKeyApplication,
-      changeOrder,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('chongzhi')
-    // mybus.emit('changeSelcted')
-  },
-}
+      // 算法对比跳转
+      const goComparePk = (item) => {
+        router.push({
+          path: '/algorithmCompare',
+          query: {
+            id: item.id,
+          },
+        })
+      }
+      return {
+        onSearch,
+        resultList,
+        toView,
+        addShoppingCart,
+        changeCondition,
+        selData,
+        selList,
+        addCollect,
+        cardType,
+        findComponentName,
+        shoppingKey,
+        openVideo,
+        videoUrl,
+        options,
+        visible,
+        goComparePk,
+        whoShow1,
+        showKey,
+        orderList,
+        handleAKeyApplication,
+        changeOrder,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('chongzhi')
+      // mybus.emit('changeSelcted')
+    },
+  }
 </script>
 <style scoped lang="less">
-#search-result-list-container {
-  width: 1088px;
-  padding: 0 20px;
-  background: #f3f5f9;
+  #search-result-list-container {
+    width: 1088px;
+    padding: 0 20px;
+    background: #f3f5f9;
 
-  .detail-content {
-    // 超出
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 130px;
-    display: inline-block;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    // margin: 11px 0 20px;
-    // background: #e5f2ff;
-    // padding-left: 20px;
-    display: flex;
-    align-items: center;
-    position: relative;
-
-    .circle {
-      width: 16px;
-      height: 16px;
-      border-radius: 50%;
-      background-color: #0087ff;
-      text-align: center;
-      color: #fff;
-      line-height: 16px;
-      margin-right: 21px;
+    .detail-content {
+      // 超出
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 130px;
+      display: inline-block;
     }
 
-    .result {
-      font-size: 14px;
-      font-weight: 500;
-      color: #212121;
+    .shai-xuan {
+      width: 1047px;
+      height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-      span {
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      ul {
-        display: flex;
+      .result {
+        font-size: 14px;
+        font-weight: 500;
+        color: #212121;
 
-        li {
-          width: 90px;
-          height: 12px;
-          text-align: center;
-          cursor: pointer;
+        span {
+          font-size: 18px;
+          color: #0087ff;
+        }
+      }
+
+      .condition {
+        position: absolute;
+        right: 20px;
+        top: 10px;
+
+        ul li {
+          list-style-type: none;
+        }
+
+        ul {
           display: flex;
-          justify-content: center;
-          align-items: center;
 
-          .arrow {
-            display: inline-block;
-            width: 12px;
+          li {
+            width: 90px;
             height: 12px;
-            background: url('~@/assets/newHome/arrow.png');
-            margin-left: 10px;
-          }
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-          .down {
-            background: url('~@/assets/newHome/down.png');
-            margin-top: 6px;
+            .arrow {
+              display: inline-block;
+              width: 12px;
+              height: 12px;
+              background: url('~@/assets/newHome/arrow.png');
+              margin-left: 10px;
+            }
+
+            .down {
+              background: url('~@/assets/newHome/down.png');
+              margin-top: 6px;
+            }
           }
         }
       }
     }
-  }
 
-  .result-list {
-    width: 1048px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-    border-top: 1px rgba(150, 144, 144, 0.3) solid;
-    padding: 10px 0;
-
-    .item {
-      width: 100%;
-      margin-top: 10px;
+    .result-list {
+      width: 1048px;
       display: flex;
-      align-items: center;
+      flex-direction: column;
+      flex-wrap: wrap;
+      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+      border-top: 1px rgba(150, 144, 144, 0.3) solid;
+      padding: 10px 0;
 
-      .left {
-        display: inline-block;
-        width: 120px;
-        height: 110px;
-        margin-right: 16px;
-      }
-
-      .right {
+      .item {
         width: 100%;
-      }
-
-      .yyzy {
-        background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .sjzy {
-        background: url('~@/assets/home/sjzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .znsf {
-        background: url('~@/assets/home/znsf_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .tcfw {
-        background: url('~@/assets/home/tcfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .kfzj {
-        background: url('~@/assets/home/kfzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .ywzj {
-        background: url('~@/assets/home/ywzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .rhfw {
-        background: url('~@/assets/home/rhfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .jcss {
-        background: url('~@/assets/home/sxt_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .header {
+        margin-top: 10px;
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        margin: 0 10px 0 0;
 
-        .header-right {
+        .left {
+          display: inline-block;
+          width: 120px;
+          height: 110px;
+          margin-right: 16px;
+        }
+
+        .right {
+          width: 100%;
+        }
+
+        .yyzy {
+          background: url('~@/assets/home/yyzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .sjzy {
+          background: url('~@/assets/home/sjzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .znsf {
+          background: url('~@/assets/home/znsf_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .tcfw {
+          background: url('~@/assets/home/tcfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .kfzj {
+          background: url('~@/assets/home/kfzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .ywzj {
+          background: url('~@/assets/home/ywzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .rhfw {
+          background: url('~@/assets/home/rhfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .jcss {
+          background: url('~@/assets/home/sxt_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .header {
           display: flex;
-          font-size: 14px;
-          color: #212121;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
 
-          span {
+          .header-right {
+            display: flex;
             font-size: 14px;
             color: #212121;
+
+            span {
+              font-size: 14px;
+              color: #212121;
+            }
+
+            div {
+              margin-right: 24px;
+            }
+
+            .label-content {
+              flex: 1;
+              display: flex;
+              justify-content: flex-end;
+
+              .label {
+                padding: 0.01rem 0.1rem;
+                margin-right: 0.1rem;
+                border-radius: 0.13rem;
+                background: #0087ff;
+              }
+            }
           }
 
+          .header-right:last-child {
+            div {
+              margin-right: 16px;
+            }
+          }
+
+          span {
+            font-size: 20px;
+            font-weight: 600;
+            // color: #0087ff;
+          }
+        }
+
+        .dec {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // white-space: nowrap;
+          color: #0058e1;
+          display: flex;
+          margin-top: 10px;
+
           div {
-            margin-right: 24px;
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
           }
 
-          .label-content {
+          div:nth-child(2) {
+            max-width: 200px;
+            display: -webkit-box;
+            /*设置为弹性盒子*/
+            -webkit-line-clamp: 1;
+            /*最多显示3行*/
+            overflow: hidden;
+            /*超出隐藏*/
+            text-overflow: ellipsis;
+            /*超出显示为省略号*/
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .btn {
+          display: flex;
+          justify-content: space-between;
+          font-size: 14px;
+          margin: 5px 0;
+
+          // .left {
+          //   width: 600px;
+          //   display: flex;
+          //   justify-content: space-between;
+          //   flex-wrap: wrap;
+          //   & > div {
+          //     width: 300px;
+          //     & > span {
+          //       color: #0087ff;
+          //       font-weight: 600;
+          //     }
+          //   }
+          // }
+          .right {
             flex: 1;
             display: flex;
             justify-content: flex-end;
+            margin: 0 10px;
+            align-items: center;
 
-            .label {
-              padding: 0.01rem 0.1rem;
-              margin-right: 0.1rem;
-              border-radius: 0.13rem;
-              background: #0087ff;
+            .shopping {
+              span {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 10px;
+                margin-top: 5px;
+              }
+
+              .shopping-on {
+                background: url('~@/assets/newHome/shopping-on.png');
+                cursor: pointer;
+              }
+
+              .shopping-down {
+                background: url('~@/assets/newHome/shopping-down.png');
+              }
             }
-          }
-        }
 
-        .header-right:last-child {
-          div {
-            margin-right: 16px;
-          }
-        }
-
-        span {
-          font-size: 20px;
-          font-weight: 600;
-          // color: #0087ff;
-        }
-      }
-
-      .dec {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        // white-space: nowrap;
-        color: #0058e1;
-        display: flex;
-        margin-top: 10px;
-
-        div {
-          margin-right: 10px;
-          background: rgba(0, 88, 225, 0.1);
-          padding-left: 10px;
-          padding-right: 10px;
-        }
-
-        div:nth-child(2) {
-          max-width: 200px;
-          display: -webkit-box;
-          /*设置为弹性盒子*/
-          -webkit-line-clamp: 1;
-          /*最多显示3行*/
-          overflow: hidden;
-          /*超出隐藏*/
-          text-overflow: ellipsis;
-          /*超出显示为省略号*/
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
-      }
-
-      .btn {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-        margin: 5px 0;
-
-        // .left {
-        //   width: 600px;
-        //   display: flex;
-        //   justify-content: space-between;
-        //   flex-wrap: wrap;
-        //   & > div {
-        //     width: 300px;
-        //     & > span {
-        //       color: #0087ff;
-        //       font-weight: 600;
-        //     }
-        //   }
-        // }
-        .right {
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
-
-          .shopping {
-            span {
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
+              background: url('~@/assets/newHome/pk-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
-              background: url('~@/assets/newHome/shopping-down.png');
-            }
-          }
-
-          .pk-on {
-            display: inline-block;
-            height: 32px;
-            width: 32px;
-            margin-left: 10px;
-            margin-right: 10px;
-            margin-top: 5px;
-            background: url('~@/assets/newHome/pk-on.png');
-            cursor: pointer;
-          }
-
-          .sc {
-            // margin-top: 4px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-
-            .sc-down {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-down.png');
-            }
-
-            .sc-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-on.png');
-            }
-          }
-
-          .ant-btn {
-            background: transparent;
-            background: #0058e1;
-            color: white;
-            width: 80px;
-            height: 32px;
-            font-weight: 600;
-            border-radius: 2px;
-            text-align: center;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 10px;
-          }
-
-          .ant-btn:last-child {
-            background: #0058e1;
-            color: white;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-        align-items: center;
-
-        &>div {
-          display: flex;
-          align-items: center;
-
-          &>div {
-            margin: 0 10px;
-          }
-        }
-
-        .pingfen {
-          :deep(span) {
-            display: flex;
-            align-items: center;
-
-            :deep(ul) {
+            .sc {
+              // margin-top: 4px;
+              cursor: pointer;
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
-                margin-right: 4px;
+              .sc-down {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-down.png');
+              }
+
+              .sc-on {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-on.png');
+              }
+            }
+
+            .ant-btn {
+              background: transparent;
+              background: #0058e1;
+              color: white;
+              width: 80px;
+              height: 32px;
+              font-weight: 600;
+              border-radius: 2px;
+              text-align: center;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-left: 10px;
+            }
+
+            .ant-btn:last-child {
+              background: #0058e1;
+              color: white;
+            }
+          }
+        }
+
+        .bottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10px;
+          align-items: center;
+
+          & > div {
+            display: flex;
+            align-items: center;
+
+            & > div {
+              margin: 0 10px;
+            }
+          }
+
+          .pingfen {
+            :deep(span) {
+              display: flex;
+              align-items: center;
+
+              :deep(ul) {
+                display: flex;
+                align-items: center;
+
+                :deep(.ant-rate-star:not(:last-child)) {
+                  margin-right: 4px;
+                }
               }
             }
           }
         }
       }
-    }
 
-    .item:nth-of-type(1) {
-      margin-top: 0;
+      .item:nth-of-type(1) {
+        margin-top: 0;
+      }
     }
   }
-}
 
-.description {
-  max-width: 990px;
-  height: 52px;
-  font-size: 14px;
-  line-height: 18px;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  /*最多显示3行*/
-  overflow: hidden;
-  /*超出隐藏*/
-  text-overflow: ellipsis;
-  /*超出显示为省略号*/
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
+  .description {
+    max-width: 990px;
+    height: 52px;
+    font-size: 14px;
+    line-height: 18px;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    /*最多显示3行*/
+    overflow: hidden;
+    /*超出隐藏*/
+    text-overflow: ellipsis;
+    /*超出显示为省略号*/
+    -webkit-box-orient: vertical;
+    word-break: break-all;
+  }
 </style>

From ce0ce3f2f1138cbf94cd9718a15296622c00d2f8 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 3 Aug 2022 14:17:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/instructionManual/index.vue | 56 +++++----------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue
index 717e8b10..6e599ca7 100644
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@@ -11,24 +11,20 @@
           :clickData="clickData"></abilityDocTree>
       </div>
 
-      <div class="first-title-text new-guide-box" :style="{ color: '新手指引' === titleData.name ? '#0058e1' : '' }"
-        @click="changeName({ name: '新手指引' })">
-        <div class="guide-text">新手指引</div>
+      <div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
+        @click="changeName({ name: '使用手册' })">
+        <div class="guide-text">使用手册</div>
       </div>
 
       <!-- 技术文档 -->
-      <div class="right" v-if="titleData.name !== '新手指引'">
+      <div class="right" v-if="titleData.name !== '使用手册'">
         <div style="height: 100%">
           <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
             :src="doc_base_url + clickData.doc"></iframe>
         </div>
-        <!-- 使用手册 -->
-        <div class="manual" v-if="titleData.name === '新手指引'">
-          <p>使用手册</p>
-        </div>
       </div>
     </div>
-    <menuBook v-if="titleData.name === '新手指引'"></menuBook>
+    <menuBook v-if="titleData.name === '使用手册'"></menuBook>
   </div>
 
   <home-footer v-if="footShow"></home-footer>
@@ -45,7 +41,7 @@ import HomeFooter from '@/views/newHome/components/Footer'
 
 const titleList = ref([
   {
-    name: '新手指引',
+    name: '使用手册',
     className: 'newGuide',
   },
   {
@@ -85,7 +81,7 @@ const footShow = ref(true)
 
 const changeName = (item) => {
   titleData.value = item
-  if (item.name == '新手指引') {
+  if (item.name == '使用手册') {
     footShow.value = true
     clickData.value = {}
   }
@@ -224,24 +220,14 @@ onMounted(() => {
 }
 
 .left {
-  z-index: 10;
   width: 200px;
-  padding: 20px;
-  margin-right: 20px;
-  background: rgba(244, 245, 248, 1);
-  overflow-y: scroll;
+  padding-left: 10px;
+  padding-top: 10px;
+  background: #f4f5f8;
   position: absolute;
-  top: 200px;
-  left: 20px;
-}
-
-.right {
-  width: 1300px;
-  height: calc(100% - 20px);
-  position: absolute;
-  top: 10px;
-  left: 300px;
-  min-height: 600px;
+  top: 300px;
+  left: 85px;
+  max-height: 400px;
 }
 
 .manual {
@@ -287,32 +273,16 @@ onMounted(() => {
   margin-right: 8px;
 }
 
-.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>

From 403018f234045378af2d70035055ecedecdb28e5 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 3 Aug 2022 14:23:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=87=E7=AD=BE=E5=AD=97=E4=BD=93=E6=BC=94?=
 =?UTF-8?q?=E7=A4=BA=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/searchResultList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 70ae9509..b8c6d0e0 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -1104,6 +1104,7 @@
                 margin-right: 0.1rem;
                 border-radius: 0.13rem;
                 background: #0087ff;
+                color: #fff;
               }
             }
           }