From 23afdde69b762e0e6c6042a04bac1834a6c4ea68 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Tue, 24 Dec 2024 10:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx/nginx.conf | 3 --- nginx/nginx_prd.conf | 3 --- nginx/nginx_stg.conf | 3 --- src/components/showFile.vue | 4 ++-- src/components/uploadFile copy.vue | 2 +- src/components/uploadFile.vue | 2 +- src/components/uploadFileName.vue | 2 +- src/components/uploadImport.vue | 2 +- src/components/uploadImportPackage.vue | 2 +- .../components/templateManagement.vue | 4 ++-- .../components/editCaseDrawer.vue | 2 +- .../components/LayoutContent.vue | 2 +- .../components/LayoutContent.vue | 2 +- src/services/basicManage.js | 2 +- src/services/caseManagement.js | 2 +- src/services/fetchApi.js | 2 +- src/services/projectConfig.js | 2 +- src/services/statisticalAnalysisApi.js | 2 +- src/services/systemManage.js | 2 +- vue.config.js | 22 +++++++++---------- 20 files changed, 29 insertions(+), 38 deletions(-) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 1e472e0..45f0fe6 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -11,9 +11,6 @@ } # 开发环境 - location /manage-center { - proxy_pass http://221.236.31.182:8621/manage-center; - } location /mediate { proxy_pass http://221.236.31.182:8620/mediate; diff --git a/nginx/nginx_prd.conf b/nginx/nginx_prd.conf index 318fb73..dce571a 100644 --- a/nginx/nginx_prd.conf +++ b/nginx/nginx_prd.conf @@ -12,9 +12,6 @@ server { } # 生产环境 - location /manage-center { - proxy_pass http://221.236.31.182:8621/manage-center; - } location /mediate { proxy_pass http://221.236.31.182:8620/mediate; diff --git a/nginx/nginx_stg.conf b/nginx/nginx_stg.conf index a5b6591..9dde3a3 100644 --- a/nginx/nginx_stg.conf +++ b/nginx/nginx_stg.conf @@ -12,9 +12,6 @@ server { } # 测试环境 - location /manage-center { - proxy_pass http://221.236.31.183:8620/manage-center; - } location /mediate { proxy_pass http://221.236.31.183:8620/mediate; diff --git a/src/components/showFile.vue b/src/components/showFile.vue index 064b599..f31f9ac 100644 --- a/src/components/showFile.vue +++ b/src/components/showFile.vue @@ -8,8 +8,8 @@
- - + +
diff --git a/src/components/uploadFile copy.vue b/src/components/uploadFile copy.vue index 59c4611..7ad41f6 100644 --- a/src/components/uploadFile copy.vue +++ b/src/components/uploadFile copy.vue @@ -176,7 +176,7 @@ obj.iconFrontSrc = this.$util.getIcon(obj) // let previewUrl = `${projectConfig.fileHost}${obj.url}` - let previewUrl = `/manage-center/minio/preview/${obj.url}` + let previewUrl = `/mediate/minio/preview/${obj.url}` if(obj.url.includes('http')){ previewUrl = obj.url } diff --git a/src/components/uploadFile.vue b/src/components/uploadFile.vue index b8fd4c3..15b6f65 100644 --- a/src/components/uploadFile.vue +++ b/src/components/uploadFile.vue @@ -194,7 +194,7 @@ obj.iconFrontSrc = this.$util.getIcon(obj) // let previewUrl = `${projectConfig.fileHost}${obj.url}` - let previewUrl = `/manage-center/minio/preview/${obj.url}` + let previewUrl = `/mediate/minio/preview/${obj.url}` if(obj.url.includes('http')){ previewUrl = obj.url } diff --git a/src/components/uploadFileName.vue b/src/components/uploadFileName.vue index 7afda42..7f65b81 100644 --- a/src/components/uploadFileName.vue +++ b/src/components/uploadFileName.vue @@ -165,7 +165,7 @@ obj.iconFrontSrc = this.$util.getIcon(obj) // let previewUrl = `${projectConfig.fileHost}${obj.url}` - let previewUrl = `/manage-center/minio/preview/${obj.url}` + let previewUrl = `/mediate/minio/preview/${obj.url}` if(obj.url.includes('http')){ previewUrl = obj.url } diff --git a/src/components/uploadImport.vue b/src/components/uploadImport.vue index 5e4cbcc..0a99f13 100644 --- a/src/components/uploadImport.vue +++ b/src/components/uploadImport.vue @@ -163,7 +163,7 @@ obj.fileType = this.$util.getFileExtension(text) // 统一显示文件对应的图标(前端图片地址) obj.iconFrontSrc = this.$util.getIcon(obj) - let previewUrl = `/manage-center/minio/preview/${obj.url}` + let previewUrl = `/mediate/minio/preview/${obj.url}` if(obj.url.includes('http')){ previewUrl = obj.url } diff --git a/src/components/uploadImportPackage.vue b/src/components/uploadImportPackage.vue index ab418a1..ca3b912 100644 --- a/src/components/uploadImportPackage.vue +++ b/src/components/uploadImportPackage.vue @@ -163,7 +163,7 @@ obj.fileType = this.$util.getFileExtension(text) // 统一显示文件对应的图标(前端图片地址) obj.iconFrontSrc = this.$util.getIcon(obj) - let previewUrl = `/manage-center/minio/preview/${obj.url}` + let previewUrl = `/mediate/minio/preview/${obj.url}` if(obj.url.includes('http')){ previewUrl = obj.url } diff --git a/src/pages/basic-set/components/templateManagement.vue b/src/pages/basic-set/components/templateManagement.vue index e6c5bad..3b35f56 100644 --- a/src/pages/basic-set/components/templateManagement.vue +++ b/src/pages/basic-set/components/templateManagement.vue @@ -149,8 +149,8 @@ import basicApi from "@/services/basicManage"; if(!this.$clickThrottle()) { return }//防止重复点击 if(this.currentRow!=null) { - // this.handlePreview({previewUrl:"/manage-center/minio/preview/"+this.multipleSelection[0].content,url:this.multipleSelection[0].content}) - this.handlePreview({previewUrl:"/manage-center/minio/preview/"+this.currentRow.content,url:this.currentRow.content}) + // this.handlePreview({previewUrl:"/mediate/minio/preview/"+this.multipleSelection[0].content,url:this.multipleSelection[0].content}) + this.handlePreview({previewUrl:"/mediate/minio/preview/"+this.currentRow.content,url:this.currentRow.content}) } else { diff --git a/src/pages/mediation-management/components/editCaseDrawer.vue b/src/pages/mediation-management/components/editCaseDrawer.vue index 7764457..25fe7a8 100644 --- a/src/pages/mediation-management/components/editCaseDrawer.vue +++ b/src/pages/mediation-management/components/editCaseDrawer.vue @@ -348,7 +348,7 @@ import api from "@/services/caseManagement"; handleDownloadMediationTemplate(){ if(!this.$clickThrottle()) { return }//防止重复点击 if(this.fileListTemplate[0].url){ - this.handlePreview({previewUrl:"/manage-center/minio/preview/"+this.fileListTemplate[0].url,url:this.fileListTemplate[0].url}) + this.handlePreview({previewUrl:"/mediate/minio/preview/"+this.fileListTemplate[0].url,url:this.fileListTemplate[0].url}) } }, diff --git a/src/pages/mediation-page-old/components/LayoutContent.vue b/src/pages/mediation-page-old/components/LayoutContent.vue index 83f2bea..0b4e448 100644 --- a/src/pages/mediation-page-old/components/LayoutContent.vue +++ b/src/pages/mediation-page-old/components/LayoutContent.vue @@ -519,7 +519,7 @@ import api from "@/services/caseManagement"; if(!this.$clickThrottle()) { return }//防止重复点击 // console.log('调解模板url',templateUrl) if(this.templateUrl){ - this.handlePreview({previewUrl:"/manage-center/minio/preview/"+this.templateUrl,url:this.templateUrl}) + this.handlePreview({previewUrl:"/mediate/minio/preview/"+this.templateUrl,url:this.templateUrl}) }else{ this.$message({message: '当前案件未存在调解模板', type: "warning",customClass:'messageZindex'}) } diff --git a/src/pages/mediation-page/components/LayoutContent.vue b/src/pages/mediation-page/components/LayoutContent.vue index eefd4e4..08d8d62 100644 --- a/src/pages/mediation-page/components/LayoutContent.vue +++ b/src/pages/mediation-page/components/LayoutContent.vue @@ -579,7 +579,7 @@ import api from "@/services/caseManagement"; if(!this.$clickThrottle()) { return }//防止重复点击 // console.log('调解模板url',templateUrl) if(this.templateUrl){ - this.handlePreview({previewUrl:"/manage-center/minio/preview/"+this.templateUrl,url:this.templateUrl}) + this.handlePreview({previewUrl:"/mediate/minio/preview/"+this.templateUrl,url:this.templateUrl}) }else{ this.$message({message: '当前案件未存在调解模板', type: "warning",customClass:'messageZindex'}) } diff --git a/src/services/basicManage.js b/src/services/basicManage.js index e30c310..c401339 100644 --- a/src/services/basicManage.js +++ b/src/services/basicManage.js @@ -1,5 +1,5 @@ import service from "./index"; -const apiAdmin = '/manage-center/' +const apiAdmin = '/mediate/' const apiMediate = '/mediate/' const systemLogApi = { diff --git a/src/services/caseManagement.js b/src/services/caseManagement.js index 0c7c211..c5bafe9 100644 --- a/src/services/caseManagement.js +++ b/src/services/caseManagement.js @@ -1,5 +1,5 @@ import service from "./index"; -const apiAdmin = '/manage-center/' +const apiAdmin = '/mediate/' const apiMediate = '/mediate/' const caseManagementApi = { diff --git a/src/services/fetchApi.js b/src/services/fetchApi.js index 48bacab..4854173 100644 --- a/src/services/fetchApi.js +++ b/src/services/fetchApi.js @@ -1,5 +1,5 @@ import service from "./index"; -const apiAdmin = '/manage-center/' +const apiAdmin = '/mediate/' const apiMediate = '/mediate/' const fetchApi = { //========================start::登录相关====================================== diff --git a/src/services/projectConfig.js b/src/services/projectConfig.js index 70b4b15..db6aa45 100644 --- a/src/services/projectConfig.js +++ b/src/services/projectConfig.js @@ -10,7 +10,7 @@ const dev = { } const info = { - netHost: `${dev.hostUrl}/manage-center`, + netHost: `${dev.hostUrl}/mediate`, fileHost:`${dev.fileUrl}/notary/minio/preview/`, weChatRedirectUri: 'https://dev.trydotec.com:8430/', version: '1.0.0', diff --git a/src/services/statisticalAnalysisApi.js b/src/services/statisticalAnalysisApi.js index 918382a..b6b038b 100644 --- a/src/services/statisticalAnalysisApi.js +++ b/src/services/statisticalAnalysisApi.js @@ -1,5 +1,5 @@ import service from "./index"; -const apiAdmin = '/manage-center/' +const apiAdmin = '/mediate/' const apiMediate = '/mediate/' const statisticalAnalysisApi = { diff --git a/src/services/systemManage.js b/src/services/systemManage.js index 3e450d8..46d2a3c 100644 --- a/src/services/systemManage.js +++ b/src/services/systemManage.js @@ -1,5 +1,5 @@ import service from "./index"; -const apiAdmin = '/manage-center/' +const apiAdmin = '/mediate/' const systemLogApi = { diff --git a/vue.config.js b/vue.config.js index 2018385..9be69f4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,26 +46,26 @@ module.exports = { errors: true, }, proxy: { - "/manage-center": { - target: "http://mediate.dev.trydotec.com/", // 管理中心 - changeOrigin: true, - pathRewrite: { - "^/manage-center": "/", - }, - }, + // "/mediate": { + // target: "http://mediate.dev.trydotec.com/", // 管理中心 + // changeOrigin: true, + // pathRewrite: { + // "^/mediate": "/", + // }, + // }, "/mediate": { - target: "http://mediate.dev.trydotec.com/", // 调解 + target: "http://mediate.dev.trydotec.com", // 调解 changeOrigin: true, pathRewrite: { "^/mediate": "/", }, }, //测试 - // "/manage-center": { - // target: "http://221.236.31.183:8620/manage-center", // 管理中心 + // "/mediate": { + // target: "http://221.236.31.183:8620/mediate", // 管理中心 // changeOrigin: true, // pathRewrite: { - // "^/manage-center": "/", + // "^/mediate": "/", // }, // }, // "/mediate": {