From 7fbe838496148877bc5fe055e3098b3bc00a113d Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 20 Aug 2021 08:55:35 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/securityUnitOperation/securityEchart.js |   64 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/views/securityUnitOperation/securityEchart.js b/src/views/securityUnitOperation/securityEchart.js
index 971c5e6..f88d5c9 100644
--- a/src/views/securityUnitOperation/securityEchart.js
+++ b/src/views/securityUnitOperation/securityEchart.js
@@ -1,7 +1,7 @@
 function bottomOption(alldata) {
   let data = [];
   for (var i in alldata) {
-    data.push(alldata[i])
+    data.push(alldata[i]);
   }
   let option = {
     // title: {
@@ -47,7 +47,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     xAxis: {
       type: "category",
@@ -90,7 +90,6 @@
   return option;
 }
 function bottomOption1(alldata) {
-
   let option = {
     // title: {
     //   text: "公司运营趋势",
@@ -135,7 +134,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     xAxis: {
       type: "category",
@@ -168,7 +167,7 @@
     series: [
       {
         name: "趋势",
-        data: [10,20,14,15,16,17,24,15,3,7,11,23],
+        data: [10, 20, 14, 15, 16, 17, 24, 15, 3, 7, 11, 23],
         type: "line",
         smooth: true,
         areaStyle: {}
@@ -186,23 +185,20 @@
   alldata.forEach(item => {
     for (var i in item) {
       for (var j in item[i]) {
-        if (i === 'baoan') {
-          baoan.push(item[i][j])
-        } else if (i === 'zc') {
-          zc.push(item[i][j])
-        }
-        else if (i === 'chiz') {
-          chiz.push(item[i][j])
-        }
-        else if (i === 'sheb') {
-          sheb.push(item[i][j])
-        }
-        else if (i === 'paiq') {
-          paiq.push(item[i][j])
+        if (i === "baoan") {
+          baoan.push(item[i][j]);
+        } else if (i === "zc") {
+          zc.push(item[i][j]);
+        } else if (i === "chiz") {
+          chiz.push(item[i][j]);
+        } else if (i === "sheb") {
+          sheb.push(item[i][j]);
+        } else if (i === "paiq") {
+          paiq.push(item[i][j]);
         }
       }
     }
-  })
+  });
   let option = {
     // title: {
     //   text: "公司保安类数据对比",
@@ -218,7 +214,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     legend: {
       data: [
@@ -327,7 +323,7 @@
 function middleOption2(alldata) {
   let data = [];
   for (var i in alldata) {
-    data.push(alldata[i])
+    data.push(alldata[i]);
   }
   let option = {
     // title: {
@@ -347,7 +343,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     legend: {
       data: ["客户数"],
@@ -418,10 +414,14 @@
   return option;
 }
 
-function economicMiddle(data) {
-  let data1 = [];
-  for (var a in data) {
-    data1.push(data[a])
+function economicMiddle(data1,data2) {
+  let sbData = [];
+  let pqData = [];
+  for (var a in data1) {
+    sbData.push(data1[a]);
+  }
+  for (var b in data2) {
+    pqData.push(data2[b]);
   }
   let option = {
     tooltip: {
@@ -432,7 +432,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     legend: {
       data: ["缴纳社保人数", "公司派遣人数"],
@@ -495,20 +495,19 @@
         name: "缴纳社保人数",
         type: "line",
         stack: "总量",
-        data: data1
+        data: sbData
       },
       {
         name: "公司派遣人数",
         type: "line",
         stack: "总量",
-        data: [220, 182, 191, 234, 290, 330, 310, 111, 222, 132, 143, 123]
+        data: pqData
       }
     ]
   };
   return option;
 }
 function economicPieOption(allData) {
-
   let title = "总";
   let total = Number(allData.PCount) + Number(allData.WPCount);
   let option = {
@@ -542,7 +541,7 @@
       // borderColor: "gray", //设置边框颜色
       textStyle: {
         color: "#fff" //设置文字颜色
-      },
+      }
     },
     legend: {
       bottom: "0%",
@@ -572,6 +571,9 @@
         name: "人员分布",
         type: "pie",
         radius: ["40%", "70%"],
+        label: {
+          color: "#fff"
+        },
         data: [
           { value: allData.PCount, name: "已派遣人数" },
           { value: allData.WPCount, name: "未派遣人" }

--
Gitblit v1.9.3