From 7ac499e984421b13d46ae95d04dc6f8c75b6c442 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 9 Jun 2022 21:46:57 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production b/.env.production index 5b72f6d9d..fca313993 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper From 7b9cfdd72cc086909796ad3fe5d9b14fd487d423 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 22 Sep 2022 14:21:13 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=94=BF=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production b/.env.production index f0dd6e5e6..60f310f65 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api +VUE_APP_API_SERVER = http://10.2.2.50:80/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_CUSTOMER=yantai From 5483f6978750289397cf6401ae48ddb69a069f95 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Sep 2022 10:47:39 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=96=B0=E7=9A=84oss?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/heart/heartForm.vue | 2 +- .../visual/basicinfo/basicInfoMain-备份.vue | 8 ++++---- .../duoyuanfuwu/duoyuanfuwufenxi.vue | 2 +- .../communityGovern/fivelayers/mapIndex copy 2.vue | 8 ++++---- .../communityGovern/fivelayers/mapIndex copy.vue | 8 ++++---- .../communityGovern/fivelayers/mapIndex-baidu.vue | 8 ++++---- .../visual/communityGovern/fivelayers/mapIndex.vue | 8 ++++---- .../visual/communityGovern/processAnalyze.vue | 4 ++-- .../modules/visual/communityParty/community.vue | 2 +- .../modules/visual/communityParty/gridParty.vue | 2 +- .../modules/visual/components/screen-map/index.vue | 6 +++--- .../plugin/power/components/screen-org-map.vue | 14 +++++++------- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 8f3c9bfe5..4f8d55383 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -467,7 +467,7 @@ export default { replayImgList: [ // { // id: '1', - // url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' + // url: 'http://10.2.2.50/epmet-oss-01/20220923/92fd87ee255e40f698333a8399689803.png' // } ], hideUploadBtn: false diff --git a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue index c57aaef37..d87f52247 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue @@ -179,9 +179,9 @@ let yoffset = 0 //url图标 let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ]; let textColorArray = [ 'rgba(236, 69, 4, 0.66)', @@ -762,7 +762,7 @@ const vueGis = { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex] }) }); diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 813711594..9e01980cd 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -487,7 +487,7 @@ export default { // this.agencyInfo.level = 'agency' //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray const polygonIconArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', ] this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null) } else { diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue index 10d126fb1..a8354743f 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue @@ -421,9 +421,9 @@ let yoffset = 0 // let iconUrlArray = [ -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' +// 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', +// 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', +// 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' // ]; let iconUrlArray = [ require('../../../../../assets/img/shuju/measure/lxdj.png'), @@ -1605,7 +1605,7 @@ const vueGis = { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex], }) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue index 140fddfc7..b54ae3a02 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -419,9 +419,9 @@ let yoffset = 0 //url图标 let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ]; let textColorArray = [ 'rgba(236, 69, 4, 0.66)', @@ -1614,7 +1614,7 @@ const vueGis = { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex] }) }); diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue index 9d8245eb3..28bbf95aa 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue @@ -424,9 +424,9 @@ let yoffset = 0 // let iconUrlArray = [ -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', -// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' +// 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', +// 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', +// 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' // ]; let iconUrlArray = [ require('../../../../../assets/img/shuju/measure/lxdj.png'), @@ -1608,7 +1608,7 @@ const vueGis = { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex], }) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 117deb9af..830824f31 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -417,9 +417,9 @@ let yoffset = 0 //url图标 let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ]; let textColorArray = [ 'rgba(236, 69, 4, 0.66)', @@ -1613,7 +1613,7 @@ const vueGis = { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex] }) }); diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 469b98d5b..e666c7b35 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -386,8 +386,8 @@ export default { }); this.iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/0994757e8962405ca1cdf9792bf325e4.png',//未处理 - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/2a80f800b04442448c41a6ed4592cd95.png'//已处理 + 'http://10.2.2.50/epmet-oss-01/20220923/32f637c7610d406db71d93b70e3f7267.png',//未处理 + 'http://10.2.2.50/epmet-oss-01/20220923/cf8e580192ff467b84b809f10c1bfe29.png'//已处理 ] this.iconTextStyle = { diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 885906dba..acff5028d 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -886,7 +886,7 @@ export default { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray const polIconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png' ] console.log('this.unitTableData', this.unitTableData) this.$refs.cmap.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitTableData, this.iconUrlArray, null) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index ca77115b2..37b50a192 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -183,7 +183,7 @@ export default { loadMap () { if (this.isfirstInit) { const polIconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png' ] this.$refs.map.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitMapList, this.iconUrlArray, null,) } else { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index c8be1659f..a9b3a3fad 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -190,9 +190,9 @@ const vueGis = { //policon图标样式 polIconUrlArray: [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ], //icon图标样式 iconUrlArray: [], diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue index f7e9bb875..07c218820 100644 --- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue +++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue @@ -51,9 +51,9 @@ let iconLayer; // icon标注图层 var centerPointGlobal = [120.38945519, 36.0722275] const iconArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ] const textColorArray = [ 'rgba(236, 69, 4, 0.66)', @@ -66,9 +66,9 @@ let polygonColorArray = [ 'rgba(183, 185, 0, 0.16)' ]; let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ]; //变电站标注的文字样式 var createTextStyle = function (feature) { @@ -529,7 +529,7 @@ export default { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex] }) }); From cd6d6cdfe1449084f11c99d57fbe0492384da9bc Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 15:51:09 +0800 Subject: [PATCH 04/18] =?UTF-8?q?put=20delete=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9B=B4=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/utils/request.js b/src/utils/request.js index 7de9ad4cb..437ee7245 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -71,4 +71,23 @@ http.interceptors.response.use(response => { return Promise.reject(error) }) + +http.put = function (url, data, config) { + http.post(url, data, { + ...config, + headers: { + "X-HTTP-Method-Override": "PUT", + }, + }); +}; + +http.delete = function (url, config) { + http.post(url, config.data || {}, { + ...config, + headers: { + "X-HTTP-Method-Override": "DELETE", + }, + }); +}; + export default http From f3d8c34181f52434f8b8782cb5a9bf0bacb58664 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 16:46:32 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E7=BB=A7=E7=BB=ADput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 437ee7245..d6e6884cd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,7 @@ http.interceptors.response.use(response => { http.put = function (url, data, config) { - http.post(url, data, { + return http.post(url, data, { ...config, headers: { "X-HTTP-Method-Override": "PUT", @@ -82,7 +82,7 @@ http.put = function (url, data, config) { }; http.delete = function (url, config) { - http.post(url, config.data || {}, { + return http.post(url, config.data || {}, { ...config, headers: { "X-HTTP-Method-Override": "DELETE", From 4ac50288165a5f2720659deafd5901ac11a05977 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 28 Sep 2022 17:38:30 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index d6e6884cd..b5a080173 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -83,7 +83,7 @@ http.put = function (url, data, config) { http.delete = function (url, config) { return http.post(url, config.data || {}, { - ...config, + // ...config, headers: { "X-HTTP-Method-Override": "DELETE", }, From 2f1e292961dc60011c1210a1cb18c91660021fd1 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 17 Oct 2022 17:44:49 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E4=B8=AD=E8=A3=85=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 6 +- src/js/dai/request2.js | 6 +- src/router/index.js | 10 +++ src/utils/request.js | 2 +- src/views/main-navbar.vue | 2 +- src/views/main-shuju/main-navbar.vue | 2 +- src/views/pages/yantai-login-transit.vue | 83 ++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 9 deletions(-) create mode 100644 src/views/pages/yantai-login-transit.vue diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 709895d60..0c30fbde3 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - return next({ - name: "login", - }); + // return next({ + // name: "login", + // }); } reslove(retData); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 709895d60..0c30fbde3 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - return next({ - name: "login", - }); + // return next({ + // name: "login", + // }); } reslove(retData); diff --git a/src/router/index.js b/src/router/index.js index 9ba8abf56..36180a6d1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,6 +37,16 @@ export const pageRoutes = [ title: "登录", }, }, + { + path: "/login-transit", + component: () => { + return import("@/views/pages/yantai-login-transit"); + }, + name: "login-transit", + meta: { + title: "登录", + }, + }, { path: "/", name: "index", diff --git a/src/utils/request.js b/src/utils/request.js index 7de9ad4cb..33e675326 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -61,7 +61,7 @@ http.interceptors.response.use(response => { // }else { // router.replace({ name: 'login' }) // } - router.replace({ name: 'login' }) + // router.replace({ name: 'login' }) return Promise.reject(response.data.msg) } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index abcd89837..3154b5f74 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -228,7 +228,7 @@ export default { } clearLoginInfo(); - this.$router.push({ name: "login" }); + // this.$router.push({ name: "login" }); // if (localStorage.getItem('userType') === 'work') { // this.$router.push({ name: 'loginWork' }) // } else { diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 94e303e02..1603758b4 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -244,7 +244,7 @@ export default { clearLoginInfo(); - this.$router.push({ name: "login" }); + // this.$router.push({ name: "login" }); }) .catch(() => {}); }) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue new file mode 100644 index 000000000..9e55f4b32 --- /dev/null +++ b/src/views/pages/yantai-login-transit.vue @@ -0,0 +1,83 @@ + + + + + + + From 00ac8250f1da65d24283e9c790385f75fc550e8e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 18 Oct 2022 17:22:37 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 6 ++-- src/js/dai/request2.js | 6 ++-- src/router/index.js | 8 +++--- src/utils/request.js | 9 +----- src/views/main-navbar.vue | 13 +++------ src/views/main-shuju/main-navbar.vue | 2 +- src/views/pages/yantai-login-transit.vue | 35 ++++++++++++++++++++---- 7 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 0c30fbde3..709895d60 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - // return next({ - // name: "login", - // }); + return next({ + name: "login", + }); } reslove(retData); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 0c30fbde3..709895d60 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - // return next({ - // name: "login", - // }); + return next({ + name: "login", + }); } reslove(retData); diff --git a/src/router/index.js b/src/router/index.js index 36180a6d1..d047bac98 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,23 +26,23 @@ export const pageRoutes = [ }, }, { - path: "/login", + path: "/login-local", component: () => { return CUSTOMER == "yantai" ? import("@/views/pages/yantai-login") : import("@/views/pages/login"); }, - name: "login", + name: "login-local", meta: { title: "登录", }, }, { - path: "/login-transit", + path: "/login", component: () => { return import("@/views/pages/yantai-login-transit"); }, - name: "login-transit", + name: "login", meta: { title: "登录", }, diff --git a/src/utils/request.js b/src/utils/request.js index 33e675326..8411fb0bc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,14 +54,7 @@ http.interceptors.response.use(response => { const code = [10007, 401, 10001, 10005] if (code.includes(response.data.code)) { clearLoginInfo() - // localStorage.setItem('userType', 'work') - // let userType = localStorage.getItem("userType"); - // if (userType === 'work'){ - // router.replace({ name: 'loginWork' }) - // }else { - // router.replace({ name: 'login' }) - // } - // router.replace({ name: 'login' }) + router.replace({ name: 'login' }) return Promise.reject(response.data.msg) } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 3154b5f74..a870a077e 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,10 +8,10 @@

{{ - $store.state.user.agencyName + $store.state.user.agencyName }} {{ - $store.state.user.agencyName .slice(0, 2) + $store.state.user.agencyName.slice(0, 2) }}

@@ -48,7 +48,7 @@ {}); }) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 1603758b4..94e303e02 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -244,7 +244,7 @@ export default { clearLoginInfo(); - // this.$router.push({ name: "login" }); + this.$router.push({ name: "login" }); }) .catch(() => {}); }) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index 9e55f4b32..7b37d0b0c 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -17,10 +17,12 @@ export default { status: "ing", }; }, + components: {}, computed: {}, + async mounted() { - let ticket = getQueryPara("ticket"); + let code = getQueryPara("code"); const loading = this.$loading({ lock: true, text: "登录中……", @@ -28,24 +30,45 @@ export default { customClass: "u-loading-yantai-login-transit", background: "rgba(255, 255, 255, 0.7)", }); - await this.login(ticket); - loading.close(); + if (code) { + await this.login(code); + loading.close(); + } else { + await this.skip(code); + } }, methods: { //根据社区id获取小区列表 - async login(ticket) { + async skip() { + const url = "/gov222"; + + let params = {}; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + location.href = data.url; + } else { + console.log("获取跳转页面失败", msg); + } + }, + + //根据社区id获取小区列表 + async login(client_code) { const url = "/gov222"; let params = { - ticket, + client_code, }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.status = "success"; - this.$router.replace("/"); + + localStorage.setItem("token", data.token); + this.$router.replace({ name: "index" }); } else { this.status = "failed"; } From 56c908deff699cec3dde9c4b1ac46f6fb6c2f3f9 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 19 Oct 2022 15:05:34 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E7=9B=B2=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/yantai-login-transit.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index 7b37d0b0c..d884e0367 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -34,7 +34,10 @@ export default { await this.login(code); loading.close(); } else { - await this.skip(code); + // await this.skip(code); + location.href = + "http://172.20.46.155:8080/sso/login?client_id=1000006&redirect_url=" + + encodeURIComponent(location.href); } }, @@ -56,11 +59,9 @@ export default { //根据社区id获取小区列表 async login(client_code) { - const url = "/gov222"; + const url = "/auth/sso-govlogin-yantai/" + client_code; - let params = { - client_code, - }; + let params = {}; const { data, code, msg } = await requestPost(url, params); From d319c676580c2911ef2bbccec7a50de257bee72e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 09:15:26 +0800 Subject: [PATCH 10/18] 1 --- src/views/pages/yantai-login-transit.vue | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index d884e0367..7dff55273 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -23,6 +23,7 @@ export default { async mounted() { let code = getQueryPara("code"); + console.log("------------------code", code); const loading = this.$loading({ lock: true, text: "登录中……", @@ -34,29 +35,13 @@ export default { await this.login(code); loading.close(); } else { - // await this.skip(code); - location.href = - "http://172.20.46.155:8080/sso/login?client_id=1000006&redirect_url=" + - encodeURIComponent(location.href); + // location.href = + // "http://172.20.46.155:8080/sso/login?client_id=1000006&redirect_url=" + + // encodeURIComponent(location.href); } }, methods: { - //根据社区id获取小区列表 - async skip() { - const url = "/gov222"; - - let params = {}; - - const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - location.href = data.url; - } else { - console.log("获取跳转页面失败", msg); - } - }, - //根据社区id获取小区列表 async login(client_code) { const url = "/auth/sso-govlogin-yantai/" + client_code; From 59985cf7f26198a2213ba16d45bb9f9d2cd7578e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 09:19:13 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/yantai-login-transit.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index d884e0367..41e6f00a5 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -23,6 +23,7 @@ export default { async mounted() { let code = getQueryPara("code"); + alert(code+"location.href;"+location.href); const loading = this.$loading({ lock: true, text: "登录中……", @@ -35,9 +36,11 @@ export default { loading.close(); } else { // await this.skip(code); - location.href = - "http://172.20.46.155:8080/sso/login?client_id=1000006&redirect_url=" + - encodeURIComponent(location.href); + let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; + //let uriComponent = "https://172.20.46.177:65221/#/"; + let redirect_url = encodeURIComponent(uriComponent); + let url = "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url="+redirect_url; + window.open(url,'_self'); } }, From b62149cfacd6736142f2ed8b8a207ea404b6a330 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 09:32:48 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=BC=BA=E8=A1=8C=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=96=9C=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 12 +++++++++++- src/views/pages/yantai-login-transit.vue | 25 +++++------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index d047bac98..048b4ceb6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -38,7 +38,7 @@ export const pageRoutes = [ }, }, { - path: "/login", + path: "/login/", component: () => { return import("@/views/pages/yantai-login-transit"); }, @@ -47,6 +47,16 @@ export const pageRoutes = [ title: "登录", }, }, + { + path: "/login", + component: () => { + return import("@/views/pages/yantai-login-transit"); + }, + name: "login2", + meta: { + title: "登录", + }, + }, { path: "/", name: "index", diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index 41e6f00a5..fa04f4a72 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -23,7 +23,7 @@ export default { async mounted() { let code = getQueryPara("code"); - alert(code+"location.href;"+location.href); + console.log("--------------code" + code); const loading = this.$loading({ lock: true, text: "登录中……", @@ -35,31 +35,16 @@ export default { await this.login(code); loading.close(); } else { - // await this.skip(code); let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; - //let uriComponent = "https://172.20.46.177:65221/#/"; let redirect_url = encodeURIComponent(uriComponent); - let url = "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url="+redirect_url; - window.open(url,'_self'); + let url = + "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url=" + + redirect_url; + // window.open(url, "_self"); } }, methods: { - //根据社区id获取小区列表 - async skip() { - const url = "/gov222"; - - let params = {}; - - const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - location.href = data.url; - } else { - console.log("获取跳转页面失败", msg); - } - }, - //根据社区id获取小区列表 async login(client_code) { const url = "/auth/sso-govlogin-yantai/" + client_code; From f81be39a41c0a94e4e3d591435ed6536bbc2fe26 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 09:33:25 +0800 Subject: [PATCH 13/18] 2 --- src/views/pages/yantai-login-transit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index fa04f4a72..fa49f33c6 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -40,7 +40,7 @@ export default { let url = "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url=" + redirect_url; - // window.open(url, "_self"); + window.open(url, "_self"); } }, From 84e69ac781a4679381458f595a628452fb393fe4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 13:40:41 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 048b4ceb6..ec3552213 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,13 +49,13 @@ export const pageRoutes = [ }, { path: "/login", - component: () => { - return import("@/views/pages/yantai-login-transit"); - }, name: "login2", meta: { title: "登录", }, + redirect: { + name: "login", + }, }, { path: "/", From 728bacbf4470d5bbfb462082fa6c456403e10f17 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 15:50:31 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=8E=A8=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/yantai-transit.js | 17 +++++++++++ src/views/main-navbar.vue | 21 +++++++++----- src/views/main-shuju/main-navbar.vue | 37 +++++++++++++++--------- src/views/pages/yantai-login-transit.vue | 8 ++--- 4 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 src/utils/yantai-transit.js diff --git a/src/utils/yantai-transit.js b/src/utils/yantai-transit.js new file mode 100644 index 000000000..22af0a45b --- /dev/null +++ b/src/utils/yantai-transit.js @@ -0,0 +1,17 @@ +export function logout() { + let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; + let redirect_url = encodeURIComponent(uriComponent); + let url = + "http://172.20.46.155:8080/sso/logout?client_id=1000009&redirect_url=" + + redirect_url; + window.open(url, "_self"); +} + +export function toLoginPage() { + let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; + let redirect_url = encodeURIComponent(uriComponent); + let url = + "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url=" + + redirect_url; + window.open(url, "_self"); +} diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index a870a077e..b68506cd1 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -11,7 +11,9 @@ $store.state.user.agencyName }} {{ - $store.state.user.agencyName.slice(0, 2) + $store.state.user.agencyName + ? $store.state.user.agencyName.slice(0, 2) + : "" }} @@ -127,6 +129,8 @@ import { mapGetters } from "vuex"; import screenfull from "screenfull"; import UpdatePasswordWork from "./main-navbar-update-password-work"; import { clearLoginInfo } from "@/utils"; +import { logout } from "@/utils/yantai-transit"; + export default { inject: ["refresh"], data() { @@ -211,12 +215,6 @@ export default { } ) .then(() => { - //关闭所有标签页 - // tabs, 关闭全部 - this.$store.state.contentTabs = this.$store.state.contentTabs.filter( - (item) => item.name === "home" - ); - this.$http .post("/auth/login/logout") .then(({ data: res }) => { @@ -228,7 +226,14 @@ export default { } clearLoginInfo(); - this.$router.push({ name: "login" }); + logout(); + + //关闭所有标签页 + this.$store.state.contentTabs = + this.$store.state.contentTabs.filter( + (item) => item.name === "home" + ); + // this.$router.push({ name: "login" }); }) .catch(() => {}); }) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 94e303e02..b94a3efca 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -3,9 +3,13 @@