diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index d08e1a21..be488be1 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -97,10 +97,140 @@ - + @@ -405,7 +535,6 @@ const phoneVisible = ref(false) // 选择类型 const changeType = (item, index) => { - debugger contentList.data = [] formState.value.name = '' @@ -425,11 +554,16 @@ const getChooseeList = () => { getCloudList() } else if (index == 3) {//视频 getVideoList() + }else if (index == 1) {//数据 + getDataList() } } //选择tab const handleTab = (index) => { chooseTab.value = index + if(index==1){ + typeName.value = '数据资源' + } Object.keys(yunForm).map((key) => { delete yunForm[key] }) @@ -442,6 +576,13 @@ const handleTab = (index) => { cloudList.data=[] getCloudResource() getVideoList() + }else if (index == 1) {//数据 + contentList.data=[] + getDataList() + }else{ + contentList.data=[] + typeName.value = '能力申请' + getApplyList() } } const cloudSearchReserve = () => { @@ -452,6 +593,8 @@ const cloudSearchReserve = () => { getCloudList() } else if (index == 3) {//视频 getVideoList() + }else if (index == 1) {//数据 + getDataList() } } //查询云资源数据 @@ -590,6 +733,7 @@ const showCloudDetail = (item) => { baseInfo.value = item } +//ucs内部资源和数据资源用这个详情 const showDetail = (item) => { cilckRowData.value = item // 西海岸-申请时间过期,提示 @@ -614,10 +758,10 @@ const showDetail = (item) => { message.error('数据请求失败!') } }) - } else if (typeName.value == '数据资源申请') { + } else if (typeName.value == '数据资源') { yaweiApproveDetails({ applyGuid: item.GUID }) .then((res) => { - console.log('详情===========>', res.data.data) + console.log('数据资源详情===========>', res.data.data) if (res.data.code !== 0) { message.error('数据请求失败!') return @@ -834,6 +978,7 @@ function replacement() { name.value = '' getApplyList(name.value) } +//UCS内部资源 const getApplyList = () => { const params = { page: page.value, @@ -988,6 +1133,35 @@ const getApplyList = () => { showType.value = '' } } +//数据资源 +const getDataList = () => { + yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then( + (res) => { + if (res.data.code !== 0) { + num.value = [] + total.value = 0 + contentList.data = [] + contentList2.data = [] + showType.value = '' + return + } + // let data1=[{ + // GUID:'aa', + // title:'11', + // ywlxr:'111', + // ywlxrdh:'123', + // BUSINESS_NAME:'123' + + // }] + console.log('数据资源申请===============>', res.data.data) + contentList.data = res.data.data.data + contentList.data=data1 + num.value = [] + total.value = res.data.data.cos + showType.value = '数据资源申请' + } + ) +} const onSubmit = () => { contentList.data = contentList2.data.filter( (val) => val.BUSINESS_NAME.indexOf(formState.value.name) > -1 @@ -995,10 +1169,12 @@ const onSubmit = () => { } const handleCurrentChange = (val) => { page.value = val - if (chooseTab.value == 2) { + if (chooseTab.value == 2) {//云资源 getCloudList() } else if (chooseTab.value == 3) {//视频资源 getVideoList() + } else if (chooseTab.value == 1) {//数据资源 + getDataList() } else { getApplyList() } @@ -1010,6 +1186,8 @@ const handlePageSizeChange = (val) => { getCloudList() } else if (chooseTab.value == 3) {//视频资源 getVideoList() + } else if (chooseTab.value == 1) {//视频资源 + getDataList() } else { getApplyList() } @@ -1026,7 +1204,6 @@ const viewDetail = (processDefinitionName, id, ended, businessKey) => { }) } if (processDefinitionName == '能力资源上架') { - console.log('showDetail', id, businessKey, ended) router.push({ path: '/details', query: { @@ -1127,7 +1304,6 @@ const showPhoneModal = () => { } mybus.on('closeModal', (obj) => { - debugger detailsVisible.value = false obj.name=obj.type changeType(obj, obj.index)