diff --git a/src/util/theme.color.js b/src/util/theme.color.js new file mode 100644 index 0000000..0f1cf81 --- /dev/null +++ b/src/util/theme.color.js @@ -0,0 +1,22 @@ +let colorArr = [ + "#5B8FF9", + "#E6625B", + "#FF981E", + "#F6BD16", + "#07B79D", + "#9B6BDF", + "#FF99C3", + "#1E9493", + "#BA3FB7", + "#54BEF3", + "#3C21F7", + "#F87148", + "#3EB171" +] +let colorTemp = Math.floor(Math.random() * colorArr.length + 1) - 1 + +let a = { + randomColor:colorArr[colorTemp], + colorArr +} +export default a; \ No newline at end of file diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index ea7d530..4b6dd52 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -548,6 +548,7 @@ import * as echarts from "echarts"; import { mapGetters } from "vuex"; import { exportMethodPost } from "@/util/util"; +import colorTheme from "@/util/theme.color" export default { data() { return { @@ -1187,29 +1188,7 @@ export default { var option; option = { - color: [ - "#66AFF5", - "#FABD2B", - "#6F8EDC", - "#FFCF8F", - "#F98120", - "#1CC99E", - "#9474FB", - "#657292", - "#7A6A99", - "#BF5D52", - "#EE6666", - "#77B7E4", - "#E6A065", - "#9D5139", - "#C1AA88", - "#F87F7A", - "#F6CF74", - "#7F5506", - "#88BB9B", - "#6E99AA", - "#5789D0", - ], + color: colorTheme.colorArr, tooltip: { trigger: "axis", }, @@ -1298,35 +1277,13 @@ export default { var myChart = echarts.init(chartDom); var option; option = { - color: [ - "#66AFF5", - "#FABD2B", - "#6F8EDC", - "#FFCF8F", - "#F98120", - "#1CC99E", - "#9474FB", - "#657292", - "#7A6A99", - "#BF5D52", - "#EE6666", - "#77B7E4", - "#E6A065", - "#9D5139", - "#C1AA88", - "#F87F7A", - "#F6CF74", - "#7F5506", - "#88BB9B", - "#6E99AA", - "#5789D0", - ], + color: colorTheme.colorArr[0], tooltip: { trigger: "axis", }, legend: { data: [str1], - bottom: "10", + top: "10", }, grid: { left: 10, @@ -1382,6 +1339,16 @@ export default { data: arr1, type: "line", smooth: true, + areaStyle: { + color: new echarts.graphic.LinearGradient( + 0, 0, 0, 1, + [ + { offset: 0, color: colorTheme.colorArr[0] }, + { offset: 1, color: "#fff" } + ] + ), + opacity: 0.1 + } }, ], }; @@ -1479,29 +1446,7 @@ 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", - ], + color: colorTheme.colorArr, tooltip: { trigger: "item", }, @@ -1520,29 +1465,7 @@ 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", - ], + color: colorTheme.colorArr, tooltip: { trigger: "item", }, diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue index 18a23e3..cd1a0f1 100644 --- a/src/views/Statistics/BuildingContrast.vue +++ b/src/views/Statistics/BuildingContrast.vue @@ -15,17 +15,9 @@
- +
-
+
导出
@@ -69,52 +58,22 @@ - + - + - + - +
- +
@@ -125,29 +84,41 @@
接待量（TOP10）
-
+
接待合计
{{ objList1.sum }}次
-
+
项目总数
{{ objList1.num }}个
-
+
平均接待
{{ objList1.avg }}次
-
+
-
{{ item.name }}
+ {{ i + 1 }} +
+ + {{ item.name }} + +
+
-
+ >
--> +
+
+
{{ item.zxl }}
@@ -158,25 +129,37 @@
平均执行率（TOP10）
-
+
项目总数
{{ objList2.num }}个
-
+
平均执行率
{{ objList2.avg }}%
-
+
-
{{ item.name }}
+ {{ i + 1 }} +
+ + {{ item.name }} + +
+
-
+ >
--> +
+
+
{{ item.zxl }}%
@@ -190,29 +173,40 @@
违禁接待次数（TOP10）
-
+
合计
{{ objList3.sum }}次
-
+
项目总数
{{ objList3.num }}个
-
+
平均违规
{{ objList3.avg }}次
-
+
-
{{ item.name }}
+ {{ i + 1 }} +
+ + {{ item.name }} + +
-
+ >
--> +
+
+
{{ item.zxl }}
@@ -223,29 +217,41 @@
接待时长（分钟）（TOP10）
-
+
时长合计
{{ objList4.sum }}分钟
-
+
项目总数
{{ objList4.num }}个
-
+
平均时长
{{ objList4.avg }}分钟
-
+
-
{{ item.name }}
+ {{ i + 1 }} +
+ + {{ item.name }} + + +
-
+ >
--> +
+
+
{{ item.zxl }}
@@ -329,38 +335,38 @@ export default { }, methods: { getSummaries(param) { - const { columns, data } = param; - const sums = []; - columns.forEach((column, index) => { - if (index === 0) { - sums[index] = '合计'; + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计'; + return; + } + + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + // sums[index] += ' 元'; + if (index === 2) { + sums[index] += '%'; return; } - - const values = data.map(item => Number(item[column.property])); - if (!values.every(value => isNaN(value))) { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return prev + curr; - } else { - return prev; - } - }, 0); - // sums[index] += ' 元'; - if (index === 2) { - sums[index] += '%'; - return; - } - if (index === 8) { - sums[index] += '%'; - return; - } + if (index === 8) { + sums[index] += '%'; + return; } - }); - sums[1] = ' '; - return sums; - }, + } + }); + sums[1] = ' '; + return sums; + }, downLoad() { let pamaet = { orgType: this.role, @@ -613,22 +619,36 @@ export default {