Kaynağa Gözat

数据中心摄像头

王通 2 yıl önce
ebeveyn
işleme
54a94bba37

+ 41 - 27
src/views/eventdetailsdialog.vue

@@ -212,16 +212,16 @@
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
                                     签收
                                   </el-button>
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-question"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
-                                  <!--误报-->
-                                  <!--</el-button>-->
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-warning"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
-                                  <!--重复-->
-                                  <!--</el-button>-->
+                                  <el-button size="small"
+                                             icon="el-icon-question"
+                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
+                                    误报
+                                  </el-button>
+                                  <el-button size="small"
+                                             icon="el-icon-warning"
+                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
+                                    重复
+                                  </el-button>
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
@@ -2064,23 +2064,36 @@ export default {
             that.$message.error(`请选择任务发起部门!`)
             return
           }
-          let param = {
-            sendDeptId: that.sendDeptId,
-            sendDept: that.sendDeptName,
-            eventCode: that.eventCode,
-            longitude: that.longitude,
-            latitude: that.latitude,
-            taskTitle: that.sendTaskTitle,
-            taskSource: that.sendTaskSource,
-            taskContent: that.sendTaskContent,
-            taskDept: that.sendLianDongDept
-          }
-          sendTask(param).then(res => {
+          let eventState = "";
+          listSJfl({ parentId: that.eventType }).then(res => {
             if (res.code == 200) {
-              that.$message.success(`联动发起成功!`)
-              that.refreshEventDialog(that.eventCode)
-              that.cancelEventConfirm_send()
-              that.showEventConfirm = false
+              for(let i in res.data){
+                if(res.data[i].id = that.eventTypeXl){
+                  eventState = res.data[i].eventTypeName;
+                }
+              }
+              let param = {
+                sendDeptId: that.sendDeptId,
+                sendDept: that.sendDeptName,
+                eventCode: that.eventCode,
+                longitude: that.longitude,
+                latitude: that.latitude,
+                taskTitle: that.sendTaskTitle,
+                taskSource: that.sendTaskSource,
+                taskContent: that.sendTaskContent,
+                taskDept: that.sendLianDongDept,
+                eventAddress:that.address,
+                eventState:eventState,
+                eventName:that.eventName
+              }
+              sendTask(param).then(res => {
+                if (res.code == 200) {
+                  that.$message.success(`联动发起成功!`)
+                  that.refreshEventDialog(that.eventCode)
+                  that.cancelEventConfirm_send()
+                  that.showEventConfirm = false
+                }
+              })
             }
           })
 
@@ -2168,7 +2181,8 @@ export default {
             czlx: '',
             cameraCode: that.cameraCode,
             fireRadius: that.sendHuoZaiBanJing,
-            reserve: that.sendGuanLianYuAn
+            reserve: that.sendGuanLianYuAn,
+            address:that.address,
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {

+ 1 - 2
src/views/findUserByDept.vue

@@ -95,10 +95,9 @@
         this.resUser = [];
         for (let i in selection){
           const res = {};
-          res.id = '';
+          res.id = selection[i].userId;
           res.dept = '';
           res.depteventId = '';
-          res.userId=selection[i].userId;
           res.name = selection[i].nickName;
           res.post = selection[i].postName;;
           res.telphone = selection[i].phonenumber;

+ 41 - 37
src/views/firespread.vue

@@ -192,32 +192,22 @@
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
                                     签收
                                   </el-button>
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-question"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
-                                  <!--误报-->
-                                  <!--</el-button>-->
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-warning"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
-                                  <!--重复-->
-                                  <!--</el-button>-->
+                                  <el-button size="small"
+                                             icon="el-icon-question"
+                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
+                                    误报
+                                  </el-button>
+                                  <el-button size="small"
+                                             icon="el-icon-warning"
+                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
+                                    重复
+                                  </el-button>
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
                                 <div>
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-question"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
-                                  <!--误报-->
-                                  <!--</el-button>-->
-                                  <!--<el-button size="small"-->
-                                  <!--icon="el-icon-warning"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
-                                  <!--重复-->
-                                  <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-phone" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('ld',false)">
@@ -2730,23 +2720,36 @@ export default {
             that.$message.error(`请选择任务发起部门!`)
             return
           }
-          let param = {
-            sendDeptId: that.sendDeptId,
-            sendDept: that.sendDeptName,
-            eventCode: that.eventCode,
-            longitude: that.longitude,
-            latitude: that.latitude,
-            taskTitle: that.sendTaskTitle,
-            taskSource: that.sendTaskSource,
-            taskContent: that.sendTaskContent,
-            taskDept: that.sendLianDongDept
-          }
-          sendTask(param).then(res => {
+          let eventState = "";
+          listSJfl({ parentId: that.eventType }).then(res => {
             if (res.code == 200) {
-              that.$message.success(`联动发起成功!`)
-              that.refreshEventDialog(that.eventCode)
-              that.cancelEventConfirm_send()
-              that.showEventConfirm = false
+              for(let i in res.data){
+                if(res.data[i].id = that.eventTypeXl){
+                  eventState = res.data[i].eventTypeName;
+                }
+              }
+              let param = {
+                sendDeptId: that.sendDeptId,
+                sendDept: that.sendDeptName,
+                eventCode: that.eventCode,
+                longitude: that.longitude,
+                latitude: that.latitude,
+                taskTitle: that.sendTaskTitle,
+                taskSource: that.sendTaskSource,
+                taskContent: that.sendTaskContent,
+                taskDept: that.sendLianDongDept,
+                eventAddress:that.address,
+                eventState:eventState,
+                eventName:that.eventName
+              }
+              sendTask(param).then(res => {
+                if (res.code == 200) {
+                  that.$message.success(`联动发起成功!`)
+                  that.refreshEventDialog(that.eventCode)
+                  that.cancelEventConfirm_send()
+                  that.showEventConfirm = false
+                }
+              })
             }
           })
 
@@ -2823,7 +2826,8 @@ export default {
             czlx: '',
             cameraCode: that.cameraCode,
             fireRadius: that.sendHuoZaiBanJing,
-            reserve: that.sendGuanLianYuAn
+            reserve: that.sendGuanLianYuAn,
+            address:that.address,
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {