diff --git a/public/config/app.json b/public/config/app.json index cb92f4f..b3dc257 100644 --- a/public/config/app.json +++ b/public/config/app.json @@ -1,5 +1,5 @@ { - "method":"pingyixian", + "method":"feixian", "gaodeApi": "4f992c089f9496201f6e4ea39ff3ab60", "pingyixian":{ diff --git a/public/config/feixianConfig.json b/public/config/feixianConfig.json index ddbf8ff..3049588 100644 --- a/public/config/feixianConfig.json +++ b/public/config/feixianConfig.json @@ -114,7 +114,7 @@ "name": "最新高清影像", "type": "wms", "url": "http://175.27.168.120:8080/geoserver/feixian/wms", - "layers": "feixian:yingxiang", + "layers": "feixian:yingxiang2023", "crs": "EPSG:4326", "parameters": { "transparent": "true", diff --git a/public/img/jiuyuanrenyuan.png b/public/img/jiuyuanrenyuan.png index da5d06e..2f3f7b6 100644 Binary files a/public/img/jiuyuanrenyuan.png and b/public/img/jiuyuanrenyuan.png differ diff --git a/public/lib/layer/theme/default/layer.css b/public/lib/layer/theme/default/layer.css index 1e1f59a..d61f9ef 100644 --- a/public/lib/layer/theme/default/layer.css +++ b/public/lib/layer/theme/default/layer.css @@ -31,7 +31,7 @@ html #layuicss-layer { background-color: #fff; -webkit-background-clip: content; border-radius: 2px; - box-shadow: 1px 1px 50px rgba(0, 0, 0, .3) + box-shadow: 1px 1px 50px rgba(0, 0, 0, .3); } .layui-layer-close { diff --git a/public/widgets/toolBarRight/widget.js b/public/widgets/toolBarRight/widget.js index ad1a767..2147aca 100644 --- a/public/widgets/toolBarRight/widget.js +++ b/public/widgets/toolBarRight/widget.js @@ -16,7 +16,7 @@ //此数据也可以放在widget.json的配置中，但是发现很多人容易引起同名误解，所以还是放在这里 this.data = this.config.data || [ // { name: "底图", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" }, - { name: "图层", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" }, + { name: "图层", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js"}, { name: "工具", icon: "fa fa-cubes", diff --git a/src/App.vue b/src/App.vue index 85d750f..d4fa79c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -129,6 +129,11 @@ export default { user-select: none; /* 标准语法 */ +} +#app{ + width:100vw; + height:100vh; + overflow: hidden; } .flex { display: flex; diff --git a/src/views/gridman/forestranger/index.vue b/src/views/gridman/forestranger/index.vue index c3ca511..e733851 100644 --- a/src/views/gridman/forestranger/index.vue +++ b/src/views/gridman/forestranger/index.vue @@ -1,622 +1,715 @@ \ No newline at end of file + diff --git a/src/views/gridman/forestranger/widget/ditu.vue b/src/views/gridman/forestranger/widget/ditu.vue index 5a89eed..ef53fff 100644 --- a/src/views/gridman/forestranger/widget/ditu.vue +++ b/src/views/gridman/forestranger/widget/ditu.vue @@ -14,13 +14,13 @@ export default { return { map: null, clockInList: [], - markerArr:[] + markerArr: [], }; }, watch: { rowkey: function (e) { - console.log('123',e) - this.getClockInList() + console.log("123", e); + this.getClockInList(); }, lnglat: function (e) {}, flyCenter: function (e) { @@ -45,13 +45,13 @@ export default { getMethodCommon("/FireGrid/GetTotalCheckPoint").then((res) => { this.clockInList = res.result; for (var i = this.markerArr.length - 1; i >= 0; i--) { - this.markerArr[i].remove(); + this.markerArr[i].remove(); } this.addPointLayer(); }); }, addPointLayer() { - let _this = this + let _this = this; this.clockInList.forEach((item) => { console.log("iii", item); let el = document.createElement("img"); //这里可以是任意标签 @@ -59,15 +59,19 @@ export default { el.src = "/img/dakadian.png"; //图片路径赋值 el.style.width = "40px"; // el.onclick = function(){ - + // console.log('123item',item) // _this.$emit("editClock",item) // } - + console.log(item) + const popup = new mapboxgl.Popup({ offset: 25 }).setHTML(`${item.pointname }
${item.usernames}`); // 添加自定义标记点 - let marker = new mapboxgl.Marker(el).setLngLat([item.lng, item.lat]).addTo(this.map); - this.markerArr.push(marker) - + let marker = new mapboxgl.Marker(el) + .setLngLat([item.lng, item.lat]) + .setPopup(popup) + .addTo(this.map); + marker + this.markerArr.push(marker); }); }, initMap(url, jwd) { @@ -85,14 +89,17 @@ export default { this.loadMengban(); this.loadZhenJieLayer(); this.loadXianJieLayer(); - + this.getClockInList(); }); this.map.on("click", (e) => { this.$emit("getLocation", e); }); + this.map.on("contextmenu", (e) => { + this.$emit("rightClick", e); + }); }, - + loadMengban() { this.map.addLayer({ //蒙版图层 //通过边界数据反选 达到挖洞效果 diff --git a/src/views/gridman/gridmanagement/index.vue b/src/views/gridman/gridmanagement/index.vue index c46a2a0..2534eec 100644 --- a/src/views/gridman/gridmanagement/index.vue +++ b/src/views/gridman/gridmanagement/index.vue @@ -62,11 +62,6 @@
-
-

名称：东蒙镇

-

名称：类型

-

督察长：徐景良

-
- + 县级包保领导 + 无 - + 督查长 + 副督查长 + 无
@@ -195,7 +193,7 @@ export default { ); }, deleteUser(id) { - postMethodCommon("/FireGrid/DeleteInspectors", { id: id }).then((res) => { + postMethodCommon("/FireGrid/DeleteInspectors?id="+id).then((res) => { if (res.code == 200) { this.$message({ type: "success", @@ -206,15 +204,21 @@ export default { }); }, saveUser(item) { - console.log("item", item); - item.id = 0; + let api_url = null; + if(!item.id){ + item.id = 0; + api_url = "/FireGrid/AddInspector"; + }else{ + api_url="/FireGrid/EditInspectors"; + } item.townid = [this.currentStreetId]; - postMethodCommon("/FireGrid/AddInspector", item).then((res) => { + postMethodCommon(api_url, item).then((res) => { if (res.code == 200) { this.$message({ type: "success", - message: "添加成功！", + message: "保存成功！", }); + this.getUserlist(this.currentStreetId); } }); }, @@ -441,7 +445,7 @@ export default { .grid-list-box { width: 100%; - height: calc(100% - 135px); + height: calc(100% - 15px); overflow: auto; } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 40855cd..e61b3c3 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -126,8 +126,12 @@
-
- +
+
@@ -443,7 +447,7 @@ export default { }, immediate: true }, - goodsVisible: { + goodsVisible:{ handler(newVal, oldVal) { if (!newVal) { clearRouterFunc() @@ -1237,6 +1241,11 @@ export default {