修改数据

manpower/index4.html

@@ -27,6 +27,9 @@
     <header class="my-header">
       <span class="left" @click="handleGoBack"><img style="width: 70px;height: 70px;" src="./images/back.png"></img>
       </span>
+      <!--  -->
+      <span class="left2" @click="handleGoIndex">返回首页</img>
+      </span>
       <span>山西三元煤业股份有限公司</span>
       <span class="right">{{time}}</span>
     </header>

manpower/js/data.js

@@ -48,7 +48,7 @@ const dataL1 = [
   [21, 21, 21, 21, 13, 13, 6, 13, 13, 14, 14, 12, 15, 15, 12, 15, 12, 13],
 ]
 const dataL2 = [
-  [16, 8, 12, 10, 11, 1, 0, 8, 8, 0, 7, 0, 5, 10, 0, 0, 0, 6],
+  [11, 8, 12, 10, 11, 0, 0, 5, 0, 0, 7, 0, 4, 0, 0, 0, 0, 6],
   [11, 10, 6, 10, 12, 0, 0, 5, 0, 5, 7, 0, 4, 0, 0, 0, 0, 10],
 ]
 const dataL3 = [

manpower/js/data2.js

@@ -77,8 +77,8 @@ const dataC1 = [
   [61, -12, 54, 127, 24, 2, 27, -8, 7]
 ]
 const dataC2 = [
-  [305, 8, 120.00, 79, 72, 415, 15, 571, 40],
-  [105, 323, 182, 1769.00, 43.00, -30, 686, -33, 78]
+  [105, 323, 182, 1769.00, 43.00, -30, 686, -33, 78],
+  [305, 8, 120.00, 79, 72, 415, 15, 571, 40]
 ]
 const dataR1 = [
   [1, 1, 1, 1, 1, 1, 1, 1, 1],

manpower/js/data3.js

@@ -68,19 +68,19 @@ const dataL6 = [
 ]
 const dataL7 = [
   [-57.00, 20.00, -14.00, -8.00, 0.00, 9.00, 0.00, -4.00, 0.00, -2.00],
-  [2006, 46, 2, 6, -8, 46, 17, -44, 24, -80]
+  [null, 46, 2, 6, -8, 46, 17, -44, 24, -80]
 ]
 const dataL8 = [
   [-57.00, 20.00, -14.00, -8.00, 0.00, 9.00, 0.00, -4.00, 0.00, -2.00],
-  [469.09, 117.06, -43.01, -16.89, -33.33, 35.19, 15.56, -75.42, 2733.33, -222.00]
+  [469.09, 117.06, -43.01, -16.89, -33.33, 35.19, 15.56, -75.42, null, -222.00]
 ]
 const dataC1 = [
   [321.15, 233.91, 170.76, 157.08, 156.96, 150.38, 114.21, 113.93, 40.54, 3.46],
-  [2006, 46, 2, 6, -8, 46, 17, -44, 24, -80]
+  [null, 46, 2, 6, -8, 46, 17, -44, 24, -80]
 ]
 const dataC2 = [
-  [812.00, 547.00, 212.00, 251.00, 272.00, 315.00, 401.00, 87.00, 85.00, -161.00],
-  [469.09, 117.06, -43.01, -16.89, -33.33, 35.19, 15.56, -75.42, 2733.33, -222.00]
+  [469.09, 117.06, -43.01, -16.89, -33.33, 35.19, 15.56, -75.42, null, -222.00],
+  [812.00, 547.00, 212.00, 251.00, 272.00, 315.00, 401.00, 87.00, 85.00, -161.00]
 ]
 const dataR1 = [
   [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],

manpower/js/data4.js

@@ -67,8 +67,9 @@ const dataC1 = [
   [-18.20, 0.00, 95.39, -35.61, -71.34, 0.00, 0.00, 0.00]
 ]
 const dataC2 = [
-  [0.00, 0.00, 235.35, -141.02, -138.66, -125.17, -417.93, -3675.51],
-  [0.00, 0.00, 780.62, 242.97, 18.09, -52.24, 3.12, 24.68]
+  [0.00, 0.00, 780.62, 242.97, 18.09, -52.24, 3.12, 24.68],
+  [0.00, 0.00, 235.35, -141.02, -138.66, -125.17, -417.93, -3675.51]
+  
 ]
 const dataR1 = [
   [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],

manpower/js/index.js

@@ -742,7 +742,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL7'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -750,15 +750,16 @@ let app = new Vue({
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 8, //标记的大小
+            symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              //折线拐点标志的样式
-              color: '#43ede3',
-              borderColor: '#43ede3',
-              width: 2,
-              shadowColor: '#43ede3',
-              shadowBlur: 4,
+              color: params => {
+                if (dataL7[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
+              },
             },
             lineStyle: {
               color: '#43ede3',
@@ -766,6 +767,7 @@ let app = new Vue({
             },
             data: dataL7[0],
           },
+
           {
             name: '劳动生产率同比变化',
             type: 'line',
@@ -776,17 +778,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL7[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL7[1],
           },
@@ -830,7 +827,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL8'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -838,15 +835,16 @@ let app = new Vue({
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 8, //标记的大小
+            symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              //折线拐点标志的样式
-              color: '#43ede3',
-              borderColor: '#43ede3',
-              width: 2,
-              shadowColor: '#43ede3',
-              shadowBlur: 4,
+              color: params => {
+                if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
+              },
             },
             lineStyle: {
               color: '#43ede3',
@@ -863,14 +861,14 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL8[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
+              //折线拐点标志的样式
+              color: '#b889ea',
+              borderColor: '#b889ea',
+              width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
+            
             lineStyle: {
               color: '#b889ea',
               width: 2,
@@ -1566,6 +1564,26 @@ let app = new Vue({
             name: '去年同期在岗职工平均薪酬',
             type: 'bar',
             barWidth: 15,
+            markLine: {
+              data: [
+                {
+                  name: '省属企业平均水平',
+                  yAxis: 9333.33,
+                  lineStyle: {
+                    color: '#fff',
+                  },
+                  label: {
+                    formatter: '{b}',
+                    position: 'middle',
+                    fontSize: 16,
+                    color: '#fff',
+                  },
+                }
+              ],
+              label: {
+                distance: [50, 0],
+              },
+            },
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1714,9 +1732,18 @@ let app = new Vue({
         ],
       }
       option.title.text = '各省属企业全员绩效考核'
-      option.legend.show = false
-      option.tooltip.formatter = '{a0}：{c0}' + '%'
-      option.yAxis[0].axisLabel.formatter = '{value} %'
+      option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' + '%'
+      },
+        option.yAxis[0].axisLabel = {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        }
       myChart.setOption(option)
     },
     initChartR8 () {
@@ -1747,7 +1774,7 @@ let app = new Vue({
         ],
       }
       option.title.text = '各省属企业任期制契约化管理'
-      option.legend.show = false
+      option.legend.show = true
       option.tooltip.formatter = '{a0}：{c0}' + '%'
       option.yAxis[0].axisLabel.formatter = '{value} %'
       myChart.setOption(option)

manpower/js/index2.js

@@ -535,7 +535,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL7'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -546,19 +546,18 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL7[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
+            lineStyle: {
+              color: '#43ede3',
+              width: 2,
+            },
             // markLine: {
             //   data: [{ type: 'average', name: 'Avg' }],
             // },
@@ -573,17 +572,12 @@ let app = new Vue({
             symbol: 'circle', //标记的图形为实心圆
             symbolSize: 15, //标记的大小
             itemStyle: {
-              color: params => {
-                if (dataL7[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             // itemStyle: {
             //   normal: {
@@ -654,7 +648,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL8'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -665,19 +659,18 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
+            lineStyle: {
+              color: '#43ede3',
+              width: 2,
+            },
             // markLine: {
             //   data: [{ type: 'average', name: 'Avg' }],
             // },
@@ -693,17 +686,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL8[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL8[1],
           },
@@ -1215,7 +1203,7 @@ let app = new Vue({
         },
         axisLabel: {
           show: true,
-          formatter: '{value} %',
+          formatter: '{value} ',
           textStyle: {
             color: 'rgba(250,250,250,0.6)',
           },
@@ -1380,10 +1368,6 @@ let app = new Vue({
             type: 'line',
             barWidth: 15,
             yAxisIndex: 1,
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 12, //标记的大小
-            smooth: false,
             itemStyle: {
               color: params => {
                 if (params.value > 0 && dataR6[0][params.dataIndex] < 0) {

manpower/js/index3.js

@@ -536,7 +536,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL7'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -547,17 +547,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL7[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
             // markLine: {
@@ -575,17 +570,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL7[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL7[1],
           },
@@ -642,7 +632,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL8'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -653,19 +643,18 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
+            lineStyle: {
+              color: '#43ede3',
+              width: 2,
+            },
             // markLine: {
             //   data: [{ type: 'average', name: 'Avg' }],
             // },
@@ -681,17 +670,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL8[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL8[1],
           },

manpower/js/index4.js

@@ -182,6 +182,9 @@ let app = new Vue({
         window.location.href = url
       }
     },
+    handleGoIndex () {
+      window.location.href = './index.html'
+    },
     handleGoBack () {
       window.history.go(-1)
     },
@@ -538,7 +541,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL7'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -549,17 +552,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL7[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
             // markLine: {
@@ -577,17 +575,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL7[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL7[1],
           },
@@ -644,7 +637,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL8'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-        color: ['#b889ea'],
+        color: ['#43ede3'],
         series: [
           {
             name: '人数变化',
@@ -655,19 +648,18 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#43ede3',
-                  },
-                ]),
+              color: params => {
+                if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+                  return 'red'
+                } else {
+                  return '#43ede3'
+                }
               },
             },
+            lineStyle: {
+              color: '#43ede3',
+              width: 2,
+            },
             // markLine: {
             //   data: [{ type: 'average', name: 'Avg' }],
             // },
@@ -683,17 +675,12 @@ let app = new Vue({
             symbolSize: 15, //标记的大小
             smooth: false,
             itemStyle: {
-              color: params => {
-                if (dataL8[0][params.dataIndex] > 0 && params.value < 0) {
-                  return 'red'
-                } else {
-                  return '#b889ea'
-                }
-              },
-            },
-            lineStyle: {
+              //折线拐点标志的样式
               color: '#b889ea',
+              borderColor: '#b889ea',
               width: 2,
+              shadowColor: '#b889ea',
+              shadowBlur: 4,
             },
             data: dataL8[1],
           },

manpower/styles/index.css

@@ -103,10 +103,23 @@ a {
 .my-header span.left {
   position: absolute;
   left: 100px;
+  height: 50px;
   top: 40px;
   font-size: 30px;
   cursor: pointer;
 }
+.my-header span.left2 {
+  position: absolute;
+  left: 300px;
+  top: 20px;
+  height: 100px;
+  line-height: 100px;
+  display: inline-block;
+  width: 180px;
+  font-size: 36px;
+  cursor: pointer;
+}
+
 .my-header span.right {
   position: absolute;
   right: 100px;