From 2546db9b64b3df5cf1dbb3baf18e8fd613c04cc8 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 22 Sep 2024 12:21:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E9=80=82=E9=85=8D/=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/auth.js | 15 ++ src/api/home/index.js | 2 +- src/views/article-management/add.vue | 2 +- src/views/home/index.vue | 165 +++++++++++++----- src/views/research-fund/add.vue | 2 +- .../workflow/process/common/UserPicker.vue | 8 +- 6 files changed, 142 insertions(+), 52 deletions(-) diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js index ca11cf9..01afdcb 100644 --- a/src/api/auth/auth.js +++ b/src/api/auth/auth.js @@ -14,3 +14,18 @@ export const editPassword=(data)=>{ data }) } + +export const getAgentInfo=()=>{ + return request({ + url:'/admin/mosr/user/self/approval/agent', + method:'get' + }) +} + +export const editAgentInfo=(data)=>{ + return request({ + url:'/admin/mosr/user/self/approval/agent', + method:'post', + data + }) +} diff --git a/src/api/home/index.js b/src/api/home/index.js index f62d17b..cd571e8 100644 --- a/src/api/home/index.js +++ b/src/api/home/index.js @@ -1,6 +1,6 @@ import request from '@/utils/request.js' -export const getHomeInfo = () => { +export const getHomeTaskInfo = () => { return request({ url: '/workflow/mosr/process/task', method: "get" diff --git a/src/views/article-management/add.vue b/src/views/article-management/add.vue index 544ee82..ab1c912 100644 --- a/src/views/article-management/add.vue +++ b/src/views/article-management/add.vue @@ -35,7 +35,7 @@
提交 - 重新提交 + 提交 返回
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 0bc2e02..16270ee 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -6,7 +6,7 @@
早上好，小i提醒您有{{ taskTabList[0].num }}个审批待立项
- +
@@ -147,6 +147,9 @@
+
+ +
{{ index > 8 ? '' : 0 }}{{ index + 1 }}{{ item.articleTitle }}
@@ -195,12 +198,16 @@
-
+
+ +
+
-
总资金：{{ toThousands(totalMoney) }}
+
总资金：{{ toThousands(totalMoney) }}
+
@@ -210,7 +217,7 @@
-
研发投入资金统计图
+
研发投入资金统计图
 @@ -218,16 +225,19 @@
+
+ +
@@ -258,6 +268,9 @@
+
+ +
@@ -284,7 +297,7 @@ import {useAuthStore} from '@/stores/userstore.js' import * as echarts from 'echarts' import {toThousands} from "@/utils/changePrice.js"; import {ElNotification} from "element-plus"; -import {getHomeInfo} from "@/api/home"; +import {getHomeTaskInfo} from "@/api/home"; import {getResearchFundChart} from "@/api/research-fund"; import {getArticle} from "@/api/article"; @@ -660,7 +673,7 @@ const initMoneyCharts = () => { data.moneyPieCharts = echarts.init(document.getElementById('moneyPie')).setOption(moneyPieOption.value) } const getTodoList = () => { - getHomeInfo().then(res => { + getHomeTaskInfo().then(res => { if (res.code === 1000) { // todoList.value=res.data.rows // todoNum.value=res.data.total @@ -678,10 +691,19 @@ const getResearchChart = () => { if (res.code === 1000) { totalMoney.value = res.data.totalAmount moneyData.value = res.data.rdCompanyList - if (moneyPieOption.value.series && moneyPieOption.value.series?.length > 0) { - moneyPieOption.value.series[0].data = res.data.rdCompanyList - initMoneyCharts() - } + // if (res.data.rdCompanyList?.length == 0) { + // moneyData.value = [{value: 5000, name: '智汇未来科技公司',}, + // {value: 3000, name: '云航信息技术公司'}, + // {value: 12345, name: '融智投资管理公司'},] + // moneyPieOption.value.series[0].data = moneyData.value + // initMoneyCharts() + // } else { + if(res.data.rdCompanyList?.length ==0)return; + if (moneyPieOption.value.series && moneyPieOption.value.series?.length > 0) { + moneyPieOption.value.series[0].data = res.data.rdCompanyList + initMoneyCharts() + } + // } } else { ElNotification({ title: '提示', @@ -828,26 +850,21 @@ const handleView = (row) => {