From e6528b4b3bb5cc22b5749d80cbda3026fedbb0fb Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 7 Jul 2022 09:23:12 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1BUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main.js | 8 +------- front/src/views/home/components/header.vue | 8 ++------ 2 files changed, 3 insertions(+), 13 deletions(-) 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/home/components/header.vue b/front/src/views/home/components/header.vue index 2d232f3f..aa448adc 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -20,7 +20,7 @@ {{ item.name }} - + --> - + { mynoticeFlag.value = true - // document.documentElement.style.overflowY = 'hidden' }) mynoticeDom.addEventListener('mouseout', () => { mynoticeFlag.value = false - document.documentElement.style.overflowY = 'scroll' }) } if (mynotice) { mynotice.addEventListener('mouseover', () => { mynoticeFlag.value = true - // document.documentElement.style.overflowY = 'hidden' }) mynotice.addEventListener('mouseout', () => { mynoticeFlag.value = false - document.documentElement.style.overflowY = 'scroll' }) } mybus.on('getSgcNum', () => { From 4a1126cf949706162fbbd9cfb4a6fb03e7accc1d Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 7 Jul 2022 10:27:46 +0800 Subject: [PATCH 02/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workBench/components/bottom-view.vue | 95 ++++--- .../components/frequency-top5-view.vue | 258 +++++++++--------- 2 files changed, 174 insertions(+), 179 deletions(-) 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 @@
-
{{ i + 3 }}
+
{{ i + 4 }}
{{ data.name || '--' }}
 @@ -41,185 +41,181 @@ import * as Apis from '../api.js' import contentTitle from './content-title.vue' export default { - data() { - return { - listInfo: [], - colorObj: { - 1: '#4658710', - 2: '#734204', - 3: '#805932', - }, - no1Obj: { - name: '', - count: '', - }, - no2Obj: { - name: '', - count: '', - }, - no3Obj: { - name: '', - count: '', - }, - noData: false, - loading: true, - }; - }, - mounted() { - this.getData(); - }, - methods: { - // 频率 - getData() { - let data = { - limit: 5, - page: 1, - }; - this.loading = true - Apis.getFrequence(data, res => { - this.loading = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg); - } - console.log("res----频率-------->", res.data); - let _arr = res.data.data.records || []; - if (_arr.length == 0) { - this.noData = true - return; - } - for (let i = 0; i < 3; i++) { - let k = i + 1; - this[`no${k}Obj`].name = _arr[i].name - this[`no${k}Obj`].count = _arr[i].count - } - this.listInfo = [] - this.listInfo.push(_arr[3] || {}) - this.listInfo.push(_arr[4] || {}) - - }, err => { - this.loading = false; - this.$message.error(err); - }); - }, - formatCount(count) { - return count || count === 0 ? count : '--' + data () { + return { + listInfo: [], + colorObj: { + 1: '#4658710', + 2: '#734204', + 3: '#805932' + }, + no1Obj: { + name: '', + count: '' + }, + no2Obj: { + name: '', + count: '' + }, + no3Obj: { + name: '', + count: '' + }, + noData: false, + loading: true + } + }, + mounted () { + this.getData() + }, + methods: { + // 频率 + getData () { + const data = { + limit: 5, + page: 1 + } + this.loading = true + Apis.getFrequence(data, res => { + this.loading = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) } + console.log('res----频率-------->', res.data) + const _arr = res.data.data.records || [] + if (_arr.length == 0) { + this.noData = true + return + } + for (let i = 0; i < 3; i++) { + const k = i + 1 + this[`no${k}Obj`].name = _arr[i].name + this[`no${k}Obj`].count = _arr[i].count + } + this.listInfo = [] + this.listInfo.push(_arr[3] || {}) + this.listInfo.push(_arr[4] || {}) + }, err => { + this.loading = false + this.$message.error(err) + }) }, - components: { contentTitle } + formatCount (count) { + return count || count === 0 ? count : '--' + } + }, + components: { contentTitle } } \ No newline at end of file + From b48c2972cec2e520407f38e5cb7e525893973cf5 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Thu, 7 Jul 2022 10:42:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BA=91=E5=9B=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/capabilityCloud/components/ComponentServices.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, }, From 0ad564616747961c169686b040515f2f8eff35da Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 7 Jul 2022 10:49:37 +0800 Subject: [PATCH 04/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/components/searchResultList.vue | 5 +- .../newHome/components/PopularAbility.vue | 330 +++++++++--------- 2 files changed, 167 insertions(+), 168 deletions(-) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 724084a0..f80a88a9 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -137,7 +137,7 @@
浏览量：{{ item.visits || 0 }}次
-
申购量：{{ item.applyCount || 0 }}次
+
申请量：{{ item.applyCount || 0 }}次
数据量：{{ item.sjlCount || 0 }}
@@ -430,8 +430,7 @@ item.guid ) } else { - window.open( - 'http://10.134.135.24:30090/#/home') + window.open('http://10.134.135.24:30090/#/home') } } else { if (type === 'apply') { diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue index 5f86d6c7..ee733fcf 100644 --- a/front/src/views/newHome/components/PopularAbility.vue +++ b/front/src/views/newHome/components/PopularAbility.vue @@ -16,7 +16,7 @@ > {{ sel }}
@@ -35,7 +35,7 @@
{{ select }}:{{ item.visits }}
-
+
{{ select }}:{{ item.applyCount }}
@@ -64,7 +64,7 @@ const store = useStore() const router = useRouter() const select = ref('浏览量') - const selList = ref(['浏览量', '申购量', '收藏量']) + const selList = ref(['浏览量', '申请量', '收藏量']) const list = ref([]) const paramsGetResources = { @@ -83,7 +83,7 @@ case '浏览量': paramsGetResources.orderField = 'visits' break - case '申购量': + case '申请量': paramsGetResources.orderField = 'applyCount' break case '收藏量': @@ -153,195 +153,195 @@ } From 47744311106d591cd2c7560f28357ca9231c48c6 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 7 Jul 2022 11:25:56 +0800 Subject: [PATCH 05/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AtlasResources.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 From 617373eb8ef67ddab80d1ec809f54ee745cab3f2 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Thu, 7 Jul 2022 11:37:05 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=96=87=E6=A1=A3=E6=B7=BB=E5=8A=A0=E6=9A=82=E6=97=A0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Algorithm/AlgorithmUsageMode.vue | 20 +- .../components/Business/BusinessUsageMode.vue | 521 +++++++++--------- .../LayerService/LayerServiceNavigation.vue | 468 ++++++++-------- .../LayerService/LayerServiceUsageMode.vue | 37 +- 4 files changed, 545 insertions(+), 501 deletions(-) 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 @@