init

src/api/event.js

@@ -64,14 +64,14 @@ export function getImgUrl(data) {
 //获取附近事件
 export function getNearEvent(longitude,latitude) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-traffic/traffic/getNearEvent?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }
 //获取附近摄像头
 export function getNearCamera(longitude,latitude) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-traffic/traffic/getNearCamera?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }

src/api/forest.js

@@ -74,13 +74,6 @@ export function getEventByReportorOrder(param) {
   })
 }
 
-
-
-
-
-
-
-
 // 日志文件上传
 export function eventLogUpload(param) {
   return request({
@@ -89,6 +82,7 @@ export function eventLogUpload(param) {
     data: param
   })
 }
+
 // 日志发送
 export function sendEventLog(param) {
   return request({
@@ -97,18 +91,37 @@ export function sendEventLog(param) {
     data: param
   })
 }
+
+// 事件详情截图直接上传日志
+export function uploadBase64(param) {
+  return request({
+    url: '/center-traffic/traffic/uploadBase64',
+    method: 'post',
+    data:param
+  })
+}
+
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-agriculture/fire/updateCentereventTEventcatalogueStatus',
+    url: '/center-traffic/traffic/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
 }
+
+// 事件处理流程-签收部门
+export function selectByeventCode(eventCode) {
+  return request({
+    url: '/center-traffic/traffic/selectByeventCode/'+eventCode,
+    method: 'post'
+  })
+}
+
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
-    url: '/center-agriculture/fire/listSJfl',
+    url: '/center-traffic/traffic/listSJfl',
     method: 'post',
     data: param
   })
@@ -116,17 +129,19 @@ export function listSJfl(param) {
 // 事件处理流程-关联预案
 export function listYuAn() {
   return request({
-    url: '/center-agriculture/fire/listYuAn',
-    method: 'post'
-  })
-}
-// 事件处理流程-签收部门
-export function selectByeventCode(eventCode) {
-  return request({
-    url: '/center-agriculture/fire/selectByeventCode/'+eventCode,
+    url: '/center-traffic/traffic/listYuAn',
     method: 'post'
   })
 }
+
+
+
+
+
+
+
+
+
 // 事件处理流程-联动
 export function sendTask(param) {
   return request({
@@ -182,11 +197,4 @@ export function updateYjYuAn(param) {
     data:param
   })
 }
-// 事件详情截图直接上传日志
-export function uploadBase64(param) {
-  return request({
-    url: '/center-agriculture/fire/uploadBase64',
-    method: 'post',
-    data:param
-  })
-}
+

src/router/index.js

@@ -44,20 +44,20 @@ export const constantRoutes = [{
 	},
 	{
 		//数据中心
-		path: '/datacenter',
+		path: '/',
 		name: 'datacenter',
 		component: () => import('@/views/datacenter'),
 		meta: {
-			title: '数据中心'
+			title: '交通人员'
 		}
 	},
 	{
 		//监控中心
-		path: '/monitor',
+		path: '/',
 		name: 'monitor',
 		component: () => import('@/views/monitor'),
 		meta: {
-			title: '监控中心'
+			title: '交通资源'
 		}
 	},
   {
@@ -119,20 +119,20 @@ export const constantRoutesNew = [{
 	},
 	{
 		//数据中心
-		path: '/datacenter',
+		path: '/',
 		name: 'datacenter',
 		component: () => import('@/views/datacenter'),
 		meta: {
-			title: '数据中心'
+			title: '交通人员'
 		}
 	},
 	{
 		//监控中心
-		path: '/monitor',
+		path: '/',
 		name: 'monitor',
 		component: () => import('@/views/monitor'),
 		meta: {
-			title: '监控中心'
+			title: '交通资源'
 		}
 	},
   {

src/views/eventdetailsdialog.vue

@@ -15,49 +15,6 @@
             <!-- 左侧 -->
             <el-col :span="18" class="dia-left">
               <div ref="imageTofile" style="height: 75vh;">
-                <!-- 应急预案 -->
-                <div class="dia-left-top">
-                  <div class="dia-left-top-tit">应急预案</div>
-                  <div class="dia-left-top-carousel">
-                    <el-carousel height="30px" direction="vertical" :interval="2000">
-                      <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
-                        <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName }}</a>
-                      </el-carousel-item>
-                      <el-carousel-item v-else>
-                        <a href="#">暂未关联预案</a>
-                      </el-carousel-item>
-                    </el-carousel>
-                  </div>
-                  <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
-                  </el-button>
-                </div>
-                <!-- 应急预案end -->
-                <!-- 左侧资源 -->
-                <!--<div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">-->
-                  <!--<div class="forthis">-->
-                    <!--<dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
-                      <!--<div class="i-list-con">-->
-                        <!--<div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">-->
-                          <!--<div class="icon-con" style="width: fit-content !important;"-->
-                               <!--v-for="(item,index) in resourcesList" @click="listResourceByWz(item.type)">-->
-                            <!--<div class="iconfont icon icon-normal" :class="item.icon"></div>-->
-                            <!--<div class="icon-text">-->
-                              <!--<h5>{{ item.resourceName }}</h5>-->
-                            <!--</div>-->
-                          <!--</div>-->
-                          <!--<el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>-->
-                        <!--</div>-->
-                      <!--</div>-->
-
-                    <!--</dv-border-box-7>-->
-                  <!--</div>-->
-
-                <!--</div>-->
-                <!-- 左侧资源end -->
-                <!-- 底部工具栏 -->
-                <!--   <div class="dia-left-btm-tool">
-                   </div> -->
-                <!-- 底部工具栏end -->
                 <!-- 地图 -->
                 <supermapDialog ref="supermapDialog"
                                 style="position: absolute; top:0;left: 0;"
@@ -65,7 +22,7 @@
                                 :mapSite="{zoom:12,doubleClickZoom:false,dragging:false,scrollWheelZoom:false}"
                                 :codes="['9fa5']"
                                 :isSideBySide="false"
-                                :isdynamicPlotting="true"/>
+                                :isdynamicPlotting="false"/>
                 <!-- 地图end -->
               </div>
             </el-col>
@@ -214,8 +171,8 @@
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_5'">
                                 <el-button size="small"
                                            icon="el-icon-success" style="text-align:left"
-                                           @click="updateCentereventTEventcatalogueStatus('gd',false)">
-                                  填报
+                                           @click="updateCentereventTEventcatalogueStatus('gd',true)">
+                                  归档
                                 </el-button>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
@@ -232,7 +189,6 @@
                   </dv-border-box-7>
                 </div>
               </div>
-
             </el-col>
             <!-- 左侧end -->
           </el-row>
@@ -245,9 +201,6 @@
                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="请选择签收部门"/>-->
@@ -333,518 +286,6 @@
         </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="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"
@@ -1024,6 +465,7 @@ export default {
       eventStatusValue: null,//事件状态
       eventId: null,//事件ID
       eventType: null,//事件类型-大类
+      eventTypeXl: null,//事件类型-小类
       eventCode: null,
       longitude: null,
       latitude: null,
@@ -1403,9 +845,11 @@ export default {
      * */
     async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
       this.eventStatusButton = eventStatus
-
+      this.sendEventType = this.eventTypeXl
       if (!isSend) {//事件弹窗
         if (eventStatus == 'qs') {//签收
+          // console.log(this.eventType);
+          // console.log(this.eventTypeXl);
           this.eventConfirmTitle = '事件签收'
           let param = { parentId: this.eventType }
           await listSJfl(param).then(res => {
@@ -1520,10 +964,8 @@ export default {
             eventCode: this.eventCode,
             eventStatus: eventStatus,
             id: this.eventId,
-            czlx: '',
-            forestFireLoss: { eventId: this.eventCode, table1: this.table1 },
-            fireInformation: { eventId: this.eventCode, table2: this.table2 },
-            array: this.regionalFlagObj.array
+            eventType: this.eventTypeXl,
+            czlx: ''
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
@@ -1548,7 +990,7 @@ export default {
             deptId: this.sendDeptId,
             deptName: this.sendDeptName,
             eventStatus: eventStatus,
-            eventType: this.sendEventType,
+            eventType: this.eventTypeXl,
             id: this.eventId,
             czlx: '',
             fireRadius: this.sendHuoZaiBanJing,
@@ -1598,13 +1040,14 @@ export default {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog//日志列表
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-        if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-          this.address = res.data.catalogue[0].address
-          this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-          this.eventType = res.data.catalogue[0].eventType
-          this.eventId = res.data.catalogue[0].id
-          this.longitude = res.data.catalogue[0].longitude
-          this.latitude = res.data.catalogue[0].latitude
+        if (res.data.catalogue != null) {
+          this.address = res.data.catalogue.address
+          this.eventStatusValue = res.data.catalogue.eventStatusValue
+          this.eventType = res.data.catalogue.eventType
+          this.eventTypeXl = res.data.catalogue.eventTypeXl
+          this.eventId = res.data.catalogue.id
+          this.longitude = res.data.catalogue.longitude
+          this.latitude = res.data.catalogue.latitude
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1616,20 +1059,20 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
           }
-          markersMap.lng = res.data.catalogue[0].longitude
-          markersMap.lat = res.data.catalogue[0].latitude
+          markersMap.lng = res.data.catalogue.longitude
+          markersMap.lat = res.data.catalogue.latitude
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
             markersMap.radius = res.data.eventdetail[0].fireRadius
           }
@@ -1637,7 +1080,7 @@ export default {
             that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
             that.$refs.supermapDialog.clearM(false)
             that.$refs.supermapDialog.setMarkersRadius([markersMap])
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
+            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
           }, 2000)
         }
         if (res.data.centermonitorTCamera != null) {
@@ -1678,13 +1121,13 @@ export default {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-        if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-          this.address = res.data.catalogue[0].address
-          this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-          this.eventType = res.data.catalogue[0].eventType
-          this.eventId = res.data.catalogue[0].id
-          this.latitude = res.data.catalogue[0].latitude
-          this.longitude = res.data.catalogue[0].longitude
+        if (res.data.catalogue != null) {
+          this.address = res.data.catalogue.address
+          this.eventStatusValue = res.data.catalogue.eventStatusValue
+          this.eventType = res.data.catalogue.eventType
+          this.eventId = res.data.catalogue.id
+          this.latitude = res.data.catalogue.latitude
+          this.longitude = res.data.catalogue.longitude
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1696,20 +1139,20 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
           }
-          markersMap.lng = res.data.catalogue[0].longitude
-          markersMap.lat = res.data.catalogue[0].latitude
+          markersMap.lng = res.data.catalogue.longitude
+          markersMap.lat = res.data.catalogue.latitude
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
             markersMap.radius = res.data.eventdetail[0].fireRadius
           }
@@ -1720,7 +1163,7 @@ export default {
             } else {
               that.$refs.supermapDialog.setMarkers([markersMap])
             }
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
+            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
           }, 2000)
         }
       })
@@ -1740,8 +1183,8 @@ export default {
       // imageTofile是给截图范围内的父级元素自定义的ref名称
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById('forestWarmSuperMap')
-      let toolbar = document.getElementById('toolbar')
-      canvasBox.removeChild(toolbar)
+      // let toolbar = document.getElementById('toolbar')
+      // canvasBox.removeChild(toolbar)
       // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width)
       const height = parseInt(window.getComputedStyle(canvasBox).height)