Compare commits

...

10 Commits

6 changed files with 2714 additions and 3049 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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