diff --git a/.env.development b/.env.development index b80dbeffcb64c8a0239c82714bf92426fcb66922..60ce4ccec9621b139e278b4aea8cf856212085ad 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ NODE_ENV = 'development' VUE_APP_BASE_API = 'mockServer' VUE_APP_BASE_API = 'http://192.168.31.140:11999/' +VUE_APP_UPLOAD_API = 'https://ds.cixincloud.com/geca-api/disease-data/file/info/' VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 90e9d299d8154adb87392c1376c996e5eb048ed4..d8bdcd44e424e9f3b50a73a61327087272a92784 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,4 @@ NODE_ENV = 'production' VUE_APP_BASE_API = '/geca-api/' +VUE_APP_UPLOAD_API = '/geca-api/disease-data/file/info/' diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index 987f9d9896e6caea9dd688c0fed8fa2487c48175..4dbe29e5c5d799f016910ae423826994c66188b3 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -99,6 +99,7 @@ export default { ? "/api" : process.env.VUE_APP_BASE_API, fileList: [], + uploadPrefix: process.env.VUE_APP_UPLOAD_API, } }, computed: { @@ -119,7 +120,7 @@ export default { return this.value.map((_) => { return ( _.url || - `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}` + this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}` ) }) }, @@ -132,7 +133,8 @@ export default { this.fileList = newValue.map((_) => { return { name: _.file_name, - url: `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`, + url: + this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}`, } }) }, @@ -204,7 +206,8 @@ export default { let responseUrl if (file.response) { const _ = file.response.data - responseUrl = `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}` + responseUrl = + this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}` } try { if (name.match(/\.(png|jpg|jpeg)/)) { diff --git a/src/components/UploadForOperation/index.vue b/src/components/UploadForOperation/index.vue index 24d2d99e7f5d4174be3d71f815a8b17703303014..56a2f6d7d26afe3da04d212a46d23d7a8ff74a47 100644 --- a/src/components/UploadForOperation/index.vue +++ b/src/components/UploadForOperation/index.vue @@ -124,6 +124,7 @@ export default { type: String, default: "primary", }, + value: { type: Array, default: () => [], @@ -133,6 +134,7 @@ export default { return { imgUrl: "", title: "", + uploadPrefix: process.env.VUE_APP_UPLOAD_API, httpPrefix: process.env.NODE_ENV === "development" ? "/api" @@ -154,10 +156,7 @@ export default { console.log(this.value) if (!this.value.length || this.accept != "image/*") return [] return this.value.map((_) => { - return ( - _.url || - `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}` - ) + return _.url || this.uploadPrefix + `${_.bucketName}/${_.uuidName}` }) }, }, @@ -168,7 +167,7 @@ export default { this.fileList = newValue.map((_) => { return { name: _.fileName, - url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`, + url: this.uploadPrefix + `${_.bucketName}/${_.uuidName}`, } }) }, @@ -235,7 +234,7 @@ export default { let responseUrl if (file.response) { const _ = file.response.data - responseUrl = `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}` + responseUrl = this.uploadPrefix + `${_.bucketName}/${_.uuidName}` } try { if (name.match(/\.(png|jpg|jpeg)/)) { diff --git a/src/views/Home/HealthPopularization/index.vue b/src/views/Home/HealthPopularization/index.vue index 427f01e9b43480b4c9638bf6a6fb27dad0900d0d..2f3b126be594382992eae240b07de57d5c96a3a8 100644 --- a/src/views/Home/HealthPopularization/index.vue +++ b/src/views/Home/HealthPopularization/index.vue @@ -19,7 +19,7 @@