From 46ad5e747d79730648c889cdb4a45cc268595950 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 20:28:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E5=92=8Cgis=E5=B9=BF=E5=9C=BA=20=E4=BC=A0=E5=8F=82=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/capacitySquare/components/algorithm.vue | 11 +++++++++--
 front/src/views/capacitySquare/components/layer.vue   | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue
index 9a63f367..e4ef303a 100644
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@@ -79,6 +79,7 @@ const params = {
 
 // 切换领域
 const changeAreaFunction = (val) => {
+  params.pageNum = 1;
   typeName2.value = val
   params.area = typeName2.value == '全部' ? '' : typeName2.value;
   selectFlag2.value = false
@@ -160,7 +161,13 @@ const changeDeptType = (str) => {
         break
     }
     params.pageNum = 1;
-    params.deptType = deptType.value;
+    if(deptType.value !== null && deptType.value !== undefined) {
+      params.deptType = deptType.value;
+    }else {
+      if(Object.keys(params).includes('deptType')) {
+        delete params.deptType
+      }
+    }
   }
   selectFlag.value = false
   getData(str)
@@ -169,7 +176,7 @@ const changeDeptType = (str) => {
 const getData = (str) => {
   getGisByArea(params).then((res) => {
     const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9) {
+    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
       algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
     }
     dataList.value = resData.list || []
diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue
index f7facca0..d7b03a79 100644
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
@@ -77,6 +77,7 @@ const params = {
 
 // 切换领域
 const changeAreaFunction = (val) => {
+  params.pageNum = 1;
   typeName2.value = val
   params.area = typeName2.value == '全部' ? '' : typeName2.value;
   selectFlag2.value = false
@@ -126,7 +127,13 @@ const changeDeptType = (str) => {
         break
     }
     params.pageNum = 1;
-    params.deptType = deptType.value;
+    if(deptType.value !== null && deptType.value !== undefined) {
+      params.deptType = deptType.value;
+    }else {
+      if(Object.keys(params).includes('deptType')) {
+        delete params.deptType
+      }
+    }
   }
   selectFlag.value = false
   getData(str)
@@ -135,7 +142,7 @@ const changeDeptType = (str) => {
 const getData = (str) => {
   getGisByArea(params).then((res) => {
     const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9) {
+    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
       algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
     }
     dataList.value = resData.list || []

From 4930027d6776fe6b3b558ad9a7edc143bed85140 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 10:50:09 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=AC=E5=8A=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/ability-resource-shelf.vue   |  47 +-
 .../components/CapabilityConvergence.vue      | 844 +++++++++---------
 2 files changed, 483 insertions(+), 408 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 418be3f7..663d940a 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -36,6 +36,7 @@
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
       <div>
+        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')"
           >驳回</el-button
@@ -61,6 +62,7 @@
         > -->
       </div>
     </div>
+    <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
     <el-dialog
@@ -84,6 +86,7 @@
 </template>
 
 <script>
+import RenTaskEntrust from '@/components/ren-process-running/src/ren-task-entrust'
 import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
@@ -93,7 +96,8 @@ export default {
   // 注入公共方法
   // mixins: [processModule],
   components: {
-    ResourcesAndServices
+    ResourcesAndServices,
+    RenTaskEntrust
   },
   props: {
     // fromList: {
@@ -105,6 +109,9 @@ export default {
   },
   data () {
     return {
+      taskEntrustFlag: false,
+      taskEntrustFlag2: false,
+      renTaskEntrustVisible: false,
       dialogVisible: false,
       dialogType: '',
       input: '',
@@ -132,6 +139,35 @@ export default {
     console.log('params=================>', this.$route, this.$route.params)
     this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
+    this.$http.get('/sys/user/info').then(({ data: res }) => {
+      res.data.roleIdList.map(val => {
+        this.$http.get('/sys/role/' + val).then(role => {
+          if (role.data.data.name === '流程管理员') {
+            this.taskEntrustFlag = true
+            this.$http
+              .get(
+                '/act/task/getTaskVariables?taskId=' + this.$route.params.taskId + '&variableName=allowEntrust'
+              ).then(entrust => {
+                console.log('11111111111111', entrust, this.dataForm)
+                if (entrust.data.data.allowEntrust === true) {
+                  this.taskEntrustFlag2 = true
+                  if (this.taskEntrustFlag && this.taskEntrustFlag2) {
+                    this.$alert('当前审核部门为' + this.dataForm.deptName + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
+                      confirmButtonText: '确定',
+                      callback: action => {
+                        // this.$message({
+                        //   type: 'info',
+                        //   message: `action: ${action}`
+                        // })
+                      }
+                    })
+                  }
+                }
+              })
+          }
+        })
+      })
+    })
     this.init()
     console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
@@ -154,6 +190,15 @@ export default {
   },
   computed: {},
   methods: {
+
+    entrustTask () {
+      this.renTaskEntrustVisible = true
+      this.$nextTick(() => {
+        this.$refs.renTaskEntrust.dataForm.taskId = this.dataForm.taskId
+        this.$refs.renTaskEntrust.callbacks = this.callbacks
+        this.$refs.renTaskEntrust.init()
+      })
+    },
     getInfo (id) {
       this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
         this.dataForm = res.data.resourceDTO
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 8e3d9c3a..5cfa10e3 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -8,40 +8,74 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in zjList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne1(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in yyList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne11(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
-            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
-            {{ item.name + '-' + item.num + '项' }}
+          <div
+            class="name"
+            v-for="(item, index) in jcList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)"
+          >
+            {{
+              item.name +
+              '-' +
+              item.num +
+              (item.name == '会客厅'
+                ? '间'
+                : item.name == '视频会议'
+                ? '个'
+                : '项')
+            }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)">
+          <div
+            class="name"
+            v-for="(item, index) in sjList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)">
+          <div
+            class="name"
+            v-for="(item, index) in zsList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -51,436 +85,432 @@
   </div>
 </template>
 <script setup>
-import {
-  pageWithAttrs,
-  getDataResource,
-  selectInfrastructureList,
-  selectCollectComponentList,
-  selectCollectResourceList
-} from '@/api/home.js'
-import { ref, reactive } from 'vue'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
-import { message, Upload } from 'ant-design-vue'
-import mybus from '@/myplugins/mybus'
-const store = useStore()
-const router = useRouter()
-const zjList = ref([])
-const jcList = ref([])
-const sjList = ref([])
-const yyList = ref([])
-// 知识库模块数据
-const zsList = ref([])
-// const jcList = ref([])
-const paramsGetResources = {
-  districtId: '',
-  pageNum: 1,
-  pageSize: 5,
-  type: '',
-  name: '',
-  infoList: [],
-  orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-  orderType: 'DESC', // ASC 升序  DESC 降序
-}
-console.log('dataShowdev==========================>', whoShow)
-// eslint-disable-next-line no-undef
-const whoShow1 = ref(whoShow)
-const interfaceSuccess = ref(0)
-const object = reactive({
-  yyNum: '',
-  zjNum: '',
-  jcNum: '',
-  sjNum: '',
-  zsNum: '',
-})
-const getAppResources = (type, obj) => {
-  paramsGetResources.type = type
-  if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
-    getDataResource({
-      serviceName: paramsGetResources.name || '', //资源名称
-      orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
-      orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-      pageNum: paramsGetResources.pageNum, //页码
-      pageSize: paramsGetResources.pageSize, //分页大小
-    }).then((res) => {
-      console.log('数据资源==================>', res.data.data)
-      if (whoShow1.value.itShowQingDao) {
-        res.data.data.data.forEach((val) => {
-          val.id = val.guid // id
-          val.name = val.zyname // 名字
-          val.sjlCount = val.sjcczl // 数据量
-          val.applyCount = val.syqk // 申请量
-          val.deptName = val.TGBM // 部门
-          val.createDate = val.fbrq // 发布时间
-          val.description = val.xgxt // 描述
-        })
-        obj.value = res.data.data.data || []
-        object.sjNum = res.data.data.rows
-      } else if (whoShow1.value.itShowXiHaiAn) {
-        res.data.data.list.forEach((val) => {
-          val.id = val.serviceId // id
-          val.name = val.serviceName // 名字
-          val.sjlCount = val.requestQuantity // 数据量
-          val.applyCount = val.requestCount // 申请量
-          val.deptName = val.departmentName // 部门
-          val.createTime = val.createTime.split('.')[0]
-          val.createDate = val.createTime // 发布时间
-        })
-        obj.value = res.data.data.list || []
-        object.sjNum = res.data.data.total
-      }
-    })
-  } else {
-    let type = paramsGetResources.type
+  import {
+    pageWithAttrs,
+    getDataResource,
+    selectInfrastructureList,
+    selectCollectComponentList,
+    selectCollectResourceList,
+  } from '@/api/home.js'
+  import { ref, reactive } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+  import { message, Upload } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
+  const store = useStore()
+  const router = useRouter()
+  const zjList = ref([])
+  const jcList = ref([])
+  const sjList = ref([])
+  const yyList = ref([])
+  // 知识库模块数据
+  const zsList = ref([])
+  // const jcList = ref([])
+  const paramsGetResources = {
+    districtId: '',
+    pageNum: 1,
+    pageSize: 5,
+    type: '',
+    name: '',
+    infoList: [],
+    orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+    orderType: 'DESC', // ASC 升序  DESC 降序
+  }
+  console.log('dataShowdev==========================>', whoShow)
+  // eslint-disable-next-line no-undef
+  const whoShow1 = ref(whoShow)
+  const interfaceSuccess = ref(0)
+  const object = reactive({
+    yyNum: '',
+    zjNum: '',
+    jcNum: '',
+    sjNum: '',
+    zsNum: '',
+  })
+  const getAppResources = (type, obj) => {
+    paramsGetResources.type = type
+    if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
+      getDataResource({
+        serviceName: paramsGetResources.name || '', //资源名称
+        orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
+        orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+        pageNum: paramsGetResources.pageNum, //页码
+        pageSize: paramsGetResources.pageSize, //分页大小
+      }).then((res) => {
+        console.log('数据资源==================>', res.data.data)
+        if (whoShow1.value.itShowQingDao) {
+          res.data.data.data.forEach((val) => {
+            val.id = val.guid // id
+            val.name = val.zyname // 名字
+            val.sjlCount = val.sjcczl // 数据量
+            val.applyCount = val.syqk // 申请量
+            val.deptName = val.TGBM // 部门
+            val.createDate = val.fbrq // 发布时间
+            val.description = val.xgxt // 描述
+          })
+          obj.value = res.data.data.data || []
+          object.sjNum = res.data.data.rows
+        } else if (whoShow1.value.itShowXiHaiAn) {
+          res.data.data.list.forEach((val) => {
+            val.id = val.serviceId // id
+            val.name = val.serviceName // 名字
+            val.sjlCount = val.requestQuantity // 数据量
+            val.applyCount = val.requestCount // 申请量
+            val.deptName = val.departmentName // 部门
+            val.createTime = val.createTime.split('.')[0]
+            val.createDate = val.createTime // 发布时间
+          })
+          obj.value = res.data.data.list || []
+          object.sjNum = res.data.data.total
+        }
+      })
+    } else {
+      let type = paramsGetResources.type
 
-    if (type == '基础设施') {
-      jcList.value = []
-      selectInfrastructureList().then((res) => {
-        console.log('基础设施------res------>', res);
-        for (const key in res.data.data) {
-          if (whoShow1.value.itShowXiHaiAn) {
-            if (key === '视频资源') {
+      if (type == '基础设施') {
+        jcList.value = []
+        selectInfrastructureList().then((res) => {
+          console.log('基础设施------res------>', res)
+          for (const key in res.data.data) {
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (key === '视频资源') {
+                jcList.value.push({
+                  name: key,
+                  num: res.data.data[key],
+                })
+              }
+            } else {
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
               })
             }
-          } 
-          else  {  
-            jcList.value.push({
+          }
+          //  jcList.value.push({
+          //       name: '会客厅',
+          //       num: 4,
+          //     })
+          // 西海岸-单兵设备、无人机 获取数量
+          if (whoShow1.value.itShowXiHaiAn) {
+            getSoldierData('无人机')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                jcList.value.push({
+                  name: '无人机',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--无人机---------->', err)
+              })
+            getSoldierData('单兵设备')
+              .then((res) => {
+                let { total = 0 } = res.data.data
+                jcList.value.push({
+                  name: '单兵设备',
+                  num: total,
+                })
+              })
+              .catch((err) => {
+                console.log('err--单兵设备---------->', err)
+              })
+          }
+        })
+      } else if (type == '组件服务') {
+        zjList.value = []
+        selectCollectComponentList().then((res) => {
+          console.log('组件服务----res-------->', res)
+          for (const key in res.data.data) {
+            console.log('key------------>', key)
+            zjList.value.push({
               name: key,
               num: res.data.data[key],
             })
           }
-        }
-        //  jcList.value.push({
-        //       name: '会客厅',
-        //       num: 4,
-        //     })
-        // 西海岸-单兵设备、无人机 获取数量
-        if (whoShow1.value.itShowXiHaiAn) {
-          getSoldierData('无人机')
-            .then((res) => {
-              let { total = 0 } = res.data.data
-              jcList.value.push({
-                name: '无人机',
-                num: total,
-              })
+          console.log('zjList------------>', zjList)
+        })
+      } else if (type == '应用资源') {
+        yyList.value = []
+        selectCollectResourceList().then((res) => {
+          console.log('应用资源---res--------->', res)
+          for (const key in res.data.data) {
+            yyList.value.push({
+              name: key,
+              num: res.data.data[key],
             })
-            .catch((err) => {
-              console.log('err--无人机---------->', err)
-            })
-          getSoldierData('单兵设备')
-            .then((res) => {
-              let { total = 0 } = res.data.data
-              jcList.value.push({
-                name: '单兵设备',
-                num: total,
-              })
-            })
-            .catch((err) => {
-              console.log('err--单兵设备---------->', err)
-            })
-        }
-      })
-    }
-    else if (type == '组件服务') {
-      zjList.value = []
-      selectCollectComponentList().then((res) => {
-        console.log('组件服务----res-------->', res);
-        for (const key in res.data.data) {
-          console.log('key------------>', key);
-          zjList.value.push({
-            name: key,
-            num: res.data.data[key],
-          })
-        }
-        console.log('zjList------------>', zjList);
-      })
-    }
-    else if (type == '应用资源') {
-      yyList.value = []
-      selectCollectResourceList().then((res) => {
-        console.log('应用资源---res--------->', res);
-        for (const key in res.data.data) {
-          yyList.value.push({
-            name: key,
-            num: res.data.data[key],
-          })
-        }
-      })
-    }
-    else {
-      pageWithAttrs(paramsGetResources).then((res) => {
-        console.log('object个数======>', type)
-        obj.value = res.data.data.records
-        switch (type) {
-          case '组件服务':
-            assignmentMethod('zjNum', res)
-            break
-          case '应用资源':
-            assignmentMethod('yyNum', res)
-            break
-          case '基础设施':
-            assignmentMethod('jcNum', res)
-            break
-          case '知识库':
-            assignmentMethod('zsNum', res)
-            break
-        }
-      })
+          }
+        })
+      } else {
+        pageWithAttrs(paramsGetResources).then((res) => {
+          console.log('object个数======>', type)
+          obj.value = res.data.data.records
+          switch (type) {
+            case '组件服务':
+              assignmentMethod('zjNum', res)
+              break
+            case '应用资源':
+              assignmentMethod('yyNum', res)
+              break
+            case '基础设施':
+              assignmentMethod('jcNum', res)
+              break
+            case '知识库':
+              assignmentMethod('zsNum', res)
+              break
+          }
+        })
+      }
     }
   }
-}
 
-// todo 获取无人机、单兵设备
-const getSoldierData = (name) => {
-  let _params = {
-    type: name,
-    page: 1,
-    limit: 10,
-  }
-  return new Promise((resolve, reject) => {
-    getSoldierList(_params)
-      .then((res) => {
-        resolve(res)
-        console.log('res---获取无人机、单兵设备--------->', res)
-        if (res.data.code !== 0) {
-          return message.error(res.data.msg)
-        }
-      })
-      .catch((err) => {
-        reject(err)
-      })
-  })
-}
-
-const openHref = (item) => {
-  console.log(item.id, 'wowowo')
-  console.log(item.visits, 'wowowo')
-  browsingInsert({ resourceId: item.id }).then((res) => {
-    // console.log(res)
-  })
-  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))
+  // todo 获取无人机、单兵设备
+  const getSoldierData = (name) => {
+    let _params = {
+      type: name,
+      page: 1,
+      limit: 10,
+    }
+    return new Promise((resolve, reject) => {
+      getSoldierList(_params)
+        .then((res) => {
+          resolve(res)
+          console.log('res---获取无人机、单兵设备--------->', res)
+          if (res.data.code !== 0) {
+            return message.error(res.data.msg)
+          }
+        })
+        .catch((err) => {
+          reject(err)
+        })
     })
   }
-  window.open(item.link)
-}
-const assignmentMethod = (type, res) => {
-  object[type] = res.data.data.total
-}
-getAppResources('组件服务', zjList)
-getAppResources('应用资源', yyList)
-getAppResources('基础设施', jcList)
-getAppResources('数据资源', sjList)
-getAppResources('知识库', zsList)
 
-function jumpPage(type) {
-  // 点击内存入store
-  store.commit('home/selectCardsData', {
-    selectCardsnum: type,
-  })
-  console.log(
-    '选中===================>',
-    store.getters['home/selectCardsnum']
-  )
-  // router.push({ path: '/DetailsPageconetent' })
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      select: type,
-    },
-  })
-}
-const selectOne = (id) => {
-  console.log('点击===============》', id)
-  router.push({
-    path: '/details',
-    query: {
-      id: id,
-    },
-  })
-}
-const selectOne1 = (name) => {
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      type: name,
-      select: '组件服务',
-    },
-  })
-}
-const selectOne11 = (name) => {
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      type: name,
-      select: '应用资源',
-    },
-  })
-}
-const selectOne2 = (name) => {
-  let names=''
-  if(name ==='云资源'){
-    names='政务云资源'
-  } else if(name ==='会客厅'){
-    names='城市云脑会客厅'
-  }else{
-    names=name
+  const openHref = (item) => {
+    console.log(item.id, 'wowowo')
+    console.log(item.visits, 'wowowo')
+    browsingInsert({ resourceId: item.id }).then((res) => {
+      // console.log(res)
+    })
+    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)
+  }
+  const assignmentMethod = (type, res) => {
+    object[type] = res.data.data.total
+  }
+  getAppResources('组件服务', zjList)
+  getAppResources('应用资源', yyList)
+  getAppResources('基础设施', jcList)
+  getAppResources('数据资源', sjList)
+  getAppResources('知识库', zsList)
+
+  function jumpPage(type) {
+    // 点击内存入store
+    store.commit('home/selectCardsData', {
+      selectCardsnum: type,
+    })
+    console.log(
+      '选中===================>',
+      store.getters['home/selectCardsnum']
+    )
+    // router.push({ path: '/DetailsPageconetent' })
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        select: type,
+      },
+    })
+  }
+  const selectOne = (id) => {
+    console.log('点击===============》', id)
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  const selectOne1 = (name) => {
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: name,
+        select: '组件服务',
+      },
+    })
+  }
+  const selectOne11 = (name) => {
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: name,
+        select: '应用资源',
+      },
+    })
+  }
+  const selectOne2 = (name) => {
+    let names = ''
+    if (name === '云资源') {
+      names = '政务云资源'
+    } else if (name === '会客厅') {
+      names = '城市云脑会客厅'
+    } else {
+      names = name
+    }
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        type: names,
+        select: '基础设施',
+      },
+    })
+  }
+  const selectOne3 = (name) => {
+    console.log('点击===============》', name)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        str: name,
+        select: '数据资源',
+      },
+    })
   }
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      type: names,
-      select: '基础设施',
-    },
-  })
-}
-const selectOne3 = (name) => {
-  console.log('点击===============》', name)
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      str: name,
-      select: '数据资源',
-    },
-  })
-}
 </script>
 <style lang="less" scoped>
-.capability-convergence {
-  height: 7.2rem;
-  background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
-  background-size: 100%;
-  display: flex;
-  justify-content: center;
-
-  .main {
-    width: 13rem;
-    margin-top: 1.8rem;
+  .capability-convergence {
+    height: 7.2rem;
+    background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
+    background-size: 100%;
     display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
+    justify-content: center;
 
-    .top {
-      font-size: 0.3rem;
-      color: #212121;
-      text-align: center;
+    .main {
+      width: 13rem;
+      margin-top: 1.8rem;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
-      justify-content: center;
-      align-items: center;
 
-      .line {
-        width: 0.34rem;
-        height: 0.03rem;
-        background-color: #0058e1;
-        margin-top: 0.08rem;
+      .top {
+        font-size: 0.3rem;
+        color: #212121;
+        text-align: center;
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        justify-content: center;
+        align-items: center;
+
+        .line {
+          width: 0.34rem;
+          height: 0.03rem;
+          background-color: #0058e1;
+          margin-top: 0.08rem;
+        }
       }
-    }
 
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      margin-top: 0.4rem;
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 0.4rem;
 
-      .item {
-        width: 2.44rem;
-        height: 3.91rem;
-        font-size: 0.16rem;
-        background-color: #fff;
-        border-radius: 0.02rem;
-        box-shadow: 0 0.05rem 0.2rem #ccc;
-        position: relative;
-
-        div:nth-of-type(1) {
-          height: 1.02rem;
-          line-height: 1.02rem;
-          font-size: 0.2rem;
-          color: #fff;
-          padding-left: 0.15rem;
-          background-size: 100%;
-        }
-
-        .jc {
-          background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
-        }
-
-        .sj {
-          background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
-        }
-
-        .zj {
-          background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
-        }
-
-        .yy {
-          background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
-        }
-
-        .zs {
-          background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
-        }
-
-        .name {
-          height: 0.47rem;
-          line-height: 0.47rem;
-          margin: 0 0.16rem;
-          border-bottom: 0.01rem solid #e9e9e9;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
-
-        .name:hover {
-          color: #0058e1;
-          cursor: pointer;
-        }
-
-        .name-last {
-          border-bottom: none;
-        }
-
-        .btn {
-          cursor: pointer;
-          width: 0.8rem;
-          height: 0.24rem;
-          border: 0.01rem solid #0058e1;
-          font-size: 0.14rem;
-          color: #0058e1;
+        .item {
+          width: 2.44rem;
+          height: 3.91rem;
+          font-size: 0.16rem;
+          background-color: #fff;
           border-radius: 0.02rem;
-          text-align: center;
-          margin-top: 0.1rem;
-          margin-left: 0.85rem;
-          position: absolute;
-          bottom: 0.2rem;
+          box-shadow: 0 0.05rem 0.2rem #ccc;
+          position: relative;
+
+          div:nth-of-type(1) {
+            height: 1.02rem;
+            line-height: 1.02rem;
+            font-size: 0.2rem;
+            color: #fff;
+            padding-left: 0.15rem;
+            background-size: 100%;
+          }
+
+          .jc {
+            background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
+          }
+
+          .sj {
+            background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
+          }
+
+          .zj {
+            background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
+          }
+
+          .yy {
+            background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
+          }
+
+          .zs {
+            background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
+          }
+
+          .name {
+            height: 0.47rem;
+            line-height: 0.47rem;
+            margin: 0 0.16rem;
+            border-bottom: 0.01rem solid #e9e9e9;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+
+          .name:hover {
+            color: #0058e1;
+            cursor: pointer;
+          }
+
+          .name-last {
+            border-bottom: none;
+          }
+
+          .btn {
+            cursor: pointer;
+            width: 0.8rem;
+            height: 0.24rem;
+            border: 0.01rem solid #0058e1;
+            font-size: 0.14rem;
+            color: #0058e1;
+            border-radius: 0.02rem;
+            text-align: center;
+            margin-top: 0.1rem;
+            margin-left: 0.85rem;
+            position: absolute;
+            bottom: 0.2rem;
+          }
+
+          .btn:hover {
+            background: rgba(0, 88, 225, 0.3);
+            color: #000;
+          }
         }
 
-        .btn:hover {
-          background: rgba(0, 88, 225, 0.3);
-          color: #000;
+        .item:hover {
+          border-radius: 0.02rem;
+          border: 0.01rem solid #0058e1;
+          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
         }
       }
-
-      .item:hover {
-        border-radius: 0.02rem;
-        border: 0.01rem solid #0058e1;
-        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-      }
     }
   }
-}
 </style>

From f36e2bbffcb0749b562d6b379ae9d969b92ceb60 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 11:44:25 +0800
Subject: [PATCH 3/8] =?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

---
 .../views/capacitySquare/components/layer.vue | 553 +++++++++---------
 1 file changed, 289 insertions(+), 264 deletions(-)

diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue
index d7b03a79..9f67b6f7 100644
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
@@ -22,16 +22,29 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
+          <div
+            v-for="val in dictList"
+            :key="val"
+            @click="changeAreaFunction(val)"
+          >
             {{ val }}
           </div>
         </div>
       </div>
     </div>
     <div class="algorithm-class">
-      <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="item.pic" :width="525" :height="275" :fallback="imgSrc"
-          :preview="false"></a-image>
+      <div
+        v-for="(item, index) in dataList"
+        :key="`algorithm-${index}`"
+        class="algorithm-card"
+      >
+        <a-image
+          :src="item.pic || imgSrc"
+          :width="525"
+          :height="275"
+          :fallback="imgSrc"
+          :preview="false"
+        ></a-image>
 
         <a-tooltip>
           <template #title>{{ item.name }}</template>
@@ -45,296 +58,308 @@
   </div>
 </template>
 <script setup>
-import { getCategoryTreePage } from '@/api/personalCenter'
-import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { getCategoryTreePage } from '@/api/personalCenter'
+  import { getGisByArea } from '@/api/home'
+  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
 
-const deptType = ref(null)
-const typeName = ref('全市')
-const typeName2 = ref('全部')
-const dictList = ref([])
-const dataList = ref([])
-const selectFlag2 = ref(false)
-const selectFlag = ref(false)
-getCategoryTreePage({
-  page: 1,
-  limit: 99,
-  dictTypeId: '1513712507692818433',
-}).then((res) => {
-  dictList.value = ['全部']
-  res.data.data.list.map((val) => {
-    // if (val.dictLabel !== '其他') {
-    dictList.value.push(val.dictLabel)
-    // }
-  })
-})
-const params = {
-  pageNum: 1,
-  type: '图层服务',
-  area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
-}
-
-// 切换领域
-const changeAreaFunction = (val) => {
-  params.pageNum = 1;
-  typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
-  selectFlag2.value = false
-  pageWithAttrsFunction()
-}
-
-let algorithmclassDom = null
-const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg'))
-const dataLength = ref(true)
-const isNoMore = ref(false)
-const pageWithAttrsFunction = () => {
-  getGisByArea(params).then((res) => {
-    dataList.value = res.data.data.list
-    if (res.data.data.list.length < 9) {
-      dataLength.value = false
-    }
-  })
-}
-pageWithAttrsFunction()
-
-//跳转详情页
-const detailFunction = (id) => {
-  window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
-}
-
-const changeDeptType = (str) => {
-  if (str) {
-    if(algorithmclassDom) {
-      algorithmclassDom.scrollTop = 0
-    }
-    switch (str) {
-      case '全市':
-        deptType.value = null
-        typeName.value = '全 市'
-        break
-      case '市级':
-        deptType.value = 2
-        typeName.value = '市 级'
-        break
-      case '区级':
-        deptType.value = 3
-        typeName.value = '区 级'
-        break
-      case '企业':
-        deptType.value = 4
-        typeName.value = '企 业'
-        break
-    }
-    params.pageNum = 1;
-    if(deptType.value !== null && deptType.value !== undefined) {
-      params.deptType = deptType.value;
-    }else {
-      if(Object.keys(params).includes('deptType')) {
-        delete params.deptType
-      }
-    }
-  }
-  selectFlag.value = false
-  getData(str)
-}
-
-const getData = (str) => {
-  getGisByArea(params).then((res) => {
-    const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
-      algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
-    }
-    dataList.value = resData.list || []
-    nextTick(() => {
-      algorithmclassDom = document.querySelector('.algorithm-box')
-      if (str && algorithmclassDom) {
-        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
-        algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
-      }
+  const deptType = ref(null)
+  const typeName = ref('全市')
+  const typeName2 = ref('全部')
+  const dictList = ref([])
+  const dataList = ref([])
+  const selectFlag2 = ref(false)
+  const selectFlag = ref(false)
+  getCategoryTreePage({
+    page: 1,
+    limit: 99,
+    dictTypeId: '1513712507692818433',
+  }).then((res) => {
+    dictList.value = ['全部']
+    res.data.data.list.map((val) => {
+      // if (val.dictLabel !== '其他') {
+      dictList.value.push(val.dictLabel)
+      // }
     })
   })
-}
+  const params = {
+    pageNum: 1,
+    type: '图层服务',
+    area: typeName2.value == '全部' ? '' : typeName2.value,
+    pageSize: 9, // 固定9
+  }
 
-const layerFunction = (e) => {
-  var scrollTop = e.currentTarget.scrollTop
-  var windowHeight = e.currentTarget.clientHeight
-  var scrollHeight = e.currentTarget.scrollHeight
-  console.log(scrollTop, windowHeight, scrollHeight, '123')
-  if (
-    scrollTop + windowHeight <= scrollHeight + 1 &&
-    scrollTop + windowHeight >= scrollHeight - 1
-  ) {
-    // 当前滚动条已经触底
-    isNoMore.value = true
-    params.pageNum++
+  // 切换领域
+  const changeAreaFunction = (val) => {
+    params.pageNum = 1
+    typeName2.value = val
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
+    selectFlag2.value = false
+    pageWithAttrsFunction()
+  }
+
+  let algorithmclassDom = null
+  const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo2.jpg'))
+  const dataLength = ref(true)
+  const isNoMore = ref(false)
+  const pageWithAttrsFunction = () => {
     getGisByArea(params).then((res) => {
-      dataList.value.push(...res.data.data.list)
+      dataList.value = res.data.data.list
       if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })
-  } else {
-    isNoMore.value = false
   }
-}
-onMounted(() => {
-  algorithmclassDom = document.querySelector('.algorithm-class')
-  if (dataLength.value) {
-    //监听滚动事件
-    algorithmclassDom.addEventListener('scroll', layerFunction, true)
+  pageWithAttrsFunction()
+
+  //跳转详情页
+  const detailFunction = (id) => {
+    window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
   }
-})
-onBeforeUnmount(() => {
-  algorithmclassDom.removeEventListener('scroll', layerFunction, true)
-})
+
+  const changeDeptType = (str) => {
+    if (str) {
+      if (algorithmclassDom) {
+        algorithmclassDom.scrollTop = 0
+      }
+      switch (str) {
+        case '全市':
+          deptType.value = null
+          typeName.value = '全 市'
+          break
+        case '市级':
+          deptType.value = 2
+          typeName.value = '市 级'
+          break
+        case '区级':
+          deptType.value = 3
+          typeName.value = '区 级'
+          break
+        case '企业':
+          deptType.value = 4
+          typeName.value = '企 业'
+          break
+      }
+      params.pageNum = 1
+      if (deptType.value !== null && deptType.value !== undefined) {
+        params.deptType = deptType.value
+      } else {
+        if (Object.keys(params).includes('deptType')) {
+          delete params.deptType
+        }
+      }
+    }
+    selectFlag.value = false
+    getData(str)
+  }
+
+  const getData = (str) => {
+    getGisByArea(params).then((res) => {
+      const resData = res.data.data || {}
+      if (
+        resData.list.length > 0 &&
+        resData.list.length < 9 &&
+        algorithmclassDom
+      ) {
+        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+      }
+      dataList.value = resData.list || []
+      nextTick(() => {
+        algorithmclassDom = document.querySelector('.algorithm-box')
+        if (str && algorithmclassDom) {
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
+          algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+        }
+      })
+    })
+  }
+
+  const layerFunction = (e) => {
+    var scrollTop = e.currentTarget.scrollTop
+    var windowHeight = e.currentTarget.clientHeight
+    var scrollHeight = e.currentTarget.scrollHeight
+    console.log(scrollTop, windowHeight, scrollHeight, '123')
+    if (
+      scrollTop + windowHeight <= scrollHeight + 1 &&
+      scrollTop + windowHeight >= scrollHeight - 1
+    ) {
+      // 当前滚动条已经触底
+      isNoMore.value = true
+      params.pageNum++
+      getGisByArea(params).then((res) => {
+        dataList.value.push(...res.data.data.list)
+        if (res.data.data.list.length < 9) {
+          dataLength.value = false
+        }
+      })
+    } else {
+      isNoMore.value = false
+    }
+  }
+  onMounted(() => {
+    algorithmclassDom = document.querySelector('.algorithm-class')
+    if (dataLength.value) {
+      //监听滚动事件
+      algorithmclassDom.addEventListener('scroll', layerFunction, true)
+    }
+  })
+  onBeforeUnmount(() => {
+    algorithmclassDom.removeEventListener('scroll', layerFunction, true)
+  })
 </script>
 
 <style lang="less" scoped>
-.algorithm {
-  .select {
-    margin: 0.1rem 0 0.1rem 0.2rem;
-    color: #fff;
-    font-size: 0.2rem;
-    font-family: webfont;
-    position: relative;
-
-    .top {
-      cursor: pointer;
-      width: 3.61rem;
-      height: 0.85rem;
-      font-weight: 600;
-      text-align: center;
-      padding-top: 0.1rem;
-      background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
-      background-size: 100%;
+  .algorithm {
+    .select {
+      margin: 0.1rem 0 0.1rem 0.2rem;
+      color: #fff;
+      font-size: 0.2rem;
+      font-family: webfont;
       position: relative;
 
-      .light {
-        width: 0.56rem;
-        height: 3px;
-        position: absolute;
-        top: 0.4rem;
-        left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
-        background-size: 100%;
-      }
-    }
-
-    .bottom {
-      cursor: pointer;
-      position: absolute;
-      top: 0.5rem;
-      left: 0.9rem;
-      z-index: 1000;
-      background: rgba(57, 134, 239, 0.68);
-      border: 1px solid #aed5ff;
-
-      .light {
-        display: inline-block;
-        width: 2.39rem;
-        height: 5px;
-        position: absolute;
-        top: -0.08rem;
-        left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
-        background-size: 100%;
-      }
-
-      &>div {
-        width: 1.8rem;
-        height: 0.4rem;
-        line-height: 0.4rem;
+      .top {
+        cursor: pointer;
+        width: 3.61rem;
+        height: 0.85rem;
+        font-weight: 600;
         text-align: center;
-        border-top: 1px solid #aed5ff;
-      }
+        padding-top: 0.1rem;
+        background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
+        background-size: 100%;
+        position: relative;
 
-      &>div:nth-of-type(1) {
-        border: none;
-      }
-    }
-  }
-
-  .algorithm-class {
-    // margin-top: 0.6rem;
-    margin-bottom: 0.18rem;
-    display: grid;
-    grid-template-columns: repeat(3, 33%);
-    height: 8.8rem;
-    overflow: auto;
-    margin-left: 1.15rem;
-    margin-right: 0.15rem;
-
-    .algorithm-card {
-      height: 2.75rem;
-      width: 5.23rem;
-      background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
-      background-size: 100% 100%;
-      margin-bottom: 0.4rem;
-      margin-right: 0.65rem;
-      position: relative;
-
-      :deep(.ant-image) {
-        img {
-          margin-top: 0.15rem;
-          height: 2.45rem;
-          width: 5.05rem;
-          margin-left: 0.1rem;
+        .light {
+          width: 0.56rem;
+          height: 3px;
+          position: absolute;
+          top: 0.4rem;
+          left: 1.52rem;
+          background: url('~@/assets/capacitySquare/select-light1.png')
+            no-repeat;
+          background-size: 100%;
         }
       }
 
-      .algorithm-card-photo {
-        height: 100%;
-        width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
-        background-size: 100%;
-      }
-
-      .algorithm-card-title {
+      .bottom {
+        cursor: pointer;
         position: absolute;
-        height: 0.6rem;
-        margin-left: 0.08rem;
-        width: 97%;
-        color: #ffffff;
-        font-size: 0.22rem;
-        font-family: alibaba;
-        bottom: 0.15rem;
-        padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
-        background-size: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
+        top: 0.5rem;
+        left: 0.9rem;
+        z-index: 1000;
+        background: rgba(57, 134, 239, 0.68);
+        border: 1px solid #aed5ff;
 
-        span {
-          line-height: 0.24rem;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          cursor: pointer;
+        .light {
+          display: inline-block;
+          width: 2.39rem;
+          height: 5px;
+          position: absolute;
+          top: -0.08rem;
+          left: -0.3rem;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
+          background-size: 100%;
         }
 
-        span:last-child {
-          font-size: 0.14rem;
+        & > div {
+          width: 1.8rem;
+          height: 0.4rem;
+          line-height: 0.4rem;
+          text-align: center;
+          border-top: 1px solid #aed5ff;
+        }
+
+        & > div:nth-of-type(1) {
+          border: none;
         }
       }
     }
-  }
 
-  .algorithm-class::-webkit-scrollbar-track-piece {
-    background: #a5bcdb;
-    border-radius: 0.08rem;
-  }
+    .algorithm-class {
+      // margin-top: 0.6rem;
+      margin-bottom: 0.18rem;
+      display: grid;
+      grid-template-columns: repeat(3, 33%);
+      height: 8.8rem;
+      overflow: auto;
+      margin-left: 1.15rem;
+      margin-right: 0.15rem;
 
-  .algorithm-class::-webkit-scrollbar-thumb {
-    height: 3.2rem;
-    background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
-  }
+      .algorithm-card {
+        height: 2.75rem;
+        width: 5.23rem;
+        background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
+        background-size: 100% 100%;
+        margin-bottom: 0.4rem;
+        margin-right: 0.65rem;
+        position: relative;
 
-  .algorithm-class::-webkit-scrollbar {
-    height: 8.8rem;
-    width: 0.08rem;
-    border-radius: 0.08rem;
+        :deep(.ant-image) {
+          img {
+            margin-top: 0.15rem;
+            height: 2.45rem;
+            width: 5.05rem;
+            margin-left: 0.1rem;
+          }
+        }
+
+        .algorithm-card-photo {
+          height: 100%;
+          width: 100%;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
+          background-size: 100%;
+        }
+
+        .algorithm-card-title {
+          position: absolute;
+          height: 0.6rem;
+          margin-left: 0.08rem;
+          width: 97%;
+          color: #ffffff;
+          font-size: 0.22rem;
+          font-family: alibaba;
+          bottom: 0.15rem;
+          padding-left: 0.22rem;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
+          background-size: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+
+          span {
+            line-height: 0.24rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer;
+          }
+
+          span:last-child {
+            font-size: 0.14rem;
+          }
+        }
+      }
+    }
+
+    .algorithm-class::-webkit-scrollbar-track-piece {
+      background: #a5bcdb;
+      border-radius: 0.08rem;
+    }
+
+    .algorithm-class::-webkit-scrollbar-thumb {
+      height: 3.2rem;
+      background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
+    }
+
+    .algorithm-class::-webkit-scrollbar {
+      height: 8.8rem;
+      width: 0.08rem;
+      border-radius: 0.08rem;
+    }
   }
-}
 </style>

From 3e1b6b8a222285380c34dd8cac3016ef51b2dafc Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 27 Oct 2022 13:47:19 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=EF=BC=9A=E9=9C=80=E6=B1=82=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E7=94=A8=E9=A2=86=E5=9F=9F=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addApplication.vue             | 631 ++++++++----------
 1 file changed, 267 insertions(+), 364 deletions(-)

diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index d347ae86..47331e43 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -9,83 +9,38 @@
         <div class="form-container">
           <div v-if="applySuccess">
             <div class="title">申请人信息</div>
-            <a-form
-              ref="formRef"
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
+            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
+              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
               <div class="base-info">
-                <a-form-item
-                  label="申请人"
-                  name="applyUserName"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.applyUserName"
-                  />
+                <a-form-item label="申请人" name="applyUserName" :rules="[{ required: true, message: '请输入申请人' }]">
+                  <a-input placeholder="请输入申请人" v-model:value="formName.applyUserName" />
                 </a-form-item>
 
-                <a-form-item
-                  style="margin: 0 22px"
-                  label="申请人电话"
-                  name="applyUserPhone"
-                  :rules="[
-                    {
-                      required: true,
-                      pattern: /^1[3456789]\d{9}$/,
-                      message: '请输入正确的电话号码',
-                    },
-                  ]"
-                >
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.applyUserPhone"
-                  />
+                <a-form-item style="margin: 0 22px" label="申请人电话" name="applyUserPhone" :rules="[
+                  {
+                    required: true,
+                    pattern: /^1[3456789]\d{9}$/,
+                    message: '请输入正确的电话号码',
+                  },
+                ]">
+                  <a-input placeholder="请输入申请人电话" v-model:value="formName.applyUserPhone" />
                 </a-form-item>
 
-                <a-form-item
-                  label="申请单位"
-                  name="applyUserDeptName"
-                  :rules="[{ required: true, message: '请输入申请单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请单位"
-                    v-model:value="formName.applyUserDeptName"
-                  />
+                <a-form-item label="申请单位" name="applyUserDeptName" :rules="[{ required: true, message: '请输入申请单位' }]">
+                  <a-input placeholder="请输入申请单位" v-model:value="formName.applyUserDeptName" />
                 </a-form-item>
               </div>
 
               <div class="title">需求信息</div>
 
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="需求标题"
-                name="demandSubject"
-                :rules="[{ required: true, message: '请输入需求标题' }]"
-              >
-                <a-input
-                  style="width: 350px"
-                  v-model:value="formName.demandSubject"
-                />
+              <a-form-item style="margin-bottom: 10px" label="需求标题" name="demandSubject"
+                :rules="[{ required: true, message: '请输入需求标题' }]">
+                <a-input style="width: 350px" v-model:value="formName.demandSubject" />
               </a-form-item>
 
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="需求类型"
-                name="detailsType"
-                :rules="[{ required: true, message: '请选择需求类型' }]"
-              >
-                <a-select
-                  ref="select"
-                  v-model:value="formName.detailsType"
-                  @focus="focus"
-                  style="width: 200px"
-                >
+              <a-form-item style="margin-bottom: 10px" label="需求类型" name="detailsType"
+                :rules="[{ required: true, message: '请选择需求类型' }]">
+                <a-select ref="select" v-model:value="formName.detailsType" @focus="focus" style="width: 200px">
                   <a-select-option value="基础设施">基础设施</a-select-option>
                   <a-select-option value="数据资源">数据资源</a-select-option>
                   <a-select-option value="组件服务">组件服务</a-select-option>
@@ -94,50 +49,24 @@
                 </a-select>
               </a-form-item>
 
-              <a-form-item
-                label="应用领域"
-                name="detailsField"
-                style="width: 6.93rem"
-                :rules="[
-                  {
-                    required:
-                      formName.detailsType === '应用资源' ||
-                      formName.detailsType === '组件服务'
-                        ? true
-                        : false,
-                    message: '请选择应用领域',
-                  },
-                ]"
-              >
-                <a-select
-                  :disabled="
-                    formName.detailsType === '应用资源' ||
-                    formName.detailsType === '组件服务'
-                      ? false
-                      : true
-                  "
-                  v-model:value="formName.detailsField"
-                  :options="applicationSceneOpthion"
-                  mode="tags"
-                  :size="size"
-                  placeholder="请选择应用领域"
-                  :filterOption="false"
-                  :searchValue="false"
-                  style="width: 5.87rem"
-                ></a-select>
+              <a-form-item label="应用领域" v-if="formName.detailsType === '应用资源' ||
+              formName.detailsType === '组件服务'" name="detailsField" style="width: 6.93rem" :rules="[
+    {
+      required: true,
+      message: '请选择应用领域',
+    },
+  ]">
+                <a-select v-model:value="formName.detailsField" :options="applicationSceneOpthion" mode="tags"
+                  :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false" style="width: 5.87rem">
+                </a-select>
               </a-form-item>
               <!-- <a-form-item label="应用领域" name="detailsField" style="width: 350px"
                 :rules="[{ required: true, message: '请输入应用领域' }]">
                 <a-input placeholder="请输入应用领域" v-model:value="formName.detailsField" />
               </a-form-item> -->
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="需求描述"
-                name="demandDetails"
-                :rules="[{ required: true, message: '请输入需求描述' }]"
-              >
-                <a-textarea
-                  style="
+              <a-form-item style="margin-bottom: 10px" label="需求描述" name="demandDetails"
+                :rules="[{ required: true, message: '请输入需求描述' }]">
+                <a-textarea style="
                     width: 500px;
                     height: 150px;
                     font-size: 16px;
@@ -147,25 +76,12 @@
                     border-radius: 6px;
                     padding: 10px;
                     resize: none;
-                  "
-                  v-model:value="formName.demandDetails"
-                />
+                  " v-model:value="formName.demandDetails" />
               </a-form-item>
-              <a-form-item
-                style="color: #666; font-size: 16px"
-                label="附件上传"
-                name="applyDoc"
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="upLoadUrl"
-                  :headers="headers"
-                  @change="handleChange"
-                  :maxCount="1"
-                >
-                  <a-button
-                    style="
+              <a-form-item style="color: #666; font-size: 16px" label="附件上传" name="applyDoc">
+                <a-upload v-model:file-list="fileList" name="file" :action="upLoadUrl" :headers="headers"
+                  @change="handleChange" :maxCount="1">
+                  <a-button style="
                       width: 100px;
                       height: 30px;
                       margin-right: 10px;
@@ -176,8 +92,7 @@
                       border: 1px solid #bbd3ef;
                       padding: 0;
                       text-align: center;
-                    "
-                  >
+                    ">
                     <upload-outlined></upload-outlined>
                     文件上传
                   </a-button>
@@ -188,8 +103,7 @@
               </a-form-item>
 
               <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -200,15 +114,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="cancle"
-                  @click="signOut"
-                >
+                  " type="primary" html-type="cancle" @click="signOut">
                   退出申请
                 </a-button>
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -218,11 +127,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
+                  " type="primary" html-type="submit" @click="processStartHandle()">
                   提交申请
                 </a-button>
               </a-form-item>
@@ -234,7 +139,7 @@
             </div>
             <p>
               您已成功申请{{
-                formName.demandSubject || ''
+    formName.demandSubject || ''
               }},请耐心等待审批结果，结果会第一时间通知您！
             </p>
           </div>
@@ -245,250 +150,248 @@
 </template>
 
 <script>
-  import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref } from 'vue'
-  import { message } from 'ant-design-vue'
-  // import { UploadOutlined } from '@ant-design/icons-vue'
-  import { getUser, getUserInfo, relaunch } from '@/api/home'
-  import {
-    demandApply,
-    getDemandForm,
-    updateDemandForm,
-    getCategoryTreePage,
-  } from '@/api/personalCenter'
-  // import { baseURL } from '@/config'
-  import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import { reactive, ref } from 'vue'
+import { message } from 'ant-design-vue'
+// import { UploadOutlined } from '@ant-design/icons-vue'
+import { getUser, getUserInfo, relaunch } from '@/api/home'
+import {
+  demandApply,
+  getDemandForm,
+  updateDemandForm,
+  getCategoryTreePage,
+} from '@/api/personalCenter'
+// import { baseURL } from '@/config'
+import { useRouter } from 'vue-router'
 
-  export default {
-    name: '',
-    props: {},
-    components: {
-      HomeHeader,
-      // UploadOutlined,
-    },
-    setup() {
-      const disabled = ref(false)
-      const upLoadUrl = ref(window.SITE_CONFIG.apiURL + '/upload')
-      const formName = reactive({
-        applyUserDeptId: '',
-        applyUserDeptName: '',
-        applyUserId: '',
-        applyUserName: '',
-        applyUserPhone: '',
-        demandDetails: '',
-        demandSubject: '',
-        detailsField: [],
-        detailsType: '',
-        enclosure: '',
+export default {
+  name: '',
+  props: {},
+  components: {
+    HomeHeader,
+    // UploadOutlined,
+  },
+  setup() {
+    const disabled = ref(false)
+    const upLoadUrl = ref(window.SITE_CONFIG.apiURL + '/upload')
+    const formName = reactive({
+      applyUserDeptId: '',
+      applyUserDeptName: '',
+      applyUserId: '',
+      applyUserName: '',
+      applyUserPhone: '',
+      demandDetails: '',
+      demandSubject: '',
+      detailsField: [],
+      detailsType: '',
+      enclosure: '',
+    })
+    // console.log(formName.demandSubject)
+
+    const router = useRouter()
+    const id = ref(router.currentRoute.value.query.id)
+    const taskId = ref(router.currentRoute.value.query.taskId)
+    if (id.value) {
+      getDemandForm(id.value).then((res) => {
+        console.log('回填数据===============>', res)
+        formName.applyUserPhone = res.data.data.applyUserPhone
+        formName.demandSubject = res.data.data.demandSubject
+        formName.detailsType = res.data.data.detailsType
+        formName.detailsField = res.data.data.detailsField
+        formName.demandDetails = res.data.data.demandDetails
+        formName.enclosure = res.data.data.enclosure
       })
-      // console.log(formName.demandSubject)
+    }
+    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)
+    })
+    getUser().then((res) => {
+      formName.applyUserName = res.data.data.realName
+      formName.applyUserId = res.data.data.id
+      getUserInfo(formName.applyUserId).then((res) => {
+        if (res.data.data.mobile) {
+          formName.applyUserPhone = res.data.data.mobile
+        }
+        formName.applyUserDeptName = res.data.data.deptName
+        formName.applyUserDeptId = res.data.data.deptId
+      })
+    })
+
+    const formRef = ref()
+    const applySuccess = ref(true)
+
+    // 退出
+    const signOut = () => {
+      window.close()
+    }
+    const handleChange = (info) => {
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList)
+      }
+
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name} 文件上传成功`)
+        formName.enclosure = info.file.response.data
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 文件上传失败`)
+      }
+    }
+
+    const fileList = ref([])
+    const processStartHandle = () => {
+      let detailsField = '';
+      if (formName.detailsField.length > 0) {
+        formName.detailsField.map((item) => {
+          detailsField += item + ';'
+        })
+      }
+      // copy传参
+      let _postData = JSON.parse(JSON.stringify(formName))
+      _postData.detailsField = detailsField;
 
-      const router = useRouter()
-      const id = ref(router.currentRoute.value.query.id)
-      const taskId = ref(router.currentRoute.value.query.taskId)
       if (id.value) {
-        getDemandForm(id.value).then((res) => {
-          console.log('回填数据===============>', res)
-          formName.applyUserPhone = res.data.data.applyUserPhone
-          formName.demandSubject = res.data.data.demandSubject
-          formName.detailsType = res.data.data.detailsType
-          formName.detailsField = res.data.data.detailsField
-          formName.demandDetails = res.data.data.demandDetails
-          formName.enclosure = res.data.data.enclosure
-        })
-      }
-      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)
-      })
-      getUser().then((res) => {
-        formName.applyUserName = res.data.data.realName
-        formName.applyUserId = res.data.data.id
-        getUserInfo(formName.applyUserId).then((res) => {
-          if (res.data.data.mobile) {
-            formName.applyUserPhone = res.data.data.mobile
-          }
-          formName.applyUserDeptName = res.data.data.deptName
-          formName.applyUserDeptId = res.data.data.deptId
-        })
-      })
-
-      const formRef = ref()
-      const applySuccess = ref(true)
-
-      // 退出
-      const signOut = () => {
-        window.close()
-      }
-      const handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          console.log(info.file, info.fileList)
-        }
-
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 文件上传成功`)
-          formName.enclosure = info.file.response.data
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 文件上传失败`)
-        }
-      }
-
-      const fileList = ref([])
-      const subimtFlag = ref(true)
-      const processStartHandle = () => {
-        if (formName.detailsField.length > 0) {
-          let detailsField = ''
-          formName.detailsField.map((item) => {
-            detailsField += item + ';'
-          })
-          formName.detailsField = detailsField
-        }
-        if (id.value) {
-          updateDemandForm(formName).then((upres) => {
-            if (upres.data.code == 0) {
-              relaunch({ data: formName, taskId: taskId.value }).then((res) => {
-                console.log('驳回================>', res)
-                if (res.data.code == 0) {
-                  message.success('重新发起流程成功！')
-                  window.setTimeout(() => {
-                    window.close()
-                  }, 1000)
-                } else {
-                  message.error('重新发起流程失败！')
-                }
-              })
-            } else {
-              message.error('数据更新失败！')
-            }
-          })
-        } else {
-          if (subimtFlag.value) {
-            subimtFlag.value = false
-            formRef.value.validate().then(() => {
-              const detString = String(formName.detailsField)
-              formName.detailsField = detString
-              console.log(detString, formName.detailsField, 'detString')
-              demandApply(formName).then((res) => {
-                applySuccess.value = false
-                message.success('操作成功！')
-                console.log('能力申请================>', res)
-                subimtFlag.value = true
-              })
+        updateDemandForm(_postData).then((upres) => {
+          if (upres.data.code == 0) {
+            relaunch({ data: _postData, taskId: taskId.value }).then((res) => {
+              console.log('驳回================>', res)
+              if (res.data.code == 0) {
+                message.success('重新发起流程成功！')
+                window.setTimeout(() => {
+                  window.close()
+                }, 1000)
+              } else {
+                message.error('重新发起流程失败！')
+              }
             })
+          } else {
+            message.error('数据更新失败！')
           }
-        }
+        })
+      } else {
+        formRef.value.validate().then((valid) => {
+          const detString = String(_postData.detailsField)
+          _postData.detailsField = detString
+          console.log(detString, _postData.detailsField, 'detString')
+          demandApply(_postData).then((res) => {
+            applySuccess.value = false
+            message.success('操作成功！')
+            console.log('能力申请================>', res)
+          })
+        })
       }
+    }
 
-      return {
-        formRef,
-        formName,
-        fileList,
-        headers: {
-          authorization: 'authorization-text',
-        },
-        handleChange,
-        applySuccess,
-        disabled,
-        signOut,
-        processStartHandle,
-        upLoadUrl,
-        // baseURL,
-        applicationSceneOpthion,
-      }
-    },
-  }
+    return {
+      formRef,
+      formName,
+      fileList,
+      headers: {
+        authorization: 'authorization-text',
+      },
+      handleChange,
+      applySuccess,
+      disabled,
+      signOut,
+      processStartHandle,
+      upLoadUrl,
+      // baseURL,
+      applicationSceneOpthion,
+    }
+  },
+}
 </script>
 
 <style scoped lang="less">
-  #apply-container {
-    background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 90px auto 0;
-    display: flex;
-    justify-content: space-between;
+#apply-container {
+  background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 90px auto 0;
+  display: flex;
+  justify-content: space-between;
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 5% auto;
-    }
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 5% auto;
+  }
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
+  .form-container {
+    padding: 20px 20px 30px 20px;
 
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
-      }
-    }
-
-    .base-info {
-      display: flex;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
+    .title {
       font-size: 20px;
-      font-weight: bold;
       color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
     }
   }
+
+  .base-info {
+    display: flex;
+  }
+
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
+
+      &::after {
+        content: '';
+      }
+    }
+  }
+
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
+    }
+  }
+
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
+  }
+
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
+  }
+}
 </style>
 <style>
-  body,
-  html {
-    height: unset;
-  }
+body,
+html {
+  height: unset;
+}
 </style>

From e29e0f0526d1092ede2fbc9dace3e47c5d6ecad6 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 27 Oct 2022 13:50:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E5=92=8C=E8=83=BD=E5=8A=9B=E5=B9=BF=E5=9C=BA=E5=AE=B9=E9=94=99?=
 =?UTF-8?q?=E5=A4=84=E7=90=86pic=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/capacitySquare/components/algorithm.vue | 3 ++-
 front/src/views/capacitySquare/components/layer.vue     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue
index e4ef303a..47d6b958 100644
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@@ -106,7 +106,8 @@ const algorithmCardPhoto = (item) => {
   if(item.pic && typeof item.pic == 'string') {
     _arr = JSON.parse(item.pic)
   }
-  let _img = _arr[0] && _arr[0].img || ''
+  let _img = _arr[0] && _arr[0].img || imgSrc.value;
+  console.log('_img------------>', _img);
   return _img
 }
 //跳转详情页
diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue
index d7b03a79..14c36e0e 100644
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
@@ -30,7 +30,7 @@
     </div>
     <div class="algorithm-class">
       <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="item.pic" :width="525" :height="275" :fallback="imgSrc"
+        <a-image :src="item.pic || imgSrc" :width="525" :height="275" :fallback="imgSrc"
           :preview="false"></a-image>
 
         <a-tooltip>

From a8648429573e3de67b556f1144bdc2a01042b432 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 27 Oct 2022 14:33:59 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/abilityStatistics/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 85b8d885..ac6bb284 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -71,7 +71,7 @@
 
         <!--操作按钮查询-->
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!--操作按钮重置-->
         <el-form-item>

From 140f927763a2ba1938abcd5d09919d8cb33dddb8 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 15:03:21 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/dept-todo-view.vue   |  4 +-
 .../src/views/modules/workBench/workBench.vue | 72 +++++++++++--------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index 4a018261..15a3fbce 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -9,7 +9,7 @@
     >
       <div class="content">
         <img class="img" :src="dataInfo.imgSrc" />
-        <div class="title">{{ title }}</div>
+        <div class="title">{{ '我的'+title }}</div>
         <div class="flex-row-bottom">
           <span class="num" :style="{ color: dataInfo.textColor }">{{
             formatNum(dataInfo.num)
@@ -90,7 +90,7 @@
       </div>
       <div class="more" @click="goPage(dataInfo.url)">查看更多 ></div>
     </div>
-    <div class="list-box flex-row-center no-data" v-else>暂无数据</div>
+    <div class="list-box flex-row-center no-data" v-else>暂无{{title}}任务</div>
   </div>
 </template>
 <script>
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index d01b97c6..5830b6eb 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -3,8 +3,8 @@
         <!-- 上 -->
         <div class="flex-row-start top">
             <div class="flex-row-start dept-left">
-                <dept-todo-view title="部门待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
-                <dept-todo-view title="部门已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
+                <dept-todo-view title="待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
+                <dept-todo-view title="已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
                     style="margin-left: 0"></dept-todo-view>
             </div>
             <div class="flex-row-start dept-chart-box">
@@ -56,7 +56,7 @@ export default {
         list: [],
         type: 'todo',
         // url: 'activiti-my-todo-task',
-        url: 'myAgent-CompetencyApplication',
+        url: 'myAgent-CompetencyApplication'
       },
       // 部门已办
       hasToDodoData: {
@@ -69,7 +69,7 @@ export default {
         num: 0,
         list: [],
         // url: 'activiti-my-join-task',
-        url: 'hasToDoTasks-CompetencyApplication',
+        url: 'hasToDoTasks-CompetencyApplication'
       },
       // 部门申请
       resourceData: [],
@@ -103,43 +103,53 @@ export default {
     // 待办
     getToDo () {
       this.loadingToDo = true
-      const data = {
-        limit: 5,
-        page: 1
-      }
-      Apis.getToDoTask(data, res => {
+      // const data = {
+      //   limit: 5,
+      //   page: 1
+      // }
+      this.$http.get('/act/task/myToDoTaskPage?page=1&limit=5').then(res => {
         this.loadingToDo = false
-        if (res.data.code !== 0) {
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----待办-------->', res.data)
-        this.toToData.list = res.data.data.records || []
+        this.toToData.list = res.data.data.list || []
         this.toToData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingToDo = false
       })
+      // Apis.getToDoTask(data, res => {
+      //   this.loadingToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----待办-------->', res.data)
+      //   this.toToData.list = res.data.data.records || []
+      //   this.toToData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingToDo = false
+      // })
     },
     // 已办
     getHasToDo () {
-      const data = {
-        limit: 5,
-        page: 1
-      }
+      // const data = {
+      //   limit: 5,
+      //   page: 1
+      // }
       this.loadingHasToDo = true
-      Apis.getHasToDoTask(data, res => {
+      this.$http.get('/act/his/getMyHandledInstancePage?page=1&limit=5').then(res => {
         this.loadingHasToDo = false
-        if (res.data.code !== 0) {
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----已办-------->', res.data)
-        this.hasToDodoData.list = res.data.data.records || []
+        this.hasToDodoData.list = res.data.data.list || []
         this.hasToDodoData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingHasToDo = false
-        console.log('err-----已办------->', err)
       })
+      // Apis.getHasToDoTask(data, res => {
+      //   this.loadingHasToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----已办-------->', res.data)
+      //   this.hasToDodoData.list = res.data.data.records || []
+      //   this.hasToDodoData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingHasToDo = false
+      //   console.log('err-----已办------->', err)
+      // })
     },
     // 部门上架
     getShelvesTotal () {

From c1da555cebbbcc55dc0ec83f8a2b4c3d9e9c81c0 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 27 Oct 2022 15:04:49 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=A7=86=E9=A2=91=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=82=E7=9C=8B=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index eea54b44..09340b4a 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -513,7 +513,7 @@
               <!-- 离线 -->
               <a v-if="record.status != 1" class="disabled-text">预览</a>
               <a-tooltip v-else placement="top">
-                <template #title>请申请后在我的申请中预览视频!</template>
+                <template #title>请申请后在我的申请中观看视频!</template>
                 <a
                   @click="
                     openVideo(
@@ -591,7 +591,7 @@
         <template #title>
           <span>视频预览</span>
           <span style="color: #ff4d4f; margin-left: 10px">
-            {{ `(请申请后在我的申请中预览视频)` }}
+            {{ `(请申请后在我的申请中观看视频)` }}
           </span>
         </template>
         <template #footer></template>
@@ -2262,14 +2262,14 @@
     if (index) {
       itemData = selectedList.value[index]
     }
-    let msg = '请申请后在我的申请中预览视频!'
+    let msg = '请申请后在我的申请中观看视频!'
     if (
       (itemData && itemData.status != 1) ||
       (rowClickData.value && rowClickData.value.status != 1)
     ) {
       msg = '当前视频离线不可预览!'
     } else {
-      msg = '请申请后在我的申请中预览视频!'
+      msg = '请申请后在我的申请中观看视频!'
     }
     message.warning(msg)
   }