Bladeren bron

2级页面时间修改

l1448442195@163.com 1 jaar geleden
bovenliggende
commit
a82aa47050
5 gewijzigde bestanden met toevoegingen van 217 en 313 verwijderingen
  1. 1 1
      manpower/index2.html
  2. 12 14
      manpower/index3.html
  3. 69 27
      manpower/js/data3.js
  4. 1 0
      manpower/js/index2.js
  5. 134 271
      manpower/js/index3.js

+ 1 - 1
manpower/index2.html

@@ -25,7 +25,7 @@
   <div id="app">
     <header class="my-header">
       <span>晋能控股</span>
-      <span class="right">2023-1-16 10:23:00</span>
+      <span class="right">{{time}}</span>
     </header>
     <div class="main">
       <div class="left">

+ 12 - 14
manpower/index3.html

@@ -11,30 +11,28 @@
   <link rel="stylesheet" href="./styles/index.css" />
   <!-- 引入js -->
   <script src="./libs/vue@2.7.10.js"></script>
+  <!-- <script src="https://unpkg.com/@jiaminghi/data-view/dist/datav.min.vue.js"></script> -->
   <script src="./libs/echarts.min.js"></script>
   <script src="./libs/datav.min.js"></script>
   <script src="./libs/element-ui@2.15.9.js"></script>
   <script src="./libs/axios.min.js"></script>
   <script src="./libs/lodash.min.js"></script>
   <script src="./js/request.js"></script>
-  <script src="./js/data.js"></script>
-  <script src="./js/zhb.js"></script>
-  <script src="./js/li.js"></script>
-  <script src="./js/fjx.js"></script>
+  <script src="./js/data3.js"></script>
 </head>
 
 <body>
   <div id="app">
     <header class="my-header">
-      <span>晋能控股装备制造</span>
-      <span class="right">2023-1-16 10:23:00</span>
+      <span>三级</span>
+      <span class="right">{{time}}</span>
     </header>
     <div class="main">
       <div class="left">
         <dv-border-box-8 :dur="10" style="flex: 1;">
           <div class="my-panel">
             <div class="panel-title">
-              <span class="text">投资关键指标</span>
+              <span class="text">定机构</span>
             </div>
             <div class="content flex">
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
@@ -94,7 +92,7 @@
         <dv-border-box-8 :dur="10">
           <div class="my-panel" v-if="centerData">
             <div class="panel-title">
-              <span class="text">六定改革成效果展示</span>
+              <span class="text">六定改革成效</span>
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
@@ -137,11 +135,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p>{{numFormat(centerData.changeInfo[2].value2)}}</p>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p>改革前在册职工数</p>
                   </div>
                   <div>
-                    <p>{{centerData.changeInfo[2].value3}}<span>万</span></p>
+                    <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span>万</span></p>
                     <p>在册职工压缩数</p>
                   </div>
                 </div>
@@ -152,7 +150,7 @@
         <dv-border-box-8 :dur="10">
           <div class="my-panel">
             <div class="panel-title">
-              <span class="text">核心指标展示</span>
+              <span class="text">核心指标监测</span>
             </div>
             <div class="content flex">
               <div ref="echartC1" style="flex: 1;height: 100%;"></div>
@@ -163,15 +161,15 @@
         <dv-border-box-8 :dur="10">
           <div class="my-panel">
             <div class="panel-title">
-              <span class="text">工作数据分析中心</span>
+              <span class="text">分析预警中心</span>
             </div>
             <div class="content yujing">
               <div class="flex1">
-                <p class="s-title main-color">工作分析</p>
+                <p class="s-title main-color">工作分析</p>
                 <dv-scroll-board :config="storageRecordConfig" class="content" />
               </div>
               <div class="flex1">
-                <p class="s-title main-color">数据库情况预警</p>
+                <p class="s-title main-color">数据库预警</p>
                 <dv-scroll-board :config="storageRecordConfig2" class="content" />
               </div>
             </div>

+ 69 - 27
manpower/js/data3.js

@@ -1,59 +1,101 @@
 const companyList = [
-  { name: '山西晋煤集团金明矿业有限责任公司' },
-  { name: '晋城蓝焰煤业股份有限公司' },
-  { name: '山西天源化工' },
-  { name: '山西金驹煤电化公司' },
-  { name: '山西华昱煤化工公司' },
-  { name: '阳城晋煤能源有限责任公司' },
-  { name: '赵庄煤业公司' },
-  { name: '山西晋丰煤化工公司' }
-]
+  { name: '山西煤炭运销集团三元石窟煤业有限公司' },
+  { name: '山西煤炭运销集团长治有限公司' },
+  { name: '晋能控股电力集团有限公司' },
+  { name: '中国太原煤炭交易中心有限公司' },
+  { name: '晋能控股装备制造集团有限公司' },
+  { name: '晋能控股山西煤业集团有限公司' },
+  { name: '晋能控股山西电力股份有限公司' },
+  { name: '晋控电力山西新能源有限公司' },
+  { name: '晋能控股煤业集团有限公司' }
+]
+const data = {
+  info: {
+    value1: '1708',
+    value2: '99386',
+    value3: '352494',
+  },
+  changeInfo: [
+    {
+      value1: '39',
+      value2: '34',
+      value3: '21',
+    },
+    {
+      value1: '25',
+      value2: '6278',
+      value3: '4372',
+    },
+    {
+      value1: '352494',
+      value2: '42299',
+      value3: '12',
+    },
+  ],
+}
 const dataL1 = [
-
+  [33, 29, 16, 14, 16, 12, 15, 12, 17]
 ]
 const dataL2 = [
-
+  [30, 52, 287, 12, 297, 9, 42, 57, 83]
 ]
 const dataL3 = [
-
+  [60, 104, 32, 28, 32, 24, 30, 24, 34]
 ]
 const dataL4 = [
-
+  [319, 1392, 1475, 44, 5180, 344, 740, 27, 10336],
+  [10.35, 12.13, 12.16, 8.91, 9.00, 9.01, 9.00, 9.96, 11.00]
 ]
 const dataL5 = [
-
+  [3081, 11480, 12134, 494, 57555, 3818, 8219, 271, 93960],
+  [9, 11, 0, 3, -4, -3, -2, 9, -9]
 ]
 const dataL6 = [
-
+  [269, 697, 232, 139, 300, 100, 149, 60, 344]
 ]
 const dataL7 = [
-
+  [9, 11, 0, 3, -4, -3, -2, 9, -9],
+  [61, -12, 54, 127, 24, 2, 27, -8, 7]
 ]
 const dataL8 = [
-
+  [9, 11, 0, 3, -4, -3, -2, 9, -9],
+  [105, 323, 182, 1769.00, 43.00, -30, 686, -33, 78]
+]
+const dataC1 = [
+  [153.51, 37.99, 83.68, 46.72, 50.77, 332.56, 64.64, 413.42, 44.41],
+  [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]
 ]
-
 const dataR1 = [
-
+  [1, 1, 1, 1, 1, 1, 1, 1, 1],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0]
 ]
 const dataR2 = [
-
+  [1, 1, 1, 1, 1, 1, 1, 1, 1],
+  [19, 62, 70, 3, 347, 23, 50, 2, 566]
 ]
 const dataR3 = [
-
+  [258327, 4015, 1393496, 7404, 1330867, 621047, 20622, 31010, 926504],
+  [19, 62, 70, 3, 347, 23, 50, 2, 566]
 ]
 const dataR4 = [
-
+  [69, 192, 210, 10, 1143, 76, 164, 5, 1865],
+  [19, 62, 70, 3, 347, 23, 50, 2, 566]
 ]
 const dataR5 = [
-
+  [17831.10, 13336.00, 15555.43, 11688.30, 9896.79, 13159.86, 9287.77, 9850.18, 7685.91],
+  [17117.80, 12669.20, 14311.00, 11220.77, 9302.98, 12107.07, 8637.63, 9259.17, 7301.61]
 ]
 const dataR6 = [
-
+  [183, 372, 221, 268, 51, -25, 676, -31, 62],
+  [4.00, 5.00, 5.26, 5.21, 4.98, 5.27, 5.28, 5.26, 5.25]
 ]
 const dataR7 = [
-
+  [100, 100, 100, 100, 100, 100, 100, 100, 100]
 ]
 const dataR8 = [
-
-]
+  [100, 100, 100, 100, 100, 100, 100, 100, 100]
+]

+ 1 - 0
manpower/js/index2.js

@@ -4,6 +4,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
+      time: '',
       year: '2022',
       config1: {
         number: [100],

+ 134 - 271
manpower/js/index3.js

@@ -4,6 +4,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
+      time: '',
       year: '2022',
       config1: {
         number: [100],
@@ -65,7 +66,7 @@ let app = new Vue({
           top: '22%',
           right: '5%',
           left: '8%',
-          bottom: '20%',
+          bottom: '25%',
         },
         legend: {
           data: '',
@@ -90,7 +91,7 @@ let app = new Vue({
           },
           axisLabel: {
             show: true,
-            rotate: 50,
+            rotate: 15,
             textStyle: {
               color: 'rgba(255,255,255,0.6)', //X轴文字颜色
               fontSize: 16,
@@ -183,68 +184,11 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL1'])
       let option = {
         ..._.cloneDeep(this.commonOption),
-
         series: [
           {
-            name: '全员劳动生产率',
+            name: '当前各二级企业本部机构数',
             type: 'bar',
-            barWidth: 12,
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 8, //标记的大小
-            smooth: false,
-            itemStyle: {
-              //折线拐点标志的样式
-              color: '#B889EA',
-              borderColor: '#B889EA',
-              width: 2,
-              shadowColor: '#B889EA',
-              shadowBlur: 4,
-            },
-            lineStyle: {
-              color: '#B889EA',
-              width: 2,
-            },
-            // data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
-            data: c1[0],
-            markLine: {
-              data: [
-                {
-                  name: '省属企业平均水平(万/人)',
-                  yAxis: 50.13,
-                  lineStyle: {
-                    color: '#fff',
-                  },
-                  label: {
-                    formatter: '{b}',
-                    position: 'middle',
-                    color: '#fff',
-                  },
-                },
-                {
-                  name: '央企平均水平(万/人)',
-                  yAxis: 69.4,
-                  lineStyle: {
-                    color: '#fff',
-                  },
-                  label: {
-                    formatter: '{b}',
-                    position: 'middle',
-                    color: '#fff',
-                  },
-                },
-              ],
-              label: {
-                distance: [20, 8],
-              },
-            },
-
-          },
-          {
-            name: '全员劳动生产率同比',
-            yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
-            type: 'line',
+            barWidth: 15,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -259,28 +203,18 @@ let app = new Vue({
                 ]),
               },
             },
-            // data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
-            data: c1[1],
+            data: dataL1[0],
           },
         ],
       }
-      option.title.text = '全员劳动生产率'
-      option.legend.data = ['全员劳动生产率同比', '全员劳动生产率']
-      option.legend.show = true
+      option.title.text = '各二级企业本部机构数'
+      option.legend.data = ['当前各二级企业本部机构数']
       option.yAxis.push({
-        type: 'value',
-        axisLine: {
-          show: false,
-        },
         splitLine: {
           show: false,
         },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
-          },
+        axisLine: {
+          show: false,
         },
       })
       myChart.setOption(option)
@@ -291,30 +225,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '人工成本利润率同比变化',
-            type: 'line',
-            yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 8, //标记的大小
-            smooth: false,
-            itemStyle: {
-              //折线拐点标志的样式
-              color: '#fbe138',
-              borderColor: '#fbe138',
-              width: 2,
-              shadowColor: '#fbe138',
-              shadowBlur: 4,
-            },
-            lineStyle: {
-              color: '#fbe138',
-              width: 2,
-            },
-            data: dataL1[2],
-          },
-          {
-            name: '当前人工成本利润率',
+            name: '当前各二级企业所属架构数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -322,7 +233,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#43ede3',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -331,12 +242,12 @@ let app = new Vue({
                 ]),
               },
             },
-            data: dataL1[0],
-          },
+            data: dataL2[0]
+          }
         ],
       }
-      option.title.text = '各三级企业人工成本利润率'
-      option.legend.data = ['当前人工成本利润率', '人工成本利润率同比变化']
+      option.title.text = '各二级企业所属架构数'
+      option.legend.data = ['当前各二级企业所属架构数']
       option.yAxis.push({
         splitLine: {
           show: false,
@@ -354,7 +265,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '当前管理人数',
+            name: '当前本部中层管理人数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -373,33 +284,10 @@ let app = new Vue({
             },
             data: dataL3[0],
           },
-          {
-            name: '管理人员数占总人数比值',
-            type: 'line',
-            yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
-            smooth: true, //平滑曲线显示
-            showAllSymbol: true, //显示所有图形。
-            symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 8, //标记的大小
-            smooth: false,
-            itemStyle: {
-              //折线拐点标志的样式
-              color: '#fbe138',
-              borderColor: '#fbe138',
-              width: 2,
-              shadowColor: '#fbe138',
-              shadowBlur: 4,
-            },
-            lineStyle: {
-              color: '#fbe138',
-              width: 2,
-            },
-            data: dataL3[1],
-          },
         ],
       }
-      option.title.text = '各省属企业管理人员数'
-      option.legend.data = ['当前管理人员数', '管理人员数占总人数比值']
+      option.title.text = '各二级企业本部中层管理人数'
+      option.legend.data = ['当前本部中层管理人数']
       option.yAxis.push({
         type: 'value',
         axisLine: {
@@ -408,13 +296,6 @@ let app = new Vue({
         splitLine: {
           show: false,
         },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
-          },
-        },
       })
       myChart.setOption(option)
     },
@@ -424,35 +305,57 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '六定改革前总部中层管理人数核定上限',
+            name: '当前管理人员数',
             type: 'bar',
-            barWidth: 15,
+            barWidth: 12,
+            smooth: true, //平滑曲线显示
+            showAllSymbol: true, //显示所有图形。
+            symbol: 'circle', //标记的图形为实心圆
+            symbolSize: 8, //标记的大小
+            smooth: false,
             itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#69c0ff',
+              //折线拐点标志的样式
+              color: '#B889EA',
+              borderColor: '#B889EA',
+              width: 2,
+              shadowColor: '#B889EA',
+              shadowBlur: 4,
+            },
+            lineStyle: {
+              color: '#B889EA',
+              width: 2,
+            },
+            data: dataL4[0],
+            markLine: {
+              data: [
+                {
+                  name: '管理人员比值核定上限',
+                  yAxis: 15,
+                  lineStyle: {
+                    color: '#fff',
                   },
-                  {
-                    offset: 1,
-                    color: '#082550',
+                  label: {
+                    formatter: '{b}',
+                    position: 'middle',
+                    color: '#fff',
                   },
-                ]),
+                }
+              ],
+              label: {
+                distance: [20, 8],
               },
             },
-            data: dataL4[0],
           },
           {
-            name: '当前总部中层管理人数核定上限',
-            type: 'bar',
-            barWidth: 15,
+            name: '管理人员数占总人数比值',
+            yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
+            type: 'line',
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#6480f3',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -465,16 +368,24 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业总部中层管理人数'
-      option.legend.data = ['六定改革前总部中层管理人数核定上限', '当前总部中层管理人数核定上限']
+      option.title.text = '各二级企业管理人员数'
+      option.legend.data = ['当前管理人员数', '管理人员数占总人数比值']
       option.legend.show = true
       option.yAxis.push({
-        splitLine: {
+        type: 'value',
+        axisLine: {
           show: false,
         },
-        axisLine: {
+        splitLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -484,7 +395,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '各省属企业总人数',
+            name: '各二级企业总人数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -528,8 +439,8 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业总人数'
-      option.legend.data = ['各省属企业总人数', '去年同期人数变化率']
+      option.title.text = '各二级企业总人数'
+      option.legend.data = ['各二级企业总人数', '去年同期人数变化率']
       option.legend.show = true
       option.yAxis.push({
         type: 'value',
@@ -538,14 +449,7 @@ let app = new Vue({
         },
         splitLine: {
           show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
-          },
-        },
+        }
       })
       myChart.setOption(option)
     },
@@ -555,7 +459,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '部员额数',
+            name: '部员额数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -575,30 +479,10 @@ let app = new Vue({
             },
             data: dataL6[0],
           },
-          {
-            name: '总部员额数核定上限',
-            type: 'line',
-            barWidth: 15,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#fbe138',
-                  },
-                  {
-                    offset: 1,
-                    color: '#082550',
-                  },
-                ]),
-              },
-            },
-            data: dataL6[1],
-          },
         ],
       }
-      option.title.text = '各省属企业总部员额数'
-      option.legend.data = ['总部员额数', '总部员额数核定上限']
+      option.title.text = '各二级企业本部员额数'
+      option.legend.data = ['本部员额数']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -616,8 +500,8 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '当前全员劳动生产率(万/人)',
-            type: 'bar',
+            name: '人数变化',
+            type: 'line',
             barWidth: 15,
             itemStyle: {
               normal: {
@@ -628,21 +512,21 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#43ede3',
                   },
                 ]),
               },
             },
-            markLine: {
-              data: [{ type: 'average', name: 'Avg' }],
-            },
+            // markLine: {
+            //   data: [{ type: 'average', name: 'Avg' }],
+            // },
             data: dataL7[0],
           },
           {
-            name: '劳动生产率同比变化',
+            name: '全员劳动生产率',
             type: 'line',
             barWidth: 15,
-            yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -652,48 +536,17 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#b889ea',
                   },
                 ]),
               },
             },
-            markLine: {
-              data: [
-                // {
-                //   name: '省属企业平均水平(万/人)',
-                //   yAxis: 50.13,
-                //   lineStyle: {
-                //     color: '#fff',
-                //   },
-                //   label: {
-                //     formatter: '{b}',
-                //     position: 'middle',
-                //     color: '#fff',
-                //   },
-                // },
-                {
-                  name: '央企平均水平(万/人)',
-                  yAxis: 69.4,
-                  lineStyle: {
-                    color: '#fff',
-                  },
-                  label: {
-                    formatter: '{b}',
-                    position: 'middle',
-                    color: '#fff',
-                  },
-                },
-              ],
-              label: {
-                distance: [20, 8],
-              },
-            },
             data: dataL7[1],
           },
         ],
       }
-      option.title.text = '各省属企业全员劳动生产率'
-      option.legend.data = ['当前全员劳动生产率(万/人)', '劳动生产率同比变化']
+      option.title.text = '人数变化和全员劳动生产率变化率分析'
+      option.legend.data = ['人数变化', '全员劳动生产率']
       option.legend.show = true
       option.yAxis.push({
         type: 'value',
@@ -719,28 +572,33 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '当前人工成本利润率',
-            type: 'bar',
+            name: '人数变化',
+            type: 'line',
             barWidth: 15,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#5e7ae9',
+                    color: '#43ede3',
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#43ede3',
                   },
                 ]),
               },
             },
+            // markLine: {
+            //   data: [{ type: 'average', name: 'Avg' }],
+            // },
             data: dataL8[0],
           },
           {
-            name: '人工成本利润率同比变化',
+            name: '人工成本利润率',
             type: 'line',
+            barWidth: 15,
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -750,7 +608,7 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#b889ea',
                   },
                 ]),
               },
@@ -759,16 +617,24 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业人工成本利润率'
-      option.legend.data = ['当前人工成本利润率', '人工成本利润率同比变化']
+      option.title.text = '人数变化和人工利润率变化分析'
+      option.legend.data = ['人数变化', '人工成本利润率']
       option.legend.show = true
       option.yAxis.push({
-        splitLine: {
+        type: 'value',
+        axisLine: {
           show: false,
         },
-        axisLine: {
+        splitLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -801,7 +667,7 @@ let app = new Vue({
               width: 2,
             },
             // data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
-            data: c1[0],
+            data: dataC1[0],
             markLine: {
               data: [
                 {
@@ -833,7 +699,6 @@ let app = new Vue({
                 distance: [20, 8],
               },
             },
-
           },
           {
             name: '全员劳动生产率同比',
@@ -854,7 +719,7 @@ let app = new Vue({
               },
             },
             // data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
-            data: c1[1],
+            data: dataC1[1],
           },
         ],
       }
@@ -906,7 +771,7 @@ let app = new Vue({
               width: 2,
             },
             // data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
-            data: c2[0],
+            data: dataC2[0],
             markLine: {
               data: [
                 {
@@ -958,7 +823,7 @@ let app = new Vue({
               },
             },
             // data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
-            data: c2[1]
+            data: dataC2[1]
           },
         ],
       }
@@ -1027,7 +892,7 @@ let app = new Vue({
 
         ],
       }
-      option.title.text = '当前各省属企业招聘需求公示人次'
+      option.title.text = '各二级企业招聘需求公告人次情况'
       option.legend.data = ['招聘需求公告次数', '招聘需求公告累计招聘人次']
       option.legend.show = true
       option.yAxis.push({
@@ -1087,10 +952,9 @@ let app = new Vue({
             },
             data: dataR2[1],
           },
-
         ],
       }
-      option.title.text = '当前各省属企业录用结果公示人次'
+      option.title.text = '各二级企业录用结果公示人次'
       option.legend.data = ['录用结果公示次数', '录用结果公示累计公示人数']
       option.legend.show = true
       option.yAxis.push({
@@ -1152,7 +1016,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业年利润与"当年"招聘人数'
+      option.title.text = '各二级企业年利润与招聘情况分析'
       option.legend.data = ['2022年利润(万)', '2022年累计招聘数']
       option.legend.show = true
       option.yAxis.push({
@@ -1214,7 +1078,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业"退二进一"完成情况'
+      option.title.text = '各二级企业"退二进一"完成情况'
       option.legend.data = ['2022年退出人数', '2022年累计招聘人数']
       option.legend.show = true
       option.yAxis.push({
@@ -1233,7 +1097,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '去年同期在岗职工平均薪酬',
+            name: '在岗职工平均薪酬',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1241,7 +1105,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#6682F5',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -1250,10 +1114,10 @@ let app = new Vue({
                 ]),
               },
             },
-            data: fjxdataL1[0],
+            data: dataR5[0],
           },
           {
-            name: '在岗职工平均薪酬',
+            name: '去年同期在岗职工平均薪酬',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1261,7 +1125,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#6682F5',
                   },
                   {
                     offset: 1,
@@ -1270,12 +1134,12 @@ let app = new Vue({
                 ]),
               },
             },
-            data: fjxdataL1[1],
-          },
+            data: dataR5[1],
+          }
         ],
       }
-      option.title.text = '各省属企业在岗职工平均薪酬'
-      option.legend.data = ['去年同期在岗职工平均薪酬', '在岗职工平均薪酬']
+      option.title.text = '各二级企业在岗职工平均薪酬'
+      option.legend.data = ['在岗职工平均薪酬', '去年同期在岗职工平均薪酬']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -1312,9 +1176,8 @@ let app = new Vue({
               color: '#B889EA',
               width: 2,
             },
-            data: fjxdataL2[0],
+            data: dataR6[0],
           },
-
           {
             name: '2022年薪酬累计涨幅率',
             type: 'line',
@@ -1333,11 +1196,11 @@ let app = new Vue({
                 ]),
               },
             },
-            data: fjxdataL2[1],
+            data: dataR6[1],
           },
         ],
       }
-      option.title.text = '各省属企业月利润与月薪酬变动情况'
+      option.title.text = '各二级企业月利润与月薪酬变动情况'
       option.legend.data = ['2022年利润累计涨幅率', '2022年薪酬累计涨幅率']
       option.yAxis.push({
         splitLine: {
@@ -1372,11 +1235,11 @@ let app = new Vue({
                 ]),
               },
             },
-            data: fjxdataL3[0],
+            data: dataR7[0],
           },
         ],
       }
-      option.title.text = '各省属企业全员绩效考核'
+      option.title.text = '各二级企业全员绩效考核'
       // option.legend.data = ['劳动合同签约完成率', '目标值']
       option.yAxis.push({
         splitLine: {
@@ -1411,11 +1274,11 @@ let app = new Vue({
                 ]),
               },
             },
-            data: fjxdataL4[0],
+            data: dataR8[0],
           },
         ],
       }
-      option.title.text = '各省属企业任期制考核'
+      option.title.text = '各二级企业任期制考核'
       option.yAxis.push({
         splitLine: {
           show: false,