Home Explore Help
Sign In
kingdee_large_screen
/
pc_kingdee_large_screen
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'main' of https://git.sxidc.com/kingdee_large_screen/pc_kingdee_large_screen

l1448442195@163.com 1 year ago
parent
b2ea529b0a dbaaa5365f
commit
e9066785e0
7 changed files with 268 additions and 142 deletions
Split View Show Diff Stats
  1. 19 5
      manpower/index.html
  2. 1 1
      manpower/js/data.js
  3. 28 26
      manpower/js/data4.js
  4. 7 0
      manpower/js/fjx.js
  5. 162 109
      manpower/js/index.js
  6. 8 1
      manpower/js/index4.js
  7. 43 0
      manpower/styles/index.css

+ 19 - 5
manpower/index.html
View File 

@@ -27,15 +27,16 @@
 
 <body>
 
   <div id="app">
 
     <header class="my-header">
 
-      <span>数智人力&nbsp;&nbsp;智慧山西</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">
 
+            <div class="panel-title flex-between " >
 
               <span class="text">定机构</span>
 
+              <span class="tip-window" @click="handleShowTip(0)">智能分析</span>
 
             </div>
 
             <div class="content flex">
 
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
 
@@ -56,8 +57,9 @@
 
         </dv-border-box-8>
 
         <dv-border-box-8 :dur="12" style="flex: 2;">
 
           <div class="my-panel">
 
-            <div class="panel-title">
 
+            <div class="panel-title flex-between">
 
               <span class="text">定员额</span>
 
+              <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
 
             </div>
 
             <div class="content flex flex-wrap">
 
               <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div>
 
@@ -152,8 +154,9 @@
 
         </dv-border-box-8>
 
         <dv-border-box-8 :dur="10">
 
           <div class="my-panel">
 
-            <div class="panel-title">
 
+            <div class="panel-title flex-between">
 
               <span class="text">核心指标监测</span>
 
+              <span class="tip-window" @click="handleShowTip(2)">智能分析</span>
 
             </div>
 
             <div class="content flex">
 
               <div ref="echartC1" style="flex: 1;height: 100%;"></div>
 
@@ -196,8 +199,9 @@
 
         </dv-border-box-8>
 
         <dv-border-box-8 :dur="11" style="flex: 1">
 
           <div class="my-panel">
 
-            <div class="panel-title">
 
+            <div class="panel-title flex-between">
 
               <span class="text">定薪酬</span>
 
+              <span class="tip-window" @click="handleShowTip(3)">智能分析</span>
 
             </div>
 
             <div class="content flex">
 
               <div ref="echartR5" style="flex: 1;height: 100%;"></div>
 
@@ -222,7 +226,17 @@
 
       <a class="item" v-for="(item,index) in companyList" :key="index"><img
 
           :src="`./images/logos/logo${index+1}.png`"></img> {{item.name}}</a>
 
     </div>
 
+
 
+    <div class="tip" @click="showTip = false" v-if="showTip">
 
+      <div class="tip-box">
 
+        <div>{{tipData[tipNum]}}</div>
 
+        <!-- <div class="btm20">全员劳动生产率从去年前的人均XX万元提升到XX万元；在岗职工平均工资从去年前的人均XX万元提升到XX万元。</div>
 
+        <div>打破工资“大锅饭”，所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”，省属企业负责人绩效年薪与经营业绩考核结果挂钩后，还要与企业经济效益挂钩。</div> -->
 
+      </div>
 
+    </div>
 
   </div>
 
+ 
+ 
   <script src="./js/index.js"></script>
 
 </body>

+ 1 - 1
manpower/js/data.js
View File 

@@ -43,7 +43,7 @@ const data = {
 
   ],
 
 }
 
 const dataL1 = [
 
-  [18, 21, 14, 21, 13, 14, 6, 13, 13, 14, 14, 12, 15, 16, 12, 15, 10, 19],
 
+  [35, 30, 28, 41, 28, 28, 6, 23, 31, 19, 19, 17, 23, 27, 25, 15, 13, 13],
 
   [18, 21, 14, 21, 13, 14, 6, 13, 13, 14, 14, 12, 15, 16, 12, 15, 10, 19],
 
   [21, 21, 21, 21, 13, 13, 6, 13, 13, 14, 14, 12, 15, 15, 12, 15, 12, 13],
 
 ]

+ 28 - 26
manpower/js/data4.js
View File 

@@ -33,64 +33,66 @@ const data = {
 
   ],
 
 }
 
 const dataL1 = [
 
-  [17, 27, 47, 4, 36, 43, 33, 36, 34, 17]
 
+  [3, 9, 10, 33, 23, 29, 13, 8]
 
 ]
 
 const dataL2 = [
 
-  [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 
+  [3, 9, 10, 33, 23, 29, 13, 8]
 
 ]
 
 const dataL3 = [
 
-  [34, 54, 94, 8, 72, 86, 66, 72, 68, 34]
 
+  [6, 18, 20, 66, 46, 58, 26, 12]
 
 ]
 
 const dataL4 = [
 
-  [26, 58, 137, 34, 127, 113, 96, 95, 85, 25],
 
-  [8.00, 9.00, 8.00, 10.00, 11.00, 12.00, 9.00, 8.00, 11.00, 10.00]
 
+  [6, 18, 20, 66, 46, 58, 26, 12],
 
+  [66.67, 56.25, 27.40, 23.66, 30.46, 46.40, 18.06, 100.00]
 
 ]
 
 const dataL5 = [
 
-  [323, 647, 1710, 344, 1156, 944, 1070, 1191, 775, 254],
 
-  [-57.00, 20.00, -14.00, -8.00, 0.00, 9.00, 0.00, -4.00, 0.00, -2.00]
 
+  [9, 32, 73, 279, 151, 125, 144, 12],
 
+  [0.00, 0.00, -1.35, 81.82, 73.82, 0.00, -9.03, 0.00]
 
 ]
 
 const dataL6 = [
 
-  [323, 647, 1710, 344, 1156, 944, 1070, 1191, 775, 254]
 
+  [9, 32, 73, 279, 151, 125, 144, 12]
 
 ]
 
+
 
 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]
 
+  [0.00, 0.00, -1.35, 81.82, 73.82, 0.00, -9.03, 0.00],
 
+  [-18.20, 0.00, 95.39, -35.61, -71.34, 0.00, 0.00, 0.00]
 
 ]
 
+
 
 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]
 
+  [0.00, 0.00, -1.35, 81.82, 73.82, 0.00, -9.03, 0.00],
 
+  [0.00, 0.00, 780.62, 242.97, 18.09, -52.24, 3.12, 24.68]
 
 ]
 
 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]
 
+  [37.30, 0.00, 89.53, 17.89, 7.67, 16.05, -6.89, 0.00],
 
+  [-18.20, 0.00, 95.39, -35.61, -71.34, 0.00, 0.00, 0.00]
 
 ]
 
 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]
 
+  [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]
 
 ]
 
 const dataR1 = [
 
   [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
 
   [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
 ]
 
 const dataR2 = [
 
-  [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
 
-  [2, 4, 10, 2, 7, 6, 6, 7, 5, 2]
 
+  [1, 1, 1, 1, 1, 1, 1, 1],
 
+  [0, 0, 0, 1, 2, 0, 0, 0]
 
 ]
 
 const dataR3 = [
 
-  [30029.00, 116146.00, 213144.00, 308565.00, 105661.00, 98456.00, 87853.00, 38084.00, 8204.00, -3783.00],
 
-  [2, 4, 10, 2, 7, 6, 6, 7, 5, 2]
 
+  [0.00, -2000.00, 2610.00, -12442.00, -14428.00, -7992.00, -5780.00, -3602.00],
 
+  [0, 0, 0, 1, 2, 0, 0, 0]
 
 ]
 
 const dataR4 = [
 
-  [7, 13, 33, 7, 23, 20, 20, 23, 16, 7],
 
-  [2, 4, 10, 2, 7, 6, 6, 7, 5, 2]
 
+  [2, 2, 2, 6, 8, 0, 0, 0],
 
+  [0, 0, 0, 1, 2, 0, 0, 0]
 
 ]
 
 const dataR5 = [
 
-  [11.98, 28.79, 25.07, 23.31, 23.80, 19.69, 15.56, 30.32, 18.67, 11.59],
 
-  [19.47, 26.54, 37.56, 28.23, 27.61, 25.48, 16.10, 41.23, 12.10, 11.89]
 
+  [16000.00, 0.00, 9589.04, 11260.80, 13360.00, 10853.00, 4680.80, 0.00],
 
+  [15323.20, 0.00, 9084.66, 10674.11, 12694.67, 10281.05, 4433.65, 0.00]
 
 ]
 
 const dataR6 = [
 
-  [359, 141, -26, -8, -23, 90, 20, -68, 1769, -221],
 
-  [-36, 11, 30, 11, 16, 45, 2, 23, -45, -10]
 
+  [0, -100, -920, -239, 38, 27, 30, -2727],
 
+  [4, 5, 5.26, 5.21, 4.98, 5.27, 5.28, 5.26]
 
 ]
 
 const dataR7 = [
 
   [100, 100, 100, 100, 100, 100, 100, 100, 100]

+ 7 - 0
manpower/js/fjx.js
View File 

@@ -13,4 +13,11 @@ const fjxdataL1 = [
 
   ]
 
   const fjxdataL4 = [
 
     [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,100],
 
+  ]
 
+
 
+  const tipData = [
 
+    '全员劳动生产率从去年前的人均XX万元提升到XX万元；在岗职工平均工资从去年前的人均XX万元提升到XX万元。打破工资“大锅饭”，所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”，省属企业负责人绩效年薪与经营业绩考核结果挂钩后，还要与企业经济效益挂钩。',
 
+    '全员劳动生产率从去年前的人均XX万元提升到XX万元；在岗职工平均工资从去年前的人均XX万元提升到XX万元。打破工资“大锅饭”，所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”，省属企业负责人绩效年薪与经营业绩考核结果挂钩后，还要与企业经济效益挂钩2。',
 
+    '全员劳动生产率从去年前的人均XX万元提升到XX万元；在岗职工平均工资从去年前的人均XX万元提升到XX万元。打破工资“大锅饭”，所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”，省属企业负责人绩效年薪与经营业绩考核结果挂钩后，还要与企业经济效益挂钩3。',
 
+    '全员劳动生产率从去年前的人均XX万元提升到XX万元；在岗职工平均工资从去年前的人均XX万元提升到XX万元。打破工资“大锅饭”，所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”，省属企业负责人绩效年薪与经营业绩考核结果挂钩后，还要与企业经济效益挂钩4。'
 
   ]

+ 162 - 109
manpower/js/index.js
View File 

@@ -4,6 +4,8 @@ let app = new Vue({
 
   el: '#app',
 
   data () {
 
     return {
 
+      showTip: false,
 
+      tipNum: '',
 
       time: '',
 
       year: '2022',
 
       config1: {
 
@@ -161,6 +163,11 @@ let app = new Vue({
 
     }
 
   },
 
   methods: {
 
+    handleShowTip(index){
 
+      this.showTip = true
 
+      this.tipNum = index
 
+    },
 
+
 
     numFormat (value) {
 
       if (!value) return '0'
 
       var intPart = Number(value).toFixed(0) // 获取整数部分
 
@@ -374,7 +381,7 @@ let app = new Vue({
 
             markLine: {
 
               data: [
 
                 {
 
-                  name: '固定参考线',
 
+                  name: '管理人员数占总人数的合理比值线',
 
                   yAxis: 15,
 
                   lineStyle: {
 
                     color: '#fff',
 
@@ -616,23 +623,26 @@ let app = new Vue({
 
           {
 
             name: '总部员额数核定上限',
 
             type: 'line',
 
-            barWidth: 15,
 
+            yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
 
+            smooth: true, //平滑曲线显示
 
+            showAllSymbol: true, //显示所有图形。
 
+            symbol: 'circle', //标记的图形为实心圆
 
+            symbolSize: 8, //标记的大小
 
+            smooth: false,
 
             itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#fbe138',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#082550',
 
-                  },
 
-                ]),
 
-              },
 
+              //折线拐点标志的样式
 
+              color: '#fbe138',
 
+              borderColor: '#fbe138',
 
+              width: 2,
 
+              shadowColor: '#fbe138',
 
+              shadowBlur: 4,
 
+            },
 
+            lineStyle: {
 
+              color: '#fbe138',
 
+              width: 2,
 
             },
 
             data: dataL6[1],
 
-          },
 
+          }
 
         ],
 
       }
 
       option.title.text = '各省属企业总部员额数'
 
@@ -656,50 +666,54 @@ let app = new Vue({
 
           {
 
             name: '人数变化',
 
             type: 'line',
 
-            barWidth: 15,
 
+            smooth: true, //平滑曲线显示
 
+            showAllSymbol: true, //显示所有图形。
 
+            symbol: 'circle', //标记的图形为实心圆
 
+            symbolSize: 8, //标记的大小
 
+            smooth: false,
 
             itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#43ede3',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#43ede3',
 
-                  },
 
-                ]),
 
-              },
 
+              //折线拐点标志的样式
 
+              color: '#43ede3',
 
+              borderColor: '#43ede3',
 
+              width: 2,
 
+              shadowColor: '#43ede3',
 
+              shadowBlur: 4,
 
+            },
 
+            lineStyle: {
 
+              color: '#43ede3',
 
+              width: 2,
 
             },
 
             data: dataL7[0],
 
           },
 
           {
 
-            name: '全员劳动生产率',
 
+            name: '劳动生产率同比变化',
 
             type: 'line',
 
-            barWidth: 15,
 
-            yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
 
+            yAxisIndex: 1,
 
+            smooth: true, //平滑曲线显示
 
+            showAllSymbol: true, //显示所有图形。
 
+            symbol: 'circle', //标记的图形为实心圆
 
+            symbolSize: 8, //标记的大小
 
+            smooth: false,
 
             itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#b889ea',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#b889ea',
 
-                  },
 
-                ]),
 
-              },
 
+              //折线拐点标志的样式
 
+              color: '#b889ea',
 
+              borderColor: '#b889ea',
 
+              width: 2,
 
+              shadowColor: '#b889ea',
 
+              shadowBlur: 4,
 
+            },
 
+            lineStyle: {
 
+              color: '#b889ea',
 
+              width: 2,
 
             },
 
             data: dataL7[1],
 
           },
 
         ],
 
       }
 
       option.title.text = '人数变化和全员劳动生产率变化分析'
 
-      option.legend.data = ['人数变化', '全员劳动生产率']
 
+      option.legend.data = ['人数变化', '劳动生产率同比变化']
 
       option.legend.show = true
 
-      // option.yAxis[0].axisLabel.formatter = '{value} %',
 
+      option.yAxis[0].axisLabel.formatter = '{value} %',
 
       option.yAxis.push({
 
         type: 'value',
 
         axisLine: {
 
@@ -716,6 +730,7 @@ let app = new Vue({
 
           },
 
         },
 
       })
 
+
 
       myChart.setOption(option)
 
     },
 
     initChartL8 () {
 
@@ -724,51 +739,55 @@ let app = new Vue({
 
         ..._.cloneDeep(this.commonOption),
 
         series: [
 
           {
 
-            name: '当前人工成本利润率',
 
+            name: '人数变化',
 
             type: 'line',
 
-            barWidth: 15,
 
+            smooth: true, //平滑曲线显示
 
+            showAllSymbol: true, //显示所有图形。
 
+            symbol: 'circle', //标记的图形为实心圆
 
+            symbolSize: 8, //标记的大小
 
+            smooth: false,
 
             itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#5e7ae9',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#5e7ae9',
 
-                  },
 
-                ]),
 
-              },
 
+              //折线拐点标志的样式
 
+              color: '#43ede3',
 
+              borderColor: '#43ede3',
 
+              width: 2,
 
+              shadowColor: '#43ede3',
 
+              shadowBlur: 4,
 
+            },
 
+            lineStyle: {
 
+              color: '#43ede3',
 
+              width: 2,
 
             },
 
             data: dataL8[0],
 
           },
 
           {
 
             name: '人工成本利润率同比变化',
 
             type: 'line',
 
+            smooth: true, //平滑曲线显示
 
+            showAllSymbol: true, //显示所有图形。
 
+            symbol: 'circle', //标记的图形为实心圆
 
+            symbolSize: 8, //标记的大小
 
+            smooth: false,
 
             itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#b889ea',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#b889ea',
 
-                  },
 
-                ]),
 
-              },
 
+              //折线拐点标志的样式
 
+              color: '#b889ea',
 
+              borderColor: '#b889ea',
 
+              width: 2,
 
+              shadowColor: '#b889ea',
 
+              shadowBlur: 4,
 
+            },
 
+            lineStyle: {
 
+              color: '#b889ea',
 
+              width: 2,
 
             },
 
             data: dataL8[1],
 
           },
 
         ],
 
       }
 
       option.title.text = '人数变化和人工成本利润率变化分析'
 
-      option.legend.data = ['人数变化','人工成本利润率']
 
+      option.legend.data = ['人数变化','人工成本利润率同比变化']
 
       option.legend.show = true
 
       option.yAxis[0].axisLabel.formatter = '{value} %',
 
-      console.log(option)
 
       myChart.setOption(option)
 
     },
 
     // 中间图表---------------------------------------------开始
 
@@ -779,7 +798,7 @@ let app = new Vue({
 
 
         series: [
 
           {
 
-            name: '全员劳动生产率',
 
+            name: '全员劳动生产率（万/人）',
 
             type: 'bar',
 
             barWidth: 12,
 
             smooth: true, //平滑曲线显示
 
@@ -789,22 +808,34 @@ let app = new Vue({
 
             smooth: false,
 
             itemStyle: {
 
               //折线拐点标志的样式
 
-              color: '#B889EA',
 
-              borderColor: '#B889EA',
 
+              color: '#69c0ff',
 
+              borderColor: '#69c0ff',
 
               width: 2,
 
-              shadowColor: '#B889EA',
 
+              shadowColor: '#69c0ff',
 
               shadowBlur: 4,
 
             },
 
             lineStyle: {
 
-              color: '#B889EA',
 
+              color: '#69c0ff',
 
               width: 2,
 
             },
 
             // data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
 
             data: c1[0],
 
+           
+
 
+          },
 
+          {
 
+            name: '全员劳动生产率同比',
 
+            yAxisIndex: 1,
 
+            type: 'line',
 
+            itemStyle: {
 
+              normal: {
 
+                color: '#B889EA',
 
+              },
 
+            },
 
             markLine: {
 
               data: [
 
                 {
 
-                  name: '省属企业平均水平（万/人）',
 
+                  name: '省属企业平均水平',
 
                   yAxis: 50.13,
 
                   lineStyle: {
 
                     color: '#fff',
 
@@ -812,19 +843,35 @@ let app = new Vue({
 
                   label: {
 
                     formatter: '{b}',
 
                     position: 'middle',
 
+                    fontSize: 16,
 
                     color: '#fff',
 
                   },
 
                 },
 
                 {
 
-                  name: '央企平均水平（万/人）',
 
+                  name: '',
 
+                  yAxis: 0,
 
+                  lineStyle: {
 
+                    color: '#fff',
 
+                  },
 
+                  label: {
 
+                    formatter: '{b}',
 
+                    position: 'end',
 
+                    fontSize: 16,
 
+                    color: '#fff',
 
+                  },
 
+                },
 
+                {
 
+                  name: '央企平均水平',
 
                   yAxis: 69.4,
 
                   lineStyle: {
 
+                    type: 'dashed',
 
                     color: '#fff',
 
                   },
 
                   label: {
 
                     formatter: '{b}',
 
-                    position: 'middle',
 
+                    position: 'end',
 
                     color: '#fff',
 
+                    fontSize: 16,
 
                   },
 
                 },
 
               ],
 
@@ -832,34 +879,15 @@ let app = new Vue({
 
                 distance: [20, 8],
 
               },
 
             },
 
-
 
-          },
 
-          {
 
-            name: '全员劳动生产率同比',
 
-            yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
 
-            type: 'line',
 
-            itemStyle: {
 
-              normal: {
 
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                  {
 
-                    offset: 0,
 
-                    color: '#69c0ff',
 
-                  },
 
-                  {
 
-                    offset: 1,
 
-                    color: '#082550',
 
-                  },
 
-                ]),
 
-              },
 
-            },
 
             // data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
 
             data: c1[1],
 
           },
 
         ],
 
       }
 
-      option.title.text = '全员劳动生产率'
 
-      option.legend.data = ['全员劳动生产率同比', '全员劳动生产率']
 
+      option.title.text = '当前各省属企业全员劳动生产率'
 
+      option.legend.data = ['全员劳动生产率同比', '全员劳动生产率（万/人）']
 
       option.legend.show = true
 
+      option.grid.right = '15%'
 
       option.yAxis.push({
 
         type: 'value',
 
         axisLine: {
 
@@ -904,12 +932,13 @@ let app = new Vue({
 
               color: '#B889EA',
 
               width: 2,
 
             },
 
+           
             // data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
 
             data: c2[0],
 
             markLine: {
 
               data: [
 
                 {
 
-                  name: '省属企业平均水平（万/人）',
 
+                  name: '省属企业平均水平',
 
                   yAxis: 67.09,
 
                   lineStyle: {
 
                     color: '#fff',
 
@@ -921,7 +950,7 @@ let app = new Vue({
 
                   },
 
                 },
 
                 {
 
-                  name: '央企平均水平（万/人）',
 
+                  name: '央企平均水平',
 
                   yAxis: 81,
 
                   lineStyle: {
 
                     color: '#fff',
 
@@ -956,7 +985,17 @@ let app = new Vue({
 
                 ]),
 
               },
 
             },
 
-            // data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
 
+            itemStyle: {
 
+              color: params => {
 
+                  if( params.value < 0 && c2[0][params.dataIndex] < 0) {
 
+                    return 'red'
 
+                  } else if(c2[0][params.dataIndex]  < 0) {
 
+                    return 'yellow'
 
+                  } else {
 
+                    return '#69c0ff'
 
+                  }
 
+              },
 
+            },
 
             data: c2[1]
 
           },
 
         ],
 
@@ -965,6 +1004,7 @@ let app = new Vue({
 
       option.legend.data = ['人工成本利润同比', '人工成本利润率']
 
       option.legend.show = true
 
       option.grid.right = '15%'
 
+      option.yAxis[0].axisLabel.formatter = '{value} %',
 
       option.yAxis.push({
 
         splitLine: {
 
           show: false,
 
@@ -980,6 +1020,15 @@ let app = new Vue({
 
       let myChart = echarts.init(this.$refs['echartR1'])
 
       let commonOptions = this.commonOption
 
       commonOptions.yAxis[0].splitNumber = 2
 
+      let dataTemp = []
 
+      let dataTemp2 = []
 
+      dataR1[0].forEach(item => {
 
+          dataTemp.push(item+1);
 
+      });
 
+      dataR1[1].forEach(item => {
 
+        dataTemp2.push(item+1);
 
+    });
 
+    
       let option = {
 
         ..._.cloneDeep(commonOptions),
 
         series: [
 
@@ -1001,7 +1050,7 @@ let app = new Vue({
 
                 ]),
 
               },
 
             },
 
-            data: dataR1[0],
 
+            data: dataTemp,
 
           },
 
           {
 
             name: '招聘需求公告累计招聘人次',
 
@@ -1021,7 +1070,7 @@ let app = new Vue({
 
                 ]),
 
               },
 
             },
 
-            data: dataR1[1],
 
+            data: dataTemp2,
 
           },
 
 
         ],
 
@@ -1029,6 +1078,10 @@ let app = new Vue({
 
       option.title.text = '当前各省属企业招聘需求公示人次'
 
       option.legend.data = ['招聘需求公告次数', '招聘需求公告累计招聘人次']
 
       option.legend.show = true
 
+      option.tooltip.formatter = function(value){
 
+        return value[0].axisValue+':'+ (value[0].value -1)+'<br>'+
 
+        value[1].axisValue+':'+ (value[1].value-1)
 
+      }
 
       option.yAxis[0] = {
 
         type: 'log',
 
         min: 1,
 
@@ -1175,7 +1228,7 @@ let app = new Vue({
 
           },
 
         ],
 
       }
 
-      option.title.text = '各省属企业年利润与"当年"招聘人数'
 
+      option.title.text = '各省属企业年利润与当年累计招聘人数'
 
       option.legend.data = ['2022年利润(万）', '2022年累计招聘数']
 
       option.legend.show = true
 
       option.yAxis[0] = {

+ 8 - 1
manpower/js/index4.js
View File 

@@ -449,7 +449,14 @@ let app = new Vue({
 
         },
 
         splitLine: {
 
           show: false,
 
-        }
 
+        },
 
+        axisLabel: {
 
+          show: true,
 
+          formatter: '{value} %',
 
+          textStyle: {
 
+            color: 'rgba(250,250,250,0.6)',
 
+          },
 
+        },
 
       })
 
       myChart.setOption(option)
 
     },

+ 43 - 0
manpower/styles/index.css
View File 

@@ -79,6 +79,7 @@ a {
 
   background: url('../images/page-bg.png') center center no-repeat;
 
   background-size: 100% 100%;
 
   padding-top: 10px;
 
+  position: relative;
 
 }
 
 .my-header {
 
   position: relative;
 
@@ -313,4 +314,46 @@ a {
 
 }
 
 .dv-scroll-board .rows .row-item {
 
   font-size: 18px!important;
 
+}
 
+.tip-window{
 
+  margin-right: 50px;
 
+  margin-top: 10px;
 
+  color: #69C0FF;
 
+  display: inline-block;
 
+  width: 142px;
 
+  height: 50px;
 
+  line-height: 50px;
 
+  text-align: center;
 
+  background-color: rgba(64,169,255,0.12);
 
+  border: 2px solid #40A9FF;
 
+  border-radius: 8px;
 
+  cursor: pointer;
 
+}
 
+.tip {
 
+  position: fixed;
 
+  background-color: rgba(0, 0, 0, 0.5);
 
+  width: 100%;
 
+  height: 100%;
 
+  top: 0;
 
+  left: 0;
 
+}
 
+.tip-box {
 
+  position: absolute;
 
+  /* top: 35%;
 
+  left: 32.5%; */
 
+   /* width: 35%;
 
+  height: 30%; */
 
+  width: 1000px;
 
+  height: 700px;
 
+  top: calc(50% - 350px);
 
+  left: calc(50% - 500px);
 
+  background: url('../images/sex-bg.png') no-repeat center;
 
+  background-color: #133B65;
 
+  background-size: 100% 100%;
 
+ 
+  padding: 60px;
 
+}
 
+.tip-box > div {
 
+  font-size: 42px;
 
+  line-height: 70px;
 
 }