修改写死页面样式

manpower/index.html

@@ -135,16 +135,16 @@
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
                   <p>总部机构压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'beforeReform')">改革前总部机构平均数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
                     <p>改革后总部机构平均数
                     </p>
@@ -168,32 +168,32 @@
                 </div>
               </div> -->
               <div class="box-center">
-                <div>
+                <div class="alignCenter">
                   <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
                   <p>在册职工压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter"> 
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reformRegistered')">改革前在册职工数</p>
-                  </div>
-                  <div>
+                  </div >
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span>万</span></p>
                     <p>在册职工压缩数</p>
                   </div>
                 </div>
               </div>
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
                   <p>在岗职工薪酬增长率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}<span>万元</span></p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reforAveRemuneration')">改革前在岗职工平均薪酬</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}<span>万元</span></p>
                     <p>改革后在岗职工平均薪酬</p>
                   </div>
@@ -324,20 +324,13 @@
     </div>
     <!--标题弹窗 -->
     <div class="tip" v-if="titleShow">
-      <div class="tip-box">
-        <div class="tip-content">
-          <div class="btm10" v-for="(item,index) in titleData" :key="index"> {{item}}</div>
+      <div class="tip-box-img">
+        <div class="tip-content-img">
+          <!-- <div class="btm10" v-for="(item,index) in titleData" :key="index"> {{item}}</div> -->
+          <img src="./images/1.png" alt="" style="width:100%;height:100%;">
         </div>
       </div>
     </div>
-    <!-- 定薪酬加粗弹窗 -->
-    <!-- <div class="tip" v-if="paymentShow">
-      <div class="tip-box">
-        <div class="tip-content">
-          <div class="btm10">{{tipData.focus[5][0]}}<span style="font-weight: bold;">{{tipData.focus[5][1]}}</span></div>
-        </div>
-      </div>
-    </div> -->
   </div>
 
 

manpower/index2.html

@@ -98,9 +98,9 @@
         </div> -->
         <div class="top" v-if="centerData">
           <div class="box">
-            <div>
+            <!-- <div>
               <span class="tip-window2" @click.stop="handleShowTip(0,'topThree')">创新的建设模式</span>
-            </div>
+            </div> -->
             <div class="box-content">
               <img src="./images/center-top1.png" />
               <div>
@@ -112,9 +112,9 @@
           </div>
 
           <div class="box">
-            <div>
+            <!-- <div>
               <span class="tip-window2" @click.stop="handleShowTip(1,'topThree')">穿透的全局监测</span>
-            </div>
+            </div> -->
 
             <div class="box-content">
               <img src="./images/center-top2.png" />
@@ -126,9 +126,9 @@
 
           </div>
           <div class="box">
-            <div>
+            <!-- <div>
               <span class="tip-window2" @click.stop="handleShowTip(2,'topThree')">领先的数智平台</span>
-            </div>
+            </div> -->
             <div class="box-content">
               <img src="./images/center-top3.png" style=" cursor: pointer;"
                 @click.stop="handleShowTip(0,'totlePeople')" />
@@ -146,16 +146,16 @@
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
                   <p>总部机构压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
                     <p>改革后总部机构平均数
                     </p>
@@ -168,27 +168,27 @@
                   <p>中层管理人数压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
                     <p>改革前中层管理人数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
                     <p>改革后中层管理人数</p>
                   </div>
                 </div>
               </div>
               <div class="box-center">
-                <div>
+                <div class="alignCenter">
                   <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
                   <p>在册职工压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p>改革前在册职工数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[2].value3)}}<span></span></p>
                     <p>在册职工压缩数</p>
                   </div>

manpower/index3.html

@@ -72,7 +72,7 @@
         </dv-border-box-8>
       </div>
       <div class="center">
-        <div class="top" v-if="centerData">
+        <!-- <div class="top" v-if="centerData">
           <div class="box">
             <img src="./images/center-top1.png" />
             <div>
@@ -94,6 +94,49 @@
               <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
             </div>
           </div>
+        </div> -->
+        <div class="top" v-if="centerData">
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(0,'topThree')">创新的建设模式</span>
+            </div> -->
+            <div class="box-content">
+              <img src="./images/center-top1.png" />
+              <div>
+                <p>架构数</p>
+                <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(1,'topThree')">穿透的全局监测</span>
+            </div> -->
+
+            <div class="box-content">
+              <img src="./images/center-top2.png" />
+              <div>
+                <p>岗位数</p>
+                <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(2,'topThree')">领先的数智平台</span>
+            </div> -->
+            <div class="box-content">
+              <img src="./images/center-top3.png" style=" cursor: pointer;"
+                @click.stop="handleShowTip(0,'totlePeople')" />
+              <div>
+                <p>总人数</p>
+                <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
+              </div>
+            </div>
+          </div>
         </div>
         <dv-border-box-8 :dur="10">
           <div class="my-panel" v-if="centerData">
@@ -102,16 +145,16 @@
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
                   <p>总部机构压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
                     <p>改革后总部机构平均数
                     </p>
@@ -124,28 +167,28 @@
                   <p>中层管理人数压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
                     <p>改革前中层管理人数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
                     <p>改革后中层管理人数</p>
                   </div>
                 </div>
               </div>
               <div class="box-center">
-                <div>
+                <div class="alignCenter">
                   <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
                   <p>在册职工压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p>改革前在册职工数</p>
                   </div>
-                  <div>
-                    <p style="color:#17AC76"> {{numFormat(centerData.changeInfo[2].value3)}}<span></span></p>
+                  <div class="alignCenter">
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[2].value3)}}<span></span></p>
                     <p>在册职工压缩数</p>
                   </div>
                 </div>

manpower/index4.html

@@ -75,7 +75,7 @@
         </dv-border-box-8>
       </div>
       <div class="center">
-        <div class="top" v-if="centerData">
+        <!-- <div class="top" v-if="centerData">
           <div class="box">
             <img src="./images/center-top1.png" />
             <div>
@@ -97,6 +97,49 @@
               <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
             </div>
           </div>
+        </div> -->
+        <div class="top" v-if="centerData">
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(0,'topThree')">创新的建设模式</span>
+            </div> -->
+            <div class="box-content">
+              <img src="./images/center-top1.png" />
+              <div>
+                <p>架构数</p>
+                <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(1,'topThree')">穿透的全局监测</span>
+            </div> -->
+
+            <div class="box-content">
+              <img src="./images/center-top2.png" />
+              <div>
+                <p>岗位数</p>
+                <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+          <div class="box">
+            <!-- <div>
+              <span class="tip-window2" @click.stop="handleShowTip(2,'topThree')">领先的数智平台</span>
+            </div> -->
+            <div class="box-content">
+              <img src="./images/center-top3.png" style=" cursor: pointer;"
+                @click.stop="handleShowTip(0,'totlePeople')" />
+              <div>
+                <p>总人数</p>
+                <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
+              </div>
+            </div>
+          </div>
         </div>
         <dv-border-box-8 :dur="10">
           <div class="my-panel" v-if="centerData">
@@ -105,16 +148,16 @@
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
                   <p>总部机构压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
                     <p>改革后总部机构平均数
                     </p>
@@ -127,27 +170,27 @@
                   <p>中层管理人数压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
                     <p>改革前中层管理人数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
                     <p>改革后中层管理人数</p>
                   </div>
                 </div>
               </div>
               <div class="box-center">
-                <div>
+                <div class="alignCenter">
                   <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
                   <p>在册职工压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p>改革前在册职工数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[2].value3)}}<span></span></p>
                     <p>在册职工压缩数</p>
                   </div>

manpower/indexWriteBack.html

@@ -0,0 +1,347 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <!-- 引入样式 -->
+  <link rel="stylesheet" href="./styles/element-ui@2.15.9.css" />
+  <link rel="stylesheet" href="./styles/normalize.css" />
+  <link rel="stylesheet" href="./styles/index.css" />
+  <!-- 引入js -->
+  <script src="./libs/vue@2.7.10.js"></script>
+  <!-- <script src="https://unpkg.com/@jiaminghi/data-view/dist/datav.min.vue.js"></script> -->
+  <script src="./libs/echarts.min.js"></script>
+  <script src="./libs/datav.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/data.js"></script>
+  <script src="./js/zhb.js"></script>
+  <script src="./js/li.js"></script>
+  <script src="./js/fjx.js"></script>
+  <script src="./libs/echarts-tooltip-carousel.js"></script>
+</head>
+
+<body>
+  <div id="app" v-cloak @click="showTipClose">
+    <header class="my-header">
+      <span @click.stop="handleTitleShow()" style="cursor: pointer;">国有资本数智化平台人力资源系统</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 flex-between ">
+              <span class="text">定机构</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(0,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(0,'analysis')">智能分析</span>
+              </div>
+            </div>
+            <div class="content flex">
+              <div ref="echartL1" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL2" style="flex: 1;height: 100%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="11" style="flex: 1;">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">定职数</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(1,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(1,'analysis')">智能分析</span>
+              </div>
+            </div>
+            <div class="content flex">
+              <div ref="echartL3" 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.stop="handleShowTip2(0)">?</div>
+              </div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="12" style="flex: 2;">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">定员额</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(2,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(2,'analysis')">智能分析</span>
+              </div>
+            </div>
+            <div class="content flex flex-wrap">
+              <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL6" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL7" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL8" style="flex: 0 0 49.9%;height: 50%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+      </div>
+      <div class="center">
+        <div class="top" v-if="centerData">
+          <div class="box">
+            <div>
+              <span class="tip-window2" @click.stop="handleShowTip(0,'topThree')">创新的建设模式</span>
+            </div>
+            <div class="box-content">
+              <img src="./images/center-top1.png" />
+              <div>
+                <p>架构数</p>
+                <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+
+          <div class="box">
+            <div>
+              <span class="tip-window2" @click.stop="handleShowTip(1,'topThree')">穿透的全局监测</span>
+            </div>
+
+            <div class="box-content">
+              <img src="./images/center-top2.png" />
+              <div>
+                <p>岗位数</p>
+                <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
+              </div>
+            </div>
+
+          </div>
+          <div class="box">
+            <div>
+              <span class="tip-window2" @click.stop="handleShowTip(2,'topThree')">领先的数智平台</span>
+            </div>
+            <div class="box-content">
+              <img src="./images/center-top3.png" style=" cursor: pointer;"
+                @click.stop="handleShowTip(0,'totlePeople')" />
+              <div>
+                <p>总人数</p>
+                <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <dv-border-box-8 :dur="10">
+          <div class="my-panel" v-if="centerData">
+            <div class="panel-title">
+              <span class="text">六定改革成效</span>
+            </div>
+            <div class="content flex" style="padding: 10px;">
+              <div class="box-center">
+                <div class="t">
+                  <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
+                  <p>总部机构压缩率</p>
+                </div>
+                <div class="flex">
+                  <div>
+                    <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                    <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'beforeReform')">改革前总部机构平均数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                    <p>改革后总部机构平均数
+                    </p>
+                  </div>
+                </div>
+              </div>
+              <!-- <div class="box-center">
+                <div class="t">
+                  <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
+                  <p>中层管理人数压缩率</p>
+                </div>
+                <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>{{centerData.changeInfo[2].value1}}<span>%</span></p>
+                  <p>在册职工压缩率</p>
+                </div>
+                <div class="flex">
+                  <div>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
+                    <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reformRegistered')">改革前在册职工数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span>万</span></p>
+                    <p>在册职工压缩数</p>
+                  </div>
+                </div>
+              </div>
+              <div class="box-center">
+                <div class="t">
+                  <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
+                  <p>在岗职工薪酬增长率</p>
+                </div>
+                <div class="flex">
+                  <div>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}<span>万元</span></p>
+                    <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reforAveRemuneration')">改革前在岗职工平均薪酬</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}<span>万元</span></p>
+                    <p>改革后在岗职工平均薪酬</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="10">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">核心指标监测</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(3,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(3,'analysis')">智能分析</span>
+              </div>
+
+
+            </div>
+            <div class="content flex">
+              <div style="flex: 1;height: 100%; position: relative;">
+                <div ref="echartC1" style="flex: 1;height: 100%;"></div>
+                <div class="icon" @click.stop="handleShowTip2(1)">?</div>
+              </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>
+            </div>
+            <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: 2">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">定机制</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(4,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(4,'analysis')">智能分析</span>
+              </div>
+
+            </div>
+            <div class="content flex flex-wrap">
+              <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR2" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR3" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR4" style="flex: 0 0 49.9%;height: 50%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="11" style="flex: 1">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">定薪酬</span>
+              <div>
+                <!-- <span class="tip-window" @click.stop="handlepaymentShow">改革成效</span> -->
+                <span class="tip-window" @click.stop="handleShowTip(5,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(5,'analysis')">智能分析</span>
+              </div>
+
+            </div>
+            <div class="content flex">
+              <div ref="echartR5" style="flex: 1;height: 100%;"></div>
+              <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="12" style="flex: 1">
+          <div class="my-panel">
+            <div class="panel-title flex-between">
+              <span class="text">定任期</span>
+              <div>
+                <span class="tip-window" @click.stop="handleShowTip(6,'focus')">改革成效</span>
+                <span class="tip-window" @click.stop="handleShowTip(6,'analysis')">智能分析</span>
+              </div>
+            </div>
+            <div class="content flex">
+              <div ref="echartR7" style="flex: 1;height: 100%;"></div>
+              <div ref="echartR8" style="flex: 1;height: 100%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+      </div>
+    </div>
+    <div class="footer">
+      <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 class="tip" @click="showTip = false" v-if="showTip && tipNum != 3">
+      <div class="tip-box">
+        <div class="tip-content">
+          <div class="btm10" v-for="(item,index) in tipData[tipNum]" :key="index"> {{item}}</div>
+        </div>
+      </div>
+    </div>
+    <!-- 问号弹窗 -->
+    <div class="tip" @click="showTip2 = false" v-if="showTip2">
+      <div class="tip-box" style="left:calc( 50% + 1300px )">
+        <div class="tip-content">
+          <div class="btm10" v-for="(item,index) in tipData2[tipNum]" :key="index"> {{item}}</div>
+        </div>
+      </div>
+    </div>
+    <!-- 核心指标监测专属 -->
+    <div class="tip" @click="showTip = false" v-if="showTip && tipNum == 3">
+      <div class="tip-box" style="left:calc( 50% + 1300px )">
+        <div class="tip-content">
+          <div class="btm10" v-for="(item,index) in tipData[tipNum]" :key="index"> {{item}}</div>
+        </div>
+      </div>
+    </div>
+    <!--标题弹窗 -->
+    <div class="tip" v-if="titleShow">
+      <div class="tip-box">
+        <div class="tip-content">
+          <div class="btm10" v-for="(item,index) in titleData" :key="index"> {{item}}</div>
+        </div>
+      </div>
+    </div>
+    <!-- 定薪酬加粗弹窗 -->
+    <!-- <div class="tip" v-if="paymentShow">
+      <div class="tip-box">
+        <div class="tip-content">
+          <div class="btm10">{{tipData.focus[5][0]}}<span style="font-weight: bold;">{{tipData.focus[5][1]}}</span></div>
+        </div>
+      </div>
+    </div> -->
+  </div>
+
+
+  <script src="./js/index.js"></script>
+</body>
+
+</html>

manpower/js/index.js

@@ -262,16 +262,8 @@ let app = new Vue({
       this.titleShow = true
       this.showTip = false
       this.showTip2 = false
-      // this.paymentShow = false
     },
-    // handlepaymentShow () {
-    //   this.paymentShow = true
-    //   this.titleShow = false
-    //   this.showTip = false
-    //   this.showTip2 = false
-    // },
     showTipClose () {
-      // this.paymentShow = false
       this.showTip = false
       this.showTip2 = false
       this.titleShow = false

manpower/styles/index.css

@@ -394,15 +394,35 @@ a {
   left: 32.5%; */
   /* width: 35%;
   height: 30%; */
-  width: 1800px;
+  /* width: 1800px;
   height: 1200px;
   top: calc(50% - 600px);
-  left: calc(50% - 900px);
+  left: calc(50% - 900px); */
+  width: 2080px;
+  height: 1300px;
+  top: calc(50% - 660px);
+  left: calc(50% - 1080px);
   background: url('../images/alert.png') no-repeat center;
   background-color: #133b65;
   background-size: 100% 100%;
   padding: 100px 60px 50px;
 }
+.tip-box-img {
+  position: absolute;
+  /* top: 35%;
+  left: 32.5%; */
+  /* width: 35%;
+  height: 30%; */
+  width: 2080px;
+  height: 1300px;
+  top: calc(50% - 660px);
+  left: calc(50% - 1080px);
+  background: url('../images/alert.png') no-repeat center;
+  background-color: #133b65;
+  background-size: 100% 100%;
+  /* padding: 100px 60px 50px; */
+  padding: 160px 50px 0px 50px ;
+}
 .tip-box > div {
   font-size: 42px;
   line-height: 70px;
@@ -434,7 +454,35 @@ a {
   height: 95%;
   overflow: auto;
   padding-right: 15px;
-  margin-top: 2%;
+  margin-top: 3%;
+}
+.tip-content-img {
+  height: 95%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.alignCenter{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.tip-box-img {
+  position: absolute;
+  /* top: 35%;
+  left: 32.5%; */
+  /* width: 35%;
+  height: 30%; */
+  width: 2080px;
+  height: 1300px;
+  top: calc(50% - 660px);
+  left: calc(50% - 1080px);
+  background: url('../images/alert.png') no-repeat center;
+  background-color: #133b65;
+  background-size: 100% 100%;
+  /* padding: 100px 60px 50px; */
+  padding: 160px 50px 0px 50px ;
 }
 div::-webkit-scrollbar {
   width: 4px;

manpowerPort/js/index.js

@@ -153,7 +153,7 @@ let app = new Vue({
         },
         xAxis: {
           // data: companyList.map(item => item.name),
-          data: '',
+          data: '123123',
           axisLine: {
             show: false, //隐藏X轴轴线
             lineStyle: {
@@ -291,7 +291,8 @@ let app = new Vue({
       post('/ierp/api/login.do', value).then(res => {
         this.access_token = res.data.access_token
         Promise.all([this.getData(), this.getInstitutional()])
-          .then((arr) => {                    // 生成图表
+          .then((arr) => {
+            // 生成图表       
             this.generateEcharts()
           })
           .catch((err) => console.log(err));
@@ -299,19 +300,22 @@ let app = new Vue({
     },
     // 获取组织机构
     getInstitutional () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "ORG",
-          "orgNumber": "100000"
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "ORG",
+            "orgNumber": "100000"
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        this.companyList = res.data.map(item => {
-          return { name: item.orgName, id: item.orgNumber }
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          this.companyList = res.data.map(item => {
+            return { name: item.orgName, id: item.orgNumber }
+          })
+          this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          resolve(1);
         })
-        this.commonOption.xAxis.data = this.companyList.map(item => item.name)
-      })
+      });
     },
     generateEcharts () {
       this.initChartL1()
@@ -336,196 +340,199 @@ let app = new Vue({
       this.initChartR8()
     },
     getData () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "DATA",
-          "orgNumber": "100000"
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "DATA",
+            "orgNumber": "100000"
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        res.orgData = res.data[0]
-        console.log(res.orgData, '????????')
-        // 定机构
-        // 弹窗
-        // return
-        // 左侧图表
-        tipData.focus[0] = res.orgData.area1.keyPoint
-        tipData.analysis[0] = res.orgData.area1.intAnalysis
-        //各省属企业总部机构数
-        dataL1[1] = []
-        dataL1[0] = []
-        dataL1[2] = []
-        res.orgData.area1.card1.forEach(item => {
-          dataL1[1].push(item['ZBPZ0032'])
-          dataL1[0].push(item['ZBPZ0042'])
-          dataL1[2].push(item['ZBPZ0043'])
-        })
-        // 各省属企业共享服务中心/事业部数
-        dataL2[0] = []
-        dataL2[1] = []
-        res.orgData.area1.card2.forEach(item => {
-          dataL1[1].push(item['ZBPZ0045'])
-          dataL1[0].push(item['ZBPZ0024'])
-        })
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          res.orgData = res.data[0]
+          // 定机构
+          // 弹窗
+          // return
+          // 左侧图表
+          tipData.focus[0] = res.orgData.area1.keyPoint
+          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          //各省属企业总部机构数
+          dataL1[1] = []
+          dataL1[0] = []
+          dataL1[2] = []
+          res.orgData.area1.card1.forEach(item => {
+            dataL1[1].push(item['ZBPZ0032'])
+            dataL1[0].push(item['ZBPZ0042'])
+            dataL1[2].push(item['ZBPZ0043'])
+          })
+          // 各省属企业共享服务中心/事业部数
+          dataL2[0] = []
+          dataL2[1] = []
+          res.orgData.area1.card2.forEach(item => {
+            dataL2[1].push(item['ZBPZ0045'])
+            dataL2[0].push(item['ZBPZ0024'])
+          })
 
-        // 定职数
-        // 弹窗
-        tipData.focus[1] = res.orgData.area2.keyPoint
-        tipData.analysis[1] = res.orgData.area2.intAnalysis
-        // 各省属企业管理人员数
-        dataL3[0] = []
-        dataL3[1] = []
-        res.orgData.area2.card1.forEach(item => {
-          dataL3[0].push(item['ZBPZ0031'])
-          dataL3[1].push(item['ZBPZ0049'])
-        })
-        // 各省属企业总部中层管理人数
-        dataL4[1] = []
-        dataL4[0] = []
-        dataL4[2] = []
-        res.orgData.area2.card2.forEach(item => {
-          dataL4[1].push(item['ZBPZ0046'])
-          dataL4[0].push(item['ZBPZ0047'])
-          dataL4[2].push(item['ZBPZ0048'])
-        })
+          // 定职数
+          // 弹窗
+          tipData.focus[1] = res.orgData.area2.keyPoint
+          tipData.analysis[1] = res.orgData.area2.intAnalysis
+          // 各省属企业管理人员数
+          dataL3[0] = []
+          dataL3[1] = []
+          res.orgData.area2.card1.forEach(item => {
+            dataL3[0].push(item['ZBPZ0031'])
+            dataL3[1].push(item['ZBPZ0049'])
+          })
+          // 各省属企业总部中层管理人数
+          dataL4[1] = []
+          dataL4[0] = []
+          dataL4[2] = []
+          res.orgData.area2.card2.forEach(item => {
+            dataL4[1].push(item['ZBPZ0046'])
+            dataL4[0].push(item['ZBPZ0047'])
+            dataL4[2].push(item['ZBPZ0048'])
+          })
 
-        // 定员额
-        // 弹窗
-        tipData.focus[2] = res.orgData.area3.keyPoint
-        tipData.analysis[2] = res.orgData.area3.intAnalysis
-        // 各省属企业总人数
-        dataL5[0] = []
-        dataL5[1] = []
-        res.orgData.area3.card1.forEach(item => {
-          dataL5[0].push(item['ZBPZ0006'])
-          dataL5[1].push(item['ZBPZ0050'])
-        })
-        // 各省属企业总部员额数
-        dataL6[0] = []
-        dataL6[1] = []
-        res.orgData.area3.card2.forEach(item => {
-          dataL6[0].push(item['ZBPZ0033'])
-          dataL6[1].push(item['ZBPZ0053'])
-        })
-        // 人数变化和全员劳动生产率变化分析
-        dataL7[0] = []
-        dataL7[1] = []
-        res.orgData.area3.card2.forEach(item => {
-          dataL7[0].push(item['ZBPZ0050'])
-          dataL7[1].push(item['ZBPZ0039'])
-        })
-        // 人数变化和人工成本利润率变化分析
-        dataL8[0] = []
-        dataL8[1] = []
-        res.orgData.area3.card4.forEach(item => {
-          dataL8[0].push(item['ZBPZ0050'])
-          dataL8[1].push(item['ZBPZ0041'])
-        })
+          // 定员额
+          // 弹窗
+          tipData.focus[2] = res.orgData.area3.keyPoint
+          tipData.analysis[2] = res.orgData.area3.intAnalysis
+          // 各省属企业总人数
+          dataL5[0] = []
+          dataL5[1] = []
+          res.orgData.area3.card1.forEach(item => {
+            dataL5[0].push(item['ZBPZ0006'])
+            dataL5[1].push(item['ZBPZ0050'])
+          })
+          // 各省属企业总部员额数
+          dataL6[0] = []
+          dataL6[1] = []
+          res.orgData.area3.card2.forEach(item => {
+            dataL6[0].push(item['ZBPZ0033'])
+            dataL6[1].push(item['ZBPZ0053'])
+          })
+          // 人数变化和全员劳动生产率变化分析
+          dataL7[0] = []
+          dataL7[1] = []
+          res.orgData.area3.card3.forEach(item => {
+            dataL7[0].push(item['ZBPZ0050'])
+            dataL7[1].push(item['ZBPZ0039'])
+          })
+          // 人数变化和人工成本利润率变化分析
+          dataL8[0] = []
+          dataL8[1] = []
+          res.orgData.area3.card4.forEach(item => {
+            dataL8[0].push(item['ZBPZ0050'])
+            dataL8[1].push(item['ZBPZ0041'])
+          })
 
-        // 中间
-        // 架岗人
-        this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
-        this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
-        this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
-        // 六定改革成效
-        this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
-        this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
-        this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
-        this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
-        this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
-        this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
-        this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
-        this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
-        this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
+          // 中间
+          // 架岗人
+          this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
+          this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
+          this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
+          // 六定改革成效
+          this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
+          this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
+          this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
+          this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
+          this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
+          this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
+          this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
+          this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
+          this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
 
-        // 核心指标监测
-        // 弹窗
-        tipData.focus[3] = res.orgData.area9.keyPoint
-        tipData.analysis[3] = res.orgData.area9.intAnalysis
-        // 各省属企业全员劳动生产率
-        c1[0] = []
-        c1[1] = []
-        res.orgData.area9.card1.forEach(item => {
-          c1[0].push(item['ZBPZ0035'])
-          c1[1].push(item['ZBPZ0039'])
-        })
-        // 各省属企业人工成本利润率
-        c2[1] = []
-        c2[0] = []
-        res.orgData.area9.card2.forEach(item => {
-          c2[1].push(item['ZBPZ0040'])
-          c2[0].push(item['ZBPZ0041'])
-        })
+          // 核心指标监测
+          // 弹窗
+          tipData.focus[3] = res.orgData.area9.keyPoint
+          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // 各省属企业全员劳动生产率
+          c1[0] = []
+          c1[1] = []
+          res.orgData.area9.card1.forEach(item => {
+            c1[0].push(item['ZBPZ0035'])
+            c1[1].push(item['ZBPZ0039'])
+          })
+          console.log(c1,'核心指标检测')
+          // 各省属企业人工成本利润率
+          c2[1] = []
+          c2[0] = []
+          res.orgData.area9.card2.forEach(item => {
+            c2[1].push(item['ZBPZ0040'])
+            c2[0].push(item['ZBPZ0041'])
+          })
 
-        // 左边
-        // 定机制
-        // 弹窗
-        tipData.focus[4] = res.orgData.area4.keyPoint
-        tipData.analysis[4] = res.orgData.area4.intAnalysis
-        // 各省属企业招聘需求公示人次
-        dataR1[0] = []
-        dataR1[1] = []
-        res.orgData.area4.card1.forEach(item => {
-          dataR1[0].push(item['ZBPZ0057'])
-          dataR1[1].push(item['ZBPZ0058'])
-        })
-        // 各省属企业录用结果公示人次
-        dataR2[0] = []
-        dataR2[1] = []
-        res.orgData.area4.card2.forEach(item => {
-          dataR2[0].push(item['ZBPZ0059'])
-          dataR2[1].push(item['ZBPZ0060'])
-        })
-        // 各省属企业年利润与当年累计招聘人数
-        dataR3[0] = []
-        dataR3[1] = []
-        res.orgData.area4.card3.forEach(item => {
-          dataR3[0].push(item['ZBPZ0054'])
-          dataR3[0].push(item['ZBPZ0055'])
-        })
-        // 各省属企业"退二进一"完成情况
-        dataR4[0] = []
-        dataR4[1] = []
-        res.orgData.area4.card4.forEach(item => {
-          dataR3[0].push(item['ZBPZ0056'])
-          dataR3[0].push(item['ZBPZ0055'])
-        })
+          // 左边
+          // 定机制
+          // 弹窗
+          tipData.focus[4] = res.orgData.area4.keyPoint
+          tipData.analysis[4] = res.orgData.area4.intAnalysis
+          // 各省属企业招聘需求公示人次
+          dataR1[0] = []
+          dataR1[1] = []
+          res.orgData.area4.card1.forEach(item => {
+            dataR1[0].push(item['ZBPZ0057'])
+            dataR1[1].push(item['ZBPZ0058'])
+          })
+          // 各省属企业录用结果公示人次
+          dataR2[0] = []
+          dataR2[1] = []
+          res.orgData.area4.card2.forEach(item => {
+            dataR2[0].push(item['ZBPZ0059'])
+            dataR2[1].push(item['ZBPZ0060'])
+          })
+          // 各省属企业年利润与当年累计招聘人数
+          dataR3[0] = []
+          dataR3[1] = []
+          res.orgData.area4.card3.forEach(item => {
+            dataR3[0].push(item['ZBPZ0054'])
+            dataR3[0].push(item['ZBPZ0055'])
+          })
+          // 各省属企业"退二进一"完成情况
+          dataR4[0] = []
+          dataR4[1] = []
+          res.orgData.area4.card4.forEach(item => {
+            dataR4[0].push(item['ZBPZ0056'])
+            dataR4[0].push(item['ZBPZ0055'])
+          })
 
-        // 定薪酬
-        // 弹窗
-        tipData.focus[5] = res.orgData.area5.keyPoint
-        tipData.analysis[5] = res.orgData.area5.intAnalysis
-        // 各省属企业在岗职工平均薪酬
-        fjxdataL1[0] = []
-        fjxdataL1[1] = []
-        res.orgData.area5.card1.forEach(item => {
-          fjxdataL1[0].push(item['ZBPZ0063'])
-          fjxdataL1[1].push(item['ZBPZ0064'])
-        })
-        // 各省属企业利润与薪酬变动情况
-        fjxdataL2[0] = []
-        fjxdataL2[1] = []
-        res.orgData.area5.card2.forEach(item => {
-          fjxdataL1[0].push(item['ZBPZ0061'])
-          fjxdataL1[1].push(item['ZBPZ0062'])
-        })
+          // 定薪酬
+          // 弹窗
+          tipData.focus[5] = res.orgData.area5.keyPoint
+          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // 各省属企业在岗职工平均薪酬
+          fjxdataL1[0] = []
+          fjxdataL1[1] = []
+          res.orgData.area5.card1.forEach(item => {
+            fjxdataL1[0].push(item['ZBPZ0063'])
+            fjxdataL1[1].push(item['ZBPZ0064'])
+          })
+          // 各省属企业利润与薪酬变动情况
+          fjxdataL2[0] = []
+          fjxdataL2[1] = []
+          res.orgData.area5.card2.forEach(item => {
+            fjxdataL2[0].push(item['ZBPZ0061'])
+            fjxdataL2[1].push(item['ZBPZ0062'])
+          })
 
-        // 定任期
-        // 弹窗
-        tipData.focus[5] = res.orgData.area6.keyPoint
-        tipData.analysis[5] = res.orgData.area6.intAnalysis
-        // 各省属企业全员绩效考核
-        fjxdataL3[0] = []
-        res.orgData.area6.card1.forEach(item => {
-          fjxdataL3[0].push(item['ZBPZ0066'])
-        })
-        // 各省属企业全员绩效考核
-        fjxdataL4[0] = []
-        res.orgData.area6.card2.forEach(item => {
-          fjxdataL4[0].push(item['ZBPZ0065'])
+          // 定任期
+          // 弹窗
+          tipData.focus[5] = res.orgData.area6.keyPoint
+          tipData.analysis[5] = res.orgData.area6.intAnalysis
+          // 各省属企业全员绩效考核
+          fjxdataL3[0] = []
+          res.orgData.area6.card1.forEach(item => {
+            fjxdataL3[0].push(item['ZBPZ0066'])
+          })
+          // 各省属企业全员绩效考核
+          fjxdataL4[0] = []
+          res.orgData.area6.card2.forEach(item => {
+            fjxdataL4[0].push(item['ZBPZ0065'])
+          })
+          resolve(1)
         })
-      })
+      });
     },
     handleTitleShow () {
       this.titleShow = true
@@ -572,8 +579,8 @@ let app = new Vue({
       this.titleShow = false
       this.tipNum = index
     },
-    handleGoPage (id,name) {
-      window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}` 
+    handleGoPage (id, name) {
+      window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
     },
     numFormat (value) {
       if (!value) return '0'

manpowerPort/js/index2.js

@@ -4,7 +4,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      titleName:'',
+      titleName: '',
       access_token: '',
       orgNumber: '', // 上级的id
       twinkle7: [],
@@ -225,177 +225,180 @@ let app = new Vue({
       this.initChartR8()
     },
     getData () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "DATA",
-          "orgNumber": this.orgNumber
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "DATA",
+            "orgNumber": this.orgNumber
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        console.log(res,'二级页面数据')
-        // res.orgData = res.data[0]
-        // 定机构
-        // 弹窗
-        // return
-        // 左侧图表
-        tipData.analysis[0] = res.orgData.area1.intAnalysis
-        //各二级企业本部机构数
-        dataL1[0] = []
-        res.orgData.area1.card1.forEach(item => {
-          dataL1[1].push(item['ZBPZ0010'])
-        })
-        // 各二级企业所属架构数
-        dataL2[0] = []
-        res.orgData.area1.card2.forEach(item => {
-          dataL2[0].push(item['ZBPZ0024'])
-        })
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          res.orgData = res.data[0]
+          console.log(res.orgData,'??????')
+          // 定机构
+          // 弹窗
+          // return
+          // 左侧图表
+          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          //各二级企业本部机构数
+          dataL1[0] = []
+          res.orgData.area1.card1.forEach(item => {
+            dataL1[0].push(item['ZBPZ0010'])
+          })
+          // 各二级企业所属架构数
+          dataL2[0] = []
+          res.orgData.area1.card2.forEach(item => {
+            dataL2[0].push(item['ZBPZ0024'])
+          })
 
-        // 定职数
-        // 弹窗
-        // 左侧图表
-        tipData.analysis[2] = res.orgData.area2.intAnalysis
-        //各二级企业本部中层管理人数
-        dataL3[0] = []
-        res.orgData.area2.card1.forEach(item => {
-          dataL3[0].push(item['ZBPZ0091'])
-        })
-        // 各二级企业管理人员数
-        dataL4[0] = []
-        dataL4[1] = []
-        res.orgData.area2.card2.forEach(item => {
-          dataL4[0].push(item['ZBPZ0031'])
-          dataL4[1].push(item['ZBPZ0049'])
-        })
+          // 定职数
+          // 弹窗
+          // 左侧图表
+          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          //各二级企业本部中层管理人数
+          dataL3[0] = []
+          res.orgData.area2.card1.forEach(item => {
+            dataL3[0].push(item['ZBPZ0091'])
+          })
+          // 各二级企业管理人员数
+          dataL4[0] = []
+          dataL4[1] = []
+          res.orgData.area2.card2.forEach(item => {
+            dataL4[0].push(item['ZBPZ0031'])
+            dataL4[1].push(item['ZBPZ0049'])
+          })
 
-        // 定员额
-        // 弹窗
-        tipData.analysis[1] = res.orgData.area3.intAnalysis
-        // 各二级企业总人数
-        dataL5[0] = []
-        dataL5[1] = []
-        res.orgData.area3.card1.forEach(item => {
-          dataL5[0].push(item['ZBPZ0006'])
-          dataL5[1].push(item['ZBPZ0050'])
-        })
-        // 各二级企业本部员额数
-        dataL6[0] = []
-        res.orgData.area3.card2.forEach(item => {
-          dataL6[0].push(item['ZBPZ0031'])
-        })
-        // 人数变化和全员劳动生产率变化率分析
-        dataL7[0] = []
-        dataL7[1] = []
-        res.orgData.area3.card3.forEach(item => {
-          dataL7[0].push(item['ZBPZ0050'])
-          dataL7[1].push(item['ZBPZ0039'])
-        })
-        // 人数变化和人工利润率变化分析
-        dataL8[0] = []
-        dataL8[1] = []
-        res.orgData.area3.card4.forEach(item => {
-          dataL8[0].push(item['ZBPZ0050'])
-          dataL8[1].push(item['ZBPZ0041'])
-        })
+          // 定员额
+          // 弹窗
+          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // 各二级企业总人数
+          dataL5[0] = []
+          dataL5[1] = []
+          res.orgData.area3.card1.forEach(item => {
+            dataL5[0].push(item['ZBPZ0006'])
+            dataL5[1].push(item['ZBPZ0050'])
+          })
+          // 各二级企业本部员额数
+          dataL6[0] = []
+          res.orgData.area3.card2.forEach(item => {
+            dataL6[0].push(item['ZBPZ0031'])
+          })
+          // 人数变化和全员劳动生产率变化率分析
+          dataL7[0] = []
+          dataL7[1] = []
+          res.orgData.area3.card3.forEach(item => {
+            dataL7[0].push(item['ZBPZ0050'])
+            dataL7[1].push(item['ZBPZ0039'])
+          })
+          // 人数变化和人工利润率变化分析
+          dataL8[0] = []
+          dataL8[1] = []
+          res.orgData.area3.card4.forEach(item => {
+            dataL8[0].push(item['ZBPZ0050'])
+            dataL8[1].push(item['ZBPZ0041'])
+          })
 
-        // 定机制
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area4.intAnalysis
-        // 各二级企业招聘需求公告人次情况
-        dataR1[0] = []
-        dataR1[1] = []
-        res.orgData.area4.card1.forEach(item => {
-          dataR1[0].push(item['ZBPZ0057'])
-          dataR1[1].push(item['ZBPZ0058'])
-        })
-        // 各二级企业录用结果公示人次
-        dataR2[0] = []
-        dataR2[1] = []
-        res.orgData.area4.card2.forEach(item => {
-          dataR2[0].push(item['ZBPZ0059'])
-          dataR2[1].push(item['ZBPZ0060'])
-        })
-        // 各二级企业年利润与招聘情况分析
-        dataR3[0] = []
-        dataR3[1] = []
-        res.orgData.area4.card3.forEach(item => {
-          dataR3[0].push(item['ZBPZ0054'])
-          dataR3[1].push(item['ZBPZ0055'])
-        })
-        // 各二级企业"退二进一"完成情况
-        dataR4[0] = []
-        dataR4[1] = []
-        res.orgData.area4.card4.forEach(item => {
-          dataR4[0].push(item['ZBPZ0056'])
-          dataR4[1].push(item['ZBPZ0055'])
-        })
+          // 定机制
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // 各二级企业招聘需求公告人次情况
+          dataR1[0] = []
+          dataR1[1] = []
+          res.orgData.area4.card1.forEach(item => {
+            dataR1[0].push(item['ZBPZ0057'])
+            dataR1[1].push(item['ZBPZ0058'])
+          })
+          // 各二级企业录用结果公示人次
+          dataR2[0] = []
+          dataR2[1] = []
+          res.orgData.area4.card2.forEach(item => {
+            dataR2[0].push(item['ZBPZ0059'])
+            dataR2[1].push(item['ZBPZ0060'])
+          })
+          // 各二级企业年利润与招聘情况分析
+          dataR3[0] = []
+          dataR3[1] = []
+          res.orgData.area4.card3.forEach(item => {
+            dataR3[0].push(item['ZBPZ0054'])
+            dataR3[1].push(item['ZBPZ0055'])
+          })
+          // 各二级企业"退二进一"完成情况
+          dataR4[0] = []
+          dataR4[1] = []
+          res.orgData.area4.card4.forEach(item => {
+            dataR4[0].push(item['ZBPZ0056'])
+            dataR4[1].push(item['ZBPZ0055'])
+          })
 
-        // 定薪酬
-        // 弹窗
-        tipData.analysis[5] = res.orgData.area5.intAnalysis
-        // 各二级企业在岗职工平均薪酬
-        dataR5[0] = []
-        dataR5[1] = []
-        res.orgData.area5.card1.forEach(item => {
-          dataR5[0].push(item['ZBPZ0063'])
-          dataR5[1].push(item['ZBPZ0064'])
-        })
-        // 各二级企业利润与薪酬变动情况
-        dataR6[0] = []
-        dataR6[1] = []
-        res.orgData.area5.card2.forEach(item => {
-          dataR6[0].push(item['ZBPZ0061'])
-          dataR6[1].push(item['ZBPZ0062'])
-        })
+          // 定薪酬
+          // 弹窗
+          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // 各二级企业在岗职工平均薪酬
+          dataR5[0] = []
+          dataR5[1] = []
+          res.orgData.area5.card1.forEach(item => {
+            dataR5[0].push(item['ZBPZ0063'])
+            dataR5[1].push(item['ZBPZ0064'])
+          })
+          // 各二级企业利润与薪酬变动情况
+          dataR6[0] = []
+          dataR6[1] = []
+          res.orgData.area5.card2.forEach(item => {
+            dataR6[0].push(item['ZBPZ0061'])
+            dataR6[1].push(item['ZBPZ0062'])
+          })
 
-        // 定任期
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area6.intAnalysis
-        // 各二级企业全员绩效考核
-        dataR7[0] = []
-        res.orgData.area6.card1.forEach(item => {
-          dataR7[0].push(item['ZBPZ0024'])
-        })
-        // 各二级企业任期制契约化完成率
-        dataR8[0] = []
-        res.orgData.area6.card2.forEach(item => {
-          dataR8[0].push(item['ZBPZ0065'])
-        })
+          // 定任期
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // 各二级企业全员绩效考核
+          dataR7[0] = []
+          res.orgData.area6.card1.forEach(item => {
+            dataR7[0].push(item['ZBPZ0024'])
+          })
+          // 各二级企业任期制契约化完成率
+          dataR8[0] = []
+          res.orgData.area6.card2.forEach(item => {
+            dataR8[0].push(item['ZBPZ0065'])
+          })
 
-        // 中间
-        // 架岗人员
-        this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
-        this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
-        this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
+          // 中间
+          // 架岗人员
+          this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
+          this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
+          this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
 
-        // 六定改革成效
-        this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
-        this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
-        this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
-        this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
-        this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
-        this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
-        this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
-        this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
-        this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
-        // 核心指标监测
-        // 弹窗
-        tipData.analysis[3] = res.orgData.area9.intAnalysis
-        // 各二级企业全员劳动生产率
-        dataC1[0] = []
-        dataC1[1] = []
-        res.orgData.area9.card1.forEach(item => {
-          dataC1[0].push(item['ZBPZ0035'])
-          dataC1[1].push(item['ZBPZ0039'])
-        })
-        // 各二级企业人工成本利润率
-        dataC2[1] = []
-        dataC2[0] = []
-        res.orgData.area9.card2.forEach(item => {
-          dataC2[1].push(item['ZBPZ0040'])
-          dataC2[0].push(item['ZBPZ0041'])
+          // 六定改革成效
+          this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
+          this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
+          this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
+          this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
+          this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
+          this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
+          this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
+          this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
+          this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
+          // 核心指标监测
+          // 弹窗
+          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // 各二级企业全员劳动生产率
+          dataC1[0] = []
+          dataC1[1] = []
+          res.orgData.area9.card1.forEach(item => {
+            dataC1[0].push(item['ZBPZ0035'])
+            dataC1[1].push(item['ZBPZ0039'])
+          })
+          // 各二级企业人工成本利润率
+          dataC2[1] = []
+          dataC2[0] = []
+          res.orgData.area9.card2.forEach(item => {
+            dataC2[1].push(item['ZBPZ0040'])
+            dataC2[0].push(item['ZBPZ0041'])
+          })
+          resolve(1)
         })
-      })
+      });
     },
     // 获取地址栏参数
     getUrlParams (id) {
@@ -422,27 +425,30 @@ let app = new Vue({
     },
     // 获取组织机构
     getInstitutional () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "ORG",
-          // "orgNumber": this.orgNumber
-          "orgNumber": '1494979736584079360'
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "ORG",
+            // "orgNumber": this.orgNumber
+            "orgNumber": '1494979736584079360'
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        this.companyList = res.data.map(item => {
-          return { name: item.orgName, id: item.orgNumber }
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          this.companyList = res.data.map(item => {
+            return { name: item.orgName, id: item.orgNumber }
+          })
+          this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          resolve(1);
         })
-        this.commonOption.xAxis.data = this.companyList.map(item => item.name)
-      })
+      });
     },
     handleShowTip (index) {
       this.showTip = true
       this.tipNum = index
     },
-    handleGoPage (id,name) {
-      window.location.href = './index3.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}` 
+    handleGoPage (id, name) {
+      window.location.href = './index3.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
     },
     handleGoBack () {
       window.history.go(-1)

manpowerPort/js/index3.js

@@ -227,193 +227,199 @@ let app = new Vue({
     },
     // 获取组织机构
     getInstitutional () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "ORG",
-          // "orgNumber": this.orgNumber
-          "orgNumber": '1494979736584079360'
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "ORG",
+            // "orgNumber": this.orgNumber
+            "orgNumber": '1494979736584079360'
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        this.companyList = res.data.map(item => {
-          return { name: item.orgName, id: item.orgNumber }
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          this.companyList = res.data.map(item => {
+            return { name: item.orgName, id: item.orgNumber }
+          })
+          this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          resolve(1);
         })
-        this.commonOption.xAxis.data = this.companyList.map(item => item.name)
-      })
+      });
     },
     getData () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "DATA",
-          "orgNumber": this.orgNumber
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "DATA",
+            "orgNumber": this.orgNumber
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        // res.orgData = res.data[0]
-        console.log(res.orgData, '二级页面数据')
-        // 定机构
-        // 弹窗
-        // return
-        // 左侧图表
-        tipData.analysis[0] = res.orgData.area1.intAnalysis
-        //各二级企业本部机构数
-        dataL1[0] = []
-        res.orgData.area1.card1.forEach(item => {
-          dataL1[1].push(item['ZBPZ0010'])
-        })
-        // 各二级企业所属架构数
-        dataL2[0] = []
-        res.orgData.area1.card2.forEach(item => {
-          dataL2[0].push(item['ZBPZ0024'])
-        })
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          console.log(res, '二级页面数据')
+          // res.orgData = res.data[0]
+          // 定机构
+          // 弹窗
+          // return
+          // 左侧图表
+          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          //各二级企业本部机构数
+          dataL1[0] = []
+          res.orgData.area1.card1.forEach(item => {
+            dataL1[0].push(item['ZBPZ0010'])
+          })
+          // 各二级企业所属架构数
+          dataL2[0] = []
+          res.orgData.area1.card2.forEach(item => {
+            dataL2[0].push(item['ZBPZ0024'])
+          })
 
-        // 定职数
-        // 弹窗
-        // 左侧图表
-        tipData.analysis[2] = res.orgData.area2.intAnalysis
-        //各二级企业本部中层管理人数
-        dataL3[0] = []
-        res.orgData.area2.card1.forEach(item => {
-          dataL3[0].push(item['ZBPZ0091'])
-        })
-        // 各二级企业管理人员数
-        dataL4[0] = []
-        dataL4[1] = []
-        res.orgData.area2.card2.forEach(item => {
-          dataL4[0].push(item['ZBPZ0031'])
-          dataL4[1].push(item['ZBPZ0049'])
-        })
+          // 定职数
+          // 弹窗
+          // 左侧图表
+          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          //各二级企业本部中层管理人数
+          dataL3[0] = []
+          res.orgData.area2.card1.forEach(item => {
+            dataL3[0].push(item['ZBPZ0091'])
+          })
+          // 各二级企业管理人员数
+          dataL4[0] = []
+          dataL4[1] = []
+          res.orgData.area2.card2.forEach(item => {
+            dataL4[0].push(item['ZBPZ0031'])
+            dataL4[1].push(item['ZBPZ0049'])
+          })
 
-        // 定员额
-        // 弹窗
-        tipData.analysis[1] = res.orgData.area3.intAnalysis
-        // 各二级企业总人数
-        dataL5[0] = []
-        dataL5[1] = []
-        res.orgData.area3.card1.forEach(item => {
-          dataL5[0].push(item['ZBPZ0006'])
-          dataL5[1].push(item['ZBPZ0050'])
-        })
-        // 各二级企业本部员额数
-        dataL6[0] = []
-        res.orgData.area3.card2.forEach(item => {
-          dataL6[0].push(item['ZBPZ0031'])
-        })
-        // 人数变化和全员劳动生产率变化率分析
-        dataL7[0] = []
-        dataL7[1] = []
-        res.orgData.area3.card3.forEach(item => {
-          dataL7[0].push(item['ZBPZ0050'])
-          dataL7[1].push(item['ZBPZ0039'])
-        })
-        // 人数变化和人工利润率变化分析
-        dataL8[0] = []
-        dataL8[1] = []
-        res.orgData.area3.card4.forEach(item => {
-          dataL8[0].push(item['ZBPZ0050'])
-          dataL8[1].push(item['ZBPZ0041'])
-        })
+          // 定员额
+          // 弹窗
+          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // 各二级企业总人数
+          dataL5[0] = []
+          dataL5[1] = []
+          res.orgData.area3.card1.forEach(item => {
+            dataL5[0].push(item['ZBPZ0006'])
+            dataL5[1].push(item['ZBPZ0050'])
+          })
+          // 各二级企业本部员额数
+          dataL6[0] = []
+          res.orgData.area3.card2.forEach(item => {
+            dataL6[0].push(item['ZBPZ0031'])
+          })
+          // 人数变化和全员劳动生产率变化率分析
+          dataL7[0] = []
+          dataL7[1] = []
+          res.orgData.area3.card3.forEach(item => {
+            dataL7[0].push(item['ZBPZ0050'])
+            dataL7[1].push(item['ZBPZ0039'])
+          })
+          // 人数变化和人工利润率变化分析
+          dataL8[0] = []
+          dataL8[1] = []
+          res.orgData.area3.card4.forEach(item => {
+            dataL8[0].push(item['ZBPZ0050'])
+            dataL8[1].push(item['ZBPZ0041'])
+          })
 
-        // 定机制
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area4.intAnalysis
-        // 各二级企业招聘需求公告人次情况
-        dataR1[0] = []
-        dataR1[1] = []
-        res.orgData.area4.card1.forEach(item => {
-          dataR1[0].push(item['ZBPZ0057'])
-          dataR1[1].push(item['ZBPZ0058'])
-        })
-        // 各二级企业录用结果公示人次
-        dataR2[0] = []
-        dataR2[1] = []
-        res.orgData.area4.card2.forEach(item => {
-          dataR2[0].push(item['ZBPZ0059'])
-          dataR2[1].push(item['ZBPZ0060'])
-        })
-        // 各二级企业年利润与招聘情况分析
-        dataR3[0] = []
-        dataR3[1] = []
-        res.orgData.area4.card3.forEach(item => {
-          dataR3[0].push(item['ZBPZ0054'])
-          dataR3[1].push(item['ZBPZ0055'])
-        })
-        // 各二级企业"退二进一"完成情况
-        dataR4[0] = []
-        dataR4[1] = []
-        res.orgData.area4.card4.forEach(item => {
-          dataR4[0].push(item['ZBPZ0056'])
-          dataR4[1].push(item['ZBPZ0055'])
-        })
+          // 定机制
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // 各二级企业招聘需求公告人次情况
+          dataR1[0] = []
+          dataR1[1] = []
+          res.orgData.area4.card1.forEach(item => {
+            dataR1[0].push(item['ZBPZ0057'])
+            dataR1[1].push(item['ZBPZ0058'])
+          })
+          // 各二级企业录用结果公示人次
+          dataR2[0] = []
+          dataR2[1] = []
+          res.orgData.area4.card2.forEach(item => {
+            dataR2[0].push(item['ZBPZ0059'])
+            dataR2[1].push(item['ZBPZ0060'])
+          })
+          // 各二级企业年利润与招聘情况分析
+          dataR3[0] = []
+          dataR3[1] = []
+          res.orgData.area4.card3.forEach(item => {
+            dataR3[0].push(item['ZBPZ0054'])
+            dataR3[1].push(item['ZBPZ0055'])
+          })
+          // 各二级企业"退二进一"完成情况
+          dataR4[0] = []
+          dataR4[1] = []
+          res.orgData.area4.card4.forEach(item => {
+            dataR4[0].push(item['ZBPZ0056'])
+            dataR4[1].push(item['ZBPZ0055'])
+          })
 
-        // 定薪酬
-        // 弹窗
-        tipData.analysis[5] = res.orgData.area5.intAnalysis
-        // 各二级企业在岗职工平均薪酬
-        dataR5[0] = []
-        dataR5[1] = []
-        res.orgData.area5.card1.forEach(item => {
-          dataR5[0].push(item['ZBPZ0063'])
-          dataR5[1].push(item['ZBPZ0064'])
-        })
-        // 各二级企业利润与薪酬变动情况
-        dataR6[0] = []
-        dataR6[1] = []
-        res.orgData.area5.card2.forEach(item => {
-          dataR6[0].push(item['ZBPZ0061'])
-          dataR6[1].push(item['ZBPZ0062'])
-        })
+          // 定薪酬
+          // 弹窗
+          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // 各二级企业在岗职工平均薪酬
+          dataR5[0] = []
+          dataR5[1] = []
+          res.orgData.area5.card1.forEach(item => {
+            dataR5[0].push(item['ZBPZ0063'])
+            dataR5[1].push(item['ZBPZ0064'])
+          })
+          // 各二级企业利润与薪酬变动情况
+          dataR6[0] = []
+          dataR6[1] = []
+          res.orgData.area5.card2.forEach(item => {
+            dataR6[0].push(item['ZBPZ0061'])
+            dataR6[1].push(item['ZBPZ0062'])
+          })
 
-        // 定任期
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area6.intAnalysis
-        // 各二级企业全员绩效考核
-        dataR7[0] = []
-        res.orgData.area6.card1.forEach(item => {
-          dataR7[0].push(item['ZBPZ0024'])
-        })
-        // 各二级企业任期制契约化完成率
-        dataR8[0] = []
-        res.orgData.area6.card2.forEach(item => {
-          dataR8[0].push(item['ZBPZ0065'])
-        })
+          // 定任期
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // 各二级企业全员绩效考核
+          dataR7[0] = []
+          res.orgData.area6.card1.forEach(item => {
+            dataR7[0].push(item['ZBPZ0024'])
+          })
+          // 各二级企业任期制契约化完成率
+          dataR8[0] = []
+          res.orgData.area6.card2.forEach(item => {
+            dataR8[0].push(item['ZBPZ0065'])
+          })
 
-        // 中间
-        // 架岗人员
-        this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
-        this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
-        this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
+          // 中间
+          // 架岗人员
+          this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
+          this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
+          this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
 
-        // 六定改革成效
-        this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
-        this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
-        this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
-        this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
-        this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
-        this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
-        this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
-        this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
-        this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
-        // 核心指标监测
-        // 弹窗
-        tipData.analysis[3] = res.orgData.area9.intAnalysis
-        // 各二级企业全员劳动生产率
-        dataC1[0] = []
-        dataC1[1] = []
-        res.orgData.area9.card1.forEach(item => {
-          dataC1[0].push(item['ZBPZ0035'])
-          dataC1[1].push(item['ZBPZ0039'])
+          // 六定改革成效
+          this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
+          this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
+          this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
+          this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
+          this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
+          this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
+          this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
+          this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
+          this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
+          // 核心指标监测
+          // 弹窗
+          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // 各二级企业全员劳动生产率
+          dataC1[0] = []
+          dataC1[1] = []
+          res.orgData.area9.card1.forEach(item => {
+            dataC1[0].push(item['ZBPZ0035'])
+            dataC1[1].push(item['ZBPZ0039'])
+          })
+          // 各二级企业人工成本利润率
+          dataC2[1] = []
+          dataC2[0] = []
+          res.orgData.area9.card2.forEach(item => {
+            dataC2[1].push(item['ZBPZ0040'])
+            dataC2[0].push(item['ZBPZ0041'])
+          })
+          resolve(1)
         })
-        // 各二级企业人工成本利润率
-        dataC2[1] = []
-        dataC2[0] = []
-        res.orgData.area9.card2.forEach(item => {
-          dataC2[1].push(item['ZBPZ0040'])
-          dataC2[0].push(item['ZBPZ0041'])
-        })
-      })
+      });
     },
     handleShowTip (index) {
       this.showTip = true

manpowerPort/js/index4.js

@@ -228,193 +228,199 @@ let app = new Vue({
     },
     // 获取组织机构
     getInstitutional () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "ORG",
-          // "orgNumber": this.orgNumber
-          "orgNumber": '1494979736584079360'
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "ORG",
+            // "orgNumber": this.orgNumber
+            "orgNumber": '1494979736584079360'
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        this.companyList = res.data.map(item => {
-          return { name: item.orgName, id: item.orgNumber }
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          this.companyList = res.data.map(item => {
+            return { name: item.orgName, id: item.orgNumber }
+          })
+          this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          resolve(1);
         })
-        this.commonOption.xAxis.data = this.companyList.map(item => item.name)
-      })
+      });
     },
     getData () {
-      let value = {
-        access_token: this.access_token,
-        "Data": {
-          "paramType": "DATA",
-          "orgNumber": this.orgNumber
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "Data": {
+            "paramType": "DATA",
+            "orgNumber": this.orgNumber
+          }
         }
-      }
-      post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
-        // res.orgData = res.data[0]
-        console.log(res.orgData, '二级页面数据')
-        // 定机构
-        // 弹窗
-        // return
-        // 左侧图表
-        tipData.analysis[0] = res.orgData.area1.intAnalysis
-        //各二级企业本部机构数
-        dataL1[0] = []
-        res.orgData.area1.card1.forEach(item => {
-          dataL1[1].push(item['ZBPZ0010'])
-        })
-        // 各二级企业所属架构数
-        dataL2[0] = []
-        res.orgData.area1.card2.forEach(item => {
-          dataL2[0].push(item['ZBPZ0024'])
-        })
+        post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
+          console.log(res, '二级页面数据')
+          // res.orgData = res.data[0]
+          // 定机构
+          // 弹窗
+          // return
+          // 左侧图表
+          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          //各二级企业本部机构数
+          dataL1[0] = []
+          res.orgData.area1.card1.forEach(item => {
+            dataL1[0].push(item['ZBPZ0010'])
+          })
+          // 各二级企业所属架构数
+          dataL2[0] = []
+          res.orgData.area1.card2.forEach(item => {
+            dataL2[0].push(item['ZBPZ0024'])
+          })
 
-        // 定职数
-        // 弹窗
-        // 左侧图表
-        tipData.analysis[2] = res.orgData.area2.intAnalysis
-        //各二级企业本部中层管理人数
-        dataL3[0] = []
-        res.orgData.area2.card1.forEach(item => {
-          dataL3[0].push(item['ZBPZ0091'])
-        })
-        // 各二级企业管理人员数
-        dataL4[0] = []
-        dataL4[1] = []
-        res.orgData.area2.card2.forEach(item => {
-          dataL4[0].push(item['ZBPZ0031'])
-          dataL4[1].push(item['ZBPZ0049'])
-        })
+          // 定职数
+          // 弹窗
+          // 左侧图表
+          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          //各二级企业本部中层管理人数
+          dataL3[0] = []
+          res.orgData.area2.card1.forEach(item => {
+            dataL3[0].push(item['ZBPZ0091'])
+          })
+          // 各二级企业管理人员数
+          dataL4[0] = []
+          dataL4[1] = []
+          res.orgData.area2.card2.forEach(item => {
+            dataL4[0].push(item['ZBPZ0031'])
+            dataL4[1].push(item['ZBPZ0049'])
+          })
 
-        // 定员额
-        // 弹窗
-        tipData.analysis[1] = res.orgData.area3.intAnalysis
-        // 各二级企业总人数
-        dataL5[0] = []
-        dataL5[1] = []
-        res.orgData.area3.card1.forEach(item => {
-          dataL5[0].push(item['ZBPZ0006'])
-          dataL5[1].push(item['ZBPZ0050'])
-        })
-        // 各二级企业本部员额数
-        dataL6[0] = []
-        res.orgData.area3.card2.forEach(item => {
-          dataL6[0].push(item['ZBPZ0031'])
-        })
-        // 人数变化和全员劳动生产率变化率分析
-        dataL7[0] = []
-        dataL7[1] = []
-        res.orgData.area3.card3.forEach(item => {
-          dataL7[0].push(item['ZBPZ0050'])
-          dataL7[1].push(item['ZBPZ0039'])
-        })
-        // 人数变化和人工利润率变化分析
-        dataL8[0] = []
-        dataL8[1] = []
-        res.orgData.area3.card4.forEach(item => {
-          dataL8[0].push(item['ZBPZ0050'])
-          dataL8[1].push(item['ZBPZ0041'])
-        })
+          // 定员额
+          // 弹窗
+          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // 各二级企业总人数
+          dataL5[0] = []
+          dataL5[1] = []
+          res.orgData.area3.card1.forEach(item => {
+            dataL5[0].push(item['ZBPZ0006'])
+            dataL5[1].push(item['ZBPZ0050'])
+          })
+          // 各二级企业本部员额数
+          dataL6[0] = []
+          res.orgData.area3.card2.forEach(item => {
+            dataL6[0].push(item['ZBPZ0031'])
+          })
+          // 人数变化和全员劳动生产率变化率分析
+          dataL7[0] = []
+          dataL7[1] = []
+          res.orgData.area3.card3.forEach(item => {
+            dataL7[0].push(item['ZBPZ0050'])
+            dataL7[1].push(item['ZBPZ0039'])
+          })
+          // 人数变化和人工利润率变化分析
+          dataL8[0] = []
+          dataL8[1] = []
+          res.orgData.area3.card4.forEach(item => {
+            dataL8[0].push(item['ZBPZ0050'])
+            dataL8[1].push(item['ZBPZ0041'])
+          })
 
-        // 定机制
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area4.intAnalysis
-        // 各二级企业招聘需求公告人次情况
-        dataR1[0] = []
-        dataR1[1] = []
-        res.orgData.area4.card1.forEach(item => {
-          dataR1[0].push(item['ZBPZ0057'])
-          dataR1[1].push(item['ZBPZ0058'])
-        })
-        // 各二级企业录用结果公示人次
-        dataR2[0] = []
-        dataR2[1] = []
-        res.orgData.area4.card2.forEach(item => {
-          dataR2[0].push(item['ZBPZ0059'])
-          dataR2[1].push(item['ZBPZ0060'])
-        })
-        // 各二级企业年利润与招聘情况分析
-        dataR3[0] = []
-        dataR3[1] = []
-        res.orgData.area4.card3.forEach(item => {
-          dataR3[0].push(item['ZBPZ0054'])
-          dataR3[1].push(item['ZBPZ0055'])
-        })
-        // 各二级企业"退二进一"完成情况
-        dataR4[0] = []
-        dataR4[1] = []
-        res.orgData.area4.card4.forEach(item => {
-          dataR4[0].push(item['ZBPZ0056'])
-          dataR4[1].push(item['ZBPZ0055'])
-        })
+          // 定机制
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // 各二级企业招聘需求公告人次情况
+          dataR1[0] = []
+          dataR1[1] = []
+          res.orgData.area4.card1.forEach(item => {
+            dataR1[0].push(item['ZBPZ0057'])
+            dataR1[1].push(item['ZBPZ0058'])
+          })
+          // 各二级企业录用结果公示人次
+          dataR2[0] = []
+          dataR2[1] = []
+          res.orgData.area4.card2.forEach(item => {
+            dataR2[0].push(item['ZBPZ0059'])
+            dataR2[1].push(item['ZBPZ0060'])
+          })
+          // 各二级企业年利润与招聘情况分析
+          dataR3[0] = []
+          dataR3[1] = []
+          res.orgData.area4.card3.forEach(item => {
+            dataR3[0].push(item['ZBPZ0054'])
+            dataR3[1].push(item['ZBPZ0055'])
+          })
+          // 各二级企业"退二进一"完成情况
+          dataR4[0] = []
+          dataR4[1] = []
+          res.orgData.area4.card4.forEach(item => {
+            dataR4[0].push(item['ZBPZ0056'])
+            dataR4[1].push(item['ZBPZ0055'])
+          })
 
-        // 定薪酬
-        // 弹窗
-        tipData.analysis[5] = res.orgData.area5.intAnalysis
-        // 各二级企业在岗职工平均薪酬
-        dataR5[0] = []
-        dataR5[1] = []
-        res.orgData.area5.card1.forEach(item => {
-          dataR5[0].push(item['ZBPZ0063'])
-          dataR5[1].push(item['ZBPZ0064'])
-        })
-        // 各二级企业利润与薪酬变动情况
-        dataR6[0] = []
-        dataR6[1] = []
-        res.orgData.area5.card2.forEach(item => {
-          dataR6[0].push(item['ZBPZ0061'])
-          dataR6[1].push(item['ZBPZ0062'])
-        })
+          // 定薪酬
+          // 弹窗
+          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // 各二级企业在岗职工平均薪酬
+          dataR5[0] = []
+          dataR5[1] = []
+          res.orgData.area5.card1.forEach(item => {
+            dataR5[0].push(item['ZBPZ0063'])
+            dataR5[1].push(item['ZBPZ0064'])
+          })
+          // 各二级企业利润与薪酬变动情况
+          dataR6[0] = []
+          dataR6[1] = []
+          res.orgData.area5.card2.forEach(item => {
+            dataR6[0].push(item['ZBPZ0061'])
+            dataR6[1].push(item['ZBPZ0062'])
+          })
 
-        // 定任期
-        // 弹窗
-        tipData.analysis[6] = res.orgData.area6.intAnalysis
-        // 各二级企业全员绩效考核
-        dataR7[0] = []
-        res.orgData.area6.card1.forEach(item => {
-          dataR7[0].push(item['ZBPZ0024'])
-        })
-        // 各二级企业任期制契约化完成率
-        dataR8[0] = []
-        res.orgData.area6.card2.forEach(item => {
-          dataR8[0].push(item['ZBPZ0065'])
-        })
+          // 定任期
+          // 弹窗
+          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // 各二级企业全员绩效考核
+          dataR7[0] = []
+          res.orgData.area6.card1.forEach(item => {
+            dataR7[0].push(item['ZBPZ0024'])
+          })
+          // 各二级企业任期制契约化完成率
+          dataR8[0] = []
+          res.orgData.area6.card2.forEach(item => {
+            dataR8[0].push(item['ZBPZ0065'])
+          })
 
-        // 中间
-        // 架岗人员
-        this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
-        this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
-        this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
+          // 中间
+          // 架岗人员
+          this.centerData.info.value1 = res.orgData.area7.ZBPZ0037
+          this.centerData.info.value2 = res.orgData.area7.ZBPZ0038
+          this.centerData.info.value3 = res.orgData.area7.ZBPZ0006
 
-        // 六定改革成效
-        this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
-        this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
-        this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
-        this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
-        this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
-        this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
-        this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
-        this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
-        this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
-        // 核心指标监测
-        // 弹窗
-        tipData.analysis[3] = res.orgData.area9.intAnalysis
-        // 各二级企业全员劳动生产率
-        dataC1[0] = []
-        dataC1[1] = []
-        res.orgData.area9.card1.forEach(item => {
-          dataC1[0].push(item['ZBPZ0035'])
-          dataC1[1].push(item['ZBPZ0039'])
+          // 六定改革成效
+          this.centerData.changeInfo[0].value1 = res.orgData.area8.ZBPZ0067
+          this.centerData.changeInfo[0].value2 = res.orgData.area8.ZBPZ0068
+          this.centerData.changeInfo[0].value3 = res.orgData.area8.ZBPZ0069
+          this.centerData.changeInfo[2].value1 = res.orgData.area8.ZBPZ0074
+          this.centerData.changeInfo[2].value2 = res.orgData.area8.ZBPZ0075
+          this.centerData.changeInfo[2].value3 = res.orgData.area8.ZBPZ0076
+          this.centerData.changeInfo[1].value1 = res.orgData.area8.ZBPZ0071
+          this.centerData.changeInfo[1].value2 = res.orgData.area8.ZBPZ0072
+          this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
+          // 核心指标监测
+          // 弹窗
+          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // 各二级企业全员劳动生产率
+          dataC1[0] = []
+          dataC1[1] = []
+          res.orgData.area9.card1.forEach(item => {
+            dataC1[0].push(item['ZBPZ0035'])
+            dataC1[1].push(item['ZBPZ0039'])
+          })
+          // 各二级企业人工成本利润率
+          dataC2[1] = []
+          dataC2[0] = []
+          res.orgData.area9.card2.forEach(item => {
+            dataC2[1].push(item['ZBPZ0040'])
+            dataC2[0].push(item['ZBPZ0041'])
+          })
+          resolve(1)
         })
-        // 各二级企业人工成本利润率
-        dataC2[1] = []
-        dataC2[0] = []
-        res.orgData.area9.card2.forEach(item => {
-          dataC2[1].push(item['ZBPZ0040'])
-          dataC2[0].push(item['ZBPZ0041'])
-        })
-      })
+      });
     },
     handleShowTip (index) {
       this.showTip = true