From ccbcab8dfaea2d427437f1314ad21284add64e8b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 29 Jun 2022 17:28:49 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E8=83=BD=E5=8A=9B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |   7 +-
 .../activiti/demo/correction-process2.vue     | 295 ++++++-----
 .../modules/myAgent/CompetencyApplication.vue |  23 +-
 .../myAgent/demo/competency-application.vue   | 460 ++++++++++++++++++
 front/public/index.html                       |   8 +-
 front/src/api/home.js                         |   6 +-
 front/src/views/home/AbilityToApplyFor.vue    |   8 +-
 front/src/views/home/apply.vue                | 264 +++++++---
 .../components/PurchaseVehicle.vue            |  15 +-
 9 files changed, 833 insertions(+), 253 deletions(-)
 create mode 100644 back/src/views/modules/myAgent/demo/competency-application.vue
diff --git a/back/public/index.html b/back/public/index.html
index eb19bbb6..f975e31c 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-23 18:30:45
+ * @LastEditTime: 2022-06-29 16:59:38
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -42,8 +42,9 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
     // WebSocket地址
     window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
diff --git a/back/src/views/modules/activiti/demo/correction-process2.vue b/back/src/views/modules/activiti/demo/correction-process2.vue
index 04b1db78..f242b753 100644
--- a/back/src/views/modules/activiti/demo/correction-process2.vue
+++ b/back/src/views/modules/activiti/demo/correction-process2.vue
@@ -241,180 +241,177 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-::v-deep .big-BOX{
-  background:rgba(244,245,248,0.8);
-  padding:24px;
-  h3{
-    font-size:16px;
-    color:#212121
+::v-deep .big-BOX {
+  background: rgba(244, 245, 248, 0.8);
+  padding: 24px;
+  h3 {
+    font-size: 16px;
+    color: #212121;
   }
-  p{
-    width:78%;
-    display:flex;
+  p {
+    width: 78%;
+    display: flex;
     justify-content: space-between;
-    color:#212121;
-    font-size:14px;
-    span{
-      display:inline-block;
-      margin-left:8px;
-      line-height:32px;
-      span{
-        font-weight:bold;
+    color: #212121;
+    font-size: 14px;
+    span {
+      display: inline-block;
+      margin-left: 8px;
+      line-height: 32px;
+      span {
+        font-weight: bold;
       }
     }
   }
-  p:last-of-type{
-    margin-top:16px;
-    width:100%;
-    span{
-      display:flex;
-      span{
-      padding:0 12px;
-      height:32px;
-      background:rgba(232,234,239,1);
-      border-radius:2px;
-      button{
-        background:unset;
-        border:0;
-        color:#0558e1;
-        font-size:14px;
-      }
+  p:last-of-type {
+    margin-top: 16px;
+    width: 100%;
+    span {
+      display: flex;
+      span {
+        padding: 0 12px;
+        height: 32px;
+        background: rgba(232, 234, 239, 1);
+        border-radius: 2px;
+        button {
+          background: unset;
+          border: 0;
+          color: #0558e1;
+          font-size: 14px;
+        }
       }
     }
   }
 }
-::v-deep .AbilityApply{
-    margin-top:32px;
+::v-deep .AbilityApply {
+  margin-top: 32px;
 
-  h3{
-     font-size:16px;
-    color:#212121;
-    border-bottom:1px solid #dddee1;
-    padding-bottom:10px;
-  }
-  ul{
-    padding-left: 0px;
-     li{
-      list-style:none;
-    padding: 30px 0;
+  h3 {
+    font-size: 16px;
+    color: #212121;
     border-bottom: 1px solid #dddee1;
-    display:flex;
-    img{
-      width:100px;
-      height:100px;
-    }
-    div{
-      margin-left:16px;
-          display: flex;
-    flex-direction: column;
-    justify-content: center;
-    h2{
-      margin-bottom:20px;
-      font-size:20px;
-      color:#000;
-      display:flex;
-      span{
-        display:block;
-        font-size:14px;
-        color:#ffffff;
-        margin-left:8px;
-        background:rgba(0,184,230,0.8);
+    padding-bottom: 10px;
+  }
+  ul {
+    padding-left: 0px;
+    li {
+      list-style: none;
+      padding: 30px 0;
+      border-bottom: 1px solid #dddee1;
+      display: flex;
+      img {
+        width: 100px;
+        height: 100px;
+      }
+      div {
+        margin-left: 16px;
         display: flex;
-    align-items: center;
-    padding: 0 5px;
-    border-radius: 4px;
+        flex-direction: column;
+        justify-content: center;
+        h2 {
+          margin-bottom: 20px;
+          font-size: 20px;
+          color: #000;
+          display: flex;
+          span {
+            display: block;
+            font-size: 14px;
+            color: #ffffff;
+            margin-left: 8px;
+            background: rgba(0, 184, 230, 0.8);
+            display: flex;
+            align-items: center;
+            padding: 0 5px;
+            border-radius: 4px;
+          }
+        }
+        p {
+          margin-bottom: 0;
+        }
       }
     }
-     p{
-      margin-bottom:0;
+    .clearfix:after {
+      display: block;
+      content: "";
+      clear: both;
     }
+    .title {
+      color: #0558e1;
+      font-size: 18px;
+      padding-bottom: 0;
+      border-bottom: 0;
     }
+    .title:before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      display: inline-block;
+      border-radius: 50%;
+      background: #0558e1;
+      vertical-align: middle;
+      margin-right: 10px;
+      margin-top: 6px;
     }
-    .clearfix:after{
-      display:block;
-      content:"";
-      clear:both;
-    }
-    .title{
-      color:#0558e1;
-      font-size:18px;
-      padding-bottom:0;
-    border-bottom: 0;
-
-    }
-     .title:before {
-           content: "";
-           width: 6px;
-           height: 6px;
-           display: inline-block;
-           border-radius: 50%;
-           background: #0558e1;
-           vertical-align: middle;
-          margin-right: 10px;
-    margin-top: 6px;
-           }
-
   }
 }
-::v-deep .agreeOr>div{
-  display:flex;
-      align-items: center;
-  .el-input{
+::v-deep .agreeOr > div {
+  display: flex;
+  align-items: center;
+  .el-input {
     margin-right: 10px;
     margin-left: 32px;
   }
-
 }
-::v-deep   .agreeOr>div:last-of-type{
-    margin-top:15px;
+::v-deep .agreeOr > div:last-of-type {
+  margin-top: 15px;
+}
+.blueAll {
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    background: #ffffff;
+    color: #0558e1;
+    border: 1px solid #0558e1;
   }
-  .blueAll{
-    ::v-deep .el-radio-button__inner{
-    width:80px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-    background:#ffffff;
-    color:#0558e1;
-    border:1px solid #0558e1;
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    background: #0558e1;
+    color: #ffffff;
   }
-   ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
-      box-shadow: unset !important;
-    background:#0558e1;
-    color:#ffffff;
+}
+.inputBule {
+  width: 55px;
+  height: 32px;
+  line-height: 32px;
+  padding: 0;
+  border-radius: 2px;
+  background: #0558e1;
+  color: #ffffff;
+  border: 1px solid #0558e1;
+}
+.redAll {
+  margin-left: 10px;
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    border: 1px solid #e83a48;
+    background: #ffffff;
+    color: #e83a48;
+    margin-left: 10px;
   }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    color: #ffffff;
+    background: #e83a48;
   }
-  .inputBule{
-     width:55px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-    background:#0558e1;
-    color:#ffffff;
-    border:1px solid #0558e1;
-  }
-  .redAll{
-    margin-left:10px;
-    ::v-deep .el-radio-button__inner{
-    width:80px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-   border:1px solid #e83a48;
-    background:#ffffff;
-    color:#e83a48;
-    margin-left:10px;
-    }
-    ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
-      box-shadow: unset !important;
-       color:#ffffff;
-      background: #e83a48;
-  }
-  }
-  .blueInput{
-    width:55px;
-  }
+}
+.blueInput {
+  width: 55px;
+}
 </style>
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 1a3edea2..ceae9900 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-27 11:50:45
+ * @LastEditTime: 2022-06-29 16:31:26
  * @Description: 能力申请
 -->
 <template>
@@ -43,11 +43,7 @@
         <el-table-column label="申请人" header-align="center" align="center">
           <template slot-scope="scope">
             <span>{{
-              (scope.row.params && scope.row.params.user) ||
-              (scope.row.params && scope.row.params.applyUserName) ||
-              (scope.row.params && scope.row.params.userName) ||
-              (scope.row.params && scope.row.params.undercarriageUserName)||
-              (scope.row.params && scope.row.params.name)
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].user)
             }}</span>
           </template>
         </el-table-column>
@@ -58,13 +54,7 @@
         >
           <template slot-scope="scope">
             <span>{{
-              (scope.row.params && scope.row.params.system) ||
-              (scope.row.params && scope.row.params.demandSubject) ||
-              (scope.row.params &&
-                scope.row.params.resourceDTO &&
-                scope.row.params.resourceDTO.name) ||
-              (scope.row.params && scope.row.params.undercarriageReason)||
-              (scope.row.params && scope.row.params.comment)
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].title)
             }}</span>
           </template>
         </el-table-column>
@@ -104,12 +94,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t("manage") }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t("process.viewFlowImage") }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
@@ -143,7 +133,8 @@ export default {
       },
       dataForm: {
         taskName: '',
-        taskId: ''
+        taskId: '',
+        processDefinitionKey: 'abilityprocess_v2'
       },
       processInstanceId: ''
     }
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
new file mode 100644
index 00000000..f3f02e2a
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -0,0 +1,460 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-29 15:59:51
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 17:21:00
+ * @Description: 告诉大家这是什么
+-->
+<!--  流程业务表单   -->
+<template>
+  <el-card shadow="never" class="aui-card--fill" :key='showKey'>
+
+  <!-- 申请人详情 -->
+  <div>
+     <h3>申请人信息</h3>
+    <div class="big-BOX">
+      <p>
+        <span class="text">申请人：<span> {{dataForm.content.user || '--'}}</span></span>
+        <span class="text">电话：<span>{{dataForm.content.phone || '--'}}</span></span>
+        <span class="text">单位：<span>{{dataForm.content.unit || '--'}}</span></span>
+      </p>
+      <p>
+        <span class="text"> 能力申请标题：<span> {{dataForm.content.title|| '--'}}</span></span>
+        <span class="text">应用系统：<span>{{dataForm.content.applicationSystem || '--'}}</span></span>
+        <span class="text">应用场景：<span> {{dataForm.content.applicationSceneStr || '--'}}</span></span>
+      </p>
+      <p>
+        <span> 能力应用期望效果：<span> {{dataForm.content.effectWish|| '--'}}</span></span>
+      </p>
+      <p v-if="dataForm.content.enclosure">
+      <span> 申请附件：<span> {{dataForm.content.enclosure|| '--'}}<button  @click="downloadFile2(dataForm.content.enclosure)">预览</button></span></span>
+
+      </p>
+    </div>
+  </div>
+
+  <!-- 申请能力 -->
+  <div class="AbilityApply">
+     <h3>申请能力</h3>
+    <ul  v-for="item in dataList" :key="item.id">
+      <!-- <li class="title">{{item.address}}</li> -->
+      <li class="clearfix">
+            <img
+              src="~@/assets/img/imgLeft.png"
+            />
+            <div>
+            <h2>{{item.name}}<span>{{item.type}}</span></h2>
+            <p>{{item.describe}}</p>
+            </div>
+      </li>
+    </ul>
+  </div>
+    <!--  流程综合组件   -->
+  <!--   <ren-process-multiple
+      v-if="processVisible"
+      updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
+      saveFormUrl="/processForm/tabilityapplication"
+      dataFormName="dataForm"
+      ref="renProcessMultiple"
+    ></ren-process-multiple> -->
+
+    <!-- 审批 -->
+    <div class="agreeOr">
+      <h3>审批</h3>
+      <div>
+        <el-radio-group v-model="agreeOrList" style="width:230px;">
+          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
+          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
+        </el-radio-group>
+        <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
+        <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
+         <el-button class="inputBule" @click="agreeOrNot">提交</el-button>
+      </div>
+    </div>
+
+ <!--  流程详情   -->
+    <ren-process-detail-import></ren-process-detail-import>
+  </el-card>
+</template>
+
+<script>
+// 引入工作流公共方法
+import processModule from '@/mixins/process-module'
+import debounce from 'lodash/debounce'
+import qs from 'qs'
+import RenProcessDetailImport from '@/components/ren-process-detail/src/ren-process-detail-import'
+export default {
+  // 注入公共方法
+  mixins: [processModule],
+  data () {
+    return {
+      visible: true,
+      showKey: 0,
+      // 表单属性是否可编辑
+      // fieldDisabled: false,
+      // dataForm: {
+      //   id: '',
+      //   user: '',
+      //   phone: '',
+      //   unit: '',
+      //   area: '',
+      //   system: '',
+      //   scene: '',
+      //   basis: ''
+      // }
+      dataForm: {
+        id: '',
+        content: {}
+      },
+      dataList: [],
+      inputAgree: '',
+      inputNo: '',
+      agreeOrList: '同意'
+    }
+  },
+  created () {
+    // 将业务KEY赋值给表单
+    console.log('params=================>', this.$route, this.$route.params)
+    this.dataForm.taskId = this.$route.params.taskId
+    this.init()
+    // // 流程回调
+    var callbacks = {
+      startProcessSuccessCallback: this.closeCurrentTab,
+      startProcessErrorCallback: this.startProcessErrorCallback,
+      taskHandleSuccessCallback: this.closeCurrentTab,
+      taskHandleErrorCallback: this.taskHandleErrorCallback,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null
+    }
+    // 初始化综合组件
+    this.initProcessMultiple(callbacks)
+  },
+  computed: {
+    // dataRule () {
+    //   return {
+    //     inputAgree: [
+    //       { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+    //     ],
+    //     inputNo: [
+    //       { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+    //     ]
+    //   }
+    // }
+  },
+  components: {
+    RenProcessDetailImport
+  },
+  methods: {
+    init () {
+      // this.visible = true
+      this.$nextTick(() => {
+        // this.$refs.dataForm.resetFields()
+        if (this.dataForm.taskId) {
+          // 如业务KEY已存在，不允许编辑
+          // this.fieldDisabled = true
+          this.getInfo()
+          console.log(this.dataForm, 'init')
+        }
+      })
+    },
+    downloadFile2 (url) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
+      )
+    },
+    // 获取信息
+    getInfo () {
+      this.$http
+        .get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            console.log(res.data)
+            return this.$message.error(res.msg)
+          }
+          console.log(res.data, this.dataForm, 'elas============================')
+          if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
+            res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
+            res.data.tAbilityApplicationDTOList[0].applicationScene.map((val, index) => {
+              res.data.tAbilityApplicationDTOList[0].applicationSceneStr += val
+              if (index < res.data.tAbilityApplicationDTOList[0].applicationScene.length - 1) {
+                res.data.tAbilityApplicationDTOList[0].applicationSceneStr += '、'
+              }
+            })
+          }
+          this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
+          res.data.tAbilityApplicationDTOList.map(val => {
+            this.$http.get('/resource/' + val.resourceId).then(res1 => {
+              console.log(res1.data.data, '1111111111111111111111111111111111')
+              this.dataList.push({
+                name: res1.data.data.name,
+                type: res1.data.data.type,
+                describe: res1.data.data.description
+              })
+            })
+          })
+        })
+        .catch(() => {})
+    },
+    // 申请能力
+    applyData () {
+      this.$http
+        .get(`/resource/select/${this.dataForm.instanceId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            console.log(res.data, 'hhhhh')
+            // return this.$message.error(res.msg)
+          }
+          // console.log(res.data, 'elas')
+          // this.dataForm.content = res.data
+          // console.log(this.dataForm, 'ela')
+        })
+        .catch(() => {})
+    },
+    // 同意与退回
+    agreeOrNot: debounce(function () {
+      if (this.agreeOrList === '同意') {
+        console.log('this.dataForm', this.dataForm)
+        const params = qs.stringify({
+          taskId: this.dataForm.taskId,
+          comment: this.inputAgree
+        })
+        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
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              if (this.callbacks.taskHandleSuccessCallback) {
+                this.callbacks.taskHandleSuccessCallback(res)
+              }
+            }
+          })
+        }).catch(() => {})
+      } else if (this.agreeOrList === '退回') {
+        const params = qs.stringify({
+          taskId: this.dataForm.taskId,
+          comment: this.inputNo
+        })
+        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
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              if (this.callbacks.taskHandleSuccessCallback) {
+                this.callbacks.taskHandleSuccessCallback(res)
+              }
+            }
+          })
+        })
+      }
+    }, 1000, { leading: true, trailing: false }),
+    // 启动流程出错回调
+    startProcessErrorCallback (data) {
+      console.log(data)
+    },
+    // 任务处理出错回调
+    taskHandleErrorCallback (data) {}
+  },
+  mounted () {
+    // this.applyData()
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .big-BOX {
+  background: rgba(244, 245, 248, 0.8);
+  padding: 24px;
+  h3 {
+    font-size: 16px;
+    color: #212121;
+  }
+  p {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    color: #212121;
+    font-size: 14px;
+    span {
+      display: inline-block;
+      margin-left: 8px;
+      line-height: 32px;
+      span {
+        font-weight: bold;
+      }
+    }
+    .text {
+      width: 500px;
+    }
+  }
+  p:last-of-type {
+    margin-top: 16px;
+    width: 100%;
+    span {
+      display: flex;
+      span {
+        padding: 0 12px;
+        height: 32px;
+        background: rgba(232, 234, 239, 1);
+        border-radius: 2px;
+        button {
+          background: unset;
+          border: 0;
+          color: #0558e1;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+::v-deep .AbilityApply {
+  margin-top: 32px;
+
+  h3 {
+    font-size: 16px;
+    color: #212121;
+    border-bottom: 1px solid #dddee1;
+    padding-bottom: 10px;
+  }
+  ul {
+    padding-left: 0px;
+    li {
+      list-style: none;
+      padding: 30px 0;
+      border-bottom: 1px solid #dddee1;
+      display: flex;
+      img {
+        width: 100px;
+        height: 100px;
+      }
+      div {
+        margin-left: 16px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        h2 {
+          margin-bottom: 20px;
+          font-size: 20px;
+          color: #000;
+          display: flex;
+          span {
+            display: block;
+            font-size: 14px;
+            color: #ffffff;
+            margin-left: 8px;
+            background: rgba(0, 184, 230, 0.8);
+            display: flex;
+            align-items: center;
+            padding: 0 5px;
+            border-radius: 4px;
+          }
+        }
+        p {
+          margin-bottom: 0;
+        }
+      }
+    }
+    .clearfix:after {
+      display: block;
+      content: "";
+      clear: both;
+    }
+    .title {
+      color: #0558e1;
+      font-size: 18px;
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+    .title:before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      display: inline-block;
+      border-radius: 50%;
+      background: #0558e1;
+      vertical-align: middle;
+      margin-right: 10px;
+      margin-top: 6px;
+    }
+  }
+}
+::v-deep .agreeOr > div {
+  display: flex;
+  align-items: center;
+  .el-input {
+    margin-right: 10px;
+    margin-left: 32px;
+  }
+}
+::v-deep .agreeOr > div:last-of-type {
+  margin-top: 15px;
+}
+.blueAll {
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    background: #ffffff;
+    color: #0558e1;
+    border: 1px solid #0558e1;
+  }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    background: #0558e1;
+    color: #ffffff;
+  }
+}
+.inputBule {
+  width: 55px;
+  height: 32px;
+  line-height: 32px;
+  padding: 0;
+  border-radius: 2px;
+  background: #0558e1;
+  color: #ffffff;
+  border: 1px solid #0558e1;
+}
+.redAll {
+  margin-left: 10px;
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    border: 1px solid #e83a48;
+    background: #ffffff;
+    color: #e83a48;
+    margin-left: 10px;
+  }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    color: #ffffff;
+    background: #e83a48;
+  }
+}
+.blueInput {
+  width: 55px;
+}
+</style>
diff --git a/front/public/index.html b/front/public/index.html
index afc695e8..5f765f8b 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-28 16:52:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:59:49
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -45,9 +45,9 @@
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
     window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 6f560eb9..d2af042f 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 18:59:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 14:34:24
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -114,7 +114,7 @@ export function lastestPage(params) {
 // 提交申请
 export function submitApply(data) {
   return request({
-    url: '/ability/center/apply',
+    url: '/ability/center/v2/apply',
     method: 'post',
     data,
   })
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 36d26a83..ec68b65f 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -10,7 +10,7 @@
         <span></span>
         {{ item.deptName }}
       </div>
-      <template v-for="val in item.children" :key="val.resourceId">
+      <template v-for="val in item.arr" :key="val.resourceId">
         <div class="item">
           <div class="name">
             <span>{{ val.resourceName }}</span>
@@ -48,11 +48,9 @@
   //移除方法
   const removeFunction = (data) => {
     dataForm.value.map((val) => {
-      val.children = val.children.filter(
-        (item) => item.resourceId !== data.resourceId
-      )
+      val.arr = val.arr.filter((item) => item.resourceId !== data.resourceId)
     })
-    dataForm.value = dataForm.value.filter((val) => val.children.length !== 0)
+    dataForm.value = dataForm.value.filter((val) => val.arr.length !== 0)
   }
 </script>
 
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 5bf6df4d..0af91f1c 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -20,6 +20,18 @@
               labelAlign="left"
               autocomplete="off"
             >
+              <div class="base-info">
+                <a-form-item
+                  label="申请标题"
+                  name="title"
+                  :rules="[{ required: true, message: '请输入申请标题' }]"
+                >
+                  <a-input
+                    placeholder="请输入能力申请标题"
+                    v-model:value="formName.title"
+                  />
+                </a-form-item>
+              </div>
               <div class="base-info">
                 <a-form-item
                   label="申请人信息"
@@ -59,71 +71,71 @@
                   <a-input
                     placeholder="请输入单位"
                     v-model:value="formName.unit"
+                    disabled
                   />
                 </a-form-item>
               </div>
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="申请应用"
-                name="system"
-                :rules="[{ required: true, message: '请输入申请应用' }]"
-              >
-                <a-tooltip placement="top">
-                  <template #title>
-                    <span>{{ formName.formNameSystem }}</span>
-                  </template>
+              <div class="base-info">
+                <a-form-item
+                  label="应用系统"
+                  name="applicationSystem"
+                  :rules="[{ required: true, message: '请选择应用系统' }]"
+                >
+                  <a-select
+                    v-model:value="formName.applicationSystem"
+                    show-search
+                    placeholder="请选择应用系统"
+                    style="width: 200px"
+                    :options="systemOptions"
+                    @focus="handleFocus"
+                    @blur="handleBlur"
+                    @change="systemHandleChange"
+                    @search="systemHandleSearch"
+                  ></a-select>
+                </a-form-item>
+                <a-form-item
+                  class="applicationScene"
+                  label="应用场景"
+                  name="applicationScene"
+                  :rules="[{ required: true, message: '请选择应用场景' }]"
+                  style="width: 6.93rem"
+                >
+                  <a-select
+                    v-model:value="formName.applicationScene"
+                    :options="applicationSceneOpthion"
+                    mode="tags"
+                    :size="size"
+                    placeholder="请选择应用场景"
+                    :filterOption="false"
+                    :searchValue="false"
+                    style="width: 5.87rem"
+                  ></a-select>
+                </a-form-item>
+              </div>
+              <div>
+                <a-form-item
+                  label="应用背景"
+                  name="applicationBackground"
+                  :rules="[{ required: true, message: '请输入应用背景' }]"
+                >
                   <a-input
-                    style="width: 350px; background-color: #f5f5f5"
-                    v-model:value="formName.formNameSystem"
-                    :disabled="disabled"
+                    placeholder="请输入应用背景"
+                    v-model:value="formName.applicationBackground"
                   />
-                  <span style="width: 350px; background-color: #f5f5f5"></span>
-                </a-tooltip>
-              </a-form-item>
-
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="应用场景"
-                name="scene"
-                :rules="[{ required: true, message: '请输入应用场景' }]"
-              >
-                <a-textarea
-                  style="
-                    width: 500px;
-                    height: 150px;
-                    font-size: 16px;
-                    line-height: 24px;
-                    color: #333;
-                    border: 1px solid #e0e0e0;
-                    resize: none;
-                    border-radius: 6px;
-                    padding: 10px;
-                  "
-                  v-model:value="formName.scene"
-                />
-              </a-form-item>
-
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="申请依据"
-                name="basis"
-                :rules="[{ required: true, message: '请输入申请依据' }]"
-              >
-                <a-textarea
-                  style="
-                    width: 500px;
-                    height: 150px;
-                    font-size: 16px;
-                    line-height: 24px;
-                    color: #333;
-                    border: 1px solid #e0e0e0;
-                    border-radius: 6px;
-                    padding: 10px;
-                    resize: none;
-                  "
-                  v-model:value="formName.basis"
-                />
-              </a-form-item>
+                </a-form-item>
+              </div>
+              <div>
+                <a-form-item
+                  label="期望效果"
+                  name="effectWish"
+                  :rules="[{ required: true, message: '请输入期望效果' }]"
+                >
+                  <a-input
+                    placeholder="请输入期望效果"
+                    v-model:value="formName.effectWish"
+                  />
+                </a-form-item>
+              </div>
 
               <a-form-item
                 style="color: #666; font-size: 16px"
@@ -206,11 +218,7 @@
             <div>
               <img src="../../assets/home/success.png" alt="" />
             </div>
-            <p>
-              您已成功申请{{
-                formName.formNameSystem || ''
-              }},请耐心等待审批结果，结果会第一时间通知您！
-            </p>
+            <p>您已成功申请能力,请耐心等待审批结果，结果会第一时间通知您！</p>
           </div>
         </div>
       </article>
@@ -238,8 +246,10 @@
     relaunch,
     selectOne,
   } from '@/api/home'
+  import { getCategoryTreePage } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
+  import { pageWithAttrs } from '@/api/home'
   // import { baseURL } from '@/config'
   // import AsideMenu from './components/asideMenu.vue'
 
@@ -257,16 +267,18 @@
       const disabled = ref(false)
       const baseURL = window.SITE_CONFIG.apiURL
       let record = ref('1')
+      const text = ref('')
       const formName = reactive({
+        title: '', // 标题
+        applicationSystem: [], // 应用系统
+        applicationScene: [], // 应用场景
+        applicationBackground: '', // 应用背景
+        effectWish: '', // 期望效果
         user: '',
         userId: '',
         phone: '',
         unit: '',
-        area: '',
         system: [],
-        scene: '',
-        basis: '',
-        formNameSystem: '',
         enclosure: '', //附件
       })
       const dataList = ref([])
@@ -294,7 +306,21 @@
           // console.log('回填数据================>', res, formName.phone)
         })
       }
-
+      const applicationSceneOpthion = ref([])
+      getCategoryTreePage({
+        page: 1,
+        limit: 20,
+        dictTypeId: '1513712507692818433',
+        deFlage: 0,
+      }).then((res) => {
+        res.data.data.list.map((val) => {
+          applicationSceneOpthion.value.push({
+            value: val.dictLabel,
+            label: val.dictLabel,
+          })
+        })
+        // console.log('字典值========>', applicationSceneOpthion.value)
+      })
       // console.log(formName.system)
       const formRef = ref()
       const applySuccess = ref(true)
@@ -350,6 +376,31 @@
             if (!formName) {
               return message.error('请设置表单名称')
             }
+            let ids = []
+            formName.system = []
+            list.value.map((val) => {
+              val.arr.map((item) => {
+                formName.system.push({
+                  resourceId: item.resourceId,
+                  resourceName: item.resourceName,
+                })
+                console.log(item.id)
+                ids.push(item.id)
+              })
+            })
+            console.log('提交数据==========================>', formName, ids)
+            submitApply(formName).then((res) => {
+              applySuccess.value = false
+              message.success('操作成功！')
+              console.log('能力申请================>', res)
+              if (ids) {
+                sgcDel({ ids: ids }).then((res) => {
+                  if (res.data.msg === 'success') {
+                    mybus.emit('getSgcNum')
+                  }
+                })
+              }
+            })
             // if (arr && arr.length !== 0) {
             //   console.log('提交')
             //   const obj = ref({})
@@ -480,6 +531,7 @@
           label: '交通运输局',
         },
       ])
+      const systemOptions = ref([])
 
       const handleChange = (info) => {
         if (info.file.status !== 'uploading') {
@@ -538,6 +590,63 @@
       //     })
       //   })
       // })
+      // 应用系统下拉
+      const flag = ref(true)
+      const systemHandleChange = (value) => {
+        console.log(`selected ${value}`)
+      }
+      const systemHandleSearch = (value) => {
+        console.log(`search ${value}`)
+        text.value = value
+        systemOptions.value = []
+        window.setTimeout(() => {
+          if (flag.value && text.value == value && text.value !== '') {
+            console.log('1秒未输入~~~~~~~~~~~~~~~~~~~~~~~~~~')
+            pageWithAttrs({
+              pageNum: 99999,
+              pageSize: 5,
+              type: '应用资源',
+              name: text.value,
+              infoList: [],
+            }).then((res) => {
+              if (res.data.code == 0) {
+                if (res.data.data.records.length == 0) {
+                  message.warning('该关键词，暂无应用资源！')
+                } else {
+                  res.data.data.records.map((val) => {
+                    systemOptions.value.push({
+                      value: val.name,
+                      label: val.name,
+                    })
+                  })
+                  console.log(
+                    '第一次获取===================>',
+                    systemOptions.value
+                  )
+                }
+              } else {
+                message.error('获取数据失败!')
+              }
+            })
+          }
+        }, 500)
+      }
+
+      const handleBlur = () => {
+        console.log('blur')
+        flag.value = false
+      }
+
+      const handleFocus = () => {
+        console.log('focus')
+        flag.value = true
+        systemOptions.value = []
+      }
+
+      // const filterOption = (input, option) => {
+      //   return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      // }
+
       onBeforeUnmount(() => {
         mybus.off('reomveOldData')
       })
@@ -561,6 +670,12 @@
         baseURL,
         beforeUpload,
         dataList,
+        systemHandleChange,
+        systemHandleSearch,
+        handleBlur,
+        handleFocus,
+        systemOptions,
+        applicationSceneOpthion,
       }
     },
   }
@@ -599,6 +714,7 @@
     }
     .base-info {
       display: flex;
+      justify-content: space-between;
     }
     :deep(.ant-form-item-label) {
       label {
@@ -631,4 +747,12 @@
       color: #000;
     }
   }
+  .applicationScene {
+    :deep(.ant-select-selector) {
+      overflow-x: scroll;
+    }
+    :deep(.ant-select-selection-overflow) {
+      flex-wrap: nowrap;
+    }
+  }
 </style>
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 3c3b92be..3520bf07 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -513,6 +513,8 @@
           }
           val.checked = true
         })
+      } else {
+        getListByDeptId(item)
       }
       item.checkAll = true
       checkedList.value.push(item.deptId)
@@ -665,11 +667,18 @@
     //     }
     //   }
     // })
-    if (checkedList.value.length == 0) {
+    if (checkedListAbility.value.length == 0) {
       message.error('请先选择需要申请的数据！')
     } else {
-      // console.log('一键申请===================>', list.value)
-      localStorage.setItem('applyList', JSON.stringify(list.value))
+      let arr = []
+      list.value.map((val) => {
+        val.arr = val.children.filter(
+          (item) => checkedListAbility.value.indexOf(item.resourceId) > -1
+        )
+      })
+      arr = list.value.filter((val) => val.arr.length !== 0)
+      console.log('一键申请===================>', arr)
+      localStorage.setItem('applyList', JSON.stringify(arr))
       router.push({
         path: '/apply',
       })

From 50d0576a708161782853a5dd8341effcb2449260 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 29 Jun 2022 18:23:08 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   |  9 ++++-----
 front/src/api/personalCenter.js               | 10 ++++++++++
 .../components/ApplyDetails.vue               |  8 ++++++++
 .../personalCenter/components/MyApply.vue     | 20 ++++++++++++++-----
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index f3f02e2a..74fc2a7c 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,13 +2,12 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 17:21:00
+ * @LastEditTime: 2022-06-29 18:17:07
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
 <template>
   <el-card shadow="never" class="aui-card--fill" :key='showKey'>
-
   <!-- 申请人详情 -->
   <div>
      <h3>申请人信息</h3>
@@ -73,7 +72,7 @@
     </div>
 
  <!--  流程详情   -->
-    <ren-process-detail-import></ren-process-detail-import>
+    <ren-process-detail></ren-process-detail>
   </el-card>
 </template>
 
@@ -82,7 +81,7 @@
 import processModule from '@/mixins/process-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
-import RenProcessDetailImport from '@/components/ren-process-detail/src/ren-process-detail-import'
+import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -142,7 +141,7 @@ export default {
     // }
   },
   components: {
-    RenProcessDetailImport
+    RenProcessDetail
   },
   methods: {
     init () {
diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js
index 83566908..faed5074 100644
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@@ -150,6 +150,16 @@ export function nengliziyuanshangjiaapply(params) {
     params,
   })
 }
+export function getTaskVariables(params) {
+  return request({
+    url:
+      '/act/task/getTaskVariables?taskId=' +
+      params.taskId +
+      '&variableName=tAbilityApplicationDTOList',
+    method: 'get',
+    params,
+  })
+}
 // 能力下架申请
 export function undercarriage(data) {
   return request({
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index 806f5719..ab3d9294 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -509,6 +509,7 @@
     getTaskHandleDetailInfo,
     getDemandForm,
     nengliziyuanshangjiaapply,
+    getTaskVariables,
   } from '@/api/personalCenter'
   import { selectOneDel } from '@/api/home'
   const downloadFile = (path, name) => {
@@ -593,6 +594,12 @@
     resourceId: { type: String, default: null },
   })
   const getInfo = () => {
+    console.log(props.processInstanceId, '============================')
+    if (props.processDefinitionName == '能力申请') {
+      getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
+        console.log('获取数据====================>', res.data.data)
+      })
+    }
     if (props.processDefinitionName == '能力申请流程') {
       getApplyForm(props.businessKey).then((res) => {
         const { data } = res.data
@@ -662,6 +669,7 @@
   })
 
   const getResourceURL = () => {
+    console.log('111111111111111111111111111111', Cookies.get('token'))
     const params = qs.stringify({
       token: Cookies.get('token'),
       // processInstanceId: this.dataForm.processInstanceId
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 8fa64659..dfa3d105 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -60,7 +60,7 @@
           <div class="content-body-content">
             <p class="content-body-content-son">
               审核结果：{{
-                item.ended ? '审核完成' : item.backToFirst ? '被驳回' : '审核中'
+                item.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中'
               }}
             </p>
           </div>
@@ -95,10 +95,16 @@
             <div></div>
           </div>
           <div class="button-box">
-            <div class="button" @click="showDetail(item)">查看流程</div>
-            <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
-              修改
+            <div
+              class="button"
+              @click="showDetail(item)"
+              v-if="!(item.processDefinitionName == '能力申请')"
+            >
+              查看流程
             </div>
+            <!-- <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
+              修改
+            </div> -->
             <div
               v-if="
                 !(
@@ -107,7 +113,11 @@
                   item.ended == false
                 )
               "
-              v-show="item.resourceStatusTip == '正常' && item.ended"
+              v-show="
+                item.resourceStatusTip == '正常' &&
+                item.ended &&
+                item.processDefinitionName !== '能力申请'
+              "
               class="button button-details"
               @click="
                 viewDetail(

From ffaabe340a0ce34adf3d2167f05599b5b84a7af2 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 29 Jun 2022 18:36:50 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                       |   2 +-
 front/src/supermap/advance-init.js            |   3 +
 front/src/views/home/infrastructurePage.vue   | 124 ++++++++++++++----
 .../views/home/videoSurveillance/index.vue    |  40 +++---
 4 files changed, 127 insertions(+), 42 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index afc695e8..2f1af54c 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-28 16:52:46
+ * @LastEditTime: 2022-06-29 16:00:06
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js
index 9671313f..0be17a7a 100644
--- a/front/src/supermap/advance-init.js
+++ b/front/src/supermap/advance-init.js
@@ -1726,6 +1726,9 @@ export function MapFun(mapObj) {
             }
           })
         }
+        marker.on('click', e=>{
+          console.log('点位数据', e)
+        })
         layers.addLayer(marker)
       }
     })
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index ecc029c5..e68ecad9 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -11,10 +11,13 @@
           :key="itemContent"
           @click="tabClick(index, itemContent, itemContent)"
           :class="
-            clickList[index].content.indexOf(itemContent) != -1 ? 'down' : ''
+            clickList[index].content.indexOf(itemContent.labelName) != -1 ||
+            clickList[index].content.indexOf(itemContent) != -1
+              ? 'down'
+              : ''
           "
         >
-          {{ itemContent }}
+          {{ itemContent.labelName || itemContent }}
         </span>
       </div>
     </div>
@@ -43,11 +46,11 @@
         <!-- 搜索@search="onSearch" -->
         <div class="searchInput">
           <a-input-search
-            v-model:value="name"
+            v-model:value="mapSearchParam.cameraName"
             placeholder="请输入关键词"
             enter-button="搜索"
             size="large"
-            @change="onSearch"
+            @change="getCamera"
           />
           <a-button
             type="primary"
@@ -85,20 +88,70 @@
           selectedRowKeys: selectedRowKeys,
           onChange: onSelectChange,
         }"
-      ></a-table>
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'operation'">
+            <a @click="openVideo(record.channelCode)">预览</a>
+          </template>
+        </template>
+      </a-table>
     </div>
+    <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%">
+          <vue3VideoPlay v-bind="options" />
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script setup>
   import VideoSurveillance from '@/views/home/videoSurveillance'
   import { getCategoryTreePage } from '@/api/personalCenter'
   import { dataType } from 'element-plus/es/components/table-v2/src/common'
-  import { ref, onMounted } from 'vue'
-  import { getCameraByParentId } from '@/api/videoSurveillance'
+  import { ref, reactive, onMounted } from 'vue'
+  import {
+    getCameraByParentId,
+    getStreamByChannelCode,
+    getCameraAllLabel,
+  } from '@/api/videoSurveillance'
   import { sgcInsert } from '@/api/home'
   import { message } from 'ant-design-vue'
   import mybus from '@/myplugins/mybus'
-
+  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 pagination = ref({
     total: 0,
     current: 1,
@@ -109,12 +162,14 @@
   const mapSearchParam = ref({
     // 地图搜索初始化数据
     parentId: '',
+    cameraName: '',
     checkStatus: '1',
     pageNum: pagination.value.current,
     pageSize: pagination.value.pageSize,
     gpsX: '',
     gpsY: '',
     radius: '',
+    labelCodes: [],
   })
   const showMap = ref(true)
   onMounted(() => {
@@ -144,6 +199,17 @@
       content: [],
     },
   ])
+  const openVideo = (id) => {
+    console.log('打开视频', id)
+    const param = {
+      channelCode: id,
+    }
+    getStreamByChannelCode(param).then((res) => {
+      console.log(res)
+      visible.value = true
+      options.value.src = res.data.data
+    })
+  }
   // const dataTypeList = () => {
   //   if (tabList.value[0].content.indexOf('视频资源') != -1) {
   //     tabList.value[1].content = ['123344', '213124']
@@ -173,6 +239,7 @@
   let tableHeight = ref('600')
   //tab切换点击事件
   const tabClick = (indexFather, name) => {
+    debugger
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
       if (name == '视频资源') {
         tableHeight.value = 330
@@ -195,14 +262,12 @@
         tabList.value[1].content = []
         clickList.value[1].content = []
         clickList.value[indexFather].content[0] = name
-        const params = {
-          page: 1,
-          limit: 50,
-          dictTypeId: '1541336217898848257',
-        }
-        getCategoryTreePage(params).then((res) => {
-          res.data.data.list.forEach((val) => {
-            tabList.value[1].content.push(val.dictLabel)
+        getCameraAllLabel().then((res) => {
+          res.data.data.forEach((val) => {
+            tabList.value[1].content.push({
+              labelCode: val.labelCode,
+              labelName: val.labelName,
+            })
           })
         })
       } else if (name == '云资源') {
@@ -230,22 +295,26 @@
         clickList.value[indexFather].content.push(name)
       }
     }
-    console.log('clickList.value', clickList.value)
+    // 改变查询摄像头接口的labelCode数组
+    mapSearchParam.value.labelCodes = []
+    clickList.value[1].content.map((item) => {
+      mapSearchParam.value.labelCodes.push(item.labelCode)
+    })
+    console.log('选中的标签code', mapSearchParam.value)
+    mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+    getCamera()
   }
   // 清空
   const nullClick = () => {
     clickList.value[1].content = []
+    mapSearchParam.value.labelCodes = ''
+    getCamera()
     console.log('hhhhhhhh')
   }
-  const name = ref('')
-  // 搜索框
-  const onSearch = (name) => {
-    name.value = name
-    console.log(name.value)
-  }
   // 重置
   const clean = () => {
-    name.value = ''
+    mapSearchParam.value.cameraName = ''
+    getCamera()
   }
   // 一键申请
   const apply = () => {
@@ -287,8 +356,15 @@
     {
       title: '归属',
       dataIndex: 'nodeName',
+      width: '60%',
       key: 'nodeName',
     },
+    {
+      title: '操作',
+      dataIndex: 'operation',
+      width: '10%',
+      key: 'channelId',
+    },
   ])
   const allClick = ref([])
   const onSelectChange = (selectedRowKeys, selectedRows) => {
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 300cf7df..ecb113e3 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -139,6 +139,9 @@
       this.addressMatchUrl = window.SITE_CONFIG.POI_URL;
       // 初始化地址检索服务
       this.initAddressMatchService()
+      this.getCameraAllLabel()
+      // 初始化展示所有摄像头
+      // this.getCameraAllPage()
       // this.getMapPoint()
       // 根据parentId查询摄像头列表
       mybus.off('getCameraByParentId')
@@ -169,7 +172,7 @@
         const type = e.layerType;
         const circleLayer = e.layer;
         if (type === 'circle') {
-          const radius = (e.layer._mRadius).toFixed(2)
+          const radius = (e.layer._mRadius)
           if (radius > 5000) {
             message.info('最大支持5km范围的圈选')
           } else {
@@ -177,8 +180,8 @@
             this.hiMap.mapObj.featureGroup.addLayer(circlePloygonLayer);
             this.hiMap.mapObj.layerGroup.set('circlePloygonLayer', circlePloygonLayer);
             console.log('查询图层为何发生了改变', e.layer);
-            this.mapSearchParam.gpsX = e.layer._latlng.lng.toFixed(2)
-            this.mapSearchParam.gpsY = e.layer._latlng.lat.toFixed(2)
+            this.mapSearchParam.gpsX = e.layer._latlng.lng
+            this.mapSearchParam.gpsY = e.layer._latlng.lat
             this.mapSearchParam.radius = radius
             const params = {
               gpsX: this.mapSearchParam.gpsX,
@@ -251,20 +254,23 @@
           this.addressMatchService.code(geoCodeParam, match);
         }
       },
-      // getCameraAllPage(page) {
-      //   let params = {
-      //     name: '',
-      //     page: page,
-      //     pageSize: 20000,
-      //   }
-      //   selectByChannelName(params).then((res) => {
-      //     // let t1 = new Date().getTime();
-      //     this.cameraAllData = res.data.data
-      //     this.addResourceTomap('全部', res.data.data)
-      //     // let t2 = new Date().getTime();
-      //     // console.log("时间#############" + (t2 - t1));
-      //   })
-      // },
+      getCameraAllPage(page) {
+        let params = {
+          name: '',
+          page: page,
+          pageSize: 20000,
+        }
+        getCameraAll(params).then((res) => {
+          // let t1 = new Date().getTime();
+          // this.cameraAllData = res.data.data
+          this.addResourceTomap('videoMap', res.data)
+          // let t2 = new Date().getTime();
+          // console.log("时间#############" + (t2 - t1));
+        })
+      },
+      getCameraAllLabel() {
+
+      },
       tabChange(item) {
         if (this.checkboxGroup.indexOf(item.labelName) !== -1) {
           if (item.labelName == '全部') {

From 80f61d069870630d94e60723735af827ec09f4b1 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 29 Jun 2022 18:53:53 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                                 |  9 +++++++++
 front/src/views/detailsAll/AlgorithmDetails.vue       | 11 +++--------
 front/src/views/detailsAll/BusinessDetails.vue        | 11 +++--------
 front/src/views/detailsAll/DeveloperComponents.vue    | 11 +++--------
 front/src/views/detailsAll/LayerService.vue           | 11 +++--------
 .../Algorithm/AlgorithmAssociatedAbility.vue          |  2 +-
 .../components/Business/BusinessAssociatedAbility.vue |  2 +-
 .../Developer/DeveloperAssociatedAbility.vue          |  2 +-
 .../components/Developer/DeveloperTrial.vue           |  1 -
 .../LayerService/LayerServiceAssociatedAbility.vue    |  2 +-
 10 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index 3ba5a76a..9f715249 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -305,3 +305,12 @@ export function queryPartAppByKeyId(params) {
     params,
   })
 }
+//组件详情列表
+export function queryPartAppByKeyId2(params) {
+  return request({
+    url: 'dataResourceRel/queryApp4PartByKeyId',
+    method: 'get',
+    params,
+  })
+}
+
diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue
index 1bac95d9..caa53ed5 100644
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@@ -88,7 +88,7 @@
   import AlgorithmCommonProblem from '@/views/detailsAll/components/Algorithm/AlgorithmCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId2 } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -97,11 +97,7 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
-  const associatedComponents = ref([
-    { type: '应用资源', dataList: [] },
-    { type: '数据资源', dataList: [] },
-    { type: '基础设施', dataList: [] },
-  ])
+  const associatedComponents = ref([{ type: '应用资源', dataList: [] }])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -163,9 +159,8 @@
       associatedComponents.value.map((item, index) => {
         let queryPartAppByKeyIdParams = {
           keyId: id,
-          type: item.type,
         }
-        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+        queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => {
           associatedComponents.value[index].dataList = res.data.data
         })
       })
diff --git a/front/src/views/detailsAll/BusinessDetails.vue b/front/src/views/detailsAll/BusinessDetails.vue
index 8cbd5352..bd36f021 100644
--- a/front/src/views/detailsAll/BusinessDetails.vue
+++ b/front/src/views/detailsAll/BusinessDetails.vue
@@ -71,7 +71,7 @@
   import BusinessCommonProblem from '@/views/detailsAll/components/Business/BusinessCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId2 } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -80,11 +80,7 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
-  const associatedComponents = ref([
-    { type: '应用资源', dataList: [] },
-    { type: '数据资源', dataList: [] },
-    { type: '基础设施', dataList: [] },
-  ])
+  const associatedComponents = ref([{ type: '应用资源', dataList: [] }])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -146,9 +142,8 @@
       associatedComponents.value.map((item, index) => {
         let queryPartAppByKeyIdParams = {
           keyId: id,
-          type: item.type,
         }
-        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+        queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => {
           associatedComponents.value[index].dataList = res.data.data
         })
       })
diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue
index 1c7c5c9e..d4cf3941 100644
--- a/front/src/views/detailsAll/DeveloperComponents.vue
+++ b/front/src/views/detailsAll/DeveloperComponents.vue
@@ -78,7 +78,7 @@
   import DeveloperTrial from '@/views/detailsAll/components/Developer/DeveloperTrial' //组件试用
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId2 } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -87,11 +87,7 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
-  const associatedComponents = ref([
-    { type: '应用资源', dataList: [] },
-    { type: '数据资源', dataList: [] },
-    { type: '基础设施', dataList: [] },
-  ])
+  const associatedComponents = ref([{ type: '应用资源', dataList: [] }])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -153,9 +149,8 @@
       associatedComponents.value.map((item, index) => {
         let queryPartAppByKeyIdParams = {
           keyId: id,
-          type: item.type,
         }
-        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+        queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => {
           associatedComponents.value[index].dataList = res.data.data
         })
       })
diff --git a/front/src/views/detailsAll/LayerService.vue b/front/src/views/detailsAll/LayerService.vue
index 126e17cb..bc5ab295 100644
--- a/front/src/views/detailsAll/LayerService.vue
+++ b/front/src/views/detailsAll/LayerService.vue
@@ -80,7 +80,7 @@
   import LayerServiceUsageMode from '@/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue' //使用方式
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId2 } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -89,11 +89,7 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
-  const associatedComponents = ref([
-    { type: '应用资源', dataList: [] },
-    { type: '数据资源', dataList: [] },
-    { type: '基础设施', dataList: [] },
-  ])
+  const associatedComponents = ref([{ type: '应用资源', dataList: [] }])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -155,9 +151,8 @@
       associatedComponents.value.map((item, index) => {
         let queryPartAppByKeyIdParams = {
           keyId: id,
-          type: item.type,
         }
-        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+        queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => {
           associatedComponents.value[index].dataList = res.data.data
         })
       })
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
index 4740f254..e405b3dd 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
@@ -87,7 +87,7 @@
       margin-top: 0.4rem;
       width: 13.14rem;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       .associated-ability-card {
         width: 4.28rem;
         display: flex;
diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
index 4740f254..e405b3dd 100644
--- a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
@@ -87,7 +87,7 @@
       margin-top: 0.4rem;
       width: 13.14rem;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       .associated-ability-card {
         width: 4.28rem;
         display: flex;
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
index 4740f254..e405b3dd 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
@@ -87,7 +87,7 @@
       margin-top: 0.4rem;
       width: 13.14rem;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       .associated-ability-card {
         width: 4.28rem;
         display: flex;
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
index c436c734..32d723e1 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
@@ -66,7 +66,6 @@
     }
   }
   const clickLink = (link) => {
-    debugger
     window.open(link)
   }
   //复制方法
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
index 4740f254..e405b3dd 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
@@ -87,7 +87,7 @@
       margin-top: 0.4rem;
       width: 13.14rem;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       .associated-ability-card {
         width: 4.28rem;
         display: flex;

From ff1aea83f7605fb708ee40cbe3126a90481ce10f Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 29 Jun 2022 19:12:12 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmAssociatedAbility.vue  | 26 +++++++------------
 .../Business/BusinessAssociatedAbility.vue    | 26 +++++++------------
 .../Developer/DeveloperAssociatedAbility.vue  | 26 +++++++------------
 .../LayerServiceAssociatedAbility.vue         | 26 +++++++------------
 4 files changed, 36 insertions(+), 68 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
index e405b3dd..95e54415 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
@@ -4,21 +4,16 @@
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
-        v-for="(item, index) in dataFrom"
-        :key="item.type"
+        v-for="(dataListitem, dataListindex) in dataFrom[0].dataList"
+        :key="dataListitem.id"
+        @click="switchFunction(dataListitem.id)"
       >
         <div class="associated-ability-card-title">
-          {{ item.type }}
+          {{ dataListitem.name }}
         </div>
         <div class="associated-ability-card-content">
-          <div
-            class="associated-ability-card-content-font"
-            v-for="(dataListitem, dataListindex) in item.dataList"
-            :key="dataListitem.id"
-            @click="switchFunction(dataListitem.id)"
-          >
-            <span>{{ dataListindex + 1 }}、</span>
-            {{ dataListitem.name }}
+          <div class="associated-ability-card-content-font">
+            {{ dataListitem.description }}
           </div>
         </div>
       </div>
@@ -85,11 +80,11 @@
     align-items: center;
     .application-associated-ability-main {
       margin-top: 0.4rem;
-      width: 13.14rem;
+      width: 13.3rem;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       .associated-ability-card {
-        width: 4.28rem;
+        width: 3.2rem;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -112,9 +107,6 @@
             margin-right: 0.15rem;
             margin-top: 0.15rem;
           }
-          .associated-ability-card-content-font:hover {
-            color: #0058e1;
-          }
         }
       }
       .associated-ability-card:hover {
diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
index e405b3dd..95e54415 100644
--- a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
@@ -4,21 +4,16 @@
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
-        v-for="(item, index) in dataFrom"
-        :key="item.type"
+        v-for="(dataListitem, dataListindex) in dataFrom[0].dataList"
+        :key="dataListitem.id"
+        @click="switchFunction(dataListitem.id)"
       >
         <div class="associated-ability-card-title">
-          {{ item.type }}
+          {{ dataListitem.name }}
         </div>
         <div class="associated-ability-card-content">
-          <div
-            class="associated-ability-card-content-font"
-            v-for="(dataListitem, dataListindex) in item.dataList"
-            :key="dataListitem.id"
-            @click="switchFunction(dataListitem.id)"
-          >
-            <span>{{ dataListindex + 1 }}、</span>
-            {{ dataListitem.name }}
+          <div class="associated-ability-card-content-font">
+            {{ dataListitem.description }}
           </div>
         </div>
       </div>
@@ -85,11 +80,11 @@
     align-items: center;
     .application-associated-ability-main {
       margin-top: 0.4rem;
-      width: 13.14rem;
+      width: 13.3rem;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       .associated-ability-card {
-        width: 4.28rem;
+        width: 3.2rem;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -112,9 +107,6 @@
             margin-right: 0.15rem;
             margin-top: 0.15rem;
           }
-          .associated-ability-card-content-font:hover {
-            color: #0058e1;
-          }
         }
       }
       .associated-ability-card:hover {
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
index e405b3dd..95e54415 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
@@ -4,21 +4,16 @@
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
-        v-for="(item, index) in dataFrom"
-        :key="item.type"
+        v-for="(dataListitem, dataListindex) in dataFrom[0].dataList"
+        :key="dataListitem.id"
+        @click="switchFunction(dataListitem.id)"
       >
         <div class="associated-ability-card-title">
-          {{ item.type }}
+          {{ dataListitem.name }}
         </div>
         <div class="associated-ability-card-content">
-          <div
-            class="associated-ability-card-content-font"
-            v-for="(dataListitem, dataListindex) in item.dataList"
-            :key="dataListitem.id"
-            @click="switchFunction(dataListitem.id)"
-          >
-            <span>{{ dataListindex + 1 }}、</span>
-            {{ dataListitem.name }}
+          <div class="associated-ability-card-content-font">
+            {{ dataListitem.description }}
           </div>
         </div>
       </div>
@@ -85,11 +80,11 @@
     align-items: center;
     .application-associated-ability-main {
       margin-top: 0.4rem;
-      width: 13.14rem;
+      width: 13.3rem;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       .associated-ability-card {
-        width: 4.28rem;
+        width: 3.2rem;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -112,9 +107,6 @@
             margin-right: 0.15rem;
             margin-top: 0.15rem;
           }
-          .associated-ability-card-content-font:hover {
-            color: #0058e1;
-          }
         }
       }
       .associated-ability-card:hover {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
index e405b3dd..95e54415 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
@@ -4,21 +4,16 @@
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
-        v-for="(item, index) in dataFrom"
-        :key="item.type"
+        v-for="(dataListitem, dataListindex) in dataFrom[0].dataList"
+        :key="dataListitem.id"
+        @click="switchFunction(dataListitem.id)"
       >
         <div class="associated-ability-card-title">
-          {{ item.type }}
+          {{ dataListitem.name }}
         </div>
         <div class="associated-ability-card-content">
-          <div
-            class="associated-ability-card-content-font"
-            v-for="(dataListitem, dataListindex) in item.dataList"
-            :key="dataListitem.id"
-            @click="switchFunction(dataListitem.id)"
-          >
-            <span>{{ dataListindex + 1 }}、</span>
-            {{ dataListitem.name }}
+          <div class="associated-ability-card-content-font">
+            {{ dataListitem.description }}
           </div>
         </div>
       </div>
@@ -85,11 +80,11 @@
     align-items: center;
     .application-associated-ability-main {
       margin-top: 0.4rem;
-      width: 13.14rem;
+      width: 13.3rem;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       .associated-ability-card {
-        width: 4.28rem;
+        width: 3.2rem;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -112,9 +107,6 @@
             margin-right: 0.15rem;
             margin-top: 0.15rem;
           }
-          .associated-ability-card-content-font:hover {
-            color: #0058e1;
-          }
         }
       }
       .associated-ability-card:hover {

From 976e58837237cc9049172792aa1de14b2b7336db Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 30 Jun 2022 09:34:16 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                                 |  4 ++--
 front/public/index.html                                |  2 +-
 .../personalCenter/components/PurchaseVehicle.vue      | 10 +++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/back/public/index.html b/back/public/index.html
index f975e31c..17d1b9da 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:59:38
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-29 19:38:17
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
diff --git a/front/public/index.html b/front/public/index.html
index a68491c4..6353bd6c 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-29 18:37:11
+ * @LastEditTime: 2022-06-29 19:38:31
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 3520bf07..0b313667 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -95,7 +95,15 @@
             <a-list-item>
               <a-skeleton avatar :title="false" :loading="item.loading" active>
                 <a-list-item-meta
-                  :description="item.description || '--'"
+                  :description="
+                    item.description ||
+                    (item.note1 &&
+                      JSON.parse(item.note1)[0].channelName +
+                        '等' +
+                        JSON.parse(item.note1).length +
+                        '个摄像头') ||
+                    '--'
+                  "
                   style="position: relative"
                 >
                   <template #title>

From 08b971c411fc8b65f9248c1e851ee67156a67882 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 30 Jun 2022 10:09:05 +0800
Subject: [PATCH 07/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Developer/DeveloperAssociatedAbility.vue  |  4 +-
 .../views/newHome/components/WorkDynList.vue  | 44 ++++++++++---------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
index 95e54415..a584b464 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
@@ -4,7 +4,7 @@
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
-        v-for="(dataListitem, dataListindex) in dataFrom[0].dataList"
+        v-for="dataListitem in dataFrom[0].dataList"
         :key="dataListitem.id"
         @click="switchFunction(dataListitem.id)"
       >
@@ -62,7 +62,7 @@
   )
   watch(
     () => router.currentRoute.value.query.id,
-    (newValue, oldValue) => {
+    () => {
       if (oldid != router.currentRoute.value.query.id) {
         window.location.reload()
       }
diff --git a/front/src/views/newHome/components/WorkDynList.vue b/front/src/views/newHome/components/WorkDynList.vue
index 59a6fbf6..8b402866 100644
--- a/front/src/views/newHome/components/WorkDynList.vue
+++ b/front/src/views/newHome/components/WorkDynList.vue
@@ -21,26 +21,30 @@
         </template>
         <template #renderItem="{ item }">
           <a-list-item key="item.title">
-            <a-list-item-meta
-              :description="
-                item.note1 ? `摘要：${item.note1 || ''}` : item.content
-              "
-            >
-              <template #title>
-                <a class="title-content" @click="goToDetails(item.id)">
-                  {{ item.title }}
-                </a>
-              </template>
-              <template #avatar>
-                <a-image
-                  width="100"
-                  height="100"
-                  alt="暂无图片"
-                  :src="item.imageUrl"
-                  :fallback="imgSrc"
-                />
-              </template>
-            </a-list-item-meta>
+            <a-tooltip>
+              <template #title>{{ item.note1 || item.content }}</template>
+              <a-list-item-meta
+                ellipsis="true"
+                :description="
+                  item.note1 ? `摘要：${item.note1 || ''}` : item.content
+                "
+              >
+                <template #title>
+                  <a class="title-content" @click="goToDetails(item.id)">
+                    {{ item.title }}
+                  </a>
+                </template>
+                <template #avatar>
+                  <a-image
+                    width="100"
+                    height="100"
+                    alt="暂无图片"
+                    :src="item.imageUrl"
+                    :fallback="imgSrc"
+                  />
+                </template>
+              </a-list-item-meta>
+            </a-tooltip>
             <div class="pulish-time">发布时间：{{ item.createDate }}</div>
             <!-- <template #extra>
               <a-image

From f2921a02270cfdf4f0155a6f1dc6a7a647a4f66c Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 30 Jun 2022 10:12:28 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=AE=97=E6=B3=95PK=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/ability/bsdataresources.vue |   40 +-
 front/src/views/home/algorithmCompare.vue     | 1193 +++++++++--------
 2 files changed, 661 insertions(+), 572 deletions(-)

diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue
index 7bb034dd..dcb29158 100644
--- a/back/src/views/modules/ability/bsdataresources.vue
+++ b/back/src/views/modules/ability/bsdataresources.vue
@@ -20,8 +20,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="orderId" :label="$t('dataresources.resourcesName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('dataresources.resourcesCode')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productName" :label="$t('dataresources.resourcesName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="orderId" :label="$t('dataresources.resourcesCode')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="payAmount" :label="$t('dataresources.resourcesProvide')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="status" :label="$t('dataresources.resourcesAbstract')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="payAt" :label="$t('dataresources.putOnDate')" header-align="center" align="center"></el-table-column>
@@ -50,8 +50,8 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 // import AddOrUpdate from './order-add-or-update'
-import {addDynamicRoute} from "@/router";
-import RelateApplication from "./bsabilityai-relate-application.vue"
+import { addDynamicRoute } from '@/router'
+import RelateApplication from './bsabilityai-relate-application.vue'
 
 export default {
   mixins: [mixinViewModule],
@@ -68,7 +68,7 @@ export default {
         status: '',
         userId: ''
       },
-       // 关联应用弹窗
+      // 关联应用弹窗
       relateApplicationVisible: false,
       relateInfo: {
         id: '',
@@ -79,31 +79,31 @@ export default {
   },
   components: {
     // AddOrUpdate,
-    RelateApplication,
+    RelateApplication
   },
   methods: {
-     //重置
-     resetDataList(){
-        this.dataForm=this.noDataForm;
-        this.page=1;                    // 当前页码
-        this.query();
-     },
-      // 点击关联应用按钮
-    showRelateApplication(row){
+    // 重置
+    resetDataList () {
+      this.dataForm = this.noDataForm
+      this.page = 1 // 当前页码
+      this.query()
+    },
+    // 点击关联应用按钮
+    showRelateApplication (row) {
       this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => {
-        if( res && res.data ) {
-          this.relateApplicationVisible = true;
+        if (res && res.data) {
+          this.relateApplicationVisible = true
           this.relateInfo = {
             id: row.id,
             responseData: res.data,
             linkType: '2'
-          };
+          }
         }
       }).catch(() => { })
     },
-      // 是否展示关联应用弹窗
-    handleIsShowRelatePopup(type) {
-      this.relateApplicationVisible = type;
+    // 是否展示关联应用弹窗
+    handleIsShowRelatePopup (type) {
+      this.relateApplicationVisible = type
     }
   }
 }
diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue
index 76ec432c..dbfa5141 100644
--- a/front/src/views/home/algorithmCompare.vue
+++ b/front/src/views/home/algorithmCompare.vue
@@ -1,576 +1,669 @@
 <template>
-    <div class="bg">
-        <home-header></home-header>
-        <div class="box-container">
-            <a-spin size="large" v-if="loadingPage" class="loading-box" :spinning="loadingPage" />
-            <div class="nav-box">
-                <a-breadcrumb>
-                    <a-breadcrumb-item>能力集市</a-breadcrumb-item>
-                    <a-breadcrumb-item>算法对比</a-breadcrumb-item>
-                </a-breadcrumb>
+  <div class="bg">
+    <home-header></home-header>
+    <div class="box-container">
+      <a-spin
+        size="large"
+        v-if="loadingPage"
+        class="loading-box"
+        :spinning="loadingPage"
+      />
+      <div class="nav-box">
+        <a-breadcrumb>
+          <a-breadcrumb-item>能力集市</a-breadcrumb-item>
+          <a-breadcrumb-item>算法对比</a-breadcrumb-item>
+        </a-breadcrumb>
+      </div>
+      <div class="content">
+        <a-anchor
+          :affix="false"
+          class="left"
+          :getContainer="getId"
+          @click="handleClickTab"
+        >
+          <a-anchor-link
+            class="left-item"
+            :href="`#${data}`"
+            :title="data"
+            v-for="(data, i) in leftNav"
+            :key="i"
+            :data-title="data"
+          />
+        </a-anchor>
+        <div class="right">
+          <div class="top no-border-right">
+            <div class="td-name">
+              <!-- selectedRowKeys -->
+              {{ `共选取${selectedRowKeys.length}个算法` }}
             </div>
-            <div class="content">
-                <a-anchor :affix="false" class="left" :getContainer="getId" @click="handleClickTab">
-                    <a-anchor-link class="left-item" :href="`#${data}`" :title="data" v-for="(data, i) in leftNav"
-                        :key="i" :data-title="data" />
-                </a-anchor>
-                <div class="right">
-                    <div class="top no-border-right">
-                        <div class="td-name">
-                            <!-- selectedRowKeys -->
-                            {{ `共选取${selectedRowKeys.length}个算法` }}
-                        </div>
-                        <div class="td" v-for="(item, k) in detailArray" :key="k">
-                            <span v-if="item">{{ item.name || '--' }}</span>
-                            <span v-if="item" @click="deleteList(k)" class="icon-delete">
-                            </span>
-                            <span class="add-img" @click="addList"
-                                v-if="!item && k === detailArray.filter(v => v).length">
-                            </span>
-                        </div>
-                    </div>
-                    <div class="bottom bottomRef" id="bottomRef" ref="bottomRef">
-                        <div class="bottom-item" v-for="(data, i) in tableData" :key="i">
-                            <div class="title" :id="data.title" :title="data.title" :ref="data.title">{{ data.title }}
-                            </div>
-                            <!-- 算法优势 -->
-                            <div class="group-data" v-if="data.groupName">
-                                <!-- <compare-group-view :dataList="data.groupList"></compare-group-view> -->
-                                <div v-if="data.groupList.length > 0">
-                                    <div class="group-box" v-for="(data, i) in data.groupList" :key="i">
-                                        <div class="flex-row-start row-tr" v-for="(item, j) in Object.keys(data)"
-                                            :key="j" :class="j == Object.keys(data).length - 1 ? 'border-bottom' : ''">
-                                            <div class="td-name" :style="{ height: getHeight(item) }">
-                                                <span class="td-text td-name-text">{{ item }}</span>
-                                            </div>
-                                            <div class="flex-row-start">
-                                                <div class="td" :style="{ height: getHeight(item) }"
-                                                    v-for="(d, k) in data[item]" :key="k">
-                                                    <a-tooltip placement="top" :title="d">
-                                                        <span class="td-text">{{ d }}</span>
-                                                    </a-tooltip>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div v-if="data.groupList.length == 0" class="no-data">暂无数据</div>
-                            </div>
-                            <div class="flex-row-start row-tr" v-else v-for="(rowData, j) in data.list" :key="j"
-                                :class="j == data.list.length - 1 ? 'border-bottom' : ''">
-                                <div class="td-name" :style="{ height: getHeight(rowData.name) }">
-                                    <span class="td-text td-name-text">
-                                        {{ rowData.name }}
-                                    </span>
-                                </div>
-                                <div class="flex-row-start">
-                                    <div class="td" v-for="(item, k) in rowData.infoList" :key="k"
-                                        :style="{ height: getHeight(rowData.name) }">
-                                        <video v-if="showVideo(rowData.name) && item" width="240" height="180" controls>
-                                            <source :src="item" type="video/mp4">
-                                            您的浏览器不支持 HTML5 video 标签。
-                                        </video>
-                                        <a-tooltip v-else placement="top" :title="item">
-                                            <span class="td-text">{{ item }}</span>
-                                        </a-tooltip>
-                                    </div>
-                                </div>
-                            </div>
+            <div class="td" v-for="(item, k) in detailArray" :key="k">
+              <span v-if="item">{{ item.name || '--' }}</span>
+              <span
+                v-if="item"
+                @click="deleteList(k)"
+                class="icon-delete"
+              ></span>
+              <span
+                class="add-img"
+                @click="addList"
+                v-if="!item && k === detailArray.filter((v) => v).length"
+              ></span>
+            </div>
+          </div>
+          <div class="bottom bottomRef" id="bottomRef" ref="bottomRef">
+            <div class="bottom-item" v-for="(data, i) in tableData" :key="i">
+              <div
+                class="title"
+                :id="data.title"
+                :title="data.title"
+                :ref="data.title"
+              >
+                {{ data.title }}
+              </div>
+              <!-- 算法优势 -->
+              <div class="group-data" v-if="data.groupName">
+                <!-- <compare-group-view :dataList="data.groupList"></compare-group-view> -->
+                <div v-if="data.groupList.length > 0">
+                  <div
+                    class="group-box"
+                    v-for="(data, i) in data.groupList"
+                    :key="i"
+                  >
+                    <div
+                      class="flex-row-start row-tr"
+                      v-for="(item, j) in Object.keys(data)"
+                      :key="j"
+                      :class="
+                        j == Object.keys(data).length - 1 ? 'border-bottom' : ''
+                      "
+                    >
+                      <div class="td-name" :style="{ height: getHeight(item) }">
+                        <span class="td-text td-name-text">{{ item }}</span>
+                      </div>
+                      <div class="flex-row-start">
+                        <div
+                          class="td"
+                          :style="{ height: getHeight(item) }"
+                          v-for="(d, k) in data[item]"
+                          :key="k"
+                        >
+                          <a-tooltip placement="top" :title="d">
+                            <span class="td-text">{{ d }}</span>
+                          </a-tooltip>
                         </div>
+                      </div>
                     </div>
+                  </div>
                 </div>
+                <div v-if="data.groupList.length == 0" class="no-data">
+                  暂无数据
+                </div>
+              </div>
+              <div
+                class="flex-row-start row-tr"
+                v-else
+                v-for="(rowData, j) in data.list"
+                :key="j"
+                :class="j == data.list.length - 1 ? 'border-bottom' : ''"
+              >
+                <div
+                  class="td-name"
+                  :style="{ height: getHeight(rowData.name) }"
+                >
+                  <span class="td-text td-name-text">
+                    {{ rowData.name }}
+                  </span>
+                </div>
+                <div class="flex-row-start">
+                  <div
+                    class="td"
+                    v-for="(item, k) in rowData.infoList"
+                    :key="k"
+                    :style="{ height: getHeight(rowData.name) }"
+                  >
+                    <video
+                      v-if="showVideo(rowData.name) && item"
+                      width="240"
+                      height="180"
+                      controls
+                    >
+                      <source :src="item" type="video/mp4" />
+                      您的浏览器不支持 HTML5 video 标签。
+                    </video>
+                    <a-tooltip v-else placement="top" :title="item">
+                      <span class="td-text">{{ item }}</span>
+                    </a-tooltip>
+                  </div>
+                </div>
+              </div>
             </div>
+          </div>
         </div>
-
-        <a-modal class="modal-box" title="请选择" :visible="showAddModal" :onOk='handleOk' :onCancel='handleCancel'>
-            <a-table :columns="columns" :data-source="dataList" style="height:610px;overflow-y:scroll"
-                :row-selection="rowSelection" rowKey="id">
-            </a-table>
-        </a-modal>
-
-        <!-- <HomeFooter></HomeFooter> -->
+      </div>
     </div>
+
+    <a-modal
+      class="modal-box"
+      title="请选择"
+      :visible="showAddModal"
+      :onOk="handleOk"
+      :onCancel="handleCancel"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="dataList"
+        style="height: 610px; overflow-y: scroll"
+        :row-selection="rowSelection"
+        rowKey="id"
+      ></a-table>
+    </a-modal>
+
+    <!-- <HomeFooter></HomeFooter> -->
+  </div>
 </template>
 
 <script setup>
-import HomeFooter from '@/views/newHome/components/Footer'
-import HomeHeader from '@/views/home/components/header'
-import CompareGroupView from '@/views/home/components/CompareGroupView'
-import { pageWithAttrs } from '@/api/abilityStatistics'
-import { defineComponent, ref, onMounted, getCurrentInstance, computed, unref, reactive, nextTick, onCreated } from 'vue';
-import { selectOne } from '@/api/home'
-import { message, Tooltip, Table, Spin } from 'ant-design-vue'
-import { useRouter } from 'vue-router';
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import HomeHeader from '@/views/home/components/header'
+  import CompareGroupView from '@/views/home/components/CompareGroupView'
+  import { pageWithAttrs } from '@/api/abilityStatistics'
+  import {
+    defineComponent,
+    ref,
+    onMounted,
+    getCurrentInstance,
+    computed,
+    unref,
+    reactive,
+    nextTick,
+    onCreated,
+  } from 'vue'
+  import { selectOne } from '@/api/home'
+  import { message, Tooltip, Table, Spin } from 'ant-design-vue'
+  import { useRouter } from 'vue-router'
 
-const router = useRouter()
-let queryId = router.currentRoute.value.query.id;
-const ctx = getCurrentInstance();
+  const router = useRouter()
+  let queryId = router.currentRoute.value.query.id
+  const ctx = getCurrentInstance()
 
-// 最大4列
-const pagination = ref([])
-// 表格列名
-const columns = ref([
+  // 最大4列
+  const pagination = ref([])
+  // 表格列名
+  const columns = ref([
     {
-        title: '算法名称',
-        dataIndex: 'name',
+      title: '算法名称',
+      dataIndex: 'name',
     },
     {
-        title: '算法类型',
-        dataIndex: 'type',
+      title: '算法类型',
+      dataIndex: 'type',
     },
-])
-// 详情列表
-const detailArray = ref(['', '', '', ''])
+  ])
+  // 详情列表
+  const detailArray = ref(['', '', '', ''])
 
-const titleInfoObj = {
-    '基本信息': [
-        {
-            text: '算法名称', key: 'name'
-        },
-        {
-            text: '算法类别',
-        },
-        {
-            text: '部署位置',
-        },
-        {
-            text: '应用领域', key: '应用领域'
-        },
-        {
-            text: '共享条件', key: 'shareCondition'
-        },
-        {
-            text: '共享类型', key: 'shareType'
-        },
-        {
-            text: '算法描述', key: 'description'
-        },
-        {
-            text: '算法介绍视频', key: '算法介绍视频'
-        },
+  const titleInfoObj = {
+    基本信息: [
+      {
+        text: '算法名称',
+        key: 'name',
+      },
+      {
+        text: '算法类别',
+      },
+      {
+        text: '部署位置',
+      },
+      {
+        text: '应用领域',
+        key: '应用领域',
+      },
+      {
+        text: '共享条件',
+        key: 'shareCondition',
+      },
+      {
+        text: '共享类型',
+        key: 'shareType',
+      },
+      {
+        text: '算法描述',
+        key: 'description',
+      },
+      {
+        text: '算法介绍视频',
+        key: '算法介绍视频',
+      },
     ],
-    '算法优势': [
-        {
-            text: '算法优势名称', key: 'name'
-        },
-        {
-            text: '算法优势描述', key: 'desc'
-        },
+    算法优势: [
+      {
+        text: '算法优势名称',
+        key: 'name',
+      },
+      {
+        text: '算法优势描述',
+        key: 'desc',
+      },
     ],
-    '应用场景': [
-        {
-            text: '场景名称', key: '场景名称'
-        },
-        {
-            text: '场景描述', key: '场景描述'
-        },
+    应用场景: [
+      {
+        text: '场景名称',
+        key: '场景名称',
+      },
+      {
+        text: '场景描述',
+        key: '场景描述',
+      },
     ],
-    '应用案例': [
-        {
-            text: '关联应用',
-        },
-        {
-            text: '算法需求背景',
-        },
-        {
-            text: '算法应用期望达成效果',
-        },
+    应用案例: [
+      {
+        text: '关联应用',
+      },
+      {
+        text: '算法需求背景',
+      },
+      {
+        text: '算法应用期望达成效果',
+      },
     ],
-    '计费标准信息': [
-        {
-            text: '是否收费',
-        },
-        {
-            text: '计费方式',
-        },
-        {
-            text: '计费描述',
-        },
-        // {
-        //     text: '计费标准信息', key: ''
-        // },
+    计费标准信息: [
+      {
+        text: '是否收费',
+      },
+      {
+        text: '计费方式',
+      },
+      {
+        text: '计费描述',
+      },
+      // {
+      //     text: '计费标准信息', key: ''
+      // },
     ],
-    '使用方式': [
-        {
-            text: '服务接口',
-        },
-        {
-            text: '接口请求方式', key: 'apiMethodType'
-        },
-        {
-            text: '技术文档', key: ''
-        },
-        {
-            text: '是否支持试用', key: ''
-        },
-        {
-            text: '试用描述', key: ''
-        },
-        {
-            text: '试用地址',
-        },
+    使用方式: [
+      {
+        text: '服务接口',
+      },
+      {
+        text: '接口请求方式',
+        key: 'apiMethodType',
+      },
+      {
+        text: '技术文档',
+        key: '',
+      },
+      {
+        text: '是否支持试用',
+        key: '',
+      },
+      {
+        text: '试用描述',
+        key: '',
+      },
+      {
+        text: '试用地址',
+      },
     ],
-    '服务商': [
-        {
-            text: '服务商名',
-        },
-        {
-            text: '服务商联系人',
-        },
-        {
-            text: '服务商联系电话',
-        },
+    服务商: [
+      {
+        text: '服务商名',
+      },
+      {
+        text: '服务商联系人',
+      },
+      {
+        text: '服务商联系电话',
+      },
     ],
-    '常见问题': [
-        {
-            text: '常见问题',
-        },
-        {
-            text: '回答',
-        },
-    ]
-}
-// 左侧导航
-const leftNav = ref([])
-Object.keys(titleInfoObj).map(v => leftNav.value.push(v))
+    常见问题: [
+      {
+        text: '常见问题',
+      },
+      {
+        text: '回答',
+      },
+    ],
+  }
+  // 左侧导航
+  const leftNav = ref([])
+  Object.keys(titleInfoObj).map((v) => leftNav.value.push(v))
 
-// 可能会有多组的数据
-const arrayStr = [
-    '算法优势', '应用场景', '计费标准信息', '常见问题'
-]
+  // 可能会有多组的数据
+  const arrayStr = ['算法优势', '应用场景', '计费标准信息', '常见问题']
 
-let textObj = {
-    '算法优势': {
-        name: '算法优势名称',
-        desc: '算法优势描述'
+  let textObj = {
+    算法优势: {
+      name: '算法优势名称',
+      desc: '算法优势描述',
     },
-    '应用场景': {
-        name: '场景名称',
-        desc: '场景描述',
+    应用场景: {
+      name: '场景名称',
+      desc: '场景描述',
     },
-    '计费标准信息': {
-        type: '计费方式',
-        price: '价格',
-        desc: '计费描述信息',
-        '是否收费': '是否收费'
+    计费标准信息: {
+      type: '计费方式',
+      price: '价格',
+      desc: '计费描述信息',
+      是否收费: '是否收费',
     },
-    '常见问题': {
-        question: '常见问题',
-        answer: '回答'
+    常见问题: {
+      question: '常见问题',
+      answer: '回答',
     },
-}
+  }
 
-const showAddModal = ref(false)
-const dataList = ref([])
-const selectedRowKeys = ref([]);
-let tableData = ref([])
-const loadingPage = ref(false)
+  const showAddModal = ref(false)
+  const dataList = ref([])
+  const selectedRowKeys = ref([])
+  let tableData = ref([])
+  const loadingPage = ref(false)
 
-const getId = () => {
+  const getId = () => {
     return window.document.getElementById('bottomRef')
-}
+  }
 
-const handleClickTab = (e, link) => {
+  const handleClickTab = (e, link) => {
     // 阻止点击的默认事件修改路由
-    e.preventDefault();
+    e.preventDefault()
     if (link.href) {
-        let ele = document.getElementById(link.href);
-        ele && ele.scrollIntoView({ block: 'start', behavior: 'smooth' });
+      let ele = document.getElementById(link.href)
+      ele && ele.scrollIntoView({ block: 'start', behavior: 'smooth' })
     }
-}
+  }
 
-// 初始化
-onMounted(() => {
+  // 初始化
+  onMounted(() => {
     selectedRowKeys.value.push(queryId)
     nextTick(() => {
-        getList().then(res => {
-            initData()
-        })
+      getList().then((res) => {
+        initData()
+      })
     })
-})
+  })
 
-
-const initData = () => {
-    loadingPage.value = true;
+  const initData = () => {
+    loadingPage.value = true
     // queryId
     // 获取详情
-    Promise.all(selectedRowKeys.value.map(id => getDetail(id))).then(data => {
+    Promise.all(selectedRowKeys.value.map((id) => getDetail(id)))
+      .then((data) => {
         detailArray.value = []
         for (let index = 0; index < 4; index++) {
-            if (data[index] == undefined) {
-                detailArray.value.push('')
-            } else {
-                detailArray.value.push(formatterData(data[index]))
-            }
+          if (data[index] == undefined) {
+            detailArray.value.push('')
+          } else {
+            detailArray.value.push(formatterData(data[index]))
+          }
         }
 
         nextTick(() => {
-            // 处理数据
-            getNewData()
+          // 处理数据
+          getNewData()
         })
 
         loadingPage.value = false
-    }).catch(err => {
+      })
+      .catch((err) => {
         loadingPage.value = false
         message.error(err || '获取算法详情失败，请重试！')
-    })
-}
+      })
+  }
 
-// 处理数组
-const getNewData = () => {
+  // 处理数组
+  const getNewData = () => {
     tableData.value = []
     Object.keys(titleInfoObj).map((titleKey, i) => {
-        // 标题
-        let _newObj = {
-            'title': titleKey,
+      // 标题
+      let _newObj = {
+        title: titleKey,
+      }
+      if (arrayStr.includes(titleKey)) {
+        _newObj.groupName = titleKey
+        _newObj.groupList = []
+      } else {
+        _newObj.list = []
+      }
+      let list = []
+      titleInfoObj[titleKey].map((trName) => {
+        let obj = {
+          name: trName.text,
         }
-        if (arrayStr.includes(titleKey)) {
-            _newObj.groupName = titleKey;
-            _newObj.groupList = []
-        } else {
-            _newObj.list = []
-        }
-        let list = [];
-        titleInfoObj[titleKey].map(trName => {
-            let obj = {
-                name: trName.text,
-            }
-            if (!arrayStr.includes(titleKey)) {
-                obj.infoList = getInfoList(trName)
-                list.push(obj)
-            } else {
-                _newObj.groupList = getGroupList(titleKey, trName)
-            }
-        })
         if (!arrayStr.includes(titleKey)) {
-            _newObj.list = list;
+          obj.infoList = getInfoList(trName)
+          list.push(obj)
+        } else {
+          _newObj.groupList = getGroupList(titleKey, trName)
         }
-        tableData.value.push(_newObj)
+      })
+      if (!arrayStr.includes(titleKey)) {
+        _newObj.list = list
+      }
+      tableData.value.push(_newObj)
     })
-}
+  }
 
-// 基本信息等
-const getInfoList = (rowItem) => {
+  // 基本信息等
+  const getInfoList = (rowItem) => {
     let arr = []
-    detailArray.value.map(item => {
-        let val = undefined;
-        val = item[rowItem.key || rowItem.text]
-        arr.push(val)
+    detailArray.value.map((item) => {
+      let val = undefined
+      val = item[rowItem.key || rowItem.text]
+      arr.push(val)
     })
-    return arr;
-}
+    return arr
+  }
 
-// 算法优势：分组信息数组getGroupList
-const getGroupList = (titleKey, trName) => {
+  // 算法优势：分组信息数组getGroupList
+  const getGroupList = (titleKey, trName) => {
     let arr = []
-    detailArray.value.map(item => {
-        if (arrayStr.includes(titleKey)) {
-            let groupItemObj = {}
-            let _list = item[titleKey] || [];
-            let textInfo = textObj[titleKey]
-            _list.map(v => {
-                Object.keys(v).map(d => {
-                    if (textInfo[d] !== undefined) {
-                        groupItemObj[textInfo[d]] = v[d]
-                    }
-                })
-            })
-            arr.push(groupItemObj)
-        }
+    detailArray.value.map((item) => {
+      if (arrayStr.includes(titleKey)) {
+        let groupItemObj = {}
+        let _list = item[titleKey] || []
+        let textInfo = textObj[titleKey]
+        _list.map((v) => {
+          Object.keys(v).map((d) => {
+            if (textInfo[d] !== undefined) {
+              groupItemObj[textInfo[d]] = v[d]
+            }
+          })
+        })
+        arr.push(groupItemObj)
+      }
     })
     let _arr = translateArray(arr)
-    return _arr;
-}
+    return _arr
+  }
 
-// 数组转化
-const translateArray = (list) => {
+  // 数组转化
+  const translateArray = (list) => {
     let arr = []
-    if (list.every(v => JSON.stringify(v) == '{}')) {
-        arr = []
+    if (list.every((v) => JSON.stringify(v) == '{}')) {
+      arr = []
     } else {
-        let itemObj = list.find(v => JSON.stringify(v) !== '{}')
-        let obj = {}
-        Object.keys(itemObj).map(v => {
-            let arr2 = []
-            list.map(item => {
-                arr2.push(item[v] || '')
-            })
-            obj[v] = arr2
+      let itemObj = list.find((v) => JSON.stringify(v) !== '{}')
+      let obj = {}
+      Object.keys(itemObj).map((v) => {
+        let arr2 = []
+        list.map((item) => {
+          arr2.push(item[v] || '')
         })
-        arr.push(obj);
+        obj[v] = arr2
+      })
+      arr.push(obj)
     }
-    return arr;
-}
+    return arr
+  }
 
-// 获取算法列表
-const getList = () => {
+  // 获取算法列表
+  const getList = () => {
     const data = {
-        deptIds: [],
-        districtId: '',
-        infoList: [
-            { attrType: "组件类型", attrValue: "智能算法" }
-        ],
-        name: '',
-        orderField: 'total',
-        orderType: 'DESC',
-        pageNum: 1,
-        pageSize: 15,
-        // type: '组件服务',
-        type: '',
+      deptIds: [],
+      districtId: '',
+      infoList: [{ attrType: '组件类型', attrValue: '智能算法' }],
+      name: '',
+      orderField: 'total',
+      orderType: 'DESC',
+      pageNum: 1,
+      pageSize: 15,
+      // type: '组件服务',
+      type: '',
     }
     return new Promise((resolve, reject) => {
-        pageWithAttrs(data).then((res) => {
-            dataList.value = res.data.data.records || []
-            nextTick(() => {
-                // 默认前两个
-                // selectedRowKeys.value.push(dataList.value[0].id)
-                // selectedRowKeys.value.push(dataList.value[1].id)
-            })
-            resolve(res)
-        }).catch(err => {
-            reject(err)
+      pageWithAttrs(data)
+        .then((res) => {
+          dataList.value = res.data.data.records || []
+          nextTick(() => {
+            // 默认前两个
+            // selectedRowKeys.value.push(dataList.value[0].id)
+            // selectedRowKeys.value.push(dataList.value[1].id)
+          })
+          resolve(res)
+        })
+        .catch((err) => {
+          reject(err)
         })
     })
-}
+  }
 
-// 删除算法
-const deleteList = (i) => {
+  // 删除算法
+  const deleteList = (i) => {
     selectedRowKeys.value.splice(i, 1)
     detailArray.value.splice(i, 1)
     nextTick(() => {
-        for (let index = 0; index < 4; index++) {
-            if (detailArray.value[index] == undefined) {
-                detailArray.value.splice(index, 1, '')
-            }
+      for (let index = 0; index < 4; index++) {
+        if (detailArray.value[index] == undefined) {
+          detailArray.value.splice(index, 1, '')
         }
-        getNewData()
+      }
+      getNewData()
     })
-}
+  }
 
-const addList = () => {
+  const addList = () => {
     showAddModal.value = true
-}
+  }
 
-const handleOk = () => {
-    if (selectedRowKeys.length > 4) {
-        message.error('最多选择四个算法！')
-        return false;
+  const handleOk = () => {
+    if (selectedRowKeys.value.length > 4) {
+      message.error('最多选择四个算法！')
+      return false
     }
     initData()
     showAddModal.value = false
-}
+  }
 
-const handleCancel = () => {
+  const handleCancel = () => {
     showAddModal.value = false
-}
+  }
 
-const rowSelection = computed(() => {
+  const rowSelection = computed(() => {
     return {
-        selectedRowKeys: unref(selectedRowKeys),
-        onChange: changableRowKeys => {
-            if (changableRowKeys.length > 4) {
-                message.error('最多选择四个算法！')
-            } else {
-                selectedRowKeys.value = changableRowKeys;
-            }
-            if (selectedRowKeys.value.length > 4) {
-                selectedRowKeys.value = selectedRowKeys.value.splice(4)
-            }
-        },
-        hideDefaultSelections: true,
-    };
-});
+      selectedRowKeys: unref(selectedRowKeys),
+      onChange: (changableRowKeys) => {
+        if (changableRowKeys.length > 4) {
+          message.error('最多选择四个算法！')
+        } else {
+          selectedRowKeys.value = changableRowKeys
+        }
+        if (selectedRowKeys.value.length > 4) {
+          selectedRowKeys.value = selectedRowKeys.value.splice(4)
+        }
+      },
+      hideDefaultSelections: true,
+    }
+  })
 
-
-// 动态获取高度
-const getHeight = (name) => {
+  // 动态获取高度
+  const getHeight = (name) => {
     if (name.indexOf('描述') != -1) {
-        return '120px'
+      return '120px'
     }
     if (name.indexOf('视频') != -1) {
-        return '230px'
+      return '230px'
     }
-}
+  }
 
-// 是否视频播放
-const showVideo = (name) => {
+  // 是否视频播放
+  const showVideo = (name) => {
     if (name.indexOf('视频') !== -1) {
-        return true
+      return true
     }
-    return false;
-}
+    return false
+  }
 
-
-// 获取详情
-const getDetail = (id) => {
+  // 获取详情
+  const getDetail = (id) => {
     return new Promise((resolve, reject) => {
-        selectOne(id).then((res) => {
-            resolve(res.data && res.data.data)
-        }).catch(err => {
-            reject(err)
+      selectOne(id)
+        .then((res) => {
+          resolve(res.data && res.data.data)
+        })
+        .catch((err) => {
+          reject(err)
         })
     })
-}
+  }
 
-// 判断是否json字符串
-const isJson = (str) => {
+  // 判断是否json字符串
+  const isJson = (str) => {
     if (typeof str == 'string') {
-        try {
-            let obj = JSON.parse(str)
-            return true
-        } catch (e) {
-            return false;
-        }
+      try {
+        let obj = JSON.parse(str)
+        return true
+      } catch (e) {
+        return false
+      }
     }
-}
+  }
 
-// infoList数组处理
-const formatterData = (obj) => {
+  // infoList数组处理
+  const formatterData = (obj) => {
     let _newObj = {}
-    obj.infoList.map(v => {
-        _newObj[v.attrType] = isJson(v.attrValue) ? JSON.parse(v.attrValue) : v.attrValue;
+    obj.infoList.map((v) => {
+      _newObj[v.attrType] = isJson(v.attrValue)
+        ? JSON.parse(v.attrValue)
+        : v.attrValue
     })
     let _obj = Object.assign({}, obj, _newObj)
     return _obj
-}
-
+  }
 </script>
 
-
 <style lang="less" scoped>
-.bg {
+  .bg {
     background: #fff;
     height: 100vh;
     width: 100%;
-}
+  }
 
-// @font-face {
-//     font-family: 'num-typeface';
-//     src: url('~@/assets/newHome/font/num-typeface.otf');
-// }
+  // @font-face {
+  //     font-family: 'num-typeface';
+  //     src: url('~@/assets/newHome/font/num-typeface.otf');
+  // }
 
-.border {
+  .border {
     border: 1px solid #dddee1;
     border-bottom: none;
     border-right: none;
-}
+  }
 
-.border-bottom {
+  .border-bottom {
     border-bottom: 1px solid #dddee1;
-}
+  }
 
-.no-border-right {
+  .no-border-right {
     border: 1px solid #dddee1;
     border-right: none;
-}
+  }
 
-.flex-row-start {
+  .flex-row-start {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-}
+  }
 
-.box-container {
+  .box-container {
     width: 1592px;
     margin: 0 auto;
     padding-top: 60px;
@@ -578,114 +671,111 @@ const formatterData = (obj) => {
     box-sizing: border-box;
 
     .content {
-        display: flex;
-        justify-content: flex-start;
-        align-items: flex-start;
-        padding-top: 10px;
-        height: calc(100% - 60px);
-        width: 100%;
+      display: flex;
+      justify-content: flex-start;
+      align-items: flex-start;
+      padding-top: 10px;
+      height: calc(100% - 60px);
+      width: 100%;
     }
 
     .nav-box {
-        height: 50px;
-        width: 100%;
-        font-size: 14px;
-        display: flex;
-        align-items: center;
-        background: rgba(244, 245, 248, 0.8);
-        padding-left: 10px;
+      height: 50px;
+      width: 100%;
+      font-size: 14px;
+      display: flex;
+      align-items: center;
+      background: rgba(244, 245, 248, 0.8);
+      padding-left: 10px;
     }
 
-
     .left {
-        width: 200px;
-        height: 600px;
-        background: rgba(244, 245, 248, 0.8);
+      width: 200px;
+      height: 600px;
+      background: rgba(244, 245, 248, 0.8);
 
-        .left-item {
-            margin: 0 14px;
-            height: 60px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size: 16px;
-            color: #212121;
-            border-bottom: 1px solid #dddee1;
+      .left-item {
+        margin: 0 14px;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        color: #212121;
+        border-bottom: 1px solid #dddee1;
 
-            &:hover {
-                cursor: pointer;
-            }
+        &:hover {
+          cursor: pointer;
         }
+      }
 
-        .active {
-            background: #0058e1;
-            color: #fff !important;
-            margin: 0;
-        }
+      .active {
+        background: #0058e1;
+        color: #fff !important;
+        margin: 0;
+      }
     }
 
     .right {
-        width: 1370px;
-        margin-left: 32px;
-        height: 100%;
+      width: 1370px;
+      margin-left: 32px;
+      height: 100%;
 
-        .top {
-            width: 100%;
-            height: 100px;
-            margin-bottom: 20px;
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
+      .top {
+        width: 100%;
+        height: 100px;
+        margin-bottom: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
 
-            .td-name {
-                height: 100px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-
-            .td {
-                height: 100px;
-                line-height: 100px;
-                position: relative;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-            }
-
-
-            .icon-delete {
-                position: absolute;
-                right: 10px;
-                top: 10px;
-                height: 12px;
-                width: 12px;
-                background: url('~@/assets/newHome/delete-on.png');
-                background-size: 100% 100%;
-                cursor: pointer;
-            }
+        .td-name {
+          height: 100px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
 
-
-        .bottom {
-            width: 100%;
-            overflow-y: auto;
-            height: calc(100% - 130px);
-            padding-bottom: 10px;
-            box-sizing: border-box;
+        .td {
+          height: 100px;
+          line-height: 100px;
+          position: relative;
+          display: flex;
+          justify-content: center;
+          align-items: center;
         }
+
+        .icon-delete {
+          position: absolute;
+          right: 10px;
+          top: 10px;
+          height: 12px;
+          width: 12px;
+          background: url('~@/assets/newHome/delete-on.png');
+          background-size: 100% 100%;
+          cursor: pointer;
+        }
+      }
+
+      .bottom {
+        width: 100%;
+        overflow-y: auto;
+        height: calc(100% - 130px);
+        padding-bottom: 10px;
+        box-sizing: border-box;
+      }
     }
-}
+  }
 
-.title {
+  .title {
     font-size: 14px;
     padding: 20px 0 10px 10px;
     color: #212121;
     font-weight: bold;
     background: rgba(244, 245, 248, 0.8);
-}
+  }
 
-.td-name {
+  .td-name {
     border-right: 1px solid #dddee1;
     height: 60px;
     line-height: 60px;
@@ -695,10 +785,9 @@ const formatterData = (obj) => {
     display: flex;
     align-items: center;
     justify-content: center;
+  }
 
-}
-
-.td {
+  .td {
     border-right: 1px solid #dddee1;
     height: 60px;
     text-align: center;
@@ -709,10 +798,9 @@ const formatterData = (obj) => {
     font-size: 14px;
     box-sizing: border-box;
     table-layout: fixed;
-}
+  }
 
-
-.td-text {
+  .td-text {
     width: 290px;
     font-size: 14px;
     overflow: hidden;
@@ -720,80 +808,78 @@ const formatterData = (obj) => {
     display: -webkit-box;
     -webkit-line-clamp: 3;
     -webkit-box-orient: vertical;
-}
+  }
 
-.td-name-text {
+  .td-name-text {
     width: 200px;
-}
+  }
 
-
-.row-tr {
+  .row-tr {
     border: 1px solid #dddee1;
     border-right: none;
     border-bottom: none;
     background: #fff;
-}
+  }
 
-.border-bottom {
+  .border-bottom {
     border-bottom: 1px solid #dddee1;
-}
+  }
 
-.modal-box {
+  .modal-box {
     height: 650px;
     width: 800px;
-}
+  }
 
-.add-img {
+  .add-img {
     height: 60px;
     width: 60px;
     background: url('~@/assets/newHome/add-on.png');
     background-size: 100% 100%;
     cursor: pointer;
-}
+  }
 
-.no-data {
+  .no-data {
     height: 100px;
     width: 100%;
-    ;
     display: flex;
     align-items: center;
     justify-content: center;
     border: 1px solid #dddee1;
-}
+  }
 
-.loading-box {
+  .loading-box {
     width: 1592px;
     height: 500px;
     position: absolute;
     display: flex;
     align-items: center;
     justify-content: center;
-}
+  }
 
-.video-box {
+  .video-box {
     height: 140px;
     width: 240px;
-}
+  }
 
-.ant-anchor-wrapper {
+  .ant-anchor-wrapper {
     width: 200px;
     height: 600px;
     background: rgba(244, 245, 248, 0.8);
     padding-left: 0;
     position: static;
-}
+  }
 
-.ant-anchor-ink::before {
+  .ant-anchor-ink::before {
     content: ' ';
     width: 0 !important;
-}
+  }
 
-/deep/ .ant-anchor {
+  /deep/ .ant-anchor {
     position: static;
     padding-left: 0;
-}
+  }
 
-.ant-anchor-link {
+  .ant-anchor-link {
     padding: 0;
     margin: 0 14px;
     height: 60px;
@@ -803,5 +889,8 @@ const formatterData = (obj) => {
     font-size: 16px;
     color: #212121;
     border-bottom: 1px solid #dddee1;
-}
-</style>
\ No newline at end of file
+  }
+  :deep(.ant-checkbox-indeterminate) {
+    display: none;
+  }
+</style>

From a4c46b8edfaa67ea08e9da453595064718707823 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 30 Jun 2022 10:28:02 +0800
Subject: [PATCH 09/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/detailsAll/ApplicationDetails.vue | 8 ++++++--
 front/src/views/login/index.vue                   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 509ade79..32fc2079 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:59:18
+ * @LastEditTime: 2022-06-30 10:22:31
  * @Description: 应用详情页
 -->
 <template>
@@ -136,9 +136,13 @@
       selectOne(id).then((res) => {
         // console.clear()
         dataList.data = res.data.data
-        console.log('初始化详情页=========================>', dataList.data)
         const arrList = ref([])
         arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+        console.log(
+          '初始化详情页=========================>',
+          dataList.data,
+          arrList.value
+        )
         if (arrList.value && arrList.value.indexOf(id) === -1) {
           arrList.value.push(id)
           updateVisits({
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index 9808d177..61be47bf 100644
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@@ -108,6 +108,7 @@
             username: this.form.username,
           })
           window.sessionStorage.setItem('visits', JSON.stringify([]))
+          console.log('添加visits========================================>')
           // console.log(this.handleRoute())
           await this.$router.push('/home')
         } catch (error) {

From 802a940dc014a10e1de14b888e1ee41e93ad6d3c Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 30 Jun 2022 10:30:53 +0800
Subject: [PATCH 10/10] =?UTF-8?q?303-=E7=9F=A5=E8=AF=86=E5=BA=93=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Business/BusinessNavigation.vue     |  2 +-
 .../LayerService/LayerServiceNavigation.vue        |  4 +---
 front/src/views/home/components/KnowledgeBase.vue  | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
index fa9f6e76..2c48888b 100644
--- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
@@ -57,7 +57,7 @@
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
   })
-  const select = ref('algorithm-display')
+  const select = ref('business-presentation')
   const list = ref([])
   const selectNav = (key) => {
     select.value = key
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
index cdaa2258..9ccd0217 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@@ -61,7 +61,7 @@
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
   })
-  const select = ref('algorithm-display')
+  const select = ref('service-presentation')
   const list = ref([])
   const selectNav = (key) => {
     select.value = key
@@ -197,8 +197,6 @@
           }
         })
         list.value.push('关联能力')
-        list.value.push('图层信息')
-        list.value.push('使用方式')
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
diff --git a/front/src/views/home/components/KnowledgeBase.vue b/front/src/views/home/components/KnowledgeBase.vue
index f4d0cc60..d3724da5 100644
--- a/front/src/views/home/components/KnowledgeBase.vue
+++ b/front/src/views/home/components/KnowledgeBase.vue
@@ -51,6 +51,7 @@
 <script setup>
   import { ref, reactive, defineProps } from 'vue'
   import mybus from '@/myplugins/mybus'
+  import { updateVisits } from '@/api/home'
   const props = defineProps({
     resourceList: { type: Array, default: null },
     resourceTotal: { type: String, default: '' },
@@ -63,6 +64,19 @@
   })
   const current = ref(1)
   const openHref = (item) => {
+    console.log(item.id, 'wowowo')
+    console.log(item.visits, 'wowowo')
+    const arrList = ref([])
+    arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+    if (arrList.value.indexOf(item.id) === -1) {
+      arrList.value.push(item.id)
+      updateVisits({
+        id: item.id,
+        visits: item.visits || '0',
+      }).then(() => {
+        window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+      })
+    }
     window.open(item.link)
     // window.open(
     //   window.SITE_CONFIG.previewUrl +
