LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【update】-项目颜色的调整；之前遗留问题的开发

Browse Source
This commit is contained in:
fengchenchen
2022-12-07 19:17:19 +08:00
parent 8cf915e53e
commit 27dbbe6055
28 changed files with 293 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/screen/location_icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

src/assets/screen/title_box.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

src/assets/screen/title_income.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

src/assets/screen/title_iso.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

src/assets/screen/title_wp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

src/assets/screen/title_zxd.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

src/views/screen/HomePage.vue
+112 -7
View File
@@ -1,31 +1,62 @@
<template> <template>
<div class="screen-home-page"> <div class="screen-home-page">
<div class="location-icon">
<a-dropdown overlayClassName="screen-dropdown-box">
<img src="../../assets/screen/location_icon.png" alt="">
<template #overlay>
<a-menu>
<a-menu-item
v-for="item in menuData"
:key="item.value"
>
<a :href="'#' + item.href">{{ item.name }}</a>
</a-menu-item>
</a-menu>
</template>
</a-dropdown>
</div>
<!-- 上面的头部--> <!-- 上面的头部-->
<div class="header"> <div class="header">
<img src="../../assets/screen/header_bg.png" alt=""> <img class="bg-img" src="../../assets/screen/header_bg.png" alt="">
<span class="title">中国汽车标准化研究院运营管理</span> <!-- <span class="title">中国汽车标准化研究院运营管理平台</span>-->
<span class="title"><img class="title" src="../../assets/screen/title_box.png" alt=""></span>
<!-- <img class="title" src="../../assets/screen/title_box.png" alt="">-->
<!-- <span></span>-->
</div> </div>
<!-- 来款--> <!-- 来款-->
<template> <template>
<div class="sub-title"><span>汽车标准化工作平台</span></div> <div class="sub-title" id="income">
<!-- <span>汽车标准化工作平台</span>-->
<img src="../../assets/screen/title_income.png" alt="">
</div>
<income-payment-screen></income-payment-screen> <income-payment-screen></income-payment-screen>
</template> </template>
<!-- 制修订 --> <!-- 制修订 -->
<template> <template>
<div class="sub-title"><span>汽车标准制修订管理系统 </span></div> <div class="sub-title" id="preparationRevisionScreen">
<!-- <span>汽车标准制修订管理系统 </span>-->
<img src="../../assets/screen/title_zxd.png" alt="">
</div>
<preparation-revision-screen></preparation-revision-screen> <preparation-revision-screen></preparation-revision-screen>
</template> </template>
<!-- 中国汽车国际法规工作平台-ISO--> <!-- 中国汽车国际法规工作平台-ISO-->
<template> <template>
<div class="sub-title"><span>中国汽车国际标准工作平台-ISO</span></div> <div class="sub-title" id="ISO">
<!-- <span>中国汽车国际标准工作平台-ISO</span>-->
<img src="../../assets/screen/title_iso.png" alt="">
</div>
<i-s-o-screen></i-s-o-screen> <i-s-o-screen></i-s-o-screen>
</template> </template>
<!-- 中国汽车国际法规工作平台-WP.29 --> <!-- 中国汽车国际法规工作平台-WP.29 -->
<template> <template>
<div class="sub-title"><span>中国汽车国际法规工作平台-WP.29</span></div> <div class="sub-title" id="WP">
<!-- <span>中国汽车国际法规工作平台-WP.29</span>-->
<img src="../../assets/screen/title_wp.png" alt="">
</div>
<w-p-screen></w-p-screen> <w-p-screen></w-p-screen>
</template> </template>
</div> </div>
@@ -46,10 +77,26 @@ export default {
WPScreen, WPScreen,
ISOScreen ISOScreen
}, },
data() {
return {
menuData: [
{name: '汽车标准化工作平台', value: '1', href: 'income'},
{name: '汽车标准制修订管理系统', value: '2', href: 'preparationRevisionScreen'},
{name: '中国汽车国际标准工作平台-ISO', value: '3', href: 'ISO'},
{name: '中国汽车国际法规工作平台-WP.29', value: '4', href: 'WP'},
]
}
},
created() {
document.title = `中国汽车标准化研究院运营管理平台`
}
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
::selection{
background: transparent;
}
.screen-home-page{ .screen-home-page{
min-height: 100%; min-height: 100%;
background: url("../../assets/screen/screen_bg.png"); background: url("../../assets/screen/screen_bg.png");
@@ -69,13 +116,22 @@ export default {
height: 162px; height: 162px;
display: flex; display: flex;
justify-content: center; justify-content: center;
img{ img.bg-img{
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
height: 162px; height: 162px;
width: 100%; width: 100%;
} }
img.title{
display: inline-block;
height: 64px;
width: auto;
//margin-top: 21px;
//line-height: 42px;
position: relative;
}
span.title{ span.title{
display: inline-block; display: inline-block;
margin-top: 21px; margin-top: 21px;
@@ -141,4 +197,53 @@ export default {
} }
} }
/*内部标题*/
/deep/.box-title{
text-shadow: 0 0 5px #88D8FB;
}
/* 右侧定位的按钮*/
.location-icon{
position: fixed;
z-index: 200;
top: 165px;
right: 20px;
cursor: pointer;
img{
cursor: pointer;
width: 40px;
height: 40px;
}
}
::v-deep ::-webkit-scrollbar-track{
background: yellow;
//border-color: transparent;
}
::v-deep ::-webkit-scrollbar-thumb{
background: red;
}
::v-deep ::-webkit-scrollbar-corner {
background: black;
}
</style>
<style lang="less">
.screen-dropdown-box ul{
background: #233062;
color: #fff;
box-shadow: 0 0 4px #7599E8 inset;
li a{
color: #fff;
}
.ant-dropdown-menu-item:hover{
background-color: #7599E8;
}
}
.ant-select-screen .ant-empty-description{
color: #fff;
}
</style> </style>
src/views/screen/incomePayments/AllMoneyTenEcharts.vue
+6 -2
View File
@@ -138,9 +138,13 @@ export default {
}) })
let option = { let option = {
legend: { legend: {
right: '2%' right: '2%',
top: '2%'
},
grid: {
bottom: '1%',
top: '14%'
}, },
tooltip:{ tooltip:{
formatter: params => { formatter: params => {
src/views/screen/incomePayments/SingleMonthEcharts.vue
+6 -6
View File
@@ -211,11 +211,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#4471EF' color: 'rgba(88, 115, 234, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(88, 115, 234, 0.1)'
} }
]) ])
}, },
@@ -238,11 +238,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#00D8F1' color: 'rgba(0, 216, 241, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(0, 216, 241, 0)'
} }
]) ])
}, },
@@ -265,11 +265,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#6CFBCE' color: 'rgba(108, 251, 206, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(108, 251, 206, 0)'
} }
]) ])
}, },
src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
+7 -12
View File
@@ -182,12 +182,7 @@ export default {
// let chartDom = document.getElementById('singleMonthTotalEcharts') // let chartDom = document.getElementById('singleMonthTotalEcharts')
// let myChart = echarts.init(chartDom) // let myChart = echarts.init(chartDom)
let option let option = {
option = {
xAxis: { xAxis: {
data: xData data: xData
}, },
@@ -211,11 +206,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#4471EF' color: 'rgba(68, 113, 239, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(68, 113, 239, 0)'
} }
]) ])
}, },
@@ -239,11 +234,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#00D8F1' color: 'rgba(0, 216, 241, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(0, 216, 241, 0)'
} }
]) ])
}, },
@@ -267,11 +262,11 @@ export default {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,
color: '#6CFBCE' color: 'rgba(108, 251, 206, 1)'
}, },
{ {
offset: 1, offset: 1,
color: '#ffffff' color: 'rgba(108, 251, 206, 0)'
} }
]) ])
}, },
src/views/screen/incomePayments/index.vue
+10 -5
View File
@@ -67,7 +67,7 @@ export default {
} }
/deep/ .box-title { /deep/ .box-title {
font-size: 18px; font-size: 16px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #DDF0FF; color: #DDF0FF;
@@ -82,8 +82,8 @@ export default {
/deep/ .box-content { /deep/ .box-content {
position: absolute; position: absolute;
width: calc(100% - 100px); width: calc(100% - 100px);
height: calc(100% - 5% * 2); height: calc(100% - 6% * 2);
top: 5%; top: 7%;
left: 50px; left: 50px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -145,6 +145,9 @@ export default {
// 表格样式的修改 // 表格样式的修改
/deep/ .ant-table-fixed{
border-color: transparent!important;
}
/deep/ .ant-table-thead tr > th { /deep/ .ant-table-thead tr > th {
color: #FFFFFF; color: #FFFFFF;
font-weight: bold; font-weight: bold;
@@ -164,11 +167,13 @@ export default {
} }
/deep/ .ant-table-tbody tr:nth-of-type(2n + 1) { /deep/ .ant-table-tbody tr:nth-of-type(2n + 1) {
background: #233062; //background: #233062;
background: rgba(136, 216, 251, 0.1);
} }
/deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td { /deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #233062; //background: #233062;
background: rgba(136, 216, 251, 0.2);
} }
/deep/ .ant-table-content .ant-table-placeholder { /deep/ .ant-table-content .ant-table-placeholder {
src/views/screen/iso/ExpertChart.vue
+16
View File
@@ -19,6 +19,7 @@
@change="fieldSelectChange" @change="fieldSelectChange"
dropdown-class-name="ant-select-screen" dropdown-class-name="ant-select-screen"
> >
<!-- <a-icon slot="suffixIcon" type="gold" />-->
<a-select-option <a-select-option
v-for="(item, index) in fieldOptionData" v-for="(item, index) in fieldOptionData"
:key="index + item.orgCode" :key="index + item.orgCode"
@@ -153,6 +154,7 @@ export default {
.select-info-box{ .select-info-box{
width: 75%; width: 75%;
margin-left: 25%; margin-left: 25%;
margin-bottom: 10px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@@ -164,6 +166,20 @@ export default {
.label{ .label{
color: @white; color: @white;
} }
/deep/.ant-select{
ul> li {
background: transparent;
border-color: transparent;
color: #fff;
}
svg{
color: #fff;
}
}
::v-deep .ant-select-selection__placeholder{
color: #fff;
}
} }
</style> </style>
src/views/screen/iso/LeadingStandardChart.vue
+41 -17
View File
@@ -3,6 +3,7 @@
<div class="iso-full-box iso-full-table"> <div class="iso-full-box iso-full-table">
<div class="box-title">中国牵头标准信息统计</div> <div class="box-title">中国牵头标准信息统计</div>
<div class="box-content"> <div class="box-content">
<!-- y: 500-->
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
@@ -12,7 +13,7 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:scroll="{x: 1200}" :scroll="{x: 1200, y: 550}"
@change="handleTableChange" @change="handleTableChange"
class="j-table-force-nowrap main-table iso-table"> class="j-table-force-nowrap main-table iso-table">
@@ -33,8 +34,8 @@
<div>{{ record.standardNameEnglish }}</div> <div>{{ record.standardNameEnglish }}</div>
</template> </template>
<div > <div >
<div class="table-text">{{ record.standardNameChinese }}</div> <div class="">{{ record.standardNameChinese }}</div>
<div class="table-text">{{ record.standardNameEnglish }}</div> <div class="">{{ record.standardNameEnglish }}</div>
</div> </div>
</a-tooltip> </a-tooltip>
@@ -77,14 +78,14 @@ export default {
{ {
title: '标准名称', title: '标准名称',
align: 'center', align: 'center',
width: '444px', width: '500px',
dataIndex: 'standardName', dataIndex: 'standardName',
scopedSlots: { customRender: 'standard-name' } scopedSlots: { customRender: 'standard-name' }
}, },
{ {
title: '技术领域', title: '技术领域',
align: 'center', align: 'center',
dataIndex: 'technosphereSc_dictText', dataIndex: 'technosphere',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
@@ -139,7 +140,7 @@ export default {
} else { } else {
this.ipagination.total = 0 this.ipagination.total = 0
} }
// this.operateData(this.dataSource) this.operateData(this.dataSource)
} }
if (res.code === 510) { if (res.code === 510) {
this.$message.warning(res.message) this.$message.warning(res.message)
@@ -151,11 +152,19 @@ export default {
}, },
// 操作表格中的数据 // 操作表格中的数据
operateData(data) { operateData(data) {
// data.map(tt => { data.map(tt => {
// tt.standardNumber = '0000000000000000000099999999999999999999999999999999999999000000000000000000' tt.technosphere = `${tt.technosphereSc_dictText || ''} ${tt.technosphereWg_dictText || ''}`
// tt.standardNameChinese = '标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名' tt.standardNumber = `ISO ${tt.standardNumber}`
// tt.technosphereSc_dictText = '技术领域技技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域术领域' if(tt.standardYear) {
// }) tt.standardNumber = `${tt.standardNumber}：${tt.standardYear}`
}
if(tt.supplement) {
tt.standardNumber = `${tt.standardNumber} / ${tt.supplement}`
}
// tt.standardNameChinese = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个'
tt.standardNameEnglish = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个'
tt.standardNameChinese = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个'
})
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
//分页、排序、筛选变化时触发 //分页、排序、筛选变化时触发
@@ -200,23 +209,28 @@ export default {
/deep/ .ant-table-tbody tr > td { /deep/ .ant-table-tbody tr > td {
color: #A1E1FD; color: #A1E1FD;
border: none; border: none;
min-height: 108px;
//border-bottom: 1px solid rgb(245,245,246); //border-bottom: 1px solid rgb(245,245,246);
} }
/*
/deep/ .ant-table-tbody tr > td:first-child { /deep/ .ant-table-tbody tr > td:first-child {
color: #FFFFFF; color: #FFFFFF;
font-weight: bold; font-weight: bold;
} }
*/
/deep/ .ant-table-tbody tr:nth-of-type(2n + 1) { /deep/ .ant-table-tbody tr:nth-of-type(2n + 1) {
background: #233062; //background: #233062;
background: rgba(136, 216, 251, 0.1);
} }
/deep/ .ant-table-tbody tr:nth-of-type(2n){ /deep/ .ant-table-tbody tr:nth-of-type(2n){
background: transparent; background: transparent;
} }
/deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td { /deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #233062; //background: #233062;
background: rgba(136, 216, 251, 0.2);
} }
/deep/ .ant-table-content .ant-table-placeholder { /deep/ .ant-table-content .ant-table-placeholder {
@@ -227,18 +241,26 @@ export default {
color: white; color: white;
} }
/deep/.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body{
background-color: transparent;
}
/deep/.ant-table-fixed{
border-color: transparent!important;
}
// 高度必须固定否则没有办法出滚动条 // 高度必须固定否则没有办法出滚动条
.iso-full-table.iso-full-box{ .iso-full-table.iso-full-box{
height: 581px; //height: 600px;
height: 800px;
padding-top: 0; padding-top: 0;
background-color: transparent; //background: transparent;
/deep/* { /deep/* {
background-color: transparent; background: transparent;
} }
} }
.iso-table{ .iso-table{
margin-top: 60px; margin-top: 80px;
width: 100%; width: 100%;
height: 100%; height: 100%;
//overflow: auto; //overflow: auto;
@@ -270,5 +292,7 @@ export default {
/*表格滚动条*/ /*表格滚动条*/
/deep/.ant-table-body { /deep/.ant-table-body {
overflow-x: auto!important; overflow-x: auto!important;
overflow-y: auto!important;
} }
</style> </style>
src/views/screen/iso/MeetingCalendar.vue
+8
View File
@@ -113,15 +113,19 @@ export default {
arrayData.forEach((item) => { arrayData.forEach((item) => {
if (item.orgType === 'TC22') { if (item.orgType === 'TC22') {
item.status = '#5671E7' item.status = '#5671E7'
item.textColor = '#091C7C'
} else if (item.orgType === 'SC') { } else if (item.orgType === 'SC') {
item.status = '#6CFBCE' item.status = '#6CFBCE'
item.textColor = '#115379'
} else { } else {
item.status = '#69C4F3' item.status = '#69C4F3'
item.textColor = '#115379'
} }
newArr.push({ newArr.push({
start: this.dealWithTime(item.time), start: this.dealWithTime(item.time),
end: this.addDate(this.dealWithTime(item.endTime), 1), end: this.addDate(this.dealWithTime(item.endTime), 1),
color: item.status, color: item.status,
textColor: item.textColor,
id: item.meetingId, id: item.meetingId,
title: `${item.name}` title: `${item.name}`
}) })
@@ -321,6 +325,10 @@ div.calendar-box{
background-color: #7599E8; background-color: #7599E8;
} }
::v-deep .fc-event-title{
font-weight: 800!important;
}
</style> </style>
<style lang="less"> <style lang="less">
.tippy-content-box { .tippy-content-box {
src/views/screen/iso/index.vue
+1 -1
View File
@@ -49,7 +49,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
/deep/ .box-title { /deep/ .box-title {
font-size: 18px; font-size: 16px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #DDF0FF; color: #DDF0FF;
src/views/screen/preparationRevision/GeneralSituationChart.vue
+5 -3
View File
@@ -24,7 +24,9 @@ import { deepMerge } from '../../../utils/util'
let commonOption = { let commonOption = {
color: ['#5671E7', '#73BBF4'], color: ['#5671E7', '#73BBF4'],
title: { title: {
show: true show: true,
color: '#FEFEFE',
top: '20%'
}, },
tooltip: { tooltip: {
formatter: (param) => { formatter: (param) => {
@@ -41,7 +43,7 @@ let commonOption = {
borderColor: '#162057', borderColor: '#162057',
borderWidth: 2 borderWidth: 2
}, },
radius: ['35%', '60%'], radius: ['25%', '40%'],
center: ['50%', '55%'], center: ['50%', '55%'],
roseType: false, roseType: false,
label: { label: {
@@ -57,7 +59,7 @@ let commonOption = {
borderColor: '#162057', borderColor: '#162057',
borderWidth: 2 borderWidth: 2
}, },
radius: ['25%', '34%'], radius: ['15%', '22%'],
center: ['50%', '55%'], center: ['50%', '55%'],
label: { label: {
position: 'center', position: 'center',
src/views/screen/preparationRevision/OverdueChart.vue
+3 -3
View File
@@ -55,13 +55,13 @@ export default {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(88, 115, 234, 1)'
}, },
{ {
offset: 0.9, color: '#2D419A' // 100% 处的颜色 offset: 0.8, color: 'rgba(88, 115, 234, 0.6)'
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
src/views/screen/preparationRevision/PreparationRevisionChart.vue
+11 -2
View File
@@ -4,7 +4,7 @@
<div class="box-title">汽车标准制修订情况</div> <div class="box-title">汽车标准制修订情况</div>
<ul class="title-right"> <ul class="title-right">
<li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li> <li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li>
<img class="splice-icon" src="../../../assets/screen/split_icon.png" alt=""> <img class="splice-icon" @click="changeType" src="../../../assets/screen/split_icon.png" alt="">
<a-select <a-select
:class="{'active': selectType === 2}" :class="{'active': selectType === 2}"
v-model="selectValue" v-model="selectValue"
@@ -121,7 +121,7 @@ export default {
// name:'年度待确收金额', // name:'年度待确收金额',
data: this.barData, data: this.barData,
type: 'bar', type: 'bar',
barMaxWidth:20, barMaxWidth:40,
itemStyle:{ itemStyle:{
borderRadius:[4,4,0,0] borderRadius:[4,4,0,0]
} }
@@ -146,6 +146,15 @@ export default {
} else { } else {
this.selectType = 1 this.selectType = 1
} }
},
// 点击中间的图片 做维度的转换
changeType() {
if(this.selectType === 1) {
this.selectValue = this.SCOptionData[0]
this.selectChange(this.SCOptionData[0])
} else {
this.selectTypeChange(1)
}
} }
}, },
created() { created() {
src/views/screen/preparationRevision/ReleasePlanChart.vue
+13 -4
View File
@@ -4,7 +4,7 @@
<div class="box-title">历年计划下达情况</div> <div class="box-title">历年计划下达情况</div>
<ul class="title-right"> <ul class="title-right">
<li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li> <li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li>
<img class="splice-icon" src="../../../assets/screen/split_icon.png" alt=""> <img class="splice-icon" @click="changeType" src="../../../assets/screen/split_icon.png" alt="">
<a-select <a-select
:class="{'active': selectType === 2}" :class="{'active': selectType === 2}"
v-model="selectValue" v-model="selectValue"
@@ -69,6 +69,15 @@ export default {
this.selectType = 1 this.selectType = 1
} }
}, },
// 点击中间的图片 做维度的转换
changeType() {
if(this.selectType === 1) {
this.selectValue = this.SCOptionData[0]
this.selectChange(this.SCOptionData[0])
} else {
this.selectTypeChange(1)
}
},
getYearData() { getYearData() {
let year = new Date().getFullYear() let year = new Date().getFullYear()
let yearData = [] let yearData = []
@@ -148,13 +157,13 @@ export default {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(88, 115, 234, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.8, color: '#2D419A' // 100% 处的颜色 offset: 0.8, color: 'rgba(88, 115, 234, 0.6)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
src/views/screen/preparationRevision/ReleaseStandardChart.vue
+13 -4
View File
@@ -4,7 +4,7 @@
<div class="box-title">历年标准发布情况</div> <div class="box-title">历年标准发布情况</div>
<ul class="title-right"> <ul class="title-right">
<li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li> <li :class="{'active': selectType === 1}" @click="selectTypeChange(1)">总体</li>
<img class="splice-icon" src="../../../assets/screen/split_icon.png" alt=""> <img class="splice-icon" @click="changeType" src="../../../assets/screen/split_icon.png" alt="">
<a-select <a-select
:class="{'active': selectType === 2}" :class="{'active': selectType === 2}"
v-model="selectValue" v-model="selectValue"
@@ -67,6 +67,15 @@ export default {
this.selectType = 1 this.selectType = 1
} }
}, },
// 点击中间的图片 做维度的转换
changeType() {
if(this.selectType === 1) {
this.selectValue = this.SCOptionData[0]
this.selectChange(this.SCOptionData[0])
} else {
this.selectTypeChange(1)
}
},
getYearData() { getYearData() {
let year = new Date().getFullYear() let year = new Date().getFullYear()
let yearData = [] let yearData = []
@@ -145,13 +154,13 @@ export default {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(88, 115, 234, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.8, color: '#2D419A' // 100% 处的颜色 offset: 0.8, color: 'rgba(88, 115, 234, 0.6)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
src/views/screen/preparationRevision/ShouldBeCompletedProjectChart.vue
+7 -4
View File
@@ -6,11 +6,11 @@
<a-select <a-select
class="active" class="active"
v-model="selectValue" v-model="selectValue"
style="width: 70px" style="width: 90px"
placeholder="各SC" placeholder="年份"
:bordered="false" :bordered="false"
show-search show-search
:show-arrow="false" :show-arrow="true"
@change="selectChange" @change="selectChange"
dropdown-class-name="ant-select-screen" dropdown-class-name="ant-select-screen"
> >
@@ -100,6 +100,9 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="less">
.title-right {
right: 1%;
}
</style> </style>
src/views/screen/preparationRevision/index.vue
+5 -1
View File
@@ -83,7 +83,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
/deep/ .box-title { /deep/ .box-title {
font-size: 18px; font-size: 16px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #DDF0FF; color: #DDF0FF;
@@ -159,6 +159,7 @@ export default {
width: 20px; width: 20px;
height: 19px; height: 19px;
margin: 0 10px; margin: 0 10px;
cursor: pointer;
} }
} }
@@ -172,6 +173,9 @@ export default {
/deep/.ant-select.active .ant-select-selection{ /deep/.ant-select.active .ant-select-selection{
color: @white!important; color: @white!important;
} }
/deep/.ant-select-arrow{
color: @white!important;
}
/deep/.ant-select-focused .ant-select-selection, .ant-select-selection:focus, .ant-select-selection:active{ /deep/.ant-select-focused .ant-select-selection, .ant-select-selection:focus, .ant-select-selection:active{
border: none!important; border: none!important;
src/views/screen/util/BarAndLineOptions.js
+6 -6
View File
@@ -13,13 +13,13 @@ export const BarAndLineOptions = {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(66, 96, 231, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.8, color: '#2D419A' // 100% 处的颜色 offset: 0.8, color: 'rgba(66, 96, 231, 0.5)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(66, 96, 231, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
@@ -32,13 +32,13 @@ export const BarAndLineOptions = {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#00D8F1' // 0% 处的颜色 offset: 0, color: 'rgba(106, 197, 244, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.9, color: '#4679B1' // 100% 处的颜色 offset: 0.8, color: 'rgba(106, 197, 244, 0.5)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(106, 197, 244, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
src/views/screen/util/BarOptions.js
+9 -9
View File
@@ -14,13 +14,13 @@ export const BarOptions = {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(88, 115, 234, 1)'
}, },
{ {
offset: 0.8, color: '#2D419A' // 100% 处的颜色 offset: 0.8, color: 'rgba(88, 115, 234, 0.6)'
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
@@ -33,13 +33,13 @@ export const BarOptions = {
y2: 1, y2: 1,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#00D8F1' // 0% 处的颜色 offset: 0, color: 'rgba(106, 197, 244, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.9, color: '#4679B1' // 100% 处的颜色 offset: 0.8, color: 'rgba(106, 197, 244, 0.5)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(106, 197, 244, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
@@ -180,13 +180,13 @@ export const BarAxisTransformOptions = {
y2: 0, y2: 0,
colorStops: [ colorStops: [
{ {
offset: 0, color: '#4471EF' // 0% 处的颜色 offset: 0, color: 'rgba(88, 115, 234, 1)' // 0% 处的颜色
}, },
{ {
offset: 0.9, color: '#2D419A' // 100% 处的颜色 offset: 0.9, color: 'rgba(88, 115, 234, 0.6)' // 100% 处的颜色
}, },
{ {
offset: 1, color: 'transparent' // 100% 处的颜色 offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色
} }
], ],
global: false // 缺省为 false global: false // 缺省为 false
src/views/screen/util/LineOptions.js
+1 -1
View File
@@ -44,7 +44,7 @@ export const LineOptions = {
grid: { grid: {
left: '2.4%', left: '2.4%',
right: '3%', right: '3%',
bottom: '3%', bottom: '0',
containLabel: true containLabel: true
}, },
toolbox: {}, toolbox: {},
src/views/screen/wp29/MeetingCalendar.vue
+8 -1
View File
@@ -77,6 +77,7 @@ export default {
created() { created() {
// 获取用户信息 // 获取用户信息
this.$nextTick(() => { this.$nextTick(() => {
console.log('----this.$refs.fullCalendar---------', this.$refs.fullCalendar)
this.calendarApi = this.$refs.fullCalendar.getApi() this.calendarApi = this.$refs.fullCalendar.getApi()
let currentDate = new Date(this.calendarApi.currentData.currentDate) let currentDate = new Date(this.calendarApi.currentData.currentDate)
this.time = currentDate.getFullYear() + '年' + (currentDate.getMonth() + 1) + '月' this.time = currentDate.getFullYear() + '年' + (currentDate.getMonth() + 1) + '月'
@@ -130,15 +131,19 @@ export default {
arrayData.forEach((item) => { arrayData.forEach((item) => {
if (item.orgType == 'GR') { if (item.orgType == 'GR') {
item.status = '#5671E7' item.status = '#5671E7'
item.textColor = '#93D1F5'
} else if (item.orgType == 'IWG') { } else if (item.orgType == 'IWG') {
item.status = '#6CFBCE' item.status = '#6CFBCE'
item.textColor = '#115379'
} else { } else {
item.status = '#69C4F3' item.status = '#69C4F3'
item.textColor = '#115379'
} }
newArr.push({ newArr.push({
start: this.dealWithTime(item.time), start: this.dealWithTime(item.time),
end: this.addDate(this.dealWithTime(item.endTime), 1), end: this.addDate(this.dealWithTime(item.endTime), 1),
color: item.status, color: item.status,
textColor: item.textColor,
id: item.meetingId, id: item.meetingId,
title: `${item.name}` title: `${item.name}`
}) })
@@ -326,7 +331,9 @@ div.calendar-box{
::v-deep .fc .fc-daygrid-day.fc-day-today{ ::v-deep .fc .fc-daygrid-day.fc-day-today{
background-color: #7599E8; background-color: #7599E8;
} }
::v-deep .fc-event-title{
font-weight: 800!important;
}
</style> </style>
<style lang="less"> <style lang="less">
src/views/screen/wp29/MeetingInformationChart.vue
+3 -3
View File
@@ -231,7 +231,7 @@ export default {
{ {
name: '数量', name: '数量',
type: 'bar', type: 'bar',
barMaxWidth:20, barMaxWidth:30,
itemStyle:{ itemStyle:{
borderRadius:[4,4,0,0], borderRadius:[4,4,0,0],
}, },
@@ -263,8 +263,8 @@ export default {
@white: #fff; @white: #fff;
.search-box{ .search-box{
width: 70%; width: 76%;
margin-left: 30%; margin-left: 24%;
} }
.select-info-box{ .select-info-box{
display: flex; display: flex;
src/views/screen/wp29/index.vue
+2 -1
View File
@@ -54,7 +54,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
/deep/ .box-title { /deep/ .box-title {
font-size: 18px; font-size: 16px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #DDF0FF; color: #DDF0FF;
@@ -106,6 +106,7 @@ export default {
/deep/.title-right{ /deep/.title-right{
width: 50%; width: 50%;
margin-left: 50%; margin-left: 50%;
margin-bottom: 10px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;