diff --git a/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue b/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue
index 3505066..055260a 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue
+++ b/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue
@@ -124,7 +124,7 @@ export default {
},
methods: {
clickIntoDutyInfoDialog() {
- this.dutyInfoDialog.visible = true
+ this.$emit('goInfo', this.titleType)
}
}
}
diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
index eb503fa..554cd47 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
+++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
@@ -8,9 +8,9 @@
-
-
-
+
+
+
@@ -298,14 +298,14 @@ export default {
x: null,
y: null
},
- mapLevel: 20
+ mapLevel: 20,
+ goBackFlag: true
}
},
mounted() {
/** 调用地图初始化方法 */
this.firstInitPoint()
/** 调用初始化点位绘制方法 */
- // this.initPoints()
/** 初始化选中首个二级坐标点位分类 */
this.currSubControlPoint = this.subControlPoint['0']
},
@@ -537,6 +537,24 @@ export default {
loading.close()
})
},
+ goInfo(e) {
+ if (e === '值班信息') {
+ this.goBackFlag = false
+ this.$router.push('/emergen_cyrescue/duty_management/shift_registration')
+ }
+ if (e === '预案信息') {
+ if (this.FIRERESERVEPLAN_ID) {
+ this.goBackFlag = false
+ this.$router.push('/plan/company_plan?FIRERESERVEPLAN_ID=' + this.FIRERESERVEPLAN_ID)
+ } else {
+ this.$message.error('救援没启动预案')
+ }
+ }
+ if (e === '通讯录') {
+ this.goBackFlag = false
+ this.$router.push('/emergencyuser/communication')
+ }
+ },
initWebsocket() {
const wsUrl = config.YjSysUrl + '/yjMessage/' + this.REPORT_ID
this.webSocket = new WebSocket(encodeURI(wsUrl))
@@ -545,10 +563,17 @@ export default {
this.webSocket.send('链接成功')
}
this.webSocket.onerror = () => {
+ console.log('指挥调度的webSocket链接失败')
this.$router.back()
}
this.webSocket.onclose = () => {
- this.$router.push('/emergen_cyrescue/incident_management')
+ console.log('指挥调度的webSocket链接关闭')
+ console.log(this.goBackFlag)
+ if (this.goBackFlag) {
+ this.$router.push('/emergen_cyrescue/incident_management')
+ } else {
+ this.goBackFlag = true
+ }
}
var _this = this
this.webSocket.onmessage = function(message) {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
index 892eca5..873fbe6 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
@@ -27,7 +27,6 @@
-
@@ -38,7 +37,6 @@
-
@@ -57,7 +54,6 @@
水灾
其他
-
@@ -80,14 +76,12 @@
-
-
@@ -95,9 +89,7 @@
-
-
@@ -150,11 +142,8 @@
-
-
-