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 @@
-
-
- {{detailModalTitle}}
+
+ {{refObj.description && itShowXiHaiAn ? refObj.description + '申请详情' : '申请详情'}}
@@ -101,9 +100,6 @@
-
@@ -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) => { })