@@ -78,7 +78,7 @@ echarts.use([
import {getAction} from '@api/manage'
import {formatMoney} from '@/utils/formatMoney'
import {queryDepartTreeList} from '@api/api'
-import { createPieChart } from "../util/PieOptions";
+import { createPieChart } from '../util/PieOptions'
const columns = [
{
@@ -269,3 +269,9 @@ export default {
}
}
+
+
\ No newline at end of file
diff --git a/src/views/screen/incomePayments/index.vue b/src/views/screen/incomePayments/index.vue
index 4d983f1..e9a89b8 100644
--- a/src/views/screen/incomePayments/index.vue
+++ b/src/views/screen/incomePayments/index.vue
@@ -128,19 +128,20 @@ export default {
/deep/ .box-title {
// (139 + 327 / 2) / 1875
left: 16.13%;
+ top: 6.2%;
}
}
// 半屏 标题右侧的样式
/deep/.title-right{
display: flex;
- flex-direction: column;
- align-items: end;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
margin-right: 6%;
- padding-top: 6%;
+ padding-top: 4%;
position: relative;
z-index: 100;
- width: 50%;
- float: right;
+ margin-left: 50%;
}
@@ -192,8 +193,9 @@ export default {
//下拉框，输入框
/deep/ .ant-select-selection {
- border-color: @borderColor;
- background: @backgroundColor !important;
+ border: none;
+ background: transparent !important;
+ text-shadow: 0 0 5px #88D8FB;
}
/deep/ .ant-select-selection-selected-value {
@@ -203,6 +205,13 @@ export default {
color: #fff !important;
}
+/deep/.ant-select-focused .ant-select-selection,
+.ant-select-selection:focus,
+.ant-select-selection:active{
+ border: none!important;
+ box-shadow: none;
+}
+
/deep/.table-text {
white-space: nowrap;
overflow: hidden;
@@ -213,6 +222,12 @@ export default {
overflow-x: auto!important;
}
+/* 增加媒体查询的限制*/
+@media screen and (max-width: 1400px) {
+ /deep/.income-more-title-full-box .box-title {
+ font-size: 14px;
+ }
+}
\ No newline at end of file
diff --git a/src/views/screen/preparationRevision/CompletionProjectChart.vue b/src/views/screen/preparationRevision/CompletionProjectChart.vue
index 927249f..ef15fdc 100644
--- a/src/views/screen/preparationRevision/CompletionProjectChart.vue
+++ b/src/views/screen/preparationRevision/CompletionProjectChart.vue
@@ -124,6 +124,12 @@ export default {
}
-
\ No newline at end of file
diff --git a/src/views/screen/preparationRevision/EnterpriseContributionChart.vue b/src/views/screen/preparationRevision/EnterpriseContributionChart.vue
index 26c30f5..9a7b0b0 100644
--- a/src/views/screen/preparationRevision/EnterpriseContributionChart.vue
+++ b/src/views/screen/preparationRevision/EnterpriseContributionChart.vue
@@ -84,6 +84,11 @@ export default {
}
-
\ No newline at end of file
diff --git a/src/views/screen/preparationRevision/index.vue b/src/views/screen/preparationRevision/index.vue
index 7a676a8..de59bcd 100644
--- a/src/views/screen/preparationRevision/index.vue
+++ b/src/views/screen/preparationRevision/index.vue
@@ -154,6 +154,7 @@ export default {
}
li.active{
color: @white;
+ text-shadow: 0 0 5px #88D8FB;
}
.splice-icon{
width: 20px;
@@ -161,6 +162,9 @@ export default {
margin: 0 10px;
cursor: pointer;
}
+ .ant-select.active {
+ text-shadow: 0 0 5px #88D8FB;
+ }
}
diff --git a/src/views/screen/util/BarOptions.js b/src/views/screen/util/BarOptions.js
index cd76992..2c14c08 100644
--- a/src/views/screen/util/BarOptions.js
+++ b/src/views/screen/util/BarOptions.js
@@ -158,8 +158,8 @@ export const BarOptions = {
},
splitLine: {
lineStyle: {
- color: '#7599E8',
- type: 'dashed'
+ color: 'rgba(117, 153, 232, 0.5)',
+ type: 'solid'
}
},
type: 'value',
@@ -305,8 +305,8 @@ export const BarAxisTransformOptions = {
},
splitLine: {
lineStyle: {
- color: '#7599E8',
- type: 'dashed'
+ color: 'rgba(117, 153, 232, 0.5)',
+ type: 'solid'
}
},
type: 'value',
diff --git a/src/views/screen/util/LineOptions.js b/src/views/screen/util/LineOptions.js
index bcf536c..675aee6 100644
--- a/src/views/screen/util/LineOptions.js
+++ b/src/views/screen/util/LineOptions.js
@@ -81,8 +81,8 @@ export const LineOptions = {
},
splitLine: {
lineStyle: {
- color: '#7599E8',
- type: 'dashed'
+ color: 'rgba(117, 153, 232, 0.5)',
+ type: 'solid'
}
},
type: 'value',
@@ -166,8 +166,8 @@ export const ISOLineOptions = {
},
splitLine: {
lineStyle: {
- color: '#7599E8',
- type: 'dashed'
+ color: 'rgba(117, 153, 232, 0.5)',
+ type: 'solid'
}
},
type: 'value',
diff --git a/src/views/screen/util/PieOptions.js b/src/views/screen/util/PieOptions.js
index eccfaba..696c1d4 100644
--- a/src/views/screen/util/PieOptions.js
+++ b/src/views/screen/util/PieOptions.js
@@ -55,7 +55,7 @@ export const PieOptions = {
type: 'radial',
x: 0.5,
y: 0.5,
- r: 2,
+ r: 1,
colorStops: [{
offset: 0, color: 'rgba(25, 108, 235, 1)' // 0% 处的颜色
}, {
@@ -70,8 +70,14 @@ export const PieOptions = {
show: true,
trigger: 'item',
formatter: (param) => {
+ let color = ''
+ if(typeof param.color === 'string') {
+ color = param.color
+ } else {
+ color = param.color.colorStops[0].color
+ }
return `
-
+
${param.name}
${formatMoney(param.data.money)}
`
@@ -107,15 +113,16 @@ export const PieOptions = {
type: 'pie',
radius: ['20%', '60%'],
center: ['50%', '50%'],
- roseType: 'area', // 南丁格尔图，所有扇区圆心角相同，仅通过半径展现数据大小。
- // roseType: 'radius', // 南丁格尔图，扇区圆心角展现数据的百分比，半径展现数据的大小。
+ // roseType: 'area', // 南丁格尔图，所有扇区圆心角相同，仅通过半径展现数据大小。
+ roseType: 'radius', // 南丁格尔图，扇区圆心角展现数据的百分比，半径展现数据的大小。
itemStyle: {
borderRadius: [0, 0, 5, 5]
},
label: {
show: true,
color: '#7599E8',
- formatter: '{b}: {d}%',
+ // formatter: '{b}: {d}%',
+ formatter: '{b}: {c}',
}
}
]
diff --git a/src/views/screen/wp29/ExpertQuantityChart.vue b/src/views/screen/wp29/ExpertQuantityChart.vue
index 5be5cc3..4f6022c 100644
--- a/src/views/screen/wp29/ExpertQuantityChart.vue
+++ b/src/views/screen/wp29/ExpertQuantityChart.vue
@@ -60,8 +60,14 @@ export default {
},
tooltip: {
formatter: (param) => {
+ let color = ''
+ if(typeof param.color === 'string') {
+ color = param.color
+ } else {
+ color = param.color.colorStops[0].color
+ }
return `
-
+
${param.name}
${param.value}
`
@@ -71,6 +77,21 @@ export default {
series: [
{
center: ['42%', '50%'],
+ label: {
+ formatter: '{a|{c}}{hr|}',
+ rich: {
+ hr: {
+ backgroundColor: 't',
+ borderRadius: 50,
+ width: 7,
+ height: 7,
+ marginRight: 14
+ },
+ a: {
+ padding: [10, 5, 10, 10]
+ }
+ }
+ },
data: echartsData
}
]
diff --git a/src/views/screen/wp29/MeetingInformationChart.vue b/src/views/screen/wp29/MeetingInformationChart.vue
index 6f88562..1ccb0ec 100644
--- a/src/views/screen/wp29/MeetingInformationChart.vue
+++ b/src/views/screen/wp29/MeetingInformationChart.vue
@@ -96,9 +96,9 @@ export default {
dimensionValue: 'year', // 查询维度 默认是’year‘
// 维度查询的下拉框数据
dimensionOptionData: [
- {text: '年', value: 'year'},
+ {text: '年份', value: 'year'},
{text: '季度', value: 'quarter'},
- {text: '月', value: 'month'},
+ {text: '月份', value: 'month'},
],
quarterOptionData: [
{text: '第一季度', value: '1'},
@@ -194,6 +194,7 @@ export default {
initChart(data) {
let xData = data.leftData
let echartsData = data.resultMapList[0].count
+ let tooltipTitle = data.resultMapList[0].cogName
let option = {
legend: {
show: false
@@ -205,7 +206,7 @@ export default {
tooltip: {
formatter: params => {
// 获取xAxis data中的数据
- let dataStr = ''
+ let dataStr = `
${tooltipTitle}
`
params.forEach(item => {
let color = ''
if(typeof item.color === 'string') {
diff --git a/src/views/screen/wp29/RegulationQuantityChart.vue b/src/views/screen/wp29/RegulationQuantityChart.vue
index f611294..cd0e5c7 100644
--- a/src/views/screen/wp29/RegulationQuantityChart.vue
+++ b/src/views/screen/wp29/RegulationQuantityChart.vue
@@ -63,6 +63,12 @@ export default {
formatter: params => {
// 获取xAxis data中的数据
let dataStr = ''
+ let total = 0
+ for (let i = 0; i < params.length; i++) {
+ total += parseInt(params[i].data)
+ }
+ dataStr += `
总数: ${total}
`
+
params.forEach(item => {
let color = ''
if(typeof item.color === 'string') {