From fad21d94931ef4a021ca40f7d7e0466db0787014 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 11:09:41 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=B8=B4=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .../modules/visual/command/cpts/map-ol.vue | 23 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index d1c8a3e7c..e6abb72d8 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -# VUE_APP_NODE_ENV=dev_sdtdt -VUE_APP_NODE_ENV=dev +VUE_APP_NODE_ENV=dev_sdtdt +# VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/src/views/modules/visual/command/cpts/map-ol.vue b/src/views/modules/visual/command/cpts/map-ol.vue index 0959d17f8..df446bf40 100644 --- a/src/views/modules/visual/command/cpts/map-ol.vue +++ b/src/views/modules/visual/command/cpts/map-ol.vue @@ -456,9 +456,11 @@ export default { target: "map", }); - myMap.on("singleclick", function (e) { - // console.log(e.coordinate) - // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); + myMap.on("singleclick", (event) => { + myMap.forEachFeatureAtPixel(event.pixel, function (feature) { + // 为移动到的 feature 发送自定义的 mousemove 消息 + feature.dispatchEvent({ type: "click", event }); + }); }); await nextTick(); @@ -535,6 +537,21 @@ export default { }), ]; + item.on("click", function (event) { + console.log("我被点击拉", item, event); + // 修改feature的样式为半径100像素的园，用蓝色填充 + this.setStyle( + new ol.style.Style({ + image: new ol.style.Circle({ + radius: 100, + fill: new ol.style.Fill({ + color: "blue", + }), + }), + }) + ); + }); + setInterval(() => { let currStyle = item.getStyle(); if (!Array.isArray(currStyle)) { From 2266ec09be37898c55a639c6b185db3444a44593 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 13:53:48 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/utils/dai-map.js | 6 ++-- src/utils/tdt-wp-zw.js | 6 ++-- src/views/modules/visual/command/index.vue | 5 +++- src/views/modules/workSys/mapConfig.vue | 33 +++++++++++----------- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/public/index.html b/public/index.html index 2e1d6b701..de763cc25 100644 --- a/public/index.html +++ b/public/index.html @@ -39,7 +39,7 @@ if (SITE_CONFIG['nodeEnv'] == 'dev_tdt') { toLoadJs('http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926') - } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt') { + } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt1') { toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js') } else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') { toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js') diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index 0edd0fa9c..f51a46780 100644 --- a/src/utils/dai-map.js +++ b/src/utils/dai-map.js @@ -16,7 +16,7 @@ const urlSdtdt = (() => { }; } else { return { - search: "http://172.20.46.177/epmet-map-proxy/QueryService.ashx", + search: "http://172.20.46.177/map_search_proxy/search", geo: "http://172.20.46.177/epmet-map-proxy/GeoDecodeService.ashx", }; } @@ -108,12 +108,12 @@ export function searchNearby(map, keyword) { const center = map.getCenter(); const url = urlSdtdt.search; const { status, result } = await requestGet(url, { - // area: `CIRCLE(${center.lon} ${center.lat} 1000000)`, + area: `CIRCLE(${center.lon} ${center.lat} 1000000)`, words: keyword, city: "烟台", uid: "navinfo", st: "LocalSearch", - // tk: "e758167d5b90c351b70a979c0820840c", + tk: "e758167d5b90c351b70a979c0820840c", }); if ( diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index 8e2c609cb..55c57cf1c 100644 --- a/src/utils/tdt-wp-zw.js +++ b/src/utils/tdt-wp-zw.js @@ -1,6 +1,8 @@ -export const baseUrl = "http://59.206.203.34/tileservice/SDPubMap"; +// let vec = +// "http://59.206.203.34/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng"; + let vec = - "http://59.206.203.34/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng"; + "http://172.20.46.177/map_tile_proxy/appmaptile?lang=zh_cn&style=7<ype=7&scl=0&size=0&x={x}&y={y}&z={z}"; if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { vec = "http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c"; diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index fd33754a7..4a08c4291 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -288,7 +288,10 @@ export default { People, cptCard, ScreenLoading, - gridMap: mapType == "tdzw" ? gridMapOl : gridMap, + gridMap: + mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt" + ? gridMapOl + : gridMap, sidemenu1, sidemenu2, sidemenuLeft, diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index 96f209a03..939b9e36b 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -647,27 +647,27 @@ const vueGis = { gaodeMapLayer = new TileLayer({ title: "地图", - source: new XYZ({ - url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", - }), // source: new XYZ({ - // url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}" + // url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", // }), // source: new XYZ({ - // //指定url瓦片 - // url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}', - // wrapX: true//x方向平铺，也可以选择false + // url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}" // }), + source: new XYZ({ + //指定url瓦片 + url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7<ype=7&scl=0&size=0&x={x}&y={y}&z={z}", + wrapX: true, //x方向平铺，也可以选择false + }), // zIndex: 20 }); - var sourceMark = new XYZ({ - url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", - // zIndex: 22 - }); - var tileMark = new TileLayer({ - title: "标注图层", - source: sourceMark, - }); + // var sourceMark = new XYZ({ + // url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", + // // zIndex: 22 + // }); + // var tileMark = new TileLayer({ + // title: "标注图层", + // source: sourceMark, + // }); (mapView = new View({ //中心点坐标 @@ -680,7 +680,8 @@ const vueGis = { //初始化map和地图底图 //创建地图容器 (map = new Map({ - layers: [gaodeMapLayer, tileMark], + layers: [gaodeMapLayer], + // layers: [gaodeMapLayer, tileMark], //加载瓦片图层数据 view: mapView, target: "map", From a550a46656bba7d5b70a8958aebc4949ad32240d Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 13:54:39 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index de763cc25..2e1d6b701 100644 --- a/public/index.html +++ b/public/index.html @@ -39,7 +39,7 @@ if (SITE_CONFIG['nodeEnv'] == 'dev_tdt') { toLoadJs('http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926') - } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt1') { + } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt') { toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js') } else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') { toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js') From a7040edad0d38f6735d681210d8b15f4433e4058 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 14:24:57 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=B0=83=E8=AF=951.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 5 ++++- src/utils/tdt-wp-zw.js | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 2e1d6b701..8f6a6eb47 100644 --- a/public/index.html +++ b/public/index.html @@ -7,12 +7,12 @@ + diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index 55c57cf1c..b5ed6093c 100644 --- a/src/utils/tdt-wp-zw.js +++ b/src/utils/tdt-wp-zw.js @@ -10,7 +10,6 @@ if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { "http://www.sdmap.gov.cn/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=sdvec&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng"; } -// http://www.sdmap.gov.cn/tileservice/SDPubMap export default { vec, }; From 37d3d44e1ed075510c5c59c0830a945b66cce6a4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 15:54:13 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=82=B9=E6=9C=89=E6=97=B6=E5=80=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/utils/dai-map.js | 12 ++++++++++-- src/utils/tdt-wp-zw.js | 2 -- src/views/modules/cpts/base/cpts/edit.vue | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 8f6a6eb47..e099cd9fc 100644 --- a/public/index.html +++ b/public/index.html @@ -48,7 +48,7 @@ toLoadJs('https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77') } - console.log('============调试版本：1.0.1') + console.log('============调试版本：1.0.2') console.log('nodeEnv', window.SITE_CONFIG['nodeEnv']) diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index f51a46780..2f852a730 100644 --- a/src/utils/dai-map.js +++ b/src/utils/dai-map.js @@ -335,11 +335,15 @@ export default function init(ele, position, params) { }; this.setCenter = function (lat, lng) { + lat = parseFloat(lat); + lng = parseFloat(lng); this.map.setCenter(new OpenLayers.LonLat(lng, lat), 16); }; this.setCenter(latitude, longitude); this.setMarker = function (lat, lng, title = "位置") { + lat = parseFloat(lat); + lng = parseFloat(lng); if (!this.marker) { //创建矢量图层 var graphicLayer = new OpenLayers.Layer.Vector("graphicLayer", { @@ -360,9 +364,13 @@ export default function init(ele, position, params) { this.marker = feature; this.markerLayer = graphicLayer; } else { - this.marker.geometry.x = lng; - this.marker.geometry.y = lat; + console.log("this marker", this.marker); + // this.marker.geometry.x = lng; + // this.marker.geometry.y = lat; + this.marker.geometry = new OpenLayers.Geometry.Point(lng, lat); + this.markerLayer.redraw(); + console.log("redraw", this.marker); } }; diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index b5ed6093c..530783b60 100644 --- a/src/utils/tdt-wp-zw.js +++ b/src/utils/tdt-wp-zw.js @@ -6,8 +6,6 @@ let vec = if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { vec = "http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c"; - vec = - "http://www.sdmap.gov.cn/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=sdvec&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng"; } export default { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 422d1fb72..cc4fcbf79 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -655,10 +655,12 @@ export default { console.log("handleMoveCenter", e); //修改地图中心点 const { lat, lng } = map.getCenter(); + console.log("getCenter", lat); this.fmData[item.supKeys[0]] = parseFloat(lng); this.fmData[item.supKeys[1]] = parseFloat(lat); map.setMarker(lat, lng); + console.log("setMarker", lat); let { msg, data } = await map.getAddress(lat, lng); if (msg == "success") { From bb3f41765d5410105b0a45175fc83005c687db5a Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 2 Nov 2022 16:51:51 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=A5=BD=E5=83=8F=E6=98=AF=E5=A5=BD?= =?UTF-8?q?=E4=BA=86=20=E5=9C=B0=E5=9B=BE=E9=A3=9E=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/utils/dai-map.js | 39 +++++++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/public/index.html b/public/index.html index e099cd9fc..c6e160baa 100644 --- a/public/index.html +++ b/public/index.html @@ -48,7 +48,7 @@ toLoadJs('https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77') } - console.log('============调试版本：1.0.2') + console.log('============调试版本：1.0.3') console.log('nodeEnv', window.SITE_CONFIG['nodeEnv']) diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index 2f852a730..1d2f4bb07 100644 --- a/src/utils/dai-map.js +++ b/src/utils/dai-map.js @@ -344,31 +344,38 @@ export default function init(ele, position, params) { this.setMarker = function (lat, lng, title = "位置") { lat = parseFloat(lat); lng = parseFloat(lng); + const style = { + externalGraphic: require("@/assets/img/common/map-poi.png"), + graphicWidth: 32, + graphicHeight: 32, + }; if (!this.marker) { //创建矢量图层 - var graphicLayer = new OpenLayers.Layer.Vector("graphicLayer", { + this.markerLayer = new OpenLayers.Layer.Vector("graphicLayer", { style: OpenLayers.Util.extend( {}, OpenLayers.Feature.Vector.style["default"] ), }); - this.map.addLayer(graphicLayer); - let pt = new OpenLayers.Geometry.Point(lng, lat); - var style = { - externalGraphic: require("@/assets/img/common/map-poi.png"), - graphicWidth: 32, - graphicHeight: 32, - }; - var feature = new OpenLayers.Feature.Vector(pt, null, style); - graphicLayer.addFeatures([feature]); - this.marker = feature; - this.markerLayer = graphicLayer; + this.map.addLayer(this.markerLayer); + this.marker = new OpenLayers.Feature.Vector( + new OpenLayers.Geometry.Point(lng, lat), + null, + style + ); + this.markerLayer.addFeatures([this.marker]); } else { console.log("this marker", this.marker); - // this.marker.geometry.x = lng; - // this.marker.geometry.y = lat; - this.marker.geometry = new OpenLayers.Geometry.Point(lng, lat); - + this.marker.geometry.x = 0; + this.marker.geometry.y = 0; + this.marker.geometry.destroy(); + this.markerLayer.removeFeatures([this.marker]); + this.marker = new OpenLayers.Feature.Vector( + new OpenLayers.Geometry.Point(lng, lat), + null, + style + ); + // this.markerLayer.addFeatures([this.marker]); this.markerLayer.redraw(); console.log("redraw", this.marker); } From bb4485c0e584e7dc36987b3c7bc86008384805d9 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 3 Nov 2022 14:52:06 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index e6abb72d8..d1c8a3e7c 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -VUE_APP_NODE_ENV=dev_sdtdt -# VUE_APP_NODE_ENV=dev +# VUE_APP_NODE_ENV=dev_sdtdt +VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file From d50e1ad91b9ef31c5eeb289ddb46bbc06c3ee903 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Nov 2022 09:59:56 +0800 Subject: [PATCH 08/12] 111 --- src/views/modules/base/epidemic/antiInfo.vue | 72 ++++++++++++++++++-- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index a84dfb885..c716715a9 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -9,7 +9,14 @@
- + 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.searchForm.agencyId = '' + } else { + this.searchForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.searchForm.gridId = '' + } + + } else { + this.searchForm.agencyId = '' + this.searchForm.gridId = '' + } + + this.searchForm.neighborId = '' + this.searchForm.buildingId = '' + this.searchForm.unitId = '' + this.searchForm.houseId = '' + this.getValiheList() + }, + handleChangeGrid (val) { console.log('val', val) this.searchForm.neighborId = '' @@ -687,6 +727,23 @@ export default { this.searchForm.houseId = '' this.getHouseList() }, + getOrgTreeList () { + const { user } = this.$store.state + this.$http + .post('/gov/org/customeragency/agencygridtree', {}) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取组织树成功', res.data) + this.orgOptions = [] + this.orgOptions.push(res.data) + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, getGridList () { const { user } = this.$store.state this.$http @@ -708,7 +765,7 @@ export default { this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.searchForm.gridId, - agencyId: '' + agencyId: this.searchForm.agencyId // agencyId: user.agencyId }) .then(({ data: res }) => { @@ -904,6 +961,7 @@ export default { //重置搜索条件 resetSearch () { this.timeRange = [] + this.agencyIdArray = [] this.$refs.ref_searchform.resetFields() this.searchForm.buildingId = '' this.searchForm.unitId = '' From 39ca7325bce9a008eebe64cada8c371a2a35a075 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 4 Nov 2022 10:14:42 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=88=A0=E6=8E=89=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report.20221026.142822.38864.0.001.json | 580 ------------------------ 1 file changed, 580 deletions(-) delete mode 100644 report.20221026.142822.38864.0.001.json diff --git a/report.20221026.142822.38864.0.001.json b/report.20221026.142822.38864.0.001.json deleted file mode 100644 index 1170160d7..000000000 --- a/report.20221026.142822.38864.0.001.json +++ /dev/null @@ -1,580 +0,0 @@ - -{ - "header": { - "event": "Allocation failed - JavaScript heap out of memory", - "trigger": "FatalError", - "filename": "report.20221026.142822.38864.0.001.json", - "dumpEventTime": "2022-10-26T14:28:22Z", - "processId": 38864, - "cwd": "D:\\Project\\Web\\epmet-oper-gov", - "commandLine": [ - "node", - "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\\\..\\_@vue_cli-service@3.12.1@@vue\\cli-service\\bin\\vue-cli-service.js", - "serve" - ], - "nodejsVersion": "v11.15.0", - "wordSize": 64, - "arch": "x64", - "platform": "win32", - "componentVersions": { - "node": "11.15.0", - "v8": "7.0.276.38-node.19", - "uv": "1.27.0", - "zlib": "1.2.11", - "brotli": "1.0.7", - "ares": "1.15.0", - "modules": "67", - "nghttp2": "1.37.0", - "napi": "4", - "llhttp": "1.1.1", - "http_parser": "2.8.0", - "openssl": "1.1.1b", - "cldr": "34.0", - "icu": "63.1", - "tz": "2018e", - "unicode": "11.0" - }, - "release": { - "name": "node", - "headersUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0-headers.tar.gz", - "sourceUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0.tar.gz", - "libUrl": "https://nodejs.org/download/release/v11.15.0/win-x64/node.lib" - }, - "osName": "Windows_NT", - "osRelease": "10.0.22621", - "osVersion": "Windows 10 Home China", - "osMachine": "x86_64", - "host": "DESKTOP-KD168PS" - }, - "javascriptStack": { - "message": "No stack.", - "stack": [ - "Unavailable." - ] - }, - "nativeStack": [ - { - "pc": "0x00007ff793c6d24e", - "symbol": "std::basic_ios >::fill+16366" - }, - { - "pc": "0x00007ff793c6c0f9", - "symbol": "std::basic_ios >::fill+11929" - }, - { - "pc": "0x00007ff793c6b923", - "symbol": "std::basic_ios >::fill+9923" - }, - { - "pc": "0x00007ff793d5dc22", - "symbol": "uv_loop_fork+89362" - }, - { - "pc": "0x00007ff79418609e", - "symbol": "v8::internal::FatalProcessOutOfMemory+798" - }, - { - "pc": "0x00007ff794185fd7", - "symbol": "v8::internal::FatalProcessOutOfMemory+599" - }, - { - "pc": "0x00007ff794239a14", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+14068" - }, - { - "pc": "0x00007ff79422f822", - "symbol": "v8::internal::Heap::CollectGarbage+7234" - }, - { - "pc": "0x00007ff79422e038", - "symbol": "v8::internal::Heap::CollectGarbage+1112" - }, - { - "pc": "0x00007ff794237967", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5703" - }, - { - "pc": "0x00007ff7942379e6", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5830" - }, - { - "pc": "0x00007ff79436f8b1", - "symbol": "v8::internal::Factory::NewFillerObject+49" - }, - { - "pc": "0x00007ff794429786", - "symbol": "v8::internal::StoreBuffer::StoreBufferOverflow+27190" - }, - { - "pc": "0x0000020868150481", - "symbol": "" - } - ], - "javascriptHeap": { - "totalMemory": 1475153920, - "totalCommittedMemory": 1475153920, - "usedMemory": 1325429824, - "availableMemory": 52170184, - "memoryLimit": 1526909922, - "heapSpaces": { - "read_only_space": { - "memorySize": 524288, - "committedMemory": 524288, - "capacity": 515584, - "used": 33520, - "available": 482064 - }, - "new_space": { - "memorySize": 2097152, - "committedMemory": 2097152, - "capacity": 1031168, - "used": 19408, - "available": 1011760 - }, - "old_space": { - "memorySize": 1254297600, - "committedMemory": 1254297600, - "capacity": 1130026960, - "used": 1128870728, - "available": 1156232 - }, - "code_space": { - "memorySize": 9437184, - "committedMemory": 9437184, - "capacity": 7747264, - "used": 7747264, - "available": 0 - }, - "map_space": { - "memorySize": 24653824, - "committedMemory": 24653824, - "capacity": 6556000, - "used": 6556000, - "available": 0 - }, - "large_object_space": { - "memorySize": 184143872, - "committedMemory": 184143872, - "capacity": 231723032, - "used": 182202904, - "available": 49520128 - }, - "new_large_object_space": { - "memorySize": 0, - "committedMemory": 0, - "capacity": 0, - "used": 0, - "available": 0 - } - } - }, - "resourceUsage": { - "userCpuSeconds": 540.296, - "kernelCpuSeconds": 32.078, - "cpuConsumptionPercent": 4.59775, - "maxRss": 1920303104, - "pageFaults": { - "IORequired": 4598933, - "IONotRequired": 0 - }, - "fsActivity": { - "reads": 43082, - "writes": 5808 - } - }, - "libuv": [ - ], - "environmentVariables": { - "=C:": "C:\\", - "=D:": "D:\\Project\\Web\\epmet-oper-gov", - "add_path": "D:\\APP\\cmder", - "add_to_path": "D:\\APP\\cmder", - "aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd", - "ALLUSERSPROFILE": "C:\\ProgramData", - "ANSICON": "90x1000 (90x24)", - "ANSICON_DEF": "7", - "APPDATA": "C:\\Users\\lenovo\\AppData\\Roaming", - "architecture_bits": "64", - "BABEL_ENV": "development", - "ccall": "call \"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"", - "cexec": "\"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"", - "clink_architecture": "x64", - "CMDER_ALIASES": "1", - "CMDER_CLINK": "1", - "CMDER_CONFIGURED": "1", - "CMDER_INIT_END": "10:41:53.98", - "CMDER_INIT_START": "10:41:46.93", - "CMDER_ROOT": "D:\\APP\\cmder", - "CMDER_SHELL": "cmd", - "CMDER_USER_FLAGS": " ", - "COLUMNS": "90", - "CommonProgramFiles": "C:\\Program Files\\Common Files", - "CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files", - "CommonProgramW6432": "C:\\Program Files\\Common Files", - "COMPUTERNAME": "DESKTOP-KD168PS", - "ComSpec": "C:\\WINDOWS\\system32\\cmd.exe", - "ConEmuANSI": "ON", - "ConEmuAnsiLog": "", - "ConEmuArgs": "/Icon \"D:\\APP\\cmder\\icons\\cmder.ico\" /Title Cmder /dir \"D:\\Project\\Web\\epmet-oper-gov\"", - "ConEmuArgs2": "", - "ConEmuBackHWND": "0x001009E8", - "ConEmuBaseDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu", - "ConEmuBaseDirShort": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu", - "ConEmuBuild": "210912", - "ConEmuCfgDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5", - "ConEmuConfig": "", - "ConEmuDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5", - "ConEmuDrawHWND": "0x00080A82", - "ConEmuDrive": "D:", - "ConEmuHooks": "Enabled", - "ConEmuHWND": "0x00380A8C", - "ConEmuPalette": "Monokai", - "ConEmuPID": "41292", - "ConEmuServerPID": "33484", - "ConEmuTask": "{cmd::Cmder}", - "ConEmuWorkDir": "D:\\Project\\Web\\epmet-oper-gov", - "ConEmuWorkDrive": "D:", - "currenArgu": "/setpath", - "debug_output": "0", - "depth": "1", - "dp0": "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\", - "DriverData": "C:\\Windows\\System32\\Drivers\\DriverData", - "fast_init": "0", - "feFlagName": " ", - "feNot": "false", - "find_query": "D:\\\\APP\\\\cmder", - "found": "1", - "git_executable": "D:\\APP\\Git\\cmd\\git.exe", - "GIT_INSTALL_ROOT": "D:\\APP\\Git", - "git_locale": "\"D:\\APP\\Git\\usr\\bin\\locale.exe\"", - "GIT_VERSION_USER": "2.31.1.windows.1", - "HOME": "C:\\Users\\lenovo", - "HOMEDRIVE": "C:", - "HOMEPATH": "\\Users\\lenovo", - "INIT_CWD": "D:\\Project\\Web\\epmet-oper-gov", - "LANG": "zh_CN.UTF-8", - "lib_base": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_base.cmd\"", - "lib_console": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\"", - "lib_git": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_git.cmd\"", - "lib_path": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_path.cmd\"", - "lib_profile": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_profile.cmd\"", - "LINES": "24", - "LOCALAPPDATA": "C:\\Users\\lenovo\\AppData\\Local", - "LOGONSERVER": "\\\\DESKTOP-KD168PS", - "max_depth": "1", - "nix_tools": "1", - "NODE": "D:\\APP\\nodejs\\node.exe", - "NODE_ENV": "development", - "NODE_EXE": "D:\\APP\\nodejs\\\\node.exe", - "NPM_CLI_JS": "D:\\APP\\nodejs\\\\node_modules\\npm\\bin\\npm-cli.js", - "npm_config_access": "", - "npm_config_allow_same_version": "", - "npm_config_also": "", - "npm_config_always_auth": "", - "npm_config_argv": "{\"remain\":[],\"cooked\":[\"run\",\"dev\"],\"original\":[\"run\",\"dev\"]}", - "npm_config_audit": "true", - "npm_config_audit_level": "low", - "npm_config_auth_type": "legacy", - "npm_config_bin_links": "true", - "npm_config_browser": "", - "npm_config_ca": "", - "npm_config_cache": "C:\\Users\\lenovo\\AppData\\Roaming\\npm-cache", - "npm_config_cache_lock_retries": "10", - "npm_config_cache_lock_stale": "60000", - "npm_config_cache_lock_wait": "10000", - "npm_config_cache_max": "Infinity", - "npm_config_cache_min": "10", - "npm_config_cafile": "", - "npm_config_cert": "", - "npm_config_cidr": "", - "npm_config_color": "true", - "npm_config_commit_hooks": "true", - "npm_config_depth": "Infinity", - "npm_config_description": "true", - "npm_config_dev": "", - "npm_config_dry_run": "", - "npm_config_editor": "notepad.exe", - "npm_config_engine_strict": "", - "npm_config_fetch_retries": "2", - "npm_config_fetch_retry_factor": "10", - "npm_config_fetch_retry_maxtimeout": "60000", - "npm_config_fetch_retry_mintimeout": "10000", - "npm_config_force": "", - "npm_config_git": "git", - "npm_config_git_tag_version": "true", - "npm_config_global": "", - "npm_config_globalconfig": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\etc\\npmrc", - "npm_config_globalignorefile": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\etc\\npmignore", - "npm_config_global_style": "", - "npm_config_group": "", - "npm_config_ham_it_up": "", - "npm_config_heading": "npm", - "npm_config_https_proxy": "", - "npm_config_if_present": "", - "npm_config_ignore_prepublish": "", - "npm_config_ignore_scripts": "", - "npm_config_init_author_email": "", - "npm_config_init_author_name": "", - "npm_config_init_author_url": "", - "npm_config_init_license": "ISC", - "npm_config_init_module": "C:\\Users\\lenovo\\.npm-init.js", - "npm_config_init_version": "1.0.0", - "npm_config_json": "", - "npm_config_key": "", - "npm_config_legacy_bundling": "", - "npm_config_link": "", - "npm_config_local_address": "", - "npm_config_loglevel": "notice", - "npm_config_logs_max": "10", - "npm_config_long": "", - "npm_config_maxsockets": "50", - "npm_config_message": "%s", - "npm_config_metrics_registry": "https://registry.npmjs.org/", - "npm_config_node_gyp": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js", - "npm_config_node_options": "", - "npm_config_node_version": "11.15.0", - "npm_config_noproxy": "", - "npm_config_offline": "", - "npm_config_onload_script": "", - "npm_config_only": "", - "npm_config_optional": "true", - "npm_config_otp": "", - "npm_config_package_lock": "true", - "npm_config_package_lock_only": "", - "npm_config_parseable": "", - "npm_config_prefer_offline": "", - "npm_config_prefer_online": "", - "npm_config_prefix": "C:\\Users\\lenovo\\AppData\\Roaming\\npm", - "npm_config_preid": "", - "npm_config_production": "", - "npm_config_progress": "true", - "npm_config_proxy": "", - "npm_config_read_only": "", - "npm_config_rebuild_bundle": "true", - "npm_config_registry": "https://registry.npmjs.org/", - "npm_config_rollback": "true", - "npm_config_save": "true", - "npm_config_save_bundle": "", - "npm_config_save_dev": "", - "npm_config_save_exact": "", - "npm_config_save_optional": "", - "npm_config_save_prefix": "^", - "npm_config_save_prod": "", - "npm_config_scope": "", - "npm_config_scripts_prepend_node_path": "warn-only", - "npm_config_script_shell": "", - "npm_config_searchexclude": "", - "npm_config_searchlimit": "20", - "npm_config_searchopts": "", - "npm_config_searchstaleness": "900", - "npm_config_send_metrics": "", - "npm_config_shell": "C:\\WINDOWS\\system32\\cmd.exe", - "npm_config_shrinkwrap": "true", - "npm_config_sign_git_commit": "", - "npm_config_sign_git_tag": "", - "npm_config_sso_poll_frequency": "500", - "npm_config_sso_type": "oauth", - "npm_config_strict_ssl": "true", - "npm_config_tag": "latest", - "npm_config_tag_version_prefix": "v", - "npm_config_timing": "", - "npm_config_tmp": "C:\\Users\\lenovo\\AppData\\Local\\Temp", - "npm_config_umask": "0000", - "npm_config_unicode": "", - "npm_config_unsafe_perm": "true", - "npm_config_update_notifier": "true", - "npm_config_usage": "", - "npm_config_user": "", - "npm_config_userconfig": "C:\\Users\\lenovo\\.npmrc", - "npm_config_user_agent": "npm/6.7.0 node/v11.15.0 win32 x64", - "npm_config_version": "", - "npm_config_versions": "", - "npm_config_viewer": "browser", - "npm_execpath": "D:\\APP\\nodejs\\node_modules\\npm\\bin\\npm-cli.js", - "npm_lifecycle_event": "dev", - "npm_lifecycle_script": "vue-cli-service serve", - "npm_node_execpath": "D:\\APP\\nodejs\\node.exe", - "npm_package_browserslist_0": "> 1%", - "npm_package_browserslist_1": "last 2 versions", - "npm_package_browserslist_2=not ie <": " 10", - "npm_package_dependencies_async_validator": "^4.2.5", - "npm_package_dependencies_axios": "^0.19.0", - "npm_package_dependencies_babel_eslint": "^8.0.1", - "npm_package_dependencies_babel_plugin_component": "^1.1.1", - "npm_package_dependencies_echarts": "^5.2.2", - "npm_package_dependencies_echarts_gl": "^2.0.9", - "npm_package_dependencies_element_theme": "^2.0.1", - "npm_package_dependencies_element_ui": "^2.13.0", - "npm_package_dependencies_file_saver": "^2.0.5", - "npm_package_dependencies_gulp_autoprefixer": "^6.1.0", - "npm_package_dependencies_gulp_clean_css": "^4.2.0", - "npm_package_dependencies_gulp_load_plugins": "^2.0.0", - "npm_package_dependencies_gulp_rename": "^1.4.0", - "npm_package_dependencies_gulp_sass": "^4.0.2", - "npm_package_dependencies_jsencrypt": "^3.0.3", - "npm_package_dependencies_js_cookie": "^2.2.0", - "npm_package_dependencies_lodash": "^4.17.15", - "npm_package_dependencies_mint_ui": "^2.2.13", - "npm_package_dependencies_node_sass": "^4.12.0", - "npm_package_dependencies_ol": "^6.9.0", - "npm_package_dependencies_portfinder": "^1.0.21", - "npm_package_dependencies_qs": "^6.7.0", - "npm_package_dependencies_quill": "^1.3.6", - "npm_package_dependencies_screenfull": "^4.2.1", - "npm_package_dependencies_sortablejs": "^1.12.0", - "npm_package_dependencies_svg_sprite_loader": "^4.1.6", - "npm_package_dependencies_throttle_debounce": "^3.0.1", - "npm_package_dependencies_vue": "^2.6.11", - "npm_package_dependencies_vuex": "^3.1.1", - "npm_package_dependencies_vue_baidu_map": "^0.21.22", - "npm_package_dependencies_vue_i18n": "^8.12.0", - "npm_package_dependencies_vue_quill_editor": "^3.0.6", - "npm_package_dependencies_vue_router": "^3.0.7", - "npm_package_dependencies_v_distpicker": "^1.2.2", - "npm_package_dependencies_xlsx": "^0.17.1", - "npm_package_dependencies__antv_l7": "2.9.14", - "npm_package_dependencies__antv_l7_draw": "3.0.5", - "npm_package_dependencies__antv_l7_maps": "2.9.14", - "npm_package_dependencies__riophae_vue_treeselect": "^0.4.0", - "npm_package_dependencies__tinymce_tinymce_vue": "^3.2.8", - "npm_package_description": "## Project setup ``` npm install ```", - "npm_package_devDependencies_dai_js": "^0.0.12", - "npm_package_devDependencies_element_theme_chalk": "^2.13.0", - "npm_package_devDependencies_natives": "^1.1.6", - "npm_package_devDependencies_ol": "^6.9.0", - "npm_package_devDependencies_sass_loader": "^7.3.1", - "npm_package_devDependencies_script_loader": "^0.7.2", - "npm_package_devDependencies_tinymce": "5.8.2", - "npm_package_devDependencies_vue_template_compiler": "^2.6.11", - "npm_package_devDependencies__antv_f2": "^3.8.10-beta.1", - "npm_package_devDependencies__tinymce_tinymce_vue": "3.2.8", - "npm_package_devDependencies__vue_cli_plugin_babel": "^3.10.0", - "npm_package_devDependencies__vue_cli_plugin_eslint": "^3.10.0", - "npm_package_devDependencies__vue_cli_service": "^3.10.0", - "npm_package_devDependencies__vue_eslint_config_standard": "^4.0.0", - "npm_package_element_theme_browsers_0": "> 1%", - "npm_package_element_theme_browsers_1": "last 2 versions", - "npm_package_element_theme_browsers_2=not ie <": " 10", - "npm_package_element_theme_config": "./src/element-ui/theme-variables.scss", - "npm_package_element_theme_minimize": "true", - "npm_package_element_theme_out": "./src/element-ui/theme", - "npm_package_engines_node=>": " 8.11.1", - "npm_package_engines_npm=>": " 5.6.0", - "npm_package_eslintConfig_env_node": "true", - "npm_package_eslintConfig_extends_0": "plugin:vue/essential", - "npm_package_eslintConfig_extends_1": "@vue/standard", - "npm_package_eslintConfig_parserOptions_parser": "babel-eslint", - "npm_package_eslintConfig_root": "true", - "npm_package_gitHead": "28c653677ab76d5cd430a42ccb76a3fb6afedccb", - "npm_package_name": "epmet-oper-web", - "npm_package_private": "true", - "npm_package_readmeFilename": "README.md", - "npm_package_scripts_build": "vue-cli-service build", - "npm_package_scripts_build_prod": "vue-cli-service build --mode production", - "npm_package_scripts_build_shibei_prod": "vue-cli-service build --mode shibei_production", - "npm_package_scripts_build_sit": "vue-cli-service build --mode production.sit", - "npm_package_scripts_build_uat": "vue-cli-service build --mode production.uat", - "npm_package_scripts_dev": "vue-cli-service serve", - "npm_package_scripts_et": "et", - "npm_package_scripts_et_init": "et -i", - "npm_package_scripts_et_list": "gulp themes", - "npm_package_scripts_lint": "vue-cli-service lint", - "npm_package_scripts_serve": "vue-cli-service serve", - "npm_package_version": "2.0.0", - "NPM_PREFIX_NPM_CLI_JS": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js", - "NUMBER_OF_PROCESSORS": "8", - "OLD_PATH": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin", - "OneDrive": "C:\\Users\\lenovo\\OneDrive", - "OS": "Windows_NT", - "Path": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin", - "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC", - "path_position": "append", - "PLINK_PROTOCOL": "ssh", - "position": "append", - "print_debug": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" debug_output", - "print_error": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" show_error", - "print_verbose": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" verbose_output", - "PROCESSOR_ARCHITECTURE": "AMD64", - "PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 142 Stepping 12, GenuineIntel", - "PROCESSOR_LEVEL": "6", - "PROCESSOR_REVISION": "8e0c", - "ProgramData": "C:\\ProgramData", - "ProgramFiles": "C:\\Program Files", - "ProgramFiles(x86)": "C:\\Program Files (x86)", - "ProgramW6432": "C:\\Program Files", - "PROMPT": "C\bL\bI\bN\bK\b \b$P$G", - "PSModulePath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\Modules", - "PUBLIC": "C:\\Users\\Public", - "SESSIONNAME": "Console", - "SVN_SSH": "D:\\\\APP\\\\Git\\\\bin\\\\ssh.exe", - "SystemDrive": "C:", - "SystemRoot": "C:\\WINDOWS", - "TEMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp", - "TERM": "cygwin", - "time_init": "0", - "TMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp", - "USERDOMAIN": "DESKTOP-KD168PS", - "USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KD168PS", - "USERNAME": "lenovo", - "USERPROFILE": "C:\\Users\\lenovo", - "user_aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd", - "USER_BUILD": "windows.1", - "USER_MAJOR": "2", - "USER_MINOR": "31", - "USER_PATCH": "1", - "verbose_output": "0", - "VUE_APP_API_SERVER": "http://192.168.1.140/api", - "VUE_APP_NODE_ENV": "dev", - "VUE_APP_PUBLIC_PATH": "epmet-oper", - "VUE_CLI_ENTRY_FILES": "[\"D:\\\\Project\\\\Web\\\\epmet-oper-gov\\\\src\\\\main.js\"]", - "WEBPACK_DEV_SERVER": "true", - "windir": "C:\\WINDOWS", - "ZES_ENABLE_SYSMAN": "1", - "_prog": "node" - }, - "sharedObjects": [ - "D:\\APP\\nodejs\\node.exe", - "C:\\WINDOWS\\SYSTEM32\\ntdll.dll", - "C:\\WINDOWS\\System32\\KERNEL32.DLL", - "C:\\WINDOWS\\System32\\KERNELBASE.dll", - "C:\\WINDOWS\\System32\\PSAPI.DLL", - "C:\\WINDOWS\\System32\\WS2_32.dll", - "C:\\WINDOWS\\System32\\RPCRT4.dll", - "C:\\WINDOWS\\System32\\ADVAPI32.dll", - "C:\\WINDOWS\\System32\\msvcrt.dll", - "C:\\WINDOWS\\System32\\sechost.dll", - "C:\\WINDOWS\\System32\\USER32.dll", - "C:\\WINDOWS\\System32\\win32u.dll", - "C:\\WINDOWS\\System32\\GDI32.dll", - "C:\\WINDOWS\\SYSTEM32\\dbghelp.dll", - "C:\\WINDOWS\\System32\\gdi32full.dll", - "C:\\WINDOWS\\System32\\ucrtbase.dll", - "C:\\WINDOWS\\System32\\msvcp_win.dll", - "C:\\WINDOWS\\System32\\combase.dll", - "C:\\WINDOWS\\System32\\CRYPT32.dll", - "C:\\WINDOWS\\System32\\OLEAUT32.dll", - "C:\\WINDOWS\\SYSTEM32\\IPHLPAPI.DLL", - "C:\\WINDOWS\\SYSTEM32\\USERENV.dll", - "C:\\WINDOWS\\SYSTEM32\\bcrypt.dll", - "C:\\WINDOWS\\SYSTEM32\\WINMM.dll", - "C:\\WINDOWS\\System32\\IMM32.DLL", - "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\ConEmuHk64.dll", - "C:\\WINDOWS\\SYSTEM32\\powrprof.dll", - "C:\\WINDOWS\\SYSTEM32\\UMPDC.dll", - "C:\\WINDOWS\\system32\\uxtheme.dll", - "C:\\WINDOWS\\system32\\mswsock.dll", - "C:\\WINDOWS\\SYSTEM32\\kernel.appcore.dll", - "C:\\WINDOWS\\System32\\bcryptprimitives.dll", - "C:\\WINDOWS\\system32\\napinsp.dll", - "C:\\WINDOWS\\system32\\pnrpnsp.dll", - "C:\\WINDOWS\\SYSTEM32\\DNSAPI.dll", - "C:\\WINDOWS\\System32\\NSI.dll", - "C:\\WINDOWS\\System32\\winrnr.dll", - "C:\\WINDOWS\\system32\\wshbth.dll", - "C:\\WINDOWS\\system32\\nlansp_c.dll", - "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc6.DLL", - "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc.DLL", - "C:\\WINDOWS\\SYSTEM32\\CRYPTBASE.DLL", - "\\\\?\\D:\\Project\\Web\\epmet-oper-gov\\node_modules\\_node-sass@4.14.1@node-sass\\vendor\\win32-x64-67\\binding.node" - ] -} \ No newline at end of file From ec04087f312deadbc1e04b27f6dee44cce09f7ec Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Nov 2022 10:22:41 +0800 Subject: [PATCH 10/12] 11 --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index c716715a9..8a4a0be50 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -763,7 +763,7 @@ export default { getValiheList () { const { user } = this.$store.state this.$http - .post('/gov/org/icneighborhood/neighborhoodoption', { + .post('/gov/org/icneighborhood/neighborhood-options', { gridId: this.searchForm.gridId, agencyId: this.searchForm.agencyId // agencyId: user.agencyId From d6fbab3430de1f88df479ad2c4e742b8257352a8 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Nov 2022 11:01:19 +0800 Subject: [PATCH 11/12] 11 --- src/router/index.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index c17e618ce..eca051a0d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -176,10 +176,7 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - path: - CUSTOMER == "yantai" && process.env.VUE_APP_NODE_ENV == "prod" - ? "/main-shuju/i-1536625421829599234" - : "/main-shuju/visual-basicinfo-basicInfoMain", + path:"/main-shuju/visual-basicinfo-basicInfoMain", }, meta: { title: "主入口布局", From b3dc98b313e7fc70953b6914d79a5dab508dfc26 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Nov 2022 13:54:52 +0800 Subject: [PATCH 12/12] 111 --- .../base/epidemic/natFocus/nfVisiteList.vue | 4 ++-- .../travelPanshi/travelPanshiDetail.vue | 2 +- .../epidemic/travelPanshi/travelPanshiForm.vue | 6 +++--- .../base/epidemic/veroFocus/vfVisiteList.vue | 6 +++--- .../communityParty/regionalParty/activitys.vue | 5 +++-- .../communityParty/regionalParty/units.vue | 18 ++++++++++++++++-- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index a0dd6da8e..a95eec6df 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -149,10 +149,10 @@ export default { methods: { async initTable (row, origin) { - + console.log('row', row) this.formData.idCard = row.realIdCard this.formData.name = row.name - this.formData.mobile = row.mobile + this.formData.mobile = row.realMobile this.formData.origin = origin await this.loadTable() diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue index 0c936f2f9..de4e99a1d 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue @@ -46,7 +46,7 @@
- 来曹居住地点： + 在曹居住地点： {{ formData.presentAddress||'--' }}
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue index 36feb308b..a5372bbb5 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue @@ -152,7 +152,7 @@ - @@ -473,10 +473,10 @@ export default { ], presentAddress: [ - { required: true, message: '来曹居住地点不能为空', trigger: 'change' }, + { required: true, message: '在曹居住地点不能为空', trigger: 'change' }, ], detailAddress: [ - { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' }, + { required: true, message: '在曹居住详细地址不能为空', trigger: 'change' }, ], trafficType: [ diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue index fdef145e9..882deeffb 100644 --- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue +++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue @@ -151,10 +151,10 @@ export default { methods: { async initTable (row) { - - this.formData.idCard = row.idCard + console.log(row) + this.formData.idCard = row.realIdCard this.formData.name = row.name - this.formData.mobile = row.mobile + this.formData.mobile = row.realMobile await this.loadTable() diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index e9785bebb..2559274b9 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -193,13 +193,14 @@ style="color:#1C6AFD;text-decoration: underline;" size="small" @click="handleDetail(scope.row)">查看 - 修改 - 删除 diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index fa3cfb952..bc61e38c6 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -128,6 +128,12 @@ label="单位名称" min-width="100"> + + 查看 - 修改 - 更多 + 积分记录 +