odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 修复首页适配/人员选择器取消功能bug' (#796) from de into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/796
This commit is contained in:
odjbin
2024-09-22 04:22:25 +00:00
parent 58ffb22bf6 2546db9b64
commit 242fb1ddee
6 changed files with 142 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/auth/auth.js
View File

@@ -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
})
}

2
src/api/home/index.js
View File

@@ -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"

2
src/views/article-management/add.vue
View File

@@ -35,7 +35,7 @@
</el-form>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName === 'Article/add'" @click="handleSubmit(fundForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
</div>

165
src/views/home/index.vue
View File

@@ -6,7 +6,7 @@
<el-card shadow="never">
<div class="notice-title">早上好，小i提醒您<span>有<span>{{ taskTabList[0].num }}</span>个审批待立项</span></div>
<el-row class="statistics">
<el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" v-for="(item,index) in taskTabList" :key="index">
<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-for="(item,index) in taskTabList" :key="index">
<div class="block" :style="{'background-image':'url('+getImgUrl(item.icon)+')'}"
@click="clickGotoListPage(item)">
<div class="block-right">
@@ -147,6 +147,9 @@
</div>
</div>
<div class="notice-block">
<div v-if="noticeList&&noticeList.length==0">
<el-empty image-size="135" description="暂无通知公告~"/>
</div>
<div v-for="(item,index) in noticeList" class="notice" @click="handleGoToArticleDetail(item)">
<span>{{ index > 8 ? '' : 0 }}{{ index + 1 }}</span>{{ item.articleTitle }}
</div>
@@ -195,12 +198,16 @@
</el-icon>
</div>
</div>
<div class="money-block">
<div v-if="moneyData&&moneyData.length==0" style="margin-top: 15px">
<el-empty image-size="135" description="暂无研发投入资金信息~"/>
</div>
<div class="money-block" v-else>
<div class="money-container">
<div id="moneyPie" ref="moneyPie"></div>
</div>
<div>
<div class="total-money">总资金：{{ toThousands(totalMoney) }}</div>
<div class="total-money" >总资金：{{ toThousands(totalMoney) }}</div>
<div v-for="(item,index) in moneyData" class="legend">
<div style="display: flex;align-items: center">
<div class="money-dot" :style="{'background-color': moneyColorList[index]}"></div>
@@ -210,7 +217,7 @@
</div>
</div>
</div>
<div class="fund-pie" style="text-align: left;margin-left: 70px;margin-top: 10px">研发投入资金统计图</div>
<div class="fund-pie" v-if="totalMoney" style="text-align: left;margin-left: 70px;margin-top: 10px">研发投入资金统计图</div>
</div>
</div>
</el-col>
@@ -218,16 +225,19 @@
<el-card shadow="never" class="todo-bg">
<el-tabs v-model="docActiveTab" editable @tab-add="goToArticleList">
<template #add-icon>
<div style="white-space: nowrap;display: flex;align-items: center">
更多
<el-icon color="#1F63E6" size="18">
<ArrowRight/>
</el-icon>
</div>
<div style="white-space: nowrap;display: flex;align-items: center">
更多
<el-icon color="#1F63E6" size="18">
<ArrowRight/>
</el-icon>
</div>
<div style="width: 15px"></div>
</template>
<el-tab-pane label="规章制度" name="first">
<div class="notice-block rules-block">
<div v-if="rulesList&&rulesList.length==0">
<el-empty image-size="135" description="暂无规章制度~"/>
</div>
<div v-for="(item,index) in rulesList" class="notice" @click="handleGoToArticleDetail(item)">
<!-- <div>-->
<!-- <span>{{ index > 8 ? '' : 0 }}{{ index + 1 }}</span>{{ item.title }}-->
@@ -258,6 +268,9 @@
</el-tab-pane>
<el-tab-pane label="常见问题" name="third">
<div class="notice-block rules-block">
<div v-if="problemList&&problemList.length==0">
<el-empty image-size="135" description="暂无常见问题~"/>
</div>
<div v-for="(item,index) in problemList" class="notice" @click="handleGoToArticleDetail(item)">
<!-- <span>{{ index > 8 ? '' : 0 }}{{ index + 1 }}</span>-->
<div>
@@ -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) => {
<style lang="scss" scoped>
@media (min-width: 1200px) and (max-width: 1918px) {
.right-top {
height: 684px !important;
//.right-top {
// height: 684px !important;
//}
//.home-bg .notice-block {
// height: 624px !important;
//}
.todo-bg {
margin-top: 10px;
}
.block {
width: 300px !important;
}
.home-bg .notice-block {
height: 624px !important;
} .todo-bg {
margin-top: 10px;
}
}
@media only screen and (max-width: 1500px) {
.statistics {
.block {
width: 300px !important;
}
}
}
@media only screen and (max-width: 1420px) {
@media only screen and (max-width: 1800px) {
.statistics {
.block {
width: 280px !important;
@@ -855,17 +872,21 @@ const handleView = (row) => {
}
}
@media only screen and (max-width: 1344px) {
@media only screen and (max-width: 1720px) {
.statistics {
.block {
width: 260px !important;
//height: 140px!important;
}
}
//.right-top {
// height: 670px !important;
//}
//.home-bg .notice-block {
// height: 624px !important;
//}
}
@media only screen and (max-width: 1270px) {
@media only screen and (max-width: 1620px) {
.statistics {
.block {
width: 240px !important;
@@ -873,6 +894,42 @@ const handleView = (row) => {
}
}
@media only screen and (max-width: 1500px) {
.statistics {
.block {
width: 220px !important;
//height: 120px!important;
}
}
}
//@media only screen and (max-width: 1420px) {
// .statistics {
// .block {
// width: 280px !important;
// }
// }
//
//}
//@media only screen and (max-width: 1344px) {
// .statistics {
// .block {
// width: 260px !important;
// }
// }
//
//}
//
//@media only screen and (max-width: 1270px) {
// .statistics {
// .block {
// width: 240px !important;
// }
// }
//
//}
@media only screen and (max-width: 1200px) {
.right {
@@ -886,18 +943,11 @@ const handleView = (row) => {
}
.statistics {
.block {
width: 320px !important;
width: 350px !important;
}
}
}
@media only screen and (max-width: 1120px) {
.statistics {
.block {
width: 290px !important;
}
}
}
@media only screen and (max-width: 1000px) {
.right {
@@ -911,6 +961,22 @@ const handleView = (row) => {
}
}
@media only screen and (max-width: 888px) {
.statistics {
.block {
width: 320px !important;
}
}
}
@media only screen and (max-width: 820px) {
.statistics {
.block {
width: 300px !important;
}
}
}
@media only screen and (max-width: 767px) {
.right {
margin-top: 10px;
@@ -921,6 +987,11 @@ const handleView = (row) => {
.todo-bg {
margin-top: 10px;
}
.statistics {
.block {
width: 350px !important;
}
}
}
* {
@@ -1261,7 +1332,7 @@ const handleView = (row) => {
cursor: pointer;
display: flex;
align-items: center;
width: 320px;
width: 344px;
height: 170px;
background-size: 100% 100%;
background-repeat: no-repeat;

2
src/views/research-fund/add.vue
View File

@@ -48,7 +48,7 @@
</el-form>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName === 'Devfund/add'" @click="handleSubmit(fundForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
<company-picker :multiple="false" ref="companyRef" title="请选择研发公司" @ok="sureSelectedCompany" @cancelOrClear="cancelSelectedCompany"

8
src/views/workflow/process/common/UserPicker.vue
View File

@@ -261,10 +261,14 @@ const clearSelected = () => {
});
};
const cancelUserPicker = () => {
if (isRemoveSingleSelected.value&&localStorage.getItem('originallySelectedList')) {
if (localStorage.getItem('originallySelectedList')) {
selectList.value = JSON.parse(localStorage.getItem('originallySelectedList'))
}else{
selectList.value=[]
if(_value.value?.length>0){
selectList.value=_value.value
}else {
selectList.value = []
}
}
emit("cancelOrClear", selectList.value);
visible.value = false;