diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 1825a32..b3085a2 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -251,8 +251,8 @@ const leftBar1Option = ref({
offset: '7',
axisLabel: {
textStyle: {
- color: 'rgba(255,255,255,.6)',
- fontSize: '14',
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
},
data: []
@@ -267,8 +267,8 @@ const leftBar1Option = ref({
show: true,
position: 'right',
textStyle: {
- color: 'rgba(255,255,255,.8)',
- fontSize: '12',
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
}
},
@@ -316,7 +316,8 @@ const leftBar2Option = ref({
right: 'center',
top: 0,
textStyle: {
- color: "#fff"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
itemWidth: 12,
itemHeight: 10,
@@ -335,18 +336,18 @@ const leftBar2Option = ref({
axisLine: {
lineStyle: {
color: 'white'
-
}
},
axisLabel: {
//rotate:-90,
formatter: function (value: any) { return value.split("").join("\n"); },
textStyle: {
- color: "rgba(255,255,255,.6)",
- fontSize: 14,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
lineStyle: {
- color: 'rgba(255,255,255,0.3)'
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
}
},
@@ -356,15 +357,16 @@ const leftBar2Option = ref({
splitNumber: 4,
axisTick: { show: false },
splitLine: {
- show: true,
+ show: false,
lineStyle: {
- color: 'rgba(255,255,255,0.1)'
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
},
axisLabel: {
textStyle: {
- color: "rgba(255,255,255,.6)",
- fontSize: 14,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
},
axisLine: { show: false },
@@ -398,7 +400,7 @@ const centerBar1Option = ref({
grid: {
top: "20%",
right: "50",
- bottom: "20",
+ bottom: "30",
left: "30",
},
legend: {
@@ -406,7 +408,8 @@ const centerBar1Option = ref({
right: 'center',
width: '100%',
textStyle: {
- color: "#fff"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
itemWidth: 12,
itemHeight: 10,
@@ -415,9 +418,17 @@ const centerBar1Option = ref({
{
type: "category",
data: [],
- axisLine: { lineStyle: { color: "rgba(255,255,255,.1)" } },
+ axisLine: {
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },
axisLabel: {
- textStyle: { color: "rgba(255,255,255,.7)", fontSize: '14', },
+ textStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ },
},
},
],
@@ -428,17 +439,19 @@ const centerBar1Option = ref({
axisTick: { show: false },
splitLine: {
show: false,
-
},
"axisLabel": {
"show": true,
- fontSize: 14,
- color: "rgba(255,255,255,.6)"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
axisLine: {
min: 0,
- lineStyle: { color: 'rgba(255,255,255,.1)' }
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
},//左线色
},
@@ -448,12 +461,23 @@ const centerBar1Option = ref({
"show": true,
"axisLabel": {
"show": true,
- fontSize: 14,
- color: "rgba(255,255,255,.6)"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
axisTick: { show: false },
- axisLine: { lineStyle: { color: 'rgba(255,255,255,.1)' } },//右线色
- splitLine: { show: true, lineStyle: { color: 'rgba(255,255,255,.1)' } },//x轴线
+ axisLine: {
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },//右线色
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },//x轴线
},
],
"series": [
@@ -595,7 +619,7 @@ const centerLine2Option = ref({
grid: {
left: '0',
top: '30',
- right: '10',
+ right: '20',
bottom: '20',
containLabel: true
},
@@ -617,14 +641,14 @@ const centerLine2Option = ref({
axisLabel: {
rotate: -90,
textStyle: {
- color: "rgba(255,255,255,.6)",
- fontSize: 14,
-
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
},
axisLine: {
lineStyle: {
- color: 'rgba(255,255,255,.1)'
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
},
@@ -644,20 +668,22 @@ const centerLine2Option = ref({
// splitNumber: 6,
axisLine: {
lineStyle: {
- color: 'rgba(255,255,255,.1)'
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
},
axisLabel: {
formatter: "{value}",
textStyle: {
- color: "rgba(255,255,255,.6)",
- fontSize: 14,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
},
-
splitLine: {
+ show: false,
lineStyle: {
- color: 'rgba(255,255,255,.1)'
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
}
}
}],
@@ -721,7 +747,7 @@ const rightBar1Option = ref({
}, "grid": {
"top": "15%",
"right": "10%",
- "bottom": "20",
+ "bottom": "30",
"left": "10%",
},
legend: {
@@ -729,7 +755,8 @@ const rightBar1Option = ref({
right: 'center',
top: 0,
textStyle: {
- color: "#fff"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
itemWidth: 12,
itemHeight: 10,
@@ -739,9 +766,17 @@ const rightBar1Option = ref({
"type": "category",
data: [],
- axisLine: { lineStyle: { color: "rgba(255,255,255,.1)" } },
+ axisLine: {
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },
axisLabel: {
- textStyle: { color: "rgba(255,255,255,.7)", fontSize: '14', },
+ textStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ },
},
},
@@ -754,10 +789,16 @@ const rightBar1Option = ref({
axisTick: { show: false },
"axisLabel": {
"show": true,
- color: "rgba(255,255,255,.6)"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
- axisLine: { lineStyle: { color: 'rgba(255,255,255,.1)' } },//左线色
+ axisLine: {
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },//左线色
},
{
@@ -768,10 +809,22 @@ const rightBar1Option = ref({
"axisLabel": {
"show": true,
formatter: "{value}",
- color: "rgba(255,255,255,.6)"
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
},
- axisLine: { lineStyle: { color: 'rgba(255,255,255,.1)' } },//右线色
- splitLine: { show: true, lineStyle: { color: 'rgba(255,255,255,.1)' } },//x轴线
+ axisLine: {
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },//右线色
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
+ }
+ },//x轴线
},
],
"series": [
@@ -842,13 +895,13 @@ const rightPie2Option = ref({
x: 'center',
y: '50%',
textStyle: {
- color: '#fff',
- fontSize: 22,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
lineHeight: 10,
},
subtextStyle: {
- color: '#90979c',
- fontSize: 16,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
lineHeight: 10,
},
@@ -880,13 +933,12 @@ const rightPie2Option = ref({
rich: {
c: {
color: 'rgb(241,246,104)',
- fontSize: 20,
- fontWeight: 'bold',
+ fontSize: '0.2rem',
lineHeight: 5
},
b: {
- color: 'rgb(98,137,169)',
- fontSize: 14,
+ color: 'rgba(255,255,255,.7)',
+ fontSize: '0.2rem',
height: 44
},
},
@@ -896,6 +948,7 @@ const rightPie2Option = ref({
normal: {
lineStyle: {
color: 'rgb(98,137,169)',
+ fontSize: '0.2rem',
},
smooth: 0.2,
length: 10,
@@ -1034,7 +1087,7 @@ li {
}
.alltitle {
- font-size: .25rem;
+ font-size: .225rem;
color: #fff;
line-height: .5rem;
position: relative;
diff --git a/src/views/evaluate/evaluateList/index.vue b/src/views/evaluate/evaluateList/index.vue
index 9423471..9309374 100644
--- a/src/views/evaluate/evaluateList/index.vue
+++ b/src/views/evaluate/evaluateList/index.vue
@@ -31,7 +31,14 @@
-
+
+
+
+ {{ scope.row.deptNames.length > 0 ? scope.row.deptNames.join(',') : scope.row.userNames.join(',') }}
+
+
+
+
{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}
diff --git a/src/views/index.vue b/src/views/index.vue
index 591f552..755d1d5 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,111 +1,129 @@
-
+
+
+
+
{{ getGreeting() }}
+
+
+
+
+
+
+ 可视大屏
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 总用户数
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 总测评数
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 总预警数
+
+
+
+
+
+
+
-
-
- - 总测评数
- - {{ evaluationNum }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 总干预数
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- - 总干预数
- - {{ interveneNum }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -300,7 +318,7 @@ const centerBarOption = ref({
splitNumber: 4,
axisTick: { show: false },
splitLine: {
- show: true,
+ show: false,
lineStyle: {
color: '#95989D'
}
@@ -365,7 +383,13 @@ const rightBarOption = ref({
},
yAxis: {
type: 'category',
- data: []
+ data: [],
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: '#95989D'
+ }
+ },
},
series: [
@@ -431,103 +455,32 @@ onMounted(() => {