@@ -185,8 +186,8 @@
"barrack":[]
})
const clueInfo = ref({
- lng:118.092787,
- lat:35.386524
+ lng:null,
+ lat:null
})
const handlerGetWaterData = () => {
return axios.get("http://221.2.83.254:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Ananbeibushluiyuanhebing&maxFeatures=50000&outputFormat=application%2Fjson")
@@ -401,8 +402,8 @@ function mergeTopResources(waterClass, supplyClass, campClass, key) {
onMounted(() => {
// 组件通信
EventBus.on('responseToResourceAnalysisReport', (data) => {
- console.log("data123",data.lng,data.lat);
- console.log(111111111111,'资源分析报告',data);
+ console.log("data",data.lng,data.lat);
+ console.log('资源分析报告',data);
clueInfo.value.lng = Number(data.lng);
clueInfo.value.lat = Number(data.lat);
@@ -415,7 +416,7 @@ function mergeTopResources(waterClass, supplyClass, campClass, key) {
let data = water.value.data;
let listTemp = geojsonPointToArray(data);
listTemp = getPointDistance([clueInfo.value.lng,clueInfo.value.lat],listTemp);
- console.log(11111111111,'水源',listTemp)
+ console.log('水源',listTemp)
resources.value['water'] = listTemp;
}
if(wuzichubei.status === 'fulfilled'){
@@ -423,7 +424,7 @@ function mergeTopResources(waterClass, supplyClass, campClass, key) {
console.log("goodsSources",data);
let listTemp = convertWKTArrayToCoordinates(data);
listTemp = getPointDistance([clueInfo.value.lng,clueInfo.value.lat],listTemp);
- console.log(11111111111,'物资点',listTemp)
+ console.log('物资点',listTemp)
resources.value['goods'] = listTemp;
}
if(yingfang.status === 'fulfilled'){
@@ -431,7 +432,7 @@ function mergeTopResources(waterClass, supplyClass, campClass, key) {
let listTemp = convertWKTArrayToCoordinates(data);
listTemp = getPointDistance([clueInfo.value.lng,clueInfo.value.lat],listTemp);
resources.value['barrack'] = listTemp;
- console.log(11111111111,'营房',listTemp)
+ console.log('营房',listTemp)
}
const report = generateEmergencyReport(
resources.value['water'],
diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.ts b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.ts
new file mode 100644
index 0000000..76ab3f3
--- /dev/null
+++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.ts
@@ -0,0 +1,18 @@
+import cloneDeep from 'lodash/cloneDeep'
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig, requestSqlConfig } from '@/settings/designSetting'
+import { ZhiChu_DroneLiveConfig } from './index'
+
+export const option = {
+ dataset: {},
+ dataStyle: {},
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ public key = ZhiChu_DroneLiveConfig.key
+ public attr = { ...chartInitConfig, w: 357, h: 335, zIndex: -1 }
+ public filter = "return res.result;"
+ public chartConfig = cloneDeep(ZhiChu_DroneLiveConfig)
+ public option = cloneDeep(option)
+}
diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.vue b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.vue
new file mode 100644
index 0000000..87c78a5
--- /dev/null
+++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/config.vue
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.ts b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.ts
new file mode 100644
index 0000000..f1b3591
--- /dev/null
+++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const ZhiChu_DroneLiveConfig: ConfigType = {
+ key: 'ZhiChu_DroneLive',
+ chartKey: 'VZhiChu_DroneLive',
+ conKey: 'VCZhiChu_DroneLive',
+ title: '响应中心-无人机直播',
+ category: ChatCategoryEnum.ZHICHU,
+ categoryName: ChatCategoryEnumName.ZHICHU,
+ package: PackagesCategoryEnum.ZHICHU,
+ chartFrame: ChartFrameEnum.STATIC,
+ image: 'ZhiChu_DroneLive.png'
+}
diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.vue b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.vue
new file mode 100644
index 0000000..8d5bfed
--- /dev/null
+++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_DroneLive/index.vue
@@ -0,0 +1,409 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Zhichu/Zhichu/index.ts b/src/packages/components/Zhichu/Zhichu/index.ts
index 20bc5fb..c5a13be 100644
--- a/src/packages/components/Zhichu/Zhichu/index.ts
+++ b/src/packages/components/Zhichu/Zhichu/index.ts
@@ -5,6 +5,7 @@ import { ZhiChu_TuLiConfig } from "./ZhiChu_TuLi/index";
import { ZhiChu_LuXianGuHuaConfig } from "./ZhiChu_LuXianGuHua/index";
import { ZhiChu_ResourceConfig } from "./ZhiChu_Resource/index";
import { ResourceAnalysisReportConfig } from "./ResourceAnalysisReport/index";
+import { ZhiChu_DroneLiveConfig } from "./ZhiChu_DroneLive/index";
export default [
ZhiChu_ModalFrameConfig,
@@ -13,5 +14,6 @@ export default [
ZhiChu_TuLiConfig,
ZhiChu_LuXianGuHuaConfig,
ZhiChu_ResourceConfig,
- ResourceAnalysisReportConfig
+ ResourceAnalysisReportConfig,
+ ZhiChu_DroneLiveConfig
];