Kaynağa Gözat

责任制度

王通 2 yıl önce
ebeveyn
işleme
75893d9533

+ 76 - 35
src/views/eventdetailsdialog.vue

@@ -169,7 +169,7 @@
                                 </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 size="small" icon="el-icon-download" @click="showResponsibility()" v-if="eventStatusValue!='forest_event_status_1'&&eventStatusValue!='forest_event_status_7'">责任制
                                 </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)">处置
@@ -255,12 +255,12 @@
                               <div class="z-info-btm-input-btn"
                                    v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
                                 <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left" v-if="eventType == 1"
+                                           icon="el-icon-success" style="text-align:left" v-if="eventTypeXl == 101"
                                            @click="updateCentereventTEventcatalogueStatus('gd',false)">
                                   填报
                                 </el-button>
                                 <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left" v-if="eventType != '1'"
+                                           icon="el-icon-success" style="text-align:left" v-if="eventTypeXl != 101"
                                            @click="updateCentereventTEventcatalogueStatus('gd',true)">
                                   归档
                                 </el-button>
@@ -1507,9 +1507,11 @@ export default {
       this.showMeetingMsgDialog = false
     },
     addResponsibilityDialog() {//责任制保存
+console.log(this.dutysystemTableData)
       let reg_user = /^[\u4e00-\u9fa5]{2,4}$/;    //2-4个中文字符正则
       let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;    //11位手机号码正则
       for(let i in this.dutysystemTableData){
+
         if(!reg_user.test(this.dutysystemTableData[i].name)){
           this.$message.error(`请输入正确姓名!`)
           return;
@@ -1548,6 +1550,44 @@ export default {
       // this.$refs.TVWall.showTVWall();
 
     },
+    showTVWall(channelCode, channelName) {
+      let tvListJson = [{
+        "switchTab": "2",
+        "treeLabels": [{
+          "id": null,
+          "labelCode": "999",
+          "labelName": "电视墙",
+          "cameraType": null,
+          "parentLabelCode": ""
+        },
+          {
+            "id": "spcamera00010",
+            "labelCode": channelCode,
+            "labelName": channelName,
+            "cameraType": "1",
+            "parentLabelCode": "999"
+          }
+        ],
+        "labelChannels": [{
+          "labelCode": channelCode,
+          "channelDates": [{
+            "channelCode": channelCode,
+            "channelName": channelName,
+            "channelSn": null,
+            "cameraType": "1",
+            "online": "1",
+            "cameraCode": "1"
+          }]
+        }]
+      }]
+      this.$refs.TVWall.showTVWall(tvListJson, [{
+        "channelId": channelCode
+      }]);
+      this.$refs.bottomMenu.showMeasure = false;
+      this.$refs.bottomMenu.showChild = false;
+      this.$refs.bottomMenu.showBanChild = false;
+      this.$refs.bottomMenu.showChangChild = false;
+    },
     initByCameras()
     {
       const params=Object.assign({})
@@ -1721,7 +1761,7 @@ export default {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
                   markersMap.parameter = {code:res.data[i].cameraCode,
-                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1}
+                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].name}
                 }
               }
               markersMap.lng = res.data[i].longitude
@@ -2236,7 +2276,7 @@ export default {
             icon: 'camera',
             bindPopupHtml: '',
             click: 'preview',
-            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
+            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
             keepBindPopup: false,
             isAggregation: true,
             radius: 0
@@ -2327,7 +2367,7 @@ export default {
             icon: 'camera',
             bindPopupHtml: '',
             click: 'preview',
-            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
+            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
             keepBindPopup: false,
             isAggregation: true,
             radius: 0
@@ -2435,35 +2475,36 @@ export default {
     /** 预览按钮操作 */
     preview(cameraParam) {
       if(cameraParam.type=='1'){
-        getDahuaVideoServer().then(newResponse => {
-          console.log(newResponse)
-          this.ws.detectConnectQt().then(res => {
-            if (res) { // 连接客户端成功
-              this.alertLogin()
-              this.ws.login({
-                loginIp: newResponse.loginIp,
-                loginPort: newResponse.loginPort,
-                userName: newResponse.userName,
-                userPwd: newResponse.userPwd,
-                token: '',
-                https: 1
-              })
-              this.ws.on('loginState', (res) => {
-                this.isLogin = res
-                console.log('---res-----', res)
-                if (res) {
-                  this.alertLoginSuccess()
-                  this.activePanel = 'key2'
-                  this.realTimeVideoDialog(cameraParam.code)
-                } else {
-                  this.alertLoginFailed()
-                }
-              })
-            } else { // 连接客户端失败
-              this.alertReinstall()
-            }
-          })
-        })
+        this.showTVWall(cameraParam.code,cameraParam.name)
+        // getDahuaVideoServer().then(newResponse => {
+        //   console.log(newResponse)
+        //   this.ws.detectConnectQt().then(res => {
+        //     if (res) { // 连接客户端成功
+        //       this.alertLogin()
+        //       this.ws.login({
+        //         loginIp: newResponse.loginIp,
+        //         loginPort: newResponse.loginPort,
+        //         userName: newResponse.userName,
+        //         userPwd: newResponse.userPwd,
+        //         token: '',
+        //         https: 1
+        //       })
+        //       this.ws.on('loginState', (res) => {
+        //         this.isLogin = res
+        //         console.log('---res-----', res)
+        //         if (res) {
+        //           this.alertLoginSuccess()
+        //           this.activePanel = 'key2'
+        //           this.realTimeVideoDialog(cameraParam.code)
+        //         } else {
+        //           this.alertLoginFailed()
+        //         }
+        //       })
+        //     } else { // 连接客户端失败
+        //       this.alertReinstall()
+        //     }
+        //   })
+        // })
       }else if(cameraParam.type=='0'){
         let that = this
         that.cameraVisible = true

+ 1 - 0
src/views/findUserByDept.vue

@@ -96,6 +96,7 @@
         for (let i in selection){
           const res = {};
           res.id = '';
+          res.userId=selection[i].userId
           res.dept = '';
           res.depteventId = '';
           res.name = selection[i].nickName;

+ 861 - 36
src/views/firespread.vue

@@ -149,7 +149,7 @@
                                 </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 size="small" icon="el-icon-download" @click="showResponsibility()" v-if="eventStatusValue!='forest_event_status_1'&&eventStatusValue!='forest_event_status_7'">责任制
                                 </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)">处置
@@ -235,12 +235,12 @@
                               <div class="z-info-btm-input-btn"
                                    v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
                                 <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left" v-if="eventType == 1"
+                                           icon="el-icon-success" style="text-align:left" v-if="eventTypeXl == 101"
                                            @click="updateCentereventTEventcatalogueStatus('gd',false)">
                                   填报
                                 </el-button>
                                 <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left" v-if="eventType != '1'"
+                                           icon="el-icon-success" style="text-align:left" v-if="eventTypeXl != 101"
                                            @click="updateCentereventTEventcatalogueStatus('gd',true)">
                                   归档
                                 </el-button>
@@ -963,6 +963,789 @@
     <el-dialog title="人员选择" :visible.sync="showFindUserByDept" width="40%">
       <findUserByDept v-if="showFindUserByDept" ref="findUserByDept" :deptId="iconCurrentIndex" @addSelection="addSelection"></findUserByDept>
     </el-dialog>
+    <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'&&eventTypeXl==null">
+          <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'&& eventTypeXl == null">
+          <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="请选择关联预案!" filterable 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-button
+              size="mini"
+              type="danger"
+              v-if="depteventId!=null&&depteventId!=''"
+              @click="finUserByDept">选择
+            </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>
+    <!--    会议弹窗  start -->
+    <el-dialog title="视频会议" :visible.sync="showMeetingMsgDialog" v-if="showMeetingMsgDialog" width="65%"
+               @close="closeMeetingMsgDialog()">
+      <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-button
+              size="mini"
+              type="danger"
+              v-if="depteventId!=null&&depteventId!=''"
+              @click="finUserByDept">选择
+            </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="sendMsg">发送短信
+        </el-button>
+        <div style="clear: both;"></div>
+      </el-form>
+    </el-dialog>
+    <!--    会议弹窗  end   -->
+    <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="showTcPlayer" width="40%" customClass="customWidthMp4">
+      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>
+    </el-dialog>
+    <el-dialog :title="cameraTitle" :visible.sync="cameraVisible" v-if="cameraVisible" customClass="videoCustomWidth"
+               @close="cancelEventLocationShow()">
+      <div style="width:1020px;height:625px;position:relative;">
+        <!--视频窗口展示---海康-->
+        <div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>
+      </div>
+    </el-dialog>
+    <TVWall ref="TVWall"></TVWall>
   </div>
 </template>
 
@@ -975,6 +1758,7 @@ import areaSupermap from '@/components/supermap'//区域标记地图
 import TcPlayer from '@/components/TcPlayer' //视频预览
 import leftRightSwiperScroll from '@/components/leftRightSwiperScroll.vue';//事件中心底部资源内容溢出组件
 import {getIconBg} from '@/api/components/sookaMapIcon';//资源底色控制文件
+import TVWall from '@/components/TVWall.vue' //电视墙弹窗
 import {
   getEventDetail,
   sendEventLog,
@@ -1023,7 +1807,8 @@ export default {
     supermapDialog1,
     eventLogUpload,
     areaSupermap,
-    TcPlayer
+    TcPlayer,
+    TVWall
   },
   data() {
     return {
@@ -1282,6 +2067,7 @@ export default {
       resourcesListCheck: [],
       //文本域
       feedback: '',
+      statusFlag: null,//事件流程按钮
 
     }
   },
@@ -1433,6 +2219,44 @@ export default {
         }
       }
     },
+    showTVWall(channelCode, channelName) {
+      let tvListJson = [{
+        "switchTab": "2",
+        "treeLabels": [{
+          "id": null,
+          "labelCode": "999",
+          "labelName": "电视墙",
+          "cameraType": null,
+          "parentLabelCode": ""
+        },
+          {
+            "id": "spcamera00010",
+            "labelCode": channelCode,
+            "labelName": channelName,
+            "cameraType": "1",
+            "parentLabelCode": "999"
+          }
+        ],
+        "labelChannels": [{
+          "labelCode": channelCode,
+          "channelDates": [{
+            "channelCode": channelCode,
+            "channelName": channelName,
+            "channelSn": null,
+            "cameraType": "1",
+            "online": "1",
+            "cameraCode": "1"
+          }]
+        }]
+      }]
+      this.$refs.TVWall.showTVWall(tvListJson, [{
+        "channelId": channelCode
+      }]);
+      this.$refs.bottomMenu.showMeasure = false;
+      this.$refs.bottomMenu.showChild = false;
+      this.$refs.bottomMenu.showBanChild = false;
+      this.$refs.bottomMenu.showChangChild = false;
+    },
     addSelection: function(userList){
       for (let i in this.dutysystemTableData) {
         for (let j in userList) {
@@ -1608,7 +2432,7 @@ export default {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
                   markersMap.parameter = {code:res.data.data[i].cameraCode,
-                    type:res.data.data[i].cameraFactory}
+                    type:res.data.data[i].cameraFactory,name:res.data[i].name}
                 }
               }
               markersMap.lng = res.data[i].longitude
@@ -2106,7 +2930,7 @@ export default {
             icon: 'camera',
             bindPopupHtml: '',
             click: 'preview',
-            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
+            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.name},
             keepBindPopup: false,
             isAggregation: false,
             radius: 0
@@ -2204,7 +3028,7 @@ export default {
             icon: 'camera',
             bindPopupHtml: '',
             click: 'preview',
-            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
+            parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
             keepBindPopup: false,
             isAggregation: false,
             radius: 0
@@ -2312,35 +3136,36 @@ export default {
     /** 预览按钮操作 */
     preview(cameraParam) {
       if(cameraParam.type=='1'){
-        getDahuaVideoServer().then(newResponse => {
-          console.log(newResponse)
-          this.ws.detectConnectQt().then(res => {
-            if (res) { // 连接客户端成功
-              this.alertLogin()
-              this.ws.login({
-                loginIp: newResponse.loginIp,
-                loginPort: newResponse.loginPort,
-                userName: newResponse.userName,
-                userPwd: newResponse.userPwd,
-                token: '',
-                https: 0
-              })
-              this.ws.on('loginState', (res) => {
-                this.isLogin = res
-                console.log('---res-----', res)
-                if (res) {
-                  this.alertLoginSuccess()
-                  this.activePanel = 'key2'
-                  this.realTimeVideoDialog(cameraParam.code)
-                } else {
-                  this.alertLoginFailed()
-                }
-              })
-            } else { // 连接客户端失败
-              this.alertReinstall()
-            }
-          })
-        })
+        this.showTVWall(cameraParam.code,cameraParam.name)
+        // getDahuaVideoServer().then(newResponse => {
+        //   console.log(newResponse)
+        //   this.ws.detectConnectQt().then(res => {
+        //     if (res) { // 连接客户端成功
+        //       this.alertLogin()
+        //       this.ws.login({
+        //         loginIp: newResponse.loginIp,
+        //         loginPort: newResponse.loginPort,
+        //         userName: newResponse.userName,
+        //         userPwd: newResponse.userPwd,
+        //         token: '',
+        //         https: 0
+        //       })
+        //       this.ws.on('loginState', (res) => {
+        //         this.isLogin = res
+        //         console.log('---res-----', res)
+        //         if (res) {
+        //           this.alertLoginSuccess()
+        //           this.activePanel = 'key2'
+        //           this.realTimeVideoDialog(cameraParam.code)
+        //         } else {
+        //           this.alertLoginFailed()
+        //         }
+        //       })
+        //     } else { // 连接客户端失败
+        //       this.alertReinstall()
+        //     }
+        //   })
+        // })
       }else if(cameraParam.type=='0'){
         let that = this
         that.cameraVisible = true