From 6fed0ef97675deaffaa466d8686d35563c8c33b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Sat, 17 Sep 2022 18:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B(=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86):=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=8A=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/zhongjianFourth.js          |  7 +++
 src/assets/js/http.js                         |  4 +-
 .../projectAdmin/zjsj/command/rightOne.vue    |  2 +-
 .../projectAdmin/zjsj/security/centerTop.vue  | 57 ++++++++++++++++---
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js
index 5825372a..21596306 100644
--- a/src/assets/js/api/zhongjianFourth.js
+++ b/src/assets/js/api/zhongjianFourth.js
@@ -29,3 +29,10 @@ export const getTodayInspectionInfo = params => get('xmgl/inspectTaskRecord/getT
  * @returns 
  */
 export const listProgressOfTheTask = params => get('xmgl/progressItem/getScheduleList', params);
+
+
+/* --------------安全管理------------ */
+// 人员管理
+export const getWorkerNumApi = data => get('xmgl/workerInfo/getPersonnelNum',data)
+// 时间区间查询人员增长趋势
+export const getWorkerGrowthApi = data => get('xmgl/workerInfo/getPersonnelGrowth',data)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 33741fa7..696c502b 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
-  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
diff --git a/src/views/projectAdmin/zjsj/command/rightOne.vue b/src/views/projectAdmin/zjsj/command/rightOne.vue
index ed7072b6..758fe7b5 100644
--- a/src/views/projectAdmin/zjsj/command/rightOne.vue
+++ b/src/views/projectAdmin/zjsj/command/rightOne.vue
@@ -55,7 +55,7 @@ export default {
     return {
       // 巡检数据
       pollingData: {
-        rectificationNum: undefined, // 完成整改数
+        rectificationNum: '', // 完成整改数
         totalNum: undefined, // 巡检总数
         closeRatio: undefined, // 占比
         days: undefined, // 安全生产天数
diff --git a/src/views/projectAdmin/zjsj/security/centerTop.vue b/src/views/projectAdmin/zjsj/security/centerTop.vue
index 3f016b46..d77d87c0 100644
--- a/src/views/projectAdmin/zjsj/security/centerTop.vue
+++ b/src/views/projectAdmin/zjsj/security/centerTop.vue
@@ -4,35 +4,35 @@
       <div class="topbox">
         <div class="item">
           <span>总人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.sumNumber}}</p>
         </div>
         <div class="item">
           <span>实际出勤人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.attendanceNumber}}</p>
         </div>
         <div class="item">
           <span>未出勤人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.noAttendanceNumber}}</p>
         </div>
         <div class="item">
           <span>实名制人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.realNameNumber}}</p>
         </div>
         <div class="item margin">
           <span>入职培训人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.inductionTrainingNumber}}</p>
         </div>
         <div class="item margin">
           <span>特殊工种人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.specialNumber}}</p>
         </div>
         <div class="item margin">
           <span>普通工种人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.commonNumber}}</p>
         </div>
         <div class="item margin">
           <span>管理人员人数</span>
-          <p>14521</p>
+          <p>{{WorkerNum.managerNumber}}</p>
         </div>
       </div>
       <div class="bunbox">
@@ -44,6 +44,8 @@
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-DD"
+            @change="getTime1"
           ></el-date-picker>
           <JBarChart :tooltip="{}" :xData="xData" :series="series" :grid="grid" />
         </div>
@@ -55,6 +57,8 @@
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-DD"
+            @change="getTime2"
           ></el-date-picker>
           <div class="rightChart" ref="rightChart"></div>
         </div>
@@ -66,11 +70,15 @@
 <script>
 import Card from "../components/Card.vue";
 import JBarChart from "../../common/jChart/bar/JBarChart.vue";
+import { getWorkerNumApi,getWorkerGrowthApi } from '@/assets/js/api/zhongjianFourth';
 import echarts from "echarts4";
 export default {
   components: { Card, JBarChart },
   data() {
     return {
+      WorkerNum:{},
+      time1:[],
+      time2:[],
       value1: "",
       value2: "",
       xData: ["18-24", "25-34", "34-49", "50-55", "未登记"],
@@ -89,9 +97,42 @@ export default {
     };
   },
   mounted() {
+    this.getData();
     this.createChart();
   },
+  watch:{
+    time1:{
+      handler(oldVal,newVal){
+        if(oldVal!=newVal){
+          this.getYearData()
+        }
+      }
+    }
+  },
   methods: {
+    getData(){
+      getWorkerNumApi({projectSn: this.$store.state.projectSn}).then((res)=>{
+        this.WorkerNum = res.result
+      })
+    },
+    getTime1(val){
+      // console.log('-----时间',val)
+      this.time1 = val
+    },
+    getTime2(val){
+      // console.log('-----时间',val)
+    },
+    getYearData(){
+      let data ={}
+      data.projectSn = this.$store.state.projectSn
+      if(this.time1 != null){
+        data.startDate = this.time1[0]
+        data.endDate = this.time1[1]
+        getWorkerGrowthApi(data).then((res)=>{
+        console.log('======',res)
+      })
+      }
+    },
     createChart() {
       let myChart = echarts.init(this.$refs.rightChart);
       const option = {