diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 2a1d6b4a..0feb923b 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -7,6 +7,20 @@ export function getMyProcessInstancePage(params) { params, }) } +export function getResourceBusinessList(params) { + return request({ + url: 'resource/getResourceBusinessList', + method: 'post', + params, + }) +} +export function getVideoBusinessList(params) { + return request({ + url: 'resource/getVideoBusinessList', + method: 'post', + params, + }) +} export function yaweiApproveStatus(params) { return request({ url: 'resource/ZywMessage/yaweiApproveStatus', diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue index c16abffb..71279504 100644 --- a/front/src/views/personalCenter/components/ApplyDetails.vue +++ b/front/src/views/personalCenter/components/ApplyDetails.vue @@ -22,8 +22,12 @@ :refObj="refObj" v-else-if="showType === '数据资源申请'" > + -
+
审批详情
@@ -55,7 +62,10 @@ 名称：{{ item.cameraList ? item.system - : item.title || item.name || item.title + : item.title || + item.name || + item.title || + item.BUSINESS_NAME }}
@@ -74,13 +84,27 @@ > 审核结果：{{ item.state === 0 ? '审核中' : '审核完成' }}

+

+ 审核结果：{{ item.STATUS }} +

审核结果：{{ item.bmyijian ? '审核完成' : '审核中' }}

- 申请日期：{{ item.createDate || item.startTime || item.tbsj }} + 申请日期：{{ + item.createDate || + item.startTime || + item.tbsj || + (item.CREATE_TIME && + moment(item.CREATE_TIME.time + 480 * 60 * 1000).format( + 'YYYY-MM-DD HH:mm:ss' + )) + }}
过期时间：{{ item.expireDate || '' }}
@@ -238,6 +262,8 @@ getDeviceDetail, yaweiApproveStatus, yaweiApproveDetails, + getResourceBusinessList, + getVideoBusinessList, } from '@/api/personalCenter' import { updateRes, @@ -247,6 +273,7 @@ selectOneDel, } from '@/api/home' import { useRouter } from 'vue-router' + import { getUserInfo } from '@/api/user' import { message } from 'ant-design-vue' import ApplyDetails from '@/views/personalCenter/components/ApplyDetails' import mybus from '@/myplugins/mybus' @@ -256,6 +283,10 @@ tabTypeName: { type: String, default: '' }, }) const router = useRouter() + const userName = ref('') + getUserInfo().then((res) => { + userName.value = res.data.data.username + }) let typeList = ref([ '能力申请', '能力上架', @@ -263,6 +294,8 @@ '能力需求', '需求评论', '数据资源申请', + '云资源申请', + '云视频申请', // '能力评价', ]) // 西海岸-设备申请 @@ -409,6 +442,25 @@ detailsVisible.value = true }) .catch((err) => {}) + } else if (typeName.value == '云资源申请') { + refObj.value.description = '政务云' + refObj.value.STATUS = item.STATUS // 状态 + refObj.value.CREATE_TIME = moment( + item.CREATE_TIME.time + 480 * 60 * 1000 + ).format('YYYY-MM-DD HH:mm:ss') + // 操作时间 + refObj.value.PROJECT_NAME = item.PROJECT_NAME // 业务名称 + refObj.value.BSNUM = item.BSNUM // 业务id + refObj.value.APPLYTYPE = item.APPLYTYPE // 申请类型 + refObj.value.SOURCE_TYPE = item.SOURCE_TYPE // 资源类型 + refObj.value.REGION_CODE = item.REGION_CODE // 区划编码 + refObj.value.REGION_NAME = item.REGION_NAME // 区划名称 + refObj.value.ORG_NAME = item.ORG_NAME // 部门名称 + refObj.value.ORG_CODE = item.ORG_CODE // 部门名称编码 + refObj.value.AGENT_NAME = item.AGENT_NAME // 处室名称 + refObj.value.AGENT_CODE = item.AGENT_CODE // 处室编码 + refObj.value.CREATOR_NAME = item.CREATOR_NAME // 申请人 + detailsVisible.value = true } else if (typeName.value == '设备申请') { getDeviceDetailInfo(item.deviceId) .then((res) => { @@ -599,6 +651,24 @@ showType.value = '数据资源申请' } ) + } else if (typeName.value == '云资源申请') { + getResourceBusinessList({ userAccount: 'qdsdzzwbgsxtaqglc' }).then( + (res) => { + console.log('数据资源申请===============>', res.data.data) + contentList.data = res.data.data + num.value = [] + total.value = 0 + showType.value = '云资源' + } + ) + } else if (typeName.value == '云视频申请') { + getVideoBusinessList({ userAccount: 'zfcxjsjkjc' }).then((res) => { + console.log('数据资源申请===============>', res.data.data) + contentList.data = res.data.data + num.value = [] + total.value = 0 + showType.value = '云资源' + }) } else if (typeName.value == '能力评价') { contentList.data = [] num.value = [] diff --git a/front/src/views/personalCenter/components/cloudResources.vue b/front/src/views/personalCenter/components/cloudResources.vue new file mode 100644 index 00000000..9a172ec8 --- /dev/null +++ b/front/src/views/personalCenter/components/cloudResources.vue @@ -0,0 +1,229 @@ + + + +