xujingliang
/
Lin_Ye_Fang_Huo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

13.28

master
徐景良 2023-08-16 13:28:41 +08:00
parent 583184a5d0
commit f9934c86b2
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/home/index.vue
View File

@ -50,14 +50,11 @@
</div>
<div class="huoqing-box" v-show="reportlistShow">
<div class="close-button" @click="reportlistShow = false">
<i class='el-icon el-icon-close'></i>
</div>
<reportlist :mergeSuccessRandom="mergeSuccessRandom" @wuzi="wuzi" @shuiyuan="shuiyuan" @getlistSocket="reportlistShow = true" @jiankong="jiankong" @renyuan="renyuan" @merge="mergeboxShow=true;" @changeCurrentInfo="changeCurrentInfo" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></reportlist>
<reportlist @close="reportlistShow=false" :mergeSuccessRandom="mergeSuccessRandom" @wuzi="wuzi" @shuiyuan="shuiyuan" @getlistSocket="reportlistShow = true" @jiankong="jiankong" @renyuan="renyuan" @merge="mergeboxShow=true;" @changeCurrentInfo="changeCurrentInfo" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></reportlist>
</div>
<div class="merage-box" v-if="mergeboxShow">
<mergebox @wuzi="wuzi" @shuiyuan="shuiyuan" @changeCurrentInfo="changeCurrentInfo" @clsoe="mergeboxShow = false;" @success="mergeSuccess" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></mergebox>
<mergebox @wuzi="wuzi" @changeCurrentInfo="changeCurrentInfo" @clsoe="mergeboxShow = false;" @success="mergeSuccess" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></mergebox>
</div>
<!-- 火情调度 -->
@ -209,7 +206,7 @@ import { mask } from '@turf/turf';
import mergebox from './widget/mergebox.vue';
import rightclicksetting from './widget/rightclick.vue';
import socketDiaBox from './widget/socketdiabox.vue';
let BASE_URL = process.env.VUE_APP_BASE_API
export default {
name: 'business',
components: {
@ -326,6 +323,8 @@ export default {
// 视频通话
window.videoCall = this.videoCall;
window.shuiyuan = this.shuiyuan;
},
methods: {
// 视频通话
@ -356,7 +355,7 @@ export default {
getFirePointList(){
axios({
method:"get",
url:"http://123.132.248.154:9231/api/FireManagement/GetFireInfo",
url:BASE_URL+"/FireManagement/GetFireInfo",
params:{
"id":0,
},
@ -376,7 +375,6 @@ export default {
}else{
this.friePointLayer.clear();
}
data.forEach((item,index)=>{
let graphic = new mars3d.graphic.BillboardEntity({
position: [parseFloat(item.lng),parseFloat(item.lat)],
@ -396,7 +394,6 @@ export default {
distanceDisplayCondition_near: 0
}
},
"popup": `<div class="marsTiltPanel marsTiltPanel-theme-red" style="font-size:12px;">
<div class="marsTiltPanel-wrap">
<div class="area">
@ -407,22 +404,20 @@ export default {
<div class="b-l"></div>
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">${item.address}</div>
<div class="title">火点信息</div>
<div class="label-content">
<div class="data-li">
<div class="data-label">火情描述：${item.describe}</div>
<div class="data-label">火点地址：${item.address}</div>
</div>
<div class="data-li">
<div class="data-label">上报时间：</div>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.reportTime}</span><span class="label-unit"></span>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.createTime}</span><span class="label-unit"></span>
</div>
</div>
<div class="data-li">
<div class="data-value">
<span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" title="中间状态">人员调度</span>
<span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" title="中间状态">附近人员</span>
<span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])" class="label-tag data-value-status-2" title="附近水源">附近水源</span>
<span id="lablSBZT1" onclick="jiankong('${item.createId}')" style="display:${jiankongDisplay}" class="label-tag data-value-status-1" title="视频监控">视频监控</span>
</div>
</div>
</div>
@ -435,7 +430,7 @@ export default {
</div>`,
"popupOptions":{
"offsetY":-30,
"template":"<div class='marsBlackPanel animation-spaceInDown'><div class='marsBlackPanel-text'>{content}</div><span class='mars3d-popup-close-button closeButton' >×</span></div>",
"template":"{content}",
"horizontalOrigin":"Cesium.HorizontalOrigin.LEFT",
"verticalOrigin":"Cesium.VerticalOrigin.CENTER"
},
@ -817,7 +812,7 @@ export default {
lng:lng,
lat:lat
},
url:"http://123.132.248.154:9231/api/Camera/GetCameraInfoByPoint"
url:BASE_URL+"/Camera/GetCameraInfoByPoint"
}).then(res=>{
if(res.data.code == 200){
res.data.data.forEach((item,index)=>{

21
src/views/home/widget/reportlist.vue
View File

@ -31,8 +31,6 @@
<el-button type="primary" size="mini" style="float:right;position:relative;top:-12px;" @click="toPosition(item);">位置</el-button>
</p>
</div>
</div>
</div>
</div>
@ -44,6 +42,7 @@
</template>
<script>
let BASE_URL = process.env.VUE_APP_BASE_API
import axios from 'axios'
import { parse } from '../lib/handleGeojson';
export default {
@ -83,7 +82,7 @@ import { parse } from '../lib/handleGeojson';
deal(){
axios({
method:"post",
url:"http://123.132.248.154:9224/api/FireManagement/BatchUpdatFireStatue",
url:BASE_URL+"/FireManagement/BatchUpdatFireStatue",
data:this.checkNumber,
headers:{
'X-Token':localStorage.getItem("X-Token")
@ -99,14 +98,9 @@ import { parse } from '../lib/handleGeojson';
})
},
merage(){
if(this.checkList.length<2){
this.$message({
type:"warning",
message:"请选择至少两条线索",
})
}else{
this.$emit('merge')
}
},
close(){
this.graphicLayer.removeGraphic(this.graphicWinodw);
@ -167,7 +161,7 @@ import { parse } from '../lib/handleGeojson';
getList(){
axios({
method:"get",
url:"http://123.132.248.154:9224/api/FireManagement/LoadFireClueInfoByState",
url:BASE_URL+"/FireManagement/LoadFireClueInfoByState",
params:this.listParams,
headers:{
'X-Token':localStorage.getItem("X-Token")
@ -183,7 +177,7 @@ import { parse } from '../lib/handleGeojson';
},
toPosition(item){
this.$emit("changeCurrentInfo",item);
// this.$emit("changeCurrentInfo",item);
let _self = this;
if(!_self.graphicLayer){
@ -237,7 +231,7 @@ import { parse } from '../lib/handleGeojson';
<div class="data-li">
<div class="data-value">
<span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" title="中间状态">人员调度</span>
<span id="lablSBZT2" onclick="wuzi([${item.lng},${item.lat}]);" class="label-tag data-value-status-0" title="物资调度" >物资调度</span>
<span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])" class="label-tag data-value-status-2" title="附近水源">附近水源</span>
<span id="lablSBZT1" onclick="jiankong('${item.createId}')" style="display:${jiankongDisplay}" class="label-tag data-value-status-1" title="视频监控">视频监控</span>
</div>
@ -267,6 +261,7 @@ import { parse } from '../lib/handleGeojson';
_self.graphicWinodw.flyTo();
},
// // <span id="lablSBZT2" onclick="wuzi([${item.lng},${item.lat}]);" class="label-tag data-value-status-0" title="物资调度" >物资调度</span>
initWebSocket(){
let _this = this;
if ("WebSocket" in window) {