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

manpower/index2.html

@@ -217,8 +217,7 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList" :key="index"><img
-          :src="`./images/logos/logo${index+1}.png`"></img> {{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList" :key="index">{{item.name}}</a>
     </div>
   </div>
   <script src="./js/index2.js"></script>

manpower/index3.html

@@ -215,8 +215,7 @@
       </div>
     </div>
     <div class="footer" style="width: 70%;">
-      <a class="item" v-for="(item,index) in companyList" :key="index"><img
-          :src="`./images/logos/logo${index+1}.png`"></img> {{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList" :key="index">{{item.name}}</a>
     </div>
   </div>
   <script src="./js/index3.js"></script>

manpower/js/index3.js

@@ -447,6 +447,10 @@ let app = new Vue({
       option.title.text = '各三级企业总人数'
       option.legend.data = ['各三级企业总人数', '去年同期人数变化率']
       option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.yAxis.push({
         type: 'value',
         axisLine: {
@@ -454,7 +458,14 @@ let app = new Vue({
         },
         splitLine: {
           show: false,
-        }
+        },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -553,6 +564,10 @@ let app = new Vue({
       option.title.text = '人数变化和全员劳动生产率变化率分析'
       option.legend.data = ['人数变化', '全员劳动生产率']
       option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.yAxis.push({
         type: 'value',
         axisLine: {
@@ -625,6 +640,10 @@ let app = new Vue({
       option.title.text = '人数变化和人工利润率变化分析'
       option.legend.data = ['人数变化', '人工成本利润率']
       option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.yAxis.push({
         type: 'value',
         axisLine: {
@@ -651,7 +670,7 @@ let app = new Vue({
 
         series: [
           {
-            name: '全员劳动生产率',
+            name: '全员劳动生产率（万/人）',
             type: 'bar',
             barWidth: 12,
             smooth: true, //平滑曲线显示
@@ -671,7 +690,6 @@ 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: dataC1[0],
             markLine: {
               data: [
@@ -728,8 +746,12 @@ let app = new Vue({
         ],
       }
       option.title.text = '全员劳动生产率'
-      option.legend.data = ['全员劳动生产率同比', '全员劳动生产率']
+      option.legend.data = ['全员劳动生产率同比', '全员劳动生产率（万/人）']
       option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.yAxis.push({
         type: 'value',
         axisLine: {
@@ -832,6 +854,10 @@ let app = new Vue({
       option.title.text = '人工成本利润率'
       option.legend.data = ['人工成本利润同比', '人工成本利润率']
       option.legend.show = true
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.grid.right = '15%'
       option.yAxis.push({
         splitLine: {
@@ -840,6 +866,13 @@ let app = new Vue({
         axisLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -937,6 +970,7 @@ let app = new Vue({
           {
             name: '录用结果公示累计公示人数',
             type: 'bar',
+            yAxisIndex: 1,
             barWidth: 15,
             itemStyle: {
               normal: {
@@ -960,12 +994,20 @@ let app = new Vue({
       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)
     },
@@ -998,6 +1040,7 @@ let app = new Vue({
           },
           {
             name: '2022年累计招聘数',
+            yAxisIndex: 1,
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1028,6 +1071,13 @@ let app = new Vue({
         axisLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+            fontSize: 16,
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -1062,6 +1112,7 @@ let app = new Vue({
             name: '2022年累计招聘人数',
             type: 'bar',
             barWidth: 15,
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1090,6 +1141,13 @@ let app = new Vue({
         axisLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -1122,6 +1180,7 @@ let app = new Vue({
             name: '在岗职工平均薪酬',
             type: 'bar',
             barWidth: 15,
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1150,6 +1209,13 @@ let app = new Vue({
         axisLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value}',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },
@@ -1184,6 +1250,7 @@ let app = new Vue({
             name: '2022年薪酬累计涨幅率',
             type: 'line',
             barWidth: 15,
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1204,6 +1271,10 @@ let app = new Vue({
       }
       option.title.text = '各三级企业月利润与月薪酬变动情况'
       option.legend.data = ['2022年利润累计涨幅率', '2022年薪酬累计涨幅率']
+      option.tooltip = {
+        trigger: 'axis',
+        formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
+      }
       option.yAxis.push({
         splitLine: {
           show: false,
@@ -1211,6 +1282,13 @@ let app = new Vue({
         axisLine: {
           show: false,
         },
+        axisLabel: {
+          show: true,
+          formatter: '{value} %',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
       })
       myChart.setOption(option)
     },