From 79c97721d884efa5709cb8519b2205be1ea7c053 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 12 Dec 2022 11:12:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/detailsAll/ApplicationDetails.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 8e68c6c5..11c536bb 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-22 18:43:37
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-12-12 11:12:30
  * @Description: 应用详情页
 -->
 <template>
@@ -207,7 +207,7 @@
 <style lang="less" scoped>
   .fixed {
     position: sticky;
-    z-index: 2000;
+    z-index: 10012;
     top: 0;
     left: 50%;
     margin-left: -9.56rem;

From efba4dc7ba66eb0a5f1963167b8e3ffea516937d Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 12 Dec 2022 14:16:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/css/modal.css             |  3 +
 .../views/newHome/components/WorkDynamics.vue |  3 +-
 .../personalCenter/components/MyBrowse.vue    | 70 +++++++++----------
 3 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/front/public/static/css/modal.css b/front/public/static/css/modal.css
index 130de93b..df46ad54 100644
--- a/front/public/static/css/modal.css
+++ b/front/public/static/css/modal.css
@@ -89,6 +89,9 @@ z-index: 10010!important;
 .ant-tooltip{
 z-index: 10010!important;
 }
+.ant-image-preview-wrap {
+  z-index: 10012!important;
+}
 
 .model-container .confirmChrome {
   width: 140px;
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index e3d435b9..71adc58f 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -236,8 +236,7 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '基础设施',
-        zwy: true,
+        select: '应用资源',
       },
     })
   }
diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue
index db6fb3da..d855119a 100644
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@@ -220,7 +220,7 @@
     type.value = ''
     pageNum.value = '1'
     pageSize.value = '5'
-    tabIndex.value = 0
+    tabIndex.value = -1
     showKey.value++
     checkAll.value = false
     getList()
@@ -333,7 +333,7 @@
     showKey.value++
   }
   // 切换筛选条件
-  const tabIndex = ref(0)
+  const tabIndex = ref(-1)
   const changeTab = (index) => {
     console.log('tabIndex', tabIndex.value, index, tabList)
     if (tabIndex.value == index) {
@@ -388,39 +388,39 @@
   }
   //监听tabindex发生改变调用接口
   watch(tabIndex, (val) => {
-    getBsList({
-      limit: pageSize.value,
-      page: pageNum.value,
-      type: tabList.value[val],
-      name: name.value,
-    }).then((res) => {
-      checkAll.value = true
-      console.log('申购车列表================>', res)
-      initLoading.value = false
-      list.value = []
-      total.value = res.data.data.total
-      res.data.data.list.forEach((val) => {
-        const obj = {
-          loading: false,
-          name: val.resourceDTO.name,
-          id: val.id,
-          checked: false,
-          visits: val.resourceDTO.visits,
-          type: val.resourceDTO.type,
-          link: val.resourceDTO.link,
-          resourceId: val.resourceId,
-          createDate: val.createDate,
-          description: val.resourceDTO.description,
-          delFlag: val.resourceDTO.delFlag,
-        }
-        if (checkedList.value.indexOf(val.id) == -1) {
-          checkAll.value = false
-        } else {
-          obj.checked = true
-        }
-        list.value.push(obj)
-      })
-    })
+    // getBsList({
+    //   limit: pageSize.value,
+    //   page: pageNum.value,
+    //   type: tabList.value[val],
+    //   name: name.value,
+    // }).then((res) => {
+    //   checkAll.value = true
+    //   console.log('申购车列表================>', res)
+    //   initLoading.value = false
+    //   list.value = []
+    //   total.value = res.data.data.total
+    //   res.data.data.list.forEach((val) => {
+    //     const obj = {
+    //       loading: false,
+    //       name: val.resourceDTO.name,
+    //       id: val.id,
+    //       checked: false,
+    //       visits: val.resourceDTO.visits,
+    //       type: val.resourceDTO.type,
+    //       link: val.resourceDTO.link,
+    //       resourceId: val.resourceId,
+    //       createDate: val.createDate,
+    //       description: val.resourceDTO.description,
+    //       delFlag: val.resourceDTO.delFlag,
+    //     }
+    //     if (checkedList.value.indexOf(val.id) == -1) {
+    //       checkAll.value = false
+    //     } else {
+    //       obj.checked = true
+    //     }
+    //     list.value.push(obj)
+    //   })
+    // })
   })
 </script>
 <style lang="less" scoped>

From 8906f1f60aad20082e68337c7c166c057237fdd1 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 12 Dec 2022 16:27:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=96=B0=E5=BB=BA=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/demandCenter/demandDetails.vue  |    4 +-
 front/src/views/home/details.vue              |    7 +-
 .../views/home/integrationServicesDetails.vue |   11 +-
 .../components/AbilityApplication.vue         |    3 +-
 .../personalCenter/components/Collection.vue  |   33 +-
 .../components/MyApplication.vue              |   12 +-
 .../personalCenter/components/MyApply.vue     |  805 ++++----
 .../personalCenter/components/MyBrowse.vue    |   12 +-
 .../personalCenter/components/MyComments.vue  |   12 +-
 .../personalCenter/components/MyPublish.vue   |   14 +-
 .../components/PurchaseVehicle.vue            | 1775 +++++++++--------
 front/src/views/personalCenter/index.vue      |   26 +-
 12 files changed, 1421 insertions(+), 1293 deletions(-)

diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index bce9a244..58aa69e9 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -238,7 +238,7 @@
         </a-list>
       </div>
       <!-- 关闭需求申请 -->
-      <div class="closeMain" @click="closeMain">X</div>
+      <div class="closeMain" @click="closeMain" v-show="!hiddenBackFlag">X</div>
     </div>
   </div>
 </template>
@@ -286,6 +286,7 @@
   const evaluateData = ref([])
 
   const myComment = ref('')
+  const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
   const evaluateSubmit = () => {
     if (myComment.value === '') {
       message.error('请填写评价！')
@@ -388,6 +389,7 @@
     // const formData = computed(() => store.getters['home/demandDetailsData'])
     // formName.value = formData.value
     const id = router.currentRoute.value.query.id
+
     getDemandForm(id).then((res) => {
       console.log(res, 'res')
       const { data } = res.data
diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue
index 15879f72..139b35b1 100644
--- a/front/src/views/home/details.vue
+++ b/front/src/views/home/details.vue
@@ -2,14 +2,14 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-14 09:43:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-12-09 17:31:52
+ * @LastEditTime: 2022-12-12 15:36:59
  * @Description: 告诉大家这是什么
 -->
 <template>
   <div>
     <div id="apply-container">
       <home-header :showView="showView" :target-flag="targetFlag"></home-header>
-      <detail-back></detail-back>
+      <detail-back v-show="!hiddenBackFlag"></detail-back>
       <div class="detail-content">
         <details-view v-if="showView === 'details-view'"></details-view>
         <algorithm-details
@@ -93,6 +93,8 @@
       ])
       const router = useRouter()
       const id = router.currentRoute.value.query.id
+      // 是否隐藏回退按钮
+      const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
       const obj = JSON.parse(window.sessionStorage.getItem('preview'))
       let showView = ref('')
       const targetFlag = ref(true)
@@ -176,6 +178,7 @@
         init,
         router,
         id,
+        hiddenBackFlag,
       }
     },
   })
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 002c66af..e331b162 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
-    <detail-back></detail-back>
+    <detail-back v-show="!hiddenBackFlag"></detail-back>
     <!-- 头部基本信息 -->
     <application-top-details
       :dataList="detailInfoObj"
@@ -190,6 +190,7 @@
   const infrastructureCount = ref(0)
   const componentCount = ref(0)
   const id = router.currentRoute.value.query.id
+  const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -560,11 +561,11 @@
       width: 5.75rem;
       height: 3.4rem;
       background: url('~@/assets/home/fn/cjtd.png') no-repeat;
-      background-size: 100%; 
+      background-size: 100%;
     }
-    .cjtd img{
-        width:100%;
-        height:100%    
+    .cjtd img {
+      width: 100%;
+      height: 100%;
     }
 
     .content {
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 2563f9dd..d02f6d53 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-26 14:47:12
+ * @LastEditTime: 2022-12-12 15:37:17
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -503,6 +503,7 @@
         path: '/details', // 跳转的页面路由
         query: {
           id: id,
+          hiddenBackFlag: true,
         },
       })
       window.open(applypage.href, '_blank')
diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue
index e37a41c1..166365f1 100644
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@@ -171,7 +171,11 @@
       console.log('编目一级=============>', res.data)
       res.data.data.forEach((val) => {
         // tabList.value.push(val.name)
-        if (val.name == '应用资源' || val.name == '组件服务' || val.name == '融合服务') {
+        if (
+          val.name == '应用资源' ||
+          val.name == '组件服务' ||
+          val.name == '融合服务'
+        ) {
           tabList.value.push(val.name)
         }
       })
@@ -349,22 +353,39 @@
     if (delFlag == 0) {
       console.log('进入详情')
       mybus.emit('tabsChange', { flag: id })
-      router.push({
-        path: '/details',
+      // router.push({
+      //   path: '/details',
+      //   query: {
+      //     id: id,
+      //   },
+      // })
+      const detailPage = router.resolve({
+        path: '/details', // 跳转的页面路由
         query: {
           id: id,
+          hiddenBackFlag: true,
         },
       })
+      window.open(detailPage.href, '_blank')
     } else if (delFlag === undefined) {
       // 融合服务
-     // mybus.emit('tabsChange', { flag: item.resourceId })
+      // mybus.emit('tabsChange', { flag: item.resourceId })
       mybus.emit('tabsChange', { flag: id })
-      router.push({
-        path: `/integrationServicesDetails`,
+
+      // router.push({
+      //   path: `/integrationServicesDetails`,
+      //   query: {
+      //     id: id,
+      //   },
+      // })
+      const detailPage = router.resolve({
+        path: '/integrationServicesDetails', // 跳转的页面路由
         query: {
           id: id,
+          hiddenBackFlag: true,
         },
       })
+      window.open(detailPage.href, '_blank')
     }
   }
 </script>
diff --git a/front/src/views/personalCenter/components/MyApplication.vue b/front/src/views/personalCenter/components/MyApplication.vue
index baf33171..2805fe21 100644
--- a/front/src/views/personalCenter/components/MyApplication.vue
+++ b/front/src/views/personalCenter/components/MyApplication.vue
@@ -90,12 +90,20 @@
   const showDetail = (item) => {
     // console.log('demandDetails', item)
     // store.commit('home/demandDetailsData', item)
-    router.push({
-      path: '/demandDetails',
+    // router.push({
+    //   path: '/demandDetails',
+    //   query: {
+    //     id: item.id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/demandDetails', // 跳转的页面路由
       query: {
         id: item.id,
+        hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
 
   const creator = ref('')
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index f9cd1cf4..6bef0f4a 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -9,10 +9,10 @@
         :key="index"
         @click="handleTab(index)"
       >
-      {{item}}
+        {{ item }}
       </div>
     </div>
-    <div class="tab" style="margin-bottom: 0.1rem" v-show="(chooseTab==0)">
+    <div class="tab" style="margin-bottom: 0.1rem" v-show="chooseTab == 0">
       <span>类型</span>
       <div
         :class="typeIndex == index ? 'tabclass' : ' '"
@@ -23,10 +23,7 @@
         {{ item }}
       </div>
     </div>
-    <div
-      class="tab"
-      v-if="(chooseTab != 1 && chooseTab != 2 && chooseTab != 3)"
-    >
+    <div class="tab" v-if="chooseTab != 1 && chooseTab != 2 && chooseTab != 3">
       <span>申请状态</span>
       <div
         :class="tabIndex == index ? 'tabclass' : ' '"
@@ -45,112 +42,107 @@
         </template>
       </div>
     </div>
-  <!--政务云资源-->
-    <template v-if="chooseTab==2">
+    <!--政务云资源-->
+    <template v-if="chooseTab == 2">
       <a-form
-            :label-col="{ style: { width: '80px' } }"
-            :wrapper-col="{ style: { width: '200px' } }"
-            labelAlign="center"     
-          >
-          <a-row>
-              <a-form-item
-                label="业务名称">
-                <a-input   placeholder="请输入业务名称"
-                  v-model:value="yunForm.busineessName"
-                  style="width: 200px"
-                />
-              </a-form-item>
-              <a-form-item  label="状态">
-                <a-select
-                ref="select"
-                v-model:value="yunForm.status"
-                placeholder="请选择状态"
-                style="width: 200px"
+        :label-col="{ style: { width: '80px' } }"
+        :wrapper-col="{ style: { width: '200px' } }"
+        labelAlign="center"
+      >
+        <a-row>
+          <a-form-item label="业务名称">
+            <a-input
+              placeholder="请输入业务名称"
+              v-model:value="yunForm.busineessName"
+              style="width: 200px"
+            />
+          </a-form-item>
+          <a-form-item label="状态">
+            <a-select
+              ref="select"
+              v-model:value="yunForm.status"
+              placeholder="请选择状态"
+              style="width: 200px"
+            >
+              <a-select-option
+                v-for="(item, index) in cloudResourceStatusList"
+                :key="index"
+                :value="item.dictValue"
               >
-              <a-select-option v-for="(item,index) in cloudResourceStatusList"
-               :key="index" :value="item.dictValue">
-              {{ item.dictLabel}}
-            </a-select-option>
-              </a-select>
-              </a-form-item>
-              <button  class="queryButton" @click="getCloudList()">查询</button>
-          <button  class="queryButton"  @click="cloudSearchReserve()"> 重置</button>
-            </a-row>
-            </a-form>
+                {{ item.dictLabel }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <button class="queryButton" @click="getCloudList()">查询</button>
+          <button class="queryButton" @click="cloudSearchReserve()">
+            重置
+          </button>
+        </a-row>
+      </a-form>
 
-            <div v-if="cloudList.data.length > 0">
-              <div class="content-cloud">
-        <div
-          class="content-cloud-body"
-          v-for="item in cloudList.data"
-          :key="item.index"
-        >
-          <div class="content-body-left">
-           <div class="content-body-left-one">
-            <div style="font-size:16px">{{item.BUSINESS_NAME}}</div>
-            <div>单号: {{item.BSNUM}}</div>
-           </div>
-           <div class="content-body-left-two">
-            <!-- <div>申请类型: {{item.type}}</div> -->
-            <div>状态: {{item.STATUS}}</div>
-            <div>申请时间: {{item.CREATE_TIME}}</div>
-  
-           </div>
+      <div v-if="cloudList.data.length > 0">
+        <div class="content-cloud">
+          <div
+            class="content-cloud-body"
+            v-for="item in cloudList.data"
+            :key="item.index"
+          >
+            <div class="content-body-left">
+              <div class="content-body-left-one">
+                <div style="font-size: 16px">{{ item.BUSINESS_NAME }}</div>
+                <div>单号: {{ item.BSNUM }}</div>
+              </div>
+              <div class="content-body-left-two">
+                <!-- <div>申请类型: {{item.type}}</div> -->
+                <div>状态: {{ item.STATUS }}</div>
+                <div>申请时间: {{ item.CREATE_TIME }}</div>
+              </div>
+            </div>
+            <div class="content-body-right">
+              <div class="button" @click="showCloudDetail(item)">查看详情</div>
+            </div>
           </div>
-          <div class="content-body-right">
-            <div class="button" @click="showCloudDetail(item)">查看详情</div>
-          </div>
-     
+        </div>
+        <div class="bottom">
+          <a-pagination
+            size="small"
+            pageSize="4"
+            :total="total"
+            :showTotal="(total) => `共 ${total} 项`"
+            :current="page"
+            @change="handleCurrentChange"
+            @showSizeChange="handlePageSizeChange"
+            :showSizeChanger="false"
+          />
         </div>
       </div>
-      <div class="bottom">
-        <a-pagination
-          size="small"
-          pageSize="4"
-          :total="total"
-          :showTotal="(total) => `共 ${total} 项`"
-          :current="page"
-          @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange"
-          :showSizeChanger="false"
-        />
-      </div>
-              </div>
-              <a-empty v-else />
+      <a-empty v-else />
     </template>
     <!--数据资源和视频资源-->
-    <template v-else-if="(chooseTab==1||chooseTab==3)">
+    <template v-else-if="chooseTab == 1 || chooseTab == 3">
       <a-empty></a-empty>
     </template>
-      <!--UCS内部资源-->
+    <!--UCS内部资源-->
     <template v-else>
       <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="withdraw" v-if="item.approveStatus === '不通过'"></div>
-          <div class="content-body-title">
-            <span>
-              申请单号：{{
-                item.applyNumber || item.GUID || item.BSNUM || '--'
-              }}
-            </span>
-            <div></div>
-          </div>
-          <a-tooltip>
-            <template #title>
-              {{
-                item.cameraList
-                  ? item.system
-                  : item.title || item.name || item.title || item.BUSINESS_NAME
-              }}
-            </template>
+        <div class="content">
+          <div
+            class="content-body"
+            v-for="item in contentList.data"
+            :key="item.index"
+          >
+            <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
             <div class="content-body-title">
               <span>
-                名称：{{
+                申请单号：{{
+                  item.applyNumber || item.GUID || item.BSNUM || '--'
+                }}
+              </span>
+              <div></div>
+            </div>
+            <a-tooltip>
+              <template #title>
+                {{
                   item.cameraList
                     ? item.system
                     : item.title ||
@@ -158,198 +150,205 @@
                       item.title ||
                       item.BUSINESS_NAME
                 }}
-              </span>
-              <div></div>
+              </template>
+              <div class="content-body-title">
+                <span>
+                  名称：{{
+                    item.cameraList
+                      ? item.system
+                      : item.title ||
+                        item.name ||
+                        item.title ||
+                        item.BUSINESS_NAME
+                  }}
+                </span>
+                <div></div>
+              </div>
+            </a-tooltip>
+            <div class="content-body-content">
+              <p class="content-body-content-son" v-if="typeName == '设备申请'">
+                审核结果：{{ item.state === 0 ? '审核中' : '审核完成' }}
+              </p>
+              <p
+                class="content-body-content-son"
+                v-else-if="typeName == '数据资源申请'"
+              >
+                审核结果：{{ item.bmyijian === 0 ? '审核中' : '审核完成' }}
+              </p>
+              <p
+                class="content-body-content-son"
+                v-else-if="typeName == '云资源申请'"
+              >
+                审核结果：{{ status[item.STATUS] }}
+              </p>
+              <p
+                class="content-body-content-son"
+                v-else-if="typeName == '云视频申请'"
+              >
+                审核结果：{{ status2[item.STATUS] }}
+              </p>
+              <p class="content-body-content-son" v-else>
+                审核结果：{{
+                  item.ended
+                    ? '审核完成'
+                    : item.backToFirst
+                    ? '审核中（请修改被驳回内容）'
+                    : '审核中'
+                }}
+              </p>
+              <div>
+                申请日期：{{
+                  item.createDate ||
+                  item.startTime ||
+                  item.tbsj ||
+                  (item.CREATE_TIME &&
+                    moment(item.CREATE_TIME.time + 480 * 60 * 1000).format(
+                      'YYYY-MM-DD HH:mm:ss'
+                    ))
+                }}
+              </div>
+              <!-- 西海岸--增加过期时间显示 -->
+              <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
             </div>
-          </a-tooltip>
-          <div class="content-body-content">
-            <p class="content-body-content-son" v-if="typeName == '设备申请'">
-              审核结果：{{ item.state === 0 ? '审核中' : '审核完成' }}
-            </p>
-            <p
-              class="content-body-content-son"
-              v-else-if="typeName == '数据资源申请'"
-            >
-              审核结果：{{ item.bmyijian === 0 ? '审核中' : '审核完成' }}
-            </p>
-            <p
-              class="content-body-content-son"
-              v-else-if="typeName == '云资源申请'"
-            >
-              审核结果：{{ status[item.STATUS] }}
-            </p>
-            <p
-              class="content-body-content-son"
-              v-else-if="typeName == '云视频申请'"
-            >
-              审核结果：{{ status2[item.STATUS] }}
-            </p>
-            <p class="content-body-content-son" v-else>
-              审核结果：{{
-                item.ended
-                  ? '审核完成'
-                  : item.backToFirst
-                  ? '审核中（请修改被驳回内容）'
-                  : '审核中'
-              }}
-            </p>
-            <div>
-              申请日期：{{
-                item.createDate ||
-                item.startTime ||
-                item.tbsj ||
-                (item.CREATE_TIME &&
-                  moment(item.CREATE_TIME.time + 480 * 60 * 1000).format(
-                    'YYYY-MM-DD HH:mm:ss'
-                  ))
-              }}
+            <div class="button-box">
+              <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="
+                  item.processDefinitionName != '能力资源下架' &&
+                  item.approveStatus !== '不通过' &&
+                  (item.resourceStatus == 4 || item.resourceStatus == 5)
+                "
+                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>
+                <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>
+                <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>
+                <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>
+              </svg>
             </div>
-            <!-- 西海岸--增加过期时间显示 -->
-            <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>
-            <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="
-                item.processDefinitionName != '能力资源下架' &&
-                item.approveStatus !== '不通过' &&
-                (item.resourceStatus == 4 || item.resourceStatus == 5)
-              "
-              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>
-              <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>
-              <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>
-              <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>
-            </svg>
           </div>
         </div>
+        <div class="bottom">
+          <a-pagination
+            size="small"
+            pageSize="4"
+            :total="total"
+            :current="page"
+            :showTotal="(total) => `共 ${total} 项`"
+            @change="handleCurrentChange"
+            @showSizeChange="handlePageSizeChange"
+            :showSizeChanger="false"
+          />
+        </div>
       </div>
-      <div class="bottom">
-        <a-pagination
-          size="small"
-          pageSize="4"
-          :total="total"
-          :current="page"
-          :showTotal="(total) => `共 ${total} 项`"
-          @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange"
-          :showSizeChanger="false"
-        />
-      </div>
-    </div>
-    <a-empty v-else />
+      <a-empty v-else />
     </template>
-   
-   
   </div>
   <!-- 政务云资源详情-->
   <a-modal
-      bodyStyle="padding:0.1rem 0"
-      v-model:visible="cloudVisible"
-      style="width: 1000px"
-      :footer="null"
-      destroyOnClose="true"
-      :maskClosable="false"
-    >
-    <template v-slot:title>
-        申请详情
-      </template>
-    <cloud-details
-        :BSNUM="BSNUM"
-        :baseInfo="baseInfo"
-      ></cloud-details>
-      
-    </a-modal>
+    bodyStyle="padding:0.1rem 0"
+    v-model:visible="cloudVisible"
+    style="width: 1000px"
+    :footer="null"
+    destroyOnClose="true"
+    :maskClosable="false"
+  >
+    <template v-slot:title>申请详情</template>
+    <cloud-details :BSNUM="BSNUM" :baseInfo="baseInfo"></cloud-details>
+  </a-modal>
   <a-modal
-      bodyStyle="padding:0.1rem 0"
-      v-model:visible="detailsVisible"
-      style="width: 1000px"
-      :footer="null"
-      destroyOnClose="true"
-      :maskClosable="false"
+    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-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 }"
     >
-      <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-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 }"
-      >
-        <template #bodyCell="{ column, text }">
-          <!-- <template>
+      <template #bodyCell="{ column, text }">
+        <!-- <template>
         <a>{{ text }}</a>
       </template> -->
-        </template>
-      </a-table>
-    </a-modal>
+      </template>
+    </a-table>
+  </a-modal>
   <!-- 联系方式弹框 -->
   <a-modal
     v-model:visible="phoneVisible"
@@ -385,7 +384,7 @@
     getResourceBusinessList,
     getVideoBusinessList,
     getCategoryTreePage,
-    getZwyBusinessList
+    getZwyBusinessList,
   } from '@/api/personalCenter'
   import {
     updateRes,
@@ -408,7 +407,7 @@
   const router = useRouter()
   const userName = ref('')
   //云资源下拉框
-  let cloudResourceStatusList=ref([])
+  let cloudResourceStatusList = ref([])
   getUserInfo().then((res) => {
     userName.value = res.data.data.username
   })
@@ -416,23 +415,22 @@
   // 西海岸-设备申请
   let isXiHaiAn = whoShow.itShowXiHaiAn
   //选择展示的Tab页
-  let chooseTab=ref(0)
+  let chooseTab = ref(0)
   //云资源查询条件
-  let yunForm=reactive({
-    status:'',
-    busineesName:'',
+  let yunForm = reactive({
+    status: '',
+    busineesName: '',
   })
-  let chooseList=ref(['UCS内部资源','数据资源','政务云资源','视频资源'])
-  let typeList = ref( [
-          '能力申请',
-          '能力上架',
-          '能力下架',
-          '能力需求',
-          '需求评论',
-          // '数据资源申请',
-          // '云资源申请',
-          // '云视频申请',
-       
+  let chooseList = ref(['UCS内部资源', '数据资源', '政务云资源', '视频资源'])
+  let typeList = ref([
+    '能力申请',
+    '能力上架',
+    '能力下架',
+    '能力需求',
+    '需求评论',
+    // '数据资源申请',
+    // '云资源申请',
+    // '云视频申请',
   ])
 
   const itShowXiHaiAn = ref(isXiHaiAn)
@@ -450,9 +448,7 @@
   const contentList = reactive({ data: [] })
   const contentList2 = reactive({ data: [] }) // 云资源 云视频前端过滤使用
   //政务云资源
-  const cloudList = reactive({ data: [
-
-]})
+  const cloudList = reactive({ data: [] })
   let tabIndex = ref(0)
   let typeIndex = ref(0)
   let typeName = ref(typeList.value[0])
@@ -474,7 +470,7 @@
   const detailsVisible = ref(false)
   const detailsVisible2 = ref(false)
   //政务云资源详情
-  const cloudVisible=ref(false)
+  const cloudVisible = ref(false)
   const businessKey = ref('')
   const processInstanceId = ref('')
   const processDefinitionName = ref('')
@@ -515,49 +511,46 @@
     getApplyList()
   }
   //选择tab
-  const handleTab=(index)=>{
-    chooseTab.value=index
-    if(index==2){
+  const handleTab = (index) => {
+    chooseTab.value = index
+    if (index == 2) {
       //查询政务云状态
       getCloudResource()
       getCloudList()
     }
   }
-  const cloudSearchReserve = () =>{
-    Object.keys(yunForm).map(key => {
+  const cloudSearchReserve = () => {
+    Object.keys(yunForm).map((key) => {
       delete yunForm[key]
     })
-  getCloudList()
+    getCloudList()
   }
   //查询政务云数据
   const getCloudList = () => {
     const params = {
-      pageNum : page.value,
-      pageSize : 5,
-      status:yunForm.status,
-      name :yunForm.busineesName
+      pageNum: page.value,
+      pageSize: 5,
+      status: yunForm.status,
+      name: yunForm.busineesName,
     }
     total.value = 5
-      getZwyBusinessList(params).then(
-        (res) => {
-          cloudList.data = res.data.data.list
-          num.value = []
-          total.value = res.data.data.total
-        }
-      )
+    getZwyBusinessList(params).then((res) => {
+      cloudList.data = res.data.data.list
+      num.value = []
+      total.value = res.data.data.total
+    })
   }
   //查询政务云状态
   const getCloudResource = () => {
     getCategoryTreePage({
-        page: 1,
-        limit: 20,
-        dictTypeId: '1601043884320755714',
-        deFlage: 0,
-      }).then((res) => {
-        cloudResourceStatusList.value = res.data.data.list
-  })
-}
-
+      page: 1,
+      limit: 20,
+      dictTypeId: '1601043884320755714',
+      deFlage: 0,
+    }).then((res) => {
+      cloudResourceStatusList.value = res.data.data.list
+    })
+  }
 
   // 申请状态切换
   function changeApplyState(item, index) {
@@ -622,12 +615,11 @@
   }
   const cilckRowData = ref({})
   //查看政务云详情
-  const showCloudDetail=(item)=>{
-      //待完成
-      cloudVisible.value = true
-      BSNUM.value=item.BSNUM
-      baseInfo.value=item
-
+  const showCloudDetail = (item) => {
+    //待完成
+    cloudVisible.value = true
+    BSNUM.value = item.BSNUM
+    baseInfo.value = item
   }
   const showDetail = (item) => {
     cilckRowData.value = item
@@ -757,6 +749,7 @@
     oInput.remove()
   }
   const showAdd = (item) => {
+    console.log('item', item)
     if (item.processDefinitionKey == 'resourcemountapply') {
       const data = {
         id: item.resourceId,
@@ -975,12 +968,11 @@
         contentList.data = res.data.data.list
         total.value = res.data.data.total
         initNum()
- 
+
         switch (typeIndex.value) {
           case 1:
             contentList.data.map((val) => {
               nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
-            
                 val.title = res1.data.data.resourceDTO.name
                 val.dto = res1.data.data.resourceDTO
                 showType.value = '能力上架'
@@ -1034,23 +1026,20 @@
   }
   const handleCurrentChange = (val) => {
     page.value = val
-    if(chooseTab==2){
+    if (chooseTab.value == 2) {
       getCloudList()
-    }else{
+    } else {
       getApplyList()
     }
-   
-
   }
 
   const handlePageSizeChange = (val) => {
     page.value = val
-    if(chooseTab==2){
+    if (chooseTab.value == 2) {
       getCloudList()
-    }else{
+    } else {
       getApplyList()
     }
-  
   }
 
   const viewDetail = (processDefinitionName, id, ended, businessKey) => {
@@ -1164,7 +1153,6 @@
     phoneVisible.value = true
   }
 
-
   mybus.on('closeModal', (obj) => {
     detailsVisible.value = false
     changeType(obj.type, obj.index)
@@ -1183,15 +1171,15 @@
 </script>
 
 <style scoped lang="less">
-.queryButton{
-  background: #0058e1;
-  width: 80px;
-   height: 32px;
+  .queryButton {
+    background: #0058e1;
+    width: 80px;
+    height: 32px;
     margin-left: 20px;
-    border:1px solid #0058e1;
+    border: 1px solid #0058e1;
     border-radius: 2px;
-    color:#fff;
-}
+    color: #fff;
+  }
   .on-the-right-side-of-the-list {
     background: #ffffff;
     padding: 20px 0px 30px 20px;
@@ -1206,30 +1194,29 @@
     justify-content: left;
     .second-title {
       border-radius: 4px;
-    margin-top: 10px;
-    margin-bottom: 22px;
-    font-size: 18px;
-    cursor: pointer;
-    text-align: center;
-    background: #edf4fc;
-    width: 500px;
-    height: 36px;
-    line-height: 36px;
-    display: table;
+      margin-top: 10px;
+      margin-bottom: 22px;
+      font-size: 18px;
+      cursor: pointer;
+      text-align: center;
+      background: #edf4fc;
+      width: 500px;
+      height: 36px;
+      line-height: 36px;
+      display: table;
+    }
 
-}
-
-.chooseStyle {
-  display: table-cell;
-  width: 25%;
-  color: #fff;
-  background-color: #0058e1;
-  font-weight: bolder;
-}
-.noChooseStyle{
-  display: table-cell;
-  width: 25%;
-}
+    .chooseStyle {
+      display: table-cell;
+      width: 25%;
+      color: #fff;
+      background-color: #0058e1;
+      font-weight: bolder;
+    }
+    .noChooseStyle {
+      display: table-cell;
+      width: 25%;
+    }
     .title {
       font-size: 20px;
       color: #000000;
@@ -1288,56 +1275,46 @@
         color: #0087ff;
       }
     }
-.content-cloud{
-  padding: 0px 10px;
-  overflow-y: scroll;
-  height: 610px;
-    .content-cloud-body{
-      height: 100px;
-      height: 100px;
-      margin-bottom: 10px;
-    border-bottom: 1px solid #cccccc;
-      .content-body-left{
-        width:85%;
-        float: left;
-    
-
-        .content-body-left-one{
-          display: table;
-          height: 50px;
-          width: 80%;
-          div{
-            display: table-cell;
-            width: 50%;
-            font-size:14px;
+    .content-cloud {
+      padding: 0px 10px;
+      overflow-y: scroll;
+      height: 610px;
+      .content-cloud-body {
+        height: 100px;
+        height: 100px;
+        margin-bottom: 10px;
+        border-bottom: 1px solid #cccccc;
+        .content-body-left {
+          width: 85%;
+          float: left;
 
+          .content-body-left-one {
+            display: table;
+            height: 50px;
+            width: 80%;
+            div {
+              display: table-cell;
+              width: 50%;
+              font-size: 14px;
+            }
           }
-
-        }
-        .content-body-left-two{
-          width: 80%;
-          height: 50px;
-          display: table;
-          div{
-            display: table-cell;
-            width: 30%;
-            font-size:14px;
-
-
+          .content-body-left-two {
+            width: 80%;
+            height: 50px;
+            display: table;
+            div {
+              display: table-cell;
+              width: 30%;
+              font-size: 14px;
+            }
           }
-
         }
-
+        .content-body-right {
+          width: 15%;
+          float: left;
+        }
       }
-      .content-body-right{
-        width:15%;
-        float: left;
-        
-      }
-
     }
-
-}
     .content {
       padding-right: 10px;
       height: 610px;
diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue
index d855119a..3f42ad7d 100644
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@@ -377,12 +377,20 @@
         openHref(item)
       } else {
         mybus.emit('tabsChange', { flag: id })
-        router.push({
-          path: '/details',
+        // router.push({
+        //   path: '/details',
+        //   query: {
+        //     id: id,
+        //   },
+        // })
+        const detailPage = router.resolve({
+          path: '/details', // 跳转的页面路由
           query: {
             id: id,
+            hiddenBackFlag: true,
           },
         })
+        window.open(detailPage.href, '_blank')
       }
     }
   }
diff --git a/front/src/views/personalCenter/components/MyComments.vue b/front/src/views/personalCenter/components/MyComments.vue
index e8316b15..31e89205 100644
--- a/front/src/views/personalCenter/components/MyComments.vue
+++ b/front/src/views/personalCenter/components/MyComments.vue
@@ -71,12 +71,20 @@
   const showDetail = (item) => {
     console.log('demandDetails', item)
     // store.commit('home/demandDetailsData', item)
-    router.push({
-      path: '/demandDetails',
+    // router.push({
+    //   path: '/demandDetails',
+    //   query: {
+    //     id: item.demandDataDTO.id,
+    //   },
+    // })
+    const detailPage = router.resolve({
+      path: '/demandDetails', // 跳转的页面路由
       query: {
         id: item.demandDataDTO.id,
+        hiddenBackFlag: true,
       },
     })
+    window.open(detailPage.href, '_blank')
   }
 
   const total = ref()
diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue
index cd87a772..c276ff88 100644
--- a/front/src/views/personalCenter/components/MyPublish.vue
+++ b/front/src/views/personalCenter/components/MyPublish.vue
@@ -395,13 +395,15 @@
   const showDetail = (item) => {
     console.log('showDetail', item, item.id)
     if (item.delFlag == 0) {
-      router.push({
-        path: '/details',
+      const detailPage = router.resolve({
+        path: '/details', // 跳转的页面路由
         query: {
           id: item.id,
+          hiddenBackFlag: true,
         },
       })
-      newpage
+      window.open(detailPage.href, '_blank')
+      // newpage
     }
     // getProcDefBizRoute(item.processDefinitionId)
     // detailsVisible.value = true
@@ -445,9 +447,9 @@
     limt.value = size
     getApplyList(tabname.value)
   }
-  const newpage = router.resolve({
-    path: '/nenglishangjia', // 跳转的页面路由
-  })
+  // const newpage = router.resolve({
+  //   path: '/nenglishangjia', // 跳转的页面路由
+  // })
   // const nenglishangjia = () => {
   //   window.open(newpage.href, '_blank')
   //   // router.resolve('/nenglishangjia')
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 2c6cb06f..0bb4e2b9 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -12,19 +12,40 @@
     </div>
     <div class="right">
       <div class="sousuokuang">
-        <a-input-search v-model:value="name" placeholder="请输入关键词" enter-button="搜索" size="large"
-          @search="getList('init')" />
+        <a-input-search
+          v-model:value="name"
+          placeholder="请输入关键词"
+          enter-button="搜索"
+          size="large"
+          @search="getList('init')"
+        />
       </div>
-      <a-popconfirm v-if="checkedListAbility.length != 0" title="是否进行批量删除?" ok-text="是" cancel-text="否"
-        @confirm="handleDelete" @cancel="cancel">
+      <a-popconfirm
+        v-if="checkedListAbility.length != 0"
+        title="是否进行批量删除?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="handleDelete"
+        @cancel="cancel"
+      >
         <a-button type="primary" class="collect-btn" @click="ceshiFunction()">
           批量删除
         </a-button>
       </a-popconfirm>
-      <a-button v-else type="primary" class="collect-btn" @click="ceshiFunction()">
+      <a-button
+        v-else
+        type="primary"
+        class="collect-btn"
+        @click="ceshiFunction()"
+      >
         批量删除
       </a-button>
-      <a-button type="primary" v-if="!itShowXiHaiAn" class="collect-btn" @click="collection">
+      <a-button
+        type="primary"
+        v-if="!itShowXiHaiAn"
+        class="collect-btn"
+        @click="collection"
+      >
         批量收藏
       </a-button>
       <a-button type="primary" class="apply-btn" @click="apply">
@@ -36,9 +57,12 @@
     <div class="item" v-for="(val, valIndex) in list" :key="val.id">
       <div class="item-top" @click="showBottom(val)">
         <div>
-          <a-checkbox :checked="val.checked" @click.stop="checkedDept(val)"></a-checkbox>
+          <a-checkbox
+            :checked="val.checked"
+            @click.stop="checkedDept(val)"
+          ></a-checkbox>
           <span style="margin-left: 0.2rem" v-if="itShowXiHaiAn">
-            {{ val.deptName}}
+            {{ val.deptName }}
           </span>
           <span style="margin-left: 0.2rem" v-else>
             {{ val.deptName + '(' + val.count + ')' }}
@@ -48,33 +72,45 @@
         <UpOutlined v-show="val.show" />
       </div>
       <div class="item-bottom" v-show="val.show">
-        <a-list class="demo-loadmore-list" :loading="val.initLoading" item-layout="horizontal"
-          :data-source="val.children">
+        <a-list
+          class="demo-loadmore-list"
+          :loading="val.initLoading"
+          item-layout="horizontal"
+          :data-source="val.children"
+        >
           <template #renderItem="{ item }">
             <a-list-item>
               <a-skeleton avatar :title="false" :loading="item.loading" active>
-                <a-list-item-meta :description="
-                  item.description ||
-                  (item.note1 && JSON.parse(item.note1) &&
-                    JSON.parse(item.note1)[0] &&
-                    JSON.parse(item.note1)[0].channelName +
-                      '等' +
-                      JSON.parse(item.note1).length +
-                      '个摄像头') ||
-                  ''
-                " style="position: relative">
+                <a-list-item-meta
+                  :description="
+                    item.description ||
+                    (item.note1 &&
+                      JSON.parse(item.note1) &&
+                      JSON.parse(item.note1)[0] &&
+                      JSON.parse(item.note1)[0].channelName +
+                        '等' +
+                        JSON.parse(item.note1).length +
+                        '个摄像头') ||
+                    ''
+                  "
+                  style="position: relative"
+                >
                   <template #title>
                     <div>
                       <a-tooltip>
                         <template #title>{{ item.resourceName }}</template>
-                        <span @click="
-                          showItem(
-                            item.resourceId,
-                            item.type,
-                            item.delFlag,
-                            item.note1
-                          )
-                        " style="cursor: pointer" class="name">
+                        <span
+                          @click="
+                            showItem(
+                              item.resourceId,
+                              item.type,
+                              item.delFlag,
+                              item.note1
+                            )
+                          "
+                          style="cursor: pointer"
+                          class="name"
+                        >
                           {{ item.resourceName }}
                         </span>
                       </a-tooltip>
@@ -82,68 +118,115 @@
                     </div>
                     <!-- // todo -->
                     <span class="time">
-                      <span v-if="!itShowXiHaiAn">加购时间:{{ item.time }}</span>
-                      <a-popconfirm title="是否删除该记录?" ok-text="是" cancel-text="否" @confirm="handleDelete(item, valIndex)"
-                        @cancel="cancel">
-                        <a-button type="primary" style="
+                      <span v-if="!itShowXiHaiAn">
+                        加购时间:{{ item.time }}
+                      </span>
+                      <a-popconfirm
+                        title="是否删除该记录?"
+                        ok-text="是"
+                        cancel-text="否"
+                        @confirm="handleDelete(item, valIndex)"
+                        @cancel="cancel"
+                      >
+                        <a-button
+                          type="primary"
+                          style="
                             width: 0.7rem;
                             height: 0.3rem;
                             margin-left: 0.12rem;
                             border-radius: 2px;
                             background: #fff;
                             color: #0558e1;
-                          " @click="del">
+                          "
+                          @click="del"
+                        >
                           删除
                         </a-button>
                       </a-popconfirm>
                     </span>
-                    <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="50"
-                      height="50" v-if="item.delFlag == 4 || item.delFlag == 5"
-                      style="position: absolute; top: 0; left: 1rem">
+                    <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="50"
+                      height="50"
+                      v-if="item.delFlag == 4 || item.delFlag == 5"
+                      style="position: absolute; top: 0; left: 1rem"
+                    >
                       <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>
                   </template>
                   <template #avatar>
-                    <a-checkbox :checked="item.checked" @click.stop="checkedItem(val, item)"></a-checkbox>
-                    <div class="tx" v-if="!itShowXiHaiAn" :class="
-                      item.type == '基础设施'
-                        ? 'sxt'
-                        : item.type == '应用资源'
-                        ? 'yyzy'
-                        : item.componentType == '智能算法'
-                        ? 'znsf'
-                        : item.componentType == '图层服务'
-                        ? 'tcfw'
-                        : item.componentType == '开发组件'
-                        ? 'kfzj'
-                        : item.componentType == '业务组件'
-                        ? 'ywzj'
-                        : ''
-                    "></div>
+                    <a-checkbox
+                      :checked="item.checked"
+                      @click.stop="checkedItem(val, item)"
+                    ></a-checkbox>
+                    <div
+                      class="tx"
+                      v-if="!itShowXiHaiAn"
+                      :class="
+                        item.type == '基础设施'
+                          ? 'sxt'
+                          : item.type == '应用资源'
+                          ? 'yyzy'
+                          : item.componentType == '智能算法'
+                          ? 'znsf'
+                          : item.componentType == '图层服务'
+                          ? 'tcfw'
+                          : item.componentType == '开发组件'
+                          ? 'kfzj'
+                          : item.componentType == '业务组件'
+                          ? 'ywzj'
+                          : ''
+                      "
+                    ></div>
                   </template>
                 </a-list-item-meta>
               </a-skeleton>
             </a-list-item>
           </template>
         </a-list>
-
       </div>
     </div>
   </div>
-  <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>
@@ -151,878 +234,884 @@
       </template>
     </a-table>
   </a-modal>
-
 </template>
 <script setup>
-import { onMounted, ref } from 'vue'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import mybus from '@/myplugins/mybus'
-import {
-  sgcDel,
-  scInsert,
-  selectResourceCarGroupByDept,
-  selectResourceListByDept,
-  selectResourceListByDeptName,
-} from '@/api/personalCenter'
-const router = useRouter()
-// 分页
-const pageNum = ref('1')
-const pageSize = ref('99999')
-const videoVisible = ref(false)
-const xVideoList = ref([])
-const total = ref(0)
-const load = ref(0)
-// 多选框
-const checkedList = ref([])
-const checkedListAll = ref([])
-const checkedListAbility = ref([])
-const checkAll = ref(false)
-const checkNum = ref(0)
-const showKey = ref(0)
-const columns = ref([
-  {
-    title: '摄像头名称',
-    dataIndex: 'name',
-  },
-])
-// 筛选条件
-const name = ref('')
-const type = ref('')
-const list = ref([])
-const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn);
-// 初始化
-onMounted(() => {
-  getList('init')
-})
-// 收藏
-const collection = () => {
-  let scArr = []
-  if (checkedListAbility.value.length === 0) {
-    message.warning('请选择需要收藏的数据')
-  } else {
-    list.value.forEach((val) => {
-      if (val.children) {
-        val.children.map((item) => {
-          if (
-            checkedListAbility.value.indexOf(item.id) > -1 &&
-            item.delFlag == 0
-          ) {
-            if (item.resourceId == '8888888880000000001') {
-              message.warning('摄像头无法添加收藏！')
-            } else {
-              scArr.push({ resourceId: item.resourceId })
+  import { onMounted, ref } from 'vue'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
+  import {
+    sgcDel,
+    scInsert,
+    selectResourceCarGroupByDept,
+    selectResourceListByDept,
+    selectResourceListByDeptName,
+  } from '@/api/personalCenter'
+  const router = useRouter()
+  // 分页
+  const pageNum = ref('1')
+  const pageSize = ref('99999')
+  const videoVisible = ref(false)
+  const xVideoList = ref([])
+  const total = ref(0)
+  const load = ref(0)
+  // 多选框
+  const checkedList = ref([])
+  const checkedListAll = ref([])
+  const checkedListAbility = ref([])
+  const checkAll = ref(false)
+  const checkNum = ref(0)
+  const showKey = ref(0)
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  // 筛选条件
+  const name = ref('')
+  const type = ref('')
+  const list = ref([])
+  const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
+  // 初始化
+  onMounted(() => {
+    getList('init')
+  })
+  // 收藏
+  const collection = () => {
+    let scArr = []
+    if (checkedListAbility.value.length === 0) {
+      message.warning('请选择需要收藏的数据')
+    } else {
+      list.value.forEach((val) => {
+        if (val.children) {
+          val.children.map((item) => {
+            if (
+              checkedListAbility.value.indexOf(item.id) > -1 &&
+              item.delFlag == 0
+            ) {
+              if (item.resourceId == '8888888880000000001') {
+                message.warning('摄像头无法添加收藏！')
+              } else {
+                scArr.push({ resourceId: item.resourceId })
+              }
             }
+          })
+        }
+      })
+      if (scArr.length > 0) {
+        scInsert(scArr).then((res) => {
+          if (res.data.code === 0) {
+            message.success('收藏成功')
+            clean()
           }
         })
+      } else {
+        message.warning('下架的数据无法收藏')
       }
-    })
-    if (scArr.length > 0) {
-      scInsert(scArr).then((res) => {
-        if (res.data.code === 0) {
-          message.success('收藏成功')
-          clean()
+    }
+  }
+  // 全选按钮
+  const onCheckAllChange = () => {
+    if (checkAll.value) {
+      list.value.forEach((val) => {
+        if (checkedList.value.indexOf(val.deptId) == -1) {
+          checkedList.value.push(val.deptId)
+          checkedListAll.value.push(val.deptId)
+        }
+        if (val.children.length > 0) {
+          val.children.map((item) => {
+            if (checkedListAbility.value.indexOf(item.id) == -1) {
+              checkedListAbility.value.push(item.id)
+              val.checkedList.push(item.id)
+              checkNum.value++
+            }
+            item.checked = true
+          })
+        } else {
+          getListByDeptId(val)
+        }
+        val.checked = true
+      })
+      console.log(checkAll.value, checkedList.value)
+    } else {
+      list.value.forEach((val) => {
+        val.checked = false
+        checkNum.value -= Number(val.count)
+        if (checkedList.value.indexOf(val.deptId) != -1) {
+          checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
+          checkedListAll.value.splice(
+            checkedListAll.value.indexOf(val.deptId),
+            1
+          )
+          handleChild(val)
+        }
+      })
+      // console.log(checkAll.value, checkedList.value)
+    }
+  }
+  // 处理child
+  const handleChild = (val) => {
+    if (val.children.length > 0) {
+      val.children.map((item) => {
+        // console.log('child=============>', checkedListAbility.value, item)
+        if (checkedListAbility.value.indexOf(item.id) > -1) {
+          item.checked = false
+          checkedListAbility.value.splice(
+            checkedListAbility.value.indexOf(item.id),
+            1
+          )
+          val.checkedList.splice(val.checkedList.indexOf(item.id), 1)
+        }
+      })
+    }
+  }
+  // 反选
+  const reverseSelectionFalg = ref(false)
+  const reverseSelection = () => {
+    // console.log(
+    //   '点击反选==============>',
+    //   checkedList.value,
+    //   checkAll.value,
+    //   list.value
+    // )
+    reverseSelectionFalg.value = !reverseSelectionFalg.value
+    if (checkAll.value) {
+      checkAll.value = false
+      list.value.map((val) => {
+        checkNum.value -= Number(val.count)
+        if (checkedList.value.indexOf(val.deptId) > -1) {
+          val.checked = false
+          checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
+          checkedListAll.value.splice(
+            checkedListAll.value.indexOf(val.deptId),
+            1
+          )
+          handleChild(val)
         }
       })
     } else {
-      message.warning('下架的数据无法收藏')
-    }
-  }
-}
-// 全选按钮
-const onCheckAllChange = () => {
-  if (checkAll.value) {
-    list.value.forEach((val) => {
-      if (checkedList.value.indexOf(val.deptId) == -1) {
-        checkedList.value.push(val.deptId)
-        checkedListAll.value.push(val.deptId)
-      }
-      if (val.children.length > 0) {
-        val.children.map((item) => {
-          if (checkedListAbility.value.indexOf(item.id) == -1) {
-            checkedListAbility.value.push(item.id)
-            val.checkedList.push(item.id)
-            checkNum.value++
+      const arr = []
+      list.value.map((val) => {
+        val.checked = !val.checked
+        if (val.checked) {
+          checkNum.value += Number(val.count)
+          checkedList.value.push(val.deptId)
+          checkedListAll.value.push(val.deptId)
+          if (val.children.length > 0) {
+            val.children.map((item) => {
+              item.checked = true
+              checkedListAbility.value.push(item.id)
+              val.checkedList.push(item.id)
+            })
           }
-          item.checked = true
-        })
-      } else {
-        getListByDeptId(val)
-      }
-      val.checked = true
-    })
-    console.log(checkAll.value, checkedList.value)
-  } else {
-    list.value.forEach((val) => {
-      val.checked = false
-      checkNum.value -= Number(val.count)
-      if (checkedList.value.indexOf(val.deptId) != -1) {
-        checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
-        checkedListAll.value.splice(
-          checkedListAll.value.indexOf(val.deptId),
-          1
-        )
-        handleChild(val)
-      }
-    })
-    // console.log(checkAll.value, checkedList.value)
-  }
-}
-// 处理child
-const handleChild = (val) => {
-  if (val.children.length > 0) {
-    val.children.map((item) => {
-      // console.log('child=============>', checkedListAbility.value, item)
-      if (checkedListAbility.value.indexOf(item.id) > -1) {
-        item.checked = false
-        checkedListAbility.value.splice(
-          checkedListAbility.value.indexOf(item.id),
-          1
-        )
-        val.checkedList.splice(val.checkedList.indexOf(item.id), 1)
-      }
-    })
-  }
-}
-// 反选
-const reverseSelectionFalg = ref(false)
-const reverseSelection = () => {
-  // console.log(
-  //   '点击反选==============>',
-  //   checkedList.value,
-  //   checkAll.value,
-  //   list.value
-  // )
-  reverseSelectionFalg.value = !reverseSelectionFalg.value
-  if (checkAll.value) {
-    checkAll.value = false
-    list.value.map((val) => {
-      checkNum.value -= Number(val.count)
-      if (checkedList.value.indexOf(val.deptId) > -1) {
-        val.checked = false
-        checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
-        checkedListAll.value.splice(
-          checkedListAll.value.indexOf(val.deptId),
-          1
-        )
-        handleChild(val)
-      }
-    })
-  } else {
-    const arr = []
-    list.value.map((val) => {
-      val.checked = !val.checked
-      if (val.checked) {
-        checkNum.value += Number(val.count)
-        checkedList.value.push(val.deptId)
-        checkedListAll.value.push(val.deptId)
-        if (val.children.length > 0) {
-          val.children.map((item) => {
-            item.checked = true
-            checkedListAbility.value.push(item.id)
-            val.checkedList.push(item.id)
-          })
+          arr.push(val.deptId)
+        } else {
+          checkNum.value -= Number(val.count)
+          checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
+          checkedListAll.value.splice(
+            checkedListAll.value.indexOf(val.deptId),
+            1
+          )
+          handleChild(val)
         }
-        arr.push(val.deptId)
-      } else {
-        checkNum.value -= Number(val.count)
-        checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
-        checkedListAll.value.splice(
-          checkedListAll.value.indexOf(val.deptId),
-          1
-        )
-        handleChild(val)
+        if (arr.length == list.value.length) {
+          checkAll.value = true
+        }
+      })
+    }
+    reverseSelectionFalg.value = !reverseSelectionFalg.value
+  }
+  // 重置
+  const clean = (index) => {
+    name.value = ''
+    type.value = ''
+    pageNum.value = '1'
+    pageSize.value = '99999'
+    checkedList.value = []
+    checkedListAbility.value = []
+    checkedListAll.value = []
+    checkAll.value = false
+    showKey.value++
+    getList('', index)
+  }
+  // 获取信息
+  const getList = (type, index) => {
+    console.log(type, index)
+    if (type == 'init') {
+      pageNum.value = 1
+      pageSize.value = 99999
+    }
+    selectResourceCarGroupByDept({
+      pageNum: pageNum.value,
+      pageSize: pageSize.value,
+      name: name.value,
+    }).then((res) => {
+      console.log('res---获取信息--------->', res)
+      if (res.data.code !== 0) {
+        return message.error(res.data.msg)
       }
-      if (arr.length == list.value.length) {
+      let statistics = 0
+      res.data.data.list.map((val) => {
+        val.initLoading = true
+        val.show = false
+        if (checkedList.value.indexOf(val.deptId) > -1) {
+          val.checked = true
+          statistics++
+        } else {
+          val.checked = false
+        }
+        val.checkedList = []
+        val.children = []
+        val.pageNum = '1'
+        val.pageSize = '99999'
+      })
+      if (statistics != 0 && statistics == res.data.data.list.length) {
         checkAll.value = true
       }
-    })
-  }
-  reverseSelectionFalg.value = !reverseSelectionFalg.value
-}
-// 重置
-const clean = (index) => {
-  name.value = ''
-  type.value = ''
-  pageNum.value = '1'
-  pageSize.value = '99999'
-  checkedList.value = []
-  checkedListAbility.value = []
-  checkedListAll.value = []
-  checkAll.value = false
-  showKey.value++
-  getList('', index)
-}
-// 获取信息
-const getList = (type, index) => {
-  console.log(type, index)
-  if (type == 'init') {
-    pageNum.value = 1
-    pageSize.value = 99999
-  }
-  selectResourceCarGroupByDept({
-    pageNum: pageNum.value,
-    pageSize: pageSize.value,
-    name: name.value,
-  }).then((res) => {
-    console.log('res---获取信息--------->', res);
-    if (res.data.code !== 0) {
-      return message.error(res.data.msg)
-    }
-    let statistics = 0
-    res.data.data.list.map((val) => {
-      val.initLoading = true
-      val.show = false
-      if (checkedList.value.indexOf(val.deptId) > -1) {
-        val.checked = true
-        statistics++
-      } else {
-        val.checked = false
+      if (list.value.length == 0) {
+        load.value = 1
       }
-      val.checkedList = []
-      val.children = []
-      val.pageNum = '1'
-      val.pageSize = '99999'
-    })
-    if (statistics != 0 && statistics == res.data.data.list.length) {
-      checkAll.value = true
-    }
-    if (list.value.length == 0) {
-      load.value = 1
-    }
-    if (load.value < Number(pageNum.value)) {
-      load.value = Number(pageNum.value)
-    }
-    // console.log('整体页面加载次数===============>', load.value)
-    // 判断是否有已打开项，如果有重新载入之后自动打开
-    list.value = res.data.data.list || []
-    console.log('list.value------------>', list.value);
+      if (load.value < Number(pageNum.value)) {
+        load.value = Number(pageNum.value)
+      }
+      // console.log('整体页面加载次数===============>', load.value)
+      // 判断是否有已打开项，如果有重新载入之后自动打开
+      list.value = res.data.data.list || []
+      console.log('list.value------------>', list.value)
 
-    if (index || index === 0) {
-      list.value[index].show = true
-      showNew(list.value[index])
-    }
-    total.value = res.data.data.deptCount
-    showKey.value++
-    if (type == 'init' || type == 'changePage') {
-      getListByDeptId(list.value[0])
-    }
-  })
-}
-// 通过deptid查询列表
-const getListByDeptId = async (item) => {
-  console.log('通过deptid或者deptName查询列表------------>', item);
-  if (item.children.length == 0) {
-    let _obj = {
-      pageNum: item.pageNum,
-      pageSize: item.pageSize,
-      name: name.value,
-    }
-    let res;
-    // 西海岸 todo
-    if (whoShow.itShowXiHaiAn) {
-      _obj.deptName = item.deptName;
-      res = await selectResourceListByDeptName(_obj)
-    } else {
-      _obj.deptId = item.deptId || '';
-      res = await selectResourceListByDept(_obj)
-    }
-    console.log('res----根据部门查询-------->', res);
-    item.initLoading = false
-    if (res.data.code !== 0) {
-      return message.error(res.data.msg)
-    }
-    (res.data.data || []).map((val) => {
-      if (
-        (!item.load || item.load < Number(item.pageNum)) &&
-        load.value <= Number(pageNum.value)
-      ) {
+      if (index || index === 0) {
+        list.value[index].show = true
+        showNew(list.value[index])
+      }
+      total.value = res.data.data.deptCount
+      showKey.value++
+      if (type == 'init' || type == 'changePage') {
+        getListByDeptId(list.value[0])
+      }
+    })
+  }
+  // 通过deptid查询列表
+  const getListByDeptId = async (item) => {
+    console.log('通过deptid或者deptName查询列表------------>', item)
+    if (item.children.length == 0) {
+      let _obj = {
+        pageNum: item.pageNum,
+        pageSize: item.pageSize,
+        name: name.value,
+      }
+      let res
+      // 西海岸 todo
+      if (whoShow.itShowXiHaiAn) {
+        _obj.deptName = item.deptName
+        res = await selectResourceListByDeptName(_obj)
+      } else {
+        _obj.deptId = item.deptId || ''
+        res = await selectResourceListByDept(_obj)
+      }
+      console.log('res----根据部门查询-------->', res)
+      item.initLoading = false
+      if (res.data.code !== 0) {
+        return message.error(res.data.msg)
+      }
+      ;(res.data.data || []).map((val) => {
         if (
-          item.checkAll == true ||
-          checkedList.value.indexOf(item.deptId) > -1
+          (!item.load || item.load < Number(item.pageNum)) &&
+          load.value <= Number(pageNum.value)
         ) {
+          if (
+            item.checkAll == true ||
+            checkedList.value.indexOf(item.deptId) > -1
+          ) {
+            if (checkedListAbility.value.indexOf(val.id) == -1) {
+              checkedListAbility.value.push(val.id)
+              item.checkedList.push(val.id)
+            }
+            val.checked = true
+            checkNum.value++
+          } else if (checkedListAbility.value.indexOf(val.id) == -1) {
+            val.checked = false
+          }
+        } else {
+          if (
+            checkedListAbility.value.indexOf(val.id) > -1 ||
+            (item.load < Number(item.pageNum) &&
+              checkedListAll.value.indexOf(item.deptId) > -1)
+          ) {
+            val.checked = true
+          } else {
+            val.checked = false
+          }
+        }
+        val.loading = false
+      })
+      if (item.children.length == 0) {
+        item.load = 1
+      }
+      if (item.load < Number(item.pageNum)) {
+        item.load = Number(item.pageNum)
+      }
+      item.children = res.data.data
+      item.show = true
+    }
+  }
+  // 显示资源信息
+  const showBottom = (item) => {
+    debugger
+    item.show = !item.show
+    if (item.show) {
+      getListByDeptId(item)
+    }
+  }
+  const showNew = (item) => {
+    getListByDeptId(item)
+  }
+  // 切换页数
+  const pageChange = (val) => {
+    checkAll.value = false
+    pageNum.value = val
+    getList('changePage')
+  }
+  // 能力内分页
+  const pageChange2 = (item) => {
+    getListByDeptId(item)
+  }
+  // 点击部门多选框
+  const checkedDept = (item) => {
+    console.log(
+      '点击部门多选框==================>',
+      item,
+      checkedList.value,
+      checkAll.value
+    )
+    item.checked = !item.checked
+    if (item.checked) {
+      if (item.children.length > 0) {
+        item.children.map((val) => {
+          console.log('val.id------------>', val.id)
           if (checkedListAbility.value.indexOf(val.id) == -1) {
             checkedListAbility.value.push(val.id)
             item.checkedList.push(val.id)
           }
           val.checked = true
-          checkNum.value++
-        } else if (checkedListAbility.value.indexOf(val.id) == -1) {
-          val.checked = false
-        }
+        })
       } else {
-        if (
-          checkedListAbility.value.indexOf(val.id) > -1 ||
-          (item.load < Number(item.pageNum) &&
-            checkedListAll.value.indexOf(item.deptId) > -1)
-        ) {
-          val.checked = true
-        } else {
-          val.checked = false
-        }
+        getListByDeptId(item)
       }
-      val.loading = false
-    })
-    if (item.children.length == 0) {
-      item.load = 1
-    }
-    if (item.load < Number(item.pageNum)) {
-      item.load = Number(item.pageNum)
-    }
-    item.children = res.data.data
-    item.show = true
-  }
-}
-// 显示资源信息
-const showBottom = (item) => {
-  debugger
-  item.show = !item.show
-  if (item.show) {
-    getListByDeptId(item)
-  }
-}
-const showNew = (item) => {
-  getListByDeptId(item)
-}
-// 切换页数
-const pageChange = (val) => {
-  checkAll.value = false
-  pageNum.value = val
-  getList('changePage')
-}
-// 能力内分页
-const pageChange2 = (item) => {
-  getListByDeptId(item)
-}
-// 点击部门多选框
-const checkedDept = (item) => {
-  console.log(
-    '点击部门多选框==================>',
-    item,
-    checkedList.value,
-    checkAll.value
-  )
-  item.checked = !item.checked
-  if (item.checked) {
-    if (item.children.length > 0) {
-      item.children.map((val) => {
-        console.log('val.id------------>', val.id);
-        if (checkedListAbility.value.indexOf(val.id) == -1) {
-          checkedListAbility.value.push(val.id)
-          item.checkedList.push(val.id)
-        }
-        val.checked = true
-      })
-    } else {
-      getListByDeptId(item)
-    }
-    item.checkAll = true
-    checkedList.value.push(item.deptId)
-    checkedListAll.value.push(item.deptId)
-    judgeAll(item)
-    checkNum.value += Number(item.count)
-    if (checkedList.value.length == list.value.length) {
-      checkAll.value = true
-    }
-  } else {
-    if (item.children.length > 0) {
-      item.children.map((val) => {
-        if (checkedListAbility.value.indexOf(val.id) > -1) {
-          checkedListAbility.value.splice(
-            checkedListAbility.value.indexOf(val.id),
-            1
-          )
-          item.checkedList.splice(item.checkedList.indexOf(val.id), 1)
-          val.checked = false
-        }
-      })
-    }
-    item.checkAll = false
-    checkedList.value.splice(checkedList.value.indexOf(item.deptId), 1)
-    checkedListAll.value.splice(checkedListAll.value.indexOf(item.deptId), 1)
-    judgeAll(item)
-    if (checkedList.value.length !== list.value.length) {
-      checkAll.value = false
-    }
-    checkNum.value -= Number(item.count)
-  }
-}
-// 判断是否全选
-const judgeAll = (item, val) => {
-  console.log(
-    '判断是否全选============>',
-    item,
-    val,
-    list.value,
-    checkedList.value
-  )
-  if (!val) {
-    let all = true
-    list.value.map((val) => {
-      if (val.checkedList.length !== val.children.length) {
-        all = false
+      item.checkAll = true
+      checkedList.value.push(item.deptId)
+      checkedListAll.value.push(item.deptId)
+      judgeAll(item)
+      checkNum.value += Number(item.count)
+      if (checkedList.value.length == list.value.length) {
+        checkAll.value = true
       }
-    })
-    if (all) {
-      checkAll.value = true
     } else {
-      checkAll.value = false
-    }
-  } else {
-    let all = true
-    item.children.map((child) => {
-      if (checkedListAbility.value.indexOf(child.id) == -1) {
-        all = false
+      if (item.children.length > 0) {
+        item.children.map((val) => {
+          if (checkedListAbility.value.indexOf(val.id) > -1) {
+            checkedListAbility.value.splice(
+              checkedListAbility.value.indexOf(val.id),
+              1
+            )
+            item.checkedList.splice(item.checkedList.indexOf(val.id), 1)
+            val.checked = false
+          }
+        })
       }
-    })
-    if (all) {
-      item.checked = true
-    } else {
-      item.checked = false
+      item.checkAll = false
+      checkedList.value.splice(checkedList.value.indexOf(item.deptId), 1)
+      checkedListAll.value.splice(checkedListAll.value.indexOf(item.deptId), 1)
+      judgeAll(item)
+      if (checkedList.value.length !== list.value.length) {
+        checkAll.value = false
+      }
+      checkNum.value -= Number(item.count)
     }
   }
-}
-// 点击能力
-const checkedItem = (val, item) => {
-  // console.log('点击能力===========>', val, item, checkedListAbility.value)
-  item.checked = !item.checked
-  if (item.checked) {
-    checkNum.value++
-    if (checkedListAbility.value.indexOf(item.id) == -1) {
-      checkedListAbility.value.push(item.id)
-      val.checkedList.push(item.id)
-    }
-  } else {
-    checkNum.value--
-    checkedListAbility.value.splice(
-      checkedListAbility.value.indexOf(item.id),
-      1
+  // 判断是否全选
+  const judgeAll = (item, val) => {
+    console.log(
+      '判断是否全选============>',
+      item,
+      val,
+      list.value,
+      checkedList.value
     )
-    val.checkedList.splice(val.checkedList.indexOf(item.id), 1)
-  }
-  // console.log('判断是否全选===============>', val, checkedListAll.value)
-  if (val.checkedList.length == val.count) {
-    val.checked = true
-    checkedList.value.push(val.deptId)
-    checkedListAll.value.push(val.deptId)
-    // console.log(
-    //   '全选===========================>',
-    //   checkedList.value,
-    //   list.value
-    // )
-    if (checkedList.value.length == list.value.length) {
-      checkAll.value = true
-    }
-  } else {
-    val.checked = false
-    if (checkedList.value.indexOf(val.deptId) > -1) {
-      checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
-    }
-    if (checkedList.value.length !== list.value.length) {
-      checkAll.value = false
+    if (!val) {
+      let all = true
+      list.value.map((val) => {
+        if (val.checkedList.length !== val.children.length) {
+          all = false
+        }
+      })
+      if (all) {
+        checkAll.value = true
+      } else {
+        checkAll.value = false
+      }
+    } else {
+      let all = true
+      item.children.map((child) => {
+        if (checkedListAbility.value.indexOf(child.id) == -1) {
+          all = false
+        }
+      })
+      if (all) {
+        item.checked = true
+      } else {
+        item.checked = false
+      }
     }
   }
-}
-// 删除按钮
-const delList = () => {
-  if (checkedListAbility.value.length == 0) {
-    message.warning('请先选择需要操作的数据！')
-  } else {
+  // 点击能力
+  const checkedItem = (val, item) => {
+    // console.log('点击能力===========>', val, item, checkedListAbility.value)
+    item.checked = !item.checked
+    if (item.checked) {
+      checkNum.value++
+      if (checkedListAbility.value.indexOf(item.id) == -1) {
+        checkedListAbility.value.push(item.id)
+        val.checkedList.push(item.id)
+      }
+    } else {
+      checkNum.value--
+      checkedListAbility.value.splice(
+        checkedListAbility.value.indexOf(item.id),
+        1
+      )
+      val.checkedList.splice(val.checkedList.indexOf(item.id), 1)
+    }
+    // console.log('判断是否全选===============>', val, checkedListAll.value)
+    if (val.checkedList.length == val.count) {
+      val.checked = true
+      checkedList.value.push(val.deptId)
+      checkedListAll.value.push(val.deptId)
+      // console.log(
+      //   '全选===========================>',
+      //   checkedList.value,
+      //   list.value
+      // )
+      if (checkedList.value.length == list.value.length) {
+        checkAll.value = true
+      }
+    } else {
+      val.checked = false
+      if (checkedList.value.indexOf(val.deptId) > -1) {
+        checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
+      }
+      if (checkedList.value.length !== list.value.length) {
+        checkAll.value = false
+      }
+    }
+  }
+  // 删除按钮
+  const delList = () => {
+    if (checkedListAbility.value.length == 0) {
+      message.warning('请先选择需要操作的数据！')
+    } else {
+      sgcDel({
+        ids: checkedListAbility.value,
+      }).then((res) => {
+        if (res.data.msg === 'success') {
+          message.success('删除成功')
+          // console.log('删除申购车列表================>', res)
+          mybus.emit('getSgcNum')
+          clean()
+        }
+      })
+    }
+  }
+  //ceshiFunction
+  const ceshiFunction = () => {
+    // debugger
+    if (checkedListAbility.value.length == 0) {
+      message.warning('请先选择需要操作的数据！')
+    }
+  }
+  // delOne delList handleDelete
+  const handleDelete = (item, index) => {
+    console.log('item, index------------>', item, index)
+
+    console.log('item------------>', item)
+    let delArr = []
+    // 单个删除
+    if (index) {
+      delArr = [item.id]
+    } else {
+      // 批量删除
+      if (checkedListAbility.value.length == 0) {
+        return message.warning('请先选择需要操作的数据！')
+      } else {
+        delArr = checkedListAbility.value
+      }
+    }
     sgcDel({
-      ids: checkedListAbility.value,
+      ids: delArr,
     }).then((res) => {
       if (res.data.msg === 'success') {
         message.success('删除成功')
         // console.log('删除申购车列表================>', res)
         mybus.emit('getSgcNum')
-        clean()
+        clean(index)
+        // val.show = true
       }
     })
   }
-}
-//ceshiFunction
-const ceshiFunction = () => {
-  // debugger
-  if (checkedListAbility.value.length == 0) {
-    message.warning('请先选择需要操作的数据！')
+  const cancel = (e) => {
+    // console.log(e)
   }
-}
-// delOne delList handleDelete
-const handleDelete = (item, index) => {
-  console.log('item, index------------>', item, index);
-  
-  console.log('item------------>', item);
-  let delArr = [];
-  // 单个删除
-  if (index) {
-    delArr = [item.id]
-  } else {
-    // 批量删除
-    if (checkedListAbility.value.length == 0) {
-      return message.warning('请先选择需要操作的数据！')
+  // 详情
+  const showItem = (id, type, delFlag, note1) => {
+    if (type == '基础设施') {
+      // console.log()
+      let arr = JSON.parse(note1)
+      xVideoList.value = []
+      arr.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
+      videoVisible.value = true
     } else {
-      delArr = checkedListAbility.value
+      if (delFlag == 0) {
+        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+        mybus.emit('tabsChange', { flag: id })
+        // router.push({
+        //   path: '/details',
+        //   query: {
+        //     id: id,
+        //   },
+        // })
+        const detailPage = router.resolve({
+          path: '/details', // 跳转的页面路由
+          query: {
+            id: id,
+            hiddenBackFlag: true,
+          },
+        })
+        window.open(detailPage.href, '_blank')
+      }
     }
   }
-  sgcDel({
-    ids: delArr
-  }).then((res) => {
-    if (res.data.msg === 'success') {
-      message.success('删除成功')
-      // console.log('删除申购车列表================>', res)
-      mybus.emit('getSgcNum')
-      clean(index)
-      // val.show = true
-    }
-  })
-}
-const cancel = (e) => {
-  // console.log(e)
-}
-// 详情
-const showItem = (id, type, delFlag, note1) => {
-  if (type == '基础设施') {
-    // console.log()
-    let arr = JSON.parse(note1)
-    xVideoList.value = []
-    arr.map((val) => {
-      xVideoList.value.push({ name: val.channelName, key: val.channelId })
-    })
-    videoVisible.value = true
-  } else {
-    if (delFlag == 0) {
-      window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-      mybus.emit('tabsChange', { flag: id })
-      router.push({
-        path: '/details',
-        query: {
-          id: id,
-        },
-      })
-    }
-  }
-}
-// 一键申请
-const apply = () => {
-  if (checkedListAbility.value.length == 0) {
-    message.warning('请先选择需要申请的数据！')
-  } else {
-    let arr = []
-    let delArr = []
-    console.log('list.value------------>', list.value);
+  // 一键申请
+  const apply = () => {
+    if (checkedListAbility.value.length == 0) {
+      message.warning('请先选择需要申请的数据！')
+    } else {
+      let arr = []
+      let delArr = []
+      console.log('list.value------------>', list.value)
 
-    list.value.map((val) => {
-      val.arr = val.children.filter((item) => {
-        if (whoShow.itShowXiHaiAn) {
-          item.type = '基础设施';
-          item.resourceName = '摄像头列表';
-          item.resourceId = '1522550195055828996';
-        }
-        console.log('选择的数据=============>', item)
-        if (checkedListAbility.value.indexOf(item.id) > -1) {
-          if (item.delFlag == 0) {
-            return item
-          } else {
-            delArr.push(item)
+      list.value.map((val) => {
+        val.arr = val.children.filter((item) => {
+          if (whoShow.itShowXiHaiAn) {
+            item.type = '基础设施'
+            item.resourceName = '摄像头列表'
+            item.resourceId = '1522550195055828996'
           }
-        }
-      })
-    })
-    arr = list.value.filter((val) => val.arr.length !== 0)
-    if (delArr.length > 0) {
-      message.warning('已经下架的能力无法申请！')
-    }
-    if (arr.length > 0) {
-      console.log('一键申请===================>', arr)
-      localStorage.setItem('applyList', JSON.stringify(arr))
-      router.push({
-        path: '/apply',
+          console.log('选择的数据=============>', item)
+          if (checkedListAbility.value.indexOf(item.id) > -1) {
+            if (item.delFlag == 0) {
+              return item
+            } else {
+              delArr.push(item)
+            }
+          }
+        })
       })
+      arr = list.value.filter((val) => val.arr.length !== 0)
+      if (delArr.length > 0) {
+        message.warning('已经下架的能力无法申请！')
+      }
+      if (arr.length > 0) {
+        console.log('一键申请===================>', arr)
+        localStorage.setItem('applyList', JSON.stringify(arr))
+        router.push({
+          path: '/apply',
+        })
+      }
     }
   }
-}
 </script>
 <style lang="less" scoped>
-.ant-list {
+  .ant-list {
+    // max-height: 5.3rem;
+    .ant-list-item {
+      width: 100%;
+      padding: 0.24rem 0.2rem;
 
-  // max-height: 5.3rem;
-  .ant-list-item {
-    width: 100%;
-    padding: 0.24rem 0.2rem;
+      .ant-list-item-meta {
+        align-items: center;
 
-    .ant-list-item-meta {
-      align-items: center;
+        :deep(.ant-list-item-meta-avatar) {
+          padding-left: 0.2rem;
+          margin-right: 0.3rem;
+        }
 
-      :deep(.ant-list-item-meta-avatar) {
-        padding-left: 0.2rem;
-        margin-right: 0.3rem;
-      }
+        .time {
+          margin-left: 0.3rem;
+          font-size: 0.12rem;
+          color: #ccc;
+        }
 
-      .time {
-        margin-left: 0.3rem;
-        font-size: 0.12rem;
-        color: #ccc;
-      }
+        .type {
+          margin-left: 0.1rem;
+          padding: 0.03rem 0.1rem;
+          background: #00a7e3;
+          color: #fff;
+        }
 
-      .type {
-        margin-left: 0.1rem;
-        padding: 0.03rem 0.1rem;
-        background: #00a7e3;
-        color: #fff;
-      }
-
-      :deep(.ant-list-item-meta-description) {
-        margin-top: 0.1rem;
-        max-height: 0.22rem;
-        margin-right: 0.1rem;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 2;
-        word-break: break-all;
-        -webkit-box-orient: vertical;
-      }
-    }
-  }
-}
-
-.ant-list::-webkit-scrollbar {
-  width: 0 !important;
-}
-
-.top {
-  margin: 0.1rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid #f0f0f0;
-
-  .left {
-    display: flex;
-    align-items: center;
-
-    p {
-      height: 0.18rem;
-      line-height: 0.14rem;
-      padding-left: 0.1rem;
-      margin-bottom: 0;
-      border-left: 1px solid #212121;
-    }
-
-    .reverseSelection {
-      margin-right: 0.1rem;
-      cursor: pointer;
-    }
-
-    .reverseSelection:hover {
-      color: #0058e1;
-    }
-
-    span {
-      margin-left: 0.1rem;
-    }
-
-    .num {
-      margin-left: 0;
-      color: #0087ff;
-      font-size: 0.2rem;
-    }
-  }
-
-  .right {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-
-    button {
-      margin-bottom: 0.1rem;
-    }
-
-    .sousuokuang {
-      width: 3.25rem;
-      margin: 0.1rem 0rem 0.21rem 0.2rem;
-
-      .ant-input-search {
-        max-width: 3rem;
-      }
-
-      :deep(.ant-input) {
-        width: 2.4rem;
-        height: 0.36rem;
-        font-size: 0.14rem;
-        color: #000;
-        background: #fff;
-      }
-
-      :deep(.ant-input-group-addon) {
-        display: inline-block;
-        margin-left: 0.1rem;
-
-        .ant-input-search-button {
-          width: 0.65rem;
-          height: 0.36rem;
-          border-radius: 2px;
-          font-size: 0.14rem;
+        :deep(.ant-list-item-meta-description) {
+          margin-top: 0.1rem;
+          max-height: 0.22rem;
+          margin-right: 0.1rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          word-break: break-all;
+          -webkit-box-orient: vertical;
         }
       }
     }
   }
-}
 
-.title {
-  font-size: 0.2rem;
-  color: #000000;
-  font-family: 'Alibaba PuHuiTi';
-  font-weight: 500;
-  margin-top: 0.2rem;
-  margin-left: 0.2rem;
-}
-
-.tab {
-  margin-top: 0.1rem;
-  margin-left: 0.2rem;
-  margin-bottom: 0.1rem;
-  display: flex;
-  font-size: 0.14rem;
-  color: #999999;
-
-  div {
-    width: 0.7rem;
-    height: 0.24rem;
-    border: 0.01rem solid #cccccc;
-    border-radius: 0.12rem;
-    margin-left: 0.1rem;
-    text-align: center;
-    color: #666666;
-    cursor: pointer;
+  .ant-list::-webkit-scrollbar {
+    width: 0 !important;
   }
 
-  .tabclass {
-    border: 0.01rem solid #0087ff;
-    color: #0087ff;
-  }
-}
+  .top {
+    margin: 0.1rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #f0f0f0;
 
-.name {
-  max-width: 4.15rem;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
-  word-break: break-all;
-}
-
-.name:hover {
-  color: #0087ff;
-}
-
-.items {
-  height: 7.25rem;
-  padding: 0 0.3rem;
-  overflow-y: scroll;
-
-  .item {
-    .item-top {
-      width: 100%;
-      height: 0.6rem;
-      font-size: 20px;
-      font-weight: 600;
-      background: rgba(0, 135, 225, 0.1);
+    .left {
       display: flex;
-      justify-content: space-between;
       align-items: center;
-      padding: 0 0.1rem;
-      margin-top: 0.08rem;
-    }
 
-    .item-top:hover {
-      cursor: pointer;
-      // 0058e1 透明度 0.5
-      background: rgba(0, 88, 225, 0.8);
-      color: white;
+      p {
+        height: 0.18rem;
+        line-height: 0.14rem;
+        padding-left: 0.1rem;
+        margin-bottom: 0;
+        border-left: 1px solid #212121;
+      }
 
-      :deep(.anticon) {
-        color: white;
+      .reverseSelection {
+        margin-right: 0.1rem;
+        cursor: pointer;
+      }
+
+      .reverseSelection:hover {
+        color: #0058e1;
+      }
+
+      span {
+        margin-left: 0.1rem;
+      }
+
+      .num {
+        margin-left: 0;
+        color: #0087ff;
+        font-size: 0.2rem;
       }
     }
 
-    .item-bottom {
-      padding: 0 0.2rem;
-      border: 1px solid rgba(0, 135, 225, 0.1);
+    .right {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+
+      button {
+        margin-bottom: 0.1rem;
+      }
+
+      .sousuokuang {
+        width: 3.25rem;
+        margin: 0.1rem 0rem 0.21rem 0.2rem;
+
+        .ant-input-search {
+          max-width: 3rem;
+        }
+
+        :deep(.ant-input) {
+          width: 2.4rem;
+          height: 0.36rem;
+          font-size: 0.14rem;
+          color: #000;
+          background: #fff;
+        }
+
+        :deep(.ant-input-group-addon) {
+          display: inline-block;
+          margin-left: 0.1rem;
+
+          .ant-input-search-button {
+            width: 0.65rem;
+            height: 0.36rem;
+            border-radius: 2px;
+            font-size: 0.14rem;
+          }
+        }
+      }
     }
   }
-}
 
-:deep(.ant-list-item-meta-avatar) {
-  display: flex;
-  align-items: center;
-}
+  .title {
+    font-size: 0.2rem;
+    color: #000000;
+    font-family: 'Alibaba PuHuiTi';
+    font-weight: 500;
+    margin-top: 0.2rem;
+    margin-left: 0.2rem;
+  }
 
-.ant-pagination {
-  margin-bottom: 0.2rem;
-}
+  .tab {
+    margin-top: 0.1rem;
+    margin-left: 0.2rem;
+    margin-bottom: 0.1rem;
+    display: flex;
+    font-size: 0.14rem;
+    color: #999999;
 
-.tx {
-  display: inline-block;
-  width: 0.8rem;
-  height: 0.8rem;
-  margin-left: 0.1rem;
-}
+    div {
+      width: 0.7rem;
+      height: 0.24rem;
+      border: 0.01rem solid #cccccc;
+      border-radius: 0.12rem;
+      margin-left: 0.1rem;
+      text-align: center;
+      color: #666666;
+      cursor: pointer;
+    }
 
-.sxt {
-  background: url('~@/assets/home/sxt_square.png') no-repeat;
-  background-size: 100%;
-}
+    .tabclass {
+      border: 0.01rem solid #0087ff;
+      color: #0087ff;
+    }
+  }
 
-.yyzy {
-  background: url('~@/assets/home/yyzy_square.png') no-repeat;
-  background-size: 100%;
-}
+  .name {
+    max-width: 4.15rem;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    word-break: break-all;
+  }
 
-.znsf {
-  background: url('~@/assets/home/znsf_square.png') no-repeat;
-  background-size: 100%;
-}
+  .name:hover {
+    color: #0087ff;
+  }
 
-.tcfw {
-  background: url('~@/assets/home/tcfw_square.png') no-repeat;
-  background-size: 100%;
-}
+  .items {
+    height: 7.25rem;
+    padding: 0 0.3rem;
+    overflow-y: scroll;
 
-.kfzj {
-  background: url('~@/assets/home/kfzj_square.png') no-repeat;
-  background-size: 100%;
-}
+    .item {
+      .item-top {
+        width: 100%;
+        height: 0.6rem;
+        font-size: 20px;
+        font-weight: 600;
+        background: rgba(0, 135, 225, 0.1);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 0.1rem;
+        margin-top: 0.08rem;
+      }
 
-.ywzj {
-  background: url('~@/assets/home/ywzj_square.png') no-repeat;
-  background-size: 100%;
-}
+      .item-top:hover {
+        cursor: pointer;
+        // 0058e1 透明度 0.5
+        background: rgba(0, 88, 225, 0.8);
+        color: white;
 
-:deep(.ant-list-item-meta-title) {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+        :deep(.anticon) {
+          color: white;
+        }
+      }
 
-  div {
+      .item-bottom {
+        padding: 0 0.2rem;
+        border: 1px solid rgba(0, 135, 225, 0.1);
+      }
+    }
+  }
+
+  :deep(.ant-list-item-meta-avatar) {
     display: flex;
     align-items: center;
   }
-}
 
-.collect-btn {
-  width: 1rem;
-  height: 0.36rem;
-  border-radius: 2px;
-  background: #fff;
-  color: #0558e1;
-}
+  .ant-pagination {
+    margin-bottom: 0.2rem;
+  }
 
-.apply-btn {
-  width: 1rem;
-  height: 0.36rem;
-  margin-left: 0.12rem;
-  border-radius: 2px;
-}
+  .tx {
+    display: inline-block;
+    width: 0.8rem;
+    height: 0.8rem;
+    margin-left: 0.1rem;
+  }
+
+  .sxt {
+    background: url('~@/assets/home/sxt_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .yyzy {
+    background: url('~@/assets/home/yyzy_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .znsf {
+    background: url('~@/assets/home/znsf_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .tcfw {
+    background: url('~@/assets/home/tcfw_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .kfzj {
+    background: url('~@/assets/home/kfzj_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .ywzj {
+    background: url('~@/assets/home/ywzj_square.png') no-repeat;
+    background-size: 100%;
+  }
+
+  :deep(.ant-list-item-meta-title) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    div {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .collect-btn {
+    width: 1rem;
+    height: 0.36rem;
+    border-radius: 2px;
+    background: #fff;
+    color: #0558e1;
+  }
+
+  .apply-btn {
+    width: 1rem;
+    height: 0.36rem;
+    margin-left: 0.12rem;
+    border-radius: 2px;
+  }
 </style>
diff --git a/front/src/views/personalCenter/index.vue b/front/src/views/personalCenter/index.vue
index d8eeeedf..85ab677e 100644
--- a/front/src/views/personalCenter/index.vue
+++ b/front/src/views/personalCenter/index.vue
@@ -6,20 +6,28 @@
         <aside-menu></aside-menu>
       </aside>
       <article>
+        <!-- 我的申请 -->
         <div class="form-container">
-   
           <template v-if="showFlag === 'apply'">
-            <my-apply-xha v-if="xinhaian" :tabTypeName="tabTypeName"></my-apply-xha>
+            <my-apply-xha
+              v-if="xinhaian"
+              :tabTypeName="tabTypeName"
+            ></my-apply-xha>
             <my-apply v-else :tabTypeName="tabTypeName"></my-apply>
           </template>
-         
+          <!-- 我的发布 -->
           <my-publish v-if="showFlag === 'push'"></my-publish>
+          <!-- 申购车 -->
           <purchase-vehicle
             v-if="showFlag === 'PurchaseVehicle'"
           ></purchase-vehicle>
+          <!-- 我的收藏 -->
           <collection v-else-if="showFlag === 'collect'"></collection>
+          <!-- 我的需求 -->
           <my-application v-else-if="showFlag === 'demand'"></my-application>
+          <!-- 我的评论 -->
           <my-comments v-else-if="showFlag === 'remark'"></my-comments>
+          <!-- 我的浏览 -->
           <my-browse v-else-if="showFlag === 'recent'"></my-browse>
         </div>
       </article>
@@ -76,30 +84,30 @@
     background-color: #f5f8fc;
     height: 100%;
     width: 100%;
-    margin: 64px auto 0;
+    margin: 0.64rem auto 0;
     display: flex;
     justify-content: center;
     position: relative;
     aside {
-      width: 282px;
+      width: 2.82rem;
       height: 96%;
       overflow-y: auto;
       background-color: #fff;
       margin: 1% 0 3%;
     }
     article {
-      width: 1090px;
+      width: 10.9rem;
       height: 99%;
       // overflow-y: auto;
       background-color: #fff;
-      margin: 1% 0 1% 14px;
+      margin: 1% 0 1% 0.14rem;
     }
     .form-container {
       .title {
-        font-size: 20px;
+        font-size: 0.2rem;
         color: #000;
         font-weight: bold;
-        margin-bottom: 20px;
+        margin-bottom: 0.2rem;
       }
     }
   }