diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 2177a951..8d0102bc 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -10,10 +10,17 @@
-
+
@@ -127,6 +134,7 @@ import { sgcDel, getApplyForm } from '@/api/personalCenter'
import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
import { getIntegrationDetail, soldierApply } from '@/api/home'
+import * as moment from 'moment'
export default {
name: '',
@@ -148,6 +156,21 @@ export default {
// 融合服务详情
const integrationServicesItemInfo = ref(null)
const num = ref(0)
+ // 过期时间
+ const expireDateOptions = [
+ {
+ value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
+ label: '30天',
+ },
+ {
+ value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
+ label: '60天',
+ },
+ {
+ value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
+ label: '90天',
+ },
+ ]
if (!applyAll) {
list.value.map((item) => {
@@ -171,8 +194,14 @@ export default {
const baseURL = window.SITE_CONFIG.apiURL
let record = ref('1')
const text = ref('')
- // 西海岸-特殊处理 todo
+ // 西海岸-特殊处理
let wrjAndDbText = ['单兵设备', '无人机']
+ const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
+ // 西海岸-判断是否是基础设施-摄像头
+ const isCamera = ref(false);
+ if (list.value[0] && list.value[0].arr && list.value[0].arr[0] && list.value[0].arr[0].type == '基础设施') {
+ isCamera.value = true
+ }
const formName = reactive({
title: applyAll
? '全部应用资源申请'
@@ -331,8 +360,8 @@ export default {
}
} else {
let obj = {}
- Object.assign(obj, formName)
- console.log('摄像头===============>', obj, item)
+ // todo
+ console.log('formName---摄像头--------->', formName);
obj.system = []
item.note1 = JSON.parse(item.note1)
item.note1.map((sxt) => {
@@ -352,6 +381,8 @@ export default {
status: sxt.status + '',
})
})
+ console.log('obj----摄像头申请-------->', obj);
+ return;
submitApply(obj).then((res) => {
// applySuccess.value = false
console.log('摄像头申请================>', res)
@@ -734,7 +765,7 @@ export default {
})
}
- // 西海岸:单兵设备、无人机提交申请 todo
+ // 西海岸:单兵设备、无人机提交申请
const handleWrjApply = (formName) => {
let _data = {
deviceId: formName.system && formName.system[0] && formName.system[0].resourceId,
@@ -746,11 +777,8 @@ export default {
applicationSystem: formName.applicationSystem, // 应用系统
applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
demand: formName.applicationBackground, // 需求依据
- // applyUserId: formName.userId // 登录用户id
}
- console.log('_data-----提交申请------->', _data);
soldierApply(_data).then(res => {
- console.log('res----提交申请-------->', res);
if (res.data.code == 0) {
message.success(res.data.msg)
jumpToDetailsPageconetent()
@@ -794,6 +822,9 @@ export default {
flag,
applyAll,
getIntegrationServicesDeatil,
+ isCamera,
+ isXiHaiAn,
+ expireDateOptions,
}
},
}
@@ -839,6 +870,11 @@ export default {
justify-content: space-between;
}
+ .flex-row-start {
+ justify-content: flex-start;
+ align-items: center;
+ }
+
:deep(.ant-form-item-label) {
label {
color: #666;