修改所有个人中心新建窗口跳转详情

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

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,
       }
     },
   })

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'
@@ -562,9 +563,9 @@
       background: url('~@/assets/home/fn/cjtd.png') no-repeat;
       background-size: 100%;
     }
-    .cjtd img{
+    .cjtd img {
-        width:100%;
+      width: 100%;
-        height:100%    
+      height: 100%;
     }
 
     .content {

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')

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({
+      // router.push({
-        path: '/details',
+      //   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>

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({
+    // router.push({
-      path: '/demandDetails',
+    //   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('')

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
+    <div class="tab" v-if="chooseTab != 1 && chooseTab != 2 && chooseTab != 3">
-      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' } }"
+        :label-col="{ style: { width: '80px' } }"
-            :wrapper-col="{ style: { width: '200px' } }"
+        :wrapper-col="{ style: { width: '200px' } }"
-            labelAlign="center"     
+        labelAlign="center"
-          >
+      >
-          <a-row>
+        <a-row>
-              <a-form-item
+          <a-form-item label="业务名称">
-                label="业务名称">
+            <a-input
-                <a-input   placeholder="请输入业务名称"
+              placeholder="请输入业务名称"
-                  v-model:value="yunForm.busineessName"
+              v-model:value="yunForm.busineessName"
-                  style="width: 200px"
+              style="width: 200px"
-                />
+            />
-              </a-form-item>
+          </a-form-item>
-              <a-form-item  label="状态">
+          <a-form-item label="状态">
-                <a-select
+            <a-select
-                ref="select"
+              ref="select"
-                v-model:value="yunForm.status"
+              v-model:value="yunForm.status"
-                placeholder="请选择状态"
+              placeholder="请选择状态"
-                style="width: 200px"
+              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"
+                {{ item.dictLabel }}
-               :key="index" :value="item.dictValue">
+              </a-select-option>
-              {{ item.dictLabel}}
+            </a-select>
-            </a-select-option>
+          </a-form-item>
-              </a-select>
+          <button class="queryButton" @click="getCloudList()">查询</button>
-              </a-form-item>
+          <button class="queryButton" @click="cloudSearchReserve()">
-              <button  class="queryButton" @click="getCloudList()">查询</button>
+            重置
-          <button  class="queryButton"  @click="cloudSearchReserve()"> 重置</button>
+          </button>
-            </a-row>
+        </a-row>
-            </a-form>
+      </a-form>
 
-            <div v-if="cloudList.data.length > 0">
+      <div v-if="cloudList.data.length > 0">
-              <div class="content-cloud">
+        <div class="content-cloud">
-        <div
+          <div
-          class="content-cloud-body"
+            class="content-cloud-body"
-          v-for="item in cloudList.data"
+            v-for="item in cloudList.data"
-          :key="item.index"
+            :key="item.index"
-        >
+          >
-          <div class="content-body-left">
+            <div class="content-body-left">
-           <div class="content-body-left-one">
+              <div class="content-body-left-one">
-            <div style="font-size:16px">{{item.BUSINESS_NAME}}</div>
+                <div style="font-size: 16px">{{ item.BUSINESS_NAME }}</div>
-            <div>单号: {{item.BSNUM}}</div>
+                <div>单号: {{ item.BSNUM }}</div>
-           </div>
+              </div>
-           <div class="content-body-left-two">
+              <div class="content-body-left-two">
-            <!-- <div>申请类型: {{item.type}}</div> -->
+                <!-- <div>申请类型: {{item.type}}</div> -->
-            <div>状态: {{item.STATUS}}</div>
+                <div>状态: {{ item.STATUS }}</div>
-            <div>申请时间: {{item.CREATE_TIME}}</div>
+                <div>申请时间: {{ item.CREATE_TIME }}</div>
-  
+              </div>
-           </div>
+            </div>
+            <div class="content-body-right">
+              <div class="button" @click="showCloudDetail(item)">查看详情</div>
+            </div>
           </div>
-          <div class="content-body-right">
+        </div>
-            <div class="button" @click="showCloudDetail(item)">查看详情</div>
+        <div class="bottom">
-          </div>
+          <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-empty v-else />
-        <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)">
+    <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">
-        <div
+          <div
-          class="content-body"
+            class="content-body"
-          v-for="item in contentList.data"
+            v-for="item in contentList.data"
-          :key="item.index"
+            :key="item.index"
-        >
+          >
-          <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
+            <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.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>
+              </template>
-              <div></div>
+              <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="button-box">
-          <div class="content-body-content">
+              <div
-            <p class="content-body-content-son" v-if="typeName == '设备申请'">
+                class="button"
-              审核结果：{{ item.state === 0 ? '审核中' : '审核完成' }}
+                v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-            </p>
+                @click="showPhoneModal(item)"
-            <p
+              >
-              class="content-body-content-son"
+                联系方式
-              v-else-if="typeName == '数据资源申请'"
+              </div>
-            >
+              <div class="button" @click="showDetail(item)">查看详情</div>
-              审核结果：{{ item.bmyijian === 0 ? '审核中' : '审核完成' }}
+              <!-- <div
-            </p>
+                class="button"
-            <p
+                @click="showAdd(item)"
-              class="content-body-content-son"
+                v-if="item.backToFirst"
-              v-else-if="typeName == '云资源申请'"
+              >
-            >
+                修改
-              审核结果：{{ status[item.STATUS] }}
+              </div> -->
-            </p>
+              <svg
-            <p
+                t="1652233950228"
-              class="content-body-content-son"
+                class="icon"
-              v-else-if="typeName == '云视频申请'"
+                viewBox="0 0 1024 1024"
-            >
+                version="1.1"
-              审核结果：{{ status2[item.STATUS] }}
+                xmlns="http://www.w3.org/2000/svg"
-            </p>
+                p-id="5970"
-            <p class="content-body-content-son" v-else>
+                data-spm-anchor-id="a313x.7781069.0.i8"
-              审核结果：{{
+                width="80"
-                item.ended
+                height="80"
-                  ? '审核完成'
+                v-if="
-                  : item.backToFirst
+                  item.processDefinitionName != '能力资源下架' &&
-                  ? '审核中（请修改被驳回内容）'
+                  item.approveStatus !== '不通过' &&
-                  : '审核中'
+                  (item.resourceStatus == 4 || item.resourceStatus == 5)
-              }}
+                "
-            </p>
+                style="position: absolute; top: 20px; left: -850px"
-            <div>
+              >
-              申请日期：{{
+                <path
-                item.createDate ||
+                  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"
-                item.startTime ||
+                  fill="#515151"
-                item.tbsj ||
+                  opacity=".5"
-                (item.CREATE_TIME &&
+                  p-id="5971"
-                  moment(item.CREATE_TIME.time + 480 * 60 * 1000).format(
+                ></path>
-                    'YYYY-MM-DD HH:mm:ss'
+                <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-empty v-else />
-        <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 />
     </template>
-   
-   
   </div>
   <!-- 政务云资源详情-->
   <a-modal
-      bodyStyle="padding:0.1rem 0"
+    bodyStyle="padding:0.1rem 0"
-      v-model:visible="cloudVisible"
+    v-model:visible="cloudVisible"
-      style="width: 1000px"
+    style="width: 1000px"
-      :footer="null"
+    :footer="null"
-      destroyOnClose="true"
+    destroyOnClose="true"
-      :maskClosable="false"
+    :maskClosable="false"
-    >
+  >
-    <template v-slot:title>
+    <template v-slot:title>申请详情</template>
-        申请详情
+    <cloud-details :BSNUM="BSNUM" :baseInfo="baseInfo"></cloud-details>
-      </template>
+  </a-modal>
-    <cloud-details
-        :BSNUM="BSNUM"
-        :baseInfo="baseInfo"
-      ></cloud-details>
-      
-    </a-modal>
   <a-modal
-      bodyStyle="padding:0.1rem 0"
+    bodyStyle="padding:0.1rem 0"
-      v-model:visible="detailsVisible"
+    v-model:visible="detailsVisible"
-      style="width: 1000px"
+    style="width: 1000px"
-      :footer="null"
+    :footer="null"
-      destroyOnClose="true"
+    destroyOnClose="true"
-      :maskClosable="false"
+    :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>
+      <template #bodyCell="{ column, text }">
-        {{
+        <!-- <template>
-          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>
+      </template>
-      </a-table>
+    </a-table>
-    </a-modal>
+  </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({
+  let yunForm = reactive({
-    status:'',
+    status: '',
-    busineesName:'',
+    busineesName: '',
   })
-  let chooseList=ref(['UCS内部资源','数据资源','政务云资源','视频资源'])
+  let chooseList = ref(['UCS内部资源', '数据资源', '政务云资源', '视频资源'])
-  let typeList = ref( [
+  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)=>{
+  const handleTab = (index) => {
-    chooseTab.value=index
+    chooseTab.value = index
-    if(index==2){
+    if (index == 2) {
       //查询政务云状态
       getCloudResource()
       getCloudList()
     }
   }
-  const cloudSearchReserve = () =>{
+  const cloudSearchReserve = () => {
-    Object.keys(yunForm).map(key => {
+    Object.keys(yunForm).map((key) => {
       delete yunForm[key]
     })
-  getCloudList()
+    getCloudList()
   }
   //查询政务云数据
   const getCloudList = () => {
     const params = {
-      pageNum : page.value,
+      pageNum: page.value,
-      pageSize : 5,
+      pageSize: 5,
-      status:yunForm.status,
+      status: yunForm.status,
-      name :yunForm.busineesName
+      name: yunForm.busineesName,
     }
     total.value = 5
-      getZwyBusinessList(params).then(
+    getZwyBusinessList(params).then((res) => {
-        (res) => {
+      cloudList.data = res.data.data.list
-          cloudList.data = res.data.data.list
+      num.value = []
-          num.value = []
+      total.value = res.data.data.total
-          total.value = res.data.data.total
+    })
-        }
-      )
   }
   //查询政务云状态
   const getCloudResource = () => {
     getCategoryTreePage({
-        page: 1,
+      page: 1,
-        limit: 20,
+      limit: 20,
-        dictTypeId: '1601043884320755714',
+      dictTypeId: '1601043884320755714',
-        deFlage: 0,
+      deFlage: 0,
-      }).then((res) => {
+    }).then((res) => {
-        cloudResourceStatusList.value = res.data.data.list
+      cloudResourceStatusList.value = res.data.data.list
-  })
+    })
-}
+  }
-
 
   // 申请状态切换
   function changeApplyState(item, index) {
@@ -622,12 +615,11 @@
   }
   const cilckRowData = ref({})
   //查看政务云详情
-  const showCloudDetail=(item)=>{
+  const showCloudDetail = (item) => {
-      //待完成
+    //待完成
-      cloudVisible.value = true
+    cloudVisible.value = true
-      BSNUM.value=item.BSNUM
+    BSNUM.value = item.BSNUM
-      baseInfo.value=item
+    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,
@@ -980,7 +973,6 @@
           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{
+  .queryButton {
-  background: #0058e1;
+    background: #0058e1;
-  width: 80px;
+    width: 80px;
-   height: 32px;
+    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-top: 10px;
-    margin-bottom: 22px;
+      margin-bottom: 22px;
-    font-size: 18px;
+      font-size: 18px;
-    cursor: pointer;
+      cursor: pointer;
-    text-align: center;
+      text-align: center;
-    background: #edf4fc;
+      background: #edf4fc;
-    width: 500px;
+      width: 500px;
-    height: 36px;
+      height: 36px;
-    line-height: 36px;
+      line-height: 36px;
-    display: table;
+      display: table;
+    }
 
-}
+    .chooseStyle {
-
+      display: table-cell;
-.chooseStyle {
+      width: 25%;
-  display: table-cell;
+      color: #fff;
-  width: 25%;
+      background-color: #0058e1;
-  color: #fff;
+      font-weight: bolder;
-  background-color: #0058e1;
+    }
-  font-weight: bolder;
+    .noChooseStyle {
-}
+      display: table-cell;
-.noChooseStyle{
+      width: 25%;
-  display: table-cell;
+    }
-  width: 25%;
-}
     .title {
       font-size: 20px;
       color: #000000;
@@ -1288,56 +1275,46 @@
         color: #0087ff;
       }
     }
-.content-cloud{
+    .content-cloud {
-  padding: 0px 10px;
+      padding: 0px 10px;
-  overflow-y: scroll;
+      overflow-y: scroll;
-  height: 610px;
+      height: 610px;
-    .content-cloud-body{
+      .content-cloud-body {
-      height: 100px;
+        height: 100px;
-      height: 100px;
+        height: 100px;
-      margin-bottom: 10px;
+        margin-bottom: 10px;
-    border-bottom: 1px solid #cccccc;
+        border-bottom: 1px solid #cccccc;
-      .content-body-left{
+        .content-body-left {
-        width:85%;
+          width: 85%;
-        float: left;
+          float: left;
-    
-
-        .content-body-left-one{
-          display: table;
-          height: 50px;
-          width: 80%;
-          div{
-            display: table-cell;
-            width: 50%;
-            font-size:14px;
 
+          .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%;
-        .content-body-left-two{
+            height: 50px;
-          width: 80%;
+            display: table;
-          height: 50px;
+            div {
-          display: table;
+              display: table-cell;
-          div{
+              width: 30%;
-            display: table-cell;
+              font-size: 14px;
-            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;

front/src/views/personalCenter/components/MyBrowse.vue

@@ -377,12 +377,20 @@
         openHref(item)
       } else {
         mybus.emit('tabsChange', { flag: id })
-        router.push({
+        // router.push({
-          path: '/details',
+        //   path: '/details',
+        //   query: {
+        //     id: id,
+        //   },
+        // })
+        const detailPage = router.resolve({
+          path: '/details', // 跳转的页面路由
           query: {
             id: id,
+            hiddenBackFlag: true,
           },
         })
+        window.open(detailPage.href, '_blank')
       }
     }
   }

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({
+    // router.push({
-      path: '/demandDetails',
+    //   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()

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({
+      const detailPage = router.resolve({
-        path: '/details',
+        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({
+  // const newpage = router.resolve({
-    path: '/nenglishangjia', // 跳转的页面路由
+  //   path: '/nenglishangjia', // 跳转的页面路由
-  })
+  // })
   // const nenglishangjia = () => {
   //   window.open(newpage.href, '_blank')
   //   // router.resolve('/nenglishangjia')

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;
       }
     }
   }