页面提交

src/router/index.js

@@ -97,7 +97,7 @@ export const constantRoutesNew = [{
 				component: () => import('@/views/SentryEmergencyCenter'),
 				meta: {
 					title: '哨兵-应急中心'
-				}
+				},
 			},
 			{
 				//哨兵设备中心

src/views/SentryEmergencyCenter.vue

@@ -46,13 +46,11 @@
 		</div>
     <el-popover
       placement="right"
-      width="160"
+      width="100"
       trigger="click"
+      popper-class="popperClass"
+      content="请选择经纬度"
       v-model="visible">
-      <p>请选择经纬度</p>
-      <div style="text-align: right; margin: 0">
-        <el-button type="primary" size="mini" @click="visible = false">确定</el-button>
-      </div>
       <div class="setEmergencyEvent" slot="reference" @click="getLocation">发起应急事件</div>
     </el-popover>
 		<div class="visual-body">
@@ -260,10 +258,10 @@
 						<el-input v-model="ruleForm.createName"></el-input>
 					</el-form-item> -->
 					<el-form-item label="经度" prop="longitude" style="width: 350px;height: 40px;">
-						<el-input v-model="ruleForm.longitude"></el-input>
+						<el-input v-model="ruleForm.longitude" readonly ></el-input>
 					</el-form-item>
 					<el-form-item label="纬度" prop="latitude" style="width: 350px;height: 40px;">
-						<el-input v-model="ruleForm.latitude"></el-input>
+						<el-input v-model="ruleForm.latitude" readonly ></el-input>
 					</el-form-item>
 					<el-form-item label="部门" prop="deptList" style="width: 350px;height: 40px;">
 <!--						<el-select v-model="ruleForm.deptList" placeholder="选择部门" popper-class="deptDropdown" @clear="clearall" ref="mySelect clearable">-->
@@ -286,7 +284,7 @@
 <!--							</el-row>-->
 <!--						</el-select>-->
             <el-tree class="tree-border tree_scroll" style="height: 23vh; overflow-y:scroll" :data="deptOptionsLiandong"
-                     show-checkbox ref="LiandongDept" node-key="id" :check-strictly="true"
+                     show-checkbox ref="LiandongDept" node-key="id" :check-strictly="true" :default-expand-all = "true"
                      :accordion="true" empty-text="加载中，请稍候" :props="defaultProps"></el-tree>
 					</el-form-item>
 					<el-form-item label="图片" prop="fileList" style="width: 1200px;height: 40px;">
@@ -477,7 +475,7 @@
 				videoList:[],
 				uploadList:[],
 				videoUploadList:[],
-        		deviceTotal:0,
+        deviceTotal:0,
 				number: 0,
 				videoNumber: 0,
 				listParams:{
@@ -490,41 +488,45 @@
 				value: '',
 				isDetailVisible:false,          // 设备弹窗显隐flag
 				detailInfo:{},                  // 设备详情信息
-                dialogVisible:false,
-                setEventDialogVisible:false,
-                eventParams:{
-                    pageNum:1,
-                    pageSize:10,
-                    eventTypeCode:'2',
-                    eventTitle:''
-                },
+        dialogVisible:false,
+        setEventDialogVisible:false,
+        eventParams:{
+            pageNum:1,
+            pageSize:10,
+            eventTypeCode:'2',
+            eventTitle:''
+        },
 				planParams:{
-                    pageNum:1,
-                    pageSize:10,
-                    contingencyPlanName:''
-                },
-                ruleForm: {
-                    eventTitle: '',
-                    latitude:'',
-                    longitude:'',
-					eventStatus: "event_report", 	//事件状态
-					eventSource:'artificial',
-					eventDescription:'',
-					eventType: {
-						eventTypeCode: "2" 			//内部自定义编码
-					},
-					deptList: [], //事件接受部门集合
-					contingencyDetail:{
-						eventLocation:'',
-						eventReason:'',
-						eventCasualties:'',
-						eventEarlyWarning:'',
-						processingPerson:'',
-						personPhone:'',
-						eventResolutionTime:'',
-						videoPath:''
-					}
-                },
+            pageNum:1,
+            pageSize:10,
+            contingencyPlanName:''
+        },
+        positioning: {
+          longitude: "",
+          latitude: ""
+        },
+        ruleForm: {
+          eventTitle: '',
+          latitude:'',
+          longitude:'',
+          eventStatus: "event_report", 	//事件状态
+          eventSource:'artificial',
+          eventDescription:'',
+          eventType: {
+            eventTypeCode: "2" 			//内部自定义编码
+          },
+          deptList: [], //事件接受部门集合
+          contingencyDetail:{
+            eventLocation:'',
+            eventReason:'',
+            eventCasualties:'',
+            eventEarlyWarning:'',
+            processingPerson:'',
+            personPhone:'',
+            eventResolutionTime:'',
+            videoPath:''
+          }
+        },
 				eventId:'',
                 rules: {
                     eventTitle: [
@@ -544,23 +546,18 @@
 				emergencyEventDetails:{},       // 应急事件详情信息
 				attachExamine:[],
 				deptList:[],
-				visible:false,
 				dimensionHighlighted:true,
 				showLatLng:null
 			}
 		},
 		methods: {
       setPositioning(longitude, latitude) {
-
-        let that = this
-        that.positioning.lon = longitude
-        that.positioning.lat = latitude
+        this.positioning.longitude = longitude
+        this.positioning.latitude = latitude
+        this.setEmergencyEvent();
       },
       getLocation(){
-        // this.visible = true;
-        // this.positioning.lon = ''
-        // this.positioning.lat = ''
-        // this.$parent.$refs.supermap.clearDW()
+        this.$parent.$refs.supermap.clearDW()
         this.$parent.$refs.supermap.setIsObtainLaAndLon(true)
       },
       // 获取部门列表树
@@ -614,19 +611,21 @@
 
 			},
             // 发起应急事件
-            setEmergencyEvent(){
-              this.currentFormStatus = 0
-                this.setEventDialogVisible = true
+      setEmergencyEvent(){
+        this.currentFormStatus = 0
+        this.setEventDialogVisible = true
+        this.ruleForm.longitude = this.positioning.longitude
+        this.ruleForm.latitude = this.positioning.latitude
 				setTimeout(() => {
 					this.resetForm('ruleForm')
 				})
-            },
+      },
 			getDescriptionByContingency(){
 				this.currentFormStatus = 1
 				let form = {
 					eventTitle: this.emergencyEventDetails.eventTitle || '',
-                    latitude: this.emergencyEventDetails.latitude || '',
-                    longitude: this.emergencyEventDetails.longitude || '',
+          latitude: this.emergencyEventDetails.latitude || '',
+          longitude: this.emergencyEventDetails.longitude || '',
 					eventStatus: "event_report", 	//事件状态
 					eventSource: 'artificial',
 					eventDescription: this.emergencyEventDetails.eventDescription || '',
@@ -695,6 +694,7 @@
                 this.dropLocation(latitude ,longitude)
             },
             submitForm(formName) {
+              this.$parent.$refs.supermap.clearDW()
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
 						const deptList = [];
@@ -781,15 +781,15 @@
 					}
                 });
             },
-            resetForm(formName) {
-                this.$refs[formName].resetFields();
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
 				this.fileList = [],
 				this.videoList = [],
 				this.uploadList = [],
 				this.videoUploadList = []
 				this.attachExamine = []
-            },
-            getEventList(){
+      },
+      getEventList(){
                 getEventList(this.eventParams).then(res => {
                     this.deviceList = res.rows
 					this.deviceListSearch = res.rows
@@ -827,6 +827,7 @@
                 })
             },
 			getPlanList(){
+        debugger
 				getPlanList(this.planParams).then(res => {
 					this.planList = res.rows
 					this.planListSearch = res.rows

src/views/SentryPage.vue

@@ -9,7 +9,7 @@
 
  <template>
     <div class="visual-con hz_body">
-    <!-- <router-view ref="senEventCenter"></router-view> -->
+     <router-view ref="SentryEmergencyCenter"></router-view>
 		<div class="s_header">
 			<div class="head_btn">
           <div @click="jumpTo('/SentryCockpit',0)" :class="routerIdx == 0 ? 'on' : ''">
@@ -39,10 +39,6 @@
 			</div>
 		</div>
 		<div class="visual-body">
-            <!--主体-->
-            <router-view>
-
-            </router-view>
             <!-- 哨兵详情弹窗 -->
       <div class="tk_div" v-show="isDetailVisible">
 				<div class="tk1 tk_bor" style="width: 371px;height: 310px;">
@@ -293,10 +289,6 @@
         areaDetailInfo:{},
         imageIndex:null,
         bigImage:false,
-        positioning: {
-          lon: "",
-          lat: ""
-        },
       }
 		},
     created() {
@@ -316,8 +308,7 @@
 		},
     methods:{
       setPositioning(longitude, latitude) {
-        this.positioning.lon = longitude
-        this.positioning.lat = latitude
+        this.$refs.SentryEmergencyCenter.setPositioning(longitude,latitude)
       },
       async logout() {
         this.$confirm('确定注销并退出系统吗？', '提示', {