Merge remote-tracking branch 'origin/visu_firecontrol' into visu_firecontrol

src/api/event.js

@@ -1,19 +1,20 @@
 import request from '@/utils/request'
 
 //获取附近事件
-export function getNearEvent(longitude,latitude,day,loading) {
+export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
   return request({
-    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude+"&day="+day,
+    url: '/center-firecontrol/VisuForestEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude + "&day=" + day + "&eventTypeIdDl=" + eventTypeIdDl + "&eventTypeId=" + eventTypeId,
     method: 'get',
     headers: {
       loading: loading
     },
   })
 }
+
 //获取附近摄像头
-export function getNearCamera(longitude,latitude) {
+export function getNearCamera(longitude, latitude) {
   return request({
-    url: '/center-firecontrol/VisuForestMonitorCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=8",
+    url: '/center-firecontrol/VisuForestMonitorCenterController/getNearCamera?longitude=' + longitude + "&latitude=" + latitude + "&type=8",
     method: 'get',
   })
 }

src/api/forest.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request'
 
+// 获取绑定的事件类型
+export function getMenuEventType() {
+  return request({
+    url: '/center-firecontrol/VisuForestCloudMapController/getMenuEventType',
+    method: 'get',
+  })
+}
+// 获取事件详情
+export function getEventPush(param) {
+  return request({
+    url: '/center-firecontrol/VisuForestCloudMapController/getEventPush',
+    method: 'post',
+    data: param
+  })
+}
 // 左侧获取部门信息
 export function getBaseInfo() {
   return request({
@@ -273,3 +288,12 @@ export function selectMessageById(messageId) {
     method: 'get'
   })
 }
+
+// 事件处置
+export function eventHandling(id,eventCode) {
+  return request({
+    url: '/center-firecontrol/VisuForestEventCenterController/eventHandling',
+    method: 'post',
+    data: {id:id,eventCode:eventCode,dataStatus:"1"}
+  })
+}

src/assets/styles/base.scss

@@ -1363,7 +1363,7 @@ div::-webkit-scrollbar {
 
       .d-l-l-text {
         width: 100%;
-        white-space: nowrap;
+        //white-space: nowrap;
 
         h4 {
           display: flex;

src/components/TVWall.vue

@@ -346,7 +346,7 @@ export default {
                 // userName: 'system',
                 // userPwd: 'Admin@123',
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/store/getters.js

@@ -6,6 +6,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  userId: state => state.user.id,
   name: state => state.user.name,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,

src/store/modules/user.js

@@ -4,6 +4,7 @@ import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
 const user = {
   state: {
     token: getToken(),
+    userId: '',
     name: '',
     avatar: '',
     roles: [],
@@ -28,6 +29,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
     }
   },
 
@@ -65,6 +69,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
+          commit('SET_USERID', user.id)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/views/bigdata/chart-equipmentDistribution.vue

@@ -34,6 +34,7 @@
       sbfb() {
         let that = this
         getSbfb().then(resp => {
+          that.data_sbfb = resp.data;
           that.myEcharts2();
         })
       },

src/views/eventdetailsdialog.vue

@@ -148,14 +148,15 @@
                           <div class="z-info-btm-grp">
                             <div class="z-info-btm-grp-top">
                               <div class="z-info-btm-grp-left">
-                                <!--                                <el-button size="small" icon="el-icon-s-flag">责任制-->
-                                <!--                                </el-button>-->
                                 <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
                                 </el-button>
                                 <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传
                                 </el-button>
                                 <el-button size="small" icon="el-icon-download" @click="showResponsibility()">责任制
                                 </el-button>
+                                <el-button v-if="eventStatusValue=='forest_event_status_2' && statusFlag=='1' && dataStatus=='0'"
+                                           size="small" icon="el-icon-download" @click="updateCentereventTEventcatalogueStatus('cz',true)">处置
+                                </el-button>
                               </div>
                               <div class="z-info-btm-grp-right">
                                 <el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
@@ -225,7 +226,7 @@
                                              @click="updateCentereventTEventcatalogueStatus('ld',false)">
                                     联动
                                   </el-button>
-                                  <el-button size="small" v-if="dataStatus=='1'"
+                                  <el-button size="small" v-if="statusFlag=='1'"
                                              icon="el-icon-success" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('bj',true)">
                                     办结
@@ -235,7 +236,7 @@
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn"
-                                   v-else-if="eventStatusValue=='forest_event_status_5'&&dataStatus=='1'">
+                                   v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
                                 <el-button size="small"
                                            icon="el-icon-success" style="text-align:left"
                                            @click="updateCentereventTEventcatalogueStatus('gd',false)">
@@ -285,7 +286,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
+        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
           <el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
             <el-option
               v-for="item in eventTypeList"
@@ -1004,7 +1005,8 @@ import {
   dutysystemList,
   dutysystemAdd,
   dutysystemRemove,
-  userFeginlist
+  userFeginlist,
+  eventHandling
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1174,7 +1176,9 @@ export default {
       eventStatusValue: null,//事件状态
       eventId: null,//事件ID
       eventType: null,//事件类型-大类
-      dataStatus: null,//事件流程按钮
+      eventTypeXl: null,//事件类型-小类
+      statusFlag: null,//事件流程按钮
+      dataStatus: null,//事件处置按钮
       deptId: null,//事件流程部门
       eventCode: null,
       eventName: null,
@@ -1324,6 +1328,8 @@ export default {
     },
 
     showResponsibility() {//弹出责任制弹窗
+      //初始化责任制数据列表
+      this.dutysystemTableData = [];
       let param = { eventCode: this.eventCode }
       centereventtdepteventList(param).then(res => {
         this.depteventList = res.data
@@ -1656,12 +1662,16 @@ export default {
         if (eventStatus == 'qs') {//签收
           that.eventConfirmTitle = '事件签收'
           let param = { parentId: that.eventType }
-          await listSJfl(param).then(res => {
-            //事件类型
-            if (res.code == 200) {
-              that.eventTypeList = res.data
-            }
-          })
+          if(that.eventTypeXl != null){
+            that.sendEventType = that.eventTypeXl;
+          }else{
+            await listSJfl(param).then(res => {
+              //事件类型
+              if (res.code == 200) {
+                that.eventTypeList = res.data
+              }
+            })
+          }
           await listYuAn().then(res => {
             //关联预案
             if (res.code == 200) {
@@ -1810,6 +1820,15 @@ export default {
               that.$emit('getSupermap', that.calendarDay)
             }
           })
+        } else if(eventStatus == 'cz'){
+          eventHandling(that.eventId,that.eventCode).then(res => {
+            if (res.code == 200) {
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
+            }
+          })
         } else {
           if (eventStatus == 'qs' || eventStatus == 'wb' || eventStatus == 'cf') {
             if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
@@ -1876,7 +1895,7 @@ export default {
       this.$refs.eventLogUpload.eventLogUpload(this.eventCode)
     },
     cancelEventShow() {
-      this.dataStatus = null
+      this.statusFlag = null
       this.deptId = null
       console.log('关闭事件弹窗')
       this.eventLogList = []
@@ -1892,12 +1911,14 @@ export default {
         that.address = res.data.catalogue.address
         that.eventStatusValue = res.data.catalogue.eventStatusValue
         that.eventType = res.data.catalogue.eventType
+        that.statusFlag = res.data.catalogue.statusFlag
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
         that.longitude = res.data.catalogue.longitude
         that.latitude = res.data.catalogue.latitude
         that.eventName = res.data.catalogue.eventName
+        that.eventTypeXl = res.data.catalogue.eventTypeXl
         let markersMap = {
           lng: 124.59,
           lat: 43.02,
@@ -1935,7 +1956,7 @@ export default {
           that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
         }, 2000)
         if (res.data.centermonitorTCamera != null) {
-          that.cameraCode = res.data.centermonitorTCamera.cameraCode;
+          that.cameraCode = res.data.centermonitorTCamera.id;
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1976,12 +1997,14 @@ export default {
         that.address = res.data.catalogue.address
         that.eventStatusValue = res.data.catalogue.eventStatusValue
         that.eventType = res.data.catalogue.eventType
+        that.statusFlag = res.data.catalogue.statusFlag
         that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
         that.latitude = res.data.catalogue.latitude
         that.longitude = res.data.catalogue.longitude
         that.eventName = res.data.catalogue.eventName
+        that.eventTypeXl = res.data.catalogue.eventTypeXl
         let markersMap = {
           lng: 124.59,
           lat: 43.02,

src/views/firespread.vue

@@ -113,121 +113,6 @@
                     </div>
                   </dv-border-box-7>
                 </div>
-                <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
-                    <div class="i-list-con">
-                      <div class="this-con h-25 no-padding">
-                        <div class="z-info-list" style="margin-top: 0;">
-                          <div class="z-info-btm-grp">
-                            <div class="z-info-btm-grp-top">
-                              <div class="z-info-btm-grp-left">
-                                <!--                                <el-button size="small" icon="el-icon-s-flag">责任制-->
-                                <!--                                </el-button>-->
-                                <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
-                                </el-button>
-                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传
-                                </el-button>
-                                <el-button size="small" icon="el-icon-download" @click="showResponsibility()">责任制
-                                </el-button>
-                              </div>
-                              <div class="z-info-btm-grp-right">
-                                <el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
-                                </el-button>
-                              </div>
-                            </div>
-                            <div class="z-info-btm-input">
-                              <el-input type="textarea" v-model="eventLog"
-                                        :autosize="{ minRows: 7, maxRows: 7}" placeholder="请输入反馈信息">
-                              </el-input>
-                              <div class="z-info-btm-input-btn" v-if="eventStatusValue=='forest_event_status_1'">
-                                <div style="text-align:left">
-                                  <el-button size="small"
-                                             icon="el-icon-s-flag"
-                                             @click="updateCentereventTEventcatalogueStatus('qr',true)">
-                                    确认
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
-                                </div>
-                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
-                                </el-button>
-                              </div>
-                              <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_7'">
-                                <div style="text-align:left">
-                                  <el-button size="small"
-                                             icon="el-icon-s-flag"
-                                             @click="updateCentereventTEventcatalogueStatus('qs',false)">
-                                    签收
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
-                                </div>
-                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
-                                </el-button>
-                              </div>
-                              <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
-                                <div>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-phone" style="text-align:left"
-                                             @click="updateCentereventTEventcatalogueStatus('ld',false)">
-                                    联动
-                                  </el-button>
-                                  <el-button size="small" v-if="dataStatus=='1'"
-                                             icon="el-icon-success" style="text-align:left"
-                                             @click="updateCentereventTEventcatalogueStatus('bj',true)">
-                                    办结
-                                  </el-button>
-                                </div>
-                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
-                                </el-button>
-                              </div>
-                              <div class="z-info-btm-input-btn"
-                                   v-else-if="eventStatusValue=='forest_event_status_5'&&dataStatus=='1'">
-                                <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left"
-                                           @click="updateCentereventTEventcatalogueStatus('gd',false)">
-                                  填报
-                                </el-button>
-                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
-                                </el-button>
-                              </div>
-                              <div class="z-info-btm-input-btn" v-else>
-                                <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
-                                </el-button>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </dv-border-box-7>
-                </div>
               </div>
 
             </el-col>
@@ -238,692 +123,6 @@
     </div>
     <vBottomMenu ref="bottomMenu"></vBottomMenu>
     <eventLogUpload ref="eventLogUpload"></eventLogUpload>
-    <el-dialog :title="eventConfirmTitle" :visible.sync="showEventConfirm" v-if="showEventConfirm" width="50%"
-               class="top-dialog"
-               @close="cancelEventConfirm()">
-      <el-form label-width="80px">
-        <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'">
-          <el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
-        </el-form-item>
-        <el-form-item :label="deptNameitem">
-          <!--          <treeselect v-model="deptId" :options="deptOptions" multiple :show-count="true"-->
-          <!--                      placeholder="请选择签收部门"/>-->
-          <el-select v-model="sendDeptName" clearable placeholder="请选择部门" class="m-r-1rem" @change="setValue"
-                     v-if="eventStatusButton=='wb'||eventStatusButton=='qs'||eventStatusButton=='cf'||eventStatusButton=='ld'">
-            <el-option
-              v-for="item in deptOptions"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="{value:item.deptId,label:item.deptName}">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
-          <el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
-            <el-option
-              v-for="item in eventTypeList"
-              :key="item.id"
-              :label="item.eventTypeName"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="任务来源" v-if="eventStatusButton=='ld'">
-          <el-select v-model="sendTaskSource" placeholder="请选择任务来源！" clearable>
-            <el-option
-              v-for="dict in dict.type.task_source"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="联动标题" v-if="eventStatusButton=='ld'">
-          <el-input v-model="sendTaskTitle" placeholder="请输入联动标题"/>
-        </el-form-item>
-        <el-form-item label="联动内容" v-if="eventStatusButton=='ld'">
-          <el-input type="textarea" v-model="sendTaskContent"
-                    :autosize="{ minRows: 7, maxRows: 7}" placeholder="请输入联动内容">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联动部门" v-if="eventStatusButton=='ld'">
-          <el-input
-            placeholder="输入关键字进行过滤"
-            v-model="filterText">
-          </el-input>
-          <el-tree
-            class="tree-border tree_scroll"
-            style="height: 20vh; overflow-y:scroll"
-            :data="deptOptionsLiandong"
-            show-checkbox
-            ref="LiandongDept"
-            node-key="id"
-            :check-strictly="true"
-            :filter-node-method="filterNode"
-            :accordion="true"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-          <!--            default-expand-all-->
-        </el-form-item>
-        <el-form-item label="关联预案" v-if="eventStatusButton=='qs'">
-          <el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案！" clearable>
-            <el-option
-              v-for="item in guanLianYuAnList"
-              :key="item.id"
-              :label="item.resTitle"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <!--<el-form-item label="联系人" v-if="eventStatusButton=='qs'">-->
-        <!--<el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable filterable>-->
-        <!--<el-option-->
-        <!--v-for="item in userFeginList"-->
-        <!--:label="item.nickName"-->
-        <!--:value="item.phonenumber"-->
-        <!--/>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
-        <el-button size="mini" type="primary" v-if="eventStatusButton=='qr'"
-                   @click="updateCentereventTEventcatalogueStatus('qr',false)">确认
-        </el-button>
-        <el-button size="mini" type="primary" v-if="eventStatusButton=='qs'"
-                   @click="updateCentereventTEventcatalogueStatus('qs',true)">签收
-        </el-button>
-        <el-button size="mini" type="primary" v-if="eventStatusButton=='wb'"
-                   @click="updateCentereventTEventcatalogueStatus('wb',true)">误报
-        </el-button>
-        <el-button size="mini" type="primary" v-if="eventStatusButton=='cf'"
-                   @click="updateCentereventTEventcatalogueStatus('cf',true)">重复
-        </el-button>
-        <el-button size="mini" type="primary" v-if="eventStatusButton=='ld'"
-                   @click="updateCentereventTEventcatalogueStatus('ld',true)">发起联动
-        </el-button>
-      </el-form>
-    </el-dialog>
-    <el-dialog title="调整预案" :visible.sync="showGuanLianYuAnConfirm" v-if="showGuanLianYuAnConfirm" width="50%"
-               class="top-dialog tz_tk">
-      <el-form label-width="80px">
-        <el-form-item label="关联预案">
-          <el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案！" clearable>
-            <el-option
-              v-for="item in guanLianYuAnList"
-              :key="item.id"
-              :label="item.resTitle"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-button size="mini" type="primary" class="fr_button" @click="updateYjYuAn">确定
-        </el-button>
-        <div style="clear: both;"></div>
-      </el-form>
-    </el-dialog>
-    <el-dialog title="责任制" :visible.sync="showResponsibilityDialog" v-if="showResponsibilityDialog" width="65%"
-               @close="closeResponsibilityDialog()">
-      <el-form label-width="1500px">
-        <div class="bottom">
-          <!-- 左侧菜单栏 -->
-          <div class="bottomLeft">
-            <div class="leftItem d-l-con padding-box nowrap" v-for="(item,index) in depteventList">
-              <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
-                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- 左侧菜单栏对应的右侧的内容 -->
-          <div class="bottomRight" ref="wrapper">
-            <el-button
-              size="mini"
-              type="danger"
-              v-if="depteventId!=null&&depteventId!=''"
-              @click="addLine">添加
-            </el-button>
-            <el-table
-              :data="dutysystemTableData"
-              style="width: 100%"
-              :rules="rules">
-              <el-table-column prop="id" label="主键" v-if="false">
-                <template slot-scope="scope" hidden>
-                  <el-input v-model="scope.row.id" readonly placeholder="主键"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.name" placeholder="姓名" οninput="value=value.replace(/^[\u4e00-\u9fa5]{2,4}$/,'')"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column prop="post" label="岗位">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.post" placeholder="岗位"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column prop="telphone" label="手机号码">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.telphone" placeholder="手机号码" οninput="value=value.replace(/^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/,'')"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column prop="bookbuytime" label="操作">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.$index, scope.row)">删除
-                  </el-button>
-                  <!--<el-button-->
-                  <!--size="mini"-->
-                  <!--type="danger"-->
-                  <!--icon="el-icon-save"-->
-                  <!--@click="handleSave(scope.$index, scope.row)">保存-->
-                  <!--</el-button>-->
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <el-button size="mini" type="primary" class="fr_button" @click="addResponsibilityDialog">确定
-        </el-button>
-        <div style="clear: both;"></div>
-      </el-form>
-    </el-dialog>
-    <el-dialog title="火险报告" :visible.sync="showEventConfirm_gd" v-if="showEventConfirm_gd" width="100%"
-               class="top-dialog"
-               @close="cancelEventConfirm_gd()">
-      <div class="table-container">
-        <form>
-          <table id="table1" cellpadding="0" cellspacing="0">
-            <thead style="width: 100%;padding:.5rem 0;">
-            <th rowspan="1" colspan="1" class="txt_left" width="100px">填报单位：</th>
-            <th rowspan="1" colspan="6" align="left"><input type="text" style=" width:100%;margin-left: .5rem;"
-                                                            v-model="table1.reportUnit"/></th>
-            <th rowspan="1" colspan="2" class="txt_right">填报时间：</th>
-            <th rowspan="1" colspan="6" align="left"><input type="text" style="width:3rem;text-align: center;"
-                                                            v-model="table1.reportTimeY"/>年<input
-              type="text" style="width:4rem;text-align: center;" v-model="table1.reportTimeM"/>月<input type="text"
-                                                                                                       style="width:3rem;text-align: center;"
-                                                                                                       v-model="table1.reportTimeD"/>日
-            </th>
-            <th rowspan="1" colspan="8" style="text-align: right;">吉林省人民政府森林防火指挥部办公室制</th>
-            </thead>
-            <tbody>
-
-            <tr>
-              <td colspan="22" rowspan="1" class="font1" style="letter-spacing:3rem;padding: .5rem 0">森林火灾损失</td>
-              <td colspan="1" rowspan="6">
-                <table class="border0">
-                  <tr>
-                    <td>备注</td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr>
-              <td rowspan="4" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>森林火灾<br>损失总计</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="1" colspan="12">火灾损失价值</td>
-              <td rowspan="1" colspan="9">扑火费用支出</td>
-            </tr>
-            <tr>
-
-              <td rowspan="3" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>合计</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="1" colspan="4">林木资源</td>
-              <td rowspan="1" colspan="6">人员伤亡</td>
-              <td rowspan="3" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>其他<br>火灾<br>损失</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="3" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>合计</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="1" colspan="2">
-                <table class="border0">
-                  <tr>
-                    <td>人工费</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="1" colspan="3">
-                <table class="border0">
-                  <tr>
-                    <td>车辆费</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="1" colspan="2">
-                <table class="border0">
-                  <tr>
-                    <td>飞行费</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="3" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>其他<br>扑火<br>费用</td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="2">成林</td>
-              <td rowspan="1" colspan="2">幼林</td>
-              <td rowspan="1" colspan="2">轻伤</td>
-              <td rowspan="1" colspan="2">重伤</td>
-              <td rowspan="1" colspan="2">死亡</td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>出动<br>人工</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>支出<br>费用</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>计</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>其中<br>汽车</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>支出<br>费用</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>出动<br>飞机</td>
-                  </tr>
-                </table>
-              </td>
-              <td rowspan="2" colspan="1">
-                <table class="border0">
-                  <tr>
-                    <td>支出<br>费用</td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="1">蓄积</td>
-              <td rowspan="1" colspan="1">价值</td>
-              <td rowspan="1" colspan="1">株数</td>
-              <td rowspan="1" colspan="1">价值</td>
-              <td rowspan="1" colspan="1">人数</td>
-              <td rowspan="1" colspan="1">支出费用</td>
-              <td rowspan="1" colspan="1">人数</td>
-              <td rowspan="1" colspan="1">支出费用</td>
-              <td rowspan="1" colspan="1">人数</td>
-              <td rowspan="1" colspan="1">支出费用</td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">米³</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">万株</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">人</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">人</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">人</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">工日</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">台</td>
-              <td rowspan="1" colspan="1">台</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">架次</td>
-              <td rowspan="1" colspan="1">万元</td>
-              <td rowspan="1" colspan="1">万元</td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="1">1</td>
-              <td rowspan="1" colspan="1">2</td>
-              <td rowspan="1" colspan="1">3</td>
-              <td rowspan="1" colspan="1">4</td>
-              <td rowspan="1" colspan="1">5</td>
-              <td rowspan="1" colspan="1">6</td>
-              <td rowspan="1" colspan="1">7</td>
-              <td rowspan="1" colspan="1">8</td>
-              <td rowspan="1" colspan="1">9</td>
-              <td rowspan="1" colspan="1">10</td>
-              <td rowspan="1" colspan="1">11</td>
-              <td rowspan="1" colspan="1">12</td>
-              <td rowspan="1" colspan="1">13</td>
-              <td rowspan="1" colspan="1">14</td>
-              <td rowspan="1" colspan="1">15</td>
-              <td rowspan="1" colspan="1">16</td>
-              <td rowspan="1" colspan="1">17</td>
-              <td rowspan="1" colspan="1">18</td>
-              <td rowspan="1" colspan="1">19</td>
-              <td rowspan="1" colspan="1">20</td>
-              <td rowspan="1" colspan="1">21</td>
-              <td rowspan="1" colspan="1">22</td>
-              <td rowspan="1" colspan="1">23</td>
-            </tr>
-            <tr class="int_tr">
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.forestFireLossTotal"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.fireLossTotal"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.forestArea"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.forestPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.treesNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.treesPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.minorInjuriesNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.minorInjuriesPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.seriouslyInjuredNumber"/>
-              </td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.seriouslyInjuredPrice"/>
-              </td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.deathNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.deathPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.elseFireLossPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.blazesPriceTotal"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.artificialDays"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.artificialPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.vehicleNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.carNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.vehiclePrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.planeNumber"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.planePrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.elseBlazesPrice"/></td>
-              <td rowspan="1" colspan="1"><input type="text" class="border0" v-model="table1.note"/></td>
-
-            </tr>
-            </tbody>
-          </table>
-          <table class="table2" cellpadding="0" cellspacing="0" style="white-space: nowrap;">
-            <tbody>
-            <tr>
-              <th rowspan="1" colspan="26" style="letter-spacing:6rem">火场资料</th>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;1.起火时间</td>
-              <td colspan="5" rowspan="1"><input type="text" v-model="table2.fireTime"/></td>
-              <td colspan="2" rowspan="1">发现时间</td>
-              <td colspan="8" rowspan="1"><input type="text" v-model="table2.foundTime"/></td>
-              <td colspan="2" rowspan="1">扑灭时间</td>
-              <td colspan="7" rowspan="1"><input type="text" v-model="table2.blazesTime"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;2.地点及发现方式</td>
-              <td colspan="2" rowspan="1" class="txt_left"><select v-model="table2.address">
-                <option>吉林市</option>
-                <option>延边州</option>
-                <option>白山市</option>
-                <option>通化市</option>
-                <option>辽源市</option>
-                <option>四平市</option>
-                <option>长春市</option>
-                <option>白城市</option>
-                <option>松原市</option>
-                <option>敦化航站</option>
-                <option>长白山管委会</option>
-              </select></td>
-              <td colspan="13" rowspan="1"><input type="text" v-model="table2.firePlace"/></td>
-              <td colspan="2" rowspan="1">发现方式</td>
-              <td colspan="7" rowspan="1"><input type="text" v-model="table2.foundType"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;3.火场位置</td>
-              <td colspan="2" rowspan="1" class="border_l0">东经：</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.longitudeD"/></td>
-              <td colspan="1" rowspan="1" class="border_l0">度</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.longitudeM"/></td>
-              <td colspan="1" rowspan="1" class="border_l0">分</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.longitudeS"/></td>
-              <td colspan="2" rowspan="1" class="border_l0">秒</td>
-              <td colspan="1" rowspan="1" class="border_l0">；</td>
-              <td colspan="2" rowspan="1" class="border_l0">北纬：</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.latitudeD"/></td>
-              <td colspan="1" rowspan="1" class="border_l0">度</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.latitudeM"/></td>
-              <td colspan="1" rowspan="1" class="border_l0">分</td>
-              <td colspan="1" rowspan="1" class="border_l0"><input type="text" style="width:50px;"
-                                                                   v-model="table2.latitudeS"/></td>
-              <td colspan="1" rowspan="1" class="border_l0">秒</td>
-              <td class="border_l0"></td>
-              <td class="border_l0"></td>
-              <td class="border_l0"></td>
-              <td class="border_l0"></td>
-              <td class="border_l0"></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;4.起火原因</td>
-              <td colspan="3" rowspan="1" class="txt_left"><select v-model="table2.fireSource">
-                <option>未查明火源</option>
-                <option>烧荒烧炭</option>
-                <option>炼山造林</option>
-                <option>烧牧场</option>
-                <option disabled>烧窑</option>
-                <option>烧隔离带</option>
-                <option>火车喷漏</option>
-                <option>火车甩瓦</option>
-                <option>机车喷火</option>
-                <option>其他（生产性火源）</option>
-                <option>野外吸烟</option>
-                <option>取暖做饭</option>
-                <option>上坟烧纸</option>
-                <option>烧山驱兽</option>
-                <option>小孩玩火</option>
-                <option>痴呆弄火</option>
-                <option>家火上山</option>
-                <option>电线引起</option>
-                <option>其他（非生产性用火）</option>
-                <option>故意放火</option>
-                <option>外省（区）烧入</option>
-                <option>外国烧入</option>
-                <option>雷击火</option>
-                <option>其他自然火</option>
-              </select></td>
-              <td colspan="3" rowspan="1">火灾种类</td>
-              <td colspan="4" rowspan="1" class="txt_left"><select v-model="table2.fireType">
-                <option>地表火</option>
-                <option>树冠火</option>
-                <option>地下火</option>
-              </select></td>
-              <td colspan="3" rowspan="1">火灾等级</td>
-              <td colspan="11" rowspan="1" class="txt_left"><select v-model="table2.fireLevel">
-                <option>一般</option>
-                <option>较大</option>
-                <option>重大</option>
-                <option>特大</option>
-              </select></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;5.火场面积（公顷）</td>
-              <td colspan="2" rowspan="1">总面积合计</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.areaTotal"/></td>
-              <td colspan="4" rowspan="1">受害森林面积合计</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.forestLossAreaTotal"/></td>
-              <td colspan="1" rowspan="1">其中：</td>
-              <td colspan="2" rowspan="1">原森林</td>
-              <td colspan="4" rowspan="1"><input type="text" v-model="table2.originalForestArea"/></td>
-              <td colspan="2" rowspan="1">人工林</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.artificialForestArea"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;6.扑火人力物力投入</td>
-              <td colspan="2" rowspan="1">出动总人数</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.peopleTotal"/></td>
-              <td colspan="2" rowspan="1">其中扑火队</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.blazesTeamNumber"/></td>
-              <td colspan="1" rowspan="1">森警</td>
-              <td colspan="2" rowspan="1"><input type="text" v-model="table2.policeNumber"/></td>
-              <td colspan="1" rowspan="1">军队</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.armyNumber"/></td>
-              <td colspan="1" rowspan="1">群众</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.crowdNumber"/></td>
-              <td colspan="2" rowspan="1">风力灭火机</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.windExtinguisher"/></td>
-              <td colspan="2" rowspan="1">二号工具</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.secondTool"/></td>
-              <td colspan="2" rowspan="1">水枪</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.waterGun"/></td>
-              <td colspan="1" rowspan="1">其他</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.elseThings"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;7.受害森林概况</td>
-              <td colspan="2" rowspan="1">林木组成</td>
-              <td colspan="11" rowspan="1"><input type="text" v-model="table2.forestComposition"/></td>
-              <td colspan="2" rowspan="1">林令</td>
-              <td colspan="4" rowspan="1"><input type="text" v-model="table2.forestToken"/></td>
-              <td colspan="2" rowspan="1">疏密度</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.porosities"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;8.当日天气实况</td>
-              <td colspan="2" rowspan="1">天气</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.weather"/></td>
-              <td colspan="1" rowspan="1">气温</td>
-              <td colspan="2" rowspan="1"><input type="text" v-model="table2.temperature"/></td>
-              <td colspan="1" rowspan="1">C°</td>
-              <td colspan="3" rowspan="1">火险等级</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.fireInsuranceLevel"/></td>
-              <td colspan="2" rowspan="1">风力</td>
-              <td colspan="2" rowspan="1" class="border_l0"><input type="text" v-model="table2.windLevel"/></td>
-              <td colspan="2" rowspan="1" class="txt_left">级</td>
-              <td colspan="2" rowspan="1">风向</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.windDirection"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;9.指挥扑火负责人</td>
-              <td colspan="2" rowspan="1">单位</td>
-              <td colspan="11" rowspan="1"><input type="text" v-model="table2.commandUnit"/></td>
-              <td colspan="2" rowspan="1">姓名</td>
-              <td colspan="4" rowspan="1"><input type="text" v-model="table2.commandName"/></td>
-              <td colspan="2" rowspan="1">职务</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.commandPosition"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;10.火场调查负责人</td>
-              <td colspan="2" rowspan="1">单位</td>
-              <td colspan="11" rowspan="1"><input type="text" v-model="table2.surveyUnit"/></td>
-              <td colspan="2" rowspan="1">姓名</td>
-              <td colspan="4" rowspan="1"><input type="text" v-model="table2.surveyName"/></td>
-              <td colspan="2" rowspan="1">职务</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.surveyPosition"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;11.火灾肇事人情况</td>
-              <td colspan="2" rowspan="1">姓名</td>
-              <td colspan="2" rowspan="1"><input type="text" v-model="table2.accidentName"/></td>
-              <td colspan="2" rowspan="1">性别</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.accidentSex"/></td>
-              <td colspan="3" rowspan="1">年龄</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.accidentAge"/></td>
-              <td colspan="1" rowspan="1">职业</td>
-              <td colspan="1" rowspan="1"><input type="text" v-model="table2.accidentPosition"/></td>
-              <td colspan="2" rowspan="1">单位或住址</td>
-              <td colspan="9" rowspan="1"><input type="text" v-model="table2.accidentUnit"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left">&nbsp;12.火灾处理情况</td>
-              <td colspan="2" rowspan="1">处理方式</td>
-              <td colspan="4" rowspan="1"><select v-model="table2.dealType">
-                <option>立案（刑事处理）</option>
-                <option>破案（刑事处理）</option>
-                <option>行政处理</option>
-                <option>待查</option>
-                <option>拘留</option>
-                <option>处理</option>
-                <option>未处理</option>
-              </select></td>
-              <td colspan="3" rowspan="1">已处理人数</td>
-              <td colspan="4" rowspan="1"><input type="text" v-model="table2.dealNumber"/></td>
-              <td colspan="4" rowspan="1">刑事处罚人数</td>
-              <td colspan="7" rowspan="1"><input type="text" v-model="table2.criminalDealNumber"/></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left" style="height: 60px;">&nbsp;13.对火灾肇事人<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;的处理情况
-              </td>
-              <td colspan="24" rowspan="1" class="txt_left">
-                <textarea v-model="table2.accidentDealSituation"></textarea>
-              </td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left" style="height: 60px;">&nbsp;14.对责任人员的<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;责任人追查情况
-              </td>
-              <td colspan="24" rowspan="1" class="txt_left">
-                <textarea v-model="table2.responsibilityDealSituation"></textarea></td>
-            </tr>
-            <tr>
-              <td colspan="2" rowspan="1" class="txt_left" style="height: 60px;">&nbsp;15.对有关领导的<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;责任追查情况
-              </td>
-              <td colspan="24" rowspan="1" class="txt_left">
-                <textarea v-model="table2.leadershipDealSituation"></textarea></td>
-            </tr>
-            <tr class="tr_border">
-              <td colspan="4" rowspan="1">县（市、区、局、站）填表人：</td>
-              <td colspan="2" rowspan="1"><input type="text" v-model="table2.townForm"/></td>
-              <td colspan="4" rowspan="1">县（市、区、局、站）审核人：</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.townAudit"/></td>
-              <td colspan="4" rowspan="1">市（州、管委会）填表人：</td>
-              <td colspan="2" rowspan="1"><input type="text" v-model="table2.cityForm"/></td>
-              <td colspan="4" rowspan="1">市（州、管委会）审核人：</td>
-              <td colspan="3" rowspan="1"><input type="text" v-model="table2.cityAudit"/></td>
-            </tr>
-            </tbody>
-          </table>
-          <div class="btm-btn-group">
-            <el-button size="mini" type="primary"
-                       @click="updateCentereventTEventcatalogueStatus('gd',true)">归档
-            </el-button>
-            <el-button size="mini" type="primary"
-                       @click="regionalFlagAdd()">火灾区域
-            </el-button>
-          </div>
-        </form>
-      </div>
-    </el-dialog>
     <!-- 添加区域标记 -->
     <el-dialog title="火灾区域" :visible.sync="regionalFlagOpen" width="1000px">
       <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" style="width: 100%;height:74vh"

src/views/from/dvCapsuleChart.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="dv-capsule-chart">
+    <template v-if="mergedConfig">
+      <div class="label-column">
+        <div v-for="item in mergedConfig.data" :key="item.name" style="cursor: pointer" @click="getEventList(item)">
+          {{ item.name }}
+        </div>
+        <div>&nbsp;</div>
+      </div>
+      <div class="capsule-container">
+        <div class="capsule-item" v-for="(capsule, index) in capsuleLength" :key="index" style="cursor: pointer" @click="getEventList(mergedConfig.data[index])">
+          <div
+            class="capsule-item-column"
+            :style="`width: ${capsule * 100}%; background-color: ${mergedConfig.colors[index % mergedConfig.colors.length]};`"
+          >
+            <div
+              v-if="mergedConfig.showValue"
+              class="capsule-item-value"
+            >{{ capsuleValue[index] }}
+            </div>
+          </div>
+        </div>
+
+        <div class="unit-label">
+          <div
+            v-for="(label, index) in labelData"
+            :key="label + index"
+          >{{ label }}
+          </div>
+        </div>
+      </div>
+
+      <div class="unit-text" v-if="mergedConfig.unit">{{ mergedConfig.unit }}</div>
+    </template>
+  </div>
+</template>
+
+<script>
+import {deepMerge} from '@jiaminghi/charts/lib/util/index'
+
+import {deepClone} from '@jiaminghi/c-render/lib/plugin/util'
+
+export default {
+  name: 'DvCapsuleChart',
+  props: {
+    config: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      defaultConfig: {
+        /**
+         * @description Capsule chart data
+         * @type {Array<Object>}
+         * @default data = []
+         * @example data = [{ name: 'foo1', value: 100 }, { name: 'foo2', value: 100 }]
+         */
+        data: [],
+        /**
+         * @description Colors (hex|rgb|rgba|color keywords)
+         * @type {Array<String>}
+         * @default color = ['#37a2da', '#32c5e9', '#67e0e3', '#9fe6b8', '#ffdb5c', '#ff9f7f', '#fb7293']
+         * @example color = ['#000', 'rgb(0, 0, 0)', 'rgba(0, 0, 0, 1)', 'red']
+         */
+        colors: [
+          '#37a2da',
+          '#32c5e9',
+          '#67e0e3',
+          '#9fe6b8',
+          '#ffdb5c',
+          '#ff9f7f',
+          '#fb7293'
+        ],
+        /**
+         * @description Chart unit
+         * @type {String}
+         * @default unit = ''
+         */
+        unit: '',
+        /**
+         * @description Show item value
+         * @type {Boolean}
+         * @default showValue = false
+         */
+        showValue: false
+      },
+
+      mergedConfig: null,
+
+      capsuleLength: [],
+      capsuleValue: [],
+      labelData: [],
+      labelDataLength: []
+    }
+  },
+  watch: {
+    config() {
+      const {calcData} = this
+      calcData()
+    }
+  },
+  methods: {
+    getEventList(val) {
+      
+      let args = {eventTypeIdDl: [], eventTypeId: []}
+      if (val.id != '0') {
+        args.eventTypeIdDl.push(-1)
+        args.eventTypeId.push(val.id)
+      } else {
+        args.eventTypeIdDl.push(val.parentId)
+        args.eventTypeId.push(-1)
+      }
+      this.$emit('setEventTypeId', args)
+
+    },
+    calcData() {
+      const {mergeConfig, calcCapsuleLengthAndLabelData} = this
+
+      mergeConfig()
+
+      calcCapsuleLengthAndLabelData()
+    },
+    mergeConfig() {
+      let {config, defaultConfig} = this
+
+      this.mergedConfig = deepMerge(
+        deepClone(defaultConfig, true),
+        config || {}
+      )
+    },
+    calcCapsuleLengthAndLabelData() {
+      const {data} = this.mergedConfig
+
+      if (!data.length) return
+
+      const capsuleValue = data.map(({value}) => value)
+
+      const maxValue = Math.max(...capsuleValue)
+
+      this.capsuleValue = capsuleValue
+
+      this.capsuleLength = capsuleValue.map(v => (maxValue ? v / maxValue : 0))
+
+      const oneFifth = maxValue / 5
+
+      const labelData = Array.from(
+        new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth)))
+      )
+
+      this.labelData = labelData
+
+      this.labelDataLength = Array.from(labelData).map(v =>
+        maxValue ? v / maxValue : 0
+      )
+    }
+  },
+  mounted() {
+    const {calcData} = this
+
+    calcData()
+  }
+}
+</script>

src/views/leader.vue

@@ -77,7 +77,7 @@
                   <el-collapse-item v-for="(item,index) in xunLinListOne">
                     <template slot="title">
                       <div class="d-l-con sj-collapse"
-                           @click="getRecordList(item.id)">
+                           @click="getRecordList(item.id, item.patrolTrajectory)">
                         <div class="d-l-l-text">
                           <el-tooltip class="item" effect="dark" placement="left"
                                       style="width:10rem ;" :disabled="(item.taskName.length <= 20)">
@@ -171,8 +171,10 @@
 				indentText: '收起左右栏',
 				indentdisabled: false,
 				visuForestCloudRYBO: [], //人员类型列表
-				peopleList: [], //人员列表
-				connectList: [], //画线
+        personId: null, //人员
+        peopleList: [], //人员列表
+        connectList: [], //画线
+        patrolTrajectory: null, //任务画线
 				xunLinListOne: [], //巡林任务
 				recordList: [], //巡查记录
 				showNothing: false, //暂无信息
@@ -287,26 +289,35 @@
 				getForestLeader(linJob, linType).then(res => {
 					this.peopleList = res.data
 				})
-				this.connectList = []
-				this.$refs.supermap.clearC()
+        this.connectList = []
+        this.personId = null;
+        this.xunLinListOne = [];
+        this.patrolTrajectory = null;
+        this.$refs.supermap.clearC()
 			},
 			//点击左侧人员列表获取 巡林计划
 			getPlanList(personId) {
+        if(this.personId == personId){//当前人员已经被点击一次 不再重复加载
+          return;
+        }
+        this.personId = personId;
 				this.showNothing = false;
 				this.recordList = [];
 				getPlanList(personId).then(res => {
 					this.xunLinListOne = res.data;
 				})
-				this.$refs.supermap.clearC()
+        this.patrolTrajectory = null;
+        this.$refs.supermap.clearC();
 			},
 			//点击右侧巡林计划获取 巡查记录
-			getRecordList(id) {
+			getRecordList(id, patrolTrajectory) {
 				this.showNothing = false;
 				this.recordList = [];
 				getRecordList(id).then(res => {
 					this.recordList = res.data;
 				})
-				this.$refs.supermap.clearC()
+        this.$refs.supermap.clearC();
+        this.setTaskPointList(patrolTrajectory);
 			},
 			//点击右侧巡查记录获取 巡查轨迹
 			getPointList(id) {
@@ -315,6 +326,23 @@
 					this.setPointList(res);
 				})
 			},
+      //点击巡查人员 巡查任务落点
+      setTaskPointList(patrolTrajectory) {
+        console.log("巡查任务落点", typeof JSON.parse(patrolTrajectory));
+        if(this.patrolTrajectory == patrolTrajectory){
+          this.patrolTrajectory = null;
+        }else {
+          this.patrolTrajectory = patrolTrajectory;
+          this.drawTaskPoint(this.patrolTrajectory);
+        }
+      },
+      // 巡查任务落点
+      drawTaskPoint(patrolTrajectory) {
+        setTimeout(() => {
+          this.$refs.supermap.clearC();
+          this.$refs.supermap.setConnectList(JSON.parse(patrolTrajectory), '#04f');
+        }, 1000)
+      },
 			//点击巡查轨迹时段 巡查轨迹落点
 			setPointList(res) {
 				let that = this;
@@ -329,8 +357,8 @@
 						this.connectList.push(latlng)
 					}
 					setTimeout(() => {
-						that.$refs.supermap.clearC()
-						that.$refs.supermap.setConnectList(this.connectList, 'red')
+						// that.$refs.supermap.clearC()
+						that.$refs.supermap.setConnectList(this.connectList, '#f40')
 					}, 1000)
 				} else {
 					that.$refs.supermap.clearC()

src/views/monitor.vue

@@ -625,7 +625,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res