diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue index 612dcf7e..15d9c049 100644 --- a/back/src/views/modules/ability/IntegratedServices-add.vue +++ b/back/src/views/modules/ability/IntegratedServices-add.vue @@ -88,9 +88,8 @@ diff --git a/back/src/views/modules/ability/assignedScene/area-add.vue b/back/src/views/modules/ability/assignedScene/area-add.vue index bec30639..3f429dc3 100644 --- a/back/src/views/modules/ability/assignedScene/area-add.vue +++ b/back/src/views/modules/ability/assignedScene/area-add.vue @@ -2,7 +2,6 @@
-
@@ -10,7 +9,7 @@ :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
- +
@@ -52,18 +51,17 @@
-
- + - + - + - \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/city-add.vue b/back/src/views/modules/ability/assignedScene/city-add.vue index e77d109a..4cd278a1 100644 --- a/back/src/views/modules/ability/assignedScene/city-add.vue +++ b/back/src/views/modules/ability/assignedScene/city-add.vue @@ -22,7 +22,6 @@ -
- + - + - + - \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/components/ability-add.vue b/back/src/views/modules/ability/assignedScene/components/ability-add.vue index 199dd0a9..3a4ff5e8 100644 --- a/back/src/views/modules/ability/assignedScene/components/ability-add.vue +++ b/back/src/views/modules/ability/assignedScene/components/ability-add.vue @@ -63,7 +63,7 @@ diff --git a/front/src/views/instructionManual/components/TheOverallProcess.vue b/front/src/views/instructionManual/components/TheOverallProcess.vue index a09fb3e8..a207e4b7 100644 --- a/front/src/views/instructionManual/components/TheOverallProcess.vue +++ b/front/src/views/instructionManual/components/TheOverallProcess.vue @@ -21,6 +21,15 @@ 需求中心 能力申请流程 能力需求流程 + + + + + + + + + @@ -47,6 +56,7 @@ } } .TheOverallProcess-content { + width:1920px; height: 855px; background: url('~@/assets/menu/TheOverallProcess-bg.png'); position: relative; @@ -166,6 +176,75 @@ left: 125px; top: 102px; } + .data-property-library-flow { + width: 50px; + height: 38px; + background-image: url("~@/assets/menu/line-flow.png"); + } + .absolute { + position: absolute; + } + .flow-1 { + offset-path: path("m982,198c0,0 0,68 0,68"); + animation: move 2s linear infinite; + -webkit-animation: move 2s linear infinite; + } + .flow-2 { + offset-path: path("m928,281c0,0 0,-71 0,-71"); + animation: move 2s linear infinite; + -webkit-animation: move 2s linear infinite; + } + .flow-3 { + offset-path: path("m539,359c0,0 318,-1 318,-1"); + animation: move 2s linear infinite; + -webkit-animation: move 2s linear infinite; + animation-delay: 1s; + -webkit-animation-delay: 1s; + } + .flow-4 { + offset-path: path("m856,412c0,0 -308,0 -308,0"); + animation: move 3s linear infinite; + -webkit-animation: move 3s linear infinite; + animation-delay: 2s; + -webkit-animation-delay: 2s; + } + .flow-5 { + offset-path: path("m454,480c0,0 0,160 0,160c0,0 401,0 401,0"); + animation: move 4s linear infinite; + -webkit-animation: move 4s linear infinite; + } + .flow-6 { + offset-path: path("m402,478c0,0 0,295 0,295c0,0 1067,0 1067,0c0,0 -1,-273 -1,-273"); + animation: move 6s linear infinite; + -webkit-animation: move 6s linear infinite; + } + .flow-7 { + offset-path: path("m1392,383c0,0 -332,0 -332,0"); + animation: move 2s linear infinite; + -webkit-animation: move 2s linear infinite; + } + .flow-8 { + offset-path: path("m1457,295c0,0 0,-181 0,-181c0,0 -397,0 -397,0"); + animation: move 3s linear infinite; + -webkit-animation: move 3s linear infinite; + animation-delay: 1s; + -webkit-animation-delay: 1s; + } + .flow-9 { + offset-path: path("m955,483c0,0 0,74 0,74"); + animation: move 2s linear infinite; + -webkit-animation: move 2s linear infinite; + animation-delay: 1s; + -webkit-animation-delay: 1s; + } + @keyframes move { + 0% { + offset-distance: 0%; + } + 100% { + offset-distance: 100%; + } + } } } diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index c4fe8828..3e723872 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -55,6 +55,22 @@ > {{ item.btnText }} >> + + + @@ -405,7 +537,6 @@ const phoneVisible = ref(false) // 选择类型 const changeType = (item, index) => { - debugger contentList.data = [] formState.value.name = '' @@ -425,11 +556,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 +578,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 +595,8 @@ const cloudSearchReserve = () => { getCloudList() } else if (index == 3) {//视频 getVideoList() + }else if (index == 1) {//数据 + getDataList() } } //查询云资源数据 @@ -590,6 +735,7 @@ const showCloudDetail = (item) => { baseInfo.value = item } +//ucs内部资源和数据资源用这个详情 const showDetail = (item) => { cilckRowData.value = item // 西海岸-申请时间过期，提示 @@ -614,10 +760,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 +980,7 @@ function replacement() { name.value = '' getApplyList(name.value) } +//UCS内部资源 const getApplyList = () => { const params = { page: page.value, @@ -988,6 +1135,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 +1171,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 +1188,8 @@ const handlePageSizeChange = (val) => { getCloudList() } else if (chooseTab.value == 3) {//视频资源 getVideoList() + } else if (chooseTab.value == 1) {//视频资源 + getDataList() } else { getApplyList() } @@ -1026,7 +1206,6 @@ const viewDetail = (processDefinitionName, id, ended, businessKey) => { }) } if (processDefinitionName == '能力资源上架') { - console.log('showDetail', id, businessKey, ended) router.push({ path: '/details', query: { @@ -1127,7 +1306,6 @@ const showPhoneModal = () => { } mybus.on('closeModal', (obj) => { - debugger detailsVisible.value = false obj.name=obj.type changeType(obj, obj.index)