diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 98acdc7a..75368b2d 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -28,108 +28,108 @@ \ No newline at end of file + diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 7a90265f..92fcaa3c 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,13 +1,22 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 +<<<<<<< HEAD * @LastEditors: hisense.wuhongjian * @LastEditTime: 2022-07-07 17:30:10 +======= + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-07-07 17:41:25 +>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1 * @Description: 数据资源参数配置 */ const newLocation = 'qingdao' // const newLocation = 'baotou' +<<<<<<< HEAD // const newLocation = 'xihaian' +======= +// const newLocation = 'xihaian' +>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1 // 数据资源数据 const whoShow = {} diff --git a/front/src/main.js b/front/src/main.js index a24e5800..c43d1b20 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-05 15:04:47 + * @LastEditTime: 2022-07-07 09:22:56 * @Description: 告诉大家这是什么 */ import { createApp } from 'vue' @@ -51,9 +51,3 @@ router.beforeEach((to, from, next) => { document.body.scrollTop = 0 next() }) -// 解决bug:页面/路由跳转后,滚动条消失,页面无法滚动 -router.afterEach((to, from, next) => { - document - .querySelector('body') - .setAttribute('style', 'overflow: auto !important;') -}) diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue index 4c93e14a..9d9afe04 100644 --- a/front/src/views/abilityStatistics/components/AtlasResources.vue +++ b/front/src/views/abilityStatistics/components/AtlasResources.vue @@ -31,7 +31,9 @@ v-for="(item, index) in bubbleList" :key="item.id" class="bubble-item" - @click.stop.prevent="index == 0 ? showDepartmentList() : ''" + @click.stop.prevent=" + index == 0 ? showDepartmentList() : goToDetails(item) + " > @@ -58,7 +60,7 @@ -

查看更多>

+
@@ -136,6 +138,8 @@ provideDeptTopN, applyDeptTopN, } from '@/api/abilityStatistics' + // import { useRouter } from 'vue-router' + // const router = useRouter() // 左侧导航 const navList = ref([ '能力共享方-应用领域', @@ -149,6 +153,15 @@ ]) const navSelect = ref('能力共享方-应用领域') const departmentListFlag = ref(false) + const goToDetails = (item) => { + // console.log('点击气泡===============>', item) + // router.push({ + // path: '/details', + // query: { + // id: item.id, + // }, + // }) + } // 点击导航 const selectNav = (name) => { navSelect.value = name diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index a892d2b9..837b6885 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -147,6 +147,10 @@ break } }) + let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库'] + dataList.value.dataList.sort((a, b) => { + return arr.indexOf(a.type) - arr.indexOf(b.type) + }) }) let datas = ref([]) let laiyuanDataList = ref([]) diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index ae100a9f..bf6082cf 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -271,8 +271,8 @@ }, grid: { top: '10%', - left: '0%', - right: '5%', + left: '3%', + right: '10%', bottom: '0%', containLabel: true, }, diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue index 9f43f6cb..380272aa 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue @@ -65,6 +65,7 @@ diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 053d6e75..e1e19e28 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -2,7 +2,10 @@
- +
@@ -84,281 +87,297 @@ diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index b0e395c3..b0585b8f 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -8,7 +8,12 @@