From 988f5784ecb0376832f1e0a622fc95fce8cfadaa Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 25 Sep 2024 09:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BA=BA=E5=91=98=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=8F=AD=E6=AC=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/api/bigScreenApi/index.js                 |  2 +-
 .../bigScreen/components/mapLeftContent.vue   | 20 ++++++++++++++++---
 src/views/bigScreen/map/index.vue             | 15 +++++++-------
 src/views/components/mapLeftNumber/index.vue  |  8 ++++++--
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index fd284ed..2c3a063 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
  # @Author: 张涛
  # @Date: 2023-11-09 18:29:41
  # @LastEditors: JC9527
- # @LastEditTime: 2024-05-15 13:40:14
+ # @LastEditTime: 2024-09-22 05:39:52
  # @FilePath: \JiangningUrbanManagePc\.env.development
 ### 
 # 页面标题
diff --git a/src/api/bigScreenApi/index.js b/src/api/bigScreenApi/index.js
index 67e9ce8..860bf7f 100644
--- a/src/api/bigScreenApi/index.js
+++ b/src/api/bigScreenApi/index.js
@@ -201,7 +201,7 @@ export function getUserByImei(params){
 // 根据手机号和人员名称查询
 export function dwgjList(params){
   return request({
-    url: '/jn/dwgj/list',
+    url: '/jn/scheduling/allList',
     method: 'get',
     params
   })
diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index fd13669..8cd9fe5 100644
--- a/src/views/bigScreen/components/mapLeftContent.vue
+++ b/src/views/bigScreen/components/mapLeftContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:44:13
  * @LastEditors: JC9527
- * @LastEditTime: 2024-09-05 17:30:07
+ * @LastEditTime: 2024-09-24 11:12:07
 -->
 <template>
   <div class="left-wai-box">
@@ -71,7 +71,7 @@
       </div>
       <div class="item lfet-list-one" id="parent-getHeight" :style="itemOne">
         <title-box title="人员在线情况" :id="1"></title-box>
-        <map-number title="在线人员总数" :onLine="personOnLine" :sum="perpsonNum" type="人" @unfold="unfold" :numberArray="peopleArray"
+        <map-number title="在线人员总数" :currentClasses="currentClasses" :onLine="personOnLine" :sum="perpsonNum" type="人" @unfold="unfold" :numberArray="peopleArray"
           :height="oneHeight" :id="1" v-on="$listeners"></map-number>
         <div style="display:flex;justify-content:flex-end;">
           <div class="pagesBtnChange">
@@ -209,6 +209,7 @@ export default {
       personLoading:false,
       isBreadcrumb:true,
       account:"",
+      currentClasses: "白班"
     }
   },
   props: ['personLine', 'carLine'],
@@ -441,7 +442,20 @@ export default {
     this.getEvent();
     this.getOnline();
     this.account = localStorage.getItem('account')
-    this.MYsummarystat()
+    this.MYsummarystat();
+
+    const now = new Date();
+    const hours = now.getHours() < 10 ? '0' + now.getHours() : now.getHours();
+    const minutes = now.getMinutes() < 10 ? '0' + now.getMinutes() : now.getMinutes();
+    let currentTime = hours + ':' + minutes;
+
+    if(currentTime > '07:30' && currentTime < '17:30') {
+      this.currentClasses = '白班'
+    } else if(currentTime > '17:30' && currentTime < '21:30'){
+      this.currentClasses = '值班/定岗'
+    } else{
+      this.currentClasses = '夜班'
+    }
   },
 }
 </script>
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index 46bc78b..9517584 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-09-14 15:28:34
+ * @LastEditTime: 2024-09-24 11:11:17
 -->
 <template>
   <div class="map-main">
@@ -520,7 +520,8 @@ import {
   getStreetShopList,
   listZhzz,
   getUserByImei,
-  dwgjList
+  dwgjList,
+  onlinePeople
 } from "@/api/bigScreenApi";
 import {
   previewURLs,
@@ -940,11 +941,11 @@ export default {
         this.personLine = [];
         this.videoPoint = [];
         // 获取人员信息
-        getDeviceList().then((res) => {
+        onlinePeople().then((res) => {
           this.mapLoading = false;
           // console.log(res,'点位信息');
-          if (res.data.obj) {
-            res.data.obj.forEach((element) => {
+          if (res.data) {
+            res.data.forEach((element) => {
               if (element.status == "0" || element.status == "1") {
                 this.personLine.push(element);
                 let obj = {position:[]};
@@ -2406,7 +2407,7 @@ export default {
       this.input = queryString;
       // 执法人员搜索
       if(this.actionMap == 1) {
-        dwgjList({name:queryString}).then(res=>{
+        dwgjList({nickName:queryString}).then(res=>{
           var restaurants = res.data;
           let a = [];
           restaurants.forEach((per=>{
@@ -2676,7 +2677,7 @@ export default {
   mounted() {
     // this.getPersonIcon();
     this.getCarList();
-    this.getrobotToken();
+    // this.getrobotToken();
     window.addEventListener('beforeunload', e => this.beforeunloadHandler(e));
     window.addEventListener('unload', e => this.unloadHandler(e));
     // this.markerInterval();
diff --git a/src/views/components/mapLeftNumber/index.vue b/src/views/components/mapLeftNumber/index.vue
index e3aa7d5..4b12d77 100644
--- a/src/views/components/mapLeftNumber/index.vue
+++ b/src/views/components/mapLeftNumber/index.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
       
-      <div>{{ onLine }}/{{ sum }}{{ type }}</div>
+      <div style="display: flex;align-items: center;"><div v-if="id == 1" style="margin-right: 5px;">{{ currentClasses }}: </div>{{ onLine }}/{{ sum }}{{ type }}</div>
     </div>
     <div class="header-title">
       <div class="header-title-left" :class="id == 1 ? 'header-title-left-two' : ''">{{ id == 1 ? "姓名" : "车牌号" }}</div>
@@ -78,6 +78,10 @@ export default {
     id:{
       type:Number,
       default:0,
+    },
+    currentClasses: {
+      type:String,
+      default:'白班',
     }
   },
   methods:{
@@ -102,7 +106,7 @@ export default {
     }
   },
   mounted(){
-    
+
     this.$nextTick(()=>{
       // 获取父级容器元素
       var parentElement = document.getElementById('parent');