周兴 пре 3 година
родитељ
комит
65a5491d53

+ 1 - 0
.env.dev

@@ -2,6 +2,7 @@ NODE_ENV = 'development'
 VUE_APP_BUILD_TYPE='dev'
 VUE_APP_SERVER_URL='http://localhost:6001'
 VUE_APP_UPLOAD_URL='http://localhost:6001/basic-server/file/upload'
+VUE_APP_EXPORT_URL='http://localhost:5000/'
 VUE_APP_LOGS_URL='https://ibossmp.dongkesoft.com:7050/logs'
 VUE_APP_IMG_URL='https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/'
 VUE_APP_HG_IMG_URL='https://haip-dev.oss-cn-shenzhen.aliyuncs.com/'

+ 1 - 0
.env.pro

@@ -1,6 +1,7 @@
 NODE_ENV='production'
 VUE_APP_BUILD_TYPE='pro'
 VUE_APP_SERVER_URL='https://scrm.hegii.com/api'
+VUE_APP_EXPORT_URL='http://s.dev01.dkiboss.com:5000/'
 VUE_APP_UPLOAD_URL='https://scrm.hegii.com/api/basic-server/file/upload'
 VUE_APP_LOGS_URL='https://scrm.hegii.com/logs'
 VUE_APP_IMG_URL='https://scrmoss.hegii.com/'

+ 1 - 0
.env.test

@@ -1,6 +1,7 @@
 NODE_ENV='production'
 VUE_APP_BUILD_TYPE='test'
 VUE_APP_SERVER_URL='http://s.dev01.dkiboss.com:6010/api'
+VUE_APP_EXPORT_URL='http://s.dev01.dkiboss.com:5000/'
 VUE_APP_UPLOAD_URL='http://s.dev01.dkiboss.com:6010/api/basic-server/file/upload'
 VUE_APP_LOGS_URL='https://ibossmp.dongkesoft.com:7050/logs'
 VUE_APP_IMG_URL='https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/'

+ 1 - 1
src/components/base/dk-table/dk-table-column.vue

@@ -228,7 +228,7 @@
       <!--如果整列不是disabled,那么就可以按照行的disabled来处理-->
       <vxe-switch size="mini" v-model="row[field]" @change="handleSwitchChange(Object.assign(row,{checked:$event}))"
                   @click.stop="()=>{}" :disabled="switchDisabled?true:(row['disabled']?true:false)" :open-value="true"
-                  :close-value="false"></vxe-switch>
+                  :close-value="false" ></vxe-switch>
     </template>
   </vxe-column>
 </template>

+ 2 - 1
src/components/base/dk-table/dk-table.vue

@@ -1211,7 +1211,8 @@ export default {
             this.excute(this.$service.exportService, this.$service.exportService.export, params).then(res => {
               if (res.code === this.$config.SUCCESS_CODE) {
                 if (res.data) {
-                  window.location.href = 'http://192.168.0.57:5000/' + res.data
+                  console.log('rre',this.$config.exportUrl)
+                  window.location.href = this.$config.exportUrl + res.data
                 }
               }
               this.handleExportAll(false); // 还原

+ 1 - 0
src/libs/base/api.request.js

@@ -10,6 +10,7 @@ let baseUrl = '';
   // config.imgUrl =process.env.VUE_APP_IMG_URL;
   // config.hgImgUrl = process.env.VUE_APP_HG_IMG_URL;
   config.uploadUrl = process.env.VUE_APP_UPLOAD_URL;
+  config.exportUrl = process.env.VUE_APP_EXPORT_URL;
   config.logsUrl = process.env.VUE_APP_LOGS_URL;
   config.websockUrl = process.env.VUE_APP_WEBSOCKET_URL;
   config.LOGIN_PAGE_NAME=JSON.parse(process.env.VUE_APP_LOGIN_PAGE_NAME);