From 76d669a9648e1bc60d39130fa01fa8d801ff23dc Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 8 Mar 2024 10:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E3=80=81=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E3=80=81=E8=B7=AF=E6=AE=B5=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8C=87=E6=B4=BE=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |    6 +-
 src/api/bigScreenApi/eventApi.js              |   42 +
 src/api/bigScreenApi/robot.js                 |   57 +-
 src/assets/styles/leaflet.scss                |   18 +-
 src/utils/request1.js                         |    3 +
 .../bigScreen/components/mapLeftContent.vue   |   28 +-
 .../bigScreen/components/mapRightContent.vue  |  106 +-
 src/views/bigScreen/map/index.vue             |  177 +-
 src/views/components/crewAssign/index.vue     |  110 +-
 src/views/components/mapLeftNumber/index.vue  |    4 +
 src/views/components/mapRight/index.vue       |    9 +-
 src/views/components/newEvent/index.vue       | 1478 +----------------
 src/views/components/personageTask/index.vue  |  105 +-
 src/views/components/personagetrack/index.vue |    4 +-
 src/views/components/shop/components/tab2.vue |   54 +-
 src/views/components/shop/components/tab3.vue |   49 +-
 src/views/components/shop/components/tab4.vue |   26 +-
 17 files changed, 662 insertions(+), 1614 deletions(-)

diff --git a/.env.development b/.env.development
index 85c2861..bc58c3c 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
  # @Author: 张涛
  # @Date: 2023-11-09 18:29:41
  # @LastEditors: JC9527
- # @LastEditTime: 2024-03-01 16:49:05
+ # @LastEditTime: 2024-03-07 20:51:13
  # @FilePath: \JiangningUrbanManagePc\.env.development
 ### 
 # 页面标题
@@ -14,10 +14,10 @@ ENV = 'development'
 # 若依管理系统/开发环境
 # /dev-api
 # VUE_APP_BASE_API = 'http://39.101.188.84:9037'
-# VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com'
+VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com'
 VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com'
 VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp'
-VUE_APP_BASE_API = 'http://192.168.0.105:9037'
+# VUE_APP_BASE_API = 'http://192.168.0.110:9037'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/bigScreenApi/eventApi.js b/src/api/bigScreenApi/eventApi.js
index 435e998..9d786b3 100644
--- a/src/api/bigScreenApi/eventApi.js
+++ b/src/api/bigScreenApi/eventApi.js
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2024-01-09 23:11:58
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-03-06 18:56:29
+ */
 import request from "@/utils/request2"
 
 // 事件来源按日/月纬度统计
@@ -48,4 +56,38 @@ export function getEventGridEnum() {
       "X-Access-Token": localStorage.getItem('robotToken')
     }
   })
+}
+
+// 网格数据
+export function statgrid(params){
+  return request({
+    url: "/event/summary/statgrid",
+    method:'get',
+    headers:{
+      isToken:false,
+    },
+    params
+  })
+}
+// 重点路段
+export function statroad(params){
+  return request({
+    url: "/event/summary/statroad",
+    method:'get',
+    headers:{
+      isToken:false,
+    },
+    params
+  })
+}
+// 重点区域
+export function statregion(params){
+  return request({
+    url: "/event/summary/statregion",
+    method:'get',
+    headers:{
+      isToken:false,
+    },
+    params
+  })
 }
\ No newline at end of file
diff --git a/src/api/bigScreenApi/robot.js b/src/api/bigScreenApi/robot.js
index 812ef7e..a6a3114 100644
--- a/src/api/bigScreenApi/robot.js
+++ b/src/api/bigScreenApi/robot.js
@@ -4,19 +4,44 @@
  * @Author: JC9527
  * @Date: 2024-01-11 23:19:29
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 23:59:57
+ * @LastEditTime: 2024-03-06 11:39:06
  */
 import request from "@/utils/request1"
 
-// 自动提交事件流程
+// 自动提交事件流程-1---保存事件数据接口
 export function eventSaveData(params,data) {
   return request({
     url: "/api/eform/engine/formEngine/saveData",
     method:'post',
+    // headers: {
+    //   isToken: false
+    // },
     params,
     data
   })
 }
+// 自动提交事件流程-2---获取流程权限
+export function getBpmOperateVo(params){
+  return request({
+    url: "/api/bpm/bpm-front/displayRest/getBpmOperateVo/v1",
+    method:'get',
+    // headers: {
+    //   isToken: false
+    // },
+    params
+  })
+}
+// 自动提交事件流程-3---调用自动提交
+export function autoSubmit(params){
+  return request({
+    url: "/api/bpm/bpm-front/operateRest/autoSubmit/v1",
+    method:'put',
+    // headers: {
+    //   isToken: false
+    // },
+    params
+  })
+}
 // 模拟登录
 export function robotLogin(data){
   return request({
@@ -36,30 +61,22 @@ export function ViewListPage(params,data){
 }
 /**
  * 
- * 任务派发流程
+ * 事件指派-保存业务数据
  */
-// 任务派发流程----3调用自动提交
-export function autoSubmit(data){
+// 1.事件指派-保存业务数据
+export function formEngineSaveData(params,data){
   return request({
-    url: "/api/bpm/bpm-front/operateRest/autoSubmit/v1",
-    method:'put',
+    url: "/api/eform/engine/formEngine/saveData",
+    method:'post',
+    params,
     data
   })
 }
-// 任务派至城管队长----1获取流程权限
-export function getBpmOperateVo(params){
+// 2.事件指派-流程流转
+export function auditSubmit(params){
   return request({
-    url: "/api/bpm/bpm-front/displayRest/getBpmOperateVo/v1",
+    url: "/audit/auditSubmit",
     method:'get',
-    params
-  })
-}
-// 任务派至城管队长----2保存业务数据
-export function distributeSaveData(params,data){
-  return request({
-    url: "/api/eform/engine/formEngine/saveData",
-    method:'post',
     params,
-    data
   })
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/leaflet.scss b/src/assets/styles/leaflet.scss
index 760b717..b702025 100644
--- a/src/assets/styles/leaflet.scss
+++ b/src/assets/styles/leaflet.scss
@@ -14,7 +14,7 @@
 // 事件分布
 .event-popup {
   width: 252px;
-  height: 224px;
+  // height: 244px;
   background-image: url("../images/popup/popup.png");
   background-size: 100% 100%;
   z-index: 600;
@@ -63,6 +63,7 @@
       .dot {
         width: 4px;
         height: 4px;
+        line-height: 17px;
         background: #DAEBFF;
         box-shadow: 0px 0px 10px 5px rgba(0, 119, 255, 0.25), 0px 0px 5px 0px rgba(229, 241, 255, 0.25);
         border-radius: 20px 20px 20px 20px;
@@ -78,8 +79,15 @@
         line-height: 17px;
       }
 
+      .name {
+        // flex: 1;
+        flex-wrap: nowrap;
+      }
+
       .position {
         width: 120px;
+        // flex: 1;
+        // flex-wrap: wrap;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -104,11 +112,15 @@
     }
   }
 }
+.event-popupTwo {
+  // height: 190px;
+}
 
 // 执法人员
 .person-popup {
   // width: 242px;
-  width: 470px;
+  // width: 470px;
+  width: 390px;
   height: 244px;
   background-image: url("../images/popup/popup.png");
   background-size: 100% 100%;
@@ -357,7 +369,7 @@
         .info-left {
           display: flex;
           // align-items: center;
-          width: 45%;
+          width: 35%;
           .dot {
             width: 4px;
             height: 4px;
diff --git a/src/utils/request1.js b/src/utils/request1.js
index 8e06ef8..d64337a 100644
--- a/src/utils/request1.js
+++ b/src/utils/request1.js
@@ -36,6 +36,9 @@ service.interceptors.request.use(config => {
     // config.headers['Authorization'] = 'Bearer ' +  getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     config.headers['X-Access-Token'] = localStorage.getItem('robotToken') // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  // if (localStorage.getItem('accessToken') && isToken) {
+  //   config.headers['X-Access-Token'] = localStorage.getItem('accessToken')
+  // }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params);
diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index b0b2000..5f668fb 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-03-01 16:48:15
+ * @LastEditTime: 2024-03-08 08:56:50
 -->
 <template>
   <div class="left-box">
@@ -82,7 +82,7 @@
     <div class="item lfet-list-two" :style="itemOne">
       <title-box title="车辆在线情况"></title-box>
       <map-number title="在线车辆总数" :onLine="10" :sum="18" type="辆" :numberArray="vehicleArray" :height="oneHeight"
-        :id="3"></map-number>
+        :id="3" v-on="$listeners"></map-number>
     </div>
   </div>
 </template>
@@ -99,29 +99,7 @@ export default {
       perpsonNum: 0,
       personOnLine: 0,
       peopleArray: [],
-      vehicleArray: [
-        {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        }, {
-          userName: '苏A123456'
-        },
-      ],
+      vehicleArray: [],
       itemOne: {
         height: '',
       },
diff --git a/src/views/bigScreen/components/mapRightContent.vue b/src/views/bigScreen/components/mapRightContent.vue
index 9e66fca..3086b90 100644
--- a/src/views/bigScreen/components/mapRightContent.vue
+++ b/src/views/bigScreen/components/mapRightContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 11:09:57
  * @LastEditors: JC9527
- * @LastEditTime: 2024-02-02 13:38:08
+ * @LastEditTime: 2024-03-08 10:15:01
 -->
 <template>
   <div class="right-box">
@@ -32,6 +32,7 @@ import mapRight from '../../components/mapRight/index.vue'
 import {
   getFence,
 } from "@/api/bigScreenApi";
+import { statgrid, statroad, statregion } from "@/api/bigScreenApi/eventApi"
 export default {
   name:'mapRightContent',
   components:{titleBox,mapRight},
@@ -108,36 +109,30 @@ export default {
   watch:{
     quyuData:{
       handler(newQuyu){
-        // console.log(newQuyu,'区域');
         if(newQuyu) {
-          this.quyuArray = newQuyu
+          // this.quyuArray = newQuyu;
+          // console.log("区域");
+          this.getquyu(newQuyu);
         }
       },
       immediate:true,
     },
-    // weilanData:{
-    //   handler(newWeilan){
-    //     // console.log(newWeilan,'围栏');
-    //     if(newWeilan) {
-    //       this.weilanArray = newWeilan
-    //     }
-    //   },
-    //   immediate:true,
-    // },
     luduanData:{
       handler(newLuduan){
-        // console.log(newLuduan,'路段');
         if(newLuduan) {
-          this.luduanArray = newLuduan
+          // console.log("路段");
+          // this.luduanArray = newLuduan;
+          this.getLuduan(newLuduan);
         }
       },
       immediate:true,
     },
     wanggeData: {
       handler(newWange){
-        // console.log(newWange,'网格');
         if(newWange) {
-          this.wanggeArray = newWange
+          // console.log("网格");
+          // this.wanggeArray = newWange;
+          this.getWangge(newWange);
         }
       },
       immediate:true,
@@ -163,8 +158,85 @@ export default {
           this.weilanArray = res.data;
         }
       })
-      
     },
+    getWangge(newWange){
+      let data = newWange.map((item)=>{
+        let data = {
+          startTime: this.getCurrentTime(),
+          endTime: this.getCurrentTime(1),
+          gridld: item.id
+        }
+        statgrid(data).then(res=>{
+          this.$set(item,'total',res.data.total);
+          item.total = res.data.total;
+          item.handled = res.data.handled;
+          item.unhandled = res.data.unhandled;
+        })
+        return item;
+      })
+      this.wanggeArray = data;
+      // let grids = []
+      // newWange.map((item)=>{
+      //   grids.push(item.id);
+      // })
+      // let data = {
+      //   startTime: this.getCurrentTime(),
+      //   endTime: this.getCurrentTime(1),
+      //   gridld: grids.join(",")
+      // }
+      // statgrid(data).then(res=>{
+      //   this.$set(item,'total',res.data.total);
+      //   item.total = res.data.total;
+      //   item.handled = res.data.handled;
+      //   item.unhandled = res.data.unhandled;
+      //   console.log(res,"网格数据");
+      // })
+    },
+    getquyu(newQuyu){
+      let data = newQuyu.map((item)=>{
+        let data = {
+          startTime: this.getCurrentTime(),
+          endTime: this.getCurrentTime(1),
+          gridld: item.id
+        }
+        statroad(data).then(res=>{
+          this.$set(item,'total',res.data.total);
+          item.total = res.data.total;
+          item.handled = res.data.handled;
+          item.unhandled = res.data.unhandled;
+        })
+        return item;
+      })
+      this.quyuArray = data;
+    },
+    getLuduan(newLuduan){
+      let data = newLuduan.map((item)=>{
+        let data = {
+          startTime: this.getCurrentTime(),
+          endTime: this.getCurrentTime(1),
+          gridld: item.id
+        }
+        statregion(data).then(res=>{
+          this.$set(item,'total',res.data.total);
+          item.total = res.data.total;
+          item.handled = res.data.handled;
+          item.unhandled = res.data.unhandled;
+        })
+        return item;
+      })
+      this.luduanArray = data;
+    },
+    getCurrentTime(id) {
+      const currentDate = new Date();
+      if(id){
+        currentDate.setDate(currentDate.getDate() + 1);
+      }
+      const year = currentDate.getFullYear();
+      const month = currentDate.getMonth() + 1 < 10 ? '0' + (currentDate.getMonth() + 1) : currentDate.getMonth() + 1; // 月份从0开始，所以要加1
+      const day = currentDate.getDate() < 10 ? '0' + currentDate.getDate() : currentDate.getDate();
+
+      return year + "-" + month + "-" + day;
+    }
   },
   mounted(){
     window.addEventListener("resize", () => {
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index 30db127..d62a93d 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-03-04 10:48:02
+ * @LastEditTime: 2024-03-08 09:06:26
 -->
 <template>
   <div class="map-main">
@@ -104,8 +104,8 @@
             </div>
             <div class="btns">
               <div @click="travelPath()">行程轨迹</div>
-              <div>附近队员</div>
-              <div>位置分享</div>
+              <!-- <div>附近队员</div> -->
+              <div @click="shareClick">位置分享</div>
               <div @click="watchClick">强制观摩</div>
               <div @click="taskClick">任务派发</div>
             </div>
@@ -121,7 +121,7 @@
         :position="eventInfo.position"
         :visible.sync="eventInfo.visible"
       >
-        <div class="event-popup">
+        <div class="event-popup" :class="eventInfo.info.status == '待受理' ? '':'event-popupTwo'">
           <div class="event-title">
             <div class="title">事件信息</div>
             <!-- <div class="mask" @click="markersClosePopup"></div> -->
@@ -136,19 +136,30 @@
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">事件类别：</div>
-              <div class="position">{{ eventInfo.info.type }}</div>
+              <el-tooltip :content="eventInfo.info.type" placement="top">
+                <div class="position">{{ eventInfo.info.type }}</div>
+              </el-tooltip>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">事件地址：</div>
-              <div class="position">{{ eventInfo.info.address }}</div>
+              <el-tooltip :content="eventInfo.info.address" placement="top">
+                <div class="position">{{ eventInfo.info.address }}</div>
+              </el-tooltip>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">描述：</div>
-              <div class="position">{{ eventInfo.info.content }}</div>
+              <el-tooltip :content="eventInfo.info.content" placement="top">
+                <div class="position">{{ eventInfo.info.content }}</div>
+              </el-tooltip>
             </div>
-            <div class="btn" @click="eventBtn">
+            <div class="event-info">
+              <div class="dot"></div>
+              <div class="name">状态：</div>
+              <div class="position">{{ eventInfo.info.status }}</div>
+            </div>
+            <div class="btn" v-show="eventInfo.info.status == '待受理'" @click="eventBtn">
               指派
             </div>
           </div>
@@ -158,7 +169,7 @@
       <!-- 执法车辆弹框 -->
       <el-amap-info-window
         v-if="carInfo.visible"
-        :offset="[-10,-40]"
+        :offset="[-0,-10]"
         :closeWhenClickMap="true"
         :position="carInfo.position"
         :visible.sync="carInfo.visible"
@@ -172,8 +183,8 @@
           <div class="car-main">
             <div class="car-info">
               <div class="dot"></div>
-              <div class="name">执法一队1号车</div>
-              <div class="position">苏A568974</div>
+              <div class="name">{{carInfo.info.carName}}</div>
+              <div class="position">{{carInfo.info.carCode}}</div>
             </div>
             <div class="btn" @click="travelPath()">行程轨迹</div>
           </div>
@@ -199,7 +210,7 @@
               <div class="person-info">
                 <div class="info-left">
                   <div class="dot"></div>
-                  <div class="name">监控点名称：</div>
+                  <div class="name">点位名称：</div>
                 </div>
                 <div class="position">{{ monitoringInfo.info.name }}</div>
               </div>
@@ -254,12 +265,16 @@
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">所在地址：</div>
-              <div class="position">{{ shopInfo.info.bodyAddress }}</div>
+              <el-tooltip :content="shopInfo.info.bodyAddress" placement="top">
+                <div class="position">{{ shopInfo.info.bodyAddress }}</div>
+              </el-tooltip>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">描述：</div>
-              <div class="position">{{ shopInfo.info.bodyName }}</div>
+              <el-tooltip :content="shopInfo.info.bodyName" placement="top">
+                <div class="position">{{ shopInfo.info.bodyName }}</div>
+              </el-tooltip>
             </div>
           
             <div class="btn" @click="getShopInfo">
@@ -276,7 +291,7 @@
     <transition name="left-animationMap">
       <div class="map-left" v-if="leftAnimationData">
         <!--  :personLine="personLine" -->
-        <map-left :carLine="carLine" @realTimeLocationClick="realTimeLocationClick"></map-left>
+        <map-left :carLine="carLine" @realTimeLocationClick="realTimeLocationClick" @carTimeLocationClick="realTimeLocationClick"></map-left>
       </div>
     </transition>
 
@@ -415,6 +430,7 @@
       <div class="bgt"></div>
     </div>
     <personage-track ref="personageTrack"></personage-track>
+    <!-- 事件指派人员 -->
     <crew-assign ref="crewAssign"></crew-assign>
     <!-- <video-wall ref="videoWall"></video-wall> -->
     <alone-video ref="aloneVideo"></alone-video>
@@ -545,6 +561,7 @@ export default {
       // 车辆弹框信息
       carInfo: {
         position: [],
+        info:{},
         visible: false,
       },
       // 监控视频弹框信息
@@ -958,7 +975,8 @@ export default {
     },
     // 事件的非聚合自定义样式及点击事件
     _eventMarker (context) {
-      var content = `<div class="markerStyles"><img src="${require("../../../assets/images/icon/icon2.png")}" alt=""></div>`;
+      // console.log(context,"context");
+      var content = `<div class="markerStyles"><img src="${context.data[0].info.status == '已处理' ? require("../../../assets/images/icon/offLine2.png") : require("../../../assets/images/icon/icon2.png")}" alt=""></div>`;
       var offset = new AMap.Pixel(-13, -16);
       context.marker.setContent(content)
       context.marker.setOffset(offset)
@@ -968,6 +986,18 @@ export default {
         this.eventInfo.visible = true;
       })
     },
+    // 车辆非聚合自定义样式及点击事件
+    _carMarker(context){
+      var content = `<div class="markerStyles"><img src="${require("../../../assets/images/icon/icon4.png")}" alt=""></div>`;
+      var offset = new AMap.Pixel(-13, -16);
+      context.marker.setContent(content)
+      context.marker.setOffset(offset)
+      context.marker.on('click',(ev)=>{
+        this.carInfo.position = context.data[0].position;
+        this.carInfo.info = context.data[0].info;
+        this.carInfo.visible = true;
+      })
+    },
     // 视频非聚合自定义样式及点击事件
     _renderMarker (context) {
       var content = `<div class="markerStyles"><img src="${context.data[0].info.status == 1 ? require("../../../assets/images/icon/icon5.png") : require("../../../assets/images/icon/offLine4.png")}" alt=""></div>`;
@@ -993,6 +1023,7 @@ export default {
         this.shopInfo.visible = true;
       })
     },
+    
 
     // 各个点位获取
     getMarkers(id,status){
@@ -1119,17 +1150,58 @@ export default {
           }
         })
       } else if(id == 3){
-        point.features.forEach((element)=>{
-          if (element.properties.name == "执法车辆") {
+        // point.features.forEach((element)=>{
+        //   if (element.properties.name == "执法车辆") {
+        //     let obj = {position:[]};
+        //     obj.position[0] = element.geometry.coordinates[0];
+        //     obj.position[1] = element.geometry.coordinates[1];
+        //     obj.imgSrc = element.properties.status == "0"? offIcon3 : ico4;
+        //     obj.text = element.properties.name;
+        //     this.markers.push(obj)
+        //     this.mapLoading = false;
+        //   }
+        // })
+        getCarManageList({pageNum: 1,pageSize: 1000}).then(res=>{
+          // console.log('车辆',res);
+          this.carLine = res.rows
+          let videoPoint = [];
+          this.mapLoading = false;
+          res.rows.forEach((element)=>{
+          // console.log(element);
             let obj = {position:[]};
-            obj.position[0] = element.geometry.coordinates[0];
-            obj.position[1] = element.geometry.coordinates[1];
-            obj.imgSrc = element.properties.status == "0"? offIcon3 : ico4;
-            obj.text = element.properties.name;
-            this.markers.push(obj)
+            obj.position[0] = element.longitude;
+            obj.position[1] = element.latitude;
+            // obj.imgSrc = element.status == "0" ? offIcon4 : ico5;
+            obj.lnglat = new AMap.LngLat(element.longitude ? element.longitude : 0 ,element.latitude ? element.latitude : 0)
+            obj.imgSrc = ico4;
+            obj.info = element;
+            // this.markers.push(obj)
+            videoPoint.push(obj)
+          })
+          this.count = videoPoint.length;
+          
+          AMap.plugin(['AMap.MarkerCluster','AMap.Size','AMap.Pixel'],()=>{
+              
+            this.cluster = new AMap.MarkerCluster(this.map,videoPoint,{
+              gridSize: 60, // 设置网格像素大小
+              styles: sts,
+              maxZoom: 15,
+              // renderClusterMarker: this._renderClusterMarker, // 自定义聚合点样式
+              renderMarker: this._carMarker, // 自定义非聚合点样式
+            })
+          })
+            // res.rows.forEach(element => {
+            //   let obj = {position:[]};
+            //   obj.position[0] = element.longitude;
+            //   obj.position[1] = element.latitude;
+            //   obj.imgSrc = ico6;
+            //   obj.info = element;
+            //   this.markers.push(obj)
+            //   this.mapLoading = false;
+            // })
+          }).catch(err=>{
             this.mapLoading = false;
-          }
-        })
+          })
       } else if(id == 4){
         getVideoPageEq({pageNo:1,pageSize:1000}).then(res=>{
           this.mapLoading = false;
@@ -1251,7 +1323,11 @@ export default {
     },
     // 任务派发事件
     taskClick(){
-      this.$refs.personageTask.open(this.personInfo.info);
+      if(this.personInfo.info.status == "1") {
+        this.$refs.personageTask.open(this.personInfo.info);
+      } else {
+        this.$modal.msgError("该设备已离线");
+      }
     },
     // 播放监控视频
     initVideoPlayer(videoUrl){
@@ -1324,7 +1400,7 @@ export default {
           if(res.code == 200 && res.data.msg == '操作成功') {
           // http://121.229.2.163:9291/live/9999   http://120.27.25.166:9305/live/9999_
             setTimeout(()=>{
-              this.initVideoPlayer(`http://121.229.2.163:9291/live/9999_${this.personInfo.info.userId}.flv`)
+              this.initVideoPlayer(`https://121.229.2.163:9307/live/9999_${this.personInfo.info.userId}.flv`)
             },3000)
           }
         })
@@ -1343,6 +1419,21 @@ export default {
       this.player = null
       if(this.timer) clearInterval(this.timer)
     },
+    // 位置分享
+    shareClick(){
+      console.log(this.personInfo,"位置分享");
+      if(this.personInfo.info.status == "1") {
+        var aux = document.createElement("input"); 
+        aux.setAttribute("value", this.personInfo.info.address); 
+        document.body.appendChild(aux); 
+        aux.select();
+        document.execCommand("copy"); 
+        document.body.removeChild(aux);
+        this.$modal.msgSuccess("位置已复制");
+      } else {
+        this.$modal.msgError("该人员已离线");
+      }
+    },
     // 事件指派
     eventBtn(){
       this.$refs.crewAssign.open(this.eventInfo.info);
@@ -1614,6 +1705,18 @@ export default {
         })
       })
     },
+    // 今日明日获取
+    getCurrentTime(id) {
+      const currentDate = new Date();
+      if(id){
+        currentDate.setDate(currentDate.getDate() + 1);
+      }
+      const year = currentDate.getFullYear();
+      const month = currentDate.getMonth() + 1; // 月份从0开始，所以要加1
+      const day = currentDate.getDate();
+
+      return year + "-" +month + "-" + day;
+    },
     // 开启围栏，路段，区域的点击事件
     openClick(layer){
       layer.on('click',(e)=>{
@@ -1672,14 +1775,20 @@ export default {
     },
     // 子组件的实时定位事件
     realTimeLocationClick(item,id){
-      if(id == this.actionMap) {
+      if(id == 1) {
         this.personLine.forEach(per=>{
           if(item.imei == per.imei) {
             this.map.setZoomAndCenter(16,[per.longitude,per.latitude]);
           }
         })
-      } else if(id == this.actionMap){
-
+      } else if(id == 3){
+        // console.log("进来了");
+        console.log(this.carInfo);
+        this.carLine.forEach(car=>{
+          if(item.id == car.id) {
+            this.map.setZoomAndCenter(16,[car.longitude,car.latitude]);
+          }
+        })
       }
     },
     // 执法人员/执法车辆 行程轨迹
@@ -1687,7 +1796,7 @@ export default {
       if(this.actionMap == 1) {
         this.$refs.personageTrack.open("person", this.personInfo.info);
       } else if(this.actionMap == 3) {
-        this.$refs.personageTrack.open("car");
+        this.$refs.personageTrack.open("car", this.car.info);
       }
     },
     // 子组件的名称点击事件
@@ -2404,7 +2513,7 @@ export default {
     },
     confirm() {
       // 事件新增完毕重新请求事件列表及经纬度
-      
+      this.getMarkers(2);
     },
     // 切换地图事件
     changeMap(id) {
@@ -2449,7 +2558,7 @@ export default {
     // 获取车辆信息
     getCarList(){
       getCarManageList({pageNum: 1,pageSize: 10}).then(res=>{
-        // console.log(res);
+        // console.log('车辆',res);
         this.carLine = res.rows
       })
     },
@@ -2486,7 +2595,7 @@ export default {
     // 模拟登录获取token
     getrobotToken(){
       robotLogin({username:"superAdmin",password:"sa@123456"}).then(res=>{
-        console.log(res,"登录信息");
+        // console.log(res,"登录信息");
         if(res.code == 200) {
           // setRobotToken(res.result.token)
           localStorage.setItem('robotToken',res.result.token)
diff --git a/src/views/components/crewAssign/index.vue b/src/views/components/crewAssign/index.vue
index 7988bf4..03cfc61 100644
--- a/src/views/components/crewAssign/index.vue
+++ b/src/views/components/crewAssign/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-17 09:04:40
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-04 10:49:27
+ * @LastEditTime: 2024-03-07 13:53:39
 -->
 <template>
   <dia-log ref="dialog2" width="30%" title="人员指派">
@@ -52,6 +52,7 @@
         <div class="right">
           <el-date-picker
             v-model="dateTime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             placeholder="选择日期时间"
           >
@@ -69,6 +70,10 @@
 <script>
 import diaLog from "../../components/dialog/index.vue";
 import { hasImeiTree, getDept } from "@/api/bigScreenApi"
+import {
+  formEngineSaveData,
+  auditSubmit, 
+} from "@/api/bigScreenApi/robot.js";
 export default {
   components: { diaLog },
   data() {
@@ -82,14 +87,11 @@ export default {
         lazy:true,
         lazyLoad:(node, resolve)=>{
           const { children,value,level } = node;
-          // console.log(children,"children")
-          // console.log(value);
-          // console.log("level",level);
-       if(children?.length == 0 ) {
+          if(children?.length == 0 ) {
             getDept(value).then(res=>{
               const nodes = Array.from(res.data).map((item)=>{
                 return {
-                  deptId:item.userId,
+                  deptId:item.userName,
                   deptName:item.nickName,
                   leaf:level >= level
                 }
@@ -102,14 +104,33 @@ export default {
         }
       },
       eventInfo:{},
+      query:{
+        formKey:"event-holder",
+        isFlow:"true",
+      },
+      body:{
+        formData:{
+          "report-event":{
+            id:"",                                        // 事件id
+            tasks:{
+              taskRandNumber:"",                          // 指派时的唯一值年月日时分秒毫秒
+              taskDeadline:"",                            // 截至时间
+              taskName:""                                 // 任务名称
+            },
+          }
+        },
+        saveParameter:{},
+        docList:[],
+      }
     };
   },
   methods: {
     open(info) {
       this.$refs.dialog2.open("2");
       hasImeiTree().then(res=>{
-        // console.log('部门树',res);
+        console.log('部门树',res);
         this.options = res.data[0].children[0].children;
+        console.log(this.options,"this.options");
       })
       this.eventInfo = info;
     },
@@ -120,10 +141,83 @@ export default {
     cancel() {
       this.$refs.dialog2.Close();
     },
-    confirm() {},
+    confirm() {
+      if( !this.dateTime & !this.value) {
+        this.$modal.msgError("请选择指派人员和截止时间")
+      } else if(!this.dateTime){
+        this.$modal.msgError("请选择截止时间")
+      } else if(!this.value) {
+        this.$modal.msgError("请选择指派人员")
+      } else {
+        // console.log(this.body.reportEvent);
+        let body = {
+          formData:{
+            "report-event":{
+              id: this.eventInfo.id,                                           // 事件id
+              tasks:{
+                taskIsdiscard: "0",
+                taskVoidReason: "",
+                taskType: "2",
+                taskRandNumber:this.getCurrentTime(),                          // 指派时的唯一值年月日时分秒毫秒
+                taskDeadline:this.dateTime,                                    // 截至时间
+                taskStatus: "6",
+                taskName:this.eventInfo.name                                   // 任务名称
+              },
+              status: "1"
+            }
+          },
+          saveParameter:{},
+          docList:[],
+        }
+        formEngineSaveData(this.query,body).then(res=>{
+          // console.log(res,"信息");
+          // name获取的中队名称
+          let name = this.recursion(this.value[this.value.length - 2],this.options);
+          if(res.code == 200) {
+            auditSubmit({formId:res.result,phone:this.value[this.value.length - 1],depName:"集团有限公司环卫管理部"}).then(resTwo=>{
+              // console.log(resTwo,"流程流转");
+              if(resTwo.code == 200) {
+                this.value = "";
+                this.dateTime = "";
+                this.$modal.msgSuccess("指派成功");
+                this.Close();
+              } 
+            }).catch(err=>{
+              this.value = "";
+              this.dateTime = "";
+              this.Close();
+            })
+          }
+        })
+      }
+    },
     handleChange(value){
       console.log(value);
     },
+    recursion(id,arr){
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].deptId === id) {
+          return arr[i].deptName;
+        } else if (arr[i].children) {
+          let result = this.recursion(id, arr[i].children);
+          if (result) {
+            return result;
+          }
+        }
+      }
+      return null;
+    },
+    getCurrentTime() {
+      var currentDate = new Date();
+      var year = currentDate.getFullYear();
+      var month = ('0' + (currentDate.getMonth() + 1)).slice(-2);
+      var day = ('0' + currentDate.getDate()).slice(-2);
+      var hours = ('0' + currentDate.getHours()).slice(-2);
+      var minutes = ('0' + currentDate.getMinutes()).slice(-2);
+      var seconds = ('0' + currentDate.getSeconds()).slice(-2);
+      var milliseconds = ('00' + currentDate.getMilliseconds()).slice(-3);
+      return year + month + day + hours + minutes + seconds + milliseconds;
+    }
   },
 };
 </script>
diff --git a/src/views/components/mapLeftNumber/index.vue b/src/views/components/mapLeftNumber/index.vue
index 10752c8..300570b 100644
--- a/src/views/components/mapLeftNumber/index.vue
+++ b/src/views/components/mapLeftNumber/index.vue
@@ -75,12 +75,16 @@ export default {
     realTimeLocation(item){
       if(this.id == 1) {
         this.$emit("realTimeLocationClick", item,this.id);
+      } else if(this.id == 3) {
+        this.$emit("carTimeLocationClick", item,this.id);
       }
     },
     // 历史轨迹
     historicalRoute(item){
       if(this.id == 1) {
         this.$refs.personageTrack.open("person", item);
+      } else if(this.id == 3) {
+        this.$refs.personageTrack.open("car", item);
       }
     }
   },
diff --git a/src/views/components/mapRight/index.vue b/src/views/components/mapRight/index.vue
index bcedbc0..0f00532 100644
--- a/src/views/components/mapRight/index.vue
+++ b/src/views/components/mapRight/index.vue
@@ -18,10 +18,13 @@
         <div>{{ item.resolved }}</div>
         <div class="unsolved">{{ item.unsolved }}</div> -->
         <div v-if="id == 4">{{ item.ydk || 0 }}</div>
-        <div v-else>50</div>
+        <!-- 今日事件 -->
+        <div v-else>{{ item.total }}</div>
         <div v-if="id == 4">{{ item.wdk || 0 }}</div>
-        <div v-else>30</div>
-        <div class="unsolved" v-if="id != 4">20</div>
+        <!-- 已处理 -->
+        <div v-else>{{ item.handled }}</div>
+        <!-- 未处理 -->
+        <div class="unsolved" v-if="id != 4">{{ item.unhandled }}</div>
       </div>
     </div>
   </div>
diff --git a/src/views/components/newEvent/index.vue b/src/views/components/newEvent/index.vue
index f84e310..2cda9f3 100644
--- a/src/views/components/newEvent/index.vue
+++ b/src/views/components/newEvent/index.vue
@@ -167,7 +167,9 @@ import videoUpload from "../videoFileUpload/index.vue"
 import { getEventTypeEnum, getEventGridEnum } from '@/api/bigScreenApi/eventApi.js'
 import {
   getQueryViewListPage,
-  eventSaveData
+  eventSaveData, 
+  getBpmOperateVo, 
+  autoSubmit 
 } from "@/api/bigScreenApi/robot.js";
 export default {
   components:{diaLog,myUpload,videoUpload},
@@ -225,26 +227,7 @@ export default {
         formKey:"report-event-submit",                                          // 表单标识，固定参数
         processDefId:"Process_17roha9:2:7fed99d1-964d-11ee-b204-0242ac1e0014",  // 流程id，固定参数
         isFlow:"true",                                                          // 是否触发流程，默认为true
-      },
-      formData:{
-        "formData":{
-          "reportEventObj": {
-            "address": "上海镇江市鄂城区",
-            "audioUrl": "http://xsupqgraf.io/vnszlcr",
-            "content": "veniam",
-            "createPhone": "18644579846",
-            "dataStatus": "fugiat est nisi",
-            "eventSource": "non ex",
-            "imgUrl": "http://dummyimage.com/400x400",
-            "isSimple": "dolore",
-            "meshOccurs": "ut cillum nisi",
-            "name": "义里再",
-            "openTime": "2014-11-02 21:34:15",
-            "randNumber": "2",
-            "type": "veniam Lorem ullamco id reprehenderit",
-            "videoUrl": "http://ederrs.ga/fbbtutxdhq"
-          }
-        }
+        taskId:"",
       },
       typeProps:{
         label:"name",
@@ -256,1425 +239,8 @@ export default {
         value:"id",
         children:"subList"
       },
-      gridOptions: [
-        {
-          value: '一中队',
-          label: '一中队',
-          children: [
-            {
-              value: '一号网格',
-              label: '一号网格',
-            },{
-              value: '二号网格',
-              label: '二号网格',
-            },{
-              value: '三号网格',
-              label: '三号网格',
-            },{
-              value: '四号网格',
-              label: '四号网格',
-            },{
-              value: '五号网格',
-              label: '五号网格',
-            },{
-              value: '六号网格',
-              label: '六号网格',
-            },{
-              value: '七号网格',
-              label: '七号网格',
-            },
-          ]
-        },{
-          value: '二中队',
-          label: '二中队',
-          children: [
-            {
-              value: '一号网格',
-              label: '一号网格',
-            },{
-              value: '二号网格',
-              label: '二号网格',
-            },{
-              value: '三号网格',
-              label: '三号网格',
-            },{
-              value: '四号网格',
-              label: '四号网格',
-            }
-          ]
-        },{
-          value: '三中队',
-          label: '三中队',
-          children: [
-            {
-              value: '一号网格',
-              label: '一号网格',
-            },{
-              value: '二号网格',
-              label: '二号网格',
-            },{
-              value: '三号网格',
-              label: '三号网格',
-            },{
-              value: '四号网格',
-              label: '四号网格',
-            },{
-              value: '五号网格',
-              label: '五号网格',
-            }
-          ]
-        },{
-          value: '四中队',
-          label: '四中队',
-          children: [
-            {
-              value: '一号网格',
-              label: '一号网格',
-            },{
-              value: '二号网格',
-              label: '二号网格',
-            },{
-              value: '三号网格',
-              label: '三号网格',
-            },{
-              value: '四号网格',
-              label: '四号网格',
-            },{
-              value: '五号网格',
-              label: '五号网格',
-            },{
-              value: '六号网格',
-              label: '六号网格',
-            },{
-              value: '七号网格',
-              label: '七号网格',
-            },{
-              value: '八号网格',
-              label: '八号网格',
-            },
-          ]
-        },{
-          value: '开发区空港开发区',
-          label: '开发区空港开发区',
-        },{
-          value: '开发区软件园',
-          label: '开发区软件园',
-        }
-      ],
-      options: [
-        {
-          value: '道路交通',
-          label: '道路交通',
-          children: [
-            {
-              value: '停车场',
-              label: '停车场',
-            },{
-              value: '停车咪表',
-              label: '停车咪表',
-            },{
-              value: '公交站亭',
-              label: '公交站亭',
-            },{
-              value: '出租车站牌',
-              label: '出租车站牌',
-            },{
-              value: '过街天桥',
-              label: '过街天桥',
-            },{
-              value: '地下通道',
-              label: '地下通道',
-            },{
-              value: '高架立交桥',
-              label: '高架立交桥',
-            },{
-              value: '跨河桥',
-              label: '跨河桥',
-            },{
-              value: '公交标志牌',
-              label: '公交标志牌',
-            },{
-              value: '交通信号灯',
-              label: '交通信号灯',
-            },{
-              value: '交通护栏',
-              label: '交通护栏',
-            },{
-              value: '存车支架',
-              label: '存车支架',
-            },{
-              value: '路名牌',
-              label: '路名牌',
-            },{
-              value: '交通信号设施',
-              label: '交通信号设施',
-            },{
-              value: '监控电子眼',
-              label: '监控电子眼',
-            },{
-              value: '道路信息显示屏',
-              label: '道路信息显示屏',
-            },{
-              value: '道路隔音屏',
-              label: '道路隔音屏',
-            },{
-              value: '交通岗亭',
-              label: '交通岗亭',
-            },
-          ]
-        },{
-          value: '房屋土地',
-          label: '房屋土地',
-          children: [
-            {
-              value: '宣传栏',
-              label: '宣传栏',
-            },{
-              value: '人防工事',
-              label: '人防工事',
-            },{
-              value: '公房地下室',
-              label: '公房地下室',
-            }
-          ]
-        },{
-          value: '公用设施',
-          label: '公用设施',
-          children: [
-            {
-              value: '上水井盖',
-              label: '上水井盖',
-            },{
-              value: '污水井盖',
-              label: '污水井盖',
-            },{
-              value: '雨水井盖',
-              label: '雨水井盖',
-            },{
-              value: '雨水箅子',
-              label: '雨水箅子',
-            },{
-              value: '电力井盖',
-              label: '电力井盖',
-            },{
-              value: '路灯井盖',
-              label: '路灯井盖',
-            },{
-              value: '通讯井盖',
-              label: '通讯井盖',
-            },{
-              value: '电视井盖',
-              label: '电视井盖',
-            },{
-              value: '网络井盖',
-              label: '网络井盖',
-            },{
-              value: '热力井盖',
-              label: '热力井盖',
-            },{
-              value: '燃气井盖',
-              label: '燃气井盖',
-            },{
-              value: '公安井盖',
-              label: '公安井盖',
-            },{
-              value: '消防井盖',
-              label: '消防井盖',
-            },{
-              value: '无主井盖',
-              label: '无主井盖',
-            },{
-              value: '通讯交接箱',
-              label: '通讯交接箱',
-            },{
-              value: '电力设施',
-              label: '电力设施',
-            },{
-              value: '立杆',
-              label: '立杆',
-            },{
-              value: '路灯',
-              label: '路灯',
-            },{
-              value: '地灯',
-              label: '地灯',
-            },{
-              value: '景观灯',
-              label: '景观灯',
-            },{
-              value: '报刊亭',
-              label: '报刊亭',
-            },{
-              value: '电话亭',
-              label: '电话亭',
-            },{
-              value: '邮筒',
-              label: '邮筒',
-            },{
-              value: '信息亭',
-              label: '信息亭',
-            },{
-              value: '自动售货机',
-              label: '自动售货机',
-            },{
-              value: '健身设施',
-              label: '健身设施',
-            },{
-              value: '中水井盖',
-              label: '中水井盖',
-            },{
-              value: '公交井盖',
-              label: '公交井盖',
-            },{
-              value: '输油（气）井盖',
-              label: '输油（气）井盖',
-            },{
-              value: '特殊井盖',
-              label: '特殊井盖',
-            },{
-              value: '民用井盖',
-              label: '民用井盖',
-            },{
-              value: '供水器',
-              label: '供水器',
-            },{
-              value: '高压线铁塔',
-              label: '高压线铁塔',
-            },{
-              value: '变压器（箱）',
-              label: '变压器（箱）',
-            },{
-              value: '燃气调压站（箱）',
-              label: '燃气调压站（箱）',
-            },{
-              value: '售货亭',
-              label: '售货亭',
-            },{
-              value: '治安岗亭',
-              label: '治安岗亭',
-            },
-          ]
-        },{
-          value: '街面秩序',
-          label: '街面秩序',
-          children: [
-            {
-              value: '无照经营游商',
-              label: '无照经营游商',
-            },{
-              value: '流浪乞讨',
-              label: '流浪乞讨',
-            },{
-              value: '占道废品收购',
-              label: '占道废品收购',
-            },{
-              value: '店外经营',
-              label: '店外经营',
-            },{
-              value: '机动车乱停乱放',
-              label: '机动车乱停乱放',
-            },{
-              value: '非机动车乱停乱放',
-              label: '非机动车乱停乱放',
-            },{
-              value: '乱堆物堆料',
-              label: '乱堆物堆料',
-            },{
-              value: '商业噪音',
-              label: '商业噪音',
-            },{
-              value: '黑车拉客',
-              label: '黑车拉客',
-            },{
-              value: '露天烧烤',
-              label: '露天烧烤',
-            },{
-              value: '沿街晾挂',
-              label: '沿街晾挂',
-            },{
-              value: '非法出版物销售',
-              label: '非法出版物销售',
-            },{
-              value: '空调室外机低挂',
-              label: '空调室外机低挂',
-            },{
-              value: '其他街面秩序问题',
-              label: '其他街面秩序问题',
-            }
-          ]
-        },{
-          value: '扩展部件',
-          label: '扩展部件',
-          children: [
-            {
-              value: '扩展部件',
-              label: '扩展部件',
-            },{
-              value: '园林井盖',
-              label: '园林井盖',
-            },{
-              value: '信号灯电源井盖',
-              label: '信号灯电源井盖',
-            },{
-              value: '邮政井盖',
-              label: '邮政井盖',
-            },{
-              value: '电缆井盖',
-              label: '电缆井盖',
-            },{
-              value: '化粪池井盖',
-              label: '化粪池井盖',
-            },{
-              value: '水井',
-              label: '水井',
-            },{
-              value: '沟槽厕所盖板',
-              label: '沟槽厕所盖板',
-            },{
-              value: '电力设施标识牌',
-              label: '电力设施标识牌',
-            },{
-              value: '电力立杆',
-              label: '电力立杆',
-            },{
-              value: '通信立杆',
-              label: '通信立杆',
-            },{
-              value: '公交立杆',
-              label: '公交立杆',
-            },{
-              value: '特殊立杆',
-              label: '特殊立杆',
-            },{
-              value: '不明立杆',
-              label: '不明立杆',
-            },{
-              value: '旗杆',
-              label: '旗杆',
-            },{
-              value: '监控电子眼',
-              label: '监控电子眼',
-            },{
-              value: '休息亭',
-              label: '休息亭',
-            },{
-              value: '自助缴费机',
-              label: '自助缴费机',
-            },{
-              value: '充电桩',
-              label: '充电桩',
-            },{
-              value: '防蚊闸',
-              label: '防蚊闸',
-            },{
-              value: '跨河管道',
-              label: '跨河管道',
-            },{
-              value: '露天燃气管道',
-              label: '露天燃气管道',
-            },{
-              value: '晒衣架',
-              label: '晒衣架',
-            },{
-              value: '路灯配电表箱',
-              label: '路灯配电表箱',
-            },{
-              value: '路灯杆',
-              label: '路灯杆',
-            },{
-              value: '地埋电缆',
-              label: '地埋电缆',
-            },{
-              value: '泵站',
-              label: '泵站',
-            },{
-              value: '公共阅报栏',
-              label: '公共阅报栏',
-            },{
-              value: '护栏等防护设施',
-              label: '护栏等防护设施',
-            },{
-              value: '雨水井',
-              label: '雨水井',
-            },{
-              value: '排水设施',
-              label: '排水设施',
-            },{
-              value: '通信铁塔',
-              label: '通信铁塔',
-            },{
-              value: '配电柜',
-              label: '配电柜',
-            },{
-              value: '立体车库',
-              label: '立体车库',
-            },{
-              value: '交通标志牌',
-              label: '交通标志牌',
-            },{
-              value: '限高架标志',
-              label: '限高架标志',
-            },{
-              value: '地名牌',
-              label: '地名牌',
-            },{
-              value: '防撞桶',
-              label: '防撞桶',
-            },{
-              value: '安全岛',
-              label: '安全岛',
-            },{
-              value: '人行横道桩',
-              label: '人行横道桩',
-            },{
-              value: '便道桩',
-              label: '便道桩',
-            },{
-              value: '柔性隔离体',
-              label: '柔性隔离体',
-            },{
-              value: '道路信息显示屏',
-              label: '道路信息显示屏',
-            },{
-              value: '非机动车停放点',
-              label: '非机动车停放点',
-            },{
-              value: '自行车租赁点',
-              label: '自行车租赁点',
-            },{
-              value: '铁道口设施',
-              label: '铁道口设施',
-            },{
-              value: '栈桥',
-              label: '栈桥',
-            },{
-              value: '水域标示牌',
-              label: '水域标示牌',
-            },{
-              value: '港监设施',
-              label: '港监设施',
-            },{
-              value: '道路临时停车场点',
-              label: '道路临时停车场点',
-            },{
-              value: '道路停车泊位标线、标识',
-              label: '道路停车泊位标线、标识',
-            },{
-              value: '公共停车场诱导屏',
-              label: '公共停车场诱导屏',
-            },{
-              value: '道路停车泊位及岗亭卫生',
-              label: '道路停车泊位及岗亭卫生',
-            },{
-              value: '非机动车停放点',
-              label: '非机动车停放点',
-            },{
-              value: '牌匾标识',
-              label: '牌匾标识',
-            },{
-              value: '宣传栏',
-              label: '宣传栏',
-            },{
-              value: '污水监测器',
-              label: '污水监测器',
-            },{
-              value: '垃圾分类收集转运点',
-              label: '垃圾分类收集转运点',
-            },{
-              value: '居住区垃圾分类收集容器',
-              label: '居住区垃圾分类收集容器',
-            },{
-              value: '保洁车、垃圾收集车',
-              label: '保洁车、垃圾收集车',
-            },{
-              value: '垃圾运输车',
-              label: '垃圾运输车',
-            },{
-              value: '机械化清扫保洁车辆',
-              label: '机械化清扫保洁车辆',
-            },{
-              value: '独立树',
-              label: '独立树',
-            },{
-              value: '人防工事',
-              label: '人防工事',
-            },{
-              value: '公房地下室',
-              label: '公房地下室',
-            },{
-              value: '车辆加油(气、电)站',
-              label: '车辆加油(气、电)站',
-            },{
-              value: '液化气站',
-              label: '液化气站',
-            },{
-              value: '水域附属设施',
-              label: '水域附属设施',
-            },{
-              value: '文物古迹',
-              label: '文物古迹',
-            },{
-              value: '河道护栏',
-              label: '河道护栏',
-            },{
-              value: '河道',
-              label: '河道',
-            },{
-              value: '地铁标识杆',
-              label: '地铁标识杆',
-            },{
-              value: '地铁附属设施',
-              label: '地铁附属设施',
-            },{
-              value: '输油(气)标志',
-              label: '输油(气)标志',
-            },
-          ]
-        },{
-          value: '扩展事件',
-          label: '扩展事件',
-          children: [
-            {
-              value: '门前三包',
-              label: '门前三包',
-            },{
-              value: '市政设施',
-              label: '市政设施',
-            },{
-              value: '隔离墩破损或移位',
-              label: '隔离墩破损或移位',
-            },{
-              value: '路灯灯杆后盖破损或移位',
-              label: '路灯灯杆后盖破损或移位',
-            },{
-              value: '花坛破损',
-              label: '花坛破损',
-            },{
-              value: '交通护栏破损或移位',
-              label: '交通护栏破损或移位',
-            },{
-              value: '警示杆破损',
-              label: '警示杆破损',
-            },{
-              value: '雨水箅子（井盖）缺失或损坏',
-              label: '雨水箅子（井盖）缺失或损坏',
-            },{
-              value: '景观灯缺失或破损',
-              label: '景观灯缺失或破损',
-            },{
-              value: '指示牌倾倒或路名牌倾倒',
-              label: '指示牌倾倒或路名牌倾倒',
-            },{
-              value: '无主井盖缺失或破损',
-              label: '无主井盖缺失或破损',
-            },{
-              value: '护树设施缺失或损坏',
-              label: '护树设施缺失或损坏',
-            },{
-              value: '行道树缺株或死株',
-              label: '行道树缺株或死株',
-            },{
-              value: '井盖移位或破损',
-              label: '井盖移位或破损',
-            },{
-              value: '路牙破损',
-              label: '路牙破损',
-            },{
-              value: '道路破损',
-              label: '道路破损',
-            },{
-              value: '泥土裸露',
-              label: '泥土裸露',
-            },{
-              value: '花坛缺株或死株',
-              label: '花坛缺株或死株',
-            },{
-              value: '其他问题',
-              label: '其他问题',
-            },{
-              value: '店面无证装修',
-              label: '店面无证装修',
-            },{
-              value: '违章接坡',
-              label: '违章接坡',
-            },{
-              value: '临街阳台脏乱差',
-              label: '临街阳台脏乱差',
-            },{
-              value: '擅自在临街的建筑物上挂彩旗',
-              label: '擅自在临街的建筑物上挂彩旗',
-            },{
-              value: '沿街晾挂',
-              label: '沿街晾挂',
-            },{
-              value: '擅自架设管线、杆线设施',
-              label: '擅自架设管线、杆线设施',
-            },{
-              value: '空调室外机低挂',
-              label: '空调室外机低挂',
-            },{
-              value: '沙（河）滩不洁',
-              label: '沙（河）滩不洁',
-            },{
-              value: '交通标线不清晰',
-              label: '交通标线不清晰',
-            },{
-              value: '绿化弃料',
-              label: '绿化弃料',
-            },{
-              value: '病虫害',
-              label: '病虫害',
-            },{
-              value: '非法伐树',
-              label: '非法伐树',
-            },{
-              value: '河道污染',
-              label: '河道污染',
-            },{
-              value: '商业噪声',
-              label: '商业噪声',
-            },{
-              value: '露天烧烤',
-              label: '露天烧烤',
-            },{
-              value: '乱倒乱排污水、废水',
-              label: '乱倒乱排污水、废水',
-            },{
-              value: '餐厨垃圾遗撒和污染',
-              label: '餐厨垃圾遗撒和污染',
-            },{
-              value: '非正规垃圾填埋场',
-              label: '非正规垃圾填埋场',
-            },{
-              value: '乱丢弃医疗废物',
-              label: '乱丢弃医疗废物',
-            },{
-              value: '废弃家具设备',
-              label: '废弃家具设备',
-            },{
-              value: '乱堆物堆料',
-              label: '乱堆物堆料',
-            },{
-              value: '擅自饲养家禽家畜',
-              label: '擅自饲养家禽家畜',
-            },{
-              value: '餐厨垃圾违规清运',
-              label: '餐厨垃圾违规清运',
-            },{
-              value: '村庄保洁',
-              label: '村庄保洁',
-            },{
-              value: '村庄院落',
-              label: '村庄院落',
-            },{
-              value: '装潢垃圾、大件垃圾',
-              label: '装潢垃圾、大件垃圾',
-            },{
-              value: '道路机械化清扫保洁',
-              label: '道路机械化清扫保洁',
-            },{
-              value: '旱厕',
-              label: '旱厕',
-            },{
-              value: '区域环卫发展规划制定',
-              label: '区域环卫发展规划制定',
-            },{
-              value: '垃圾收集容器',
-              label: '垃圾收集容器',
-            },{
-              value: '环卫市场化',
-              label: '环卫市场化',
-            },{
-              value: '环卫职工待遇落实',
-              label: '环卫职工待遇落实',
-            },{
-              value: '垃圾调运不规范',
-              label: '垃圾调运不规范',
-            },{
-              value: '垃圾分类示范小区建设',
-              label: '垃圾分类示范小区建设',
-            },{
-              value: '居住区垃圾分类积分奖励',
-              label: '居住区垃圾分类积分奖励',
-            },{
-              value: '大件垃圾收运',
-              label: '大件垃圾收运',
-            },{
-              value: '厨余垃圾分类收运',
-              label: '厨余垃圾分类收运',
-            },{
-              value: '有害垃圾收集',
-              label: '有害垃圾收集',
-            },{
-              value: '黑洗车点',
-              label: '黑洗车点',
-            },{
-              value: '占道洗车',
-              label: '占道洗车',
-            },{
-              value: '洗车废水溢流',
-              label: '洗车废水溢流',
-            },{
-              value: '站容站貌不洁',
-              label: '站容站貌不洁',
-            },{
-              value: '洗车废水直排',
-              label: '洗车废水直排',
-            },{
-              value: '保洁车、垃圾收集车维护',
-              label: '保洁车、垃圾收集车维护',
-            },{
-              value: '垃圾箱清掏、维护',
-              label: '垃圾箱清掏、维护',
-            },{
-              value: '公共厕所维护',
-              label: '公共厕所维护',
-            },{
-              value: '垃圾收集、中转站维护',
-              label: '垃圾收集、中转站维护',
-            },{
-              value: '垃圾运输车不规范',
-              label: '垃圾运输车不规范',
-            },{
-              value: '机械化作业不规范',
-              label: '机械化作业不规范',
-            },{
-              value: '违规拆除环卫设施',
-              label: '违规拆除环卫设施',
-            },{
-              value: '枯枝落叶',
-              label: '枯枝落叶',
-            },{
-              value: '痰迹污渍',
-              label: '痰迹污渍',
-            },{
-              value: '雨后积水',
-              label: '雨后积水',
-            },{
-              value: '杂草青苔',
-              label: '杂草青苔',
-            },{
-              value: '违章占用挖掘河道',
-              label: '违章占用挖掘河道',
-            },{
-              value: '违规户外广告',
-              label: '违规户外广告',
-            },{
-              value: '广告语言文字不规范',
-              label: '广告语言文字不规范',
-            },{
-              value: '户外广告设置位置不合理',
-              label: '户外广告设置位置不合理',
-            },{
-              value: '违规牌匾标识',
-              label: '违规牌匾标识',
-            },{
-              value: '违规标语宣传品',
-              label: '违规标语宣传品',
-            },{
-              value: '一店多招',
-              label: '一店多招',
-            },{
-              value: '报刊亭超范围经营',
-              label: '报刊亭超范围经营',
-            },{
-              value: '报刊亭擅自移位、占用盲道',
-              label: '报刊亭擅自移位、占用盲道',
-            },{
-              value: '报刊亭亭外出摊、乱堆放',
-              label: '报刊亭亭外出摊、乱堆放',
-            },{
-              value: '报刊亭擅自设置广告及广告破损',
-              label: '报刊亭擅自设置广告及广告破损',
-            },{
-              value: '擅自改变亭身结构及亭体破损',
-              label: '擅自改变亭身结构及亭体破损',
-            },{
-              value: '亭体及周边脏乱',
-              label: '亭体及周边脏乱',
-            },{
-              value: '亭体外有乱张贴、乱吊挂、乱拉电线',
-              label: '亭体外有乱张贴、乱吊挂、乱拉电线',
-            },{
-              value: '其他宣传广告',
-              label: '其他宣传广告',
-            },{
-              value: '工地物料乱堆放',
-              label: '工地物料乱堆放',
-            },{
-              value: '施工工地围档问题',
-              label: '施工工地围档问题',
-            },{
-              value: '施工工地道路未硬化',
-              label: '施工工地道路未硬化',
-            },{
-              value: '施工工地出入口道路破损',
-              label: '施工工地出入口道路破损',
-            },{
-              value: '施工完成后未场光地净',
-              label: '施工完成后未场光地净',
-            },{
-              value: '渣土运输车辆未安装密闭装置',
-              label: '渣土运输车辆未安装密闭装置',
-            },{
-              value: '施工工地车轮夹带',
-              label: '施工工地车轮夹带',
-            },{
-              value: '擅自排水',
-              label: '擅自排水',
-            },{
-              value: '早（夜）市管理问题',
-              label: '早（夜）市管理问题',
-            },
-          ]
-        },{
-          value: '扩展事件1',
-          label: '扩展事件1',
-          children: [
-            {
-              value: '占道经营',
-              label: '占道经营',
-            },{
-              value: '排水管道堵塞',
-              label: '排水管道堵塞',
-            },{
-              value: '火灾',
-              label: '火灾',
-            },{
-              value: '伤亡事故',
-              label: '伤亡事故',
-            },{
-              value: '化粪池满溢',
-              label: '化粪池满溢',
-            },{
-              value: '违规高空悬吊作业',
-              label: '违规高空悬吊作业',
-            },{
-              value: '临街屠宰',
-              label: '临街屠宰',
-            },{
-              value: '畜力车进城',
-              label: '畜力车进城',
-            },{
-              value: '无证餐饮',
-              label: '无证餐饮',
-            },{
-              value: '居民小区垃圾分类收集容器维护',
-              label: '居民小区垃圾分类收集容器维护',
-            },{
-              value: '居住区垃圾混装混运',
-              label: '居住区垃圾混装混运',
-            },{
-              value: '居住区垃圾分类信息没有公示',
-              label: '居住区垃圾分类信息没有公示',
-            },{
-              value: '机扫垃圾转运不规范',
-              label: '机扫垃圾转运不规范',
-            },{
-              value: '当月实收金额未完成基数、漏审或私自处理的',
-              label: '当月实收金额未完成基数、漏审或私自处理的',
-            },{
-              value: '未按规定着装、未执证上岗、脱岗、上岗未开启POS机',
-              label: '未按规定着装、未执证上岗、脱岗、上岗未开启POS机',
-            },{
-              value: '不按规定收费，不使用POS机采取人工收费、涉嫌私藏票款',
-              label: '不按规定收费，不使用POS机采取人工收费、涉嫌私藏票款',
-            },{
-              value: '非法占道经营的夜市排挡',
-              label: '非法占道经营的夜市排挡',
-            },{
-              value: '疏导点周边环境脏乱',
-              label: '疏导点周边环境脏乱',
-            },{
-              value: '早餐车超时经营',
-              label: '早餐车超时经营',
-            },{
-              value: '早餐车占用盲道影响市容',
-              label: '早餐车占用盲道影响市容',
-            },{
-              value: '早餐车周边脏乱',
-              label: '早餐车周边脏乱',
-            },{
-              value: '农贸市场溢摊经营',
-              label: '农贸市场溢摊经营',
-            },{
-              value: '农贸市场车辆乱停放',
-              label: '农贸市场车辆乱停放',
-            },{
-              value: '农贸市场外垃圾及污水',
-              label: '农贸市场外垃圾及污水',
-            },{
-              value: '货物乱堆放周边张贴',
-              label: '货物乱堆放周边张贴',
-            },{
-              value: '装潢垃圾未及时清运',
-              label: '装潢垃圾未及时清运',
-            },{
-              value: '小区内垃圾容器及周边不洁',
-              label: '小区内垃圾容器及周边不洁',
-            },{
-              value: '小区内有散在垃圾',
-              label: '小区内有散在垃圾',
-            },{
-              value: '居民区有卫生死角',
-              label: '居民区有卫生死角',
-            },{
-              value: '小区绿地被破坏，毁绿种菜',
-              label: '小区绿地被破坏，毁绿种菜',
-            },{
-              value: '小区绿地内存在垃圾、杂物',
-              label: '小区绿地内存在垃圾、杂物',
-            },{
-              value: '小区内有店外出摊、乱设摊',
-              label: '小区内有店外出摊、乱设摊',
-            },{
-              value: '小区内乱搭建',
-              label: '小区内乱搭建',
-            },{
-              value: '小区内有新搭违法建设',
-              label: '小区内有新搭违法建设',
-            },{
-              value: '小区内乱堆放、拉挂',
-              label: '小区内乱堆放、拉挂',
-            },{
-              value: '小区内散养家禽',
-              label: '小区内散养家禽',
-            },{
-              value: '小区内乱贴乱挂',
-              label: '小区内乱贴乱挂',
-            },{
-              value: '暴露垃圾和建筑垃圾或焚烧垃圾',
-              label: '暴露垃圾和建筑垃圾或焚烧垃圾',
-            },{
-              value: '有乱堆放、乱排污现象',
-              label: '有乱堆放、乱排污现象',
-            },{
-              value: '有乱张贴、乱涂写现象',
-              label: '有乱张贴、乱涂写现象',
-            },{
-              value: '公共绿地种菜',
-              label: '公共绿地种菜',
-            },{
-              value: '临街区域占道经营、占道加工',
-              label: '临街区域占道经营、占道加工',
-            },{
-              value: '有垃圾焚烧现象或焚烧痕迹',
-              label: '有垃圾焚烧现象或焚烧痕迹',
-            },{
-              value: '公厕周边污水满溢',
-              label: '公厕周边污水满溢',
-            },{
-              value: '公厕脏乱，乱涂写、乱张贴',
-              label: '公厕脏乱，乱涂写、乱张贴',
-            },{
-              value: '有家禽（畜）散养现象',
-              label: '有家禽（畜）散养现象',
-            },{
-              value: '有擅自新搭建的棚户',
-              label: '有擅自新搭建的棚户',
-            },{
-              value: '水面不洁，有垃圾漂浮物',
-              label: '水面不洁，有垃圾漂浮物',
-            },{
-              value: '斜坡或驳岸以下部位脏乱',
-              label: '斜坡或驳岸以下部位脏乱',
-            },{
-              value: '共享单车乱停放',
-              label: '共享单车乱停放',
-            },{
-              value: '阻扰检查',
-              label: '阻扰检查',
-            },
-          ]
-        },{
-          value: '垃圾分类',
-          label: '垃圾分类',
-          children: [
-            {
-              value: '未按规定配置生活垃圾分类收集容器',
-              label: '未按规定配置生活垃圾分类收集容器',
-            },{
-              value: '住宅物业企业未配备生活垃圾分类指导员',
-              label: '住宅物业企业未配备生活垃圾分类指导员',
-            },{
-              value: '住宅小区生活垃圾清运不及时',
-              label: '住宅小区生活垃圾清运不及时',
-            },
-          ]
-        },{
-          value: '其他设施',
-          label: '其他设施',
-          children: [
-            {
-              value: '重大危险源',
-              label: '重大危险源',
-            },{
-              value: '工地',
-              label: '工地',
-            },{
-              value: '属于附属设施',
-              label: '属于附属设施',
-            },{
-              value: '水域护栏',
-              label: '水域护栏',
-            },{
-              value: '港监设施',
-              label: '港监设施',
-            },{
-              value: '防汛墙',
-              label: '防汛墙',
-            },
-          ]
-        },{
-          value: '其他事件',
-          label: '其他事件',
-          children: [
-            {
-              value: '垃圾箱（桶）脏乱，周边有暴露垃圾',
-              label: '垃圾箱（桶）脏乱，周边有暴露垃圾',
-            },{
-              value: '小区内垃圾容器及周边不洁',
-              label: '小区内垃圾容器及周边不洁',
-            },{
-              value: '有乱排污现象',
-              label: '有乱排污现象',
-            },{
-              value: '居民区有卫生死角',
-              label: '居民区有卫生死角',
-            },{
-              value: '临街屠宰',
-              label: '临街屠宰',
-            },{
-              value: '野生动物交易',
-              label: '野生动物交易',
-            },{
-              value: '小区内私搭乱建',
-              label: '小区内私搭乱建',
-            },{
-              value: '小区内乱张贴、乱喷涂',
-              label: '小区内乱张贴、乱喷涂',
-            },{
-              value: '小区内毁绿种菜',
-              label: '小区内毁绿种菜',
-            },{
-              value: '小区内僵尸车、车辆乱停放',
-              label: '小区内僵尸车、车辆乱停放',
-            },
-          ]
-        },{
-          value: '施工管理 ',
-          label: '施工管理 ',
-          children: [
-            {
-              value: '施工扰民 ',
-              label: '施工扰民 ',
-            },{
-              value: '工地扬尘',
-              label: '工地扬尘',
-            },{
-              value: '施工废弃料',
-              label: '施工废弃料',
-            },{
-              value: '施工占道',
-              label: '施工占道',
-            },{
-              value: '无证掘路',
-              label: '无证掘路',
-            },{
-              value: '其他施工管理问题',
-              label: '其他施工管理问题',
-            },
-          ]
-        },{
-          value: '市容环境',
-          label: '市容环境',
-          children: [
-            {
-              value: '公共厕所',
-              label: '公共厕所'
-            },
-            {
-              value: '化粪池',
-              label: '化粪池'
-            },
-            {
-              value: '公厕指示牌',
-              label: '公厕指示牌'
-            },
-            {
-              value: '垃圾间（楼）',
-              label: '垃圾间（楼）'
-            },
-            {
-              value: '垃圾箱',
-              label: '垃圾箱'
-            },
-            {
-              value: '灯箱霓虹灯',
-              label: '灯箱霓虹灯'
-            },
-            {
-              value: '广告牌匾',
-              label: '广告牌匾'
-            },
-            {
-              value: '环保监测站',
-              label: '环保监测站'
-            },
-            {
-              value: '气象监测站',
-              label: '气象监测站'
-            },
-            {
-              value: '污水口监测站',
-              label: '污水口监测站'
-            },
-            {
-              value: '噪声显示屏',
-              label: '噪声显示屏'
-            },
-            {
-              value: '私搭乱建',
-              label: '私搭乱建'
-            },
-            {
-              value: '暴露垃圾',
-              label: '暴露垃圾'
-            },
-            {
-              value: '积存垃圾渣',
-              label: '积存垃圾渣'
-            },
-            {
-              value: '道路不洁',
-              label: '道路不洁'
-            },
-            {
-              value: '水域不洁',
-              label: '水域不洁'
-            },
-            {
-              value: '绿地脏乱',
-              label: '绿地脏乱'
-            },
-            {
-              value: '废弃车辆',
-              label: '废弃车辆'
-            },
-            {
-              value: '废弃家具设备',
-              label: '废弃家具设备'
-            },
-            {
-              value: '非装饰性树挂',
-              label: '非装饰性树挂'
-            },
-            {
-              value: '道路破损',
-              label: '道路破损'
-            },
-            {
-              value: '河堤破损',
-              label: '河堤破损'
-            },
-            {
-              value: '道路遗撒',
-              label: '道路遗撒'
-            },
-            {
-              value: '建筑物外立面不洁',
-              label: '建筑物外立面不洁'
-            },
-            {
-              value: '水域秩序问题',
-              label: '水域秩序问题'
-            },
-            {
-              value: '焚烧垃圾、树叶',
-              label: '焚烧垃圾、树叶'
-            },
-            {
-              value: '油烟污染',
-              label: '油烟污染'
-            },
-            {
-              value: '动物尸体清理',
-              label: '动物尸体清理'
-            },
-            {
-              value: '路牙破损',
-              label: '路牙破损'
-            },
-            {
-              value: '其他市容环境问题',
-              label: '其他市容环境问题'
-            },
-            {
-              value: '垃圾桶破损',
-              label: '垃圾桶破损'
-            },
-            {
-              value: '垃圾箱（桶）脏乱，周边有暴露垃圾',
-              label: '垃圾箱（桶）脏乱，周边有暴露垃圾'
-            },
-            {
-              value: '暴露垃圾',
-              label: '暴露垃圾'
-            },
-            {
-              value: '乱丢弃医疗废物(口罩）',
-              label: '乱丢弃医疗废物(口罩）'
-            },
-            {
-              value: '乱倒乱排污水、废水',
-              label: '乱倒乱排污水、废水'
-            },
-            {
-              value: '动物尸体',
-              label: '动物尸体'
-            },
-            {
-              value: '垃圾容器设置不规范',
-              label: '垃圾容器设置不规范'
-            },
-            {
-              value: '垃圾容器收运不及时、满溢',
-              label: '垃圾容器收运不及时、满溢'
-            },
-            {
-              value: '垃圾容器未套袋收集',
-              label: '垃圾容器未套袋收集'
-            },
-            {
-              value: '垃圾容器违规摆放',
-              label: '垃圾容器违规摆放'
-            },
-            {
-              value: '垃圾容器分类标识缺损',
-              label: '垃圾容器分类标识缺损'
-            },
-            {
-              value: '垃圾容器脏污、不洁、未密闭',
-              label: '垃圾容器脏污、不洁、未密闭'
-            }
-          ]
-        },{
-          value: '突发事件',
-          label: '突发事件',
-          children: [
-            {
-              value: '道路塌陷',
-              label: '道路塌陷'
-            },
-            {
-              value: '自来水管破裂',
-              label: '自来水管破裂'
-            },
-            {
-              value: '燃气管道破裂',
-              label: '燃气管道破裂'
-            },
-            {
-              value: '下水道堵塞或破裂',
-              label: '下水道堵塞或破裂'
-            },
-            {
-              value: '热力管道破裂',
-              label: '热力管道破裂'
-            },
-            {
-              value: '道路积水',
-              label: '道路积水'
-            },
-            {
-              value: '道路积雪结冰',
-              label: '道路积雪结冰'
-            },
-            {
-              value: '架空线缆损坏',
-              label: '架空线缆损坏'
-            },
-            {
-              value: '群发性事件',
-              label: '群发性事件'
-            },
-            {
-              value: '其他突发事件',
-              label: '其他突发事件'
-            }
-          ]
-        },{
-          value: '宣传广告',
-          label: '宣传广告',
-          children: [
-            {
-              value: '非法小广告',
-              label: '非法小广告'
-            },
-            {
-              value: '违章张贴悬挂广告牌匾',
-              label: '违章张贴悬挂广告牌匾'
-            },
-            {
-              value: '占道广告牌',
-              label: '占道广告牌'
-            },
-            {
-              value: '街头散发广告',
-              label: '街头散发广告'
-            },
-            {
-              value: '广告招牌破损',
-              label: '广告招牌破损'
-            }
-          ]
-        },{
-          value: '园林绿化',
-          label: '园林绿化',
-          children: [
-            {
-              value: '古树名木',
-              label: '古树名木'
-            },
-            {
-              value: '行道树',
-              label: '行道树'
-            },
-            {
-              value: '护树设施',
-              label: '护树设施'
-            },
-            {
-              value: '花架花钵',
-              label: '花架花钵'
-            },
-            {
-              value: '绿地',
-              label: '绿地'
-            },
-            {
-              value: '雕塑',
-              label: '雕塑'
-            },
-            {
-              value: '街头座椅',
-              label: '街头座椅'
-            },
-            {
-              value: '绿地护栏',
-              label: '绿地护栏'
-            },
-            {
-              value: '绿地维护设施',
-              label: '绿地维护设施'
-            },
-            {
-              value: '喷泉',
-              label: '喷泉'
-            }
-          ]
-        }
-      ],
+      gridOptions:[],
+      options:[],
       marker:null,
     }
   },
@@ -1682,6 +248,7 @@ export default {
     open(obj) {
       // console.log(obj,'obj');
       this.$refs.dialog5.open('3');
+      console.log(this.getCurrentTime());
       this.$nextTick(()=>{
         this.formInline.reportEventObj.address = obj?.address;
         this.marker = obj?.marker;
@@ -1734,6 +301,11 @@ export default {
     },
     // 确定按钮
     confirm(formName){
+      // this.formInline.reportEventObj.imgUrl = this.baseUrl + this.formInline.reportEventObj.imgUrl;
+      // this.formInline.reportEventObj.videoUrl = this.baseUrl + this.formInline.reportEventObj.videoUrl;
+      // this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
+      // this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
+      // this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
       console.log(this.formInline);
 
       this.$refs[formName].validate((valid) => {
@@ -1743,17 +315,37 @@ export default {
           this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
           this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
           this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
+          this.formInline.reportEventObj.randNumber = this.getCurrentTime();
+          this.formInline.reportEventObj.isSimple = '0';
           // console.log(this.formInline);
           eventSaveData(this.formInfo,{formData:this.formInline}).then(res=>{
             if(res.code == 200 && res.success == true) {
-              this.cancel();
-              this.$modal.msgSuccess("新增成功");
-              this.$emit('confirm')
+              getBpmOperateVo({id:res.result,idType:"formId",formCode:"report-event-submit"}).then(resTwo=>{
+                autoSubmit({taskId:resTwo.result.bpmId}).then(resThree=>{
+                  if(resThree.code == 200) {
+                    this.cancel("formInline");
+                    this.$modal.msgSuccess("新增成功");
+                    this.$emit('confirm')
+                  }
+                })
+              })
             }
           })
         }
       })
     },
+    getCurrentTime() {
+      var currentDate = new Date();
+      var year = currentDate.getFullYear();
+      var month = ('0' + (currentDate.getMonth() + 1)).slice(-2);
+      var day = ('0' + currentDate.getDate()).slice(-2);
+      var hours = ('0' + currentDate.getHours()).slice(-2);
+      var minutes = ('0' + currentDate.getMinutes()).slice(-2);
+      var seconds = ('0' + currentDate.getSeconds()).slice(-2);
+      var milliseconds = ('00' + currentDate.getMilliseconds()).slice(-3);
+
+      return year + month + day + hours + minutes + seconds + milliseconds;
+    }
   },
 }
 </script>
diff --git a/src/views/components/personageTask/index.vue b/src/views/components/personageTask/index.vue
index 206ba19..2d2a7be 100644
--- a/src/views/components/personageTask/index.vue
+++ b/src/views/components/personageTask/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 选择事件，及派发按钮 -->
-  <dia-log ref="taskDialog" width="30%" :title="title">
+  <dia-log ref="taskDialog" width="30%" :title="title" @close="close">
     <el-form :inline="true" :model="taskForm" class="demo-form-task" ref="formTask" :rules="rules">
       <el-row>
         <el-col :span="24">
@@ -62,12 +62,13 @@
             <template slot="label">
               <div class="new-event-form">
                 <div class="ball"></div>
-                <span>发生时间：</span>
+                <span>截至时间：</span>
               </div>
             </template>
             <div class="right">
               <el-date-picker
                 v-model="taskForm.openTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 type="datetime"
                 placeholder="选择日期时间"
               >
@@ -86,7 +87,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <dia-log ref="eventDialog" width="60%" title="选择事件">
+    <dia-log ref="eventDialog" width="70%" title="选择事件">
       <section>
         <el-table
           class="exporttable"
@@ -128,6 +129,11 @@
             header-align="center"
             label="事件发生时间">
           </el-table-column>
+          <el-table-column
+            prop="status"
+            header-align="center"
+            label="事件状态">
+          </el-table-column>
           <el-table-column
             prop=""
             header-align="center"
@@ -156,7 +162,8 @@
 </template>
 <script>
 import diaLog from "../../components/dialog/index.vue"
-import { ViewListPage, autoSubmit, getBpmOperateVo, distributeSaveData } from "@/api/bigScreenApi/robot.js"
+import { ViewListPage, formEngineSaveData, auditSubmit } from "@/api/bigScreenApi/robot.js"
+import { getUserByImei } from "@/api/bigScreenApi"
 export default {
   components:{diaLog},
   data() {
@@ -176,6 +183,12 @@ export default {
       info:null,
       tableData: [],
       TabLoading:false,
+      query:{
+        formKey:"event-holder",
+        isFlow:"true",
+      },
+      eventInfo:{},
+      phonenumber:"",
     }
   },
   mounted() {
@@ -185,12 +198,20 @@ export default {
     open(info){
       this.info = info;
       this.$refs.taskDialog.open();
-      
+      console.log(info,"info");
+      getUserByImei({imei: info.imei}).then(res=>{
+        if(res.code == 200) {
+          this.phonenumber = res.data[0].phonenumber;
+        }
+      })
     },
     getViewListPageList(page){
       this.TabLoading = true;
-      let data = {'queryValue' : [], "myInstanceClassify" : "all", "parameterValue":[], fks: []}
-      ViewListPage({viewCode:'shi_jian_shou_li_list_page', pageNo: page || 1, pageSize:10}, data).then(res => {
+      let data = {'queryValue' : [{
+      "colCode": "status",
+      "queryValue": "0"
+    }], "myInstanceClassify" : "all", "parameterValue":[], fks: []}
+      ViewListPage({viewCode:'event-all-list', pageNo: page || 1, pageSize:10}, data).then(res => {
         if(res.code == 200) {
           this.total = res.result.total;
           this.tableData = res.result.records;
@@ -212,8 +233,9 @@ export default {
       return 'font-size: 14px;font-family: "Source Han Sans CN-Regular";font-weight: 400;color: #d3eef2;'
     },
     zhipai(row){
-      console.log("事件触发了");
+      // console.log("事件触发了");
       this.taskForm.task = row.name
+      this.eventInfo = row;
       this.$refs.eventDialog.Close();
     },
     // 选择事件按钮
@@ -221,6 +243,11 @@ export default {
       this.$refs.eventDialog.open()
       this.getViewListPageList();
     },
+    close(){
+      this.$nextTick(()=>{
+        this.$refs['formTask'].resetFields();
+      })
+    },
     // 取消按钮
     cancel(refForm){
       this.$refs[refForm].resetFields();
@@ -228,19 +255,57 @@ export default {
     },
     // 确定按钮
     confirm(refForm){
-      this.$refs[formName].validate((valid) => {
+      this.$refs[refForm].validate((valid) => {
         if(valid){
-          let ts = Math.round(new Date().getTime()/1000).toString();
-          // console.log(ts,"tstststs");
-          // console.log(this.taskForm,"taskForm");
-          // getBpmOperateVo({_t:ts,id:this.taskForm.task,idType:"formId",formCode:"event-holder"}).then(res=>{
-          //   if(res.code == 200) {
-          //     return distributeSaveData()
-          //   }
-          // })
+          let body = {
+            formData:{
+              "report-event":{
+                id: this.eventInfo.id,                                           // 事件id
+                tasks:{
+                  taskIsdiscard: "0",
+                  taskVoidReason: "",
+                  taskType: "2",
+                  taskRandNumber:this.getCurrentTime(),                          // 指派时的唯一值年月日时分秒毫秒
+                  taskDeadline:this.taskForm.openTime,                           // 截至时间
+                  taskStatus: "6",
+                  taskName:this.eventInfo.name                                   // 任务名称
+                },
+                status: "1"
+              }
+            },
+            saveParameter:{},
+            docList:[],
+          }
+          formEngineSaveData(this.query,body).then(res=>{
+            if(res.code == 200) {
+              auditSubmit({formId:res.result,phone:this.phonenumber,depName:"集团有限公司环卫管理部"}).then(resTwo=>{
+                if(resTwo.code == 200) {
+                  this.$message({
+                    message: "任务派发成功",
+                    type: "success"
+                  });
+                  this.cancel("formTask")
+                  this.$refs.taskDialog.Close();
+                }
+              }).catch(()=>{
+
+              })
+            }
+          })
         }
       })
     },
+    getCurrentTime() {
+      var currentDate = new Date();
+      var year = currentDate.getFullYear();
+      var month = ('0' + (currentDate.getMonth() + 1)).slice(-2);
+      var day = ('0' + currentDate.getDate()).slice(-2);
+      var hours = ('0' + currentDate.getHours()).slice(-2);
+      var minutes = ('0' + currentDate.getMinutes()).slice(-2);
+      var seconds = ('0' + currentDate.getSeconds()).slice(-2);
+      var milliseconds = ('00' + currentDate.getMilliseconds()).slice(-3);
+      return year + month + day + hours + minutes + seconds + milliseconds;
+    },
     // 页码变化事件
     pageChange(pages) {
       // console.log(pages);
@@ -447,7 +512,7 @@ export default {
       ::v-deep .el-input__prefix {
         display: none;
       }
-      ::v-deep .el-date-editor {
+      .el-date-editor {
         background-color: transparent;
         // width: 350px;
         .el-input__inner {
@@ -459,7 +524,7 @@ export default {
           font-family: "Source Han Sans CN-Medium";
           font-weight: 500;
           color: #e9f4ff;
-          padding-left: 12px;
+          padding: 0px 15px;
         }
         .el-input__inner::placeholder {
           /* 在这里添加你想要修改的 placeholder 样式 */
@@ -474,7 +539,7 @@ export default {
       
       .data_icon {
         position: absolute;
-        right: 30px;
+        right: 10px;
         top: 8px;
         width: 20px;
       }
diff --git a/src/views/components/personagetrack/index.vue b/src/views/components/personagetrack/index.vue
index 1cda700..3acb73e 100644
--- a/src/views/components/personagetrack/index.vue
+++ b/src/views/components/personagetrack/index.vue
@@ -17,10 +17,10 @@
               }}</span>
             </div>
           </div>
-          <div class="item car-item" v-if="!person">
+          <!-- <div class="item car-item" v-if="!person">
             <div class="ball"></div>
             <div class="content">驾驶员姓名：<span>张三</span></div>
-          </div>
+          </div> -->
           <div class="item">
             <div class="ball"></div>
             <div class="content">
diff --git a/src/views/components/shop/components/tab2.vue b/src/views/components/shop/components/tab2.vue
index 8df53e0..93701a3 100644
--- a/src/views/components/shop/components/tab2.vue
+++ b/src/views/components/shop/components/tab2.vue
@@ -36,7 +36,7 @@
       <div class="itemtwo">
         <div class="left">
           <div class="ball"></div>
-          <div class="content">排查日期：</div>
+          <div class="content">巡查日期：</div>
         </div>
         <div class="right">
           <el-date-picker
@@ -68,20 +68,13 @@
         <span>是否发起整改工单</span>
       </div>
       <div class="tb-list">
-        <div v-for="(item, ind) in 10" :key="ind">
+        <div v-for="(item, ind) in tableData" :key="ind">
           <div class="tb-content">
-            <span>张天</span>
-            <span>网格1</span>
-            <span>2023-09-12</span>
-            <span>否</span>
-            <span>否</span>
-          </div>
-          <div class="tb-content_">
-            <span>张天</span>
-            <span>网格1</span>
-            <span>2023-09-12</span>
-            <span>否</span>
-            <span>否</span>
+            <span>{{item.name}}</span>
+            <span>{{item.grid}}</span>
+            <span>{{item.time}}</span>
+            <span>{{item.hidden}}</span>
+            <span>{{item.order}}</span>
           </div>
         </div>
       </div>
@@ -118,6 +111,39 @@ export default {
           label: "网格5",
         },
       ],
+      tableData:[
+        {
+          name: "王明光",
+          grid: "一中队一号网格",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否"
+        },{
+          name: "王龙",
+          grid: "一中队一号网格",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否"
+        },{
+          name: "鲁建国",
+          grid: "一中队一号网格",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否"
+        },{
+          name: "孔祥龙",
+          grid: "一中队一号网格",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否"
+        },{
+          name: "顾国庆",
+          grid: "一中队一号网格",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否"
+        },
+      ],
     };
   },
 };
diff --git a/src/views/components/shop/components/tab3.vue b/src/views/components/shop/components/tab3.vue
index 96c5ab7..ff63504 100644
--- a/src/views/components/shop/components/tab3.vue
+++ b/src/views/components/shop/components/tab3.vue
@@ -36,7 +36,7 @@
       <div class="itemtwo">
         <div class="left">
           <div class="ball"></div>
-          <div class="content">排查日期：</div>
+          <div class="content">整改期限：</div>
         </div>
         <div class="right">
           <el-date-picker
@@ -63,23 +63,21 @@
       <div class="tb-header">
         <span>整改工单编号</span>
         <span>整改期限</span>
+        <span>发起人</span>
+        <span>发起时间</span>
         <span>是否整改完成</span>
         <span>是否通过复查</span>
       </div>
 
       <div class="tb-list">
-        <div v-for="(item, ind) in 10" :key="ind">
+        <div v-for="(item, ind) in tableData" :key="ind">
           <div class="tb-content">
-            <span>202309120001</span>
-            <span>2023-09-12</span>
-            <span>否</span>
-            <span>否</span>
-          </div>
-          <div class="tb-content_">
-            <span>202309120001</span>
-            <span>2023-09-12</span>
-            <span>否</span>
-            <span>否</span>
+            <span>{{ item.id }}</span>
+            <span>{{ item.qixian }}</span>
+            <span>{{ item.time }}</span>
+            <span>{{ item.hidden }}</span>
+            <span>{{ item.order }}</span>
+            <span>{{ item.fucha }}</span>
           </div>
         </div>
       </div>
@@ -116,6 +114,33 @@ export default {
           label: "网格5",
         },
       ],
+      tableData:[
+        {
+          id:"202401120925154",
+          name: "王明光",
+          qixian: "2024-01-20",
+          time: "2024-01-12",
+          hidden: "否",
+          order: "否",
+          fucha: "否"
+        },{
+          id:"202401221025154",
+          name: "王龙",
+          time: "2024-01-22",
+          qixian: "2024-02-05",
+          hidden: "否",
+          order: "否",
+          fucha: "否"
+        },{
+          id:"202401181125154",
+          name: "鲁建国",
+          time: "2024-01-18",
+          qixian: "2024-02-01",
+          hidden: "否",
+          order: "否",
+          fucha: "否"
+        }
+      ],
     };
   },
 };
diff --git a/src/views/components/shop/components/tab4.vue b/src/views/components/shop/components/tab4.vue
index 1a8ce33..98de580 100644
--- a/src/views/components/shop/components/tab4.vue
+++ b/src/views/components/shop/components/tab4.vue
@@ -19,7 +19,7 @@
       <div class="itemtwo">
         <div class="left">
           <div class="ball"></div>
-          <div class="content">排查日期：</div>
+          <div class="content">告警时间：</div>
         </div>
         <div class="right">
           <el-date-picker
@@ -48,16 +48,11 @@
       </div>
 
       <div class="tb-list">
-        <div v-for="(item, ind) in 10" :key="ind">
+        <div v-for="(item, ind) in tableData" :key="ind">
           <div class="tb-content">
-            <span>202309120001</span>
-            <span>2023-09-12</span>
-            <span>2023-09-13</span>
-          </div>
-          <div class="tb-content_">
-            <span>202309120001</span>
-            <span>2023-09-12</span>
-            <span>2023-09-13</span>
+            <span>{{ item.id }}</span>
+            <span>{{ item.qixian }}</span>
+            <span>{{ item.gaojing }}</span>
           </div>
         </div>
       </div>
@@ -94,6 +89,17 @@ export default {
           label: "网格5",
         },
       ],
+      tableData:[
+        {
+          id:"202401120925154",
+          qixian: "2024-01-20",
+          gaojing: "2024-01-15",
+        },{
+          id:"202401221025154",
+          gaojing: "2024-01-30",
+          qixian: "2024-02-05",
+        }
+      ],
     };
   },
 };