diff --git a/config/index.js b/config/index.js index ff9a73de..0fdc9ddb 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api/**': { - target: 'http://192.168.5.25:9003', + target: 'http://192.168.5.32:9003', changeOrigin: true, secure: false, } diff --git a/config/prod.env.js b/config/prod.env.js index 5e7f74db..4c55351c 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,13 +1,14 @@ 'use strict' module.exports = { NODE_ENV: '"production"', + // OFFICE_WEB:'"https://office.tszcloud.com"' // API_HOST:'"https://api.tszcloud.com/api/"', - // API_WEB:'"https://tszcloud.com/"', + // OFFICE_WEB:'"https://office.tszcloud.com"' - API_HOST: '"https://bapi.tszcloud.com/api/"', - API_WEB: '"https://beta.tszcloud.com/"', - OFFICE_WEB: '"https://office.tszcloud.com"' - //API_HOST:'"http://192.168.5.25:9003/api/"', - // API_WEB:'"http://192.168.5.25:9099/"', + // API_HOST: '"https://bapi.tszcloud.com/api/"', + + + // OFFICE_WEB: '"https://office.tszcloud.com"' + API_HOST:'"http://192.168.5.25:9003/api/"', } diff --git a/src/views/login.vue b/src/views/login.vue index 41118314..bbee1e1a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -250,7 +250,7 @@ export default { checkPwdTip: "", //检测提示 phoneCode: "", //手机验证码 isRemember: false, //记住密码 - isClient: false //是否是客户端 + isClient: true //是否是客户端 }; }, beforeRouteLeave(to, from, next) { diff --git a/src/views/main_web/cloud.vue b/src/views/main_web/cloud.vue index 726f6ebb..f0a5920b 100644 --- a/src/views/main_web/cloud.vue +++ b/src/views/main_web/cloud.vue @@ -413,7 +413,7 @@ mapAddress:'北京天安门', showImage:false, imageUrl:'', - isClient:false, //是否是客户端 + isClient:true, //是否是客户端 //结束 // end }; @@ -935,15 +935,8 @@ this.officeTitle = file.objectName; if (file.extension == "pdf") { this.showOffice = true; - var fileUrl = - encodeURIComponent(process.env.API_HOST + "archives/pdf?path=") + - encodeURIComponent(file.alias) + - "&filename=" + - encodeURIComponent(file.objectName); - this.officeUrl = - process.env.API_WEB + - "static/pdfjs-2.2.228-dist/web/viewer.html?file=" + - fileUrl; + this.officeUrl = process.env.OFFICE_WEB + "?furl=" + file.alias; + this.$axios({ method: "delete", url: encodeURI( diff --git a/src/views/main_web/projnotice.vue b/src/views/main_web/projnotice.vue index c5c8363b..4deec1d4 100644 --- a/src/views/main_web/projnotice.vue +++ b/src/views/main_web/projnotice.vue @@ -85,7 +85,7 @@ showOffice: false, // 预览Office文件 officeUrl: "", // PDF URL isShowDefault:false, - isClient: false,//是否是客户端 + isClient: true,//是否是客户端 }; }, mounted: function () { @@ -184,15 +184,7 @@ this.officeTitle = file.archName + "." + file.extension; if (file.extension == "pdf") { this.showOffice = true; - var fileUrl = - encodeURIComponent(process.env.API_HOST + "archives/pdf?path=") + - encodeURIComponent(file.alias) + - "&filename=" + - encodeURIComponent(file.archName); - this.officeUrl = - process.env.API_WEB + - "static/pdfjs-2.2.228-dist/web/viewer.html?file=" + - fileUrl; + this.officeUrl = process.env.OFFICE_WEB + "?furl=" + file.alias; this.$axios({ method: "delete", url: encodeURI( @@ -213,17 +205,7 @@ file.extension == "txt" ) { this.showOffice = true; - var lastIndex = file.alias.lastIndexOf("."); - var namePdf = file.alias.substring(0, lastIndex) + ".pdf"; - var fileUrl = - encodeURIComponent(process.env.API_HOST + "archives/pdf?path=") + - encodeURIComponent(namePdf) + - "&filename=" + - encodeURIComponent(file.archName); - this.officeUrl = - process.env.API_WEB + - "static/pdfjs-2.2.228-dist/web/viewer.html?file=" + - fileUrl; + this.officeUrl = process.env.OFFICE_WEB + "?furl=" + file.alias; this.$axios({ method: "delete", url: encodeURI( diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index a75ed2da..e5970dc3 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2128,7 +2128,7 @@ export default { dialogNewSuperMapVisible: false, newSuperMap: { showName: "", description: "" }, mapAddress: "北京天安门", - isClient: false, // 是否是客户端 + isClient: true, // 是否是客户端 /**新建文件分组 start*/ dialogNewFolderGroup: false, //新建文件分组组弹窗