Browse Source

接口数据页面对接

zhbyyy 2 years ago
parent
commit
15cc77aec3

BIN
cokingCoal/images/content-bg.png


BIN
investment/images/content-bg.png


BIN
login/images/back.png


BIN
login/images/orthogon.png


BIN
manpower/images/content-bg.png


BIN
manpower/images/page-bg.png


BIN
manpowerPort/images/content-bg.png


BIN
manpowerPort/images/page-bg.png


+ 6 - 4
manpowerPort/index.html

@@ -177,7 +177,7 @@
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reformRegistered')">改革前在册职工数</p>
                   </div>
-                  <div class="alignCenter"> 
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span></span></p>
                     <p>在册职工压缩数</p>
                   </div>
@@ -295,9 +295,11 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
-          :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
-          <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index"
+        @click="handleGoPage(item.id,item.name)"><img :src="`./images/logos/${item.orgLogoNum}.png`"></img>
+        {{item.name}}</a>
+      <div style="font-weight: bold;display: flex;align-items: center;flex-shrink: 0;position: absolute;right: -20px;bottom: 30%;" v-if="companyList.length>8"><span>. . .</span>
+      </div>
     </div>
     <!-- 公共弹窗 -->
     <div class="tip" @click="showTip = false" v-if="showTip && tipNum != 3">

+ 19 - 19
manpowerPort/index2.html

@@ -41,7 +41,7 @@
             </div>
             <div class="content flex">
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL2" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL2" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -53,21 +53,21 @@
             </div>
             <div class="content flex">
               <div ref="echartL3" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL4" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
-        <dv-border-box-8 :dur="12" style="flex: 2;">
+        <dv-border-box-8 :dur="12" style="flex: 1;">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定员额</span>
               <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
             </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 class="content">
+              <!-- <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div> -->
+              <div ref="echartL6" style="height: 100%;width: 100%;"></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>
@@ -229,18 +229,18 @@
 
       </div>
       <div class="right">
-        <dv-border-box-8 :dur="10" style="flex: 2">
+        <dv-border-box-8 :dur="10" style="flex: 1">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定机制</span>
               <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
 
             </div>
-            <div class="content flex flex-wrap">
-              <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
+            <div class="content">
+              <!-- <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 ref="echartR3" style="flex: 0 0 49.9%;height: 50%;"></div> -->
+              <div ref="echartR4" style="height: 100%;width: 100%;"></div>
             </div>
           </div>
         </dv-border-box-8>
@@ -252,7 +252,7 @@
             </div>
             <div class="content flex">
               <div ref="echartR5" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartR6" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -264,17 +264,17 @@
             </div>
             <div class="content flex">
               <div ref="echartR7" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR8" 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.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
-        :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
-        <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
-    </div>
+      <!-- <a class="item onelist-hidden" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)">{{item.name}}</a> -->
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <div style="font-weight: bold;display: flex;align-items: center;flex-shrink: 0;position: absolute;right: -20px;bottom: 30%;" v-if="companyList.length>8"><span>. . .</span>
+      </div>
 
     <div class="tip" @click="showTip = false" v-if="showTip">
       <div class="tip-box">

+ 289 - 0
manpowerPort/index2JNKG.html

@@ -0,0 +1,289 @@
+<!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/data2.js"></script>
+  <script src="./libs/echarts-tooltip-carousel.js"></script>
+  <script src="./js/fjx.js"></script>
+</head>
+
+<body>
+  <div id="app" v-cloak>
+    <header class="my-header">
+      <span class="left" @click="handleGoBack"><img style="width: 70px;height: 70px;" src="./images/back.png"></img>
+      </span>
+      <span>{{titleName}}</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>
+              <span class="tip-window" @click="handleShowTip(0)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(2)">智能分析</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartL3" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+            </div>
+          </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>
+              <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
+            </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">
+            <img src="./images/center-top1.png" />
+            <div>
+              <p>架构数</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">{{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">{{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">
+            <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">{{numFormat(centerData.changeInfo[0].value2)}}</p>
+                    <p>改革前总部机构平均数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(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>改革前在册职工数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[2].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>
+              <span class="tip-window" @click="handleShowTip(3)">智能分析</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartC1" style="flex: 1;height: 90%;"></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>
+              <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
+
+            </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>
+              <span class="tip-window" @click="handleShowTip(5)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(6)">智能分析</span>
+            </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.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <div style="font-weight: bold;display: flex;align-items: center;flex-shrink: 0;position: absolute;right: -20px;bottom: 30%;" v-if="companyList.length>8"><span>. . .</span>
+      </div>
+
+    <div class="tip" @click="showTip = false" v-if="showTip">
+      <div class="tip-box">
+        <div class="tip-content">{{tipData[tipNum]}}</div>
+        <!-- <div class="btm20">全员劳动生产率从去年前的人均XX万元提升到XX万元;在岗职工平均工资从去年前的人均XX万元提升到XX万元。</div>
+        <div>打破工资“大锅饭”,所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”,省属企业负责人绩效年薪与经营业绩考核结果挂钩后,还要与企业经济效益挂钩。</div> -->
+      </div>
+    </div>
+  </div>
+  <script src="./js/index2JNKG.js"></script>
+</body>
+
+</html>

+ 20 - 21
manpowerPort/index3.html

@@ -40,7 +40,7 @@
             </div>
             <div class="content flex">
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL2" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL2" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -52,21 +52,21 @@
             </div>
             <div class="content flex">
               <div ref="echartL3" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL4" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
-        <dv-border-box-8 :dur="12" style="flex: 2;">
+        <dv-border-box-8 :dur="12" style="flex: 1;">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定员额</span>
               <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
             </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 class="content">
+              <!-- <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div> -->
+              <div ref="echartL6" style="height: 100%;width: 100%;"></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>
@@ -151,11 +151,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p style="color:#FBE139">numFormat({{centerData.changeInfo[0].value2}})</p>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[0].value2)}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
                   <div>
-                    <p style="color:#17AC76">numFormat({{centerData.changeInfo[0].value3}})</p>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[0].value3)}}</p>
                     <p>改革后总部机构平均数
                     </p>
                   </div>
@@ -228,17 +228,17 @@
 
       </div>
       <div class="right">
-        <dv-border-box-8 :dur="10" style="flex: 2">
+        <dv-border-box-8 :dur="10" style="flex: 1">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定机制</span>
               <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
             </div>
-            <div class="content flex flex-wrap">
-              <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
+            <div class="content">
+              <!-- <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 ref="echartR3" style="flex: 0 0 49.9%;height: 50%;"></div> -->
+              <div ref="echartR4" style="height: 100%;width: 100%;"></div>
             </div>
           </div>
         </dv-border-box-8>
@@ -250,7 +250,7 @@
             </div>
             <div class="content flex">
               <div ref="echartR5" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartR6" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -262,17 +262,16 @@
             </div>
             <div class="content flex">
               <div ref="echartR7" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR8" 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" style="width: 70%;">
-      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
-        :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
-        <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
-    </div>
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <div style="font-weight: bold;display: flex;align-items: center;flex-shrink: 0;position: absolute;right: -20px;bottom: 30%;" v-if="companyList.length>8"><span>. . .</span>
+      </div>
     <div class="tip" @click="showTip = false" v-if="showTip">
       <div class="tip-box">
         <div class="tip-content">{{tipData[tipNum]}}</div>

+ 286 - 0
manpowerPort/index3MT.html

@@ -0,0 +1,286 @@
+<!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="./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/data3.js"></script>
+  <script src="./libs/echarts-tooltip-carousel.js"></script>
+  <script src="./js/fjx.js"></script>
+</head>
+
+<body>
+  <div id="app" v-cloak>
+    <header class="my-header">
+      <span class="left" @click="handleGoBack"><img style="width: 70px;height: 70px;" src="./images/back.png"></img>
+      </span>
+      <span>{{titleName}}</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>
+              <span class="tip-window" @click="handleShowTip(0)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(2)">智能分析</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartL3" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+            </div>
+          </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>
+              <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
+            </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">
+            <img src="./images/center-top1.png" />
+            <div>
+              <p>架构数</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">{{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">{{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">
+            <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">{{numFormat(centerData.changeInfo[0].value2)}}</p>
+                    <p>改革前总部机构平均数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(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>改革前在册职工数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76"> {{numFormat(centerData.changeInfo[2].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>
+              <span class="tip-window" @click="handleShowTip(3)">智能分析</span>
+            </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>
+            </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>
+              <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(5)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(6)">智能分析</span>
+            </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" style="width: 70%;">
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <div style="font-weight: bold;display: flex;align-items: center;flex-shrink: 0;position: absolute;right: -20px;bottom: 30%;" v-if="companyList.length>8"><span>. . .</span>
+      </div>
+    <div class="tip" @click="showTip = false" v-if="showTip">
+      <div class="tip-box">
+        <div class="tip-content">{{tipData[tipNum]}}</div>
+        <!-- <div class="btm20">全员劳动生产率从去年前的人均XX万元提升到XX万元;在岗职工平均工资从去年前的人均XX万元提升到XX万元。</div>
+        <div>打破工资“大锅饭”,所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”,省属企业负责人绩效年薪与经营业绩考核结果挂钩后,还要与企业经济效益挂钩。</div> -->
+      </div>
+    </div>
+  </div>
+  <script src="./js/index3MT.js"></script>
+</body>
+
+</html>

+ 17 - 17
manpowerPort/index4.html

@@ -43,7 +43,7 @@
             </div>
             <div class="content flex">
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL2" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL2" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -55,21 +55,21 @@
             </div>
             <div class="content flex">
               <div ref="echartL3" style="flex: 1;height: 100%;"></div>
-              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL4" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
-        <dv-border-box-8 :dur="12" style="flex: 2;">
+        <dv-border-box-8 :dur="12" style="flex: 1;">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定员额</span>
               <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
             </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 class="content">
+              <!-- <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div> -->
+              <div ref="echartL6" style="height: 100%;width: 100%;"></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>
@@ -154,7 +154,7 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p style="color:#FBE139">numFormat({{centerData.changeInfo[0].value2}})</p>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[0].value2)}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
                   <div>
@@ -231,17 +231,17 @@
 
       </div>
       <div class="right">
-        <dv-border-box-8 :dur="10" style="flex: 2">
+        <dv-border-box-8 :dur="10" style="flex: 1">
           <div class="my-panel">
             <div class="panel-title flex-between">
               <span class="text">定机制</span>
               <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
             </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 class="content">
+              <!-- <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="height: 100%;width: 100%;"></div>
             </div>
           </div>
         </dv-border-box-8>
@@ -253,7 +253,7 @@
             </div>
             <div class="content flex">
               <div ref="echartR5" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartR6" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>
@@ -265,7 +265,7 @@
             </div>
             <div class="content flex">
               <div ref="echartR7" style="flex: 1;height: 100%;"></div>
-              <div ref="echartR8" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartR8" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>

+ 289 - 0
manpowerPort/index4SY.html

@@ -0,0 +1,289 @@
+<!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="./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/data4.js"></script>
+  <script src="./libs/echarts-tooltip-carousel.js"></script>
+  <script src="./js/fjx.js"></script>
+</head>
+
+<body>
+  <div id="app" v-cloak>
+    <header class="my-header">
+      <span class="left" @click="handleGoBack"><img style="width: 70px;height: 70px;" src="./images/back.png"></img>
+      </span>
+      <!--  -->
+      <span class="left2" @click="handleGoIndex">返回首页</img>
+      </span>
+      <span>{{titleName}}</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>
+              <span class="tip-window" @click="handleShowTip(0)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(2)">智能分析</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartL3" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
+            </div>
+          </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>
+              <span class="tip-window" @click="handleShowTip(1)">智能分析</span>
+            </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">
+            <img src="./images/center-top1.png" />
+            <div>
+              <p>架构数</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">{{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">{{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">
+            <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">{{numFormat(centerData.changeInfo[0].value2)}}</p>
+                    <p>改革前总部机构平均数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">numFormat({{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>改革前在册职工数</p>
+                  </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[2].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>
+              <span class="tip-window" @click="handleShowTip(3)">智能分析</span>
+            </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>
+            </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>
+              <span class="tip-window" @click="handleShowTip(4)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(5)">智能分析</span>
+            </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>
+              <span class="tip-window" @click="handleShowTip(6)">智能分析</span>
+            </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.id)">{{item.name}}</a>
+    </div> -->
+    <div class="tip" @click="showTip = false" v-if="showTip">
+      <div class="tip-box">
+        <div class="tip-content">{{tipData[tipNum]}}</div>
+        <!-- <div class="btm20">全员劳动生产率从去年前的人均XX万元提升到XX万元;在岗职工平均工资从去年前的人均XX万元提升到XX万元。</div>
+        <div>打破工资“大锅饭”,所有盈利企业工资增幅不高于利润增幅。实行薪酬“双挂钩”,省属企业负责人绩效年薪与经营业绩考核结果挂钩后,还要与企业经济效益挂钩。</div> -->
+      </div>
+    </div>
+  </div>
+  <script src="./js/index4SY.js"></script>
+</body>
+
+</html>

+ 2 - 2
manpowerPort/index5.html

@@ -43,8 +43,8 @@
               </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 ref="echartL1" style="flex: 1;height: 100%;"></div>
+              <!-- <div ref="echartL2" style="flex: 1;height: 100%;"></div> -->
             </div>
           </div>
         </dv-border-box-8>

+ 91 - 40
manpowerPort/js/index.js

@@ -5,6 +5,14 @@ let app = new Vue({
   data () {
     return {
       // paymentShow:false, // 定薪酬弹窗
+      echartC1:{
+        national:'',
+        province:''
+      },
+      echartC2:{
+        national:'',
+        province:''
+      },
       app_token: '',
       twinkle7: [],
       twinkle8: [],
@@ -203,32 +211,29 @@ let app = new Vue({
     }
   },
   beforeMount () {
-    dataL7[0].forEach((item, index) => {
-      if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
-        this.twinkle7.push(obj)
-      }
-    })
-    //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
-    dataL8[0].forEach((item, index) => {
-      if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
-        this.twinkle8.push(obj)
-      }
-    })
-    // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
-    fjxdataL2[0].forEach((item, index) => {
-      if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
-        let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
-        this.twinkleR6.push(obj)
-      }
-    })
-
-    console.log(this.twinkleR6)
+    // dataL7[0].forEach((item, index) => {
+    //   if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+    //     let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+    //     this.twinkle7.push(obj)
+    //   }
+    // })
+    // //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+    // dataL8[0].forEach((item, index) => {
+    //   if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+    //     let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+    //     this.twinkle8.push(obj)
+    //   }
+    // })
+    // // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+    // fjxdataL2[0].forEach((item, index) => {
+    //   if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
+    //     let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
+    //     this.twinkleR6.push(obj)
+    //   }
+    // })
   },
   mounted () {
-    let a = [1,2,3,4,5,6,7]
-    console.log(a.slice(1,3,'??????'))
+    let a = [1, 2, 3, 4, 5, 6, 7]
     if (!sessionStorage.getItem('accounts', this.accounts)) {
       window.location.href = './login/login.html'
       return
@@ -278,10 +283,17 @@ let app = new Vue({
         // "language": "zh_CN"
 
         // SIT环境
+        // "appId": "CockpitScreen",
+        // "appSecuret": "JSCdpsjgl@539126",
+        // "tenantid": "test",
+        // "accountId": "1484008912330950656",
+        // "language": "zh_CN"
+
+        // UAT环境
         "appId": "CockpitScreen",
         "appSecuret": "JSCdpsjgl@539126",
-        "tenantid": "test",
-        "accountId": "1484008912330950656",
+        "tenantid": "uatierp",
+        "accountId": "1490670568960163840",
         "language": "zh_CN"
       }
       post('/ierp/api/getAppToken.do', value).then(res => {
@@ -300,20 +312,28 @@ let app = new Vue({
         // "usertype": "UserName"
 
         // SIT环境
+        // "user": "jiashicangjiekou",
+        // "apptoken": this.app_token,
+        // "tenantid": "test",
+        // "accountId": "1484008912330950656",
+        // "usertype": "UserName"
+
+        // UAT环境
         "user": "jiashicangjiekou",
         "apptoken": this.app_token,
-        "tenantid": "test",
-        "accountId": "1484008912330950656",
+        "tenantid": "uatierp",
+        "accountId": "1490670568960163840",
         "usertype": "UserName"
       }
       post('/ierp/api/login.do', value).then(res => {
         this.access_token = res.data.access_token
-        Promise.all([this.getData(), this.getInstitutional()])
-          .then((arr) => {
-            // 生成图表       
-            this.generateEcharts()
-          })
-          .catch((err) => console.log(err));
+        // Promise.all([this.getData(), this.getInstitutional()])
+        //   .then((arr) => {
+        //     // 生成图表       
+        //     this.generateEcharts()
+        //   })
+        //   .catch((err) => console.log(err));
+        this.getInstitutional()
       })
     },
     // 获取组织机构
@@ -331,6 +351,7 @@ let app = new Vue({
             return { name: item.orgName, id: item.orgNumber, orgLogoNum: item.orgLogoNum }
           })
           this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          this.getData()
           resolve(1);
         })
       });
@@ -479,6 +500,10 @@ let app = new Vue({
             c2[1].push(item['ZBPZ0040'])
             c2[0].push(item['ZBPZ0041'])
           })
+          this.echartC1.national = res.orgData.area9.card1[0].ZBPZ0097
+          this.echartC1.province = res.orgData.area9.card1[0].ZBPZ0096
+          this.echartC2.national = res.orgData.area9.card2[0].ZBPZ0099
+          this.echartC2.province = res.orgData.area9.card2[0].ZBPZ0098
 
           // 左边
           // 定机制
@@ -504,7 +529,7 @@ let app = new Vue({
           dataR3[1] = []
           res.orgData.area4.card3.forEach(item => {
             dataR3[0].push(item['ZBPZ0054'])
-            dataR3[0].push(item['ZBPZ0055'])
+            dataR3[1].push(item['ZBPZ0055'])
           })
           // 各省属企业"退二进一"完成情况
           dataR4[0] = []
@@ -547,6 +572,28 @@ let app = new Vue({
           res.orgData.area6.card2.forEach(item => {
             fjxdataL4[0].push(item['ZBPZ0065'])
           })
+          // 数据整理
+          dataL7[0].forEach((item, index) => {
+            if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+              this.twinkle7.push(obj)
+            }
+          })
+          //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+          dataL8[0].forEach((item, index) => {
+            if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+              this.twinkle8.push(obj)
+            }
+          })
+          // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+          fjxdataL2[0].forEach((item, index) => {
+            if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
+              let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
+              this.twinkleR6.push(obj)
+            }
+          })
+          this.generateEcharts()
           resolve(1)
         })
       });
@@ -597,7 +644,11 @@ let app = new Vue({
       this.tipNum = index
     },
     handleGoPage (id, name) {
-      window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      if (name == '晋能控股') {
+        window.location.href = './index2JNKG.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      } else {
+        window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      }
     },
     numFormat (value) {
       if (!value) return '0'
@@ -1672,7 +1723,7 @@ let app = new Vue({
               data: [
                 {
                   name: '省属企业平均水平',
-                  yAxis: 50.13,
+                  yAxis: this.echartC1.national,
                   lineStyle: {
                     color: '#fff',
                   },
@@ -1700,7 +1751,7 @@ let app = new Vue({
                 // },
                 {
                   name: '央企平均水平',
-                  yAxis: 69.4,
+                  yAxis: this.echartC1.province,
                   lineStyle: {
                     color: '#fff',
                   },
@@ -1825,7 +1876,7 @@ let app = new Vue({
               data: [
                 {
                   name: '省属企业平均水平',
-                  yAxis: 67.09,
+                  yAxis: this.echartC2.province,
                   lineStyle: {
                     color: '#fff',
                   },
@@ -1839,7 +1890,7 @@ let app = new Vue({
                 },
                 {
                   name: '央企平均水平',
-                  yAxis: 81,
+                  yAxis: this.echartC2.national,
                   lineStyle: {
                     color: '#fff',
                   },

+ 65 - 37
manpowerPort/js/index2.js

@@ -143,28 +143,28 @@ let app = new Vue({
     }
   },
   beforeMount () {
-    dataL7[0].forEach((item, index) => {
-      if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
-        this.twinkle7.push(obj)
-      }
-    })
-    //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
-    dataL8[0].forEach((item, index) => {
-      if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
-        this.twinkle8.push(obj)
-      }
-    })
-    // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
-    dataR6[0].forEach((item, index) => {
-      if (dataR6[1][index] > 0 && dataR6[0][index] < 0) {
-        let obj = { value: [companyList[index].name, dataR6[1][index]], symbolSize: 15 }
-        this.twinkleR6.push(obj)
-      }
-    })
+    // dataL7[0].forEach((item, index) => {
+    //   if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+    //     let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+    //     this.twinkle7.push(obj)
+    //   }
+    // })
+    // //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+    // dataL8[0].forEach((item, index) => {
+    //   if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+    //     let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+    //     this.twinkle8.push(obj)
+    //   }
+    // })
+    // // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+    // dataR6[0].forEach((item, index) => {
+    //   if (dataR6[1][index] > 0 && dataR6[0][index] < 0) {
+    //     let obj = { value: [companyList[index].name, dataR6[1][index]], symbolSize: 15 }
+    //     this.twinkleR6.push(obj)
+    //   }
+    // })
 
-    console.log(this.twinkleR6)
+    // console.log(this.twinkleR6)
   },
   mounted () {
     this.getUrlParams()
@@ -204,25 +204,25 @@ let app = new Vue({
     // 生成图表
     generateEcharts () {
       this.initChartL1()
-      this.initChartL2()
+      // this.initChartL2()
       this.initChartL3()
-      this.initChartL4()
-      this.initChartL5()
+      // this.initChartL4()
+      // this.initChartL5()
       this.initChartL6()
-      this.initChartL7()
-      this.initChartL8()
+      // this.initChartL7()
+      // this.initChartL8()
       // 中间图表
       this.initChartC1()
       this.initChartC2()
       // 右侧图表
-      this.initChartR1()
-      this.initChartR2()
-      this.initChartR3()
+      // this.initChartR1()
+      // this.initChartR2()
+      // this.initChartR3()
       this.initChartR4()
       this.initChartR5()
-      this.initChartR6()
+      // this.initChartR6()
       this.initChartR7()
-      this.initChartR8()
+      // this.initChartR8()
     },
     getData () {
       return new Promise((resolve, err) => {
@@ -395,6 +395,28 @@ let app = new Vue({
             dataC2[1].push(item['ZBPZ0040'])
             dataC2[0].push(item['ZBPZ0041'])
           })
+             // 数据整理
+          dataL7[0].forEach((item, index) => {
+            if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+              this.twinkle7.push(obj)
+            }
+          })
+          //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+          dataL8[0].forEach((item, index) => {
+            if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+              this.twinkle8.push(obj)
+            }
+          })
+          // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+          dataR6[0].forEach((item, index) => {
+            if (dataR6[1][index] > 0 && dataR6[0][index] < 0) {
+              let obj = { value: [companyList[index].name, dataR6[1][index]], symbolSize: 15 }
+              this.twinkleR6.push(obj)
+            }
+          })
+          this.generateEcharts()
           resolve(1)
         })
       });
@@ -416,11 +438,12 @@ let app = new Vue({
       this.access_token = obj.access_token
       this.orgNumber = obj.id
       this.titleName = decodeURIComponent(obj.name)
-      Promise.all([this.getData(), this.getInstitutional()])
-        .then((arr) => {
-          this.generateEcharts()
-        })
-        .catch((err) => console.log(err));
+      // Promise.all([this.getData(), this.getInstitutional()])
+      //   .then((arr) => {
+      //     this.generateEcharts()
+      //   })
+      //   .catch((err) => console.log(err));
+      this.getInstitutional()
     },
     // 获取组织机构
     getInstitutional () {
@@ -438,6 +461,7 @@ let app = new Vue({
             return { name: item.orgName, id: item.orgNumber }
           })
           this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          this.getData()
           resolve(1);
         })
       });
@@ -447,7 +471,11 @@ let app = new Vue({
       this.tipNum = index
     },
     handleGoPage (id, name) {
-      window.location.href = './index3.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      if (name == '山西煤炭运销集团长治有限公司') {
+        window.location.href = './index3MT.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      }else{
+        window.location.href = './index3.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      }
     },
     handleGoBack () {
       window.history.go(-1)

File diff suppressed because it is too large
+ 1 - 0
manpowerPort/js/index2JNKG.js


+ 46 - 18
manpowerPort/js/index3.js

@@ -4,7 +4,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      titleName:'',
+      titleName: '',
       twinkle7: [],
       twinkle8: [],
       twinkleR6: [],
@@ -176,25 +176,25 @@ let app = new Vue({
     this.centerData = data
     // 左侧图表
     this.initChartL1()
-    this.initChartL2()
+    // this.initChartL2()
     this.initChartL3()
-    this.initChartL4()
-    this.initChartL5()
+    // this.initChartL4()
+    // this.initChartL5()
     this.initChartL6()
-    this.initChartL7()
-    this.initChartL8()
+    // this.initChartL7()
+    // this.initChartL8()
     // 中间图表
     this.initChartC1()
     this.initChartC2()
     // 右侧图表
-    this.initChartR1()
-    this.initChartR2()
-    this.initChartR3()
+    // this.initChartR1()
+    // this.initChartR2()
+    // this.initChartR3()
     this.initChartR4()
     this.initChartR5()
-    this.initChartR6()
+    // this.initChartR6()
     this.initChartR7()
-    this.initChartR8()
+    // this.initChartR8()
   },
   beforeDestroy () {
     if (this.timer) {
@@ -219,11 +219,12 @@ let app = new Vue({
       this.access_token = obj.access_token
       this.orgNumber = obj.id
       this.titleName = decodeURIComponent(obj.name)
-      Promise.all([this.getData(), this.getInstitutional()])
-        .then((arr) => {
-          this.generateEcharts()
-        })
-        .catch((err) => console.log(err));
+      // Promise.all([this.getData(), this.getInstitutional()])
+      //   .then((arr) => {
+      //     this.generateEcharts()
+      //   })
+      //   .catch((err) => console.log(err));
+      this.getInstitutional()
     },
     // 获取组织机构
     getInstitutional () {
@@ -241,6 +242,7 @@ let app = new Vue({
             return { name: item.orgName, id: item.orgNumber }
           })
           this.commonOption.xAxis.data = this.companyList.map(item => item.name)
+          this.getData()
           resolve(1);
         })
       });
@@ -417,6 +419,28 @@ let app = new Vue({
             dataC2[1].push(item['ZBPZ0040'])
             dataC2[0].push(item['ZBPZ0041'])
           })
+          // 数据整理
+          dataL7[0].forEach((item, index) => {
+            if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+              this.twinkle7.push(obj)
+            }
+          })
+          //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+          dataL8[0].forEach((item, index) => {
+            if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+              this.twinkle8.push(obj)
+            }
+          })
+          // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+          fjxdataL2[0].forEach((item, index) => {
+            if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
+              let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
+              this.twinkleR6.push(obj)
+            }
+          })
+          this.generateEcharts()
           resolve(1)
         })
       });
@@ -425,8 +449,12 @@ let app = new Vue({
       this.showTip = true
       this.tipNum = index
     },
-    handleGoPage (id,name) {
-      window.location.href = './index4.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}` 
+    handleGoPage (id, name) {
+      if (name == '山西三元煤业股份有限公司') {
+        window.location.href = './index4SY.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      } else {
+        window.location.href = './index4.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
+      }
     },
     handleGoBack () {
       window.history.go(-1)

File diff suppressed because it is too large
+ 1 - 0
manpowerPort/js/index3MT.js


+ 34 - 59
manpowerPort/js/index4.js

@@ -4,7 +4,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      titleName:'',
+      titleName: '',
       twinkle7: [],
       twinkle8: [],
       twinkleR6: [],
@@ -144,29 +144,6 @@ let app = new Vue({
     }
   },
   beforeMount () {
-    dataL7[0].forEach((item, index) => {
-      if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
-        this.twinkle7.push(obj)
-      }
-    })
-    //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
-    dataL8[0].forEach((item, index) => {
-      if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
-        let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
-        this.twinkle8.push(obj)
-      }
-    })
-    //params.value > 0 && dataR6[0][params.dataIndex] < 0
-    // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
-    dataR6[0].forEach((item, index) => {
-      if (dataR6[1][index] > 0 && dataR6[0][index] < 0) {
-        let obj = { value: [companyList[index].name, dataR6[1][index]], symbolSize: 15 }
-        this.twinkleR6.push(obj)
-      }
-    })
-
-    console.log(this.twinkleR6)
   },
   mounted () {
     this.getUrlParams()
@@ -177,25 +154,25 @@ let app = new Vue({
     this.centerData = data
     // 左侧图表
     this.initChartL1()
-    this.initChartL2()
+    // this.initChartL2()
     this.initChartL3()
-    this.initChartL4()
-    this.initChartL5()
+    // this.initChartL4()
+    // this.initChartL5()
     this.initChartL6()
-    this.initChartL7()
-    this.initChartL8()
+    // this.initChartL7()
+    // this.initChartL8()
     // 中间图表
     this.initChartC1()
     this.initChartC2()
     // 右侧图表
-    this.initChartR1()
-    this.initChartR2()
-    this.initChartR3()
+    // this.initChartR1()
+    // this.initChartR2()
+    // this.initChartR3()
     this.initChartR4()
     this.initChartR5()
-    this.initChartR6()
+    // this.initChartR6()
     this.initChartR7()
-    this.initChartR8()
+    // this.initChartR8()
   },
   beforeDestroy () {
     if (this.timer) {
@@ -220,31 +197,7 @@ let app = new Vue({
       this.access_token = obj.access_token
       this.orgNumber = obj.id
       this.titleName = decodeURIComponent(obj.name)
-      Promise.all([this.getData(), this.getInstitutional()])
-        .then((arr) => {
-          this.generateEcharts()
-        })
-        .catch((err) => console.log(err));
-    },
-    // 获取组织机构
-    getInstitutional () {
-      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 }
-          })
-          this.commonOption.xAxis.data = this.companyList.map(item => item.name)
-          resolve(1);
-        })
-      });
+      this.getData()
     },
     getData () {
       return new Promise((resolve, err) => {
@@ -418,6 +371,28 @@ let app = new Vue({
             dataC2[1].push(item['ZBPZ0040'])
             dataC2[0].push(item['ZBPZ0041'])
           })
+          dataL7[0].forEach((item, index) => {
+            if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
+              this.twinkle7.push(obj)
+            }
+          })
+          //  if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
+          dataL8[0].forEach((item, index) => {
+            if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
+              let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
+              this.twinkle8.push(obj)
+            }
+          })
+          //params.value > 0 && dataR6[0][params.dataIndex] < 0
+          // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
+          dataR6[0].forEach((item, index) => {
+            if (dataR6[1][index] > 0 && dataR6[0][index] < 0) {
+              let obj = { value: [companyList[index].name, dataR6[1][index]], symbolSize: 15 }
+              this.twinkleR6.push(obj)
+            }
+          })
+          this.generateEcharts()
           resolve(1)
         })
       });

File diff suppressed because it is too large
+ 1 - 0
manpowerPort/js/index4SY.js


+ 2 - 2
manpowerPort/js/index5.js

@@ -214,8 +214,8 @@ let app = new Vue({
     }, 1000)
     this.centerData = data
     // 左侧图表
-    // this.initChartL1() // 左上
-    this.initChartL2()
+    this.initChartL1() // 左上
+    // this.initChartL2()
     // this.initChartL3() //左中
     this.initChartL4()
     // this.initChartL5() //左下

+ 4 - 1
manpowerPort/js/request.js

@@ -58,7 +58,10 @@ function getMinioUrl () {
 const httpRequest = axios.create({
   // baseURL: 'http://192.168.1.2:8080', // 测试环境
   // baseURL: 'http://172.21.9.23:8081', // SIT环境
-  baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
+  // baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
+  // baseURL: 'http://172.27.1.243:8081', // UAT环境
+  baseURL: 'http://172.27.1.243:30001/api/', // UAT环境解决跨域
+
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true // 携带cookie
 })

+ 5 - 3
manpowerPort/styles/index.css

@@ -202,11 +202,12 @@ a {
   position: relative;
   padding-bottom: 20px;
   display: flex;
-  width: 60%;
+  justify-content: center;
+  width: 70%;
   margin: 0 auto;
 }
 .footer a {
-  flex: 1;
+  /* flex: 1; */
   height: 70px;
   line-height: 70px;
   text-align: center;
@@ -218,6 +219,7 @@ a {
   font-size: 22px;
   background: url('../images/footer-item.png') no-repeat;
   background-size: 100% 100%;
+  width: calc( 100% / 8);
 }
 .footer a img {
   width: 35px;
@@ -388,7 +390,7 @@ a {
   top: 0;
   left: 0; */
 }
-.alignCenter{
+.alignCenter {
   display: flex;
   flex-direction: column;
   justify-content: center;

Some files were not shown because too many files changed in this diff