Explorar el Código

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

zhbyyy hace 1 año
padre
commit
d711fd27c4

BIN
manpower/images/alert.png


BIN
manpower/images/back.png


+ 1 - 1
manpower/index.html

@@ -230,7 +230,7 @@
 
     <div class="tip" @click="showTip = false" v-if="showTip">
       <div class="tip-box">
-        <div>{{tipData[tipNum]}}</div>
+        <div class="tip-content">{{tipData[tipNum]}}</div>
         <!-- <div class="btm20">全员劳动生产率从去年前的人均XX万元提升到XX万元;在岗职工平均工资从去年前的人均XX万元提升到XX万元。</div>
         <div>打破工资“大锅饭”,所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”,省属企业负责人绩效年薪与经营业绩考核结果挂钩后,还要与企业经济效益挂钩。</div> -->
       </div>

+ 4 - 2
manpower/index2.html

@@ -24,7 +24,9 @@
 <body>
   <div id="app">
     <header class="my-header">
-      <span class="left">返回</span>
+      <span class="left" @click="handleGoBack"><img
+        style="width: 70px;height: 70px;"
+        src="./images/back.png"></img> </span>
       <span>晋能控股</span>
       <span class="right">{{time}}</span>
     </header>
@@ -217,7 +219,7 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList" :key="index">{{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList" :key="index" @click="handleGoPage(item.link)">{{item.name}}</a>
     </div>
   </div>
   <script src="./js/index2.js"></script>

+ 4 - 1
manpower/index3.html

@@ -23,6 +23,9 @@
 <body>
   <div id="app">
     <header class="my-header">
+      <span class="left" @click="handleGoBack"><img
+        style="width: 70px;height: 70px;"
+        src="./images/back.png"></img> </span>
       <span>山西煤炭运销集团长治有限公司</span>
       <span class="right">{{time}}</span>
     </header>
@@ -215,7 +218,7 @@
       </div>
     </div>
     <div class="footer" style="width: 70%;">
-      <a class="item" v-for="(item,index) in companyList" :key="index">{{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList" :key="index" @click="handleGoPage(item.link)">{{item.name}}</a>
     </div>
   </div>
   <script src="./js/index3.js"></script>

+ 4 - 1
manpower/index4.html

@@ -23,6 +23,9 @@
 <body>
   <div id="app">
     <header class="my-header">
+      <span class="left" @click="handleGoBack"><img
+        style="width: 70px;height: 70px;"
+        src="./images/back.png"></img> </span>
       <span>山西三元煤业股份有限公司</span>
       <span class="right">{{time}}</span>
     </header>
@@ -215,7 +218,7 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList" :key="index"><img
+      <a class="item" v-for="(item,index) in companyList" :key="index" @click="handleGoPage(item.link)"><img
           :src="`./images/logos/logo${index+1}.png`"></img> {{item.name}}</a>
     </div>
   </div>

+ 1 - 1
manpower/js/data2.js

@@ -1,6 +1,6 @@
 const companyList = [
   { name: '山西煤炭运销集团忻州有限公司' },
-  { name: '山西煤炭运销集团长治有限公司' },
+  { name: '山西煤炭运销集团长治有限公司', link:'./index3.html' },
   { name: '晋能控股电力集团有限公司' },
   { name: '中国太原煤炭交易中心有限公司' },
   { name: '晋能控股装备制造集团有限公司' },

+ 5 - 5
manpower/js/data3.js

@@ -1,7 +1,7 @@
 const companyList = [
   { name: '山西煤炭运销集团三元石窟煤业有限公司' },
   { name: '山西三元福达煤业有限公司' },
-  { name: '山西三元煤业股份有限公司' },
+  { name: '山西三元煤业股份有限公司', link: './index4.html' },
   { name: '长治市聚通能源发展有限公司' },
   { name: '长治三元中能煤业有限公司' },
   { name: '山西马堡煤业有限公司' },
@@ -87,16 +87,16 @@ const dataR4 = [
   [2, 4, 10, 2, 7, 6, 6, 7, 5, 2]
 ]
 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]
+  [34409.3, 22500.0, 15100.0, 27930.8, 19637.2, 16528.1, 26904.4, 35046.6, 22500.0, 4072.1],
+  [32620, 21120.75, 14255.91, 26785, 18356, 15658, 25738, 33585, 21078, 3683]
 ]
 const dataR6 = [
   [359, 141, -26, -8, -23, 90, 20, -68, 1769, -221],
   [-36, 11, 30, 11, 16, 45, 2, 23, -45, -10]
 ]
 const dataR7 = [
-  [100, 100, 100, 100, 100, 100, 100, 100, 100]
+  [100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
 ]
 const dataR8 = [
-  [100, 100, 100, 100, 100, 100, 100, 100, 100]
+  [100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
 ]

+ 1 - 1
manpower/js/fjx.js

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

+ 1 - 1
manpower/js/index.js

@@ -21,7 +21,7 @@ let app = new Vue({
         evenRowBGC: '',
         headerHeight: '40',
         rowNum: 4,
-        align: ['center'],
+        align: ['center','center','center'],
         data: [
           ['<span class="lightOut"><span class="light red"></span></span>', '2022年1月', '山西焦煤', '已经开展高层次人才引进工作'],
           ['<span class="lightOut"><span class="light yellow"></span></span>', '2022年2月', '山西文旅', '不能按期完成序时进度'],

+ 62 - 38
manpower/js/index2.js

@@ -161,6 +161,12 @@ let app = new Vue({
     }
   },
   methods: {
+    handleGoPage(url){
+      window.location.href = url
+    },
+    handleGoBack(){
+      window.history.go(-1)
+    },
     numFormat (value) {
       if (!value) return '0'
       var intPart = Number(value).toFixed(0) // 获取整数部分
@@ -540,7 +546,7 @@ let app = new Vue({
             data: dataL7[0],
           },
           {
-            name: '劳动生产率同比变化',
+            name: '全员劳动生产率同比变化',
             type: 'line',
             barWidth: 15,
             yAxisIndex: 1,
@@ -563,7 +569,7 @@ let app = new Vue({
         ],
       }
       option.title.text = '人数变化和全员劳动生产率变化率分析'
-      option.legend.data = ['人数变化', '劳动生产率同比变化']
+      option.legend.data = ['人数变化', '全员劳动生产率同比变化']
       option.legend.show = true
       option.tooltip = {
         trigger: 'axis',
@@ -812,7 +818,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '人工成本利润同比',
+            name: '人工成本利润同比',
             type: 'line',
             yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
             smooth: true, //平滑曲线显示
@@ -833,6 +839,27 @@ let app = new Vue({
               width: 2,
             },
             data: dataC2[0],
+            
+          },
+          {
+            name: '人工成本利润率',
+            type: 'bar',
+            barWidth: 15,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#69c0ff',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: dataC2[1],
             markLine: {
               data: [
                 {
@@ -865,51 +892,48 @@ let app = new Vue({
               },
             },
           },
-          {
-            name: '人工成本利润率',
-            type: 'bar',
-            barWidth: 15,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#69c0ff',
-                  },
-                  {
-                    offset: 1,
-                    color: '#082550',
-                  },
-                ]),
-              },
-            },
-            data: dataC2[1]
-          },
         ],
       }
       option.title.text = '人工成本利润率'
-      option.legend.data = ['人工成本利润同比', '人工成本利润率']
+      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: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     // 右侧图表---------------------------------------------开始
@@ -1424,7 +1448,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各二级企业任期制考核'
+      option.title.text = '各二级企业任期制契约化完成率'
       option.yAxis.push({
         splitLine: {
           show: false,

+ 161 - 84
manpower/js/index3.js

@@ -161,6 +161,12 @@ let app = new Vue({
     }
   },
   methods: {
+    handleGoPage(url){
+      window.location.href = url
+    },
+    handleGoBack(){
+      window.history.go(-1)
+    },
     numFormat (value) {
       if (!value) return '0'
       var intPart = Number(value).toFixed(0) // 获取整数部分
@@ -539,7 +545,7 @@ let app = new Vue({
             data: dataL7[0],
           },
           {
-            name: '全员劳动生产率',
+            name: '全员劳动生产率同比变化',
             type: 'line',
             barWidth: 15,
             yAxisIndex: 1,
@@ -562,28 +568,46 @@ 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}' + '%'
+        formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
-      option.yAxis.push({
-        type: 'value',
-        axisLine: {
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     initChartL8 () {
@@ -642,24 +666,42 @@ let app = new Vue({
       option.legend.show = true
       option.tooltip = {
         trigger: 'axis',
-        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+        formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
-      option.yAxis.push({
-        type: 'value',
-        axisLine: {
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     // 中间图表---------------------------------------------开始
@@ -776,7 +818,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '人工成本利润同比',
+            name: '人工成本利润同比',
             type: 'line',
             yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
             smooth: true, //平滑曲线显示
@@ -797,6 +839,27 @@ let app = new Vue({
               width: 2,
             },
             data: dataC2[0],
+            
+          },
+          {
+            name: '人工成本利润率',
+            type: 'bar',
+            barWidth: 15,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#69c0ff',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: dataC2[1],
             markLine: {
               data: [
                 {
@@ -829,51 +892,48 @@ let app = new Vue({
               },
             },
           },
-          {
-            name: '人工成本利润率',
-            type: 'bar',
-            barWidth: 15,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#69c0ff',
-                  },
-                  {
-                    offset: 1,
-                    color: '#082550',
-                  },
-                ]),
-              },
-            },
-            data: dataC2[1]
-          },
         ],
       }
       option.title.text = '人工成本利润率'
-      option.legend.data = ['人工成本利润同比', '人工成本利润率']
+      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: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     // 右侧图表---------------------------------------------开始
@@ -1143,7 +1203,7 @@ let app = new Vue({
         },
         axisLabel: {
           show: true,
-          formatter: '{value} %',
+          formatter: '{value}',
           textStyle: {
             color: 'rgba(250,250,250,0.6)',
           },
@@ -1275,21 +1335,38 @@ let app = new Vue({
         trigger: 'axis',
         formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     initChartR7 () {
@@ -1319,7 +1396,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各三级企业任期制考核'
+      option.title.text = '各三级企业全员绩效考核 '
       // option.legend.data = ['劳动合同签约完成率', '目标值']
       option.yAxis.push({
         splitLine: {
@@ -1337,7 +1414,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '任期制考核完成率',
+            name: '任期制契约化完成率',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1358,7 +1435,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各三级企业全员绩效考核'
+      option.title.text = '各三级企业任期制契约化完成率'
       option.yAxis.push({
         splitLine: {
           show: false,

+ 160 - 76
manpower/js/index4.js

@@ -161,6 +161,12 @@ let app = new Vue({
     }
   },
   methods: {
+    handleGoPage(url){
+      window.location.href = url
+    },
+    handleGoBack(){
+      window.history.go(-1)
+    },
     numFormat (value) {
       if (!value) return '0'
       var intPart = Number(value).toFixed(0) // 获取整数部分
@@ -539,7 +545,7 @@ let app = new Vue({
             data: dataL7[0],
           },
           {
-            name: '全员劳动生产率',
+            name: '全员劳动生产率同比变化',
             type: 'line',
             barWidth: 15,
             yAxisIndex: 1,
@@ -562,28 +568,46 @@ 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: {
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     initChartL8 () {
@@ -644,22 +668,40 @@ let app = new Vue({
         trigger: 'axis',
         formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
-      option.yAxis.push({
-        type: 'value',
-        axisLine: {
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          type: 'value',
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     // 中间图表---------------------------------------------开始
@@ -751,7 +793,7 @@ let app = new Vue({
       option.legend.show = true
       option.tooltip = {
         trigger: 'axis',
-        formatter: '{a0}:{c0}' +'<br/>'+ '{a1}:{c1}' + '%'
+        formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
       option.yAxis.push({
         type: 'value',
@@ -777,7 +819,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '人工成本利润同比',
+            name: '人工成本利润同比',
             type: 'line',
             yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
             smooth: true, //平滑曲线显示
@@ -798,6 +840,27 @@ let app = new Vue({
               width: 2,
             },
             data: dataC2[0],
+            
+          },
+          {
+            name: '人工成本利润率',
+            type: 'bar',
+            barWidth: 15,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#69c0ff',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: dataC2[1],
             markLine: {
               data: [
                 {
@@ -830,44 +893,48 @@ let app = new Vue({
               },
             },
           },
-          {
-            name: '人工成本利润率',
-            type: 'bar',
-            barWidth: 15,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#69c0ff',
-                  },
-                  {
-                    offset: 1,
-                    color: '#082550',
-                  },
-                ]),
-              },
-            },
-            data: dataC2[1]
-          },
         ],
       }
       option.title.text = '人工成本利润率'
-      option.legend.data = ['人工成本利润同比', '人工成本利润率']
+      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: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
+      option.yAxis = [
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
         },
-      })
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     // 右侧图表---------------------------------------------开始
@@ -1276,21 +1343,38 @@ let app = new Vue({
         trigger: 'axis',
         formatter: '{a0}:{c0}' + '%' +'<br/>'+ '{a1}:{c1}' + '%'
       }
-      option.yAxis.push({
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          show: true,
-          formatter: '{value} %',
-          textStyle: {
-            color: 'rgba(250,250,250,0.6)',
+      option.yAxis = [
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
           },
         },
-      })
+        {
+          splitLine: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true,
+            formatter: '{value} %',
+            textStyle: {
+              color: 'rgba(250,250,250,0.6)',
+            },
+          },
+        }
+      ]
       myChart.setOption(option)
     },
     initChartR7 () {
@@ -1320,7 +1404,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各四级企业任期制考核'
+      option.title.text = '各四级企业全员绩效考核'
       // option.legend.data = ['劳动合同签约完成率', '目标值']
       option.yAxis.push({
         splitLine: {
@@ -1338,7 +1422,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '任期制考核完成率',
+            name: '任期制契约化完成率',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1359,7 +1443,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各四级企业全员绩效考核'
+      option.title.text = '各四级企业任期制契约化完成率'
       option.yAxis.push({
         splitLine: {
           show: false,

+ 26 - 9
manpower/styles/index.css

@@ -101,8 +101,9 @@ a {
 .my-header span.left {
   position: absolute;
   left: 100px;
-  top: 0px;
+  top: 40px;
   font-size: 30px;
+  cursor: pointer;
 }
 .my-header span.right {
   position: absolute;
@@ -350,15 +351,14 @@ a {
   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;
+  width: 1200px;
+  height: 850px;
+  top: calc(50% - 375px);
+  left: calc(50% - 600px);
+  background: url('../images/alert.png') no-repeat center;
+  /* background-color: #133B65; */
   background-size: 100% 100%;
-
-  padding: 60px;
+  padding: 100px 60px 50px;
 }
 .tip-box > div {
   font-size: 42px;
@@ -387,3 +387,20 @@ a {
   align-items: center;
   justify-content: center;
 }
+.tip-content {
+  height: 95%;
+  overflow: auto;
+  padding-right: 15px;
+  margin-top: 2%;
+}
+div::-webkit-scrollbar {
+  width: 4px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: rgba(64, 169, 255, 0.6);
+}
+div::-webkit-scrollbar-track {
+  border-radius: 0;
+  background: rgba(64, 169, 255, 0.3);
+}