diff --git a/.env.development b/.env.development index 0fde813fa..addbaad81 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VUE_APP_API_SERVER = http://219.146.91.110:30801/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = /linkdata/linkdata-gateway/route - +VUE_APP_SOCKET_SERVER = ws://219.146.91.110:30801/api # VUE_APP_NODE_ENV=dev_sdtdt VUE_APP_NODE_ENV=dev #项目根路径 diff --git a/.env.preview b/.env.preview index 992725a2f..09fde55e4 100644 --- a/.env.preview +++ b/.env.preview @@ -1,6 +1,7 @@ NODE_ENV=production # VUE_APP_API_SERVER = http://120.27.18.76/api VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api +VUE_APP_SOCKET_SERVER = ws://epmet-preview.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=preview VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/.env.test b/.env.test index 2bb94e86a..c757167b5 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,6 @@ NODE_ENV=test VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_SOCKET_SERVER = ws://epmet-test.elinkservice.cn/api VUE_APP_NODE_ENV=test VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index ac1472824..d5b843df4 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -166,9 +166,9 @@ export default { options.gridKey = this.currentId; options.allowUpdate = true; options.container = 'luckysheet' - options.loadUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}` - options.updateUrl = `ws://219.146.91.110:30801/api/actual/base/ws/luckysheet/${this.currentId}/${id}` - options.loadSheetUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/loadSheets` + options.loadUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}` + options.updateUrl = `${process.env.VUE_APP_SOCKET_SERVER}/actual/base/ws/luckysheet/${this.currentId}/${id}` + options.loadSheetUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/loadSheets` window.luckysheet.create({ ...options, hook: { diff --git a/src/views/modules/base/smartExcel/filling.vue b/src/views/modules/base/smartExcel/filling.vue index 212b7b1d0..567b8c986 100644 --- a/src/views/modules/base/smartExcel/filling.vue +++ b/src/views/modules/base/smartExcel/filling.vue @@ -36,7 +36,7 @@ -