From 2bb502921f440b30d286255221f00d3adaedd06a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 24 Jun 2022 19:47:00 +0800
Subject: [PATCH] =?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/ResourceAggregation.vue | 29 +-
front/src/views/home/DetailsPageconetent.vue | 894 +++++++++---------
.../components/CapabilityConvergence.vue | 46 +-
.../views/newHome/components/Navigation2.vue | 74 +-
4 files changed, 549 insertions(+), 494 deletions(-)
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 3fdf4885..49c547a4 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -20,7 +20,7 @@
{{ item.type }}
- {{ item.amount }}
+ {{ item.amount || 0 }}
{{ item.organization }}
@@ -60,7 +60,7 @@
numberOfResourcesByCategory,
sourceDepartmentStatistics,
} from '@/api/abilityStatistics.js'
- import { zywMessage } from '@/api/home'
+ // import { zywMessage } from '@/api/home'
import * as echarts from 'echarts'
//各类资源汇聚量
let dataList = ref({
@@ -76,21 +76,21 @@
])
// let name = ref([])
// 获取数据资源数据
- const findZywMessage = () => {
- zywMessage().then((res) => {
- const { data } = res.data
- dataSourceNum.value = data.sxmlcount || 0
- snum()
- })
- }
+ // const findZywMessage = () => {
+ // zywMessage().then((res) => {
+ // const { data } = res.data
+ // dataSourceNum.value = data.sxmlcount || 0
+ // snum()
+ // })
+ // }
//各类资源数目接口
function snum() {
numberOfResourcesByCategory().then((res) => {
dataList.value.dataList = res.data.data
res.data.data.map((item, index) => {
- if (dataList.value.dataList[index].type === '数据资源') {
- dataList.value.dataList[index].amount = dataSourceNum.value || 0
- }
+ // if (dataList.value.dataList[index].type === '数据资源') {
+ // dataList.value.dataList[index].amount = dataSourceNum.value || 0
+ // }
dataList.value.dataList[index].organization = '个'
dataList.value.dataList[index].photo = photo.value[index]
})
@@ -98,7 +98,7 @@
}
let datas = ref([])
let laiyuanDataList = ref([])
- let dataSourceNum = ref(0)
+ // let dataSourceNum = ref(0)
let bumenSum = ref([])
//能力统计-来源部门统计接口
@@ -316,7 +316,8 @@
option && myChart.setOption(option)
}
onMounted(() => {
- findZywMessage()
+ // findZywMessage()
+ snum()
sourceDepartment()
})
watch(
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 4afa53f2..3e0bc5cf 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -669,7 +669,7 @@
import {
selectDicStoreAll,
pageWithAttrs,
- zywMessage,
+ // zywMessage,
getDataResource,
} from '@/api/home.js'
import { getSgcList } from '@/api/personalCenter'
@@ -1186,21 +1186,21 @@
paramsGetResources.pageNum = val
getAppResources()
}
- const findZywMessage = () => {
- zywMessage().then((res) => {
- console.log('findMessage============>', res)
- const { data } = res.data
- shujuziyuanqingkuang.value[0].value = data.sxmlcount
- shujuziyuanqingkuang.value[1].value = data.yfbfwcount
- shujuziyuanqingkuang.value[2].value = data.yfbjk
- shujuziyuanqingkuang.value[3].value = new Date().toLocaleString()
- })
- }
+ // const findZywMessage = () => {
+ // zywMessage().then((res) => {
+ // console.log('findMessage============>', res)
+ // const { data } = res.data
+ // shujuziyuanqingkuang.value[0].value = data.sxmlcount
+ // shujuziyuanqingkuang.value[1].value = data.yfbfwcount
+ // shujuziyuanqingkuang.value[2].value = data.yfbjk
+ // shujuziyuanqingkuang.value[3].value = new Date().toLocaleString()
+ // })
+ // }
onMounted(() => {
listKey2.value++
console.log('45345345', Cardsname.value, tecHnosphere, appLiCation)
getNewList()
- findZywMessage()
+ // findZywMessage()
// onSearch()
if (!tecHnosphere && !appLiCation) {
getAppResources()
@@ -1336,474 +1336,474 @@
})
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index ff34baec..aaf34ffa 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -77,9 +77,10 @@