diff --git a/public/config/widget.json b/public/config/widget.json index 248c397..0d44f47 100644 --- a/public/config/widget.json +++ b/public/config/widget.json @@ -76,9 +76,9 @@ "autoCenter": true, "windowOptions": { "position": { - "top": 50, - "bottom": 30, - "right": 10 + "top": 220, + "bottom": 50, + "left": 452 } }, "css": { diff --git a/public/img/clear-draw.png b/public/img/clear-draw.png new file mode 100644 index 0000000..53f5d22 Binary files /dev/null and b/public/img/clear-draw.png differ diff --git a/public/img/history-draw.png b/public/img/history-draw.png new file mode 100644 index 0000000..96a1cf8 Binary files /dev/null and b/public/img/history-draw.png differ diff --git a/public/img/icon/qizhi-old.png b/public/img/icon/qizhi-old.png new file mode 100644 index 0000000..1d94ff8 Binary files /dev/null and b/public/img/icon/qizhi-old.png differ diff --git a/public/img/icon/qizhi.png b/public/img/icon/qizhi.png index 1d94ff8..5e9ee35 100644 Binary files a/public/img/icon/qizhi.png and b/public/img/icon/qizhi.png differ diff --git a/public/img/jiuyuanrenyuan.png b/public/img/jiuyuanrenyuan.png index 8c3f9da..da5d06e 100644 Binary files a/public/img/jiuyuanrenyuan.png and b/public/img/jiuyuanrenyuan.png differ diff --git a/public/img/qizhi.png b/public/img/qizhi.png new file mode 100644 index 0000000..5e9ee35 Binary files /dev/null and b/public/img/qizhi.png differ diff --git a/src/components/mars3d/Map.vue b/src/components/mars3d/Map.vue index b485c9e..9ca69af 100644 --- a/src/components/mars3d/Map.vue +++ b/src/components/mars3d/Map.vue @@ -80,10 +80,20 @@ export default { if (item.children && item.children.length > 0) { item.children.forEach((it, idx) => { let attribute = JSON.parse(it.attribute); + if(attribute.symbol && attribute.symbol.styleOptions && attribute.symbol.styleOptions.label){ + attribute.symbol.styleOptions.label.pixelOffsetY = -40 + } attribute.pid = group.id; configLayers.push(attribute); }); } + // if (item.children && item.children.length > 0) { + // item.children.forEach((it, idx) => { + // let attribute = JSON.parse(it.attribute); + // attribute.pid = group.id; + // configLayers.push(attribute); + // }); + // } }); data.map3d.layers = configLayers diff --git a/src/views/home/index.vue b/src/views/home/index.vue index f673ab7..f3bba37 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -57,7 +57,7 @@
- +
@@ -446,6 +446,10 @@ export default { } }, methods: { + showHistoryLabel(){ + this.rightType = 4; + this.setVisibleShow = true; + }, drawLable(val) { this.setDatas = { title: "", @@ -1258,7 +1262,7 @@ export default { .tools { min-width: 250px; - height: calc(100vh - 440px); + height: 10px; position: absolute; top: 130px; left: 25px; diff --git a/src/views/home/widget/hitorylabelbox.vue b/src/views/home/widget/hitorylabelbox.vue new file mode 100644 index 0000000..12f9f30 --- /dev/null +++ b/src/views/home/widget/hitorylabelbox.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/src/views/home/widget/onlineuserbox.vue b/src/views/home/widget/onlineuserbox.vue index 3328edf..5b413a9 100644 --- a/src/views/home/widget/onlineuserbox.vue +++ b/src/views/home/widget/onlineuserbox.vue @@ -177,7 +177,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common'; horizontalOrigin: Cesium.HorizontalOrigin.CENTER, verticalOrigin: Cesium.VerticalOrigin.BOTTOM, clampToGround: true, - scale: 0.4, + scale: 0.6, label: { text: "", font_size: 14, diff --git a/src/views/home/widget/personnel.vue b/src/views/home/widget/personnel.vue index 72f3802..61e4d77 100644 --- a/src/views/home/widget/personnel.vue +++ b/src/views/home/widget/personnel.vue @@ -10,7 +10,8 @@
- + +
@@ -18,10 +19,9 @@ 距离：
- 小于1km - 1~5km - 5~10km - 大于10km + 1km内 + 5Km内 + 10km内 全部
@@ -82,7 +82,7 @@ export default { props: ['fireData'], data() { return { - checkList: ['护林员', '消防员'], + checkList: ['护林员', '消防员','网格员'], listData: [], allData: [], fireLngLat: '', @@ -163,7 +163,7 @@ export default { } if (this.distanceradio == 2) { arr.forEach(item => { - if (item.distance >= 1 && item.distance < 5) { + if (item.distance < 5) { newArr.push(item) } }) @@ -171,7 +171,7 @@ export default { } if (this.distanceradio == 3) { arr.forEach(item => { - if (item.distance >= 5 && item.distance < 10) { + if (item.distance < 10) { newArr.push(item) } }) diff --git a/src/views/home/widget/rightclick.vue b/src/views/home/widget/rightclick.vue index abd6a6e..fb42a1b 100644 --- a/src/views/home/widget/rightclick.vue +++ b/src/views/home/widget/rightclick.vue @@ -84,7 +84,7 @@ -
+
标注
import { postMethodCommon, getMethodCommon } from "@/api/common.js"; +import drag from "../../../utils/draged"; export default { name: "setting", props: [ "type", "clickdata"], @@ -188,7 +189,7 @@ export default { firedialogFormVisible: false, taskdialogFormVisible: false, markdialogFormVisible: false, - markListDialogFormVisible: false, + markListDialogFormVisible: true, historyMarkVisible: false, addfireDetailReqLock: false, }; @@ -205,6 +206,12 @@ export default { if (newVal == 3) { this.markdialogFormVisible = true; } + if(newVal == 4){ + this.firedialogFormVisible = false; + this.taskdialogFormVisible = false; + this.markdialogFormVisible = false; + this.markListDialogFormVisible = true; + } }, }, clickdata: { @@ -375,12 +382,16 @@ export default { getMethodCommon("/FireCodePC/MarkerList", param).then((res) => { this.allHistoryMarkList = res.data; + + if (this.historyMarkGraphicLayer == null) { this.historyMarkGraphicLayer = new mars3d.layer.GraphicLayer(); window.globalmap.addLayer(this.historyMarkGraphicLayer); + }else{ + this.historyMarkGraphicLayer.clear(); } - this.historyMarkGraphicLayerArr = []; + this.allHistoryMarkList.forEach((item, index) => { let horizontalOrigin = Cesium.HorizontalOrigin.CENTER; let verticalOrigin = Cesium.VerticalOrigin.MIDDLE; diff --git a/src/views/home/widget/taskDelivery.vue b/src/views/home/widget/taskDelivery.vue index 0798bd4..dadbfa6 100644 --- a/src/views/home/widget/taskDelivery.vue +++ b/src/views/home/widget/taskDelivery.vue @@ -8,7 +8,7 @@
任务详情： - +
@@ -120,7 +120,7 @@ export default {