Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -29,7 +29,7 @@
         <p>
           <span>应用背景：{{ props.refObj.applicationBackground }}</span>
         </p>
-        <p>
+        <p v-if="!whoShow1.itShowXiHaiAn">
           <span>期望效果：{{ props.refObj.effectWish }}</span>
         </p>
         <p v-if="props.refObj.enclosure">
@@ -163,6 +163,7 @@
                   @click.stop="openVideo(val)">
                   视频预览
                 </a-button>
+                <span class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && !item.ended" >该流程已终止</span>
 
               </div>
               <div class="ability-bottom">

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

@@ -130,9 +130,9 @@ const columns = [
     key: 'comment',
   },
   {
-    title: '任务时长/秒',
-    dataIndex: 'durationInSeconds',
-    key: 'durationInSeconds',
+    title: '任务时长',
+    dataIndex: 'duration',
+    key: 'duration',
   },
 ]
 const getInfo = () => {

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

@@ -33,7 +33,7 @@
             </template>
             <div class="content-body-title">
               <span>
-                名称：{{ item.cameraList ? item.system : item.title }}
+                名称：{{ item.cameraList ? item.system : (item.title || item.name) }}
               </span>
               <div></div>
             </div>
@@ -48,7 +48,8 @@
           </div>
           <div class="content-body-bottom">
             <div>申请日期：{{ item.createDate || item.startTime }}</div>
-            <div></div>
+            <!-- 西海岸--增加过期时间显示 -->
+            <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
             <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
@@ -86,8 +87,10 @@
       </div>
     </div>
     <a-empty v-else />
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" title="申请详情" style="width: 900px"
-      :footer="null" destroyOnClose="true" :maskClosable="false">
+    <!-- :title="detailModalTitle" -->
+    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
+      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
+      <template v-slot:title>{{detailModalTitle}}</template>
       <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
         :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
       </apply-details>
@@ -237,9 +240,17 @@ 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) {
@@ -251,7 +262,6 @@ const showDetail = (item) => {
     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