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

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

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