Compare commits
No commits in common. "38f4ec7e79b44bbd00f20742f9329c450735d2c5" and "f6e6ff66487ec10cfa9309ca6b462a0eae836a88" have entirely different histories.
38f4ec7e79
...
f6e6ff6648
|
|
@ -64,6 +64,7 @@ const dataset = ref({
|
|||
onMounted(() => {
|
||||
// 获取eventBus传过来的值
|
||||
EventBus.on('clockinlistsenddata', (data) => {
|
||||
console.log('data123444', data)
|
||||
dataset.value = data
|
||||
});
|
||||
})
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ import { PropType, toRefs, ref, onMounted } from 'vue'
|
|||
import { CreateComponentType } from '@/packages/index.d'
|
||||
import { EventBus } from '@/utils/eventBus'
|
||||
import axios from 'axios'
|
||||
import * as mars3d from "mars3d";
|
||||
import { getAppEnvConfig } from '@/utils/env'
|
||||
var { VITE_GLOB_API_URL } = getAppEnvConfig();
|
||||
|
||||
|
|
@ -100,7 +99,6 @@ const areaValue = ref()
|
|||
const searchValue = ref()
|
||||
const dataset = ref([])
|
||||
const optionsData = ref([])
|
||||
const entityArr = ref([])
|
||||
|
||||
const getListData=()=>{
|
||||
console.log('areaValue',areaValue)
|
||||
|
|
@ -149,34 +147,8 @@ const getAreaListData=(id)=>{
|
|||
props.chartConfig.option.areaOptions = optionsData.value
|
||||
})
|
||||
}
|
||||
const lisClick=(e)=>{
|
||||
EventBus.emit('clockinlistsenddata' , e);
|
||||
entityArr.value.forEach(item =>{
|
||||
let graphic = window.graphicLayer.getGraphicById(item);
|
||||
window.graphicLayer.removeGraphic(graphic);
|
||||
})
|
||||
entityArr.value = []
|
||||
handlerAddEntity(e)
|
||||
}
|
||||
|
||||
|
||||
// 添加Entity
|
||||
const handlerAddEntity = (data) => {
|
||||
let graphicOptions = {
|
||||
id: data.Id,
|
||||
position: [parseFloat(data.Lng), parseFloat(data.Lat)],
|
||||
style: {
|
||||
image: '/src/assets/images/chart/mapicons/putongbiaojidian.png',
|
||||
clampToGround: true,
|
||||
scale: 1,
|
||||
}
|
||||
}
|
||||
entityArr.value.push(data.Id)
|
||||
let graphic = window.graphicLayer.getGraphicById(data.Id);
|
||||
|
||||
graphic = new mars3d.graphic.BillboardEntity(graphicOptions);
|
||||
window.graphicLayer.addGraphic(graphic);
|
||||
window.globalMap.flyToGraphic(graphic,{radius:300});
|
||||
const lisClick=(item)=>{
|
||||
EventBus.emit('clockinlistsenddata' , item);
|
||||
}
|
||||
onMounted(() => {
|
||||
getListData()
|
||||
|
|
@ -262,7 +234,6 @@ onMounted(() => {
|
|||
background: url("@/assets/images/chart/xunchaguiji/lisbg01.png");
|
||||
background-size: 100% 100%;
|
||||
margin-bottom: 10px;
|
||||
cursor: pointer;
|
||||
.icons01{
|
||||
width: 41px;
|
||||
height: 36px;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ const props = defineProps({
|
|||
|
||||
const { w, h } = toRefs(props.chartConfig.attr)
|
||||
const entityArr = ref([])
|
||||
const polyLineArr = ref([])
|
||||
const {
|
||||
textColors,
|
||||
textSize,
|
||||
|
|
@ -85,11 +84,6 @@ const handlerAddEntity = (data) => {
|
|||
window.globalMap.flyToGraphic(graphic,{radius:300});
|
||||
}
|
||||
const rotateLine = (data)=>{
|
||||
polyLineArr.value.forEach(item =>{
|
||||
let graphic = window.graphicLayer.getGraphicById(item);
|
||||
window.graphicLayer.removeGraphic(graphic);
|
||||
})
|
||||
polyLineArr.value = []
|
||||
axios({
|
||||
method: "get",
|
||||
url: VITE_GLOB_API_URL + '/api/FirePatrol/GetPatrolPointByTime',
|
||||
|
|
@ -108,7 +102,6 @@ const rotateLine = (data)=>{
|
|||
positionsArr.push(arr)
|
||||
})
|
||||
const graphic = new mars3d.graphic.PolylineEntity({
|
||||
id: data.CreateId,
|
||||
positions: positionsArr,
|
||||
style: {
|
||||
color: '#25F8EE',
|
||||
|
|
@ -119,7 +112,6 @@ const rotateLine = (data)=>{
|
|||
flyTo: true
|
||||
})
|
||||
window.graphicLayer.addGraphic(graphic)
|
||||
polyLineArr.value.push(data.CreateId)
|
||||
})
|
||||
}
|
||||
const getListData=()=>{
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
v-model:formatted-value="rangeValue"
|
||||
type="datetimerange"
|
||||
clearable
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
@update:formatted-value="dateChange"
|
||||
|
|
@ -108,7 +106,6 @@ const navsArr = ref(['巡查轨迹','打卡记录'])
|
|||
const rangeValue = ref()
|
||||
const userId = ref()
|
||||
const dateRange = ref([null,null])
|
||||
const polyLineArr = ref([])
|
||||
const navsClick = (index) =>{
|
||||
navsIndex.value = index
|
||||
}
|
||||
|
|
@ -116,11 +113,6 @@ const dateChange = (e)=>{
|
|||
dateRange.value = e
|
||||
}
|
||||
const rotateLine = (data)=>{
|
||||
polyLineArr.value.forEach(item =>{
|
||||
let graphic = window.graphicLayer.getGraphicById(item);
|
||||
window.graphicLayer.removeGraphic(graphic);
|
||||
})
|
||||
polyLineArr.value = []
|
||||
axios({
|
||||
method: "get",
|
||||
url: VITE_GLOB_API_URL + '/api/FirePatrol/GetPatrolPointByTime',
|
||||
|
|
@ -141,7 +133,6 @@ const rotateLine = (data)=>{
|
|||
positionsArr.push(arr)
|
||||
})
|
||||
const graphic = new mars3d.graphic.PolylineEntity({
|
||||
id: data.createId,
|
||||
positions: positionsArr,
|
||||
style: {
|
||||
color: '#25F8EE',
|
||||
|
|
@ -152,7 +143,6 @@ const rotateLine = (data)=>{
|
|||
flyTo: true
|
||||
})
|
||||
window.graphicLayer.addGraphic(graphic)
|
||||
polyLineArr.value.push(data.createId)
|
||||
})
|
||||
}
|
||||
const circleGeom = (data) =>{
|
||||
|
|
|
|||
Loading…
Reference in New Issue