修改首页展示

manpower/index.html

@@ -47,12 +47,16 @@
         </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(0)">智能分析</span>
             </div>
             <div class="content flex">
               <div ref="echartL3" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+              <div style="flex: 1;height: 100%; position: relative;">
+                <div ref="echartL4" style="height: 100%; width: 100%;"></div>
+                <div class="icon" @click="handleShowTip(0)">?</div>
+              </div>
             </div>
           </div>
         </dv-border-box-8>
@@ -160,7 +164,10 @@
               <span class="tip-window" @click="handleShowTip(2)">智能分析</span>
             </div>
             <div class="content flex">
-              <div ref="echartC1" style="flex: 1;height: 100%;"></div>
+              <div style="flex: 1;height: 100%; position: relative;">
+                <div ref="echartC1" style="flex: 1;height: 100%;"></div>
+                <div class="icon" @click="handleShowTip(0)">?</div>
+              </div>
               <div ref="echartC2" style="flex: 1;height: 100%;"></div>
             </div>
           </div>
@@ -187,8 +194,9 @@
       <div class="right">
         <dv-border-box-8 :dur="10" 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(0)">智能分析</span>
             </div>
             <div class="content flex flex-wrap">
               <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
@@ -212,8 +220,9 @@
         </dv-border-box-8>
         <dv-border-box-8 :dur="12" 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="echartR7" style="flex: 1;height: 100%;"></div>

manpower/js/data.js

@@ -70,7 +70,7 @@ const dataL6 = [
 ]
 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, 2896, 24.0, 15.0, -33.0, 10.0, -38.0, 12.0, 43.0, -7.0, 6.0, 56.0, 121.0],
+  [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 = [
   [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],

manpower/js/index.js

@@ -630,9 +630,10 @@ let app = new Vue({
       option.legend.data = ['各省属企业总人数', '去年同期人数变化率']
       option.legend.show = true
       option.yAxis[0] = {
-        type: 'log',
+        type: 'value',
+        // type: 'log',
         min: 1,
-        logBase: 10,
+        // logBase: 10,
         axisLine: {
           show: false,
         },
@@ -1365,6 +1366,7 @@ let app = new Vue({
             name: '2022年累计招聘数',
             type: 'bar',
             barWidth: 15,
+            yAxisIndex: 1,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -1386,10 +1388,24 @@ let app = new Vue({
       option.title.text = '各省属企业年利润与当年累计招聘人数'
       option.legend.data = ['2022年利润(万）', '2022年累计招聘数']
       option.legend.show = true
+      option.yAxis[0].max = 
+      option.yAxis[0].min = 
       option.yAxis[0] = {
-        type: 'log',
-        min: 1,
-        logBase: 10,
+        max: function (value) {
+          if (Math.abs(value.max) > Math.abs(value.min)) {
+            return (Math.abs(value.max) * 1.2).toFixed(2);
+          } else {
+            return (Math.abs(value.min) * 1.2).toFixed(2);
+          }
+        },
+        min: function (value) {
+          if (Math.abs(value.max) > Math.abs(value.min)) {
+            return (-Math.abs(value.max) * 1.2).toFixed(2);
+          } else {
+            return (-Math.abs(value.min) * 1.2).toFixed(2);
+          }
+        },
+        type: 'value',
         axisLine: {
           show: false,
         },
@@ -1410,6 +1426,36 @@ let app = new Vue({
           },
         },
       }
+      option.yAxis.push({
+        splitLine: {
+          show: false,
+        },
+        axisLine: {
+          show: false,
+        },
+        axisLabel: {
+          show: true,
+          formatter: '{value}',
+          textStyle: {
+            color: 'rgba(250,250,250,0.6)',
+          },
+        },
+        max: function (value) {
+          if (Math.abs(value.max) > Math.abs(value.min)) {
+            return (Math.abs(value.max) * 1.2).toFixed(2);
+          } else {
+            return (Math.abs(value.min) * 1.2).toFixed(2);
+          }
+        },
+        min: function (value) {
+          if (Math.abs(value.max) > Math.abs(value.min)) {
+            return (-Math.abs(value.max) * 1.2).toFixed(2);
+          } else {
+            return (-Math.abs(value.min) * 1.2).toFixed(2);
+          }
+        }
+
+      })
       myChart.setOption(option)
     },
     initChartR4 () {
@@ -1613,7 +1659,7 @@ let app = new Vue({
           },
         ],
       }
-      option.title.text = '各省属企业月利润与月薪酬变动情况'
+      option.title.text = '各省属企业利润与薪酬变动情况'
       option.legend.data = ['2022年利润累计涨幅率', '2022年薪酬累计涨幅率']
       option.tooltip.formatter = '{a0}：{c0}' + '%' + '<br/>' + '{a1}：{c1}' + '%'
       option.yAxis[0].axisLabel.formatter = '{value} %'

manpower/js/li.js

@@ -7,10 +7,10 @@ const dataR2 = [
   [0, 2290, 1884, 0, 34, 339, 0, 231, 93, 0, 511, 0, 9, 12, 85, 508, 61, 82],
 ]
 const dataR3 = [
-  [8205410, 14715548, 2568135, 5445393, 886982, 261380, 13345, 384646, 217328, 102553, 886750, 51326, 1357108, 1504393, 99042, 313161, 693, 6361],
+  [3006606.00, 3262765.00, 751436.00, 1020038.00, 110320.00, 30198.00, -4547.00, 77807.00, 23356.00, -31785.00, 125604.00, -30488.00, 432926.00, 1032546.00, 51752.00, 73106.00, -10784.00, 672.00],
   [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]
-]
+]

manpower/js/zhb.js

@@ -1,6 +1,6 @@
 let c1 = [
   [55.05, 46.82, 52.82, 61.2, 38.48, 30.64, 117.48, 27.09, 28.7, 14.27, 25.92, 12.6, 44.66, 138.83, 56.38, 26.42, 21.58, 17.18],
-  [34, 17, 23, 26, 2, 7, 2896, 24, 15, -33, 10, -38, 12, 43, -7, 6, 56, 121],
+  [34, 17, 23, 26, 2, 7, null, 24, 15, -33, 10, -38, 12, 43, -7, 6, 56, 121],
   50.13,
   69.4
 ]

manpower/styles/index.css

@@ -406,3 +406,19 @@ div::-webkit-scrollbar-track {
   border-radius: 0;
   background: rgba(64, 169, 255, 0.3);
 }
+.icon {
+  width: 35px;
+  height: 35px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: bold;
+  position: absolute;
+  top: 8px;
+  left: 400px;
+  background-color: rgba(64, 169, 255, 0.12);
+  border: 2px solid #40a9ff;
+  cursor: pointer;
+  border-radius: 50%;
+  font-size: 24px;
+}