wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

西海岸：我的申请-设备申请单兵无人机详情增加名称显示

This commit is contained in:
guoyue 2022-10-17 14:00:44 +08:00
parent 5ac06ce8d6
commit 98d1b070ab
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
front/src/views/personalCenter/components/MyApply.vue
View File

@ -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) => { })