소스 검색

解决冲突

unknown 1 년 전
부모
커밋
c2ad628f24
6개의 변경된 파일181개의 추가작업 그리고 182개의 파일을 삭제
  1. 1 0
      manpower/index.html
  2. 63 114
      manpower/index2.html
  3. 54 0
      manpower/js/data2.js
  4. 47 48
      manpower/js/index.js
  5. 0 20
      manpower/js/index2.js
  6. 16 0
      manpower/js/li.js

+ 1 - 0
manpower/index.html

@@ -18,6 +18,7 @@
     <script src="./js/request.js"></script>
     <script src="./js/data.js"></script>
     <script src="./js/fjx.js"></script>
+    <script src="./js/li.js"></script>
   </head>
   <body>
     <div id="app">

+ 63 - 114
manpower/index2.html

@@ -14,7 +14,9 @@
     <script src="./libs/echarts.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/data2.js"></script>
   </head>
   <body>
     <div id="app">
@@ -55,74 +57,83 @@
             </div>
           </dv-border-box-8>
         </div>
-        <div class="center" style="flex: 1.5;">
-          <div class="top">
+        <div class="center" style="flex: 1.5">
+          <div class="top" v-if="centerData">
             <div class="box">
               <img src="./images/center-top1.png"/>
               <div>
                 <p>架构数</p>
-                <p><i style="color: #45DAD1">25600</i>人</p>
+                <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
               </div>
             </div>
             <div class="box">
               <img src="./images/center-top2.png"/>
               <div>
                 <p>岗位数</p>
-                <p><i style="color: #8BA2FF">15080</i>人</p>
+                <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
               </div>
             </div>
             <div class="box">
               <img src="./images/center-top3.png"/>
               <div>
                 <p>总人数</p>
-                <p><i style="color: #69C0FF">188600</i>人</p>
+                <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
               </div>
             </div>
           </div>
           <dv-border-box-8 :dur="10">
-            <div class="my-panel">
+            <div class="my-panel" v-if="centerData">
               <div class="panel-title">
                 <span class="text">六定改革成效果展示</span>
               </div>
-              <div class="content" style="padding: 10px;">
+              <div class="content flex" style="padding: 10px;">
                 <div class="box-center">
-                  <div>
-                    <p>18.20</p>
-                    <p>改革前总部机构平均数</p>
-                  </div>
-                  <div>
-                    <p>18.20</p>
-                    <p>改革前总部机构平均数</p>
+                  <div class="t">
+                    <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
+                    <p>总部机构压缩率</p>
                   </div>
-                  <div>
-                    <p>188600</p>
-                    <p>改革前总部机构平均数</p>
-                  </div>
-                  <div>
-                    <p>18.20</p>
-                    <p>改革前中层管理人数</p>
+                  <div class="flex">
+                    <div>
+                      <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                      <p>改革前总部机构平均数</p>
+                    </div>
+                    <div>
+                      <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                      <p>改革后总部机构平均数
+                      </p>
+                    </div>
                   </div>
                 </div>
                 <div class="box-center">
-                  <div>
-                    <p>188600</p>
-                    <p>改革前总部机构平均数</p>
+                  <div class="t">
+                    <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
+                    <p>中层管理人数压缩率</p>
                   </div>
-                  <div>
-                    <p>188600</p>
-                    <p>中层管理人数压缩数</p>
-                  </div>
-                  <div>
-                    <p>18.20</p>
-                    <p>当前在岗职工总人数</p>
+                  <div class="flex">
+                    <div>
+                      <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
+                      <p>改革前中层管理人数</p>
+                    </div>
+                    <div>
+                      <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
+                      <p>改革后中层管理人数</p>
+                    </div>
                   </div>
+                </div>
+                <div class="box-center">
                   <div>
-                    <p>180</p>
-                    <p>在册职工压缩</p>
+                     <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
+                    <p>在册职工压缩</p>
                   </div>
-                  <div>
-                    <p>18</p>
-                    <p>在岗职工压缩数</p>
+                  <div class="flex">
+                    <div>
+                       <p>{{numFormat(centerData.changeInfo[2].value2)}}</p>
+                      <p>改革前在册职工数</p>
+                    </div>
+                    <div>
+                      <p>{{centerData.changeInfo[2].value3}}<span>万</span></p>
+                      <p>在册职工压缩数</p>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -131,94 +142,32 @@
           <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>
-                  <dv-scroll-board :config="storageRecordConfig2" class="content" />
-                </div>
-                <div class="flex1">
-                  <p class="s-title main-color">填报情况预警</p>
-                  <dv-scroll-board :config="storageRecordConfig" class="content" />
-                </div>
+              <div class="content flex">
+                <div ref="echartC1" style="flex: 1;height: 100%;"></div>
+                <div ref="echartC2" style="flex: 1;height: 100%;"></div>
               </div>
             </div>
           </dv-border-box-8>
           <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">
-                <ul class="list">
-                  <li class="list-item">
-                    <i>1</i>
-                    <span>山西焦煤</span>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="80" stroke-width="15" color="#FBE139"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>2</i>
-                    <p>晋能控股</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="70" stroke-width="15" color="#45DAD1"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>3</i>
-                      <p>潞安化工</p>
-                      <el-progress class="flex1" style="margin: 0 10px;" percentage="60" stroke-width="15" color="#6682F5"></el-progress>
-                      <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>4</i>
-                    <p>山西建投</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>5</i>
-                    <p>华阳新材</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                </ul>
-                <ul class="list">
-                  <li class="list-item">
-                    <i>6</i>
-                    <span>山西焦煤</span>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="80" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>7</i>
-                    <p>晋能控股</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="70" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>8</i>
-                      <p>潞安化工</p>
-                      <el-progress class="flex1" style="margin: 0 10px;" percentage="60" stroke-width="15" color="#69C0FF"></el-progress>
-                      <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>9</i>
-                    <p>山西建投</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                  <li class="list-item">
-                    <i>10</i>
-                    <p>华阳新材</p>
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
-                    <span><i class="num">12500</i>人</span>
-                  </li>
-                </ul>
+              <div class="content yujing">
+                <div class="flex1">
+                  <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>
+                  <dv-scroll-board :config="storageRecordConfig2" class="content" />
+                </div>
               </div>
             </div>
           </dv-border-box-8>
-          
+         
         </div>
         <div class="right">
           <dv-border-box-8 :dur="10" style="flex: 1">
@@ -254,7 +203,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"><img :src="`./images/logos/logo${index+1}.png`"></img>  {{item.name}}</a>
       </div>
     </div>
     <script src="./js/index2.js"></script>

+ 54 - 0
manpower/js/data2.js

@@ -0,0 +1,54 @@
+const companyList = [
+  { name: '晋能控股电力集团有限公司' },
+  { name: '中国太原煤炭交易中心有限公司' },
+  { name: '晋能控股装备制造集团有限公司' },
+  { name: '晋能控股山西煤业集团有限公司' },
+  { name: '晋能控股山西电力股份有限公司' },
+  { name: '晋控电力山西新能源有限公司' },
+  { name: '晋能控股煤业集团有限公司' }
+]
+const data = {
+  info: {
+    value1: '5808',
+    value2: '444094',
+    value3: '860527',
+  },
+  changeInfo: [
+    {
+      value1: '50.30',
+      value2: '25',
+      value3: '15',
+    },
+    {
+      value1: '31.00',
+      value2: '15695',
+      value3: '10756',
+    },
+    {
+      value1: '11',
+      value2: '950527',
+      value3: '9',
+    },
+  ],
+}
+const dataL1 = [
+  [18, 21, 14, 21, 13, 14, 6, 13, 13, 14, 14, 12, 15, 16, 12, 15, 10, 19],
+  [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],
+]
+const dataL2 = [
+  [16, 8, 12, 10, 11, 1, 0, 8, 8, 0, 7, 0, 5, 10, 0, 0, 0, 6],
+  [11, 10, 6, 10, 12, 0, 0, 5, 0, 5, 7, 0, 4, 0, 0, 0, 0, 10],
+]
+const dataL3 = [
+  [15732, 29724, 4936, 9821, 2116, 763, 218, 1472, 661, 400, 3497, 265, 3066, 1205, 155, 1311, 22, 93],
+  [9.5, 8.43, 9.13, 9.11, 8.96, 8.99, 8.97, 8.99, 9.0, 9.0, 9.1, 8.2, 8.8, 9.1, 8, 8.8, 7.3, 8.8],
+]
+const dataL4 = [
+  [142, 189, 58, 59, 39, 32, 12, 36, 66, 36, 72, 41, 28, 161, 63, 10, 69, 28],
+  [109, 65, 42, 44, 36, 34, 8, 62, 45, 28, 51, 98, 40, 30, 20, 99, 51, 24],
+]
+const dataL5 = [
+  [173826, 352494, 54039, 108985, 23512, 8484, 2430, 16357, 7351, 4452, 38863, 3242, 35183, 13285, 1937, 14733, 302, 1052],
+  [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
+]

+ 47 - 48
manpower/js/index.js

@@ -828,30 +828,27 @@ 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,
+            name: '招聘需求公告次数',
+            type: 'bar',
+            barWidth: 15,
             itemStyle: {
-              //折线拐点标志的样式
-              color: '#B889EA',
-              borderColor: '#B889EA',
-              width: 2,
-              shadowColor: '#B889EA',
-              shadowBlur: 4,
-            },
-            lineStyle: {
-              color: '#B889EA',
-              width: 2,
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#69c0ff',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
             },
-            data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
+            data: dataR1[0],
           },
           {
-            name: '人工成本利润率同比',
+            name: '招聘需求公告累计招聘人次',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -859,7 +856,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#43ede3',
                   },
                   {
                     offset: 1,
@@ -868,12 +865,13 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
+            data: dataR1[1],
           },
+          
         ],
       }
-      option.title.text = '各集团人工成本利润率情况'
-      option.legend.data = ['人工成本利润率同比', '全员劳动生产率']
+      option.title.text = '当前各省属企业招聘需求公示人次'
+      option.legend.data = ['招聘需求公告次数', '招聘需求公告累计招聘人次']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -891,7 +889,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '2023年公开招聘数',
+            name: '2022年录用结果累计公示次数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -899,7 +897,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#45DAD1',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -908,10 +906,10 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
+            data: dataR2[0],
           },
           {
-            name: '2022年退出人数',
+            name: '2022年录用结果公告累计招聘人数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -919,7 +917,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#45DAD1',
                   },
                   {
                     offset: 1,
@@ -928,12 +926,13 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
+            data: dataR2[1],
           },
+          
         ],
       }
-      option.title.text = '当前各省属企业公开招聘数/退出人数对比'
-      option.legend.data = ['2023年公开招聘数', '2022年退出人数']
+      option.title.text = '当前各省属企业录用结果公示人次'
+      option.legend.data = [ '2022年录用结果累计公示次数', '2022年录用结果公告累计招聘人数' ]
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -951,7 +950,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '招聘需求公开次数',
+            name: '2022年利润(万)',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -959,7 +958,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#45DAD1',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -968,10 +967,10 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
+            data: dataR3[0],
           },
           {
-            name: '招聘需求公告需要招聘数',
+            name: '2022年累计招聘数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -979,7 +978,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#45DAD1',
                   },
                   {
                     offset: 1,
@@ -988,12 +987,12 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
+            data: dataR3[1],
           },
         ],
       }
-      option.title.text = '当前各省属企业招聘需求公示人次'
-      option.legend.data = ['招聘需求公开次数', '招聘需求公告需要招聘数']
+      option.title.text = '各省属企业年利润与当前招聘人数'
+      option.legend.data = ['2022年利润(万)', '2022年累计招聘数']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {
@@ -1011,7 +1010,7 @@ let app = new Vue({
         ..._.cloneDeep(this.commonOption),
         series: [
           {
-            name: '录用结果公告次数',
+            name: '2022年退出人数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1019,7 +1018,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#6682F5',
+                    color: '#69c0ff',
                   },
                   {
                     offset: 1,
@@ -1028,10 +1027,10 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [50, 40, 60, 20, 45, 30, 60, 100, 45, 40, 50, 20, 60, 80, 45, 70, 50, 40],
+            data: dataR4[0],
           },
           {
-            name: '录用结果公告总人数',
+            name: '2022年累计招聘人数',
             type: 'bar',
             barWidth: 15,
             itemStyle: {
@@ -1039,7 +1038,7 @@ let app = new Vue({
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#45DAD1',
                   },
                   {
                     offset: 1,
@@ -1048,12 +1047,12 @@ let app = new Vue({
                 ]),
               },
             },
-            data: [60, 50, 80, 80, 90, 55, 40, 60, 50, 80, 90, 55, 40, 60, 50, 90, 55, 40],
+            data: dataR4[1],
           },
         ],
       }
-      option.title.text = '当前各省属企业录用结果公示人次'
-      option.legend.data = ['录用结果公告次数', '录用结果公告总人数']
+      option.title.text = '各省属企业退二进一完成情况'
+      option.legend.data = ['2022年退出人数', '2022年累计招聘人数']
       option.legend.show = true
       option.yAxis.push({
         splitLine: {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 20
manpower/js/index2.js


+ 16 - 0
manpower/js/li.js

@@ -0,0 +1,16 @@
+const dataR1 = [
+  [1, 1, 5, 1, 1, 4, 2, 6, 3, 0, 7, 5, 1, 1, 4, 1, 1, 3],
+  [2000, 0, 1908, 300, 0, 733, 236, 224, 270, 0, 864, 0, 0, 325, 241, 777, 63, 104],
+]
+const dataR2 = [
+  [1, 1, 5, 1, 1, 4, 2, 6, 3, 0, 7, 5, 1, 1, 4, 1, 1, 3],
+  [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],
+  [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]
+]

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.