Browse Source

Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

newStyle
lancer 3 years ago
parent
commit
6672caff19
10 changed files with 414 additions and 0 deletions
  1. +46
    -0
      src/views/Equipment/equipmentDetailList.vue
  2. +46
    -0
      src/views/Statistics/MentoringAbility.vue
  3. +69
    -0
      src/views/Statistics/ReceptionOverview.vue
  4. +46
    -0
      src/views/Statistics/TheTeamCompared.vue
  5. +92
    -0
      src/views/Statistics/TrendAnalysis.vue
  6. +23
    -0
      src/views/Statistics/dataScreeAge.vue
  7. +23
    -0
      src/views/Statistics/dataScreeOrg.vue
  8. +23
    -0
      src/views/Statistics/dataScreeSys.vue
  9. +23
    -0
      src/views/Statistics/houseDataSys.vue
  10. +23
    -0
      src/views/Statistics/trend.vue

+ 46
- 0
src/views/Equipment/equipmentDetailList.vue View File

@@ -1281,6 +1281,29 @@ export default {
var myChart = echarts.init(document.getElementById("mane"));
var myChart1 = echarts.init(document.getElementById("mane2"));
var option = {
color: [
"#66AFF5",
"#FABD2B",
"#6F8EDC",
"#FFCF8F",
"#F98120",
"#1CC99E",
"#9474FB",
"#657292",
"#7A6A99",
"#BF5D52",
"#EE6666",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "item",
},
@@ -1299,6 +1322,29 @@ export default {
],
};
var option1 = {
color: [
"#66AFF5",
"#FABD2B",
"#6F8EDC",
"#FFCF8F",
"#F98120",
"#1CC99E",
"#9474FB",
"#657292",
"#7A6A99",
"#BF5D52",
"#EE6666",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "item",
},


+ 46
- 0
src/views/Statistics/MentoringAbility.vue View File

@@ -861,6 +861,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
legend: {
data: [this.consultantname,this.Packname],
top: "6",
@@ -981,6 +1004,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: 'axis'
},


+ 69
- 0
src/views/Statistics/ReceptionOverview.vue View File

@@ -612,6 +612,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
legend: {
data: [Strname],
bottom: '10',
@@ -726,6 +749,29 @@ export default {
let chartDom = document.getElementById('Pinspeak1');
let myChart = echarts.init(chartDom);
let option= {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: 'axis',
formatter: '{b0}: {c0}'+'%'
@@ -800,6 +846,29 @@ export default {
let chartDom = document.getElementById('Pinspeak2');
let myChart = echarts.init(chartDom);
let option= {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: 'axis',
formatter: '{b0}: {c0}'+'%'


+ 46
- 0
src/views/Statistics/TheTeamCompared.vue View File

@@ -567,6 +567,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: 'axis'
},
@@ -604,6 +627,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: 'axis'
},


+ 92
- 0
src/views/Statistics/TrendAnalysis.vue View File

@@ -992,6 +992,29 @@ export default {
trigger: "axis",
formatter: "{b0}: {c0}" + "%",
},
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
legend: {
data: ["起始时间"],
bottom: "10",
@@ -1088,6 +1111,29 @@ export default {
return src;
},
},
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
legend: {
data: ["起始时间", "对比时间"],
bottom: "10",
@@ -1170,6 +1216,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},
@@ -1213,6 +1282,29 @@ export default {
var myChart = echarts.init(chartDom);
var option;
option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},


+ 23
- 0
src/views/Statistics/dataScreeAge.vue View File

@@ -465,6 +465,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},


+ 23
- 0
src/views/Statistics/dataScreeOrg.vue View File

@@ -547,6 +547,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},


+ 23
- 0
src/views/Statistics/dataScreeSys.vue View File

@@ -570,6 +570,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},


+ 23
- 0
src/views/Statistics/houseDataSys.vue View File

@@ -563,6 +563,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
tooltip: {
trigger: "axis",
},


+ 23
- 0
src/views/Statistics/trend.vue View File

@@ -725,6 +725,29 @@ export default {
var option;

option = {
color: [
"#6F8EDC",
"#EE6666",
"#F98120",
"#1CC99E",
"#9474FB",
"#66AFF5",
"#FABD2B",
"#FFCF8F",
"#657292",
"#7A6A99",
"#BF5D52",
"#77B7E4",
"#E6A065",
"#9D5139",
"#C1AA88",
"#F87F7A",
"#F6CF74",
"#7F5506",
"#88BB9B",
"#6E99AA",
"#5789D0",
],
legend: {
data: Strname,
bottom: "10",


Loading…
Cancel
Save