From 2c1070d4e2f697a278f99ea14b697633a2938ce6 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 17 Oct 2022 09:43:35 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/vab/plugins/permissions.js | 6 +++---
 front/src/views/login/index.vue      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 4c197d7c..1bda7a3c 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-11 13:59:18
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-17 09:25:32
  * @Description: 告诉大家这是什么
  */
 /**
@@ -26,7 +26,6 @@ router.beforeEach(async (to, from, next) => {
   // if (SSOTOKEN) {
   //   setAccessToken(SSOTOKEN)
   // }
-  console.log('验证白名单', routesWhiteList)
   const token = getAccessToken()
   console.log('token', token)
   let hasToken = token
@@ -44,6 +43,7 @@ router.beforeEach(async (to, from, next) => {
     accessRoutes.forEach((item) => {
       router.addRoute(item)
     })
+    console.log('验证白名单', routesWhiteList)
     if (routesWhiteList.indexOf(to.path) !== -1) {
       debugger
       next()
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index c684ab11..7440960f 100644
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@@ -157,7 +157,7 @@
             password: Encrypt(this.form.password),
             username: this.form.username,
           })
-          window.localStorage.setItem('tokenStartTime', new Date().getTime())
+          // window.localStorage.setItem('tokenStartTime', new Date().getTime())
           window.sessionStorage.setItem('visits', JSON.stringify([]))
           console.log(
             '添加visits========================================>',

From 4d65cc11e98caaeed5e8fd52a48160d2cb9aa425 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 17 Oct 2022 10:19:27 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=201?=
 =?UTF-8?q?=E6=9D=A1=E6=B6=88=E6=81=AF=E6=97=B6=E9=9A=90=E8=97=8F=20=20?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=8C=89=E9=92=AE=EF=BC=8C=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue    |   22 +-
 .../components/ApplyDetails.vue               |  505 +++---
 .../personalCenter/components/MyApply.vue     | 1518 +++++++++--------
 3 files changed, 1081 insertions(+), 964 deletions(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 0a6a6153..53e5c2ee 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -2,7 +2,11 @@
   <div class="ability-to-apply-for" :class="{ all: falg }">
     <div class="title">
       <span>申请能力</span>
-      <div class="btnBox" v-show="!falg">
+      <div
+        class="btnBox"
+        v-show="!falg"
+        v-if="dataForm[0].arr.length > 1 || dataForm.length > 1"
+      >
         <svg
           t="1659419933164"
           class="btn"
@@ -97,7 +101,10 @@
               {{
                 val.description ||
                 ((val.note1 || '') &&
-                  (JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') +
+                  ((JSON.parse(val.note1) &&
+                    JSON.parse(val.note1)[0] &&
+                    JSON.parse(val.note1)[0].channelName) ||
+                    '--') +
                     '等' +
                     JSON.parse(val.note1).length +
                     '个摄像头') ||
@@ -105,7 +112,11 @@
               }}
             </div>
           </div>
-          <div class="remove" v-if="item.arr.length>1" @click="removeFunction(val)"></div>
+          <div
+            class="remove"
+            v-if="item.arr.length > 1"
+            @click="removeFunction(val)"
+          ></div>
         </div>
       </template>
     </div>
@@ -181,7 +192,10 @@
       let arr = JSON.parse(note1)
       xVideoList.value = []
       arr.map((val) => {
-        xVideoList.value.push({ name: val.channelName || '', key: val.channelId })
+        xVideoList.value.push({
+          name: val.channelName || '',
+          key: val.channelId,
+        })
       })
       videoVisible.value = true
     } else {
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index 1b052ff4..f9cd16ae 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -1,9 +1,21 @@
 <template>
-  <DeviceApplyDetail v-if="showType === '设备申请'" :refObj="refObj"></DeviceApplyDetail>
+  <DeviceApplyDetail
+    v-if="showType === '设备申请'"
+    :refObj="refObj"
+  ></DeviceApplyDetail>
   <div class="form-container" v-else>
-    <AbilityApplication :refObj="refObj" v-if="showType === '能力申请'"></AbilityApplication>
-    <PutOnTheShelf :refObj="refObj" v-else-if="showType === '能力上架'"></PutOnTheShelf>
-    <OffTheShelf :refObj="refObj" v-else-if="showType === '能力下架'"></OffTheShelf>
+    <AbilityApplication
+      :refObj="refObj"
+      v-if="showType === '能力申请'"
+    ></AbilityApplication>
+    <PutOnTheShelf
+      :refObj="refObj"
+      v-else-if="showType === '能力上架'"
+    ></PutOnTheShelf>
+    <OffTheShelf
+      :refObj="refObj"
+      v-else-if="showType === '能力下架'"
+    ></OffTheShelf>
     <Demand :refObj="refObj" v-else-if="showType === '能力需求'"></Demand>
     <Comment :refObj="refObj" v-else-if="showType === '需求评论'"></Comment>
     <OtherApplications :refObj="refObj" v-else></OtherApplications>
@@ -23,258 +35,263 @@
   </div>
 </template>
 <script setup>
-import AbilityApplication from './AbilityApplication.vue'
-import PutOnTheShelf from './PutOnTheShelf .vue'
-import OffTheShelf from './OffTheShelf.vue'
-import Demand from './Demand.vue'
-import Comment from './Comment.vue'
-import DeviceApplyDetail from './DeviceApplyDetail.vue'
-import OtherApplications from '@/views/personalCenter/components/OtherApplications '
-import { onMounted, reactive, defineProps, ref } from 'vue'
-import Cookies from 'js-cookie'
-// import { baseURL } from '@/config'
-import qs from 'qs'
-import {
-  getApplyForm,
-  getTaskHandleDetailInfo,
-  getDemandForm,
-  nengliziyuanshangjiaapply,
-  getTaskVariables,
-} from '@/api/personalCenter'
-import { selectOneDel } from '@/api/home'
-const props = defineProps({
-  processDefinitionName: { type: String, default: null },
-  businessKey: { type: String, default: null },
-  processInstanceId: { type: String, default: null },
-  resourceId: { type: String, default: null },
-  refObj: { type: Object, default: null },
-  showType: { type: String, default: null },
-})
-const refObj = ref({})
-const showType = ref('')
-// eslint-disable-next-line vue/no-setup-props-destructure
-refObj.value = props.refObj
-// eslint-disable-next-line vue/no-setup-props-destructure
-showType.value = props.showType
-//流转详情
-const dataSource = reactive({ data: [] })
-console.log('refObj------------>', refObj);
-
-// console.log(props.refObj, '---------------------------------------')
-
-const downloadFile = (path, name) => {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', path)
-  xhr.responseType = 'blob'
-  xhr.send()
-  xhr.onload = function () {
-    if (this.status === 200 || this.status === 304) {
-      // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
-      if ('msSaveOrOpenBlob' in navigator) {
-        navigator.msSaveOrOpenBlob(this.response, name)
-        return
-      }
-      // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
-      // const url = URL.createObjectURL(blob);
-      const url = URL.createObjectURL(this.response)
-      const a = document.createElement('a')
-      a.style.display = 'none'
-      a.href = url
-      a.download = name
-      document.body.appendChild(a)
-      a.click()
-      document.body.removeChild(a)
-      URL.revokeObjectURL(url)
-    }
-  }
-}
-//表单信息
-const formName = reactive({
-  user: '',
-  phone: '',
-  unit: '',
-  area: '',
-  system: '',
-  scene: '',
-  basis: '',
-  id: '',
-})
-let shifoushizujian = ref('')
-let nameNotShow = ref('')
-let algorithmShow = ref('')
-const dataForm = reactive({ data: {} })
-const columns = [
-  {
-    title: '任务名称',
-    dataIndex: 'activityName',
-    key: 'activityName',
-  },
-  {
-    title: '处理人',
-    dataIndex: 'assigneeName',
-    key: 'assigneeName',
-  },
-  {
-    title: '任务开始时间',
-    dataIndex: 'startTime',
-    key: 'startTime',
-  },
-  {
-    title: '任务结束时间',
-    dataIndex: 'endTime',
-    key: 'endTime',
-  },
-  {
-    title: '审核意见',
-    dataIndex: 'comment',
-    key: 'comment',
-  },
-  {
-    title: '任务时长',
-    dataIndex: 'duration',
-    key: 'duration',
-  },
-]
-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
-      console.log(data)
-      formName.user = data.user
-      formName.phone = data.phone
-      formName.unit = data.unit
-      formName.area = data.area
-      formName.system = data.system
-      formName.scene = data.scene
-      formName.enclosure = data.enclosure
-      formName.basis = data.basis
-    })
-  }
-  if (props.processDefinitionName == '能力需求申请') {
-    getDemandForm(props.businessKey).then((res) => {
-      const { data } = res.data
-      console.log(data)
-      formName.applyUserName = data.applyUserName
-      formName.applyUserPhone = data.applyUserPhone
-      formName.applyUserDeptName = data.applyUserDeptName
-      formName.detailsField = data.detailsField
-      formName.demandDetails = data.demandDetails
-      formName.detailsType = data.detailsType
-      formName.demandSubject = data.demandSubject
-      formName.enclosure = data.enclosure
-    })
-  }
-  if (props.processDefinitionName == '能力资源上架') {
-    // debugger
-    nengliziyuanshangjiaapply(props.businessKey).then((res) => {
-      // const { data } = res.data
-      dataForm.data = res.data.data.resourceDTO
-      if (res.data.data.resourceDTO.type == '应用资源') {
-        shifoushizujian.value = true
-      } else {
-        shifoushizujian.value = false
-        console.log(res.data.data.resourceDTO)
-        res.data.data.resourceDTO.infoList.forEach((val) => {
-          console.log(val, '111111111111111111111111')
-          if (val.attrValue === '智能算法') {
-            nameNotShow.value = true
-            algorithmShow.value = false
-            console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
-          }
-        })
-      }
-      console.log('222222222222', dataForm.data)
-    })
-  }
-  if (props.processDefinitionName == '能力资源下架') {
-    // debugger
-    selectOneDel(props.resourceId).then((res) => {
-      // const { data } = res.data
-      dataForm.data = res.data.data
-    })
-  }
-}
-
-const getLiuZhuanInfo = () => {
-  const params = qs.stringify({
-    processInstanceId: props.processInstanceId,
+  import AbilityApplication from './AbilityApplication.vue'
+  import PutOnTheShelf from './PutOnTheShelf .vue'
+  import OffTheShelf from './OffTheShelf.vue'
+  import Demand from './Demand.vue'
+  import Comment from './Comment.vue'
+  import DeviceApplyDetail from './DeviceApplyDetail.vue'
+  import OtherApplications from '@/views/personalCenter/components/OtherApplications '
+  import { onMounted, reactive, defineProps, ref } from 'vue'
+  import Cookies from 'js-cookie'
+  // import { baseURL } from '@/config'
+  import qs from 'qs'
+  import {
+    getApplyForm,
+    getTaskHandleDetailInfo,
+    getDemandForm,
+    nengliziyuanshangjiaapply,
+    getTaskVariables,
+  } from '@/api/personalCenter'
+  import { selectOneDel } from '@/api/home'
+  const props = defineProps({
+    processDefinitionName: { type: String, default: null },
+    businessKey: { type: String, default: null },
+    processInstanceId: { type: String, default: null },
+    resourceId: { type: String, default: null },
+    refObj: { type: Object, default: null },
+    showType: { type: String, default: null },
   })
-  getTaskHandleDetailInfo(params).then((res) => {
-    let arr = []
-    res.data.data.forEach((item) => {
-      arr.push(item)
-    })
-    dataSource.data.push([props.processInstanceId, arr])
-  })
-}
+  const refObj = ref({})
+  const showType = ref('')
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  refObj.value = props.refObj
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  showType.value = props.showType
+  //流转详情
+  const dataSource = reactive({ data: [] })
+  console.log('refObj------------>', refObj)
 
-onMounted(() => {
-  // getInfo()
-  if (props.refObj.resourceApplication) {
-    dataSource.data = []
-    for (const key in props.refObj.resourceApplication) {
-      if (props.refObj.resourceApplication[key].length > 0) {
-        props.refObj.resourceApplication[key].map((item) => {
-          dataSource.data.push([item.instanceId, item.taskHandleDetailInfo])
-        })
+  // console.log(props.refObj, '---------------------------------------')
+
+  const downloadFile = (path, name) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', path)
+    xhr.responseType = 'blob'
+    xhr.send()
+    xhr.onload = function () {
+      if (this.status === 200 || this.status === 304) {
+        // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
+        if ('msSaveOrOpenBlob' in navigator) {
+          navigator.msSaveOrOpenBlob(this.response, name)
+          return
+        }
+        // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
+        // const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(this.response)
+        const a = document.createElement('a')
+        a.style.display = 'none'
+        a.href = url
+        a.download = name
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+        URL.revokeObjectURL(url)
       }
     }
-  } else {
-    getLiuZhuanInfo()
   }
-})
-
-const getResourceURL = () => {
-  console.log('111111111111111111111111111111', Cookies.get('token'))
-  const params = qs.stringify({
-    token: Cookies.get('token'),
-    // processInstanceId: this.dataForm.processInstanceId
-    processInstanceId: props.processInstanceId,
+  //表单信息
+  const formName = reactive({
+    user: '',
+    phone: '',
+    unit: '',
+    area: '',
+    system: '',
+    scene: '',
+    basis: '',
+    id: '',
   })
-  return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}`
-}
+  let shifoushizujian = ref('')
+  let nameNotShow = ref('')
+  let algorithmShow = ref('')
+  const dataForm = reactive({ data: {} })
+  const columns = [
+    {
+      title: '任务名称',
+      dataIndex: 'activityName',
+      key: 'activityName',
+    },
+    {
+      title: '处理部门',
+      dataIndex: 'assigneeDeptName',
+      key: 'assigneeDeptName',
+    },
+    {
+      title: '处理人',
+      dataIndex: 'assigneeName',
+      key: 'assigneeName',
+    },
+    {
+      title: '任务开始时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
+    },
+    {
+      title: '任务结束时间',
+      dataIndex: 'endTime',
+      key: 'endTime',
+    },
+    {
+      title: '审核意见',
+      dataIndex: 'comment',
+      key: 'comment',
+    },
+    {
+      title: '任务时长',
+      dataIndex: 'duration',
+      key: 'duration',
+    },
+  ]
+  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
+        console.log(data)
+        formName.user = data.user
+        formName.phone = data.phone
+        formName.unit = data.unit
+        formName.area = data.area
+        formName.system = data.system
+        formName.scene = data.scene
+        formName.enclosure = data.enclosure
+        formName.basis = data.basis
+      })
+    }
+    if (props.processDefinitionName == '能力需求申请') {
+      getDemandForm(props.businessKey).then((res) => {
+        const { data } = res.data
+        console.log(data)
+        formName.applyUserName = data.applyUserName
+        formName.applyUserPhone = data.applyUserPhone
+        formName.applyUserDeptName = data.applyUserDeptName
+        formName.detailsField = data.detailsField
+        formName.demandDetails = data.demandDetails
+        formName.detailsType = data.detailsType
+        formName.demandSubject = data.demandSubject
+        formName.enclosure = data.enclosure
+      })
+    }
+    if (props.processDefinitionName == '能力资源上架') {
+      // debugger
+      nengliziyuanshangjiaapply(props.businessKey).then((res) => {
+        // const { data } = res.data
+        dataForm.data = res.data.data.resourceDTO
+        if (res.data.data.resourceDTO.type == '应用资源') {
+          shifoushizujian.value = true
+        } else {
+          shifoushizujian.value = false
+          console.log(res.data.data.resourceDTO)
+          res.data.data.resourceDTO.infoList.forEach((val) => {
+            console.log(val, '111111111111111111111111')
+            if (val.attrValue === '智能算法') {
+              nameNotShow.value = true
+              algorithmShow.value = false
+              console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
+            }
+          })
+        }
+        console.log('222222222222', dataForm.data)
+      })
+    }
+    if (props.processDefinitionName == '能力资源下架') {
+      // debugger
+      selectOneDel(props.resourceId).then((res) => {
+        // const { data } = res.data
+        dataForm.data = res.data.data
+      })
+    }
+  }
+
+  const getLiuZhuanInfo = () => {
+    const params = qs.stringify({
+      processInstanceId: props.processInstanceId,
+    })
+    getTaskHandleDetailInfo(params).then((res) => {
+      let arr = []
+      res.data.data.forEach((item) => {
+        arr.push(item)
+      })
+      dataSource.data.push([props.processInstanceId, arr])
+    })
+  }
+
+  onMounted(() => {
+    // getInfo()
+    if (props.refObj.resourceApplication) {
+      dataSource.data = []
+      for (const key in props.refObj.resourceApplication) {
+        if (props.refObj.resourceApplication[key].length > 0) {
+          props.refObj.resourceApplication[key].map((item) => {
+            dataSource.data.push([item.instanceId, item.taskHandleDetailInfo])
+          })
+        }
+      }
+    } else {
+      getLiuZhuanInfo()
+    }
+  })
+
+  const getResourceURL = () => {
+    console.log('111111111111111111111111111111', Cookies.get('token'))
+    const params = qs.stringify({
+      token: Cookies.get('token'),
+      // processInstanceId: this.dataForm.processInstanceId
+      processInstanceId: props.processInstanceId,
+    })
+    return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}`
+  }
 </script>
 
 <style scoped lang="less">
-.form-container {
-  height: 6rem;
-  overflow-y: scroll;
-  padding: 20px 20px 30px 20px;
+  .form-container {
+    height: 6rem;
+    overflow-y: scroll;
+    padding: 20px 20px 30px 20px;
 
-  .title {
-    font-size: 18px;
-    color: #000;
-    font-weight: bold;
-    margin-bottom: 20px;
-    padding-left: 10px;
-    margin-top: 10px;
-    border-left: 6px #0058e1 solid;
+    .title {
+      font-size: 18px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+      padding-left: 10px;
+      margin-top: 10px;
+      border-left: 6px #0058e1 solid;
+    }
   }
-}
 
-:deep(.ant-table-thead)>tr>.ant-table-cell {
-  background: #0087ff;
-  color: #fff;
-  border: none;
-  text-align: center;
-  font-size: 16px;
-}
+  :deep(.ant-table-thead) > tr > .ant-table-cell {
+    background: #0087ff;
+    color: #fff;
+    border: none;
+    text-align: center;
+    font-size: 16px;
+  }
 
-:deep(.ant-table-tbody)>tr>.ant-table-cell:nth-child(5) {
-  // width: 110px;
-  // display: inline-block;
-  // white-space: nowrap;
-  // overflow: hidden;
-  // text-overflow: ellipsis;
-}
+  :deep(.ant-table-tbody) > tr > .ant-table-cell:nth-child(5) {
+    // width: 110px;
+    // display: inline-block;
+    // white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+  }
 
-.oddNumbers {
-  margin-bottom: 0.05rem;
-}
+  .oddNumbers {
+    margin-bottom: 0.05rem;
+  }
 </style>
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 508e8bd2..9dd682c0 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -3,16 +3,27 @@
     <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
     <div class="tab" style="margin-bottom: 0.1rem">
       <span>类型</span>
-      <div :class="typeIndex == index ? 'tabclass' : ' '" @click="changeType(item, index)"
-        v-for="(item, index) in typeList" :key="index">
+      <div
+        :class="typeIndex == index ? 'tabclass' : ' '"
+        @click="changeType(item, index)"
+        v-for="(item, index) in typeList"
+        :key="index"
+      >
         {{ item }}
       </div>
     </div>
     <div class="tab">
       <span>申请状态</span>
-      <div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeApplyState(item, index)"
-        v-for="(item, index) in tabList" :key="index">
-        <a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
+      <div
+        :class="tabIndex == index ? 'tabclass' : ' '"
+        @click="changeApplyState(item, index)"
+        v-for="(item, index) in tabList"
+        :key="index"
+      >
+        <a-badge
+          :count="item === '审核中' ? num.unfinished : num.finished"
+          v-if="item !== '全部'"
+        >
           {{ item }}
         </a-badge>
         <template v-else>
@@ -22,7 +33,11 @@
     </div>
     <div v-if="contentList.data.length > 0">
       <div class="content">
-        <div class="content-body" v-for="item in contentList.data" :key="item.index">
+        <div
+          class="content-body"
+          v-for="item in contentList.data"
+          :key="item.index"
+        >
           <div class="content-body-title">
             <span>申请单号：{{ item.applyNumber || '--' }}</span>
             <div></div>
@@ -33,7 +48,9 @@
             </template>
             <div class="content-body-title">
               <span>
-                名称：{{ item.cameraList ? item.system : (item.title || item.name) }}
+                名称：{{
+                  item.cameraList ? item.system : item.title || item.name
+                }}
               </span>
               <div></div>
             </div>
@@ -52,54 +69,112 @@
             <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
-            <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-              @click="showPhoneModal(item)">
+            <div
+              class="button"
+              v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
+              @click="showPhoneModal(item)"
+            >
               联系方式
             </div>
             <div class="button" @click="showDetail(item)">查看详情</div>
             <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
               修改
             </div>
-            <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80" v-if="
+            <svg
+              t="1652233950228"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="5970"
+              data-spm-anchor-id="a313x.7781069.0.i8"
+              width="80"
+              height="80"
+              v-if="
                 item.processDefinitionName != '能力资源下架' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
-              " style="position: absolute; top: 20px; left: -850px">
+              "
+              style="position: absolute; top: 20px; left: -850px"
+            >
               <path
                 d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                fill="#515151" opacity=".5" p-id="5971"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5971"
+              ></path>
               <path
                 d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                fill="#515151" opacity=".5" p-id="5972"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5972"
+              ></path>
               <path
                 d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                fill="#515151" opacity=".5" p-id="5973"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5973"
+              ></path>
               <path
                 d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                fill="#515151" opacity=".5" p-id="5974"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5974"
+              ></path>
             </svg>
           </div>
         </div>
       </div>
       <div class="bottom">
-        <a-pagination size="small" pageSize="4" :total="total" :current="page" @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
+        <a-pagination
+          size="small"
+          pageSize="4"
+          :total="total"
+          :current="page"
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+          :showSizeChanger="false"
+        />
       </div>
     </div>
     <a-empty v-else />
     <!-- :title="detailModalTitle" -->
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
-      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
-      <template v-slot:title>{{detailModalTitle}}</template>
-      <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
-        :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
-      </apply-details>
+    <a-modal
+      bodyStyle="padding:0.1rem 0"
+      v-model:visible="detailsVisible"
+      style="width: 1000px"
+      :footer="null"
+      destroyOnClose="true"
+      :maskClosable="false"
+    >
+      <template v-slot:title>{{ detailModalTitle }}</template>
+      <apply-details
+        :processDefinitionName="processDefinitionName"
+        :businessKey="businessKey"
+        :processInstanceId="processInstanceId"
+        :resourceId="resourceId"
+        :refObj="refObj"
+        :showType="showType"
+      ></apply-details>
     </a-modal>
-    <a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
+    <a-modal
+      v-model:visible="visible"
+      title="下架原因"
+      @ok="del()"
+      @cancel="reason = ''"
+    >
       <a-input v-model:value="reason" placeholder="请输入下架原因" />
     </a-modal>
-    <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
+    <a-modal
+      v-model:visible="videoVisible"
+      title="已申请摄像头列表"
+      @ok="videoVisible = false"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
+      >
         <template #bodyCell="{ column, text }">
           <!-- <template>
         <a>{{ text }}</a>
@@ -110,753 +185,764 @@
   </div>
 
   <!-- 联系方式弹框 -->
-  <a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
+  <a-modal
+    v-model:visible="phoneVisible"
+    title="提示"
+    @ok="phoneVisible = false"
+  >
     <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
     <p>请联系工业信息化局，电话：199 6399 0996</p>
   </a-modal>
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, onBeforeUnmount, h, defineProps } from 'vue'
-import {
-  getMyProcessInstancePage,
-  getTabilityapplication,
-  getByApplyFlag,
-  nengliziyuanshangjiaapply,
-  getDemandForm,
-  demandComment,
-  deviceApplylist,
-  getDeviceDetail,
-} from '@/api/personalCenter'
-import {
-  updateRes,
-  relaunch,
-  selectOne,
-  getApplyCameraList,
-  selectOneDel,
-} from '@/api/home'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
-import mybus from '@/myplugins/mybus'
-import * as moment from 'moment'
+  import {
+    onMounted,
+    reactive,
+    ref,
+    onBeforeUnmount,
+    h,
+    defineProps,
+  } from 'vue'
+  import {
+    getMyProcessInstancePage,
+    getTabilityapplication,
+    getByApplyFlag,
+    nengliziyuanshangjiaapply,
+    getDemandForm,
+    demandComment,
+    deviceApplylist,
+    getDeviceDetail,
+  } from '@/api/personalCenter'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+    selectOneDel,
+  } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
+  import mybus from '@/myplugins/mybus'
+  import * as moment from 'moment'
 
-const props = defineProps({
-  tabTypeName: { type: String, default: '' },
-})
-const router = useRouter()
-let typeList = ref([
-  '能力申请',
-  '能力上架',
-  '能力下架',
-  '能力需求',
-  '需求评论',
-  // '能力评价',
-])
-// 西海岸-设备申请
-let isXiHaiAn = whoShow.itShowXiHaiAn
-const phoneSate = ref([2, 3])
-if (isXiHaiAn) {
-  typeList.value.push('设备申请')
-}
-const typeStrObj = {
-  '能力上架': 'resourcemountapply',
-  '能力下架': 'resourcundercarriageapply',
-  '能力需求': 'abilitydemandapply',
-  '需求评论': 'comment_review',
-}
-let tabList = ref(['全部', '审核中', '审核完成'])
-const contentList = reactive({ data: [] })
-let tabIndex = ref(0)
-let typeIndex = ref(0)
-let typeName = ref(typeList.value[0])
-const videoVisible = ref(false)
-const numFlag = ref(true)
-const columns = ref([
-  {
-    title: '摄像头名称',
-    dataIndex: 'name',
-  },
-])
-const xVideoList = ref([])
-
-let name = ref('')
-const detailsVisible = ref(false)
-const detailsVisible2 = ref(false)
-const businessKey = ref('')
-const processInstanceId = ref('')
-const processDefinitionName = ref('')
-const resourceId = ref('')
-const reason = ref('')
-const visible = ref(false)
-const delObj = ref({})
-const taskId = ref('')
-const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
-const refObj = ref({})
-const num = ref({
-  finished: 0,
-  unfinished: 0,
-})
-const total = ref('')
-const showType = ref('')
-const page = ref('1')
-const ended = ref('')
-const processDefinitionKey = ref('')
-const phoneVisible = ref(false)
-
-// 选择类型
-const changeType = (item, index) => {
-  console.log('item, index-----选择类型------->', item, index)
-  numFlag.value = true
-  num.value = []
-  showType.value = ''
-  tabIndex.value = 0
-  ended.value = ''
-  page.value = 1
-  typeIndex.value = index
-  typeName.value = item
-  getApplyList()
-}
-
-// 申请状态切换
-function changeApplyState(item, index) {
-  tabIndex.value = index
-  switch (item) {
-    case '审核中':
-      page.value = 1
-      ended.value = false
-      getApplyList()
-      break
-    case '审核完成':
-      page.value = 1
-      ended.value = true
-      getApplyList()
-      break
-    case '全部':
-      page.value = 1
-      ended.value = ''
-      getApplyList()
-      break
-  }
-}
-
-const cilckRowData = ref({})
-let detailModalTitle = '申请详情';
-const showDetail = (item) => {
-  cilckRowData.value = item;
-  // 西海岸-申请时间过期，提示
+  const props = defineProps({
+    tabTypeName: { type: String, default: '' },
+  })
+  const router = useRouter()
+  let typeList = ref([
+    '能力申请',
+    '能力上架',
+    '能力下架',
+    '能力需求',
+    '需求评论',
+    // '能力评价',
+  ])
+  // 西海岸-设备申请
+  let isXiHaiAn = whoShow.itShowXiHaiAn
+  const phoneSate = ref([2, 3])
   if (isXiHaiAn) {
-    // 西海岸、单兵无人机设备
-    if (item.tbDeviceDTO) {
-      detailModalTitle = item.tbDeviceDTO.name ? item.tbDeviceDTO.name + '申请详情' : '申请详情'
-    }
-    console.log('detailModalTitle------------>', detailModalTitle);
-    if (item.expireDate) {
-      let diff = moment().diff(moment(item.expireDate), 'seconds')
-      if (diff > 0) {
-        return message.error('当前申请已过期！')
-      }
+    typeList.value.push('设备申请')
+  }
+  const typeStrObj = {
+    能力上架: 'resourcemountapply',
+    能力下架: 'resourcundercarriageapply',
+    能力需求: 'abilitydemandapply',
+    需求评论: 'comment_review',
+  }
+  let tabList = ref(['全部', '审核中', '审核完成'])
+  const contentList = reactive({ data: [] })
+  let tabIndex = ref(0)
+  let typeIndex = ref(0)
+  let typeName = ref(typeList.value[0])
+  const videoVisible = ref(false)
+  const numFlag = ref(true)
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([])
+
+  let name = ref('')
+  const detailsVisible = ref(false)
+  const detailsVisible2 = ref(false)
+  const businessKey = ref('')
+  const processInstanceId = ref('')
+  const processDefinitionName = ref('')
+  const resourceId = ref('')
+  const reason = ref('')
+  const visible = ref(false)
+  const delObj = ref({})
+  const taskId = ref('')
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
+  const refObj = ref({})
+  const num = ref({
+    finished: 0,
+    unfinished: 0,
+  })
+  const total = ref('')
+  const showType = ref('')
+  const page = ref('1')
+  const ended = ref('')
+  const processDefinitionKey = ref('')
+  const phoneVisible = ref(false)
+
+  // 选择类型
+  const changeType = (item, index) => {
+    console.log('item, index-----选择类型------->', item, index)
+    numFlag.value = true
+    num.value = []
+    showType.value = ''
+    tabIndex.value = 0
+    ended.value = ''
+    page.value = 1
+    typeIndex.value = index
+    typeName.value = item
+    getApplyList()
+  }
+
+  // 申请状态切换
+  function changeApplyState(item, index) {
+    tabIndex.value = index
+    switch (item) {
+      case '审核中':
+        page.value = 1
+        ended.value = false
+        getApplyList()
+        break
+      case '审核完成':
+        page.value = 1
+        ended.value = true
+        getApplyList()
+        break
+      case '全部':
+        page.value = 1
+        ended.value = ''
+        getApplyList()
+        break
     }
   }
-  if (typeName.value == '能力申请' && item.applyFlag) {
-    getByApplyFlag(item.applyFlag).then((res) => {
-      if (res.data.code == 0) {
-        refObj.value = res.data.data
-        detailsVisible.value = true
-        processDefinitionName.value = item.processDefinitionName
-        businessKey.value = item.businessKey
-        processInstanceId.value = item.instanceId
-        resourceId.value = item.resourceId
-      } else {
-        message.error('数据请求失败！')
+
+  const cilckRowData = ref({})
+  let detailModalTitle = '申请详情'
+  const showDetail = (item) => {
+    cilckRowData.value = item
+    // 西海岸-申请时间过期，提示
+    if (isXiHaiAn) {
+      // 西海岸、单兵无人机设备
+      if (item.tbDeviceDTO) {
+        detailModalTitle = item.tbDeviceDTO.name
+          ? item.tbDeviceDTO.name + '申请详情'
+          : '申请详情'
       }
-    })
-  } else if (typeName.value == '设备申请') {
-    getDeviceDetailInfo(item.deviceId)
-      .then((res) => {
+      console.log('detailModalTitle------------>', detailModalTitle)
+      if (item.expireDate) {
+        let diff = moment().diff(moment(item.expireDate), 'seconds')
+        if (diff > 0) {
+          return message.error('当前申请已过期！')
+        }
+      }
+    }
+    if (typeName.value == '能力申请' && item.applyFlag) {
+      getByApplyFlag(item.applyFlag).then((res) => {
         if (res.data.code == 0) {
           refObj.value = res.data.data
           detailsVisible.value = true
           processDefinitionName.value = item.processDefinitionName
+          businessKey.value = item.businessKey
+          processInstanceId.value = item.instanceId
+          resourceId.value = item.resourceId
+        } else {
+          message.error('数据请求失败！')
         }
       })
-      .catch((err) => { })
-  } else if (
-    Object.keys(typeStrObj).includes(typeName.value) ||
-    typeName.value == '能力评价'
-  ) {
-    refObj.value = item
-    detailsVisible.value = true
-    processDefinitionName.value = item.processDefinitionName
-    businessKey.value = item.businessKey
-    processInstanceId.value = item.processInstanceId
-    resourceId.value = item.resourceId
-  } else {
-    message.error('数据请求失败！')
-  }
-}
-const showVideoList = (item) => {
-  console.log('显示列表', item)
-  getApplyCameraList(item.processInstanceId).then((res) => {
-    console.log('res', res)
-    xVideoList.value = []
-    res.data.data.map((val) => {
-      xVideoList.value.push({ name: val.channelName, key: val.channelId })
-    })
-  })
-  videoVisible.value = true
-}
-const copyComment = (data) => {
-  let url = data
-  let oInput = document.createElement('input')
-  oInput.value = url
-  document.body.appendChild(oInput)
-  oInput.select() // 选择对象;
-  console.log(oInput.value)
-  document.execCommand('Copy') // 执行浏览器复制命令
-  message.success('复制成功')
-  oInput.remove()
-}
-const showAdd = (item) => {
-  if (item.processDefinitionKey == 'resourcemountapply') {
-    const data = {
-      id: item.resourceId,
-      taskId: item.currentTaskList[0].taskId,
-    }
-    if (item.dto.type == '组件服务') {
-      data.abilityToType = '组件服务'
-      data.componentTypeValue = item.dto.infoList.filter(
-        (val) => val.attrType == '组件类型'
-      )[0].attrValue
-    } else if (item.dto.type == '应用资源') {
-      data.abilityToType = '应用资源'
-    }
-    const newpage = router.resolve({
-      path: '/nenglishangjia', // 跳转的页面路由
-      query: data,
-    })
-    console.log('上架申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
-    selectOne(item.resourceId).then((res) => {
-      if (res.data.code == 0) {
-        delObj.value = res.data.data
-        reason.value = delObj.value.undercarriageReason
-        taskId.value = item.currentTaskList[0].taskId
-        visible.value = true
-        console.log('下架申请修改=================》', res.data.data)
-      }
-    })
-  } else if (item.processDefinitionKey == 'abilitydemandapply') {
-    const newpage = router.resolve({
-      path: '/addApplication', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('需求申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'abilityprocess') {
-    const newpage = router.resolve({
-      path: '/apply', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        resourceId: item.resourceId,
-        name: item.name,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('能力申请修改=================》', item)
-    window.open(newpage.href, '_self')
-  }
-}
-
-const initNum = () => {
-  if (numFlag.value) {
-    num.value = []
-    getMyProcessInstancePage({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-      processDefinitionKey: processDefinitionKey.value,
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getMyProcessInstancePage({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-          processDefinitionKey: processDefinitionKey.value,
-        }).then((res) => {
+    } else if (typeName.value == '设备申请') {
+      getDeviceDetailInfo(item.deviceId)
+        .then((res) => {
           if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
+            refObj.value = res.data.data
+            detailsVisible.value = true
+            processDefinitionName.value = item.processDefinitionName
           }
         })
-      }
-    })
+        .catch((err) => {})
+    } else if (
+      Object.keys(typeStrObj).includes(typeName.value) ||
+      typeName.value == '能力评价'
+    ) {
+      refObj.value = item
+      detailsVisible.value = true
+      processDefinitionName.value = item.processDefinitionName
+      businessKey.value = item.businessKey
+      processInstanceId.value = item.processInstanceId
+      resourceId.value = item.resourceId
+    } else {
+      message.error('数据请求失败！')
+    }
   }
-}
-const initNum2 = () => {
-  if (numFlag.value) {
-    num.value = []
-    getTabilityapplication({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getTabilityapplication({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-        }).then((res) => {
-          if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
-          }
-        })
-      }
+  const showVideoList = (item) => {
+    console.log('显示列表', item)
+    getApplyCameraList(item.processInstanceId).then((res) => {
+      console.log('res', res)
+      xVideoList.value = []
+      res.data.data.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
     })
+    videoVisible.value = true
+  }
+  const copyComment = (data) => {
+    let url = data
+    let oInput = document.createElement('input')
+    oInput.value = url
+    document.body.appendChild(oInput)
+    oInput.select() // 选择对象;
+    console.log(oInput.value)
+    document.execCommand('Copy') // 执行浏览器复制命令
+    message.success('复制成功')
+    oInput.remove()
+  }
+  const showAdd = (item) => {
+    if (item.processDefinitionKey == 'resourcemountapply') {
+      const data = {
+        id: item.resourceId,
+        taskId: item.currentTaskList[0].taskId,
+      }
+      if (item.dto.type == '组件服务') {
+        data.abilityToType = '组件服务'
+        data.componentTypeValue = item.dto.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue
+      } else if (item.dto.type == '应用资源') {
+        data.abilityToType = '应用资源'
+      }
+      const newpage = router.resolve({
+        path: '/nenglishangjia', // 跳转的页面路由
+        query: data,
+      })
+      console.log('上架申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
+      selectOne(item.resourceId).then((res) => {
+        if (res.data.code == 0) {
+          delObj.value = res.data.data
+          reason.value = delObj.value.undercarriageReason
+          taskId.value = item.currentTaskList[0].taskId
+          visible.value = true
+          console.log('下架申请修改=================》', res.data.data)
+        }
+      })
+    } else if (item.processDefinitionKey == 'abilitydemandapply') {
+      const newpage = router.resolve({
+        path: '/addApplication', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('需求申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'abilityprocess') {
+      const newpage = router.resolve({
+        path: '/apply', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          resourceId: item.resourceId,
+          name: item.name,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('能力申请修改=================》', item)
+      window.open(newpage.href, '_self')
+    }
   }
-}
-// initNum()
 
-// 搜索框
-const onSearch = (name) => {
-  console.log(name.value)
-}
-//重置
-function replacement() {
-  name.value = ''
-  getApplyList(name.value)
-}
-const getApplyList = () => {
-  const params = {
-    page: page.value,
-    limit: 4,
-    ended: ended.value,
-    // name: name.value,
+  const initNum = () => {
+    if (numFlag.value) {
+      num.value = []
+      getMyProcessInstancePage({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+        processDefinitionKey: processDefinitionKey.value,
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getMyProcessInstancePage({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+            processDefinitionKey: processDefinitionKey.value,
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (ended.value === '') {
-    delete params.ended
+  const initNum2 = () => {
+    if (numFlag.value) {
+      num.value = []
+      getTabilityapplication({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getTabilityapplication({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (typeName.value == '能力申请') {
-    getTabilityapplication(params).then((res) => {
+  // initNum()
+
+  // 搜索框
+  const onSearch = (name) => {
+    console.log(name.value)
+  }
+  //重置
+  function replacement() {
+    name.value = ''
+    getApplyList(name.value)
+  }
+  const getApplyList = () => {
+    const params = {
+      page: page.value,
+      limit: 4,
+      ended: ended.value,
+      // name: name.value,
+    }
+    if (ended.value === '') {
+      delete params.ended
+    }
+    if (typeName.value == '能力申请') {
+      getTabilityapplication(params).then((res) => {
+        contentList.data = []
+        console.log('获取我的申请===============>', res.data.data)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        showType.value = '能力申请'
+        initNum2()
+      })
+    } else if (typeName.value == '能力评价') {
       contentList.data = []
-      console.log('获取我的申请===============>', res.data.data)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      showType.value = '能力申请'
-      initNum2()
-    })
-  } else if (typeName.value == '能力评价') {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  } else if (typeName.value == '设备申请') {
-    let _state =
-      ended.value === ''
-        ? '全部'
-        : ended.value === true
+      num.value = []
+      showType.value = ''
+    } else if (typeName.value == '设备申请') {
+      let _state =
+        ended.value === ''
+          ? '全部'
+          : ended.value === true
           ? '审核完成'
           : '审核中'
-    getDeviceApply(_state)
-      .then((res) => {
-        if (res.data.code == 0) {
-          contentList.data = []
-          contentList.data = res.data.data.list || []
-          total.value = res.data.data.total
-          showType.value = '设备申请'
-          // 获取审核中，审核完成 数量
-          getDeviceNum()
-        }
-      })
-      .catch((err) => { })
-  } else if (Object.keys(typeStrObj).includes(typeName.value)) {
-    processDefinitionKey.value = typeStrObj[typeName.value]
-    params.processDefinitionKey = processDefinitionKey.value
-    getMyProcessInstancePage(params).then((res) => {
-      contentList.data = []
-      // initNum(name.value)
-      console.log(res.data.data.list)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      initNum()
-      switch (typeIndex.value) {
-        case 2:
-          contentList.data.map((val) => {
-            nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
-              console.log('上架===========>', res1.data.data)
-              val.title = res1.data.data.resourceDTO.name
-              val.dto = res1.data.data.resourceDTO
-              showType.value = '能力上架'
+      getDeviceApply(_state)
+        .then((res) => {
+          if (res.data.code == 0) {
+            contentList.data = []
+            contentList.data = res.data.data.list || []
+            total.value = res.data.data.total
+            showType.value = '设备申请'
+            // 获取审核中，审核完成 数量
+            getDeviceNum()
+          }
+        })
+        .catch((err) => {})
+    } else if (Object.keys(typeStrObj).includes(typeName.value)) {
+      processDefinitionKey.value = typeStrObj[typeName.value]
+      params.processDefinitionKey = processDefinitionKey.value
+      getMyProcessInstancePage(params).then((res) => {
+        contentList.data = []
+        // initNum(name.value)
+        console.log(res.data.data.list)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        initNum()
+        switch (typeIndex.value) {
+          case 2:
+            contentList.data.map((val) => {
+              nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
+                console.log('上架===========>', res1.data.data)
+                val.title = res1.data.data.resourceDTO.name
+                val.dto = res1.data.data.resourceDTO
+                showType.value = '能力上架'
+              })
             })
-          })
-          break
-        case 3:
-          contentList.data.map((val) => {
-            selectOneDel(val.businessKey).then((res1) => {
-              console.log('下架===========>', res1.data.data)
-              val.title = res1.data.data.name
-              val.dto = res1.data.data
-              showType.value = '能力下架'
+            break
+          case 3:
+            contentList.data.map((val) => {
+              selectOneDel(val.businessKey).then((res1) => {
+                console.log('下架===========>', res1.data.data)
+                val.title = res1.data.data.name
+                val.dto = res1.data.data
+                showType.value = '能力下架'
+              })
             })
-          })
-          break
-        case 4:
-          contentList.data.map((val) => {
-            getDemandForm(val.businessKey).then((res1) => {
-              console.log('需求===========>', res1.data.data)
-              val.title = res1.data.data.demandSubject
-              val.resourceStatusTip = res1.data.data.flagTip
-              val.dto = res1.data.data
-              showType.value = '能力需求'
+            break
+          case 4:
+            contentList.data.map((val) => {
+              getDemandForm(val.businessKey).then((res1) => {
+                console.log('需求===========>', res1.data.data)
+                val.title = res1.data.data.demandSubject
+                val.resourceStatusTip = res1.data.data.flagTip
+                val.dto = res1.data.data
+                showType.value = '能力需求'
+              })
             })
-          })
-          break
-        case 5:
-          contentList.data.map((val) => {
-            demandComment(val.businessKey).then((res1) => {
-              console.log('评论===========>', res1.data.data)
-              val.title = res1.data.data.comment
-              val.resourceStatusTip = res1.data.data.delFlagTip
-              val.dto = res1.data.data
-              showType.value = '需求评论'
+            break
+          case 5:
+            contentList.data.map((val) => {
+              demandComment(val.businessKey).then((res1) => {
+                console.log('评论===========>', res1.data.data)
+                val.title = res1.data.data.comment
+                val.resourceStatusTip = res1.data.data.delFlagTip
+                val.dto = res1.data.data
+                showType.value = '需求评论'
+              })
             })
-          })
-          break
-      }
-    })
-  } else {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  }
-}
-const handleCurrentChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const handlePageSizeChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const viewDetail = (processDefinitionName, id, ended, businessKey) => {
-  if (processDefinitionName == '能力申请流程') {
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-        ended: ended,
-      },
-    })
-  }
-  if (processDefinitionName == '能力资源上架') {
-    console.log('showDetail', id, businessKey, ended)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
-  if (processDefinitionName == '能力需求申请') {
-    router.push({
-      path: '/demandDetails',
-      query: {
-        id: businessKey,
-      },
-    })
-  }
-}
-
-// 下架能力
-const del = () => {
-  console.log('下架================》', delObj.value, reason.value)
-  delObj.value.undercarriageReason = reason.value
-  updateRes(delObj.value).then((upres) => {
-    if (upres.data.code == 0) {
-      relaunch({
-        data: { undercarriageReason: reason.value },
-        taskId: taskId.value,
-      }).then((res) => {
-        console.log('驳回================>', res)
-        if (res.data.code == 0) {
-          message.success('重新发起流程成功！')
-          visible.value = false
-          reason.value = ''
-        } else {
-          message.error('重新发起流程失败！')
+            break
         }
       })
     } else {
-      message.error('数据更新失败！')
+      contentList.data = []
+      num.value = []
+      showType.value = ''
+    }
+  }
+  const handleCurrentChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const handlePageSizeChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const viewDetail = (processDefinitionName, id, ended, businessKey) => {
+    if (processDefinitionName == '能力申请流程') {
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+          ended: ended,
+        },
+      })
+    }
+    if (processDefinitionName == '能力资源上架') {
+      console.log('showDetail', id, businessKey, ended)
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+        },
+      })
+    }
+    if (processDefinitionName == '能力需求申请') {
+      router.push({
+        path: '/demandDetails',
+        query: {
+          id: businessKey,
+        },
+      })
+    }
+  }
+
+  // 下架能力
+  const del = () => {
+    console.log('下架================》', delObj.value, reason.value)
+    delObj.value.undercarriageReason = reason.value
+    updateRes(delObj.value).then((upres) => {
+      if (upres.data.code == 0) {
+        relaunch({
+          data: { undercarriageReason: reason.value },
+          taskId: taskId.value,
+        }).then((res) => {
+          console.log('驳回================>', res)
+          if (res.data.code == 0) {
+            message.success('重新发起流程成功！')
+            visible.value = false
+            reason.value = ''
+          } else {
+            message.error('重新发起流程失败！')
+          }
+        })
+      } else {
+        message.error('数据更新失败！')
+      }
+    })
+  }
+
+  // 西海岸：设备申请列表 todo
+  const getDeviceApply = (state) => {
+    return new Promise((resolve, reject) => {
+      let _data = {
+        page: page.value,
+        limit: 4,
+        state,
+      }
+      deviceApplylist(_data)
+        .then((res) => {
+          resolve(res)
+          console.log('res----设备申请-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请--查询详情
+  const getDeviceDetailInfo = (deviceId) => {
+    return new Promise((resolve, reject) => {
+      getDeviceDetail(deviceId)
+        .then((res) => {
+          resolve(res)
+          console.log('res----查询详情-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请-审核中, 审核完成数量
+  const getDeviceNum = () => {
+    if (!numFlag.value) {
+      return
+    }
+    num.value = []
+    Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
+      .then((res) => {
+        console.log('res-----数量------->', res)
+        let unfinished = res[0] && res[0].data && res[0].data.data
+        let finished = res[1] && res[1].data && res[1].data.data
+        num.value.unfinished = unfinished.total || ''
+        num.value.finished = finished.total || ''
+        numFlag.value = false
+      })
+      .catch((err) => {})
+  }
+
+  const showPhoneModal = () => {
+    phoneVisible.value = true
+  }
+
+  mybus.on('closeModal', (obj) => {
+    detailsVisible.value = false
+    changeType(obj.type, obj.index)
+  })
+  onBeforeUnmount(() => {
+    mybus.off('closeModal')
+  })
+  onMounted(() => {
+    getApplyList()
+
+    if (props.tabTypeName) {
+      let _index = typeList.value.findIndex((v) => v == props.tabTypeName)
+      changeType(props.tabTypeName, _index != -1 ? _index : 0)
     }
   })
-}
-
-// 西海岸：设备申请列表 todo
-const getDeviceApply = (state) => {
-  return new Promise((resolve, reject) => {
-    let _data = {
-      page: page.value,
-      limit: 4,
-      state,
-    }
-    deviceApplylist(_data)
-      .then((res) => {
-        resolve(res)
-        console.log('res----设备申请-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请--查询详情
-const getDeviceDetailInfo = (deviceId) => {
-  return new Promise((resolve, reject) => {
-    getDeviceDetail(deviceId)
-      .then((res) => {
-        resolve(res)
-        console.log('res----查询详情-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请-审核中, 审核完成数量
-const getDeviceNum = () => {
-  if (!numFlag.value) {
-    return
-  }
-  num.value = []
-  Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
-    .then((res) => {
-      console.log('res-----数量------->', res)
-      let unfinished = res[0] && res[0].data && res[0].data.data
-      let finished = res[1] && res[1].data && res[1].data.data
-      num.value.unfinished = unfinished.total || ''
-      num.value.finished = finished.total || ''
-      numFlag.value = false
-    })
-    .catch((err) => {
-    })
-}
-
-
-const showPhoneModal = () => {
-  phoneVisible.value = true
-}
-
-mybus.on('closeModal', (obj) => {
-  detailsVisible.value = false
-  changeType(obj.type, obj.index)
-})
-onBeforeUnmount(() => {
-  mybus.off('closeModal')
-})
-onMounted(() => {
-  getApplyList()
-
-  if (props.tabTypeName) {
-    let _index = typeList.value.findIndex(v => v == props.tabTypeName)
-    changeType(props.tabTypeName, _index != -1 ? _index : 0)
-  }
-})
 </script>
 
 <style scoped lang="less">
-.on-the-right-side-of-the-list {
-  background: #ffffff;
-  padding: 20px 0px 30px 20px;
-  position: absolute;
-  width: 1087px;
-  height: 810px;
-  top: 0px;
-  display: flex;
-  margin-top: 20px;
-  flex-direction: column;
-  font-size: 16px;
-  justify-content: left;
+  .on-the-right-side-of-the-list {
+    background: #ffffff;
+    padding: 20px 0px 30px 20px;
+    position: absolute;
+    width: 1087px;
+    height: 810px;
+    top: 0px;
+    display: flex;
+    margin-top: 20px;
+    flex-direction: column;
+    font-size: 16px;
+    justify-content: left;
 
-  .title {
-    font-size: 20px;
-    color: #000000;
-    font-family: 'Alibaba PuHuiTi';
-    font-weight: 500;
-  }
-
-  .sousuokuang {
-    margin: 20px 0px 21px 0px;
-
-    .ant-input-search {
-      max-width: 490px;
+    .title {
+      font-size: 20px;
+      color: #000000;
+      font-family: 'Alibaba PuHuiTi';
+      font-weight: 500;
     }
 
-    :deep(.ant-input) {
-      width: 400px;
-      height: 36px;
-      font-size: 14px;
-      color: #b2b2b2;
-      background: #f5f5f5;
-    }
+    .sousuokuang {
+      margin: 20px 0px 21px 0px;
 
-    :deep(.ant-input-group-addon) {
-      display: inline-block;
-      margin-left: 10px;
+      .ant-input-search {
+        max-width: 490px;
+      }
 
-      .ant-input-search-button {
-        width: 80px;
+      :deep(.ant-input) {
+        width: 400px;
         height: 36px;
-        border-radius: 4px;
         font-size: 14px;
+        color: #b2b2b2;
+        background: #f5f5f5;
+      }
+
+      :deep(.ant-input-group-addon) {
+        display: inline-block;
+        margin-left: 10px;
+
+        .ant-input-search-button {
+          width: 80px;
+          height: 36px;
+          border-radius: 4px;
+          font-size: 14px;
+        }
       }
     }
-  }
 
-  .tab {
-    display: flex;
-    font-size: 14px;
-    color: #999999;
+    .tab {
+      display: flex;
+      font-size: 14px;
+      color: #999999;
 
-    div {
-      // width: 70px;
-      padding: 5px 10px;
-      height: 24px;
-      line-height: 14px;
-      border: 1px solid #cccccc;
-      border-radius: 12px;
-      margin-left: 10px;
+      div {
+        // width: 70px;
+        padding: 5px 10px;
+        height: 24px;
+        line-height: 14px;
+        border: 1px solid #cccccc;
+        border-radius: 12px;
+        margin-left: 10px;
+        text-align: center;
+        color: #666666;
+        cursor: pointer;
+      }
+
+      .tabclass {
+        border: 1px solid #0087ff;
+        color: #0087ff;
+      }
+    }
+
+    .content {
+      padding-right: 10px;
+      height: 510px;
+
+      .content-body {
+        padding-bottom: 20px;
+        padding-top: 20px;
+        margin-right: 10px;
+        height: 150px;
+        border-bottom: #cccccc 1px solid;
+        position: relative;
+
+        .content-body-title {
+          min-width: 100px;
+          max-width: 900px;
+          width: fit-content;
+          font-size: 14px;
+          color: #333333;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 500;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .content-body-content {
+          margin-top: 10px;
+          margin-bottom: 10px;
+          margin-right: 40px;
+          /* width: 720px; */
+          display: inline-block;
+        }
+
+        .content-body-content-son {
+          line-height: 16px;
+          font-size: 12px;
+          width: 100%;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+
+          span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            max-width: 8.1rem;
+            line-height: 24px;
+            word-break: break-all;
+          }
+        }
+
+        .content-body-bottom {
+          display: flex;
+          color: #cccccc;
+          font-size: 12px;
+
+          div:first-child {
+            margin-right: 30px;
+          }
+        }
+      }
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 30px;
+      right: 20px;
+    }
+
+    .button-box {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .button {
+      width: 96px;
+      height: 30px;
+      margin: 5px 0;
+      background: #0087ff;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 4px;
       text-align: center;
-      color: #666666;
+      line-height: 30px;
       cursor: pointer;
     }
 
-    .tabclass {
-      border: 1px solid #0087ff;
-      color: #0087ff;
+    .buttonAgree {
+      background-color: #49c988;
+    }
+
+    .backToFirst {
+      background-color: rgb(214, 91, 91);
     }
   }
 
-  .content {
-    padding-right: 10px;
-    height: 510px;
-
-    .content-body {
-      padding-bottom: 20px;
-      padding-top: 20px;
-      margin-right: 10px;
-      height: 150px;
-      border-bottom: #cccccc 1px solid;
-      position: relative;
-
-      .content-body-title {
-        min-width: 100px;
-        max-width: 900px;
-        width: fit-content;
-        font-size: 14px;
-        color: #333333;
-        font-family: 'Alibaba PuHuiTi';
-        font-weight: 500;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      .content-body-content {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        margin-right: 40px;
-        /* width: 720px; */
-        display: inline-block;
-      }
-
-      .content-body-content-son {
-        line-height: 16px;
-        font-size: 12px;
-        width: 100%;
-        // text-overflow: -o-ellipsis-lastline;
-        // overflow: hidden;
-        // text-overflow: ellipsis;
-        // display: -webkit-box;
-        // -webkit-line-clamp: 3;
-        // -webkit-box-orient: vertical;
-        display: flex;
-        color: #999999;
-
-        span {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          max-width: 8.1rem;
-          line-height: 24px;
-          word-break: break-all;
-        }
-      }
-
-      .content-body-bottom {
-        display: flex;
-        color: #cccccc;
-        font-size: 12px;
-
-        div:first-child {
-          margin-right: 30px;
-        }
-      }
-    }
+  :deep(.ant-badge-count) {
+    top: -5px;
+    right: -10px;
   }
-
-  .bottom {
-    position: absolute;
-    bottom: 30px;
-    right: 20px;
-  }
-
-  .button-box {
-    position: absolute;
-    right: 20px;
-    top: 10px;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .button {
-    width: 96px;
-    height: 30px;
-    margin: 5px 0;
-    background: #0087ff;
-    font-size: 14px;
-    color: #fff;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-  }
-
-  .buttonAgree {
-    background-color: #49c988;
-  }
-
-  .backToFirst {
-    background-color: rgb(214, 91, 91);
-  }
-}
-
-:deep(.ant-badge-count) {
-  top: -5px;
-  right: -10px;
-}
 </style>

From e26937bc3794ea6f1d584b5f2551f779ef661ede Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Mon, 17 Oct 2022 13:38:46 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E9=87=8D?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assignedScene/add-update-scene.vue        |   8 +-
 .../ability/components/combine-ability.vue    |  76 +++-
 .../components/data-resource-tranfer.vue      | 414 ++++++++++++++++++
 3 files changed, 470 insertions(+), 28 deletions(-)
 create mode 100644 back/src/views/modules/ability/components/data-resource-tranfer.vue

diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
index 30afbbc0..7feb6844 100644
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@@ -116,7 +116,6 @@ import CommonQuestion from '../components/common-question.vue'
 import InfrastructureModal from './components/infrastructure-modal.vue'
 import Cookies from 'js-cookie'
 import upload from '@/views/modules/components/upload'
-
 const btnArray = ['基本信息', '场景痛点', '解决方案', '组合能力', '更多能力', '使用步骤']
 // 数据资源\组件服务
 export const getJson = (type) => {
@@ -163,7 +162,6 @@ export const modalTypeText = {
 }
 
 export const getFuseResourceList = (abilityListObj) => {
-  console.log('abilityListObjabilityListObj',abilityListObj);
   const arr = []
   let length = 0
   for (const key in abilityListObj) {
@@ -176,7 +174,7 @@ export const getFuseResourceList = (abilityListObj) => {
           resourceId: v.id,
           type: key,
           sequence: index,
-          resourceName:v.resourceName,
+          resourceName:v.resourceName|| v.name ,
           deptName:v.deptName,
         })
       })
@@ -331,9 +329,10 @@ export default {
     },
     // 更新表单
     updateDataForm (data) {
-      console.log('datadatadata',data);
+      //console.log('datadatadata',data);
       if (Object.keys(this.getListParams).includes(data.title)) {
         this.abilityListObj[data.title] = data.list
+        console.log(' this.abilityListObj[data.title]3333', this.abilityListObj[data.title]);
       } else {
         // 更多能力、使用步骤
         this.operateFuseAttrList(data.title, data)
@@ -363,6 +362,7 @@ export default {
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
+          console.log('this.dataForm------表单提交------>111111', this.dataForm)
         this.$refs.dataForm.validate((valid) => {
           if (!valid) {
             this.$message.error('请检查表单是否填写完整')
diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index 78c068b4..f0a1b8e6 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -16,19 +16,20 @@
               </el-transfer>
             </div>
             <div v-else-if="type==='数据资源'"  class="dataTransfer">
-              <el-transfer v-model="selectedArray" filterable :filter-method="filterMethod" filter-placeholder="请输入名称"
+              <!-- <el-transfer v-model="selectedArray" filter-placeholder="请输入名称"
                     :titles="nameArray" :props="{
                         key: 'id',
                         label: 'name',
                     }" :data="transferData">
                 </el-transfer>
-                <!-- <el-input
+                <el-input
                   v-model="searchValue"
                   placeholder="请输入名称"
                 ></el-input>
                 <el-button @click="rest" class="restClick">重置</el-button> -->
+                 <data-resource-tranfer @updateData="updateResourceDataForm" :selected-data="selectedData" :type="type"></data-resource-tranfer>
             </div>
-            <el-pagination
+            <!-- <el-pagination
               v-if="type==='数据资源'"
               :current-page="currentPage"
               :page-size="15"
@@ -36,7 +37,7 @@
               :total="total"
               @current-change="pageCurrentChangeHandle"
             >
-            </el-pagination>
+            </el-pagination> -->
             <template slot="footer">
                 <el-button @click="showModal = false">{{ $t("cancel") }}</el-button>
                 <el-button type="primary" @click="confirmSubmitHandle()">{{
@@ -52,7 +53,7 @@
 <script>
 import InfrastructureModal from '../assignedScene/components/infrastructure-modal.vue'
 import DisplayList from '../assignedScene/components/display-list.vue'
-
+import dataResourceTranfer from './data-resource-tranfer.vue'
 const sjzyArray = [
   {
     zyname: '城阳区图书馆总分馆、社区图书室明细信息',
@@ -199,7 +200,9 @@ export default {
       total: 0,
       currentPage: 1,
       newNum: 1,
-      searchValue: ''
+      searchValue: '',
+      selectedData:[],
+      newResourceData:[]
     }
   },
   watch: {
@@ -223,10 +226,12 @@ export default {
   },
   methods: {
     async getDataInfo (dataForm) {
+       console.log('dataForm-----====',dataForm);
+       console.log('this.type',this.type);
       await this.getData()
       const arr = []
       const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type);
-       console.log('attrValue22',attrValue);
+      this.selectedData = attrValue;
       if (attrValue.length > 0) {
         attrValue.map(val => {
           if(val.type==="数据资源"){
@@ -248,6 +253,7 @@ export default {
       }
       // 展示
       this.displayList = JSON.parse(JSON.stringify(arr));
+      this.displayList = Array.from(new Set(this.displayList))
       // 已选中
       this.selectedArray = arr.map(v => v.id)
       this.$nextTick(() => {
@@ -286,7 +292,7 @@ export default {
         this.$http[this.getDataParams.methods](this.getDataParams.url,
           this.getDataParams.postData
         ).then(res => {
-          console.log('res.data----获取列表-------->', res.data)
+          console.log('res.data----数据资源获取列表-------->', res.data)
           this.total = Number(res.data.data.rows)
           if (res.data.code !== 0) {
             return this.$message.error(res.msg)
@@ -302,37 +308,56 @@ export default {
               resourceName:v.zyname
             })
           })
-          this.allData = JSON.parse(JSON.stringify(this.transferData))
+          this.allData = JSON.parse(JSON.stringify(this.transferData));
+          //console.log('this.transferData======43434',this.transferData);
+          //console.log('res.data----retretryry-------->', this.transferData)
         }).catch(err => {
           this.$message.error('未搜索到相关数据资源')
         })
       }
     },
+    //接受数据资源数据
+    updateResourceDataForm(data){
+      let obj = {};
+      data =  data.list.reduce(function(item, next) {
+      obj[next.id] ? '' : obj[next.id] = true && item.push(next);
+       return item;
+       }, []);
+      console.log('变化后的数据222',data); 
+      this.newResourceData = data;
+    },
     filterMethod (query, item) {
       console.log('1111111111111111111111111')
       return item.name && item.name.indexOf(query) > -1
     },
     confirmSubmitHandle () {
-      console.log('tttttt',this.selectedArray)
       if(this.type === "数据资源"){
        //通过选中的数据去查找原始列表数据
-      let selectedObjectList = [];
-      this.selectedArray.forEach((item)=>{
-        let filterData = [];
-        filterData = this.allData.filter(v => v.id == item);
-        //console.log('filterDatafilterData',filterData);
-        selectedObjectList.push(filterData[0]);
-      });
-       this.$emit('update', {
-        title: this.type,
-        list: selectedObjectList
-      })
+      // let selectedObjectList = [];
+      // this.selectedArray.forEach((item)=>{
+      //   let filterData = [];
+      //   filterData = this.allData.filter(v => v.id == item);
+      //   //console.log('filterDatafilterData',filterData);
+      //   selectedObjectList.push(filterData[0]);
+      // });
+      //  this.$emit('update', {
+      //   title: this.type,
+      //   list: selectedObjectList
+      // })
+       if (this.newResourceData.length > this.maxNum) {
+        return this.$message.error('最多选择十条数据！')
+      }
+      this.$emit('update', {
+         title: this.type,
+         list: this.newResourceData
+       });
+        this.displayList = this.newResourceData;
+       this.showModal = false
       }else{
         this.$emit('update', {
         title: this.type,
         list: this.selectedArray
       })
-      }
       if (this.selectedArray.length > this.maxNum) {
         return this.$message.error('最多选择十条数据！')
       }
@@ -343,7 +368,9 @@ export default {
           this.displayList.push(v)
         }
       })
+      this.displayList = Array.from(new Set(this.displayList))
       console.log(this.selectedArray, this.displayList, 'this.displayList')
+      }
     },
     handleChange(){
       //console.log('222222',this.selectedArray);
@@ -376,9 +403,10 @@ export default {
       this.getData()
     }
   },
-  components: { InfrastructureModal, DisplayList },
+  components: { InfrastructureModal, DisplayList,dataResourceTranfer },
   mounted () {
     console.log(this.type, 'this.type')
+    
   }
 }
 </script>
@@ -493,7 +521,7 @@ export default {
     position: absolute;
     font-size: 14px;
     display: inline-block;
-    width: 80%;
+    width: 30%;
     top: 52px;
     left: 12px;
   }
diff --git a/back/src/views/modules/ability/components/data-resource-tranfer.vue b/back/src/views/modules/ability/components/data-resource-tranfer.vue
new file mode 100644
index 00000000..8e108348
--- /dev/null
+++ b/back/src/views/modules/ability/components/data-resource-tranfer.vue
@@ -0,0 +1,414 @@
+<template>
+  <div class="transfer">
+    <div class="leftTransfer">
+      <div class="leftTransfer_title">
+        <el-checkbox
+          :indeterminate="left.isIndeterminate"
+          v-model="left.checkAll"
+          @change="leftHandleCheckAllChange"
+          >{{ titles[0] }}</el-checkbox
+        >
+        <span
+          >{{ left.transferDataChecked.length }}/{{
+            left.transferData.length
+          }}</span
+        >
+      </div>
+      <el-input
+        @input="transferInputLeft"
+        class="transfer_input"
+        placeholder="请输入内容"
+        prefix-icon="el-icon-search"
+        v-model="left.inputValue"
+      >
+      </el-input>
+      <el-checkbox-group
+        class="transfer_group"
+        v-model="left.transferDataChecked"
+        @change="leftHandleCheckedCitiesChange"
+      >
+        <el-checkbox
+          v-for="item in left.transferData"
+          :label="item"
+          :key="item[defaultProps.id]"
+          >{{ item[defaultProps.label] }}</el-checkbox
+        >
+      </el-checkbox-group>
+      <el-pagination
+              :current-page="currentPage"
+              :page-size="15"
+              layout="total, prev, pager, next"
+              :total="total"
+              @current-change="handleCurrentChange"
+            >
+            </el-pagination>
+    </div>
+    <div class="transferButton">
+      <el-button type="primary" @click="push">></el-button>
+      <el-button type="primary" @click="del">{{ "<" }}</el-button>
+    </div>
+    <div class="rightTransfer">
+      <div class="rightTransfer_title">
+        <el-checkbox
+          :indeterminate="right.isIndeterminate"
+          v-model="right.checkAll"
+          @change="rightHandleCheckAllChange"
+          >{{ titles[1] }}</el-checkbox
+        >
+        <span
+          >{{ right.transferDataChecked.length }}/{{
+            right.transferData.length
+          }}</span
+        >
+      </div>
+      <el-input
+        @input="transferInputRight"
+        class="transfer_input"
+        placeholder="请输入内容"
+        prefix-icon="el-icon-search"
+        v-model="right.inputValue"
+      >
+      </el-input>
+      <div style="margin: 5px 0"></div>
+      <el-checkbox-group
+        class="transfer_group"
+        v-model="right.transferDataChecked"
+        @change="rightHandleCheckedCitiesChange"
+      >
+        <el-checkbox
+          v-for="item in right.transferData"
+          :label="item"
+          :key="item[defaultProps.id]"
+          >{{ item[defaultProps.label] }}</el-checkbox
+        >
+      </el-checkbox-group>
+    </div>
+  </div>
+</template>
+ 
+<script>
+//import { listUser } from "@/api/system/user";
+export default {
+  name: "transferPage",
+  props: {
+    titles: {
+      type: Array,
+      default: () => ["待选列表", "已选列表"],
+    },
+      selectedData: {
+      type: Array,
+      default: () => []
+    },
+    type: {
+      type: String,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      left: {
+        inputValue: "",
+        isIndeterminate: false, //半选按钮
+        checkAll: false, //是否点击全选
+        transferData: [], //穿梭框左侧全部数据
+        transferDataAll: [], //穿梭框左侧全部数据记录
+        transferDataChecked: [], //穿梭框左侧选中数据
+      },
+      right: {
+        inputValue: "",
+        isIndeterminate: false, //半选按钮
+        checkAll: false, //是否点击全选
+        transferData: [], //穿梭框右侧全部数据
+        transferDataAll: [], //穿梭框左侧全部数据记录
+        transferDataChecked: [], //穿梭框右侧选中数据
+      },
+      total: 0,
+       currentPage: 1,
+      queryParams: {
+        current: 1,
+        size: 10,
+      },
+    getDataParams:{ 
+    methods: "post",
+    url: "/resource/getDataResource",
+    postData: {
+        serviceName: "",
+        orderField: "fbrq",
+        orderType: "desc",
+        pageNum: 1,
+        pageSize: 15
+    }
+      },
+      defaultProps: {
+        label: "name",
+        id: "id",
+      },
+    };
+  },
+  created() {
+    this.initTransferData();
+  },
+	watch: {
+    // selectedData:{
+    //   	handler (newName, oldName) {
+		// 			console.log('接受到的已经选中的值',newName);
+    //       this.right.transferData = newName
+		// 		}
+    // },
+			right: {
+				handler (newName, oldName) {
+					//console.log('nnnnnn传递过去的值',newName);
+            this.$emit('updateData', {
+            title: "选中的数据资源",
+            list: newName.transferData
+      })
+				},
+				immediate: false,
+        deep: true
+			}
+		},
+  methods: {
+    // 初始化数据
+    initTransferData() {
+     this.$http[this.getDataParams.methods](this.getDataParams.url,
+          this.getDataParams.postData
+        ).then(response => {
+          console.log('数据资源response---->',response.data.data.data);
+          let responseDataList = [];
+            (response.data.data.data || []).map(v => {
+            responseDataList.push({
+              type: this.type,
+              id: v.guid,
+              name: v.zyname || '--',
+              deptName:v.TGBM,
+              resourceName:v.zyname
+            })
+          });
+        this.left.transferData = responseDataList;
+        this.left.transferData.map((item, index) => {
+          item.current = this.currentPage;
+        });
+        this.total =  Number(response.data.data.rows);
+        this.left.transferDataAll = this.left.transferData;
+        // 获得一个右边的数据，只有纯id
+        let checkedIdArr = this.right.transferData.map((item) => {
+          return item[this.defaultProps.id];
+        });
+        // 左侧数据删除
+        this.left.transferData = this.left.transferData.filter((item) => {
+          if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+            return item;
+          }
+        });
+      });
+      let selectedDataRight = [];
+        (this.selectedData || []).map(v => {
+            selectedDataRight.push({
+              type: v.resource.type,
+              id: v.resource.resourceId,
+              name: v.resource.resourceName,
+              deptName:v.resource.deptName,
+            })
+          });
+          selectedDataRight.map(v => {
+            this.right.transferData.push(v);
+          });
+       let obj = {};
+       this.right.transferData =   this.right.transferData.reduce(function(item, next) {
+       obj[next.id] ? '' : obj[next.id] = true && item.push(next);
+        return item;
+        }, []);
+        this.right.transferDataAll = this.right.transferData;
+       //console.log('this.selectedData',this.selectedData);
+       //console.log('left',this.left);
+       //console.log('rigth',this.right);
+    },
+    // 左侧是否点击全选
+    leftHandleCheckAllChange(val) {
+      this.left.transferDataChecked = val ? this.left.transferData : [];
+      this.left.isIndeterminate = false;
+    },
+    // 左侧勾选数据
+    leftHandleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.left.checkAll = checkedCount === this.left.transferData.length;
+      this.left.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.left.transferData.length;
+    },
+    // 左侧是否点击全选
+    rightHandleCheckAllChange(val) {
+      this.right.transferDataChecked = val ? this.right.transferData : [];
+      this.right.isIndeterminate = false;
+    },
+    // 右侧勾选数据
+    rightHandleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.right.checkAll = checkedCount === this.right.transferData.length;
+      this.right.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.right.transferData.length;
+    },
+    // 穿梭框选中数据
+    push() {
+      // 数据移到右侧
+      this.right.transferData = [
+        ...this.right.transferData,
+        ...this.left.transferDataChecked,
+      ].sort((a, b) => {
+        return a[this.defaultProps.id] - b[this.defaultProps.id];
+      });
+      this.right.transferDataAll = this.right.transferData;
+      // 获得一个右边的数据，只有纯id
+      let checkedIdArr = this.right.transferData.map((item) => {
+        return item[this.defaultProps.id];
+      });
+      // 左侧数据删除
+      this.left.transferData = this.left.transferData.filter((item) => {
+        if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+          return item;
+        }
+      });
+      this.left.transferDataAll = this.left.transferData;
+      // 每次推送完之后，重置选中框
+      this.left.transferDataChecked = [];
+      this.left.isIndeterminate = false;
+      this.left.checkAll = false;
+    },
+    // 穿梭框删除数据 回显的时候根据current回显到当前
+    del() {
+      //过滤当前页选中的数据
+      let arr = this.right.transferDataChecked.filter((item) => {
+        if (this.queryParams.current == item.current) {
+          return item;
+        }
+      });
+      // 数据移到左侧
+      this.left.transferData = [...this.left.transferData, ...arr].sort(
+        (a, b) => {
+          return a[this.defaultProps.id] - b[this.defaultProps.id];
+        }
+      );
+      this.left.transferDataAll = this.left.transferData;
+      // 获得一个右边的数据，只有纯id
+      let checkedIdArr = this.right.transferDataChecked.map((item) => {
+        return item[this.defaultProps.id];
+      });
+      // 删除选中的数据
+      this.right.transferData = this.right.transferData.filter((item) => {
+        if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+          return item;
+        }
+      });
+      this.right.transferDataAll = this.right.transferData;
+      // 每次推送完之后，重置选中框
+      this.right.transferDataChecked = [];
+      this.right.isIndeterminate = false;
+      this.right.checkAll = false;
+    },
+    handleCurrentChange(val) {
+      //console.log('valval',val);
+      this.getDataParams.postData.pageNum = val;
+      this.initTransferData();
+    },
+    transferInputLeft() {
+      if (this.left.inputValue) {
+        this.left.transferData = this.left.transferData.filter(
+          (p) => p[this.defaultProps.label].indexOf(this.left.inputValue) !== -1
+        );
+      } else {
+        this.left.transferData = this.left.transferDataAll;
+      }
+    },
+    transferInputRight() {
+      if (this.right.inputValue) {
+        this.right.transferData = this.right.transferData.filter(
+          (p) =>
+            p[this.defaultProps.label].indexOf(this.right.inputValue) !== -1
+        );
+      } else {
+        this.right.transferData = this.right.transferDataAll;
+      }
+    },
+  },
+};
+</script>
+ 
+<style lang="scss" scoped>
+.transfer {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 auto;
+  .transferButton {
+    .el-button {
+      display: block;
+      margin: 10px 0;
+    }
+  }
+  .el-checkbox {
+    line-height: 30px;
+  }
+  .transfer_input {
+    margin: 10px 15px 0 15px;
+    width: 85%;
+    .el-input--medium .el-input__inner {
+      height: 36px;
+      line-height: 36px;
+      border-radius: 16px;
+    }
+  }
+  .leftTransfer,
+  .rightTransfer {
+    height: 510px;
+    border: 1px solid #e6ebf5;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #ffffff;
+    display: inline-block;
+    vertical-align: middle;
+    width: 360px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    position: relative;
+    margin: 0 10px;
+ 
+    .el-checkbox {
+      display: block;
+    }
+    .el-input {
+    position: absolute;
+    font-size: 14px;
+    display: inline-block;
+    width: 70%;
+    top: 40px;
+    }
+    .pagination {
+      position: absolute;
+      bottom: -8px;
+      right: 0;
+    }
+    .leftTransfer_title,
+    .rightTransfer_title {
+      display: flex;
+      justify-content: space-between;
+      height: 40px;
+      line-height: 40px;
+      background: #f5f7fa;
+      margin: 0;
+      padding-left: 15px;
+      border-bottom: 1px solid #e6ebf5;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      padding-right: 15px;
+      align-items: center;
+    }
+  }
+}
+.transfer_group {
+  padding-left: 15px;
+  margin-top: 50px;
+    height: 390px;
+    overflow-y: auto;
+}
+</style>
\ No newline at end of file

From f20aac7430275e399a8d1699d2fa10a7bdee4271 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Mon, 17 Oct 2022 13:48:23 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E6=95=B0=E7=BB=84=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/ability/components/data-resource-tranfer.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/back/src/views/modules/ability/components/data-resource-tranfer.vue b/back/src/views/modules/ability/components/data-resource-tranfer.vue
index 8e108348..d6a89dcc 100644
--- a/back/src/views/modules/ability/components/data-resource-tranfer.vue
+++ b/back/src/views/modules/ability/components/data-resource-tranfer.vue
@@ -202,6 +202,7 @@ export default {
         });
       });
       let selectedDataRight = [];
+      this.selectedData = JSON.parse(JSON.stringify(this.selectedData));
         (this.selectedData || []).map(v => {
             selectedDataRight.push({
               type: v.resource.type,

From 5ac06ce8d6e0a4895ee587836c8f1c5be32edda1 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 14:00:16 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B3=E8=B4=AD=E8=BD=A6=E5=88=A0=E9=99=A4=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4id=E5=8F=82=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/personalCenter/components/PurchaseVehicle.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 46e032f6..2c6cb06f 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -650,17 +650,19 @@ const ceshiFunction = () => {
 }
 // delOne delList handleDelete
 const handleDelete = (item, index) => {
+  console.log('item, index------------>', item, index);
+  
   console.log('item------------>', item);
   let delArr = [];
   // 单个删除
-  if (item) {
+  if (index) {
     delArr = [item.id]
   } else {
     // 批量删除
     if (checkedListAbility.value.length == 0) {
       return message.warning('请先选择需要操作的数据！')
     } else {
-      delArr = checkedListAbility.value.map(v=>v.id)
+      delArr = checkedListAbility.value
     }
   }
   sgcDel({

From 98d1b070ab8f269a139b3f2cc8f94476fba7fe58 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 14:00:44 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7-=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E5=85=B5=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=90=8D=E7=A7=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalCenter/components/MyApply.vue     | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 508e8bd2..bfec2fb1 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -87,10 +87,9 @@
       </div>
     </div>
     <a-empty v-else />
-    <!-- :title="detailModalTitle" -->
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
-      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
-      <template v-slot:title>{{detailModalTitle}}</template>
+    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" style="width: 900px" :footer="null"
+      destroyOnClose="true" :maskClosable="false">
+      <template v-slot:title>{{refObj.description && itShowXiHaiAn ? refObj.description + '申请详情' : '申请详情'}}</template>
       <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
         :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
       </apply-details>
@@ -101,9 +100,6 @@
     <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
       <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
         <template #bodyCell="{ column, text }">
-          <!-- <template>
-        <a>{{ text }}</a>
-      </template> -->
         </template>
       </a-table>
     </a-modal>
@@ -155,6 +151,7 @@ let typeList = ref([
 ])
 // 西海岸-设备申请
 let isXiHaiAn = whoShow.itShowXiHaiAn
+let itShowXiHaiAn = ref(isXiHaiAn)
 const phoneSate = ref([2, 3])
 if (isXiHaiAn) {
   typeList.value.push('设备申请')
@@ -240,17 +237,9 @@ function changeApplyState(item, index) {
   }
 }
 
-const cilckRowData = ref({})
-let detailModalTitle = '申请详情';
 const showDetail = (item) => {
-  cilckRowData.value = item;
   // 西海岸-申请时间过期，提示
   if (isXiHaiAn) {
-    // 西海岸、单兵无人机设备
-    if (item.tbDeviceDTO) {
-      detailModalTitle = item.tbDeviceDTO.name ? item.tbDeviceDTO.name + '申请详情' : '申请详情'
-    }
-    console.log('detailModalTitle------------>', detailModalTitle);
     if (item.expireDate) {
       let diff = moment().diff(moment(item.expireDate), 'seconds')
       if (diff > 0) {
@@ -274,10 +263,12 @@ const showDetail = (item) => {
   } else if (typeName.value == '设备申请') {
     getDeviceDetailInfo(item.deviceId)
       .then((res) => {
+        console.log('res---设备申请--------->', res);
+
         if (res.data.code == 0) {
           refObj.value = res.data.data
           detailsVisible.value = true
-          processDefinitionName.value = item.processDefinitionName
+          // processDefinitionName.value = item.processDefinitionName
         }
       })
       .catch((err) => { })

From e0bde554b943b7b545ed1c20aa4faf7f76f143d5 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 14:01:05 +0800
Subject: [PATCH 07/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=B7=B2=E7=BB=88=E6=AD=A2=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AbilityApplication.vue         | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 0f2a42d6..3a2ffa25 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -163,23 +163,27 @@
                   @click.stop="openVideo(val)">
                   视频预览
                 </a-button>
-                <span class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && !item.ended" >该流程已终止</span>
+                <span class="channelName" style="color:#ff7875"
+                  v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止</span>
 
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
-                <div class="result" v-if="item.approveStatus == '通过'">
-                  申请结果：{{
-                  '列表地址：' +
+                <div class="result"  v-if="item.approveStatus == '通过'">
+                  申请结果：
+                  <span>列表地址：</span><span style="cursor: pointer;" @click="openView(backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.instanceId)">{{
                   backUrl +
                   'resource/getApplyCameraList/' +
-                  item.instanceId +
-                  ';' +
-                  '视频流地址：' +
+                  item.instanceId }}</span>
+                  <span>视频流地址：</span>
+                  <span style="cursor: pointer" @click="openView(backUrl +
+                  'resource/hls/getHls/?key=' +
+                  val.channelId)">{{
                   backUrl +
                   'resource/hls/getHls/?key=' +
-                  val.channelId
-                  }}
+                  val.channelId}}</span>
                 </div>
               </div>
             </div>
@@ -453,6 +457,10 @@ const handleUser = () => {
   })
 }
 
+const openView = (url) => {
+  window.open(url, '_blank')
+}
+
 </script>
 <style lang="less" scoped>
 .title {
@@ -733,6 +741,7 @@ const handleUser = () => {
   font-weight: bold;
   opacity: 0.4;
   transform: rotate(-25deg);
-  width: 470px
+  width: 470px;
+
 }
 </style>

From 587c728a74bfc380990e6bab1dc7f62168e037cf Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 14:16:32 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7--?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AbilityApplication.vue         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 3a2ffa25..3230512e 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -159,17 +159,18 @@
                   <span class="channelName">{{ val.channelName }}</span>
                   <span class="type">基础设施</span>
                 </div>
-                <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
-                  @click.stop="openVideo(val)">
-                  视频预览
-                </a-button>
-                <span class="channelName" style="color:#ff7875"
-                  v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止</span>
-
+                <div>
+                  <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
+                    @click.stop="openVideo(val)">
+                    视频预览
+                  </a-button>
+                  <div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
+                  </div>
+                </div>
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
-                <div class="result"  v-if="item.approveStatus == '通过'">
+                <div class="result" v-if="item.approveStatus == '通过'">
                   申请结果：
                   <span>列表地址：</span><span style="cursor: pointer;" @click="openView(backUrl +
                   'resource/getApplyCameraList/' +
@@ -539,7 +540,7 @@ const openView = (url) => {
         margin-left: 0.1rem;
 
         .ability {
-          height: 1.3rem;
+          height: 1.6rem;
           display: flex;
           border-bottom: 1px #eee solid;
           padding: 0.1rem 0;

From b66a781b8157d9623b0e2c286c6192e2cec4ace5 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 14:39:29 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/myAgent/approval.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/myAgent/approval.vue b/back/src/views/modules/myAgent/approval.vue
index 2cd53901..57e49865 100644
--- a/back/src/views/modules/myAgent/approval.vue
+++ b/back/src/views/modules/myAgent/approval.vue
@@ -12,15 +12,22 @@
             <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%">
                 <el-table-column prop="title" label="申请标题" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="name" label="申请人信息" header-align="center" align="center"></el-table-column>
+                <el-table-column label="设备名称" header-align="center" align="center">
+                    <template slot-scope="scope">
+                        <span class="demand-text">{{
+                        (scope.row && scope.row.tbDeviceDTO && scope.row.tbDeviceDTO.name)
+                        }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="state" label="审批状态" header-align="center" align="center">
                     <template slot-scope="scope">
                         <span>{{wrjStateObj[scope.row.state]}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
+                <!-- <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="dept" label="单位" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="applicationSystem" label="应用系统" header-align="center" align="center">
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"

From 21431958f082ea48e8f6218980b829dc68e1b9bb Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 17 Oct 2022 14:49:21 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalCenter/components/MyApply.vue     | 1512 +++++++++--------
 1 file changed, 801 insertions(+), 711 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index d07e6b5c..29c08390 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -3,16 +3,27 @@
     <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
     <div class="tab" style="margin-bottom: 0.1rem">
       <span>类型</span>
-      <div :class="typeIndex == index ? 'tabclass' : ' '" @click="changeType(item, index)"
-        v-for="(item, index) in typeList" :key="index">
+      <div
+        :class="typeIndex == index ? 'tabclass' : ' '"
+        @click="changeType(item, index)"
+        v-for="(item, index) in typeList"
+        :key="index"
+      >
         {{ item }}
       </div>
     </div>
     <div class="tab">
       <span>申请状态</span>
-      <div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeApplyState(item, index)"
-        v-for="(item, index) in tabList" :key="index">
-        <a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
+      <div
+        :class="tabIndex == index ? 'tabclass' : ' '"
+        @click="changeApplyState(item, index)"
+        v-for="(item, index) in tabList"
+        :key="index"
+      >
+        <a-badge
+          :count="item === '审核中' ? num.unfinished : num.finished"
+          v-if="item !== '全部'"
+        >
           {{ item }}
         </a-badge>
         <template v-else>
@@ -22,7 +33,11 @@
     </div>
     <div v-if="contentList.data.length > 0">
       <div class="content">
-        <div class="content-body" v-for="item in contentList.data" :key="item.index">
+        <div
+          class="content-body"
+          v-for="item in contentList.data"
+          :key="item.index"
+        >
           <div class="content-body-title">
             <span>申请单号：{{ item.applyNumber || '--' }}</span>
             <div></div>
@@ -33,7 +48,9 @@
             </template>
             <div class="content-body-title">
               <span>
-                名称：{{ item.cameraList ? item.system : (item.title || item.name) }}
+                名称：{{
+                  item.cameraList ? item.system : item.title || item.name
+                }}
               </span>
               <div></div>
             </div>
@@ -52,53 +69,117 @@
             <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
-            <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-              @click="showPhoneModal(item)">
+            <div
+              class="button"
+              v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
+              @click="showPhoneModal(item)"
+            >
               联系方式
             </div>
             <div class="button" @click="showDetail(item)">查看详情</div>
             <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
               修改
             </div>
-            <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80" v-if="
+            <svg
+              t="1652233950228"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="5970"
+              data-spm-anchor-id="a313x.7781069.0.i8"
+              width="80"
+              height="80"
+              v-if="
                 item.processDefinitionName != '能力资源下架' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
-              " style="position: absolute; top: 20px; left: -850px">
+              "
+              style="position: absolute; top: 20px; left: -850px"
+            >
               <path
                 d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                fill="#515151" opacity=".5" p-id="5971"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5971"
+              ></path>
               <path
                 d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                fill="#515151" opacity=".5" p-id="5972"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5972"
+              ></path>
               <path
                 d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                fill="#515151" opacity=".5" p-id="5973"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5973"
+              ></path>
               <path
                 d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                fill="#515151" opacity=".5" p-id="5974"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5974"
+              ></path>
             </svg>
           </div>
         </div>
       </div>
       <div class="bottom">
-        <a-pagination size="small" pageSize="4" :total="total" :current="page" @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
+        <a-pagination
+          size="small"
+          pageSize="4"
+          :total="total"
+          :current="page"
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+          :showSizeChanger="false"
+        />
       </div>
     </div>
     <a-empty v-else />
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
-      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
-      <template v-slot:title>{{refObj.description && itShowXiHaiAn ? refObj.description + '申请详情' : '申请详情'}}</template>
-      <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
-        :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
-      </apply-details>
+    <a-modal
+      bodyStyle="padding:0.1rem 0"
+      v-model:visible="detailsVisible"
+      style="width: 1000px"
+      :footer="null"
+      destroyOnClose="true"
+      :maskClosable="false"
+    >
+      <template v-slot:title>
+        {{
+          refObj.description && itShowXiHaiAn
+            ? refObj.description + '申请详情'
+            : '申请详情'
+        }}
+      </template>
+      <apply-details
+        :processDefinitionName="processDefinitionName"
+        :businessKey="businessKey"
+        :processInstanceId="processInstanceId"
+        :resourceId="resourceId"
+        :refObj="refObj"
+        :showType="showType"
+      ></apply-details>
     </a-modal>
-    <a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
+    <a-modal
+      v-model:visible="visible"
+      title="下架原因"
+      @ok="del()"
+      @cancel="reason = ''"
+    >
       <a-input v-model:value="reason" placeholder="请输入下架原因" />
     </a-modal>
-    <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
+    <a-modal
+      v-model:visible="videoVisible"
+      title="已申请摄像头列表"
+      @ok="videoVisible = false"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
+      >
         <template #bodyCell="{ column, text }">
           <!-- <template>
         <a>{{ text }}</a>
@@ -109,747 +190,756 @@
   </div>
 
   <!-- 联系方式弹框 -->
-  <a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
+  <a-modal
+    v-model:visible="phoneVisible"
+    title="提示"
+    @ok="phoneVisible = false"
+  >
     <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
     <p>请联系工业信息化局，电话：199 6399 0996</p>
   </a-modal>
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, onBeforeUnmount, h, defineProps } from 'vue'
-import {
-  getMyProcessInstancePage,
-  getTabilityapplication,
-  getByApplyFlag,
-  nengliziyuanshangjiaapply,
-  getDemandForm,
-  demandComment,
-  deviceApplylist,
-  getDeviceDetail,
-} from '@/api/personalCenter'
-import {
-  updateRes,
-  relaunch,
-  selectOne,
-  getApplyCameraList,
-  selectOneDel,
-} from '@/api/home'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
-import mybus from '@/myplugins/mybus'
-import * as moment from 'moment'
+  import {
+    onMounted,
+    reactive,
+    ref,
+    onBeforeUnmount,
+    h,
+    defineProps,
+  } from 'vue'
+  import {
+    getMyProcessInstancePage,
+    getTabilityapplication,
+    getByApplyFlag,
+    nengliziyuanshangjiaapply,
+    getDemandForm,
+    demandComment,
+    deviceApplylist,
+    getDeviceDetail,
+  } from '@/api/personalCenter'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+    selectOneDel,
+  } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
+  import mybus from '@/myplugins/mybus'
+  import * as moment from 'moment'
 
-const props = defineProps({
-  tabTypeName: { type: String, default: '' },
-})
-const router = useRouter()
-let typeList = ref([
-  '能力申请',
-  '能力上架',
-  '能力下架',
-  '能力需求',
-  '需求评论',
-  // '能力评价',
-])
-// 西海岸-设备申请
-let isXiHaiAn = whoShow.itShowXiHaiAn
-const itShowXiHaiAn = ref(isXiHaiAn)
-const phoneSate = ref([2, 3])
-if (isXiHaiAn) {
-  typeList.value.push('设备申请')
-}
-const typeStrObj = {
-  '能力上架': 'resourcemountapply',
-  '能力下架': 'resourcundercarriageapply',
-  '能力需求': 'abilitydemandapply',
-  '需求评论': 'comment_review',
-}
-let tabList = ref(['全部', '审核中', '审核完成'])
-const contentList = reactive({ data: [] })
-let tabIndex = ref(0)
-let typeIndex = ref(0)
-let typeName = ref(typeList.value[0])
-const videoVisible = ref(false)
-const numFlag = ref(true)
-const columns = ref([
-  {
-    title: '摄像头名称',
-    dataIndex: 'name',
-  },
-])
-const xVideoList = ref([])
-
-let name = ref('')
-const detailsVisible = ref(false)
-const detailsVisible2 = ref(false)
-const businessKey = ref('')
-const processInstanceId = ref('')
-const processDefinitionName = ref('')
-const resourceId = ref('')
-const reason = ref('')
-const visible = ref(false)
-const delObj = ref({})
-const taskId = ref('')
-const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
-const refObj = ref({})
-const num = ref({
-  finished: 0,
-  unfinished: 0,
-})
-const total = ref('')
-const showType = ref('')
-const page = ref('1')
-const ended = ref('')
-const processDefinitionKey = ref('')
-const phoneVisible = ref(false)
-
-// 选择类型
-const changeType = (item, index) => {
-  console.log('item, index-----选择类型------->', item, index)
-  numFlag.value = true
-  num.value = []
-  showType.value = ''
-  tabIndex.value = 0
-  ended.value = ''
-  page.value = 1
-  typeIndex.value = index
-  typeName.value = item
-  getApplyList()
-}
-
-// 申请状态切换
-function changeApplyState(item, index) {
-  tabIndex.value = index
-  switch (item) {
-    case '审核中':
-      page.value = 1
-      ended.value = false
-      getApplyList()
-      break
-    case '审核完成':
-      page.value = 1
-      ended.value = true
-      getApplyList()
-      break
-    case '全部':
-      page.value = 1
-      ended.value = ''
-      getApplyList()
-      break
-  }
-}
-
-const cilckRowData = ref({})
-const showDetail = (item) => {
-  cilckRowData.value = item;
-  // 西海岸-申请时间过期，提示
+  const props = defineProps({
+    tabTypeName: { type: String, default: '' },
+  })
+  const router = useRouter()
+  let typeList = ref([
+    '能力申请',
+    '能力上架',
+    '能力下架',
+    '能力需求',
+    '需求评论',
+    // '能力评价',
+  ])
+  // 西海岸-设备申请
+  let isXiHaiAn = whoShow.itShowXiHaiAn
+  const itShowXiHaiAn = ref(isXiHaiAn)
+  const phoneSate = ref([2, 3])
   if (isXiHaiAn) {
-    if (item.expireDate) {
-      let diff = moment().diff(moment(item.expireDate), 'seconds')
-      if (diff > 0) {
-        return message.error('当前申请已过期！')
-      }
+    typeList.value.push('设备申请')
+  }
+  const typeStrObj = {
+    能力上架: 'resourcemountapply',
+    能力下架: 'resourcundercarriageapply',
+    能力需求: 'abilitydemandapply',
+    需求评论: 'comment_review',
+  }
+  let tabList = ref(['全部', '审核中', '审核完成'])
+  const contentList = reactive({ data: [] })
+  let tabIndex = ref(0)
+  let typeIndex = ref(0)
+  let typeName = ref(typeList.value[0])
+  const videoVisible = ref(false)
+  const numFlag = ref(true)
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([])
+
+  let name = ref('')
+  const detailsVisible = ref(false)
+  const detailsVisible2 = ref(false)
+  const businessKey = ref('')
+  const processInstanceId = ref('')
+  const processDefinitionName = ref('')
+  const resourceId = ref('')
+  const reason = ref('')
+  const visible = ref(false)
+  const delObj = ref({})
+  const taskId = ref('')
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
+  const refObj = ref({})
+  const num = ref({
+    finished: 0,
+    unfinished: 0,
+  })
+  const total = ref('')
+  const showType = ref('')
+  const page = ref('1')
+  const ended = ref('')
+  const processDefinitionKey = ref('')
+  const phoneVisible = ref(false)
+
+  // 选择类型
+  const changeType = (item, index) => {
+    console.log('item, index-----选择类型------->', item, index)
+    numFlag.value = true
+    num.value = []
+    showType.value = ''
+    tabIndex.value = 0
+    ended.value = ''
+    page.value = 1
+    typeIndex.value = index
+    typeName.value = item
+    getApplyList()
+  }
+
+  // 申请状态切换
+  function changeApplyState(item, index) {
+    tabIndex.value = index
+    switch (item) {
+      case '审核中':
+        page.value = 1
+        ended.value = false
+        getApplyList()
+        break
+      case '审核完成':
+        page.value = 1
+        ended.value = true
+        getApplyList()
+        break
+      case '全部':
+        page.value = 1
+        ended.value = ''
+        getApplyList()
+        break
     }
   }
-  if (typeName.value == '能力申请' && item.applyFlag) {
-    getByApplyFlag(item.applyFlag).then((res) => {
-      if (res.data.code == 0) {
-        refObj.value = res.data.data
-        detailsVisible.value = true
-        processDefinitionName.value = item.processDefinitionName
-        businessKey.value = item.businessKey
-        processInstanceId.value = item.instanceId
-        resourceId.value = item.resourceId
-      } else {
-        message.error('数据请求失败！')
+
+  const cilckRowData = ref({})
+  const showDetail = (item) => {
+    cilckRowData.value = item
+    // 西海岸-申请时间过期，提示
+    if (isXiHaiAn) {
+      if (item.expireDate) {
+        let diff = moment().diff(moment(item.expireDate), 'seconds')
+        if (diff > 0) {
+          return message.error('当前申请已过期！')
+        }
       }
-    })
-  } else if (typeName.value == '设备申请') {
-    getDeviceDetailInfo(item.deviceId)
-      .then((res) => {
+    }
+    if (typeName.value == '能力申请' && item.applyFlag) {
+      getByApplyFlag(item.applyFlag).then((res) => {
         if (res.data.code == 0) {
           refObj.value = res.data.data
           detailsVisible.value = true
+          processDefinitionName.value = item.processDefinitionName
+          businessKey.value = item.businessKey
+          processInstanceId.value = item.instanceId
+          resourceId.value = item.resourceId
+        } else {
+          message.error('数据请求失败！')
         }
       })
-      .catch((err) => { })
-  } else if (
-    Object.keys(typeStrObj).includes(typeName.value) ||
-    typeName.value == '能力评价'
-  ) {
-    refObj.value = item
-    detailsVisible.value = true
-    processDefinitionName.value = item.processDefinitionName
-    businessKey.value = item.businessKey
-    processInstanceId.value = item.processInstanceId
-    resourceId.value = item.resourceId
-  } else {
-    message.error('数据请求失败！')
-  }
-}
-const showVideoList = (item) => {
-  console.log('显示列表', item)
-  getApplyCameraList(item.processInstanceId).then((res) => {
-    console.log('res', res)
-    xVideoList.value = []
-    res.data.data.map((val) => {
-      xVideoList.value.push({ name: val.channelName, key: val.channelId })
-    })
-  })
-  videoVisible.value = true
-}
-const copyComment = (data) => {
-  let url = data
-  let oInput = document.createElement('input')
-  oInput.value = url
-  document.body.appendChild(oInput)
-  oInput.select() // 选择对象;
-  console.log(oInput.value)
-  document.execCommand('Copy') // 执行浏览器复制命令
-  message.success('复制成功')
-  oInput.remove()
-}
-const showAdd = (item) => {
-  if (item.processDefinitionKey == 'resourcemountapply') {
-    const data = {
-      id: item.resourceId,
-      taskId: item.currentTaskList[0].taskId,
-    }
-    if (item.dto.type == '组件服务') {
-      data.abilityToType = '组件服务'
-      data.componentTypeValue = item.dto.infoList.filter(
-        (val) => val.attrType == '组件类型'
-      )[0].attrValue
-    } else if (item.dto.type == '应用资源') {
-      data.abilityToType = '应用资源'
-    }
-    const newpage = router.resolve({
-      path: '/nenglishangjia', // 跳转的页面路由
-      query: data,
-    })
-    console.log('上架申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
-    selectOne(item.resourceId).then((res) => {
-      if (res.data.code == 0) {
-        delObj.value = res.data.data
-        reason.value = delObj.value.undercarriageReason
-        taskId.value = item.currentTaskList[0].taskId
-        visible.value = true
-        console.log('下架申请修改=================》', res.data.data)
-      }
-    })
-  } else if (item.processDefinitionKey == 'abilitydemandapply') {
-    const newpage = router.resolve({
-      path: '/addApplication', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('需求申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'abilityprocess') {
-    const newpage = router.resolve({
-      path: '/apply', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        resourceId: item.resourceId,
-        name: item.name,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('能力申请修改=================》', item)
-    window.open(newpage.href, '_self')
-  }
-}
-
-const initNum = () => {
-  if (numFlag.value) {
-    num.value = []
-    getMyProcessInstancePage({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-      processDefinitionKey: processDefinitionKey.value,
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getMyProcessInstancePage({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-          processDefinitionKey: processDefinitionKey.value,
-        }).then((res) => {
+    } else if (typeName.value == '设备申请') {
+      getDeviceDetailInfo(item.deviceId)
+        .then((res) => {
           if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
+            refObj.value = res.data.data
+            detailsVisible.value = true
           }
         })
-      }
-    })
+        .catch((err) => {})
+    } else if (
+      Object.keys(typeStrObj).includes(typeName.value) ||
+      typeName.value == '能力评价'
+    ) {
+      refObj.value = item
+      detailsVisible.value = true
+      processDefinitionName.value = item.processDefinitionName
+      businessKey.value = item.businessKey
+      processInstanceId.value = item.processInstanceId
+      resourceId.value = item.resourceId
+    } else {
+      message.error('数据请求失败！')
+    }
   }
-}
-const initNum2 = () => {
-  if (numFlag.value) {
-    num.value = []
-    getTabilityapplication({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getTabilityapplication({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-        }).then((res) => {
-          if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
-          }
-        })
-      }
+  const showVideoList = (item) => {
+    console.log('显示列表', item)
+    getApplyCameraList(item.processInstanceId).then((res) => {
+      console.log('res', res)
+      xVideoList.value = []
+      res.data.data.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
     })
+    videoVisible.value = true
+  }
+  const copyComment = (data) => {
+    let url = data
+    let oInput = document.createElement('input')
+    oInput.value = url
+    document.body.appendChild(oInput)
+    oInput.select() // 选择对象;
+    console.log(oInput.value)
+    document.execCommand('Copy') // 执行浏览器复制命令
+    message.success('复制成功')
+    oInput.remove()
+  }
+  const showAdd = (item) => {
+    if (item.processDefinitionKey == 'resourcemountapply') {
+      const data = {
+        id: item.resourceId,
+        taskId: item.currentTaskList[0].taskId,
+      }
+      if (item.dto.type == '组件服务') {
+        data.abilityToType = '组件服务'
+        data.componentTypeValue = item.dto.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue
+      } else if (item.dto.type == '应用资源') {
+        data.abilityToType = '应用资源'
+      }
+      const newpage = router.resolve({
+        path: '/nenglishangjia', // 跳转的页面路由
+        query: data,
+      })
+      console.log('上架申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
+      selectOne(item.resourceId).then((res) => {
+        if (res.data.code == 0) {
+          delObj.value = res.data.data
+          reason.value = delObj.value.undercarriageReason
+          taskId.value = item.currentTaskList[0].taskId
+          visible.value = true
+          console.log('下架申请修改=================》', res.data.data)
+        }
+      })
+    } else if (item.processDefinitionKey == 'abilitydemandapply') {
+      const newpage = router.resolve({
+        path: '/addApplication', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('需求申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'abilityprocess') {
+      const newpage = router.resolve({
+        path: '/apply', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          resourceId: item.resourceId,
+          name: item.name,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('能力申请修改=================》', item)
+      window.open(newpage.href, '_self')
+    }
   }
-}
-// initNum()
 
-// 搜索框
-const onSearch = (name) => {
-  console.log(name.value)
-}
-//重置
-function replacement() {
-  name.value = ''
-  getApplyList(name.value)
-}
-const getApplyList = () => {
-  const params = {
-    page: page.value,
-    limit: 4,
-    ended: ended.value,
-    // name: name.value,
+  const initNum = () => {
+    if (numFlag.value) {
+      num.value = []
+      getMyProcessInstancePage({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+        processDefinitionKey: processDefinitionKey.value,
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getMyProcessInstancePage({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+            processDefinitionKey: processDefinitionKey.value,
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (ended.value === '') {
-    delete params.ended
+  const initNum2 = () => {
+    if (numFlag.value) {
+      num.value = []
+      getTabilityapplication({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getTabilityapplication({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (typeName.value == '能力申请') {
-    getTabilityapplication(params).then((res) => {
+  // initNum()
+
+  // 搜索框
+  const onSearch = (name) => {
+    console.log(name.value)
+  }
+  //重置
+  function replacement() {
+    name.value = ''
+    getApplyList(name.value)
+  }
+  const getApplyList = () => {
+    const params = {
+      page: page.value,
+      limit: 4,
+      ended: ended.value,
+      // name: name.value,
+    }
+    if (ended.value === '') {
+      delete params.ended
+    }
+    if (typeName.value == '能力申请') {
+      getTabilityapplication(params).then((res) => {
+        contentList.data = []
+        console.log('获取我的申请===============>', res.data.data)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        showType.value = '能力申请'
+        initNum2()
+      })
+    } else if (typeName.value == '能力评价') {
       contentList.data = []
-      console.log('获取我的申请===============>', res.data.data)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      showType.value = '能力申请'
-      initNum2()
-    })
-  } else if (typeName.value == '能力评价') {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  } else if (typeName.value == '设备申请') {
-    let _state =
-      ended.value === ''
-        ? '全部'
-        : ended.value === true
+      num.value = []
+      showType.value = ''
+    } else if (typeName.value == '设备申请') {
+      let _state =
+        ended.value === ''
+          ? '全部'
+          : ended.value === true
           ? '审核完成'
           : '审核中'
-    getDeviceApply(_state)
-      .then((res) => {
-        if (res.data.code == 0) {
-          contentList.data = []
-          contentList.data = res.data.data.list || []
-          total.value = res.data.data.total
-          showType.value = '设备申请'
-          // 获取审核中，审核完成 数量
-          getDeviceNum()
-        }
-      })
-      .catch((err) => { })
-  } else if (Object.keys(typeStrObj).includes(typeName.value)) {
-    processDefinitionKey.value = typeStrObj[typeName.value]
-    params.processDefinitionKey = processDefinitionKey.value
-    getMyProcessInstancePage(params).then((res) => {
-      contentList.data = []
-      // initNum(name.value)
-      console.log(res.data.data.list)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      initNum()
-      switch (typeIndex.value) {
-        case 2:
-          contentList.data.map((val) => {
-            nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
-              console.log('上架===========>', res1.data.data)
-              val.title = res1.data.data.resourceDTO.name
-              val.dto = res1.data.data.resourceDTO
-              showType.value = '能力上架'
+      getDeviceApply(_state)
+        .then((res) => {
+          if (res.data.code == 0) {
+            contentList.data = []
+            contentList.data = res.data.data.list || []
+            total.value = res.data.data.total
+            showType.value = '设备申请'
+            // 获取审核中，审核完成 数量
+            getDeviceNum()
+          }
+        })
+        .catch((err) => {})
+    } else if (Object.keys(typeStrObj).includes(typeName.value)) {
+      processDefinitionKey.value = typeStrObj[typeName.value]
+      params.processDefinitionKey = processDefinitionKey.value
+      getMyProcessInstancePage(params).then((res) => {
+        contentList.data = []
+        // initNum(name.value)
+        console.log(res.data.data.list)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        initNum()
+        switch (typeIndex.value) {
+          case 2:
+            contentList.data.map((val) => {
+              nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
+                console.log('上架===========>', res1.data.data)
+                val.title = res1.data.data.resourceDTO.name
+                val.dto = res1.data.data.resourceDTO
+                showType.value = '能力上架'
+              })
             })
-          })
-          break
-        case 3:
-          contentList.data.map((val) => {
-            selectOneDel(val.businessKey).then((res1) => {
-              console.log('下架===========>', res1.data.data)
-              val.title = res1.data.data.name
-              val.dto = res1.data.data
-              showType.value = '能力下架'
+            break
+          case 3:
+            contentList.data.map((val) => {
+              selectOneDel(val.businessKey).then((res1) => {
+                console.log('下架===========>', res1.data.data)
+                val.title = res1.data.data.name
+                val.dto = res1.data.data
+                showType.value = '能力下架'
+              })
             })
-          })
-          break
-        case 4:
-          contentList.data.map((val) => {
-            getDemandForm(val.businessKey).then((res1) => {
-              console.log('需求===========>', res1.data.data)
-              val.title = res1.data.data.demandSubject
-              val.resourceStatusTip = res1.data.data.flagTip
-              val.dto = res1.data.data
-              showType.value = '能力需求'
+            break
+          case 4:
+            contentList.data.map((val) => {
+              getDemandForm(val.businessKey).then((res1) => {
+                console.log('需求===========>', res1.data.data)
+                val.title = res1.data.data.demandSubject
+                val.resourceStatusTip = res1.data.data.flagTip
+                val.dto = res1.data.data
+                showType.value = '能力需求'
+              })
             })
-          })
-          break
-        case 5:
-          contentList.data.map((val) => {
-            demandComment(val.businessKey).then((res1) => {
-              console.log('评论===========>', res1.data.data)
-              val.title = res1.data.data.comment
-              val.resourceStatusTip = res1.data.data.delFlagTip
-              val.dto = res1.data.data
-              showType.value = '需求评论'
+            break
+          case 5:
+            contentList.data.map((val) => {
+              demandComment(val.businessKey).then((res1) => {
+                console.log('评论===========>', res1.data.data)
+                val.title = res1.data.data.comment
+                val.resourceStatusTip = res1.data.data.delFlagTip
+                val.dto = res1.data.data
+                showType.value = '需求评论'
+              })
             })
-          })
-          break
-      }
-    })
-  } else {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  }
-}
-const handleCurrentChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const handlePageSizeChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const viewDetail = (processDefinitionName, id, ended, businessKey) => {
-  if (processDefinitionName == '能力申请流程') {
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-        ended: ended,
-      },
-    })
-  }
-  if (processDefinitionName == '能力资源上架') {
-    console.log('showDetail', id, businessKey, ended)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
-  if (processDefinitionName == '能力需求申请') {
-    router.push({
-      path: '/demandDetails',
-      query: {
-        id: businessKey,
-      },
-    })
-  }
-}
-
-// 下架能力
-const del = () => {
-  console.log('下架================》', delObj.value, reason.value)
-  delObj.value.undercarriageReason = reason.value
-  updateRes(delObj.value).then((upres) => {
-    if (upres.data.code == 0) {
-      relaunch({
-        data: { undercarriageReason: reason.value },
-        taskId: taskId.value,
-      }).then((res) => {
-        console.log('驳回================>', res)
-        if (res.data.code == 0) {
-          message.success('重新发起流程成功！')
-          visible.value = false
-          reason.value = ''
-        } else {
-          message.error('重新发起流程失败！')
+            break
         }
       })
     } else {
-      message.error('数据更新失败！')
+      contentList.data = []
+      num.value = []
+      showType.value = ''
+    }
+  }
+  const handleCurrentChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const handlePageSizeChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const viewDetail = (processDefinitionName, id, ended, businessKey) => {
+    if (processDefinitionName == '能力申请流程') {
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+          ended: ended,
+        },
+      })
+    }
+    if (processDefinitionName == '能力资源上架') {
+      console.log('showDetail', id, businessKey, ended)
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+        },
+      })
+    }
+    if (processDefinitionName == '能力需求申请') {
+      router.push({
+        path: '/demandDetails',
+        query: {
+          id: businessKey,
+        },
+      })
+    }
+  }
+
+  // 下架能力
+  const del = () => {
+    console.log('下架================》', delObj.value, reason.value)
+    delObj.value.undercarriageReason = reason.value
+    updateRes(delObj.value).then((upres) => {
+      if (upres.data.code == 0) {
+        relaunch({
+          data: { undercarriageReason: reason.value },
+          taskId: taskId.value,
+        }).then((res) => {
+          console.log('驳回================>', res)
+          if (res.data.code == 0) {
+            message.success('重新发起流程成功！')
+            visible.value = false
+            reason.value = ''
+          } else {
+            message.error('重新发起流程失败！')
+          }
+        })
+      } else {
+        message.error('数据更新失败！')
+      }
+    })
+  }
+
+  // 西海岸：设备申请列表 todo
+  const getDeviceApply = (state) => {
+    return new Promise((resolve, reject) => {
+      let _data = {
+        page: page.value,
+        limit: 4,
+        state,
+      }
+      deviceApplylist(_data)
+        .then((res) => {
+          resolve(res)
+          console.log('res----设备申请-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请--查询详情
+  const getDeviceDetailInfo = (deviceId) => {
+    return new Promise((resolve, reject) => {
+      getDeviceDetail(deviceId)
+        .then((res) => {
+          resolve(res)
+          console.log('res----查询详情-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请-审核中, 审核完成数量
+  const getDeviceNum = () => {
+    if (!numFlag.value) {
+      return
+    }
+    num.value = []
+    Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
+      .then((res) => {
+        console.log('res-----数量------->', res)
+        let unfinished = res[0] && res[0].data && res[0].data.data
+        let finished = res[1] && res[1].data && res[1].data.data
+        num.value.unfinished = unfinished.total || ''
+        num.value.finished = finished.total || ''
+        numFlag.value = false
+      })
+      .catch((err) => {})
+  }
+
+  const showPhoneModal = () => {
+    phoneVisible.value = true
+  }
+
+  mybus.on('closeModal', (obj) => {
+    detailsVisible.value = false
+    changeType(obj.type, obj.index)
+  })
+  onBeforeUnmount(() => {
+    mybus.off('closeModal')
+  })
+  onMounted(() => {
+    getApplyList()
+
+    if (props.tabTypeName) {
+      let _index = typeList.value.findIndex((v) => v == props.tabTypeName)
+      changeType(props.tabTypeName, _index != -1 ? _index : 0)
     }
   })
-}
-
-// 西海岸：设备申请列表 todo
-const getDeviceApply = (state) => {
-  return new Promise((resolve, reject) => {
-    let _data = {
-      page: page.value,
-      limit: 4,
-      state,
-    }
-    deviceApplylist(_data)
-      .then((res) => {
-        resolve(res)
-        console.log('res----设备申请-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请--查询详情
-const getDeviceDetailInfo = (deviceId) => {
-  return new Promise((resolve, reject) => {
-    getDeviceDetail(deviceId)
-      .then((res) => {
-        resolve(res)
-        console.log('res----查询详情-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请-审核中, 审核完成数量
-const getDeviceNum = () => {
-  if (!numFlag.value) {
-    return
-  }
-  num.value = []
-  Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
-    .then((res) => {
-      console.log('res-----数量------->', res)
-      let unfinished = res[0] && res[0].data && res[0].data.data
-      let finished = res[1] && res[1].data && res[1].data.data
-      num.value.unfinished = unfinished.total || ''
-      num.value.finished = finished.total || ''
-      numFlag.value = false
-    })
-    .catch((err) => {
-    })
-}
-
-
-const showPhoneModal = () => {
-  phoneVisible.value = true
-}
-
-mybus.on('closeModal', (obj) => {
-  detailsVisible.value = false
-  changeType(obj.type, obj.index)
-})
-onBeforeUnmount(() => {
-  mybus.off('closeModal')
-})
-onMounted(() => {
-  getApplyList()
-
-  if (props.tabTypeName) {
-    let _index = typeList.value.findIndex(v => v == props.tabTypeName)
-    changeType(props.tabTypeName, _index != -1 ? _index : 0)
-  }
-})
 </script>
 
 <style scoped lang="less">
-.on-the-right-side-of-the-list {
-  background: #ffffff;
-  padding: 20px 0px 30px 20px;
-  position: absolute;
-  width: 1087px;
-  height: 810px;
-  top: 0px;
-  display: flex;
-  margin-top: 20px;
-  flex-direction: column;
-  font-size: 16px;
-  justify-content: left;
+  .on-the-right-side-of-the-list {
+    background: #ffffff;
+    padding: 20px 0px 30px 20px;
+    position: absolute;
+    width: 1087px;
+    height: 810px;
+    top: 0px;
+    display: flex;
+    margin-top: 20px;
+    flex-direction: column;
+    font-size: 16px;
+    justify-content: left;
 
-  .title {
-    font-size: 20px;
-    color: #000000;
-    font-family: 'Alibaba PuHuiTi';
-    font-weight: 500;
-  }
-
-  .sousuokuang {
-    margin: 20px 0px 21px 0px;
-
-    .ant-input-search {
-      max-width: 490px;
+    .title {
+      font-size: 20px;
+      color: #000000;
+      font-family: 'Alibaba PuHuiTi';
+      font-weight: 500;
     }
 
-    :deep(.ant-input) {
-      width: 400px;
-      height: 36px;
-      font-size: 14px;
-      color: #b2b2b2;
-      background: #f5f5f5;
-    }
+    .sousuokuang {
+      margin: 20px 0px 21px 0px;
 
-    :deep(.ant-input-group-addon) {
-      display: inline-block;
-      margin-left: 10px;
+      .ant-input-search {
+        max-width: 490px;
+      }
 
-      .ant-input-search-button {
-        width: 80px;
+      :deep(.ant-input) {
+        width: 400px;
         height: 36px;
-        border-radius: 4px;
         font-size: 14px;
+        color: #b2b2b2;
+        background: #f5f5f5;
+      }
+
+      :deep(.ant-input-group-addon) {
+        display: inline-block;
+        margin-left: 10px;
+
+        .ant-input-search-button {
+          width: 80px;
+          height: 36px;
+          border-radius: 4px;
+          font-size: 14px;
+        }
       }
     }
-  }
 
-  .tab {
-    display: flex;
-    font-size: 14px;
-    color: #999999;
+    .tab {
+      display: flex;
+      font-size: 14px;
+      color: #999999;
 
-    div {
-      // width: 70px;
-      padding: 5px 10px;
-      height: 24px;
-      line-height: 14px;
-      border: 1px solid #cccccc;
-      border-radius: 12px;
-      margin-left: 10px;
+      div {
+        // width: 70px;
+        padding: 5px 10px;
+        height: 24px;
+        line-height: 14px;
+        border: 1px solid #cccccc;
+        border-radius: 12px;
+        margin-left: 10px;
+        text-align: center;
+        color: #666666;
+        cursor: pointer;
+      }
+
+      .tabclass {
+        border: 1px solid #0087ff;
+        color: #0087ff;
+      }
+    }
+
+    .content {
+      padding-right: 10px;
+      height: 510px;
+
+      .content-body {
+        padding-bottom: 20px;
+        padding-top: 20px;
+        margin-right: 10px;
+        height: 150px;
+        border-bottom: #cccccc 1px solid;
+        position: relative;
+
+        .content-body-title {
+          min-width: 100px;
+          max-width: 900px;
+          width: fit-content;
+          font-size: 14px;
+          color: #333333;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 500;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .content-body-content {
+          margin-top: 10px;
+          margin-bottom: 10px;
+          margin-right: 40px;
+          /* width: 720px; */
+          display: inline-block;
+        }
+
+        .content-body-content-son {
+          line-height: 16px;
+          font-size: 12px;
+          width: 100%;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+
+          span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            max-width: 8.1rem;
+            line-height: 24px;
+            word-break: break-all;
+          }
+        }
+
+        .content-body-bottom {
+          display: flex;
+          color: #cccccc;
+          font-size: 12px;
+
+          div:first-child {
+            margin-right: 30px;
+          }
+        }
+      }
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 30px;
+      right: 20px;
+    }
+
+    .button-box {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .button {
+      width: 96px;
+      height: 30px;
+      margin: 5px 0;
+      background: #0087ff;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 4px;
       text-align: center;
-      color: #666666;
+      line-height: 30px;
       cursor: pointer;
     }
 
-    .tabclass {
-      border: 1px solid #0087ff;
-      color: #0087ff;
+    .buttonAgree {
+      background-color: #49c988;
+    }
+
+    .backToFirst {
+      background-color: rgb(214, 91, 91);
     }
   }
 
-  .content {
-    padding-right: 10px;
-    height: 510px;
-
-    .content-body {
-      padding-bottom: 20px;
-      padding-top: 20px;
-      margin-right: 10px;
-      height: 150px;
-      border-bottom: #cccccc 1px solid;
-      position: relative;
-
-      .content-body-title {
-        min-width: 100px;
-        max-width: 900px;
-        width: fit-content;
-        font-size: 14px;
-        color: #333333;
-        font-family: 'Alibaba PuHuiTi';
-        font-weight: 500;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      .content-body-content {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        margin-right: 40px;
-        /* width: 720px; */
-        display: inline-block;
-      }
-
-      .content-body-content-son {
-        line-height: 16px;
-        font-size: 12px;
-        width: 100%;
-        // text-overflow: -o-ellipsis-lastline;
-        // overflow: hidden;
-        // text-overflow: ellipsis;
-        // display: -webkit-box;
-        // -webkit-line-clamp: 3;
-        // -webkit-box-orient: vertical;
-        display: flex;
-        color: #999999;
-
-        span {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          max-width: 8.1rem;
-          line-height: 24px;
-          word-break: break-all;
-        }
-      }
-
-      .content-body-bottom {
-        display: flex;
-        color: #cccccc;
-        font-size: 12px;
-
-        div:first-child {
-          margin-right: 30px;
-        }
-      }
-    }
+  :deep(.ant-badge-count) {
+    top: -5px;
+    right: -10px;
   }
-
-  .bottom {
-    position: absolute;
-    bottom: 30px;
-    right: 20px;
-  }
-
-  .button-box {
-    position: absolute;
-    right: 20px;
-    top: 10px;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .button {
-    width: 96px;
-    height: 30px;
-    margin: 5px 0;
-    background: #0087ff;
-    font-size: 14px;
-    color: #fff;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-  }
-
-  .buttonAgree {
-    background-color: #49c988;
-  }
-
-  .backToFirst {
-    background-color: rgb(214, 91, 91);
-  }
-}
-
-:deep(.ant-badge-count) {
-  top: -5px;
-  right: -10px;
-}
 </style>

From 8db5b8bee538ba99060e2b244ef1a87fc1df0957 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 16:00:37 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=A1=E6=89=B9=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E5=92=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/hasToDoTasks/deviceApproval.vue | 3 +++
 back/src/views/modules/myAgent/approval.vue            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/back/src/views/modules/hasToDoTasks/deviceApproval.vue b/back/src/views/modules/hasToDoTasks/deviceApproval.vue
index 9f71809e..b00832db 100644
--- a/back/src/views/modules/hasToDoTasks/deviceApproval.vue
+++ b/back/src/views/modules/hasToDoTasks/deviceApproval.vue
@@ -38,6 +38,9 @@
                     </template>
                 </el-table-column>
 
+                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
+
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"
diff --git a/back/src/views/modules/myAgent/approval.vue b/back/src/views/modules/myAgent/approval.vue
index 57e49865..df7d42cd 100644
--- a/back/src/views/modules/myAgent/approval.vue
+++ b/back/src/views/modules/myAgent/approval.vue
@@ -24,6 +24,7 @@
                         <span>{{wrjStateObj[scope.row.state]}}</span>
                     </template>
                 </el-table-column>
+                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
                 <!-- <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="dept" label="单位" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="applicationSystem" label="应用系统" header-align="center" align="center">

From adf964a4003b56112f863fd980cc563bf7d14833 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 16:01:03 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=89=E9=99=84=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   | 147 ++++++++++--------
 1 file changed, 82 insertions(+), 65 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 52874502..9e788e19 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -13,40 +13,32 @@
       <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
-          >
+          <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" v-if="dataForm.content.applicationSystem"
-            >应用系统：<span>{{
-              dataForm.content.applicationSystem || '--'
-            }}</span></span
-          >
-          <span class="text" ></span>
+              {{ dataForm.content.title || '--' }}</span></span>
+          <span class="text" v-if="dataForm.content.applicationSystem">应用系统：<span>{{
+          dataForm.content.applicationSystem || '--'
+          }}</span></span>
+          <span class="text"></span>
         </p>
         <p>
-          <span v-if="dataForm.content.applicationSceneStr"
-            >应用场景：<span>
-              {{ dataForm.content.applicationSceneStr || '--' }}</span
-            ></span>
+          <span v-if="dataForm.content.applicationSceneStr">应用场景：<span>
+              {{ dataForm.content.applicationSceneStr || '--' }}</span></span>
         </p>
         <p>
           <span>
             需求依据：<span>
-              {{ dataForm.content.applicationBackground || '--' }}</span
-            ></span>
+              {{ dataForm.content.applicationBackground || '--' }}</span></span>
+        </p>
+        <p>
+          <div>
+            <el-button type="primary" v-if="dataForm.content.attachment" size="small" @click="download(dataForm.content)">附件下载</el-button>
+          </div>
         </p>
         <!-- <p>
           <span>
@@ -102,9 +94,7 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button type="danger" plain @click="showDialog('驳回')"
-          >驳回</el-button
-        >
+        <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
         <!-- <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> -->
@@ -113,21 +103,12 @@
 
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
-    <el-dialog
-      title="审批意见"
-      :close-on-click-modal="false"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-    >
+    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
+      :before-close="handleClose">
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
-        <el-button
-          type="primary"
-          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
       </span>
     </el-dialog>
   </el-card>
@@ -144,7 +125,7 @@ import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
-  data () {
+  data() {
     return {
       dialogVisible: false,
       dialogType: '',
@@ -173,7 +154,7 @@ export default {
       agreeOrList: '同意'
     }
   },
-  created () {
+  created() {
     // 将业务KEY赋值给表单
     console.log('params=================>', this.$route, this.$route.params)
     this.dataForm.taskId = this.$route.params.taskId
@@ -207,7 +188,7 @@ export default {
     RenProcessDetail
   },
   methods: {
-    init () {
+    init() {
       // this.visible = true
       this.$nextTick(() => {
         // this.$refs.dataForm.resetFields()
@@ -219,32 +200,32 @@ export default {
         }
       })
     },
-    showDialog (title) {
+    showDialog(title) {
       this.dialogVisible = true
       this.dialogType = title
     },
-    handleClose (done) {
+    handleClose(done) {
       this.$confirm('确认关闭？')
         .then((_) => {
           this.input = ''
           done()
         })
-        .catch((_) => {})
+        .catch((_) => { })
     },
-    handleClose2 () {
+    handleClose2() {
       this.dialogVisible = false
       this.input = ''
     },
-    downloadFile2 (url) {
+    downloadFile2(url) {
       console.log(window.SITE_CONFIG.previewUrl)
       window.open(
         window.SITE_CONFIG.previewUrl +
-          'hisense_office/onlinePreview?url=' +
-          btoa(encodeURI(url))
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
       )
     },
     // 获取信息
-    getInfo () {
+    getInfo() {
       let params = ''
       if (this.dataForm.taskId) {
         params = `taskId=${this.dataForm.taskId}`
@@ -272,7 +253,7 @@ export default {
                     index <
                     res.data.tAbilityApplicationDTOList[0].applicationScene
                       .length -
-                      1
+                    1
                   ) {
                     res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
                       '、'
@@ -307,7 +288,7 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => {})
+          .catch(() => { })
       } else {
         params = `instanceId=${this.dataForm.instanceId}`
         this.$http
@@ -359,11 +340,11 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => {})
+          .catch(() => { })
       }
     },
     // 申请能力
-    applyData () {
+    applyData() {
       this.$http
         .get(`/resource/select/${this.dataForm.instanceId}`)
         .then(({ data: res }) => {
@@ -375,7 +356,7 @@ export default {
           // this.dataForm.content = res.data
           // console.log(this.dataForm, 'ela')
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 同意与退回
     agreeOrNot: debounce(
@@ -412,7 +393,7 @@ export default {
                   }
                 })
               })
-              .catch(() => {})
+              .catch(() => { })
             this.tabRemoveHandle(data)
           } else {
             this.$message.error('请输入审批意见！')
@@ -455,7 +436,7 @@ export default {
       1000,
       { leading: true, trailing: false }
     ),
-    tabRemoveHandle (tabName) {
+    tabRemoveHandle(tabName) {
       console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
         return false
@@ -472,7 +453,7 @@ export default {
       if (tabName === this.$store.state.contentTabsActiveName) {
         const tab =
           this.$store.state.contentTabs[
-            this.$store.state.contentTabs.length - 1
+          this.$store.state.contentTabs.length - 1
           ]
         this.$router.push({
           name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
@@ -482,13 +463,19 @@ export default {
       }
     },
     // 启动流程出错回调
-    startProcessErrorCallback (data) {
+    startProcessErrorCallback(data) {
       console.log(data)
     },
     // 任务处理出错回调
-    taskHandleErrorCallback (data) {}
+    taskHandleErrorCallback(data) { },
+    download(data) {
+      const alink = document.createElement('a')
+      alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
+      alink.href = data.attachment // 创建 url地址
+      alink.click() // 自动点击
+    },
   },
-  mounted () {
+  mounted() {
     // this.applyData()
   }
 }
@@ -497,38 +484,47 @@ export default {
 ::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;
     }
   }
+
   .lastP {
     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;
@@ -539,6 +535,7 @@ export default {
     }
   }
 }
+
 ::v-deep .AbilityApply {
   margin-top: 32px;
 
@@ -548,27 +545,33 @@ export default {
     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;
@@ -581,22 +584,26 @@ export default {
             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;
@@ -610,17 +617,21 @@ export default {
     }
   }
 }
-::v-deep .agreeOr > div {
+
+::v-deep .agreeOr>div {
   display: flex;
   align-items: center;
+
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
   }
 }
-::v-deep .agreeOr > div:last-of-type {
+
+::v-deep .agreeOr>div:last-of-type {
   margin-top: 15px;
 }
+
 .blueAll {
   ::v-deep .el-radio-button__inner {
     width: 80px;
@@ -632,12 +643,14 @@ export default {
     color: #0558e1;
     border: 1px solid #0558e1;
   }
-  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+
+  ::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;
@@ -648,8 +661,10 @@ export default {
   color: #ffffff;
   border: 1px solid #0558e1;
 }
+
 .redAll {
   margin-left: 10px;
+
   ::v-deep .el-radio-button__inner {
     width: 80px;
     height: 32px;
@@ -661,12 +676,14 @@ export default {
     color: #e83a48;
     margin-left: 10px;
   }
-  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+
+  ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
     box-shadow: unset !important;
     color: #ffffff;
     background: #e83a48;
   }
 }
+
 .blueInput {
   width: 55px;
 }

From 2ebec87514a5cae2b45168f9eea2c2923cc7cf9f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 17 Oct 2022 17:21:18 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=85=AC=E5=AE=89=E5=B1=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=20=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=B8=BA=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 586afda0..9a14cf73 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -75,7 +75,7 @@
               <div v-if="iskfq && isXiHaiAn">
                 <a-row style="margin-top: 0.4rem">
                   <a-col :span="24">
-                    <a-form-item name="attachment" label="附件上传" class="introduction">
+                    <a-form-item name="attachment" label="附件上传" class="introduction" :rules="[{ required: true, message: '请上传附件' }]">
                       <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
                         :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
                         <a-button>
@@ -356,7 +356,7 @@ export default {
           if (!formName) {
             return message.error('请设置表单名称')
           }
-
+          
           if (id) {
             endProcess({ instanceId: taskId }).then((end) => {
               if (end.data.code == 0) {

From 5f3aad25399034fb2b85ce9b25a5cf9efdbd1c0a Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 10:45:40 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=9B=BE=E6=A0=87=E8=BF=9B=E5=85=A5=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue | 950 ++++++++++-----------
 1 file changed, 460 insertions(+), 490 deletions(-)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index c9495bdb..0e35d30e 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -1,11 +1,8 @@
 <template>
-  <div
-    class="home-header"
-    :class="[
-      select !== 'home' || scrollTop > 500 ? 'white' : '',
-      props.showView === 'algorithm-details' ? '' : '',
-    ]"
-  >
+  <div class="home-header" :class="[
+    select !== 'home' || scrollTop > 500 ? 'white' : '',
+    props.showView === 'algorithm-details' ? '' : '',
+  ]">
     <div class="name" @click="goToHome">
       <div class="name-bg" v-if="!itShowXiHaiAn"></div>
       <div class="name-bg-xihaian" v-else></div>
@@ -14,52 +11,26 @@
         <p>(United Capacity System)</p>
       </div>
     </div>
-    <div
-      v-for="item in navList"
-      :key="item.key"
-      @click="jumpPage(item)"
-      class="nav"
-      :class="item.key == select ? 'select' : ''"
-    >
+    <div v-for="item in navList" :key="item.key" @click="jumpPage(item)" class="nav"
+      :class="item.key == select ? 'select' : ''">
       {{ item.name }}
     </div>
     <!-- 购物车 -->
     <a-badge :count="sgcNum">
-      <svg
-        t="1650455446850"
-        class="icon"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2069"
-        width="0.4rem"
-        height="0.4rem"
-        @click="goToSgc"
-      >
+      <svg t="1650455446850" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2069" width="0.4rem" height="0.4rem" @click="goToSgc">
         <path
           d="M384 832v85.333333h-85.333333v-85.333333h85.333333z m405.333333 0v85.333333h-85.333333v-85.333333h85.333333zM240.32 185.002667l24.149333 140.928h633.173334L835.285333 746.666667h-563.626666l-85.333334-497.685334H94.485333v-64h145.834667z m583.104 204.928H275.434667L325.632 682.666667h454.464l43.328-292.736z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2070"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2070"></path>
       </svg>
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
       <!-- 消息提醒 -->
-      <svg
-        t="1654051054113"
-        class="icon2"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2187"
-        width="0.35rem"
-        height="0.35rem"
-      >
+      <svg t="1654051054113" class="icon2" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2187" width="0.35rem" height="0.35rem">
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2188"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2188"></path>
       </svg>
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
@@ -88,10 +59,7 @@
         <template #title>
           <span>{{ user.realName }}</span>
         </template>
-        <span
-          class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' })"
-        >
+        <span class="name" @click="jumpPage({ name: '个人中心', key: 'personalCenter' })">
           {{ user.realName }}
         </span>
       </a-tooltip>
@@ -114,171 +82,234 @@
           fill="#bfbfbf"
         ></path>
       </svg> -->
-      <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
-        class="iconTo"
-        v-show="backFlag"
-      ></i>
+      <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i>
     </div>
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
-  import { getUserInfo } from '@/api/user'
-  import { recordRoute } from '@/config'
-  import { useRoute, useRouter } from 'vue-router'
-  import { mynotice } from '@/api/home'
-  import { useStore } from 'vuex'
-  import { getSgcTotal } from '@/api/home'
-  import Cookies from 'js-cookie'
-  import mybus from '@/myplugins/mybus'
-  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  import { message } from 'ant-design-vue'
+import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
+import { getUserInfo } from '@/api/user'
+import { recordRoute } from '@/config'
+import { useRoute, useRouter } from 'vue-router'
+import { mynotice } from '@/api/home'
+import { useStore } from 'vuex'
+import { getSgcTotal } from '@/api/home'
+import Cookies from 'js-cookie'
+import mybus from '@/myplugins/mybus'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+import { message } from 'ant-design-vue'
 
-  const store = useStore()
-  const router = useRouter()
-  const route = useRoute()
-  const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
+const store = useStore()
+const router = useRouter()
+const route = useRoute()
+const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
 
-  // 用户信息
-  const user = ref({
-    username: store.getters['user/username'],
-    realName: store.getters['user/realName'],
-  })
-  const select = ref(router.currentRoute.value.name)
-  const mynoticeFlag = ref(false)
-  const mynoticeData = ref([])
-  const navList = ref(navListManagement.navList)
-  const backFlag = ref(true)
-  getUserInfo().then((res) => {
-    if (
-      res.data.data.roleIdList.length == 0 &&
-      res.data.data.superAdmin === 0
-    ) {
-      backFlag.value = false
-    }
-  })
-  console.log('navList------------>', navList)
+// 用户信息
+const user = ref({
+  username: store.getters['user/username'],
+  realName: store.getters['user/realName'],
+})
+const select = ref(router.currentRoute.value.name)
+const mynoticeFlag = ref(false)
+const mynoticeData = ref([])
+const navList = ref(navListManagement.navList)
+const backFlag = ref(true)
+getUserInfo().then((res) => {
+  if (
+    res.data.data.roleIdList.length == 0 &&
+    res.data.data.superAdmin === 0
+  ) {
+    backFlag.value = false
+  }
+})
+console.log('navList------------>', navList)
 
-  const props = defineProps({
-    showView: { type: String, default: '' },
-  })
+const props = defineProps({
+  showView: { type: String, default: '' },
+})
 
-  // 退出登录
-  const logout = async () => {
-    await store.dispatch('user/logout')
-    window.sessionStorage.setItem('visits', JSON.stringify([]))
-    // 西海岸不返回登录页
-    if (!itShowXiHaiAn.value) {
-      if (recordRoute) {
-        const fullPath = route.fullPath
-        router.push(`/login?redirect=${fullPath}`)
-      } else {
-        router.push('/login')
-      }
+// 退出登录
+const logout = async () => {
+  await store.dispatch('user/logout')
+  window.sessionStorage.setItem('visits', JSON.stringify([]))
+  // 西海岸不返回登录页
+  if (!itShowXiHaiAn.value) {
+    if (recordRoute) {
+      const fullPath = route.fullPath
+      router.push(`/login?redirect=${fullPath}`)
+    } else {
+      router.push('/login')
     }
   }
-  // 返回首页
-  const goToHome = () => {
-    router.push({
-      path: '/home',
+}
+// 返回首页
+const goToHome = () => {
+  // 西海岸
+  if (itShowXiHaiAn.value) {
+    if (
+      !xhaHasPermissionUser.list.includes(user.value.username)
+    ) {
+      return message.warn('暂无权限')
+    }
+  }
+  router.push({
+    path: '/home',
+  })
+}
+// 跳转页面
+const jumpPage = (item) => {
+  // 西海岸
+  if (itShowXiHaiAn.value) {
+    let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+    if (
+      _arr.includes(item.name) &&
+      !xhaHasPermissionUser.list.includes(user.value.username)
+    ) {
+      return message.warn('暂无权限')
+    }
+  }
+  select.value = item.key
+  switch (item.name) {
+    case '个人中心':
+      window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+      router.push({
+        path: '/personalCenter',
+      })
+      break
+    case '能力统计':
+      router.push({
+        path: '/abilityStatistics',
+      })
+      break
+    case '能力集市':
+      router.push({
+        path: '/DetailsPageconetent',
+        query: {
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+        },
+      })
+      break
+    case '能力云图':
+      router.push({
+        path: '/capabilityCloud',
+      })
+      break
+    // case '技术文档':
+    //   router.push({
+    //     path: '/developmentGuide',
+    //   })
+    //   break
+    case '新手指南':
+      router.push({
+        path: '/instructionManual',
+      })
+      break
+    case '需求中心':
+      router.push({
+        path: '/demandCenter',
+      })
+      break
+    case '区市站点':
+      router.push({
+        path: '/mapTest',
+      })
+      break
+    case '后台管理':
+      Cookies.remove('JSESSIONID')
+      window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+      // window.reload('http://15.2.21.238:9797')
+      break
+    case '赋能案例':
+      router.push({
+        path: '/assignCase',
+      })
+      break
+    case '典型赋能案例':
+      router.push({
+        path: '/assignCase',
+      })
+      break
+    case '融合服务':
+      router.push({
+        path: '/integrationServices',
+      })
+      break
+    case 'CIM专区':
+      router.push({
+        path: '/cimSpecialArea',
+      })
+      break
+    default:
+      router.push('/home')
+      break
+  }
+}
+const scrollTop = ref(0)
+window.onscroll = function () {
+  //为了保证兼容性，这里取两个值，哪个有值取哪一个
+  //scrollTop就是触发滚轮事件时滚轮的高度
+  scrollTop.value =
+    document.documentElement.scrollTop || document.body.scrollTop
+  // console.log('滚动距离' + scrollTop.value)
+}
+mybus.on('getSgcNum', () => {
+  getSgcTotal().then((res) => {
+    sgcNum.value = res.data.data.count
+    // console.log('申购车总数========================>', res.data.data.count)
+  })
+})
+
+const sgcNum = ref(0)
+const goToSgc = () => {
+  window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+  router.push('/personalCenter')
+}
+const mynoticeNum = ref(0)
+// 我的消息
+const getMynotice = () => {
+  mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
+    // console.log('我的消息', res.data.data)
+    mynoticeNum.value = res.data.data.total
+    mynoticeData.value = res.data.data.list
+  })
+}
+const goToView = () => {
+  router.push({
+    path: '/mynoticeView',
+  })
+}
+// const read = (item) => {
+//   mynoticeRead(item.id).then((res) => {
+//     console.log('已读', res)
+//     getMynotice()
+//   })
+// }
+// 建立链接 -- 携带cookie参数
+
+onMounted(() => {
+  getSgcTotal().then((res) => {
+    // console.log('初始化========================>', res.data.data.count)
+    sgcNum.value = res.data.data.count
+  })
+  getMynotice()
+  // 解决
+  const mynoticeDom = document.querySelector('.icon2')
+  const mynotice = document.querySelector('.mynotice')
+  if (mynoticeDom) {
+    mynoticeDom.addEventListener('mouseover', () => {
+      mynoticeFlag.value = true
+    })
+    mynoticeDom.addEventListener('mouseout', () => {
+      mynoticeFlag.value = false
     })
   }
-  // 跳转页面
-  const jumpPage = (item) => {
-    // 西海岸
-    if (itShowXiHaiAn.value) {
-      let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-      if (
-        _arr.includes(item.name) &&
-        !xhaHasPermissionUser.list.includes(user.value.username)
-      ) {
-        return message.warn('暂无权限')
-      }
-    }
-    select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
-        })
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
-      case '新手指南':
-        router.push({
-          path: '/instructionManual',
-        })
-        break
-      case '需求中心':
-        router.push({
-          path: '/demandCenter',
-        })
-        break
-      case '区市站点':
-        router.push({
-          path: '/mapTest',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '典型赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-  }
-  const scrollTop = ref(0)
-  window.onscroll = function () {
-    //为了保证兼容性，这里取两个值，哪个有值取哪一个
-    //scrollTop就是触发滚轮事件时滚轮的高度
-    scrollTop.value =
-      document.documentElement.scrollTop || document.body.scrollTop
-    // console.log('滚动距离' + scrollTop.value)
+  if (mynotice) {
+    mynotice.addEventListener('mouseover', () => {
+      mynoticeFlag.value = true
+    })
+    mynotice.addEventListener('mouseout', () => {
+      mynoticeFlag.value = false
+    })
   }
   mybus.on('getSgcNum', () => {
     getSgcTotal().then((res) => {
@@ -286,329 +317,268 @@
       // console.log('申购车总数========================>', res.data.data.count)
     })
   })
-
-  const sgcNum = ref(0)
-  const goToSgc = () => {
-    window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-    router.push('/personalCenter')
-  }
-  const mynoticeNum = ref(0)
-  // 我的消息
-  const getMynotice = () => {
-    mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
-      // console.log('我的消息', res.data.data)
-      mynoticeNum.value = res.data.data.total
-      mynoticeData.value = res.data.data.list
-    })
-  }
-  const goToView = () => {
-    router.push({
-      path: '/mynoticeView',
-    })
-  }
-  // const read = (item) => {
-  //   mynoticeRead(item.id).then((res) => {
-  //     console.log('已读', res)
-  //     getMynotice()
-  //   })
-  // }
-  // 建立链接 -- 携带cookie参数
-
-  onMounted(() => {
-    getSgcTotal().then((res) => {
-      // console.log('初始化========================>', res.data.data.count)
-      sgcNum.value = res.data.data.count
-    })
+  mybus.on('getMynotice', () => {
     getMynotice()
-    // 解决
-    const mynoticeDom = document.querySelector('.icon2')
-    const mynotice = document.querySelector('.mynotice')
-    if (mynoticeDom) {
-      mynoticeDom.addEventListener('mouseover', () => {
-        mynoticeFlag.value = true
-      })
-      mynoticeDom.addEventListener('mouseout', () => {
-        mynoticeFlag.value = false
-      })
-    }
-    if (mynotice) {
-      mynotice.addEventListener('mouseover', () => {
-        mynoticeFlag.value = true
-      })
-      mynotice.addEventListener('mouseout', () => {
-        mynoticeFlag.value = false
-      })
-    }
-    mybus.on('getSgcNum', () => {
-      getSgcTotal().then((res) => {
-        sgcNum.value = res.data.data.count
-        // console.log('申购车总数========================>', res.data.data.count)
-      })
-    })
-    mybus.on('getMynotice', () => {
-      getMynotice()
-    })
-  })
-  onBeforeUnmount(() => {
-    mybus.off('getSgcNum')
-    mybus.off('getMynotice')
   })
+})
+onBeforeUnmount(() => {
+  mybus.off('getSgcNum')
+  mybus.off('getMynotice')
+})
 </script>
 <style lang="less" scoped>
-  @font-face {
-    font-family: 'header-typeface';
-    src: url('~@/assets/newHome/font/header-typeface.ttf');
+@font-face {
+  font-family: 'header-typeface';
+  src: url('~@/assets/newHome/font/header-typeface.ttf');
+}
+
+.home-header {
+  height: 0.64rem;
+  width: 100%;
+  max-width: 1920px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  // padding: 0 1rem;
+  background-color: rgba(0, 0, 25, 0.7);
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+
+  div {
+    color: #fff;
+    font-size: 0.16rem;
   }
 
-  .home-header {
+  .name {
+    cursor: pointer;
+    font-size: 0.22rem;
+    font-family: header-typeface;
+    margin-right: 0.2rem;
+    display: flex;
+    align-items: center;
+
+    .name-bg {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/ucs-2.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
+    }
+
+    .name-bg-xihaian {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/newHome-title-bg-xihaian.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
+    }
+
+    .name-content {
+      padding-top: 0.14rem;
+
+      p {
+        font-size: 0.2rem;
+        margin-bottom: 0;
+
+        &:nth-of-type(2) {
+          font-size: 0.12rem;
+        }
+      }
+    }
+  }
+
+  .nav {
+    width: 1.2rem;
     height: 0.64rem;
-    width: 100%;
-    max-width: 1920px;
+    line-height: 0.64rem;
+    text-align: center;
+  }
+
+  .nav:hover {
+    background: #0058e1;
+    color: #fff;
+    cursor: pointer;
+  }
+
+  .select {
+    background: #0058e1;
+    color: #fff !important;
+  }
+
+  .info {
+    // width: 2rem;
+    margin-left: 0.2rem;
     display: flex;
     justify-content: center;
-    align-items: center;
-    // padding: 0 1rem;
-    background-color: rgba(0, 0, 25, 0.7);
-    position: fixed;
-    z-index: 1000;
-    top: 0;
 
-    div {
-      color: #fff;
+    .img {
+      width: 0.3rem;
+      height: 0.3rem;
+      border-radius: 0.1rem;
+      background: url('~@/assets/newHome/user.png') no-repeat;
+      background-size: 100%;
+    }
+
+    span {
+      height: 0.3rem;
+      line-height: 0.3rem;
+      margin-left: 0.08rem;
+      margin-right: 0.06rem;
       font-size: 0.16rem;
     }
 
     .name {
+      max-width: 2.3rem;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      word-break: break-all;
+    }
+
+    .out {
       cursor: pointer;
-      font-size: 0.22rem;
-      font-family: header-typeface;
-      margin-right: 0.2rem;
-      display: flex;
-      align-items: center;
-
-      .name-bg {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/ucs-2.png') no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      .name-bg-xihaian {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
-          no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      .name-content {
-        padding-top: 0.14rem;
-
-        p {
-          font-size: 0.2rem;
-          margin-bottom: 0;
-
-          &:nth-of-type(2) {
-            font-size: 0.12rem;
-          }
-        }
-      }
-    }
-
-    .nav {
-      width: 1.2rem;
-      height: 0.64rem;
-      line-height: 0.64rem;
-      text-align: center;
-    }
-
-    .nav:hover {
-      background: #0058e1;
-      color: #fff;
-      cursor: pointer;
-    }
-
-    .select {
-      background: #0058e1;
-      color: #fff !important;
-    }
-
-    .info {
-      // width: 2rem;
-      margin-left: 0.2rem;
-      display: flex;
-      justify-content: center;
-
-      .img {
-        width: 0.3rem;
-        height: 0.3rem;
-        border-radius: 0.1rem;
-        background: url('~@/assets/newHome/user.png') no-repeat;
-        background-size: 100%;
-      }
-
-      span {
-        height: 0.3rem;
-        line-height: 0.3rem;
-        margin-left: 0.08rem;
-        margin-right: 0.06rem;
-        font-size: 0.16rem;
-      }
-
-      .name {
-        max-width: 2.3rem;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        overflow: hidden;
-        word-break: break-all;
-      }
-
-      .out {
-        cursor: pointer;
-        // padding: 0 0.16rem;
-        padding: 0 0.04rem 0 0.1rem;
-        border-left: 0.01rem solid #666;
-      }
-
-      .icon {
-        cursor: pointer;
-      }
-    }
-  }
-
-  .white {
-    background-color: #fff;
-    box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
-
-    .name {
-      color: #0058e1;
-
-      .name-bg {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/ucs-1.png') no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      p {
-        color: #0058e1;
-      }
+      // padding: 0 0.16rem;
+      padding: 0 0.04rem 0 0.1rem;
+      border-left: 0.01rem solid #666;
     }
 
     .icon {
       cursor: pointer;
     }
-
-    .nav {
-      color: #000;
-    }
-
-    .info {
-      span {
-        color: #000;
-      }
-    }
   }
+}
 
-  .blue {
-    position: absolute;
-    background: linear-gradient(
-      to right,
-      rgba(15, 90, 253, 0.8),
-      rgba(36, 25, 248, 0.8)
-    );
+.white {
+  background-color: #fff;
+  box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
 
-    .name {
-      color: #fff;
+  .name {
+    color: #0058e1;
+
+    .name-bg {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/ucs-1.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
     }
 
-    .nav {
-      color: #fff;
-    }
-
-    .nav:hover {
-      background: #fff;
+    p {
       color: #0058e1;
     }
-
-    .info {
-      span {
-        color: #fff;
-      }
-    }
   }
 
-  .mynotice {
-    width: 4rem;
-    height: 3rem;
-    background: #eee;
-    border-radius: 0.05rem;
-    position: absolute;
-    top: 0.45rem;
-    right: 2.4rem;
-    overflow-y: scroll;
-
-    .bottom {
-      cursor: pointer;
-      width: 100%;
-      text-align: center;
-      color: #000;
-      font-size: 0.16rem;
-    }
-  }
-
-  .mynotice::-webkit-scrollbar {
-    display: none;
-  }
-
-  :deep(.ant-list-item) {
-    border-bottom: 0.01rem solid #ccc;
-    padding: 0.1rem;
-  }
-
-  :deep(.ant-list-item-meta-title) {
-    // display: flex;
-    // justify-content: space-around;
-    // align-items: center;
-    // padding: 0 0.05rem;
-    a {
-      width: 3.8rem;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      word-break: break-all;
-      -webkit-box-orient: vertical;
-    }
-
-    button {
-      width: 0.7rem;
-      height: 0.25rem;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      span {
-        font-size: 0.1rem;
-      }
-    }
-  }
-
-  .iconTo {
-    display: block;
-    width: 0.35rem;
-    height: 0.35rem;
-    background: url('~@/assets/newHome/iconTo.png') no-repeat;
+  .icon {
     cursor: pointer;
   }
+
+  .nav {
+    color: #000;
+  }
+
+  .info {
+    span {
+      color: #000;
+    }
+  }
+}
+
+.blue {
+  position: absolute;
+  background: linear-gradient(to right,
+      rgba(15, 90, 253, 0.8),
+      rgba(36, 25, 248, 0.8));
+
+  .name {
+    color: #fff;
+  }
+
+  .nav {
+    color: #fff;
+  }
+
+  .nav:hover {
+    background: #fff;
+    color: #0058e1;
+  }
+
+  .info {
+    span {
+      color: #fff;
+    }
+  }
+}
+
+.mynotice {
+  width: 4rem;
+  height: 3rem;
+  background: #eee;
+  border-radius: 0.05rem;
+  position: absolute;
+  top: 0.45rem;
+  right: 2.4rem;
+  overflow-y: scroll;
+
+  .bottom {
+    cursor: pointer;
+    width: 100%;
+    text-align: center;
+    color: #000;
+    font-size: 0.16rem;
+  }
+}
+
+.mynotice::-webkit-scrollbar {
+  display: none;
+}
+
+:deep(.ant-list-item) {
+  border-bottom: 0.01rem solid #ccc;
+  padding: 0.1rem;
+}
+
+:deep(.ant-list-item-meta-title) {
+
+  // display: flex;
+  // justify-content: space-around;
+  // align-items: center;
+  // padding: 0 0.05rem;
+  a {
+    width: 3.8rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+  }
+
+  button {
+    width: 0.7rem;
+    height: 0.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    span {
+      font-size: 0.1rem;
+    }
+  }
+}
+
+.iconTo {
+  display: block;
+  width: 0.35rem;
+  height: 0.35rem;
+  background: url('~@/assets/newHome/iconTo.png') no-repeat;
+  cursor: pointer;
+}
 </style>
 <style>
-  html::-webkit-scrollbar {
-    display: none;
-  }
+html::-webkit-scrollbar {
+  display: none;
+}
 </style>

From c5fc29a498fac538aad71fd2a635f07403573f58 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 11:12:01 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=95=B0=EF=BC=9A=E9=87=91=E5=AD=97=E5=A1=94?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/abilityStatistics/components/ResourceAggregation.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index e0d3f8d4..ad7f1428 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -318,7 +318,7 @@
   //来源部门漏斗图
   const funnelPlot = (dataList) => {
     // 排序
-    let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
+    let arrCopy = ['1-5', '5-10', '10-15', '15-20', '20以上']
     // 真实数据
     dataList.sort((a, b) => {
       return Number(a.value) - Number(b.value)

From 05964a73e89d9fb0f2e3618f85fb67b98a72c368 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Tue, 18 Oct 2022 13:52:44 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E5=B7=B2=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue | 48 +++++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 53e5c2ee..eedf7caf 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -126,11 +126,17 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
+  <a-select placeholder="请选择归属部门"  v-model:value="deptName" :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search  option-filter-prop="children" :filterOption="filterOption" @change="deptIdChangeFunction">
+                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
+                      {{ item.name }}
+                    </a-select-option>
+    </a-select>
     <a-table
       :columns="columns"
       :data-source="xVideoList"
       bordered
       :pagination="{ defaultPageSize: 6 }"
+      style="margin-top:10px"
     >
       <template #bodyCell="{ column, text }">
         <!-- <template>
@@ -146,6 +152,7 @@
   import { message } from 'ant-design-vue'
   import { ref, defineProps } from 'vue'
   import mybus from '@/myplugins/mybus'
+  import { getDeptAll } from '@/api/user'
   const router = useRouter()
   const props = defineProps({
     dataList: { type: Array, default: null },
@@ -154,12 +161,19 @@
   let dataForm = ref([])
   const videoVisible = ref(false)
   const xVideoList = ref([])
-
+  const xVideoListAll = ref([])
+  const deptNameAll = ref([]) //所有部门名称
+  const deptFlage = ref(true) //判断是否存在默认部门名称
+  const deptName = ref(null)
   const columns = ref([
     {
       title: '摄像头名称',
       dataIndex: 'name',
     },
+     {
+      title: '归属部门',
+      dataIndex: 'managementUnitName',
+    }
   ])
   // eslint-disable-next-line vue/no-setup-props-destructure
   dataForm.value = props.dataList
@@ -189,14 +203,16 @@
   // 详情
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
-      let arr = JSON.parse(note1)
+      let arr = JSON.parse(note1);
       xVideoList.value = []
       arr.map((val) => {
         xVideoList.value.push({
           name: val.channelName || '',
           key: val.channelId,
+          managementUnitName:val.managementUnitName || '',
         })
       })
+      xVideoListAll.value = xVideoList.value;
       videoVisible.value = true
     } else {
       if (delFlag == 0) {
@@ -211,6 +227,27 @@
       }
     }
   }
+    //归属部门选中改变事件
+    const deptIdChangeFunction = (name) => {
+      //console.log('nnnndddd',name);
+      //console.log('过滤前xVideoList',xVideoList);
+      //通过name过滤xVideoList
+        xVideoList.value =  xVideoListAll.value.filter((item) => {
+        if (name && item.managementUnitName.indexOf(name) < 0) return false
+        return true
+      });
+    }
+    //获取所有的归属部门列表
+     const getDeptAllData = () =>{
+      getDeptAll().then((res) => {
+       deptNameAll.value = res.data.data
+        })
+    } 
+      getDeptAllData(); 
+    //select搜索过滤
+    const filterOption = (input, option) => {
+    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  }
 </script>
 
 <style scoped lang="less">
@@ -351,4 +388,11 @@
     display: flex;
     align-items: center;
   }
+  ::v-deep .ant-table-thead > tr > th {
+  //padding-left: px;
+  font-size: 18px;
+  font-weight: bold;
+  color:#000000 ;
+  //background: # !important;
+}
 </style>

From dd100d38677706395078dbb5d62f62e0b4c92c6f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 14:11:20 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=EF=BC=9A=E7=82=B9=E5=87=BB=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mynoticeView/components/NoticeList.vue    | 22 ++++++-------------
 .../personalCenter/components/asideMenu.vue   | 18 ++++++---------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 5b20b970..a129075a 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -262,35 +262,27 @@ const goPage = (item) => {
     }
   }
 }
-let isQingDao = whoShow.itShowQingDao;
 
 // 更改消息状态
 const read = (item) => {
   if (selectData.value.length === 0 && !item) {
-    message.error('未选择消息！')
-    return
+    return message.error('未选择消息！')
   }
   console.log(selectData.value)
   if (item) {
-    // 已读状态
+    // 已读状态,跳转页面
     if (item.readStatus === 1) {
-      if(isQingDao) {
-        goPage(item)
-      }
-      // 跳转页面
-      return
+      return goPage(item)
     }
     mynoticeRead(item.id).then((res) => {
       if (res.data.code == 0) {
         message.success('通知已读！')
         mybus.emit('getMynotice')
         init()
-        if (isQingDao) {
-          // 页面跳转
-          setTimeout(() => {
-            goPage(item)
-          }, 1000)
-        }
+        // 页面跳转
+        setTimeout(() => {
+          goPage(item)
+        }, 1500)
       } else {
         message.error('操作失败！')
       }
diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue
index 46aef41e..d6a6a822 100644
--- a/front/src/views/personalCenter/components/asideMenu.vue
+++ b/front/src/views/personalCenter/components/asideMenu.vue
@@ -85,19 +85,15 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      if (itShowXiHaiAn) {
-        handleClick(menuList[0])
+      if (type) {
+        console.log('type---------->', type)
+        let _obj = menuList.find(v => v.key == type)
+        handleClick(_obj)
       } else {
-        if (type) {
-          console.log('type---------->', type)
-          let _obj = menuList.find(v => v.key == type)
-          handleClick(_obj)
+        if (menuList[1]) {
+          handleClick(menuList[1])
         } else {
-          if (menuList[1]) {
-            handleClick(menuList[1])
-          }else {
-            handleClick(menuList[0])
-          }
+          handleClick(menuList[0])
         }
       }
     })

From 42af2e980b4b12c6171732ad9b1ca45c77a8e26e Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 14:11:52 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD-=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF-=E9=A2=84=E8=A7=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7c45e006..9a7bc57f 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -312,7 +312,7 @@
               <span>{{ statusText[record.status] || '' }}</span>
             </template>
             <template v-if="column.dataIndex === 'operation'">
-              <a @click="
+              <a :class="record.status != 1 ? 'disabled-text' : ''" @click="
                 openVideo(
                   record.channelCode ||
                     record.channelId ||
@@ -758,7 +758,8 @@ const openVideo = (id, item) => {
   rowClickData.value = item
   // 单个预览
   if (item && item.status != 1) {
-    return message.warning('当前设备离线, 不可预览！')
+    return
+    // return message.warning('当前设备离线, 不可预览！')
   }
   console.log('打开视频', id)
   const param = {
@@ -2367,4 +2368,13 @@ video::-webkit-media-controls {
   bottom: 30px;
   text-align: right;
 }
+
+.disabled-text {
+  cursor: not-allowed;
+  opacity: 0.5;
+  color: #666666;
+  &:hover {
+    color: #666666;
+  }
+}
 </style>

From 71041b60f259653f8da7baa93b27b0b1f08102aa Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Tue, 18 Oct 2022 15:10:01 +0800
Subject: [PATCH 19/29] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue                        | 10 +++++++++-
 .../views/modules/myAgent/CompetencyApplication.vue    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40f882b0..7a2f1d0e 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -37,6 +37,7 @@
 import http from '@/utils/request'
 import SubMenu from "./main-sidebar-sub-menu";
 import returnLocationStr from '@/utils/location';
+import bus from '@/views/bus.js'
 export default {
   data() {
     return {
@@ -49,12 +50,19 @@ export default {
   created() {
     this.getNum()
     //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    //更新我的待办得数量
+    bus.$off('updateTaskNum')
+    bus.$on('updateTaskNum', () => {
+      this.getNum()
+    })
   },
   methods: {
     getNum(){
-      http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
+    http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
     this.numObject=res.data
    let menuList= window.SITE_CONFIG["menuList"];
+   console.log('menuList====>',menuList);
+   console.log('this.numObject====>',this.numObject);
    for(var i=0;i<menuList.length;i++){
      let menu=menuList[i];
       if(menu.id=='1541261628388888578'){//我的待办
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 930ae3d4..8c8118c9 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -47,6 +47,13 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="申请人所属部门" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].unit)
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('process.system')"
           header-align="center"
@@ -161,7 +168,8 @@ export default {
   created () {
     bus.$off('competencyApplicationInit')
     bus.$on('competencyApplicationInit', () => {
-      this.getDataList()
+      this.getDataList();
+      bus.$emit('updateTaskNum')
     })
   }
 }

From 811e80a27ccab17351dff7ac8057f7e1df8430c8 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:14:50 +0800
Subject: [PATCH 20/29] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/mixins/view-module.js                |    1 -
 back/src/router/index.js                      |    2 +-
 back/src/views/main-sidebar.vue               |   99 +-
 .../views/modules/devtools/generator-menu.vue |   13 +-
 .../views/modules/sys/menu-add-or-update.vue  |    3 +-
 back/src/views/modules/sys/menu.vue           |    7 +
 front/src/store/modules/user.js               |    7 +
 front/src/views/home/apply.vue                | 1660 +++++++++--------
 8 files changed, 972 insertions(+), 820 deletions(-)

diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index 98b075fb..edd9378c 100644
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@@ -107,7 +107,6 @@ export default {
         } else {
           this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
         }
-
         console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
         if (this.dataList[0].type === '组件服务') {
           this.dataList.map(val => {
diff --git a/back/src/router/index.js b/back/src/router/index.js
index c386dc1b..08f69ea5 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
       Vue.prototype.$message.error(res.msg)
       return next({ name: 'login' })
     }
-    window.SITE_CONFIG.menuList = res.data
+    window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40f882b0..66f28d04 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
- * @LastEditors: kongjun qdkongjun@gmail.com
- * @LastEditTime: 2022-06-22 10:04:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-14 15:20:28
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -25,7 +25,7 @@
           :menu="menu"
         >
         <span>sdddd</span>
-     
+
         </sub-menu>
       </div>
       </el-menu>
@@ -35,63 +35,64 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location';
+import SubMenu from './main-sidebar-sub-menu'
+import returnLocationStr from '@/utils/location'
 export default {
-  data() {
+  data () {
     return {
-      numObject:{}
-    };
+      numObject: {}
+    }
   },
   components: {
-    SubMenu,
+    SubMenu
   },
-  created() {
+  created () {
     this.getNum()
-    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
   },
   methods: {
-    getNum(){
+    getNum () {
       http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-    this.numObject=res.data
-   let menuList= window.SITE_CONFIG["menuList"];
-   for(var i=0;i<menuList.length;i++){
-     let menu=menuList[i];
-      if(menu.id=='1541261628388888578'){//我的待办
-        let daibanNum=0
-      for(let j=0;j<menu.children.length;j++){
-        let children=menu.children[j]
-        if(children.id=="1541261780432408577"){//能力申请 v2
-           //西海岸 v2  市局v3
-          children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } if(children.id=="1559376285703081986"){//会议室审核
-        children.total=Number(this.numObject.meetingroom_book)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
-        children.total=Number(this.numObject.resourcemountapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
-        children.total=Number(this.numObject.abilitydemandapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
-        children.total=Number(this.numObject.resourcundercarriageapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
-        children.total=Number(this.numObject.comment_review)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
-        children.total=0
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } 
-      }
-      menu.total=daibanNum
+        this.numObject = res.data
+        const menuList = window.SITE_CONFIG.menuList
+        for (var i = 0; i < menuList.length; i++) {
+          const menu = menuList[i]
+          if (menu.id == '1541261628388888578') { // 我的待办
+            let daibanNum = 0
+            for (let j = 0; j < menu.children.length; j++) {
+              const children = menu.children[j]
+              if (children.id == '1541261780432408577') { // 能力申请 v2
+                // 西海岸 v2  市局v3
+                children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1559376285703081986') { // 会议室审核
+                children.total = Number(this.numObject.meetingroom_book)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545292602084827138') { // 能力资源上架
+                children.total = Number(this.numObject.resourcemountapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545312045695377410') { // 能力需求申请
+                children.total = Number(this.numObject.abilitydemandapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313018614521857') { // 能力需求下架
+                children.total = Number(this.numObject.resourcundercarriageapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313754106699777') { // 评论审核
+                children.total = Number(this.numObject.comment_review)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
+                children.total = 0
+                daibanNum = Number(daibanNum) + Number(children.total)
+              }
+            }
+            menu.total = daibanNum
+          }
+        }
+        this.$store.state.sidebarMenuList = menuList
+      })
     }
   }
-    this.$store.state.sidebarMenuList=menuList
-})
-  }
-}};
+}
 </script>
 <style scoped lang="scss">
 .aui-sidebar {
diff --git a/back/src/views/modules/devtools/generator-menu.vue b/back/src/views/modules/devtools/generator-menu.vue
index f940b8c5..c68eec82 100644
--- a/back/src/views/modules/devtools/generator-menu.vue
+++ b/back/src/views/modules/devtools/generator-menu.vue
@@ -81,7 +81,7 @@ export default {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
         this.iconList = getIconList()
         this.dataForm.parentName = this.$t('menu.parentNameDefault')
         this.getMenuList()
@@ -89,11 +89,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置1')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 上级菜单树, 设置默认值
@@ -114,11 +115,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$http['post']('/devtools/menu', this.dataForm).then(({ data: res }) => {
+        this.$http.post('/devtools/menu', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -133,7 +134,7 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
   }
 }
 </script>
@@ -174,4 +175,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue
index ed7ddd49..318254cb 100644
--- a/back/src/views/modules/sys/menu-add-or-update.vue
+++ b/back/src/views/modules/sys/menu-add-or-update.vue
@@ -123,11 +123,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置2')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 获取信息
diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue
index 4fe46da1..bbc70ae3 100644
--- a/back/src/views/modules/sys/menu.vue
+++ b/back/src/views/modules/sys/menu.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:30:23
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-17 14:54:26
+ * @Description: 告诉大家这是什么
+-->
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 949868d6..08e03603 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -15,6 +15,7 @@ const state = () => ({
   accessToken: getAccessToken(),
   username: '',
   realName: '',
+  deptName: '',
   userId: '',
   avatar: '',
   role: 0, // 用户管理员权限
@@ -26,6 +27,7 @@ const getters = {
   avatar: (state) => state.avatar,
   role: (state) => state.role,
   userId: (state) => state.userId,
+  deptName: (state) => state.deptName,
 }
 const mutations = {
   /**
@@ -64,6 +66,10 @@ const mutations = {
   setUserId(state, id) {
     state.userId = id
   },
+  // 设置用户单位
+  setDeptName(state, name) {
+    state.deptName = name
+  },
   /**
    * @author chuzhixin 1204505056@qq.com
    * @description 设置头像
@@ -136,6 +142,7 @@ const actions = {
     commit('setRealname', res.data.data.realName)
     commit('setRole', res.data.data.roleIdList.length)
     commit('setUserId', res.data.data.id)
+    commit('setDeptName', res.data.data.deptName)
     // TODO 获取用户信息，后续执行部分操作
     // let { username, avatar, roles, ability } = data
     // if (username && roles && Array.isArray(roles)) {
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 9a14cf73..1c1b8e18 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -8,36 +8,93 @@
         </div>
         <div class="form-container">
           <div v-if="applySuccess">
-            <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 flex-row-start">
-                <a-form-item label="申请标题" name="title" :rules="[{ required: true, message: '请输入申请标题' }]">
-                  <a-input placeholder="请输入能力申请标题" v-model:value="formName.title" />
+                <a-form-item
+                  label="申请标题"
+                  name="title"
+                  :rules="[{ required: true, message: '请输入申请标题' }]"
+                >
+                  <a-input
+                    placeholder="请输入能力申请标题"
+                    v-model:value="formName.title"
+                  />
                 </a-form-item>
                 <!-- 西海岸-摄像头-增加过期时间 -->
-                <a-form-item v-if="isCamera && isXiHaiAn" label="过期时间" name="expireDate"
-                  :rules="[{ required: true, message: '请选择过期时间' }]" style="margin-left: 22px">
-                  <a-select v-model:value="formName.expireDate" placeholder="请选择过期时间" style="width: 200px"
-                    :options="expireDateOptions"></a-select>
+                <a-form-item
+                  v-if="isCamera && isXiHaiAn"
+                  label="过期时间"
+                  name="expireDate"
+                  :rules="[{ required: true, message: '请选择过期时间' }]"
+                  style="margin-left: 22px"
+                >
+                  <a-select
+                    v-model:value="formName.expireDate"
+                    placeholder="请选择过期时间"
+                    style="width: 200px"
+                    :options="expireDateOptions"
+                  ></a-select>
                 </a-form-item>
               </div>
               <div class="base-info">
-                <a-form-item label="申请人信息" name="user" :rules="[{ required: true, message: '请输入申请人' }]">
-                  <a-input placeholder="请输入申请人" v-model:value="formName.user" disabled />
+                <a-form-item
+                  label="申请人信息"
+                  name="user"
+                  :rules="[{ required: true, message: '请输入申请人' }]"
+                >
+                  <a-input
+                    placeholder="请输入申请人"
+                    v-model:value="formName.user"
+                    disabled
+                  />
                 </a-form-item>
-                <a-form-item style="margin: 0 22px" label="电话" name="phone" :rules="[
-                  {
-                    required: true,
-                    pattern: /^1[3456789]\d{9}$/,
-                    message: '请输入正确的电话号码',
-                  },
-                ]">
-                  <a-input placeholder="请输入申请人电话" v-model:value="formName.phone" />
+                <a-form-item
+                  style="margin: 0 22px"
+                  label="电话"
+                  name="phone"
+                  :rules="[
+                    {
+                      required: true,
+                      pattern: /^1[3456789]\d{9}$/,
+                      message: '请输入正确的电话号码',
+                    },
+                  ]"
+                >
+                  <a-input
+                    placeholder="请输入申请人电话"
+                    v-model:value="formName.phone"
+                  />
                 </a-form-item>
-                <a-form-item label="单位" name="unit" :rules="[{ required: true, message: '请输入单位' }]">
-                  <a-input placeholder="请输入单位" v-model:value="formName.unit" disabled v-if="deptFlage" />
-                  <a-select v-else placeholder="请选择归属部门" v-model:value="formName.unit" @change="deptIdChangeFunction">
-                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
+                <a-form-item
+                  label="单位"
+                  name="unit"
+                  :rules="[{ required: true, message: '请输入单位' }]"
+                >
+                  <a-input
+                    placeholder="请输入单位"
+                    v-model:value="formName.unit"
+                    disabled
+                    v-if="deptFlage"
+                  />
+                  <a-select
+                    v-else
+                    placeholder="请选择归属部门"
+                    v-model:value="formName.unit"
+                    @change="deptIdChangeFunction"
+                  >
+                    <a-select-option
+                      v-for="(item, index) in deptNameAll"
+                      :key="`${index}-${item}`"
+                      :value="item.name"
+                    >
                       {{ item.name }}
                     </a-select-option>
                   </a-select>
@@ -45,29 +102,63 @@
               </div>
               <div class="base-info" v-if="flag">
                 <div style="margin-bottom: 24px">
-                  <a-form-item style="margin-bottom: 0" label="应用系统" name="applicationSystem"
-                    :rules="[{ required: true, message: '请选择应用系统' }]">
-                    <a-select v-model:value="formName.applicationSystem" show-search placeholder="请选择应用系统"
-                      style="width: 230px" :options="systemOptions" @focus="handleFocus" @blur="handleBlur"
-                      @change="systemHandleChange" @search="systemHandleSearch"></a-select>
+                  <a-form-item
+                    style="margin-bottom: 0"
+                    label="应用系统"
+                    name="applicationSystem"
+                    :rules="[{ required: true, message: '请选择应用系统' }]"
+                  >
+                    <a-select
+                      v-model:value="formName.applicationSystem"
+                      show-search
+                      placeholder="请选择应用系统"
+                      style="width: 230px"
+                      :options="systemOptions"
+                      @focus="handleFocus"
+                      @blur="handleBlur"
+                      @change="systemHandleChange"
+                      @search="systemHandleSearch"
+                    ></a-select>
                   </a-form-item>
-                  <span style="font-size: 12px; color: #666; padding-left: 106px">
+                  <span
+                    style="font-size: 12px; color: #666; padding-left: 106px"
+                  >
                     如选项没有系统请新增
                   </span>
                 </div>
-                <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
+                  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: '请输入需求依据' },
-                  { min: 50, message: '需求依据最少为50个字' },
-                ]">
-                  <a-textarea placeholder="请输入需求依据" v-model:value="formName.applicationBackground" :rows="4" />
+                <a-form-item
+                  label="需求依据"
+                  name="applicationBackground"
+                  :rules="[
+                    { required: true, message: '请输入需求依据' },
+                    { min: 50, message: '需求依据最少为50个字' },
+                  ]"
+                >
+                  <a-textarea
+                    placeholder="请输入需求依据"
+                    v-model:value="formName.applicationBackground"
+                    :rows="4"
+                  />
                 </a-form-item>
               </div>
 
@@ -75,9 +166,20 @@
               <div v-if="iskfq && isXiHaiAn">
                 <a-row style="margin-top: 0.4rem">
                   <a-col :span="24">
-                    <a-form-item name="attachment" label="附件上传" class="introduction" :rules="[{ required: true, message: '请上传附件' }]">
-                      <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
-                        :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
+                    <a-form-item
+                      name="attachment"
+                      label="附件上传"
+                      class="introduction"
+                      :rules="[{ required: true, message: '请上传附件' }]"
+                    >
+                      <a-upload
+                        :max-count="1"
+                        accept=".doc,.docx,pdf"
+                        v-model:file-list="fileList"
+                        :action="`${apiURL}/upload`"
+                        @remove="handleRemove"
+                        @change="roomUpload"
+                      >
                         <a-button>
                           <upload-outlined>选择上传附件</upload-outlined>
                         </a-button>
@@ -90,16 +192,31 @@
                 </a-row>
                 <a-row>
                   <a-col :span="24" style="margin-left: 106px">
-                    <a href="/static/download/感知资源申请表.doc" download="感知资源申请表">感知资源申请表模板下载</a>
+                    <a
+                      href="/static/download/感知资源申请表.doc"
+                      download="感知资源申请表"
+                    >
+                      感知资源申请表模板下载
+                    </a>
                   </a-col>
                 </a-row>
               </div>
 
               <div class="bottom-btn">
-                <a-button class="cancel-apply" type="primary" html-type="cancle" @click="resetFields()">
+                <a-button
+                  class="cancel-apply"
+                  type="primary"
+                  html-type="cancle"
+                  @click="resetFields()"
+                >
                   退出申请
                 </a-button>
-                <a-button class="confirm-apply" type="primary" html-type="submit" @click="processStartHandle()">
+                <a-button
+                  class="confirm-apply"
+                  type="primary"
+                  html-type="submit"
+                  @click="processStartHandle()"
+                >
                   提交申请
                 </a-button>
               </div>
@@ -117,249 +234,325 @@
   </div>
 </template>
 <script>
-import AbilityToApplyFor from './AbilityToApplyFor.vue'
-import HomeHeader from '@/views/home/components/header'
-import { reactive, ref, watch, onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import qs from 'qs'
-import { Upload } from 'ant-design-vue'
-import {
-  lastestPage,
-  tabilityapplication,
-  startOfBusinessKey,
-  updateInstanceId,
-  submitApply,
-  applyAllApplication,
-  getUser,
-  getUserInfo,
-  relaunch,
-  selectOne,
-} from '@/api/home'
-import { getDeptAll } from '@/api/user'
-import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
-import { sgcDel, getApplyForm } from '@/api/personalCenter'
-import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
-import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-import { getIntegrationDetail, soldierApply } from '@/api/home'
-import * as moment from 'moment'
+  import AbilityToApplyFor from './AbilityToApplyFor.vue'
+  import HomeHeader from '@/views/home/components/header'
+  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import qs from 'qs'
+  import { Upload } from 'ant-design-vue'
+  import {
+    lastestPage,
+    tabilityapplication,
+    startOfBusinessKey,
+    updateInstanceId,
+    submitApply,
+    applyAllApplication,
+    getUser,
+    getUserInfo,
+    relaunch,
+    selectOne,
+  } from '@/api/home'
+  import { getDeptAll } from '@/api/user'
+  import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
+  import mybus from '@/myplugins/mybus'
+  import { sgcDel, getApplyForm } from '@/api/personalCenter'
+  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  import { getIntegrationDetail, soldierApply } from '@/api/home'
+  import { useStore } from 'vuex'
+  import * as moment from 'moment'
 
-export default {
-  name: '',
-  props: {},
-  components: {
-    HomeHeader,
-    AbilityToApplyFor,
-  },
-  setup() {
-    const router = useRouter()
-    const disabled = ref(false)
-    const flag = ref(false)
-    const list = ref(JSON.parse(localStorage.getItem('applyList')))
-    const deptNameAll = ref([]) //所有部门名称
-    const deptFlage = ref(true) //判断是否存在默认部门名称
-    const applyAll = router.currentRoute.value.query.applyAll
-    // 融合服务id
-    const integrationServicesId =
-      router.currentRoute.value.query.integrationServicesId
-    // 融合服务详情
-    const integrationServicesItemInfo = ref(null)
-    const num = ref(0)
-    // 过期时间
-    const expireDateOptions = [
-      {
-        value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '30天',
-      },
-      {
-        value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '60天',
-      },
-      {
-        value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '90天',
-      },
-    ]
-    const apiURL = window.SITE_CONFIG.apiURL
+  export default {
+    name: '',
+    props: {},
+    components: {
+      HomeHeader,
+      AbilityToApplyFor,
+    },
+    setup() {
+      const router = useRouter()
+      const store = useStore()
+      const deptName = store.getters['user/deptName']
+      const disabled = ref(false)
+      const flag = ref(false)
+      const list = ref(JSON.parse(localStorage.getItem('applyList')))
+      const deptNameAll = ref([]) //所有部门名称
+      const deptFlage = ref(true) //判断是否存在默认部门名称
+      const applyAll = router.currentRoute.value.query.applyAll
+      // 融合服务id
+      const integrationServicesId =
+        router.currentRoute.value.query.integrationServicesId
+      // 融合服务详情
+      const integrationServicesItemInfo = ref(null)
+      const num = ref(0)
+      // 过期时间
+      const expireDateOptions = [
+        {
+          value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '30天',
+        },
+        {
+          value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '60天',
+        },
+        {
+          value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '90天',
+        },
+      ]
+      const apiURL = window.SITE_CONFIG.apiURL
 
-    if (!applyAll) {
-      list.value.map((item) => {
-        item.arr.map((val) => {
-          let obj = item.children
-            ? item.children.filter((type) => type.id == val.id)[0]
-            : val.type !== '应用资源'
-          if (obj) {
-            if (obj.type !== '应用资源') {
-              flag.value = true
+      if (!applyAll) {
+        list.value.map((item) => {
+          item.arr.map((val) => {
+            let obj = item.children
+              ? item.children.filter((type) => type.id == val.id)[0]
+              : val.type !== '应用资源'
+            if (obj) {
+              if (obj.type !== '应用资源') {
+                flag.value = true
+              }
             }
+          })
+          if (item.checkedList) {
+            console.log(item)
+            num.value += Number(item.checkedList.length)
           }
         })
-        if (item.checkedList) {
-          console.log(item)
-          num.value += Number(item.checkedList.length)
-        }
-      })
-    }
-    console.log('list', list.value)
-    const baseURL = window.SITE_CONFIG.apiURL
-    let record = ref('1')
-    const text = ref('')
-    // 西海岸-特殊处理
-    let wrjAndDbText = ['单兵设备', '无人机']
-    const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
-    // 西海岸-判断是否是基础设施-摄像头
-    const isCamera = ref(false)
-    // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
-    let note1 = JSON.parse(list.value[0] && list.value[0].arr && list.value[0].arr[0].note1 || "[]");
-    let iskfq = ref(note1.some(v => v.managementUnitName == '开发区公安局' || v.managementUnitName == '开发区公安分局'))
-    if (
-      list.value[0] &&
-      list.value[0].arr &&
-      list.value[0].arr[0] &&
-      list.value[0].arr[0].type == '基础设施'
-    ) {
-      isCamera.value = true
-    }
-    const formName = reactive({
-      title: applyAll
-        ? '全部应用资源申请'
-        : wrjAndDbText.includes(
-          list.value[0].arr &&
-          list.value[0].arr[0] &&
-          list.value[0].arr[0].type
+      }
+      console.log('list', list.value)
+      const baseURL = window.SITE_CONFIG.apiURL
+      let record = ref('1')
+      const text = ref('')
+      // 西海岸-特殊处理
+      let wrjAndDbText = ['单兵设备', '无人机']
+      const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
+      // 西海岸-判断是否是基础设施-摄像头
+      const isCamera = ref(false)
+      // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
+      let note1 = JSON.parse(
+        (list.value[0] && list.value[0].arr && list.value[0].arr[0].note1) ||
+          '[]'
+      )
+      let iskfq = ref(
+        note1.some(
+          (v) =>
+            v.managementUnitName == '开发区公安局' ||
+            v.managementUnitName == '开发区公安分局'
         )
+      )
+      if (
+        list.value[0] &&
+        list.value[0].arr &&
+        list.value[0].arr[0] &&
+        list.value[0].arr[0].type == '基础设施'
+      ) {
+        isCamera.value = true
+      }
+      const formName = reactive({
+        title: applyAll
+          ? '全部应用资源申请'
+          : wrjAndDbText.includes(
+              list.value[0].arr &&
+                list.value[0].arr[0] &&
+                list.value[0].arr[0].type
+            )
           ? list.value[0].arr[0].type + '申请'
           : list.value[0].children
-            ? '申请' +
+          ? '申请' +
             list.value[0].children
               .filter((val) => val.id == list.value[0].checkedList[0])[0]
               .resourceName.concat(
                 num.value > 1 ? '等' + num.value + '项能力' : ''
               )
-            : '申请' + list.value[0].arr[0].resourceName, // 标题
-      // applicationSystem: '', // 应用系统
-      applicationScene: [], // 应用领域
-      applicationBackground: '', // 应用背景
-      effectWish: '', // 期望效果
-      user: '',
-      userId: '',
-      phone: '',
-      unit: '',
-      deptId: '',
-      system: [],
-      enclosure: '', //附件
-      enclosureName: '', //附件
-    })
-    const dataList = ref([])
-    const id = router.currentRoute.value.query.id
-    const taskId = router.currentRoute.value.query.taskId
-    const businessKey = ref(router.currentRoute.value.query.id)
-    if (id) {
-      getApplyForm(id).then((res) => {
-        console.log('修改==============>', res.data.data)
-        formName.applicationSystem = res.data.data.applicationSystem || ''
-        formName.applicationScene = res.data.data.applicationScene || []
-        formName.applicationBackground =
-          res.data.data.applicationBackground || ''
-        formName.effectWish = res.data.data.effectWish || ''
-        formName.phone = res.data.data.phone || ''
-        formName.enclosure = res.data.data.enclosure || ''
-        formName.enclosureName = res.data.data.enclosureName || ''
-        if (res.data.data.enclosure) {
-          fileList.value.push({
-            name: res.data.data.enclosureName,
-            url: res.data.data.enclosure,
-          })
-        }
+          : '申请' + list.value[0].arr[0].resourceName, // 标题
+        // applicationSystem: '', // 应用系统
+        applicationScene: [], // 应用领域
+        applicationBackground: '', // 应用背景
+        effectWish: '', // 期望效果
+        user: '',
+        userId: '',
+        phone: '',
+        unit: '',
+        deptId: '',
+        system: [],
+        enclosure: '', //附件
+        enclosureName: '', //附件
       })
-    }
-    getUser().then((res) => {
-      formName.user = res.data.data.realName
-      formName.userId = res.data.data.id
-      getUserInfo(formName.userId).then((res) => {
-        if (res.data.data.mobile) {
-          formName.phone = res.data.data.mobile
-        }
-        formName.unit = res.data.data.deptName
-        if (!formName.unit) {
-          deptFlage.value = false
-          //调用查询所有部门名称的接口
-          getDeptAll().then((res) => {
-            deptNameAll.value = res.data.data
-          })
-        }
-      })
-    })
-    //归属部门选中改变事件
-    const deptIdChangeFunction = (name) => {
-      deptNameAll.value.map((item) => {
-        if (item.name == name) {
-          formName.deptId = item.id
-        }
-      })
-      console.log(formName)
-    }
-    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,
+      const dataList = ref([])
+      const id = router.currentRoute.value.query.id
+      const taskId = router.currentRoute.value.query.taskId
+      const businessKey = ref(router.currentRoute.value.query.id)
+      if (id) {
+        getApplyForm(id).then((res) => {
+          console.log('修改==============>', res.data.data)
+          formName.applicationSystem = res.data.data.applicationSystem || ''
+          formName.applicationScene = res.data.data.applicationScene || []
+          formName.applicationBackground =
+            res.data.data.applicationBackground || ''
+          formName.effectWish = res.data.data.effectWish || ''
+          formName.phone = res.data.data.phone || ''
+          formName.enclosure = res.data.data.enclosure || ''
+          formName.enclosureName = res.data.data.enclosureName || ''
+          if (res.data.data.enclosure) {
+            fileList.value.push({
+              name: res.data.data.enclosureName,
+              url: res.data.data.enclosure,
+            })
+          }
+        })
+      }
+      getUser().then((res) => {
+        formName.user = res.data.data.realName
+        formName.userId = res.data.data.id
+        getUserInfo(formName.userId).then((res) => {
+          if (res.data.data.mobile) {
+            formName.phone = res.data.data.mobile
+          }
+          formName.unit = res.data.data.deptName
+          if (!formName.unit) {
+            deptFlage.value = false
+            //调用查询所有部门名称的接口
+            getDeptAll().then((res) => {
+              deptNameAll.value = res.data.data
+            })
+          }
         })
       })
-    })
-    const formRef = ref()
-    const applySuccess = ref(true)
-    const dataForm = {
-      processDefinitionKey: 'abilityprocess',
-    }
-    const callbacks = {
-      startProcessSuccessCallback: null,
-      startProcessErrorCallback: null,
-      formSaveSuccessCallback: null,
-      formSaveErrorCallback: null,
-    }
-    const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
-    const formUrl = '/processForm/tabilityapplication'
-    //退出返回上一页
-    const resetFields = () => {
-      window.history.go(-1)
-    }
-
-    // 跳转到能力集市
-    const jumpToDetailsPageconetent = () => {
-      setTimeout(() => {
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
+      //归属部门选中改变事件
+      const deptIdChangeFunction = (name) => {
+        deptNameAll.value.map((item) => {
+          if (item.name == name) {
+            formName.deptId = item.id
+          }
         })
-      }, 1000)
-    }
+        console.log(formName)
+      }
+      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,
+          })
+        })
+      })
+      const formRef = ref()
+      const applySuccess = ref(true)
+      const dataForm = {
+        processDefinitionKey: 'abilityprocess',
+      }
+      const callbacks = {
+        startProcessSuccessCallback: null,
+        startProcessErrorCallback: null,
+        formSaveSuccessCallback: null,
+        formSaveErrorCallback: null,
+      }
+      const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
+      const formUrl = '/processForm/tabilityapplication'
+      //退出返回上一页
+      const resetFields = () => {
+        window.history.go(-1)
+      }
 
-    // 提交申请
-    let submitFlag = true
-    const processStartHandle = () => {
-      formRef.value.validate().then(() => {
-        if (submitFlag) {
-          submitFlag = false
-          if (!formUrl) {
-            return message.error('请设置保存表单的URL')
-          }
-          if (!formName) {
-            return message.error('请设置表单名称')
-          }
-          
-          if (id) {
-            endProcess({ instanceId: taskId }).then((end) => {
-              if (end.data.code == 0) {
+      // 跳转到能力集市
+      const jumpToDetailsPageconetent = () => {
+        setTimeout(() => {
+          router.push({
+            path: '/DetailsPageconetent',
+            query: {
+              select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+            },
+          })
+        }, 1000)
+      }
+
+      // 提交申请
+      let submitFlag = true
+      const processStartHandle = () => {
+        formRef.value.validate().then(() => {
+          if (submitFlag) {
+            submitFlag = false
+            if (!formUrl) {
+              return message.error('请设置保存表单的URL')
+            }
+            if (!formName) {
+              return message.error('请设置表单名称')
+            }
+
+            if (id) {
+              endProcess({ instanceId: taskId }).then((end) => {
+                if (end.data.code == 0) {
+                  let ids = []
+                  let falgNum = 0
+                  let sxt = true
+                  formName.system = []
+                  console.log('list==================', list.value)
+                  list.value.map((val) => {
+                    val.arr.map((item) => {
+                      if (item.type !== '基础设施') {
+                        falgNum++
+                      }
+                    })
+                  })
+                  list.value.map((val) => {
+                    val.arr.map((item) => {
+                      if (item.type !== '基础设施') {
+                        formName.system.push({
+                          resourceId: item.resourceId,
+                          resourceName: item.resourceName,
+                        })
+                        falgNum++
+                        console.log(item.id)
+                        if (item.id) {
+                          ids.push(item.id)
+                        }
+                      } else {
+                        infrastructureConfirm(item, falgNum, sxt)
+                      }
+                    })
+                  })
+                  if (formName.system.length !== 0) {
+                    if (formName.applicationSystem.length == 0) {
+                      formName.applicationSystem = ''
+                    }
+                    submitApply(formName).then((res) => {
+                      message.success('申请提交成功，请到消息中心查看！')
+                      console.log('能力申请================>', res)
+                      if (res.data.code == 0) {
+                        if (ids && ids.length > 0) {
+                          sgcDel({ ids: ids }).then((res) => {
+                            if (res.data.msg === 'success') {
+                              mybus.emit('getSgcNum')
+                              jumpToDetailsPageconetent()
+                            }
+                          })
+                        } else {
+                          // 融合服务
+                          if (integrationServicesId) {
+                            getIntegrationServicesDeatil(
+                              integrationServicesId
+                            ).then((res) => {
+                              updateIntegrationServiceAction()
+                            })
+                          }
+                          jumpToDetailsPageconetent()
+                        }
+                      } else {
+                        message.error('申请失败！')
+                      }
+                    })
+                  }
+                }
+              })
+            } else {
+              if (!applyAll) {
                 let ids = []
                 let falgNum = 0
                 let sxt = true
@@ -389,10 +582,20 @@ export default {
                     }
                   })
                 })
+                console.log('formName--ids-提交数据--------->', formName, ids)
                 if (formName.system.length !== 0) {
-                  if (formName.applicationSystem.length == 0) {
+                  if (
+                    formName.applicationSystem &&
+                    formName.applicationSystem.length == 0
+                  ) {
                     formName.applicationSystem = ''
                   }
+                  // 西海岸：单兵设备、无人机单独调取其他接口
+                  if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
+                    handleWrjApply(formName)
+                    return
+                  }
+
                   submitApply(formName).then((res) => {
                     message.success('申请提交成功，请到消息中心查看！')
                     console.log('能力申请================>', res)
@@ -420,529 +623,462 @@ export default {
                     }
                   })
                 }
-              }
-            })
-          } else {
-            if (!applyAll) {
-              let ids = []
-              let falgNum = 0
-              let sxt = true
-              formName.system = []
-              console.log('list==================', list.value)
-              list.value.map((val) => {
-                val.arr.map((item) => {
-                  if (item.type !== '基础设施') {
-                    falgNum++
-                  }
-                })
-              })
-              list.value.map((val) => {
-                val.arr.map((item) => {
-                  if (item.type !== '基础设施') {
-                    formName.system.push({
-                      resourceId: item.resourceId,
-                      resourceName: item.resourceName,
-                    })
-                    falgNum++
-                    console.log(item.id)
-                    if (item.id) {
-                      ids.push(item.id)
-                    }
-                  } else {
-                    infrastructureConfirm(item, falgNum, sxt)
-                  }
-                })
-              })
-              console.log('formName--ids-提交数据--------->', formName, ids)
-              if (formName.system.length !== 0) {
-                if (
-                  formName.applicationSystem &&
-                  formName.applicationSystem.length == 0
-                ) {
-                  formName.applicationSystem = ''
-                }
-                // 西海岸：单兵设备、无人机单独调取其他接口
-                if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
-                  handleWrjApply(formName)
-                  return
-                }
-
-                submitApply(formName).then((res) => {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  console.log('能力申请================>', res)
+              } else {
+                formName.applicationSystem = ''
+                applyAllApplication(formName).then((res) => {
                   if (res.data.code == 0) {
-                    if (ids && ids.length > 0) {
-                      sgcDel({ ids: ids }).then((res) => {
-                        if (res.data.msg === 'success') {
-                          mybus.emit('getSgcNum')
-                          jumpToDetailsPageconetent()
-                        }
-                      })
-                    } else {
-                      // 融合服务
-                      if (integrationServicesId) {
-                        getIntegrationServicesDeatil(
-                          integrationServicesId
-                        ).then((res) => {
-                          updateIntegrationServiceAction()
-                        })
-                      }
-                      jumpToDetailsPageconetent()
-                    }
+                    message.success('申请提交成功，请到消息中心查看！')
+                    jumpToDetailsPageconetent()
                   } else {
                     message.error('申请失败！')
                   }
                 })
               }
-            } else {
-              formName.applicationSystem = ''
-              applyAllApplication(formName).then((res) => {
-                if (res.data.code == 0) {
+            }
+          }
+        })
+      }
+
+      // 基础设施--数据下发
+      const infrastructureConfirm = (item, falgNum, sxt) => {
+        let obj = {}
+        Object.assign(obj, formName)
+        console.log('摄像头===============>', obj, item)
+        obj.system = []
+        if (item.note1 && typeof item.note1 == 'string') {
+          item.note1 = JSON.parse(item.note1)
+        }
+        item.note1 &&
+          item.note1.map((jcss) => {
+            if (!jcss) {
+              return
+            }
+            let _itemData = {
+              resourceId: (jcss.idtCameraChannel || '') + '',
+              resourceName: jcss.channelName,
+              cameraId: jcss.channelId, // 改接口后删除
+              channelCode: jcss.channelCode,
+              channelId: jcss.channelId,
+              channelName: jcss.channelName,
+              checkStatus: jcss.checkStatus + '',
+              gpsX: jcss.gpsX,
+              gpsY: jcss.gpsY,
+              idtCameraChannel: (jcss.idtCameraChannel || '') + '',
+              nodeName: jcss.nodeName,
+              parentId: jcss.parentId,
+              status: jcss.status + '',
+            }
+            // 西海岸
+            if (isXiHaiAn.value) {
+              _itemData.managementUnitName = jcss.managementUnitName
+              _itemData.cameraPointTypeName = jcss.cameraPointTypeName
+            }
+            obj.system.push(_itemData)
+          })
+        submitApply(obj).then((res) => {
+          // applySuccess.value = false
+          console.log('摄像头申请================>', res)
+          if (item.id) {
+            sgcDel({ ids: [item.id] }).then((res1) => {
+              if (res1.data.msg === 'success') {
+                if (falgNum == 0 && sxt) {
                   message.success('申请提交成功，请到消息中心查看！')
-                  jumpToDetailsPageconetent()
-                } else {
-                  message.error('申请失败！')
+                  sxt = false
                 }
-              })
-            }
-          }
-        }
-      })
-    }
-
-    // 基础设施--数据下发
-    const infrastructureConfirm = (item, falgNum, sxt) => {
-      let obj = {}
-      Object.assign(obj, formName)
-      console.log('摄像头===============>', obj, item)
-      obj.system = []
-      if (item.note1 && typeof item.note1 == 'string') {
-        item.note1 = JSON.parse(item.note1)
-      }
-      item.note1 &&
-        item.note1.map((jcss) => {
-          if (!jcss) {
-            return
-          }
-          let _itemData = {
-            resourceId: (jcss.idtCameraChannel || '') + '',
-            resourceName: jcss.channelName,
-            cameraId: jcss.channelId, // 改接口后删除
-            channelCode: jcss.channelCode,
-            channelId: jcss.channelId,
-            channelName: jcss.channelName,
-            checkStatus: jcss.checkStatus + '',
-            gpsX: jcss.gpsX,
-            gpsY: jcss.gpsY,
-            idtCameraChannel: (jcss.idtCameraChannel || '') + '',
-            nodeName: jcss.nodeName,
-            parentId: jcss.parentId,
-            status: jcss.status + '',
-          }
-          // 西海岸
-          if (isXiHaiAn.value) {
-            _itemData.managementUnitName = jcss.managementUnitName
-            _itemData.cameraPointTypeName = jcss.cameraPointTypeName
-          }
-          obj.system.push(_itemData)
-        })
-      submitApply(obj).then((res) => {
-        // applySuccess.value = false
-        console.log('摄像头申请================>', res)
-        if (item.id) {
-          sgcDel({ ids: [item.id] }).then((res1) => {
-            if (res1.data.msg === 'success') {
-              if (falgNum == 0 && sxt) {
-                message.success('申请提交成功，请到消息中心查看！')
-                sxt = false
+                mybus.emit('getSgcNum')
+                jumpToDetailsPageconetent()
               }
-              mybus.emit('getSgcNum')
-              jumpToDetailsPageconetent()
-            }
-          })
-        } else {
-          if (res.data.msg === 'success' && falgNum == 0 && sxt) {
-            message.success('申请提交成功，请到消息中心查看！')
-            sxt = false
-          }
-          jumpToDetailsPageconetent()
-        }
-      })
-    }
-
-    // 启动流程
-    const startProcess = (processDefinitionKey, businessKey, formData) => {
-      var data = {
-        processDefinitionKey: processDefinitionKey,
-        businessKey: businessKey,
-        variables: formData,
-      }
-      startOfBusinessKey(data)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            if (callbacks.startProcessErrorCallback) {
-              callbacks.startProcessErrorCallback(res.data)
-            }
-          }
-          message({
-            message: '操作成功',
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              if (callbacks.startProcessSuccessCallback) {
-                callbacks.startProcessSuccessCallback(res.data)
-              }
-            },
-          })
-          if (instanceIdUrl) {
-            var params = qs.stringify({
-              processInstanceId: res.data.processInstanceId,
-              processDefinitionKey: processDefinitionKey,
-              businessKey: businessKey,
             })
-            updateInstanceId(params).then(() => { })
-          }
-        })
-        .catch(() => { })
-    }
-    const options = ref([
-      {
-        value: '政法委',
-        label: '政法委',
-      },
-      {
-        value: '公安局',
-        label: '公安局',
-      },
-      {
-        value: '卫健委',
-        label: '卫健委',
-      },
-      {
-        value: '城市管理局',
-        label: '城市管理局',
-      },
-      {
-        value: '生态环境局',
-        label: '生态环境局',
-      },
-      {
-        value: '交通运输局',
-        label: '交通运输局',
-      },
-    ])
-    const systemOptions = ref([])
-    const systemOptions2 = ref([])
-    const fileList = ref([])
-    // 应用系统下拉
-    const systemHandleChange = (value) => {
-      console.log(`selected ${value}`)
-    }
-    const systemHandleSearch = (value) => {
-      let valueArray = []
-      systemOptions.value.map((val) => {
-        valueArray.push(val.value)
-      })
-      if (valueArray.indexOf(value) == -1) {
-        systemOptions.value.push({
-          value: value,
-          label: value,
-        })
-      }
-    }
-    pageWithAttrs({
-      pageNum: 1,
-      pageSize: 99999,
-      type: '应用资源',
-      name: '',
-      infoList: [],
-    }).then((res) => {
-      if (res.data.code == 0) {
-        if (res.data.data.records.length == 0) {
-          message.warning('该关键词，暂无应用资源！')
-        } else {
-          res.data.data.records.map((val) => {
-            systemOptions2.value.push({
-              value: val.name,
-              label: val.name,
-            })
-          })
-          // console.log('第一次获取===================>', systemOptions2.value)
-        }
-      } else {
-        message.error('应用系统获取数据失败!')
-      }
-    })
-    const handleBlur = () => {
-      console.log('blur')
-    }
-    const handleFocus = () => {
-      console.log('focus')
-      let arrId = []
-      for (var valueIndex of systemOptions2.value) {
-        if (arrId.indexOf(valueIndex['value']) == -1) {
-          arrId.push(valueIndex['value'])
-          systemOptions.value.push(valueIndex)
-        }
-      }
-    }
-
-    onBeforeUnmount(() => {
-      mybus.off('reomveOldData')
-    })
-
-    // 融合服务-更新
-    const updateIntegrationServiceAction = () => {
-      let _applyCount =
-        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
-      let _data = Object.assign({}, integrationServicesItemInfo.value, {
-        applyCount: _applyCount,
-      })
-      updateIntegrationServices(_data)
-        .then((res) => {
-          console.log('res---更新--------->', res)
-        })
-        .catch((err) => {
-          console.log('err----更新-------->', err)
-        })
-    }
-
-    // 融合服务--详情
-    const getIntegrationServicesDeatil = (id) => {
-      return new Promise((resolve, reject) => {
-        getIntegrationDetail(id).then(
-          (res) => {
-            resolve(res)
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            integrationServicesItemInfo.value = res.data.data || {}
-          },
-          (err) => {
-            reject(err)
-            message.error(err)
-          }
-        )
-      })
-    }
-
-    // 西海岸：单兵设备、无人机提交申请
-    const handleWrjApply = (formName) => {
-      let _data = {
-        deviceId:
-          formName.system &&
-          formName.system[0] &&
-          formName.system[0].resourceId,
-        deviceName:
-          formName.system &&
-          formName.system[0] &&
-          formName.system[0].resourceName,
-        title: formName.title,
-        name: formName.user,
-        phone: formName.phone,
-        dept: formName.unit, // 单位
-        applicationSystem: formName.applicationSystem, // 应用系统
-        applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
-        demand: formName.applicationBackground, // 需求依据
-      }
-      soldierApply(_data)
-        .then((res) => {
-          if (res.data.msg === 'success') {
-            message.success('申请提交成功，请到消息中心查看！')
-            setTimeout(() => {
-              router.push({
-                path: '/DetailsPageconetent',
-                query: {
-                  select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-                  // 基础设施类型
-                  facilitiesType: list.value[0] && list.value[0].arr && list.value[0].arr[0] && list.value[0].arr[0].type
-                },
-              })
-            }, 1000)
           } else {
-            message.error('申请失败！')
+            if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+              message.success('申请提交成功，请到消息中心查看！')
+              sxt = false
+            }
+            jumpToDetailsPageconetent()
           }
         })
-        .catch((err) => {
-          message.error(err)
-        })
-    }
-
-    //文件上传成功回调
-    const roomUpload = (response) => {
-      if (response.file.response !== undefined) {
-        fileList.value = response.fileList
-        formName.attachment = response.file.response.data
       }
-    }
 
-    return {
-      deptIdChangeFunction,
-      formRef,
-      formName,
-      deptNameAll,
-      instanceIdUrl,
-      formUrl,
-      processStartHandle,
-      resetFields,
-      startProcess,
-      options,
-      fileList,
-      list,
-      deptFlage,
-      headers: {
-        authorization: 'authorization-text',
-      },
-      // handleChange,
-      applySuccess,
-      disabled,
-      baseURL,
-      // beforeUpload,
-      dataList,
-      systemHandleChange,
-      systemHandleSearch,
-      handleBlur,
-      handleFocus,
-      systemOptions,
-      applicationSceneOpthion,
-      flag,
-      applyAll,
-      getIntegrationServicesDeatil,
-      isCamera,
-      isXiHaiAn,
-      expireDateOptions,
-      apiURL,
-      roomUpload,
-      iskfq,
-    }
-  },
-}
+      // 启动流程
+      const startProcess = (processDefinitionKey, businessKey, formData) => {
+        var data = {
+          processDefinitionKey: processDefinitionKey,
+          businessKey: businessKey,
+          variables: formData,
+        }
+        startOfBusinessKey(data)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              if (callbacks.startProcessErrorCallback) {
+                callbacks.startProcessErrorCallback(res.data)
+              }
+            }
+            message({
+              message: '操作成功',
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                if (callbacks.startProcessSuccessCallback) {
+                  callbacks.startProcessSuccessCallback(res.data)
+                }
+              },
+            })
+            if (instanceIdUrl) {
+              var params = qs.stringify({
+                processInstanceId: res.data.processInstanceId,
+                processDefinitionKey: processDefinitionKey,
+                businessKey: businessKey,
+              })
+              updateInstanceId(params).then(() => {})
+            }
+          })
+          .catch(() => {})
+      }
+      const options = ref([
+        {
+          value: '政法委',
+          label: '政法委',
+        },
+        {
+          value: '公安局',
+          label: '公安局',
+        },
+        {
+          value: '卫健委',
+          label: '卫健委',
+        },
+        {
+          value: '城市管理局',
+          label: '城市管理局',
+        },
+        {
+          value: '生态环境局',
+          label: '生态环境局',
+        },
+        {
+          value: '交通运输局',
+          label: '交通运输局',
+        },
+      ])
+      const systemOptions = ref([])
+      const systemOptions2 = ref([])
+      const fileList = ref([])
+      // 应用系统下拉
+      const systemHandleChange = (value) => {
+        console.log(`selected ${value}`)
+      }
+      const systemHandleSearch = (value) => {
+        let valueArray = []
+        systemOptions.value.map((val) => {
+          valueArray.push(val.value)
+        })
+        if (valueArray.indexOf(value) == -1) {
+          systemOptions.value.push({
+            value: value,
+            label: value,
+          })
+        }
+      }
+      pageWithAttrs({
+        pageNum: 1,
+        pageSize: 99999,
+        type: '应用资源',
+        name: '',
+        infoList: [],
+      }).then((res) => {
+        if (res.data.code == 0) {
+          if (res.data.data.records.length == 0) {
+            message.warning('该关键词，暂无应用资源！')
+          } else {
+            // 过滤本单位的应用系统
+            res.data.data.records.map((val) => {
+              if (val.deptName === deptName) {
+                systemOptions2.value.push({
+                  value: val.name,
+                  label: val.name,
+                })
+              }
+            })
+            // console.log('第一次获取===================>', systemOptions2.value)
+          }
+        } else {
+          message.error('应用系统获取数据失败!')
+        }
+      })
+      const handleBlur = () => {
+        console.log('blur')
+      }
+      const handleFocus = () => {
+        console.log('focus')
+        let arrId = []
+        for (var valueIndex of systemOptions2.value) {
+          if (arrId.indexOf(valueIndex['value']) == -1) {
+            arrId.push(valueIndex['value'])
+            systemOptions.value.push(valueIndex)
+          }
+        }
+      }
+
+      onBeforeUnmount(() => {
+        mybus.off('reomveOldData')
+      })
+
+      // 融合服务-更新
+      const updateIntegrationServiceAction = () => {
+        let _applyCount =
+          Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+        let _data = Object.assign({}, integrationServicesItemInfo.value, {
+          applyCount: _applyCount,
+        })
+        updateIntegrationServices(_data)
+          .then((res) => {
+            console.log('res---更新--------->', res)
+          })
+          .catch((err) => {
+            console.log('err----更新-------->', err)
+          })
+      }
+
+      // 融合服务--详情
+      const getIntegrationServicesDeatil = (id) => {
+        return new Promise((resolve, reject) => {
+          getIntegrationDetail(id).then(
+            (res) => {
+              resolve(res)
+              if (res.data.code !== 0) {
+                return message.error(res.data.msg)
+              }
+              integrationServicesItemInfo.value = res.data.data || {}
+            },
+            (err) => {
+              reject(err)
+              message.error(err)
+            }
+          )
+        })
+      }
+
+      // 西海岸：单兵设备、无人机提交申请
+      const handleWrjApply = (formName) => {
+        let _data = {
+          deviceId:
+            formName.system &&
+            formName.system[0] &&
+            formName.system[0].resourceId,
+          deviceName:
+            formName.system &&
+            formName.system[0] &&
+            formName.system[0].resourceName,
+          title: formName.title,
+          name: formName.user,
+          phone: formName.phone,
+          dept: formName.unit, // 单位
+          applicationSystem: formName.applicationSystem, // 应用系统
+          applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
+          demand: formName.applicationBackground, // 需求依据
+        }
+        soldierApply(_data)
+          .then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('申请提交成功，请到消息中心查看！')
+              setTimeout(() => {
+                router.push({
+                  path: '/DetailsPageconetent',
+                  query: {
+                    select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+                    // 基础设施类型
+                    facilitiesType:
+                      list.value[0] &&
+                      list.value[0].arr &&
+                      list.value[0].arr[0] &&
+                      list.value[0].arr[0].type,
+                  },
+                })
+              }, 1000)
+            } else {
+              message.error('申请失败！')
+            }
+          })
+          .catch((err) => {
+            message.error(err)
+          })
+      }
+
+      //文件上传成功回调
+      const roomUpload = (response) => {
+        if (response.file.response !== undefined) {
+          fileList.value = response.fileList
+          formName.attachment = response.file.response.data
+        }
+      }
+
+      return {
+        deptIdChangeFunction,
+        formRef,
+        formName,
+        deptNameAll,
+        instanceIdUrl,
+        formUrl,
+        processStartHandle,
+        resetFields,
+        startProcess,
+        options,
+        fileList,
+        list,
+        deptFlage,
+        headers: {
+          authorization: 'authorization-text',
+        },
+        // handleChange,
+        applySuccess,
+        disabled,
+        baseURL,
+        // beforeUpload,
+        dataList,
+        systemHandleChange,
+        systemHandleSearch,
+        handleBlur,
+        handleFocus,
+        systemOptions,
+        applicationSceneOpthion,
+        flag,
+        applyAll,
+        getIntegrationServicesDeatil,
+        isCamera,
+        isXiHaiAn,
+        expireDateOptions,
+        apiURL,
+        roomUpload,
+        iskfq,
+      }
+    },
+  }
 </script>
 <style scoped lang="less">
-#apply-container {
-  // background-color: #f5f8fc;
-  height: 100%;
-  width: 100%;
-  margin: 0.8rem auto 0;
-  display: flex;
-  justify-content: space-between;
-
-  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: 1% auto;
-  }
-
-  .form-container {
-    padding: 20px 20px 30px 20px;
-
-    .title {
-      font-size: 20px;
-      color: #000;
-      font-weight: bold;
-      margin-bottom: 20px;
-    }
-  }
-
-  .base-info {
+  #apply-container {
+    // background-color: #f5f8fc;
+    height: 100%;
+    width: 100%;
+    margin: 0.8rem auto 0;
     display: flex;
     justify-content: space-between;
-  }
 
-  .flex-row-start {
-    justify-content: flex-start;
-    align-items: center;
-  }
+    aside {
+      width: 282px;
+      height: 96%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% 0 3%;
+    }
 
-  :deep(.ant-form-item-label) {
-    label {
-      color: #666;
-      font-size: 16px;
+    article {
+      width: 1090px;
+      height: 99%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% auto;
+    }
 
-      &::after {
-        content: '';
+    .form-container {
+      padding: 20px 20px 30px 20px;
+
+      .title {
+        font-size: 20px;
+        color: #000;
+        font-weight: bold;
+        margin-bottom: 20px;
       }
     }
-  }
 
-  :deep(.ant-form-item-required) {
-    &::before {
-      font-size: 8px;
-      margin-right: 10px;
+    .base-info {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .flex-row-start {
+      justify-content: flex-start;
+      align-items: center;
+    }
+
+    :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;
     }
   }
 
-  :deep(.ant-input) {
-    border: 1px solid #e0e0e0;
+  .applicationScene {
+    :deep(.ant-select-selector) {
+      overflow-x: scroll;
+    }
+
+    :deep(.ant-select-selection-overflow) {
+      flex-wrap: nowrap;
+    }
+  }
+
+  textarea {
+    resize: none;
+    font-size: 14px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    justify-content: center;
+    // position: fixed;
+  }
+
+  .cancel-apply {
+    width: 80px;
+    height: 38px;
+    margin-right: 20px;
+    background: #e1edfa;
+    color: #0087ff;
+    font-size: 14px;
     border-radius: 6px;
-  }
-
-  .success {
-    div {
-      width: 100px;
-      margin: 80px auto 40px;
-    }
-
+    border: none;
+    padding: 0;
     text-align: center;
-    font-size: 20px;
-    font-weight: bold;
-    color: #000;
-  }
-}
-
-.applicationScene {
-  :deep(.ant-select-selector) {
-    overflow-x: scroll;
   }
 
-  :deep(.ant-select-selection-overflow) {
-    flex-wrap: nowrap;
+  .confirm-apply {
+    width: 80px;
+    height: 38px;
+    background: #0087ff;
+    color: #fff;
+    font-size: 14px;
+    border-radius: 6px;
+    border: none;
+    padding: 0;
+    text-align: center;
   }
-}
-
-textarea {
-  resize: none;
-  font-size: 14px;
-}
-
-.bottom-btn {
-  display: flex;
-  justify-content: center;
-  // position: fixed;
-}
-
-.cancel-apply {
-  width: 80px;
-  height: 38px;
-  margin-right: 20px;
-  background: #e1edfa;
-  color: #0087ff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
-
-.confirm-apply {
-  width: 80px;
-  height: 38px;
-  background: #0087ff;
-  color: #fff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
 </style>

From e96c0c11b1f771813ee7c129605a6539c768ee11 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:23:33 +0800
Subject: [PATCH 21/29] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 87 +++++++++++++++++----------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index b11a8017..62dc4831 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:15:37
+ * @LastEditTime: 2022-10-18 15:22:45
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -35,8 +35,8 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location';
+import SubMenu from './main-sidebar-sub-menu'
+import returnLocationStr from '@/utils/location'
 import bus from '@/views/bus.js'
 export default {
   data () {
@@ -49,51 +49,54 @@ export default {
   },
   created () {
     this.getNum()
-    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
-    //更新我的待办得数量
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {
       this.getNum()
     })
   },
   methods: {
-    getNum(){
-    http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-    this.numObject=res.data
-   let menuList= window.SITE_CONFIG["menuList"];
-   console.log('menuList====>',menuList);
-   console.log('this.numObject====>',this.numObject);
-   for(var i=0;i<menuList.length;i++){
-     let menu=menuList[i];
-      if(menu.id=='1541261628388888578'){//我的待办
-        let daibanNum=0
-      for(let j=0;j<menu.children.length;j++){
-        let children=menu.children[j]
-        if(children.id=="1541261780432408577"){//能力申请 v2
-           //西海岸 v2  市局v3
-          children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } if(children.id=="1559376285703081986"){//会议室审核
-        children.total=Number(this.numObject.meetingroom_book)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
-        children.total=Number(this.numObject.resourcemountapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
-        children.total=Number(this.numObject.abilitydemandapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
-        children.total=Number(this.numObject.resourcundercarriageapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
-        children.total=Number(this.numObject.comment_review)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
-        children.total=0
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } 
-      }
-      menu.total=daibanNum
+    getNum () {
+      http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
+        this.numObject = res.data
+        const menuList = window.SITE_CONFIG.menuList
+        console.log('menuList====>', menuList)
+        console.log('this.numObject====>', this.numObject)
+        for (var i = 0; i < menuList.length; i++) {
+          const menu = menuList[i]
+          if (menu.id == '1541261628388888578') { // 我的待办
+            let daibanNum = 0
+            for (let j = 0; j < menu.children.length; j++) {
+              const children = menu.children[j]
+              if (children.id == '1541261780432408577') { // 能力申请 v2
+                // 西海岸 v2  市局v3
+                children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1559376285703081986') { // 会议室审核
+                children.total = Number(this.numObject.meetingroom_book)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545292602084827138') { // 能力资源上架
+                children.total = Number(this.numObject.resourcemountapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545312045695377410') { // 能力需求申请
+                children.total = Number(this.numObject.abilitydemandapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313018614521857') { // 能力需求下架
+                children.total = Number(this.numObject.resourcundercarriageapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313754106699777') { // 评论审核
+                children.total = Number(this.numObject.comment_review)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
+                children.total = 0
+                daibanNum = Number(daibanNum) + Number(children.total)
+              }
+            }
+            menu.total = daibanNum
+          }
+        }
+      })
     }
   }
 }

From b13577d4b44f70a1f3ec5a0d5d116c988ddf94a3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:34:46 +0800
Subject: [PATCH 22/29] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 62dc4831..9c881026 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:22:45
+ * @LastEditTime: 2022-10-18 15:34:00
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {

From a139bd809b44d966de6d88ea6fc1e982bb07f21b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:35:14 +0800
Subject: [PATCH 23/29] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 9c881026..40867a8d 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>
+</template>\
 
 <script>
 import http from '@/utils/request'

From c41028ffaa74ff6d23260038b47442e4c211e31a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 15:42:53 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 82 +++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 75686078..b6041468 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -94,6 +94,11 @@
             $t('reset')
           }}</el-button>
         </el-form-item>
+        <!-- 导出 -->
+        <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出</a>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="exportExcel()">导出</el-button>
+        </el-form-item> -->
       </el-form>
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
@@ -273,11 +278,12 @@
 
 </template>
 <script>
+import Cookies from 'js-cookie'
 import componentServices from './componentServices.vue'
 import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
-
+import qs from 'qs'
 import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
@@ -291,6 +297,10 @@ export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
+      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
+      exportExcelCondition: '',
+      exportExcelType: '',
+      token: Cookies.get('ucsToken'),
       detailType: '',
       detailParamss: {},
       isBack: true,
@@ -374,7 +384,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ],
       tableData: [],
       tableData2: [
@@ -399,7 +409,7 @@ export default {
         { name: '通用开发组件', value: 3 },
         { name: '页面开发组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
@@ -482,7 +492,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -530,6 +540,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
@@ -588,6 +604,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 点击查看详情
@@ -641,7 +663,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }  else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -662,6 +684,12 @@ export default {
           console.log('111111', this.tableData, res.data.data)
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 能力使用明细
@@ -693,6 +721,12 @@ export default {
         .then((res) => {
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     getReleaseTree (page) {
@@ -799,6 +833,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectDeptDetailTypeCountList'
           this.getFirstTree()
         } else if (this.choseId === 1) {
           // this.getReleaseTree()
@@ -808,6 +843,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
           // this.getUsedTree()
@@ -815,6 +851,7 @@ export default {
       } else if (index === 3) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
           // this.getUsedTree()
@@ -822,6 +859,7 @@ export default {
       } else if (index === 4) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusApplyTable'
           this.getTwoDetail()
         } else {
           // this.getUsedTree()
@@ -911,6 +949,13 @@ export default {
       this.examineStatus = ''
       this.abilityDepartment = ''
       this.abilityType = ''
+      this.approveStatus = ''
+      this.exportExcelCondition = qs.stringify({
+        approveStatus: this.status,
+        deptId: this.abilityDepartment,
+        startDate: this.startDate,
+        endDate: this.endDate
+      })
       if (this.departmentId === 1) {
         // if (this.detailFlag) {
         //   this.handleChose(3)
@@ -1100,4 +1145,31 @@ input::placeholder {
   text-overflow: ellipsis;
   word-break: break-all;
 }
+.export {
+  display: inline-block;
+  width: 70px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  border-radius: 5px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  color: #000;
+}
+.export:hover {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:active {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:visited {
+  color: #fff;
+  text-decoration: none;
+}
 </style>

From 8e6fac427be11f38be9409138e432a4130d3ddd6 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:48:34 +0800
Subject: [PATCH 25/29] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8Fbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40867a8d..78596756 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:34:00
+ * @LastEditTime: 2022-10-18 15:46:51
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>\
+</template>
 
 <script>
 import http from '@/utils/request'
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {
@@ -96,6 +96,7 @@ export default {
             menu.total = daibanNum
           }
         }
+        this.$store.state.sidebarMenuList = menuList
       })
     }
   }

From 2ee2d988cca63296814f67973d9cb2b9fcb4bdde Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 15:51:23 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=B7=A6=E4=BE=A7=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B1=95=E5=BC=80=E7=AC=AC=E4=B8=80=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue
index 0adb69d9..b30661cb 100644
--- a/front/src/views/home/detailsPageInfrastructureTree.vue
+++ b/front/src/views/home/detailsPageInfrastructureTree.vue
@@ -91,6 +91,10 @@ export default defineComponent({
           })
         }
         treeData.value = res.data && res.data.data || []
+        // 只有一个，默认展开到二级菜单
+        if(res.data && res.data.data.length == 1) {
+          showBottom(treeData.value[0])
+        }
       }
     }
     mybus.on('getDeptList', () => {

From cdb47c705b4e2bda1b3e49f88bda1d415a331320 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 15:52:07 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD--=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=A2=9E=E5=8A=A0=E8=BF=9C=E9=9B=84?=
 =?UTF-8?q?url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/basicConfig.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 58b8b10b..d72f5cde 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -8,8 +8,8 @@
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
-  version: 'qingdao', // 开发
+  version: 'xihaian', // 西海岸
+  // version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -28,7 +28,8 @@ var CONFIGITEM = {
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
       //apiURL: 'http://15.72.183.90:8000/renren-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '192.168.124.233:8888/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -62,8 +63,9 @@ var CONFIGITEM = {
       },
       // 获取摄像头的后端接口地址
       camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 测试环境
-        cameraUrl: '10.134.135.9:9537', // 生产环境
+        // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
+        // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
+        cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',

From 2258b051846dee407b54e0f9b43e944639ffd79b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 17:44:46 +0800
Subject: [PATCH 28/29] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/utils/location.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/src/utils/location.js b/back/src/utils/location.js
index 82fc8775..25cd9f33 100644
--- a/back/src/utils/location.js
+++ b/back/src/utils/location.js
@@ -1,12 +1,12 @@
 /*
  * @Author: hisense.guoyue
  * @Date: 2022-08-23 10:30:11
- * @LastEditors: hisense.guoyue
- * @LastEditTime: 2022-10-02 14:47:05
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-18 17:44:33
  * @Description: 判断当前环境是西海岸还是青岛市局
  */
 const returnLocationStr = () => {
-  return CONFIGITEM.version
+  return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao'
 }
 
 export default returnLocationStr

From d3466d45213ceb5a92005fceb5dc62913a5ec668 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 19:42:57 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/abilityStatistics/index.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index b6041468..c401c161 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -58,6 +58,7 @@
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
+            filterable
             clearable
           >
             <el-option label="全部" value=""></el-option>
@@ -218,6 +219,8 @@
 
           <el-table
             :data="tableData"
+            :header-cell-style="{ textAlign: 'center',height:'96px' }"
+            :cell-style="{ textAlign: 'center' }"
             style="width: 100%"
             v-show="this.departmentId === 3 || this.departmentId === 4"
           >
@@ -284,7 +287,7 @@ import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
 import qs from 'qs'
-import { mapState } from 'vuex'
+// import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
 //   businessKey: { type: String, default: null },
@@ -297,6 +300,7 @@ export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
+      departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
       exportExcelType: '',
@@ -417,6 +421,13 @@ export default {
     }
   },
   created () {
+    this.$http.get('/sys/dept/all').then(res => {
+      console.log('获取部门=========>', res)
+      this.departmentSelects = []
+      res.data.data.map(val => {
+        this.departmentSelects.push({ label: val.name, value: val.name })
+      })
+    })
     // 当前设定的日期时间
     // const d = new Date()
     // let year1, month1, day1
@@ -442,7 +453,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['departmentSelects'])
+    // ...mapState(['departmentSelects'])
   },
   methods: {
     closeModal () {