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

13.42

master
徐景良 2023-08-16 13:42:26 +08:00
parent f9934c86b2
commit 6b788a7361
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env.dev
View File

@ -17,5 +17,8 @@ VUE_APP_OIDC_SILENTREDIRECTURI = http://112.233.241.108:1803/silent-renew-oidc.h
#VUE_APP_BASE_API =http://223.99.16.253:9001/api
#VUE_APP_BASE_IMG_URL =http://223.99.16.253:9001
VUE_APP_BASE_API = http://123.132.248.154:9224/api
VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
#VUE_APP_BASE_API = http://123.132.248.154:9224/api
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
VUE_APP_BASE_API = http://123.132.248.154:9231/api
VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231

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

@ -50,11 +50,14 @@
</div>
<div class="huoqing-box" v-show="reportlistShow">
<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 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>
</div>
<div class="merage-box" v-if="mergeboxShow">
<mergebox @wuzi="wuzi" @changeCurrentInfo="changeCurrentInfo" @clsoe="mergeboxShow = false;" @success="mergeSuccess" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></mergebox>
<mergebox @wuzi="wuzi" @shuiyuan="shuiyuan" @changeCurrentInfo="changeCurrentInfo" @clsoe="mergeboxShow = false;" @success="mergeSuccess" :globalmap="globalmap" :checkList="checkList" :checkNumber="checkNumber"></mergebox>
</div>
<!-- 火情调度 -->
@ -206,7 +209,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: {
@ -323,8 +326,6 @@ export default {
// 视频通话
window.videoCall = this.videoCall;
window.shuiyuan = this.shuiyuan;
},
methods: {
// 视频通话
@ -355,7 +356,7 @@ export default {
getFirePointList(){
axios({
method:"get",
url:BASE_URL+"/FireManagement/GetFireInfo",
url:"http://123.132.248.154:9231/api/FireManagement/GetFireInfo",
params:{
"id":0,
},
@ -375,6 +376,7 @@ export default {
}else{
this.friePointLayer.clear();
}
data.forEach((item,index)=>{
let graphic = new mars3d.graphic.BillboardEntity({
position: [parseFloat(item.lng),parseFloat(item.lat)],
@ -394,6 +396,7 @@ export default {
distanceDisplayCondition_near: 0
}
},
"popup": `<div class="marsTiltPanel marsTiltPanel-theme-red" style="font-size:12px;">
<div class="marsTiltPanel-wrap">
<div class="area">
@ -404,20 +407,22 @@ export default {
<div class="b-l"></div>
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">火点信息</div>
<div class="title">${item.address}</div>
<div class="label-content">
<div class="data-li">
<div class="data-label">火点地址：${item.address}</div>
<div class="data-label">火情描述：${item.describe}</div>
</div>
<div class="data-li">
<div class="data-label">上报时间：</div>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.createTime}</span><span class="label-unit"></span>
<div class="data-value"><span id="lablYeWei" class="label-num">${item.reportTime}</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>
@ -430,7 +435,7 @@ export default {
</div>`,
"popupOptions":{
"offsetY":-30,
"template":"{content}",
"template":"<div class='marsBlackPanel animation-spaceInDown'><div class='marsBlackPanel-text'>{content}</div><span class='mars3d-popup-close-button closeButton' >×</span></div>",
"horizontalOrigin":"Cesium.HorizontalOrigin.LEFT",
"verticalOrigin":"Cesium.VerticalOrigin.CENTER"
},
@ -812,7 +817,7 @@ export default {
lng:lng,
lat:lat
},
url:BASE_URL+"/Camera/GetCameraInfoByPoint"
url:"http://123.132.248.154:9231/api/Camera/GetCameraInfoByPoint"
}).then(res=>{
if(res.data.code == 200){
res.data.data.forEach((item,index)=>{