diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 4e9ed28a..c915ad33 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -192,7 +192,11 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会客厅" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
+            <el-table-column prop="hys" label="会客厅" min-width="100%" >
+            </el-table-column>
+            <el-table-column prop="yzy" label="云资源" min-width="100%" >
+            </el-table-column>
+            <el-table-column prop="ysp" label="云视频" min-width="100%" >
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -381,7 +385,9 @@ export default {
         { name: '开发组件', value: 3 },
         { name: '业务组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会客厅', value: 6 }
+        { name: '会客厅', value: 6 },
+        { name: '云资源', value: 7 },
+        { name: '云视频', value: 8 }
       ], // 类型备选列表
       typeOptions1: [// 能力上架隐藏会客厅
         { name: '智能算法', value: 1 },
@@ -401,7 +407,7 @@ export default {
       this.departmentSelects = []
       this.provideSelects = []
       res.data.data.map(val => {
-        this.departmentSelects.push({ label: val.name, value: val.id })
+        this.departmentSelects.push({ label: val.name, value: val.name })
         this.provideSelects.push({ label: val.name, value: val.name })
       })
     })
diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js
index 28ae1359..1401c4f9 100644
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@@ -338,6 +338,23 @@ export function getDeviceDetail(deviceId) {
   })
 }
 
+// 政务云资源列表
+export function getZwyBusinessList(params) {
+  return request({
+    url: '/act/task/getZwyBusinessList',
+    method: 'get',
+    params
+  })
+}
+// 政务云资源列详情
+export function getZwyBusinessInfoById(params) {
+  return request({
+    url: '/act/task/getZwyBusinessInfoById',
+    method: 'get',
+    params
+  })
+}
+
 // 催办
 export function treminders(data) {
   return request({
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 02a63db3..851592a9 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -92,7 +92,9 @@
       <div class="bottom" @click="goToView()">查看更多</div>
     </div>
     <div class="info">
-      <i class="img"></i>
+      <i class="img"  @click="
+            jumpPage({ name: '个人中心', key: 'personalCenter' }, 'headerClick')
+          "></i>
       <a-tooltip placement="bottom">
         <template #title>
           <span>{{ user.realName }}</span>
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index d88ff14f..01c9b646 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -252,8 +252,7 @@
         }
       }
       const showToolTip = (e) => {
-        console.log('鼠标移入', e, e.target.clientWidth, e.target.scrollWidth)
-        debugger
+       
         if (e.target.clientWidth < 200) {
           e.target.style.pointerEvents = 'none' // 阻止鼠标事件
         }
diff --git a/front/src/views/personalCenter/components/CloudDetails.vue b/front/src/views/personalCenter/components/CloudDetails.vue
new file mode 100644
index 00000000..296a2091
--- /dev/null
+++ b/front/src/views/personalCenter/components/CloudDetails.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="top">
+    <div class="title">基本信息</div>
+    <div class="main">
+      <div>
+        <p class="item">
+          <span>业务名称：{{baseInfo.BUSINESS_NAME}}</span>
+        </p>
+        <p class="item">
+          <span>业务id :{{baseInfo.BSNUM}}</span>
+        </p>
+        <p class="item">
+          <span>状态：{{baseInfo.STATUS}}</span>
+        </p>
+        <p class="item">
+          <span>申请时间: {{baseInfo.CREATE_TIME}}</span>
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="top">
+    <div class="title">申请资源</div>
+
+    <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
+      <template #bodyCell="{ column, text }">
+      </template>
+    </a-table>
+  </div>
+</template>
+<script setup>
+import { onMounted, defineProps, ref } from 'vue'
+import {
+  getZwyBusinessInfoById
+} from '@/api/personalCenter'
+const props = defineProps({
+  BSNUM: { type: String, default: '' },
+  baseInfo: { type: Object, default: null },
+
+})
+const BSNUM = ref('')
+const baseInfo = ref({})
+BSNUM.value = props.BSNUM
+baseInfo.value = props.baseInfo
+const columns = ref([
+  {
+    title: '资源类型',
+    dataIndex: 'SOURCE_TYPE',
+  }, {
+    title: '资源名称',
+    dataIndex: 'NAME',
+  }, {
+    title: '备注',
+    dataIndex: 'INFO',
+  },
+])
+const xVideoList = ref([
+  
+])
+onMounted(() => {
+  
+  const params={
+    "id":BSNUM.value
+  }
+  getZwyBusinessInfoById(params).then(
+      (res) => {
+        xVideoList.value = res.data.data
+        num.value = []
+        total.value = res.data.data.total
+      }
+    )
+})
+
+</script>
+<style lang="less" scoped>
+.title {
+  font-size: 0.18rem;
+  color: #000;
+  font-weight: bold;
+  margin-bottom: 0.2rem;
+  padding-left: 0.1rem;
+  border-left: 0.06rem #0058e1 solid;
+  margin-left: 12px;
+}
+
+// .resource{
+//   margin: 0.1rem 0.2rem;
+// }
+.top {
+  margin: 0.1rem 0.2rem;
+
+  .main {
+    background: #eee;
+    padding: 0.2rem 0.2rem 0.1rem;
+    height: 100px;
+
+    .item {
+      width: 450px;
+      float: left;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index dfbe4efe..f9cd1cf4 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -1,7 +1,18 @@
 <template>
   <div class="on-the-right-side-of-the-list">
     <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
-    <div class="tab" style="margin-bottom: 0.1rem">
+    <div class="second-title">
+      <div
+        style="margin-right: 30px"
+        v-for="(item, index) in chooseList"
+        :class="chooseTab == index ? 'chooseStyle' : 'noChooseStyle'"
+        :key="index"
+        @click="handleTab(index)"
+      >
+      {{item}}
+      </div>
+    </div>
+    <div class="tab" style="margin-bottom: 0.1rem" v-show="(chooseTab==0)">
       <span>类型</span>
       <div
         :class="typeIndex == index ? 'tabclass' : ' '"
@@ -14,7 +25,7 @@
     </div>
     <div
       class="tab"
-      v-show="typeIndex != 5 && typeIndex != 6 && typeIndex != 7"
+      v-if="(chooseTab != 1 && chooseTab != 2 && chooseTab != 3)"
     >
       <span>申请状态</span>
       <div
@@ -34,25 +45,86 @@
         </template>
       </div>
     </div>
-    <a-form
-      :model="formState"
-      name="basic"
-      :label-col="{ span: 8 }"
-      :wrapper-col="{ span: 16 }"
-      autocomplete="off"
-      @submit="onSubmit"
-      v-if="typeIndex == 6 || typeIndex == 7"
-      style="display: flex; margin-top: 10px; margin-left: -35px"
-    >
-      <a-form-item label="名称" name="name">
-        <a-input v-model:value="formState.name" />
-      </a-form-item>
+  <!--政务云资源-->
+    <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"
+              >
+              <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>
 
-      <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-        <a-button type="primary" html-type="submit">搜索</a-button>
-      </a-form-item>
-    </a-form>
-    <div v-if="contentList.data.length > 0">
+            <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>
+      <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 />
+    </template>
+    <!--数据资源和视频资源-->
+    <template v-else-if="(chooseTab==1||chooseTab==3)">
+      <a-empty></a-empty>
+    </template>
+      <!--UCS内部资源-->
+    <template v-else>
+      <div v-if="contentList.data.length > 0">
       <div class="content">
         <div
           class="content-body"
@@ -198,6 +270,7 @@
           pageSize="4"
           :total="total"
           :current="page"
+          :showTotal="(total) => `共 ${total} 项`"
           @change="handleCurrentChange"
           @showSizeChange="handlePageSizeChange"
           :showSizeChanger="false"
@@ -205,7 +278,29 @@
       </div>
     </div>
     <a-empty v-else />
-    <a-modal
+    </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>
+  <a-modal
       bodyStyle="padding:0.1rem 0"
       v-model:visible="detailsVisible"
       style="width: 1000px"
@@ -255,8 +350,6 @@
         </template>
       </a-table>
     </a-modal>
-  </div>
-
   <!-- 联系方式弹框 -->
   <a-modal
     v-model:visible="phoneVisible"
@@ -291,6 +384,8 @@
     yaweiApproveDetails,
     getResourceBusinessList,
     getVideoBusinessList,
+    getCategoryTreePage,
+    getZwyBusinessList
   } from '@/api/personalCenter'
   import {
     updateRes,
@@ -303,6 +398,7 @@
   import { getUserInfo } from '@/api/user'
   import { message } from 'ant-design-vue'
   import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
+  import CloudDetails from '@/views/personalCenter/components/CloudDetails'
   import mybus from '@/myplugins/mybus'
   import * as moment from 'moment'
 
@@ -311,27 +407,34 @@
   })
   const router = useRouter()
   const userName = ref('')
+  //云资源下拉框
+  let cloudResourceStatusList=ref([])
   getUserInfo().then((res) => {
     userName.value = res.data.data.username
   })
   const formState = ref({ name: '' })
   // 西海岸-设备申请
   let isXiHaiAn = whoShow.itShowXiHaiAn
-  let typeList = ref(
-    isXiHaiAn
-      ? ['能力申请', '能力上架', '能力下架', '能力需求', '需求评论']
-      : [
+  //选择展示的Tab页
+  let chooseTab=ref(0)
+  //云资源查询条件
+  let yunForm=reactive({
+    status:'',
+    busineesName:'',
+  })
+  let chooseList=ref(['UCS内部资源','数据资源','政务云资源','视频资源'])
+  let typeList = ref( [
           '能力申请',
           '能力上架',
           '能力下架',
           '能力需求',
           '需求评论',
-          '数据资源申请',
-          '云资源申请',
-          '云视频申请',
-          // '能力评价',
-        ]
-  )
+          // '数据资源申请',
+          // '云资源申请',
+          // '云视频申请',
+       
+  ])
+
   const itShowXiHaiAn = ref(isXiHaiAn)
   const phoneSate = ref([2, 3])
   if (isXiHaiAn) {
@@ -346,9 +449,14 @@
   let tabList = ref(['全部', '审核中', '审核完成'])
   const contentList = reactive({ data: [] })
   const contentList2 = reactive({ data: [] }) // 云资源 云视频前端过滤使用
+  //政务云资源
+  const cloudList = reactive({ data: [
+
+]})
   let tabIndex = ref(0)
   let typeIndex = ref(0)
   let typeName = ref(typeList.value[0])
+
   if (router.currentRoute.value.query.tabTypeName) {
     typeName.value = router.currentRoute.value.query.tabTypeName
   }
@@ -365,6 +473,8 @@
   let name = ref('')
   const detailsVisible = ref(false)
   const detailsVisible2 = ref(false)
+  //政务云资源详情
+  const cloudVisible=ref(false)
   const businessKey = ref('')
   const processInstanceId = ref('')
   const processDefinitionName = ref('')
@@ -375,6 +485,9 @@
   const taskId = ref('')
   const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
   const refObj = ref({})
+  //政务云详情
+  const BSNUM = ref('')
+  const baseInfo = ref({})
   const num = ref({
     finished: 0,
     unfinished: 0,
@@ -401,6 +514,50 @@
     typeName.value = item
     getApplyList()
   }
+  //选择tab
+  const handleTab=(index)=>{
+    chooseTab.value=index
+    if(index==2){
+      //查询政务云状态
+      getCloudResource()
+      getCloudList()
+    }
+  }
+  const cloudSearchReserve = () =>{
+    Object.keys(yunForm).map(key => {
+      delete yunForm[key]
+    })
+  getCloudList()
+  }
+  //查询政务云数据
+  const getCloudList = () => {
+    const params = {
+      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
+        }
+      )
+  }
+  //查询政务云状态
+  const getCloudResource = () => {
+    getCategoryTreePage({
+        page: 1,
+        limit: 20,
+        dictTypeId: '1601043884320755714',
+        deFlage: 0,
+      }).then((res) => {
+        cloudResourceStatusList.value = res.data.data.list
+  })
+}
+
 
   // 申请状态切换
   function changeApplyState(item, index) {
@@ -464,6 +621,14 @@
     '06': '交付',
   }
   const cilckRowData = ref({})
+  //查看政务云详情
+  const showCloudDetail=(item)=>{
+      //待完成
+      cloudVisible.value = true
+      BSNUM.value=item.BSNUM
+      baseInfo.value=item
+
+  }
   const showDetail = (item) => {
     cilckRowData.value = item
     // 西海岸-申请时间过期，提示
@@ -810,12 +975,12 @@
         contentList.data = res.data.data.list
         total.value = res.data.data.total
         initNum()
-        console.log('typeIndex', typeIndex.value)
+ 
         switch (typeIndex.value) {
           case 1:
             contentList.data.map((val) => {
               nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
-                console.log('上架===========>', res1.data.data)
+            
                 val.title = res1.data.data.resourceDTO.name
                 val.dto = res1.data.data.resourceDTO
                 showType.value = '能力上架'
@@ -869,12 +1034,23 @@
   }
   const handleCurrentChange = (val) => {
     page.value = val
-    getApplyList()
+    if(chooseTab==2){
+      getCloudList()
+    }else{
+      getApplyList()
+    }
+   
+
   }
 
   const handlePageSizeChange = (val) => {
     page.value = val
-    getApplyList()
+    if(chooseTab==2){
+      getCloudList()
+    }else{
+      getApplyList()
+    }
+  
   }
 
   const viewDetail = (processDefinitionName, id, ended, businessKey) => {
@@ -988,6 +1164,7 @@
     phoneVisible.value = true
   }
 
+
   mybus.on('closeModal', (obj) => {
     detailsVisible.value = false
     changeType(obj.type, obj.index)
@@ -1006,6 +1183,15 @@
 </script>
 
 <style scoped lang="less">
+.queryButton{
+  background: #0058e1;
+  width: 80px;
+   height: 32px;
+    margin-left: 20px;
+    border:1px solid #0058e1;
+    border-radius: 2px;
+    color:#fff;
+}
   .on-the-right-side-of-the-list {
     background: #ffffff;
     padding: 20px 0px 30px 20px;
@@ -1018,6 +1204,32 @@
     flex-direction: column;
     font-size: 16px;
     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;
+
+}
+
+.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;
@@ -1076,7 +1288,56 @@
         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-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 {
       padding-right: 10px;
       height: 610px;
diff --git a/front/src/views/personalCenter/components/MyApplyXha.vue b/front/src/views/personalCenter/components/MyApplyXha.vue
new file mode 100644
index 00000000..dfbe4efe
--- /dev/null
+++ b/front/src/views/personalCenter/components/MyApplyXha.vue
@@ -0,0 +1,1201 @@
+<template>
+  <div class="on-the-right-side-of-the-list">
+    <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
+    <div class="tab" style="margin-bottom: 0.1rem">
+      <span>类型</span>
+      <div
+        :class="typeIndex == index ? 'tabclass' : ' '"
+        @click="changeType(item, index)"
+        v-for="(item, index) in typeList"
+        :key="index"
+      >
+        {{ item }}
+      </div>
+    </div>
+    <div
+      class="tab"
+      v-show="typeIndex != 5 && typeIndex != 6 && typeIndex != 7"
+    >
+      <span>申请状态</span>
+      <div
+        :class="tabIndex == index ? 'tabclass' : ' '"
+        @click="changeApplyState(item, index)"
+        v-for="(item, index) in tabList"
+        :key="index"
+      >
+        <a-badge
+          :count="item === '审核中' ? num.unfinished : num.finished"
+          v-if="item !== '全部'"
+        >
+          {{ item }}
+        </a-badge>
+        <template v-else>
+          {{ item }}
+        </template>
+      </div>
+    </div>
+    <a-form
+      :model="formState"
+      name="basic"
+      :label-col="{ span: 8 }"
+      :wrapper-col="{ span: 16 }"
+      autocomplete="off"
+      @submit="onSubmit"
+      v-if="typeIndex == 6 || typeIndex == 7"
+      style="display: flex; margin-top: 10px; margin-left: -35px"
+    >
+      <a-form-item label="名称" name="name">
+        <a-input v-model:value="formState.name" />
+      </a-form-item>
+
+      <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
+        <a-button type="primary" html-type="submit">搜索</a-button>
+      </a-form-item>
+    </a-form>
+    <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-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>
+          <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>
+      <div class="bottom">
+        <a-pagination
+          size="small"
+          pageSize="4"
+          :total="total"
+          :current="page"
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+          :showSizeChanger="false"
+        />
+      </div>
+    </div>
+    <a-empty v-else />
+    <a-modal
+      bodyStyle="padding:0.1rem 0"
+      v-model:visible="detailsVisible"
+      style="width: 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 #bodyCell="{ column, text }">
+          <!-- <template>
+        <a>{{ text }}</a>
+      </template> -->
+        </template>
+      </a-table>
+    </a-modal>
+  </div>
+
+  <!-- 联系方式弹框 -->
+  <a-modal
+    v-model:visible="phoneVisible"
+    title="提示"
+    @ok="phoneVisible = false"
+  >
+    <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
+    <p>请联系工业信息化局，电话：199 6399 0996</p>
+  </a-modal>
+</template>
+
+<script setup>
+  import {
+    onMounted,
+    reactive,
+    ref,
+    onBeforeUnmount,
+    h,
+    defineProps,
+    nextTick,
+  } from 'vue'
+  import {
+    getMyProcessInstancePage,
+    getTabilityapplication,
+    getByApplyFlag,
+    nengliziyuanshangjiaapply,
+    getDemandForm,
+    demandComment,
+    deviceApplylist,
+    getDeviceDetail,
+    yaweiApproveStatus,
+    yaweiApproveDetails,
+    getResourceBusinessList,
+    getVideoBusinessList,
+  } from '@/api/personalCenter'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+    selectOneDel,
+  } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import { getUserInfo } from '@/api/user'
+  import { message } from 'ant-design-vue'
+  import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
+  import mybus from '@/myplugins/mybus'
+  import * as moment from 'moment'
+
+  const props = defineProps({
+    tabTypeName: { type: String, default: '' },
+  })
+  const router = useRouter()
+  const userName = ref('')
+  getUserInfo().then((res) => {
+    userName.value = res.data.data.username
+  })
+  const formState = ref({ name: '' })
+  // 西海岸-设备申请
+  let isXiHaiAn = whoShow.itShowXiHaiAn
+  let typeList = ref(
+    isXiHaiAn
+      ? ['能力申请', '能力上架', '能力下架', '能力需求', '需求评论']
+      : [
+          '能力申请',
+          '能力上架',
+          '能力下架',
+          '能力需求',
+          '需求评论',
+          '数据资源申请',
+          '云资源申请',
+          '云视频申请',
+          // '能力评价',
+        ]
+  )
+  const itShowXiHaiAn = ref(isXiHaiAn)
+  const phoneSate = ref([2, 3])
+  if (isXiHaiAn) {
+    typeList.value.push('设备申请')
+  }
+  const typeStrObj = {
+    能力上架: 'resourcemountapply',
+    能力下架: 'resourcundercarriageapply',
+    能力需求: 'abilitydemandapply',
+    需求评论: 'comment_review',
+  }
+  let tabList = ref(['全部', '审核中', '审核完成'])
+  const contentList = reactive({ data: [] })
+  const contentList2 = reactive({ data: [] }) // 云资源 云视频前端过滤使用
+  let tabIndex = ref(0)
+  let typeIndex = ref(0)
+  let typeName = ref(typeList.value[0])
+  if (router.currentRoute.value.query.tabTypeName) {
+    typeName.value = router.currentRoute.value.query.tabTypeName
+  }
+  const videoVisible = ref(false)
+  const numFlag = ref(true)
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([])
+
+  let name = ref('')
+  const detailsVisible = ref(false)
+  const detailsVisible2 = ref(false)
+  const businessKey = ref('')
+  const processInstanceId = ref('')
+  const processDefinitionName = ref('')
+  const resourceId = ref('')
+  const reason = ref('')
+  const visible = ref(false)
+  const delObj = ref({})
+  const taskId = ref('')
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
+  const refObj = ref({})
+  const num = ref({
+    finished: 0,
+    unfinished: 0,
+  })
+  const total = ref('')
+  const showType = ref('')
+  const page = ref('1')
+  const ended = ref('')
+  const processDefinitionKey = ref('')
+  const phoneVisible = ref(false)
+
+  // 选择类型
+  const changeType = (item, index) => {
+    contentList.data = []
+    formState.value.name = ''
+    console.log('item, index-----选择类型------->', item, index)
+    numFlag.value = true
+    num.value = []
+    showType.value = ''
+    tabIndex.value = 0
+    ended.value = ''
+    page.value = 1
+    typeIndex.value = index
+    typeName.value = item
+    getApplyList()
+  }
+
+  // 申请状态切换
+  function changeApplyState(item, index) {
+    tabIndex.value = index
+    switch (item) {
+      case '审核中':
+        page.value = 1
+        ended.value = false
+        getApplyList()
+        break
+      case '审核完成':
+        page.value = 1
+        ended.value = true
+        getApplyList()
+        break
+      case '全部':
+        page.value = 1
+        ended.value = ''
+        getApplyList()
+        break
+    }
+  }
+
+  const applytype = {
+    '01': '新增',
+    '02': '变更',
+    '03': '停用',
+    '04': '核减',
+  }
+  const sourcetype = {
+    '01': '云主机',
+    '02': '云数据库',
+    '03': '对象存储',
+    '04': '堡垒机',
+    '05': '备份服务',
+    '06': '防火墙',
+    '07': '网闸',
+    '08': '负载均衡',
+    '09': '公网ip',
+    10: '托管服务',
+    11: '大数据服务',
+  }
+  const status = {
+    '00': '草稿',
+    '01': '提交',
+    '03': '一级部门提交',
+    '04': '驳回',
+    '05': '审核通过',
+    '06': '交付',
+    '07': '作废',
+    99: '终止办结',
+  }
+  const status2 = {
+    '00': '草稿',
+    '01': '提交',
+    '02': '大数据局审核通过',
+    '04': '大数据局驳回',
+    '03': '提交给视频所属部门',
+    '08': '视频所属部门审核中',
+    '05': '视频所属部门已审核',
+    '06': '交付',
+  }
+  const cilckRowData = ref({})
+  const showDetail = (item) => {
+    cilckRowData.value = item
+    // 西海岸-申请时间过期，提示
+    if (isXiHaiAn) {
+      if (item.expireDate) {
+        let diff = moment().diff(moment(item.expireDate), 'seconds')
+        if (diff > 0) {
+          return message.error('当前申请已过期！')
+        }
+      }
+    }
+    if (typeName.value == '能力申请' && item.applyFlag) {
+      getByApplyFlag(item.applyFlag).then((res) => {
+        if (res.data.code == 0) {
+          refObj.value = res.data.data
+          detailsVisible.value = true
+          processDefinitionName.value = item.processDefinitionName
+          businessKey.value = item.businessKey
+          processInstanceId.value = item.instanceId
+          resourceId.value = item.resourceId
+        } else {
+          message.error('数据请求失败！')
+        }
+      })
+    } else if (typeName.value == '数据资源申请') {
+      yaweiApproveDetails({ applyGuid: item.GUID })
+        .then((res) => {
+          console.log('详情===========>', res.data.data)
+          if (res.data.code !== 0) {
+            message.error('数据请求失败！')
+            return
+          }
+          res.data.data.map((val) => {
+            val.clsj = moment(val.clsj).format('YYYY-MM-DD HH:mm:ss')
+          })
+          refObj.value.description = '数据资源'
+          refObj.value.sqbm = item.sqbm // 申请部门
+          refObj.value.title = item.title // 需求标题
+          refObj.value.ywlxr = item.ywlxr // 业务联系人
+          refObj.value.ywlxrdh = item.ywlxrdh // 业务联系人电话
+          refObj.value.jslxr = item.jslxr // 技术联系人X
+          refObj.value.jslxrdh = item.jslxrdh // 技术联系人电话
+          refObj.value.miaoshu = item.miaoshu // 共享数据必要性法分析
+          // refObj.value.zt = item.zt // 办结结果
+          refObj.value.LEVEL = item.LEVEL // 办结结果ZBM": 区市管理员办理中 BM":部门办理中 SZQ": 市级管理员办理中 QZS":区级管理员办理中
+          refObj.value.resourceApplication = {
+            dataSource: [
+              {
+                instanceId: item.GUID,
+                taskHandleDetailInfo: res.data.data,
+              },
+            ],
+          } // 流程
+          detailsVisible.value = true
+        })
+        .catch((err) => {})
+    } else if (
+      typeName.value == '云资源申请' ||
+      typeName.value == '云视频申请'
+    ) {
+      refObj.value.description = '政务云'
+      if (typeName.value == '云资源申请') {
+        refObj.value.STATUS = status[item.STATUS] // 状态
+      } else {
+        refObj.value.STATUS = status2[item.STATUS] // 状态
+      }
+      refObj.value.CREATE_TIME = moment(
+        item.CREATE_TIME.time + 480 * 60 * 1000
+      ).format('YYYY-MM-DD HH:mm:ss')
+      // 操作时间
+      refObj.value.BUSINESS_NAME = item.BUSINESS_NAME // 业务名称
+      refObj.value.BSNUM = item.BSNUM // 业务id
+      refObj.value.APPLYTYPE = applytype[item.APPLYTYPE] // 申请类型
+      refObj.value.SOURCE_TYPE = sourcetype[item.SOURCE_TYPE] // 资源类型
+      refObj.value.REGION_CODE = item.REGION_CODE // 区划编码
+      refObj.value.REGION_NAME = item.REGION_NAME // 区划名称
+      refObj.value.ORG_NAME = item.ORG_NAME // 部门名称
+      refObj.value.ORG_CODE = item.ORG_CODE // 部门名称编码
+      refObj.value.AGENT_NAME = item.AGENT_NAME // 处室名称
+      refObj.value.AGENT_CODE = item.AGENT_CODE // 处室编码
+      refObj.value.USE_CASE = item.USE_CASE // 使用场景
+      detailsVisible.value = true
+    } else if (typeName.value == '设备申请') {
+      getDeviceDetailInfo(item.deviceId)
+        .then((res) => {
+          if (res.data.code == 0) {
+            refObj.value = res.data.data
+            detailsVisible.value = true
+          }
+        })
+        .catch((err) => {})
+    } else if (
+      Object.keys(typeStrObj).includes(typeName.value) ||
+      typeName.value == '能力评价'
+    ) {
+      refObj.value = item
+      detailsVisible.value = true
+      processDefinitionName.value = item.processDefinitionName
+      businessKey.value = item.businessKey
+      processInstanceId.value = item.processInstanceId
+      resourceId.value = item.resourceId
+    } else {
+      message.error('数据请求失败！')
+    }
+  }
+  const showVideoList = (item) => {
+    console.log('显示列表', item)
+    getApplyCameraList(item.processInstanceId).then((res) => {
+      console.log('res', res)
+      xVideoList.value = []
+      res.data.data.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
+    })
+    videoVisible.value = true
+  }
+  const copyComment = (data) => {
+    let url = data
+    let oInput = document.createElement('input')
+    oInput.value = url
+    document.body.appendChild(oInput)
+    oInput.select() // 选择对象;
+    console.log(oInput.value)
+    document.execCommand('Copy') // 执行浏览器复制命令
+    message.success('复制成功')
+    oInput.remove()
+  }
+  const showAdd = (item) => {
+    if (item.processDefinitionKey == 'resourcemountapply') {
+      const data = {
+        id: item.resourceId,
+        taskId: item.currentTaskList[0].taskId,
+      }
+      if (item.dto.type == '组件服务') {
+        data.abilityToType = '组件服务'
+        data.componentTypeValue = item.dto.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue
+      } else if (item.dto.type == '应用资源') {
+        data.abilityToType = '应用资源'
+      }
+      const newpage = router.resolve({
+        path: '/nenglishangjia', // 跳转的页面路由
+        query: data,
+      })
+      console.log('上架申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
+      selectOne(item.resourceId).then((res) => {
+        if (res.data.code == 0) {
+          delObj.value = res.data.data
+          reason.value = delObj.value.undercarriageReason
+          taskId.value = item.currentTaskList[0].taskId
+          visible.value = true
+          console.log('下架申请修改=================》', res.data.data)
+        }
+      })
+    } else if (item.processDefinitionKey == 'abilitydemandapply') {
+      const newpage = router.resolve({
+        path: '/addApplication', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('需求申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'abilityprocess') {
+      const newpage = router.resolve({
+        path: '/apply', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          resourceId: item.resourceId,
+          name: item.name,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('能力申请修改=================》', item)
+      window.open(newpage.href, '_self')
+    }
+  }
+
+  const initNum = () => {
+    if (numFlag.value) {
+      num.value = []
+      getMyProcessInstancePage({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+        processDefinitionKey: processDefinitionKey.value,
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getMyProcessInstancePage({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+            processDefinitionKey: processDefinitionKey.value,
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
+  }
+  const initNum2 = () => {
+    if (numFlag.value) {
+      num.value = []
+      getTabilityapplication({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getTabilityapplication({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
+  }
+  // initNum()
+
+  // 搜索框
+  const onSearch = (name) => {
+    console.log(name.value)
+  }
+  //重置
+  function replacement() {
+    name.value = ''
+    getApplyList(name.value)
+  }
+  const getApplyList = () => {
+    const params = {
+      page: page.value,
+      limit: 4,
+      ended: ended.value,
+      // name: name.value,
+    }
+    if (ended.value === '') {
+      delete params.ended
+    }
+    if (typeName.value == '能力申请') {
+      getTabilityapplication(params).then((res) => {
+        contentList.data = []
+        console.log('获取我的申请===============>', res.data.data)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        showType.value = '能力申请'
+        initNum2()
+      })
+    } else if (typeName.value == '数据资源申请') {
+      yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then(
+        (res) => {
+          if (res.data.code !== 0) {
+            num.value = []
+            total.value = 0
+            contentList.data = []
+            contentList2.data = []
+            showType.value = ''
+            return
+          }
+          console.log('数据资源申请===============>', res.data.data)
+          contentList.data = res.data.data.data
+          num.value = []
+          total.value = res.data.data.cos
+          showType.value = '数据资源申请'
+        }
+      )
+    } else if (typeName.value == '云资源申请') {
+      getResourceBusinessList({ userAccount: userName.value }).then((res) => {
+        console.log('数据资源申请===============>', res.data.data)
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
+        contentList.data = res.data.data
+        contentList2.data = res.data.data
+        num.value = []
+        total.value = 0
+        showType.value = '云资源'
+      })
+    } else if (typeName.value == '云视频申请') {
+      getVideoBusinessList({ userAccount: userName.value }).then((res) => {
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
+        console.log('数据资源申请===============>', res.data.data)
+        contentList.data = res.data.data
+        contentList2.data = res.data.data
+        num.value = []
+        total.value = 0
+        showType.value = '云资源'
+      })
+    } else if (typeName.value == '能力评价') {
+      contentList.data = []
+      num.value = []
+      showType.value = ''
+    } else if (typeName.value == '设备申请') {
+      let _state =
+        ended.value === ''
+          ? '全部'
+          : ended.value === true
+          ? '审核完成'
+          : '审核中'
+      getDeviceApply(_state)
+        .then((res) => {
+          if (res.data.code == 0) {
+            contentList.data = []
+            contentList.data = res.data.data.list || []
+            total.value = res.data.data.total
+            showType.value = '设备申请'
+            // 获取审核中，审核完成 数量
+            getDeviceNum()
+          }
+        })
+        .catch((err) => {})
+    } else if (Object.keys(typeStrObj).includes(typeName.value)) {
+      processDefinitionKey.value = typeStrObj[typeName.value]
+      params.processDefinitionKey = processDefinitionKey.value
+      getMyProcessInstancePage(params).then((res) => {
+        contentList.data = []
+        console.log(res.data.data.list)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        initNum()
+        console.log('typeIndex', typeIndex.value)
+        switch (typeIndex.value) {
+          case 1:
+            contentList.data.map((val) => {
+              nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
+                console.log('上架===========>', res1.data.data)
+                val.title = res1.data.data.resourceDTO.name
+                val.dto = res1.data.data.resourceDTO
+                showType.value = '能力上架'
+              })
+            })
+            break
+          case 2:
+            contentList.data.map((val) => {
+              selectOneDel(val.businessKey).then((res1) => {
+                console.log('下架===========>', res1.data.data)
+                val.title = res1.data.data.name
+                val.dto = res1.data.data
+                showType.value = '能力下架'
+              })
+            })
+            break
+          case 3:
+            contentList.data.map((val) => {
+              getDemandForm(val.businessKey).then((res1) => {
+                console.log('需求===========>', res1.data.data)
+                val.title = res1.data.data.demandSubject
+                val.resourceStatusTip = res1.data.data.flagTip
+                val.dto = res1.data.data
+                showType.value = '能力需求'
+              })
+            })
+            break
+          case 4:
+            contentList.data.map((val) => {
+              demandComment(val.businessKey).then((res1) => {
+                console.log('评论===========>', res1.data.data)
+                val.title = res1.data.data.comment
+                val.resourceStatusTip = res1.data.data.delFlagTip
+                val.dto = res1.data.data
+                showType.value = '需求评论'
+              })
+            })
+            break
+        }
+      })
+    } else {
+      contentList.data = []
+      num.value = []
+      showType.value = ''
+    }
+  }
+  const onSubmit = () => {
+    contentList.data = contentList2.data.filter(
+      (val) => val.BUSINESS_NAME.indexOf(formState.value.name) > -1
+    )
+  }
+  const handleCurrentChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const handlePageSizeChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const viewDetail = (processDefinitionName, id, ended, businessKey) => {
+    if (processDefinitionName == '能力申请流程') {
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+          ended: ended,
+        },
+      })
+    }
+    if (processDefinitionName == '能力资源上架') {
+      console.log('showDetail', id, businessKey, ended)
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+        },
+      })
+    }
+    if (processDefinitionName == '能力需求申请') {
+      router.push({
+        path: '/demandDetails',
+        query: {
+          id: businessKey,
+        },
+      })
+    }
+  }
+
+  // 下架能力
+  const del = () => {
+    console.log('下架================》', delObj.value, reason.value)
+    delObj.value.undercarriageReason = reason.value
+    updateRes(delObj.value).then((upres) => {
+      if (upres.data.code == 0) {
+        relaunch({
+          data: { undercarriageReason: reason.value },
+          taskId: taskId.value,
+        }).then((res) => {
+          console.log('驳回================>', res)
+          if (res.data.code == 0) {
+            message.success('重新发起流程成功！')
+            visible.value = false
+            reason.value = ''
+          } else {
+            message.error('重新发起流程失败！')
+          }
+        })
+      } else {
+        message.error('数据更新失败！')
+      }
+    })
+  }
+
+  // 西海岸：设备申请列表 todo
+  const getDeviceApply = (state) => {
+    return new Promise((resolve, reject) => {
+      let _data = {
+        page: page.value,
+        limit: 4,
+        state,
+      }
+      deviceApplylist(_data)
+        .then((res) => {
+          resolve(res)
+          console.log('res----设备申请-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请--查询详情
+  const getDeviceDetailInfo = (deviceId) => {
+    return new Promise((resolve, reject) => {
+      getDeviceDetail(deviceId)
+        .then((res) => {
+          resolve(res)
+          console.log('res----查询详情-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请-审核中, 审核完成数量
+  const getDeviceNum = () => {
+    if (!numFlag.value) {
+      return
+    }
+    num.value = []
+    Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
+      .then((res) => {
+        console.log('res-----数量------->', res)
+        let unfinished = res[0] && res[0].data && res[0].data.data
+        let finished = res[1] && res[1].data && res[1].data.data
+        num.value.unfinished = unfinished.total || ''
+        num.value.finished = finished.total || ''
+        numFlag.value = false
+      })
+      .catch((err) => {})
+  }
+
+  const showPhoneModal = () => {
+    phoneVisible.value = true
+  }
+
+  mybus.on('closeModal', (obj) => {
+    detailsVisible.value = false
+    changeType(obj.type, obj.index)
+  })
+  onBeforeUnmount(() => {
+    mybus.off('closeModal')
+  })
+  onMounted(() => {
+    getApplyList()
+
+    if (props.tabTypeName) {
+      let _index = typeList.value.findIndex((v) => v == props.tabTypeName)
+      changeType(props.tabTypeName, _index != -1 ? _index : 0)
+    }
+  })
+</script>
+
+<style scoped lang="less">
+  .on-the-right-side-of-the-list {
+    background: #ffffff;
+    padding: 20px 0px 30px 20px;
+    position: absolute;
+    width: 1087px;
+    height: 810px;
+    top: 0px;
+    display: flex;
+    margin-top: 20px;
+    flex-direction: column;
+    font-size: 16px;
+    justify-content: left;
+    .title {
+      font-size: 20px;
+      color: #000000;
+      font-family: 'Alibaba PuHuiTi';
+      font-weight: 500;
+    }
+
+    .sousuokuang {
+      margin: 20px 0px 21px 0px;
+
+      .ant-input-search {
+        max-width: 490px;
+      }
+
+      :deep(.ant-input) {
+        width: 400px;
+        height: 36px;
+        font-size: 14px;
+        color: #b2b2b2;
+        background: #f5f5f5;
+      }
+
+      :deep(.ant-input-group-addon) {
+        display: inline-block;
+        margin-left: 10px;
+
+        .ant-input-search-button {
+          width: 80px;
+          height: 36px;
+          border-radius: 4px;
+          font-size: 14px;
+        }
+      }
+    }
+
+    .tab {
+      display: flex;
+      font-size: 14px;
+      color: #999999;
+
+      div {
+        // width: 70px;
+        padding: 5px 10px;
+        height: 24px;
+        line-height: 14px;
+        border: 1px solid #cccccc;
+        border-radius: 12px;
+        margin-left: 10px;
+        text-align: center;
+        color: #666666;
+        cursor: pointer;
+      }
+
+      .tabclass {
+        border: 1px solid #0087ff;
+        color: #0087ff;
+      }
+    }
+
+    .content {
+      padding-right: 10px;
+      height: 610px;
+      overflow-y: scroll;
+
+      .content-body {
+        padding-bottom: 20px;
+        padding-top: 20px;
+        margin-right: 10px;
+        height: 150px;
+        border-bottom: #cccccc 1px solid;
+        position: relative;
+        .withdraw {
+          width: 0.675rem;
+          height: 0.3rem;
+          background: url('~@/assets/home/withdraw.png') no-repeat;
+          background-size: 100%;
+          position: absolute;
+          top: 0.3rem;
+          left: 0.87rem;
+          transform: rotate(-30deg);
+        }
+
+        .content-body-title {
+          min-width: 100px;
+          max-width: 900px;
+          width: fit-content;
+          font-size: 14px;
+          color: #333333;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 500;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .content-body-content {
+          margin-top: 10px;
+          margin-bottom: 10px;
+          margin-right: 40px;
+          /* width: 720px; */
+          display: inline-block;
+        }
+
+        .content-body-content-son {
+          line-height: 16px;
+          font-size: 12px;
+          width: 100%;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+
+          span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            max-width: 8.1rem;
+            line-height: 24px;
+            word-break: break-all;
+          }
+        }
+
+        .content-body-bottom {
+          display: flex;
+          color: #cccccc;
+          font-size: 12px;
+
+          div:first-child {
+            margin-right: 30px;
+          }
+        }
+      }
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 30px;
+      right: 20px;
+    }
+
+    .button-box {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .button {
+      width: 96px;
+      height: 30px;
+      margin: 5px 0;
+      background: #0087ff;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 4px;
+      text-align: center;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .buttonAgree {
+      background-color: #49c988;
+    }
+
+    .backToFirst {
+      background-color: rgb(214, 91, 91);
+    }
+  }
+
+  :deep(.ant-badge-count) {
+    top: -5px;
+    right: -10px;
+  }
+</style>
diff --git a/front/src/views/personalCenter/index.vue b/front/src/views/personalCenter/index.vue
index 41853678..d8eeeedf 100644
--- a/front/src/views/personalCenter/index.vue
+++ b/front/src/views/personalCenter/index.vue
@@ -7,10 +7,12 @@
       </aside>
       <article>
         <div class="form-container">
-          <!-- <on-the-right-side-of-the-list
-            v-if="showFlag === 'collect'"
-          ></on-the-right-side-of-the-list> -->
-          <my-apply v-if="showFlag === 'apply'" :tabTypeName="tabTypeName"></my-apply>
+   
+          <template v-if="showFlag === 'apply'">
+            <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'"
@@ -30,6 +32,7 @@
   import asideMenu from '@/views/personalCenter/components/asideMenu'
   // import OnTheRightSideOfTheList from './OnTheRightSideOfTheList'
   import MyApply from '@/views/personalCenter/components/MyApply'
+  import MyApplyXha from '@/views/personalCenter/components/MyApplyXha'
   import MyApplication from '@/views/personalCenter/components/MyApplication'
   import MyComments from '@/views/personalCenter/components/MyComments'
   import MyPublish from '@/views/personalCenter/components/MyPublish'
@@ -41,6 +44,7 @@
   import { useRouter } from 'vue-router'
   const router = useRouter()
   let tabTypeName = ref(router.currentRoute.value.query.tabTypeName || '')
+  let xinhaian = whoShow.itShowXiHaiAn //判断是否是西海岸版本
   const type = JSON.parse(window.sessionStorage.getItem('type'))
   const showFlag = ref('PurchaseVehicle')
   if (type) {