|
@ -44,10 +44,7 @@ |
|
|
<p title="态势工具" class="tb-img-p alarm" @click="drawShapeMilitary"> |
|
|
<p title="态势工具" class="tb-img-p alarm" @click="drawShapeMilitary"> |
|
|
<img :src="drawShapeMilitaryIMG" /> |
|
|
<img :src="drawShapeMilitaryIMG" /> |
|
|
</p> |
|
|
</p> |
|
|
<!-- <p title="测试" class="tb-img-p alarm" @click="test"> |
|
|
|
|
|
<img :src="eventNotif" /> |
|
|
|
|
|
<span class="divright">{{ getEventNum }}</span> |
|
|
|
|
|
</p> --> |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</Window> |
|
|
</Window> |
|
|
<div id="measurePopModal" class="popModal"> |
|
|
<div id="measurePopModal" class="popModal"> |
|
@ -131,10 +128,9 @@ |
|
|
import { defHttp } from '/@/utils/http/axios'; |
|
|
import { defHttp } from '/@/utils/http/axios'; |
|
|
import $ from 'jquery'; |
|
|
import $ from 'jquery'; |
|
|
import { useUserStore } from '/@/store/modules/user'; |
|
|
import { useUserStore } from '/@/store/modules/user'; |
|
|
|
|
|
import { useEarthMapStore } from '/@/store/modules/earthMap'; |
|
|
import { useMessage } from '/@/hooks/web/useMessage'; |
|
|
import { useMessage } from '/@/hooks/web/useMessage'; |
|
|
|
|
|
|
|
|
import TestCom from './TestCom.vue'; |
|
|
|
|
|
|
|
|
|
|
|
export default defineComponent({ |
|
|
export default defineComponent({ |
|
|
name: 'Toolbar', |
|
|
name: 'Toolbar', |
|
|
props: { |
|
|
props: { |
|
@ -155,6 +151,7 @@ |
|
|
const { proxy }: any = getCurrentInstance(); |
|
|
const { proxy }: any = getCurrentInstance(); |
|
|
// const { userInfo } = useUserStore(); |
|
|
// const { userInfo } = useUserStore(); |
|
|
const userStore = useUserStore(); |
|
|
const userStore = useUserStore(); |
|
|
|
|
|
const store = useEarthMapStore(); |
|
|
const { createMessage } = useMessage(); |
|
|
const { createMessage } = useMessage(); |
|
|
let _viewer = ref(); |
|
|
let _viewer = ref(); |
|
|
let show = ref(true); |
|
|
let show = ref(true); |
|
@ -181,7 +178,7 @@ |
|
|
const notificationModelShow = ref(false); |
|
|
const notificationModelShow = ref(false); |
|
|
const WarnListShow = ref(false); |
|
|
const WarnListShow = ref(false); |
|
|
const drawShapeShow = ref(false); |
|
|
const drawShapeShow = ref(false); |
|
|
const drawShapePackage = ref(null); |
|
|
const drawShapePackage: any = ref(null); |
|
|
const drawShapeMilitaryShow = ref(false); |
|
|
const drawShapeMilitaryShow = ref(false); |
|
|
|
|
|
|
|
|
//计算属性 |
|
|
//计算属性 |
|
@ -954,12 +951,18 @@ |
|
|
|
|
|
|
|
|
//绘画图形 |
|
|
//绘画图形 |
|
|
function drawShape() { |
|
|
function drawShape() { |
|
|
|
|
|
//基本绘图没有被使用中,则关闭 |
|
|
|
|
|
if(drawShapeMilitaryShow.value && store.shapeUsing == false) |
|
|
|
|
|
{drawShapeMilitaryShow.value = false} |
|
|
//清空数据 |
|
|
//清空数据 |
|
|
drawShapePackage.value = null |
|
|
drawShapePackage.value = null |
|
|
drawShapeShow.value = !drawShapeShow.value; |
|
|
drawShapeShow.value = !drawShapeShow.value; |
|
|
} |
|
|
} |
|
|
//绘画图形-军事态势 |
|
|
//绘画图形-军事态势 |
|
|
function drawShapeMilitary() { |
|
|
function drawShapeMilitary() { |
|
|
|
|
|
//基本绘图没有被使用中,则关闭 |
|
|
|
|
|
if(drawShapeShow.value && store.shapeUsing == false) |
|
|
|
|
|
{drawShapeShow.value = false} |
|
|
drawShapeMilitaryShow.value = !drawShapeMilitaryShow.value; |
|
|
drawShapeMilitaryShow.value = !drawShapeMilitaryShow.value; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -1064,23 +1067,6 @@ |
|
|
$mitt.off('warnInfoMan'); |
|
|
$mitt.off('warnInfoMan'); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
//测试研究 showPropertyWindow |
|
|
|
|
|
function test() { |
|
|
|
|
|
const currentModel = new window.XE.Obj.Polyline(window.$earth); |
|
|
|
|
|
// debugger |
|
|
|
|
|
window.$uia.showPropertyWindow({}, { component: TestCom }); |
|
|
|
|
|
nextTick(() => {}); |
|
|
|
|
|
// window.$uia.tools.push({ |
|
|
|
|
|
// component: currentModel, |
|
|
|
|
|
// ref: "sdfcsdcfsdc", |
|
|
|
|
|
// guid: "sdfcsdcfsdc", |
|
|
|
|
|
// item: () => { |
|
|
|
|
|
// return {} |
|
|
|
|
|
// }, |
|
|
|
|
|
//mrq添加 |
|
|
|
|
|
// nextczm: options && options.jsonSchema |
|
|
|
|
|
// }) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return { |
|
|
return { |
|
|
show, |
|
|
show, |
|
@ -1150,7 +1136,6 @@ |
|
|
drawShapePackage, |
|
|
drawShapePackage, |
|
|
drawShapeMilitaryShow, |
|
|
drawShapeMilitaryShow, |
|
|
drawShapeMilitaryIMG, |
|
|
drawShapeMilitaryIMG, |
|
|
test, |
|
|
|
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
}); |
|
|
}); |
|
|