页面提交

src/components/supermap-2.5d.vue

@@ -2085,6 +2085,7 @@ export default {
       this.isObtainLaAndLon = isObtainLaAndLon
     },
     clearDW() {
+      debugger
       if (this.positioningEntity != null) {
         this.viewer.entities.remove(this.positioningEntity);
       }

src/views/SenEquipmentCenter.vue

@@ -5,7 +5,7 @@
 			<div class="list_tit">企业设备分布</div>
 			<div class="company_fx" ref="echartsByCompany"></div>
 			<div class="company_fx_text">
-				<span v-for="item in commanyInfo">
+				<span v-for="item in commanyInfo" style="font-size: 18px;">
 					{{item.name}}:{{item.value}}
 				</span>
 			</div>
@@ -480,7 +480,7 @@
 
 	.tk_div {
 		width: 21%;
-		height: 38%;
+		height: 50%;
 		position: absolute;
 		top: 24%;
 		left: 32.2%;
@@ -611,4 +611,4 @@
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
 	@import '@/assets/styles/base.scss';
-</style>
+</style>

src/views/SentryEmergencyCenter.vue

@@ -23,14 +23,14 @@
 				<dt>
 					<span style="width: 40px;text-align: center;padding-left: 1%;">类型</span>
 					<span style="width: 128px;text-indent: 20px;padding-left: 3%;">事件名称</span>
-					<span style="width: 128px;text-align: center;">事件描述</span>
+					<span style="width: 128px;text-align: center;">发生时间</span>
 				</dt>
 				<div class="hei_scroll hei56">
 					<dd v-for="(e,idx) in deviceListSearch" :key="idx" @click="getEventDetail(e.eventId,e.latitude,e.longitude)">
 						<img :src="e.eventSource == 'artificial' ? require('@/assets/images/artificialIcon.png') : require('@/assets/images/deviceIcon.png') " style="display: inline-block;margin: 3% 0% 0% 4%;;width: 20px;height: 20px;">
 						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 3%;" :title="e.eventTitle">{{ e.eventTitle }}</span>
-						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 4%;" :title="e.eventDescription">
-							{{ e.eventDescription }}
+						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 4%;" :title="e.createTime">
+							{{ e.createTime }}
 						</span>
 					</dd>
 				</div>
@@ -44,7 +44,17 @@
 					:total="deviceTotal">
 			</el-pagination>
 		</div>
-        <div class="setEmergencyEvent" @click="setEmergencyEvent">发起应急事件</div>
+    <el-popover
+      placement="right"
+      width="160"
+      trigger="click"
+      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">
 			<!--弹框演示模板 开始-->
 			<!-- <img src="../assets/images/sentinel/hz_qy.png" class="qydw1"/>
@@ -414,6 +424,7 @@
 		},
 		data() {
 			return {
+        visible: false,
         deptOptionsLiandong: [],
 				deptId:null,
 				isVisible: false, // 初始时设置为false，不显示内容
@@ -507,6 +518,18 @@
 			}
 		},
 		methods: {
+      setPositioning(longitude, latitude) {
+        let that = this
+        that.positioning.lon = longitude
+        that.positioning.lat = latitude
+      },
+      getLocation(){
+        // this.visible = true;
+        // this.positioning.lon = ''
+        // this.positioning.lat = ''
+        this.$parent.$refs.supermap.clearDW()
+        this.$parent.$refs.supermap.setIsObtainLaAndLon(true)
+      },
       // 获取部门列表树
       getDeptTreeselect(){
         treeselectAll().then((response) => {
@@ -1390,6 +1413,7 @@
     }
 
     .setEmergencyEvent{
+        border: none;
         width: 122px;
         height: 22px;
         position: absolute;
@@ -1433,7 +1457,7 @@
 
 	.tk_div{
 		width: 21%;
-		height: 38%;
+		height: 50%;
 		position: absolute;
 		top: 24%;
 		left: 32.2%;

src/views/SentryPage.vue

@@ -35,7 +35,7 @@
         </div>
 			</div>
 			<div class="head_tx">
-				<span><img src="../assets/images/sentinel/hz_tx.png" /></span>
+				<span><img src="../assets/images/sentinel/hz_tx.png" @click="logout"/></span>
 			</div>
 		</div>
 		<div class="visual-body">
@@ -65,7 +65,7 @@
 			</div>
 
 			<!-- 地图 -->
-			<supermap ref="supermap" style="width: 100%;height: 100vh;" @preview="preview" @openDetails="openEventDetails" @openAreaDetails="openAreaDetails">
+			<supermap ref="supermap" style="width: 100%;height: 100vh;" @preview="preview" @openDetails="openEventDetails" @openAreaDetails="openAreaDetails" @setPositioning="setPositioning">
 			</supermap>
       <!-- 事件詳情彈窗start -->
       <div v-if="isEventDetails">
@@ -292,7 +292,11 @@
         isAreaDetailVisible:false,
         areaDetailInfo:{},
         imageIndex:null,
-        bigImage:false
+        bigImage:false,
+        positioning: {
+          lon: "",
+          lat: ""
+        },
       }
 		},
     created() {
@@ -311,6 +315,22 @@
 
 		},
     methods:{
+      setPositioning(longitude, latitude) {
+        debugger
+        this.positioning.lon = longitude
+        this.positioning.lat = latitude
+      },
+      async logout() {
+        this.$confirm('确定注销并退出系统吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$store.dispatch('LogOut').then(() => {
+            location.href = '/index';
+          })
+        }).catch(() => {});
+      },
       assetTypeAnImage(filePath) {
         let imageList = []
         if (filePath != null && filePath.length > 0) {
@@ -639,6 +659,9 @@
             deptList.push({mapDeptId:item.id,mapDeptName:item.label});
           }
           qsParams.deptList = deptList;
+        }else{
+          this.$message.error(`请选择任务联动部门!`);
+          return
         }
         qsParams.eventId = params.eventId;
         configDept(qsParams).then(req => {