From fdcbfdfbad34dfd15f8331aa0c4467b48320caaa Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 12 Aug 2024 18:50:26 +0800 Subject: [PATCH] =?UTF-8?q?pc=E6=8C=87=E4=BB=A4=E5=8F=91=E9=80=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency_map/components/dialog.vue | 2 +- .../emergency_map/components/mapAssembly.vue | 13 +- .../emergency_map/dialog/sendMessage.vue | 122 ++++++++++++++++-- 3 files changed, 122 insertions(+), 15 deletions(-) diff --git a/src/views/emergen_cyrescue/emergency_map/components/dialog.vue b/src/views/emergen_cyrescue/emergency_map/components/dialog.vue index 29d6bd5..694ea5a 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/dialog.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/dialog.vue @@ -26,7 +26,7 @@ - + diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue index 54e49c9..e980ac6 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue @@ -297,7 +297,8 @@ export default { firstPoint: { x: null, y: null - } + }, + mapLevel: 20 } }, mounted() { @@ -329,10 +330,10 @@ export default { this.firstPoint.x = e.x this.firstPoint.y = e.y mapInstance = new window.BMapGL.Map('map') // 创建地图实例 - mapInstance.centerAndZoom(new window.BMapGL.Point(e.y, e.x), 15) // 创建点坐标 + mapInstance.centerAndZoom(new window.BMapGL.Point(e.y, e.x), this.mapLevel) // 创建点坐标 mapInstance.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放能力 var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标(例如北京天安门) - mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别 + mapInstance.centerAndZoom(point, this.mapLevel) // 设置中心点和缩放级别 mapInstance.enableScrollWheelZoom(true) var circle = new window.BMapGL.Circle(point, this.range, { strokeColor: 'blue', @@ -349,7 +350,7 @@ export default { this.range = item mapInstance.clearOverlays() var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标(例如北京天安门) - mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别 + mapInstance.centerAndZoom(point, this.mapLevel) // 设置中心点和缩放级别 mapInstance.enableScrollWheelZoom(true) var circle = new window.BMapGL.Circle(point, item, { // 2000米半径 strokeColor: 'blue', @@ -483,7 +484,7 @@ export default { subToggleCheck(sos, ind) { mapInstance.clearOverlays() var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标(例如北京天安门) - mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别 + mapInstance.centerAndZoom(point, 10) // 设置中心点和缩放级别 mapInstance.enableScrollWheelZoom(true) var circle = new window.BMapGL.Circle(point, this.range, { // 2000米半径 strokeColor: 'blue', @@ -505,7 +506,7 @@ export default { // 接收子组件传递出来的指令发送的事件 handlerOrderMessage() { this.infoDialog.visible = true - this.infoDialog.info = {} + this.infoDialog.info = { type: 'sendMessage', FIRERESERVEPLAN_ID: this.FIRERESERVEPLAN_ID, REPORT_ID: this.REPORT_ID } this.infoDialog.title = '指令信息' }, initInfo() { diff --git a/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue b/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue index 555894c..0c0a348 100644 --- a/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue +++ b/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue @@ -1,8 +1,57 @@ @@ -22,28 +71,85 @@ export default { default() { return '' } + }, + info: { + type: Object, + default() { + return {} + } } }, data() { return { config: config, form: { - - } + INSTRUCTION_TYPE: null, + INSTRUCTION_CONTENT: null, + CORP_ID: null, + USER_ID: null + }, + instructionTypeList: [ + { + value: '0', + label: '部门指令' + }, + { + value: '1', + label: '个人指令' + } + ], + corpList: [], + userList: [] } }, created() { - this.getData() + this.getCorp() }, methods: { - getData() { + handleSelect(value) { + console.log(value) + this.getUser(value.id) + }, + getCorp() { requestFN( - '/major/registration/detailLog', { Id: this.id } + 'plan/planningDepartment/getTreeForSelect', { FIRERESERVEPLAN_ID: this.info.FIRERESERVEPLAN_ID, proid: '0' } ).then((data) => { if (data.result === 'success') { - this.form = data.msg + this.corpList = data.data } }).catch((e) => { + console.log(e) + }) + }, + getUser(id) { + requestFN( + 'plan/planningDepartment/getUserList', { FIRERESERVEPLAN_ID: this.info.FIRERESERVEPLAN_ID, DEPARTMENT_ID: id } + ).then((data) => { + if (data.result === 'success') { + this.userList = data.data + } + }).catch((e) => { + console.log(e) + }) + }, + handleClose() { + this.$emit('close', false) + }, + confirm() { + requestFN( + 'plan/planningDepartment/getUserList', { + FIRERESERVEPLAN_ID: this.info.FIRERESERVEPLAN_ID, + REPORT_ID: this.info.REPORT_ID, + USER_ID: this.form.USER_ID, + USER_NAME: this.userList.find(item => item.USER_ID === this.form.USER_ID).NAME, + MESSAGE: this.form.INSTRUCTION_CONTENT + } + ).then((data) => { + if (data.result === 'success') { + this.userList = data.data + } + }).catch((e) => { + console.log(e) }) } }