表规则核对

manpowerPort/js/data.js

@@ -50,6 +50,7 @@ const dataL1 = [
 const dataL2 = [
   [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],
+  [11, 10, 6, 10, 12, 0, 0, 5, 0, 5, 7, 0, 4, 0, 0, 0, 0, 10],
 ]
 const dataL3 = [
   [15732, 29724, 4936, 9821, 2116, 763, 218, 1472, 661, 400, 3497, 265, 3066, 1205, 155, 1311, 22, 93],
@@ -58,10 +59,10 @@ const dataL3 = [
 const dataL4 = [
   [142, 189, 58, 59, 39, 32, 12, 36, 66, 36, 72, 41, 28, 161, 63, 10, 69, 28],
   [59, 70, 71, 67, 38, 29, 2, 36, 32, 31, 36, 28, 37, 64, 25, 20, 10, 21],
-  [59, 70, 71, 67, 38, 29, 22, 36, 32, 31, 36, 28, 37, 64, 25, 33, 18, 34]
+  [19, 70, 71, 67, 38, 29, 22, 36, 32, 31, 36, 28, 37, 64, 25, 33, 18, 34]
 ]
 const dataL5 = [
-  [173826, 352494, 54039, 108985, 23512, 8484, 2430, 16357, 7351, 4452, 38863, 3242, 35183, 13285, 1937, 14733, 302, 1052],
+  [10000, 12001, 54039, 108985, 23512, 8484, 2430, 16357, 7351, 4452, 38863, 3242, 35183, 13285, 1937, 14733, 302, 1052],
   [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
 ]
 
@@ -70,8 +71,8 @@ const dataL6 = [
   [400, 400, 400, 400, 200, 180, 50, 200, 200, 177, 170, 120, 200, 330, 80, 186, 100, 150],
 ]
 const dataL7 = [
-  [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
-  [34.0, 17.0, 23.0, 26, 2, 7, null, 24.0, 15.0, -33.0, 10.0, -38.0, 12.0, 43.0, -7.0, 6.0, 56.0, 121.0],
+  [1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
+  [-34.0, 17.0, 23.0, 26, 2, 7, null, 24.0, 15.0, -33.0, 10.0, -38.0, 12.0, 43.0, -7.0, 6.0, 56.0, 121.0],
 ]
 
 const dataL8 = [

manpowerPort/js/fjx.js

@@ -9,10 +9,10 @@ const fjxdataL2 = [
 ]
 
 const fjxdataL3 = [
-  [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
+  [20, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
 ]
 const fjxdataL4 = [
-  [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
+  [20, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
 ]
 const titleData = ['国资运营公司在工作过程中高度重视将新兴管理技术运用到实际业务场景之中，大力推动大数据应用从分析展示向智能决策转变，做到“一屏总览、一键调取”，实现“全局感知、精准监测全景可视、智慧分析”，推动国资阳光运行、要素全部覆盖过程留痕可询、动态监测预警。']
 const tipData =

manpowerPort/js/index.js

@@ -261,18 +261,18 @@ let app = new Vue({
         // "language": "zh_CN"
 
         // SIT环境
-        // "appId": "CockpitScreen",
-        // "appSecuret": "JSCdpsjgl@539126",
-        // "tenantid": "test",
-        // "accountId": "1484008912330950656",
-        // "language": "zh_CN"
-
-        // UAT环境
         "appId": "CockpitScreen",
         "appSecuret": "JSCdpsjgl@539126",
-        "tenantid": "uatierp",
-        "accountId": "1490670568960163840",
+        "tenantid": "test",
+        "accountId": "1484008912330950656",
         "language": "zh_CN"
+
+        // UAT环境
+        // "appId": "CockpitScreen",
+        // "appSecuret": "JSCdpsjgl@539126",
+        // "tenantid": "uatierp",
+        // "accountId": "1490670568960163840",
+        // "language": "zh_CN"
       }
       post('/ierp/api/getAppToken.do', value).then(res => {
         this.app_token = res.data.app_token
@@ -290,18 +290,18 @@ let app = new Vue({
         // "usertype": "UserName"
 
         // SIT环境
-        // "user": "jiashicangjiekou",
-        // "apptoken": this.app_token,
-        // "tenantid": "test",
-        // "accountId": "1484008912330950656",
-        // "usertype": "UserName"
-
-        // UAT环境
         "user": "jiashicangjiekou",
         "apptoken": this.app_token,
-        "tenantid": "uatierp",
-        "accountId": "1490670568960163840",
+        "tenantid": "test",
+        "accountId": "1484008912330950656",
         "usertype": "UserName"
+
+        // UAT环境
+        // "user": "jiashicangjiekou",
+        // "apptoken": this.app_token,
+        // "tenantid": "uatierp",
+        // "accountId": "1490670568960163840",
+        // "usertype": "UserName"
       }
       post('/ierp/api/login.do', value).then(res => {
         this.access_token = res.data.access_token
@@ -704,16 +704,17 @@ let app = new Vue({
             name: '当前各省属企业本部机构数',
             type: 'bar',
             barWidth: 15,
+
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL1[2][params.dataIndex]) {
+                  if (params.value > dataL1[2][params.dataIndex]) {
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {
                         offset: 0,
-                        color: '#69c0ff',
+                        color: '#5e7ae9',
                       },
                       {
                         offset: 1,
@@ -722,7 +723,7 @@ let app = new Vue({
                     ])
                   }
                 },
-              }
+              },
             },
             data: dataL1[1],
           },
@@ -818,30 +819,17 @@ let app = new Vue({
               }
             },
             itemStyle: {
-              color: params => {
-                if (params.value > dataL2[1][params.dataIndex]) {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: 'red',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#5e7ae9',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
               },
             },
             data: dataL2[2],
@@ -1088,7 +1076,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value > dataL4[2][params.dataIndex] || params.value > dataL4[0][params.dataIndex]) {
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1110,7 +1098,7 @@ let app = new Vue({
           {
             name: '本部中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -1154,14 +1142,14 @@ let app = new Vue({
       option.title.text = '各省属企业本部中层管理人数'
       option.legend.data = ['六定改革前本部中层管理人数', '当前本部中层管理人数', '本部中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -1196,7 +1184,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > 0.1) {
+                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > params.value * 0.1) {
                     return 'yellow'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -2676,7 +2664,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   }
                   else {
@@ -2725,7 +2713,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   }
                   else {

manpowerPort/js/index2.js

@@ -565,21 +565,23 @@ let app = new Vue({
             type: 'bar',
             barWidth: 15,
             itemStyle: {
-              color: params => {
-                if (params.value > 0 && dataL1[2][params.dataIndex]) {
-                  return 'red'
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[1],
@@ -752,7 +754,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                    if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -774,7 +776,7 @@ let app = new Vue({
           {
             name: '各二级企业本部中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -818,14 +820,14 @@ let app = new Vue({
       option.title.text = '各二级企业本部中层管理人数'
       option.legend.data = ['六定改革前各二级企业本部中层管理人数', '当前各二级企业本部中层管理人数', '各二级企业本部中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -2023,7 +2025,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   } 
                   else {

manpowerPort/js/index2JNKG.js

@@ -4,13 +4,13 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      echartC1:{
-        national:'',
-        province:''
+      echartC1: {
+        national: '',
+        province: ''
       },
-      echartC2:{
-        national:'',
-        province:''
+      echartC2: {
+        national: '',
+        province: ''
       },
       titleName: '',
       access_token: '',
@@ -540,21 +540,23 @@ let app = new Vue({
             type: 'bar',
             barWidth: 15,
             itemStyle: {
-              color: params => {
-                if (params.value > 0 && dataL1[2][params.dataIndex]) {
-                  return 'red'
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[1],
@@ -764,7 +766,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
+
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -825,7 +828,7 @@ let app = new Vue({
           {
             name: '各二级中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -869,14 +872,14 @@ let app = new Vue({
       option.title.text = '各二级企业本部中层管理人数'
       option.legend.data = ['六定改革前各二级中层管理人数', '当前各二级中层管理人数', '各二级中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -891,7 +894,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > 0.1) {
+                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > params.value * 0.1) {
                     return 'yellow'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1033,7 +1036,7 @@ let app = new Vue({
         ],
       }
       option.title.text = '各二级企业本部员额数'
-      option.legend.data = ['各二级员额数', '六定改革前各二级员额数','各二级员额数核定上限']
+      option.legend.data = ['各二级员额数', '六定改革前各二级员额数', '各二级员额数核定上限']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -2054,9 +2057,9 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
-                  } 
+                  }
                   else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {
@@ -2103,9 +2106,9 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
-                  } 
+                  }
                   else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {

manpowerPort/js/index3.js

@@ -544,21 +544,23 @@ let app = new Vue({
             type: 'bar',
             barWidth: 15,
             itemStyle: {
-              color: params => {
-                if (params.value > 0 && dataL1[2][params.dataIndex]) {
-                  return 'red'
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[1],
@@ -732,7 +734,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
+
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -754,7 +757,7 @@ let app = new Vue({
           {
             name: '各三级企业本部中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -798,14 +801,14 @@ let app = new Vue({
       option.title.text = '各三级企业本部中层管理人数'
       option.legend.data = ['六定改革前各三级企业本部中层管理人数', '当前各三级企业本部中层管理人数', '各三级企业本部中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -2046,7 +2049,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   } 
                   else {

manpowerPort/js/index3MT.js

@@ -517,16 +517,22 @@ let app = new Vue({
             barWidth: 15,
             itemStyle: {
               normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#43ede3',
-                  },
-                  {
-                    offset: 1,
-                    color: '#082550',
-                  },
-                ]),
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[0],
@@ -760,7 +766,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
+
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -821,7 +828,7 @@ let app = new Vue({
           {
             name: '各三级中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -865,14 +872,14 @@ let app = new Vue({
       option.title.text = '各三级企业本部中层管理人数'
       option.legend.data = ['六定改革前各三级中层管理人数', '当前各三级中层管理人数', '各三级中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -887,7 +894,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > 0.1) {
+                    if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > params.value * 0.1) {
                     return 'yellow'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -2089,7 +2096,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   } 
                   else {
@@ -2138,7 +2145,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   } 
                   else {

manpowerPort/js/index4.js

@@ -495,21 +495,23 @@ let app = new Vue({
             type: 'bar',
             barWidth: 15,
             itemStyle: {
-              color: params => {
-                if (params.value > 0 && dataL1[2][params.dataIndex]) {
-                  return 'red'
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[1],
@@ -683,7 +685,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
+
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -705,7 +708,7 @@ let app = new Vue({
           {
             name: '各四级企业本部中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -749,14 +752,14 @@ let app = new Vue({
       option.title.text = '各四级企业本部中层管理人数'
       option.legend.data = ['六定改革前各四级企业本部中层管理人数', '当前各四级企业本部中层管理人数', '各四级企业本部中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -1970,7 +1973,7 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
                   } 
                   else {

manpowerPort/js/index4SY.js

@@ -4,13 +4,13 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      echartC1:{
-        national:'',
-        province:''
+      echartC1: {
+        national: '',
+        province: ''
       },
-      echartC2:{
-        national:'',
-        province:''
+      echartC2: {
+        national: '',
+        province: ''
       },
       titleName: '',
       twinkle7: [],
@@ -514,21 +514,23 @@ let app = new Vue({
             type: 'bar',
             barWidth: 15,
             itemStyle: {
-              color: params => {
-                if (params.value > 0 && dataL1[2][params.dataIndex]) {
-                  return 'red'
-                } else {
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    {
-                      offset: 0,
-                      color: '#69c0ff',
-                    },
-                    {
-                      offset: 1,
-                      color: '#082550',
-                    },
-                  ])
-                }
+              normal: {
+                color: params => {
+                  if (params.value > dataL1[2][params.dataIndex]) {
+                    return 'yellow'
+                  } else {
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {
+                        offset: 0,
+                        color: '#5e7ae9',
+                      },
+                      {
+                        offset: 1,
+                        color: '#082550',
+                      },
+                    ])
+                  }
+                },
               },
             },
             data: dataL1[1],
@@ -738,7 +740,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value > 0 && dataL4[2][params.dataIndex] || params.value > 0 && dataL4[0][params.dataIndex]) {
+                  if (params.value >  dataL4[2][params.dataIndex] || params.value >  dataL4[0][params.dataIndex]) {
+
                     return 'red'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -799,7 +802,7 @@ let app = new Vue({
           {
             name: '各四级中层管理人数核定上限',
             type: 'line',
-            yAxisIndex: 1,
+            // yAxisIndex: 1,
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
@@ -843,14 +846,14 @@ let app = new Vue({
       option.title.text = '各四级企业本部中层管理人数'
       option.legend.data = ['六定改革前各四级中层管理人数', '当前各四级中层管理人数', '各四级中层管理人数核定上限']
       option.legend.show = true
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-      })
+      // option.yAxis.push({
+      //   splitLine: {
+      //     show: false,
+      //   },
+      //   axisLine: {
+      //     show: false,
+      //   },
+      // })
       myChart.setOption(option)
     },
     initChartL5 () {
@@ -865,7 +868,8 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > 0.1) {
+                  if (params.dataIndex > 0 && Math.abs(params.value - dataL5[0][params.dataIndex - 1]) > params.value * 0.1) {
+
                     return 'yellow'
                   } else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1007,7 +1011,7 @@ let app = new Vue({
         ],
       }
       option.title.text = '各四级企业本部员额数'
-      option.legend.data = ['各四级员额数', '六定改革前各四级员额数','各四级员额数核定上限']
+      option.legend.data = ['各四级员额数', '六定改革前各四级员额数', '各四级员额数核定上限']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -1819,7 +1823,7 @@ let app = new Vue({
         ],
       }
       option.title.text = '各四级企业"退二进一"完成情况'
-      option.legend.data =  ['2022年退出人数和2023年当前累计退出人数之和', '2022年招聘人数和2023年当前累计招聘人数之和']
+      option.legend.data = ['2022年退出人数和2023年当前累计退出人数之和', '2022年招聘人数和2023年当前累计招聘人数之和']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -2035,9 +2039,9 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
-                  } 
+                  }
                   else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {
@@ -2084,9 +2088,9 @@ let app = new Vue({
             itemStyle: {
               normal: {
                 color: params => {
-                  if (params.value < 0.5) {
+                  if (params.value < 50) {
                     return 'yellow'
-                  } 
+                  }
                   else {
                     return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {

manpowerPort/js/li.js

@@ -11,6 +11,6 @@ const dataR3 = [
   [2, 2125, 835, 450, 34, 476, 190, 225, 37, 46, 78, 199, 281, 164, 86, 59, 12, 26]
 ]
 const dataR4 = [
-  [4000, 7000, 4000, 600, 300, 460, 90, 600, 350, 261, 618, 73, 1200, 500, 60, 742, 10, 300],
-  [2, 2125, 835, 450, 34, 476, 190, 225, 37, 46, 78, 199, 281, 164, 86, 59, 12, 26]
+  [1000, 7000, 4000, 600, 300, 460, 90, 600, 350, 261, 618, 73, 1200, 500, 60, 742, 10, 300],
+  [3010, 2125, 835, 450, 34, 476, 190, 225, 37, 46, 78, 199, 281, 164, 86, 59, 12, 26]
 ]

manpowerPort/js/request.js

@@ -58,8 +58,8 @@ function getMinioUrl () {
 const httpRequest = axios.create({
   // baseURL: 'http://192.168.1.2:8080', // 测试环境
   // baseURL: 'http://172.21.9.23:8081', // SIT环境
-  // baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
-  baseURL: 'http://172.27.1.243:8081', // UAT环境
+  baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
+  // baseURL: 'http://172.27.1.243:8081', // UAT环境
   // baseURL: 'http://172.27.1.243:30001/api/', // UAT环境解决跨域
 
   timeout: 3 * 60 * 1000, // 3分钟等待