Merge branch '3.3.1-dspf' into 3.3.2-dzxxp

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue

@@ -175,7 +175,7 @@ export default {
       // table操作按钮校验
       tableButtonType:this.hasPermiDom(['laboratory:hardware6:edit','laboratory:hardware6:remove']),
       //上传相关配置
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/hardware/importData", // 上传地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/hardware/importData", // 上传地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/mine/index.vue

@@ -303,8 +303,8 @@ export default {
     };
     return{
       buttonType:'1',
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
-      uploadImgUrlTwo: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
+      uploadImgUrlTwo: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/file/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/secureAccess/approval/infoPage.vue

@@ -172,7 +172,7 @@ export default {
   },
   methods: {
     lookFile(item){
-      let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item.url;
+      let visitUrl=window.location.href.split('://')[0]+'://'+ this.judgmentNetworkReturnAddress() +'/admin/'+item.url;
       console.log(visitUrl)
       window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
 

src/views/system/apkfileList/index.vue

@@ -313,7 +313,7 @@ import {
       },
       handleClick(index,row,doType){
         if(doType=='download'){
-          window.open(window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + row.apkFileUpload)
+          window.open(window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + row.apkFileUpload)
         }else if(doType=='edit'){
           this.upForm.id=row.id
           this.upForm.versionName=row.versionName