dedsudiyu 2 年之前
父节点
当前提交
1d1355bfee
共有 69 个文件被更改,包括 219 次插入100 次删除
  1. 7 2
      .env.production
  2. 1 1
      src/components/UEditor/index.vue
  3. 2 1
      src/main.js
  4. 1 1
      src/router/index.js
  5. 2 2
      src/utils/bigDataRequest.js
  6. 2 3
      src/utils/request.js
  7. 60 2
      src/utils/ruoyi.js
  8. 2 1
      src/utils/zipdownload.js
  9. 1 1
      src/views/codeHtml.vue
  10. 1 1
      src/views/comprehensive/laboratoryManagement/subject/index.vue
  11. 2 2
      src/views/comprehensive/personnel/student/index.vue
  12. 1 1
      src/views/comprehensive/personnel/teacher/index.vue
  13. 1 1
      src/views/comprehensive/personnel/teacher/indexOne.vue
  14. 1 1
      src/views/comprehensive/system/publicConfig/indexOne.vue
  15. 1 1
      src/views/comprehensive/system/user/index.vue
  16. 55 0
      src/views/demo.vue
  17. 1 1
      src/views/gasManage3_0/manage/infoRecord/abnormalRecordDetail.vue
  18. 1 1
      src/views/gasManage3_0/manage/infoRecord/detailsPage.vue
  19. 1 1
      src/views/gasManage3_0/manage/infoRecord/enterRecordDetail.vue
  20. 1 1
      src/views/gasManage3_0/manage/infoRecord/useRecordDetail.vue
  21. 1 1
      src/views/gasManage3_0/manage/qualificationApply/qualificationApplyDetail.vue
  22. 1 1
      src/views/gasManage3_0/manage/qualificationManage/qualificationManageCheck.vue
  23. 1 1
      src/views/gasManage3_0/manage/qualificationManage/qualificationManageDetail.vue
  24. 1 1
      src/views/gasManage3_0/manage/useGas/useGasDetail.vue
  25. 1 1
      src/views/gasManage3_0/manage/useGasManage/useGasManageCheck.vue
  26. 1 1
      src/views/gasManage3_0/manage/useGasManage/useGasManageDetail.vue
  27. 1 1
      src/views/gasManage3_0/student/qualificationApply/qualificationApplyDetail.vue
  28. 1 1
      src/views/gasManage3_0/student/useGas/useGasDetail.vue
  29. 1 1
      src/views/gasManage_syd/manage/infoRecord/abnormalRecordDetail.vue
  30. 1 1
      src/views/gasManage_syd/manage/infoRecord/enterRecordDetail.vue
  31. 1 1
      src/views/gasManage_syd/manage/infoRecord/useRecordDetail.vue
  32. 2 2
      src/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail.vue
  33. 1 1
      src/views/gasManage_syd/student/useGas/useGasDetail.vue
  34. 1 1
      src/views/gasManage_syd/student/useRecord/useRecordDetail.vue
  35. 1 1
      src/views/hazardManagement/hazard/addLaboratory.vue
  36. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue
  37. 3 3
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue
  38. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage.vue
  39. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue
  40. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue
  41. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/IntelligentTerminal/index.vue
  42. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue
  43. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/rfidIdentifier/index.vue
  44. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue
  45. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue
  46. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue
  47. 5 5
      src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue
  48. 1 1
      src/views/mine/index.vue
  49. 2 2
      src/views/mine/indexOne.vue
  50. 1 1
      src/views/newEvacuationBigData.vue
  51. 1 1
      src/views/newEvacuationBigDataHome.vue
  52. 1 1
      src/views/safetyEducationExam/safeLearning/el_course/coursePreview.vue
  53. 1 1
      src/views/safetyEducationExam/safeLearning/el_course/edit.vue
  54. 5 5
      src/views/safetyEducationExam/safeLearning/el_resources/index.vue
  55. 1 1
      src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue
  56. 1 1
      src/views/safetyEducationExam/safeLearning/safe_book/index.vue
  57. 1 1
      src/views/secureAccess/approval/infoPage.vue
  58. 1 1
      src/views/secureAccess/approval_handle/addPage.vue
  59. 3 3
      src/views/secureAccess/approval_handle/infoPage.vue
  60. 1 1
      src/views/securityCheck/checkOption/index.vue
  61. 1 1
      src/views/securityCheck/checkRecord/CheckRecordInfo.vue
  62. 1 1
      src/views/securityCheck/checkRecord/addCheck.vue
  63. 2 2
      src/views/securityCheck/checkRecord/unsubmittedInfo.vue
  64. 2 2
      src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue
  65. 5 5
      src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue
  66. 3 3
      src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue
  67. 1 1
      src/views/studentViews/studentMine/index.vue
  68. 2 2
      src/views/system/apkfile/index.vue
  69. 1 1
      src/views/system/user/profile/index.vue

+ 7 - 2
.env.production

@@ -4,13 +4,18 @@ VUE_APP_TITLE = 实验室安全管理系统
 # 生产环境配置
 ENV = 'production'
 
-# ####################接口配置####################
+# ####################外网接口配置####################
 
 # 实验室安全管理系统/生产环境
 # VUE_APP_BASE_API = '192.168.2.3/labSystem'
 
 # 实验室安全管理系统/生产环境
 #VUE_APP_BASE_API = '10.20.10.7/labSystem'
-VUE_APP_BASE_API = '192.168.1.43/labSystem'
+VUE_APP_BASE_API = '180.76.134.43:30002'
 #VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # VUE_APP_BASE_API = 'lab.sxitdlc.com/sudalabSystem'
+
+
+# ####################内网接口配置####################
+
+VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem'

+ 1 - 1
src/components/UEditor/index.vue

@@ -28,7 +28,7 @@
           // 上传文件接口(这个地址是我为了方便各位体验文件上传功能搭建的临时接口,请勿在生产环境使用!!!)
           // serverUrl: '//ueditor.szcloudplus.com/cos',
           // serverUrl: '//192.168.1.8:9300/exec',
-          serverUrl: '//'+process.env.VUE_APP_BASE_API+'/base/exec',
+          serverUrl: '//'+this.judgmentNetworkReturnAddress()+'/base/exec',
           // UEditor 资源文件的存放路径,如果你使用的是 vue-cli 生成的项目,通常不需要设置该选项,vue-ueditor-wrap 会自动处理常见的情况,如果需要特殊配置,参考下方的常见问题2
           UEDITOR_HOME_URL: './UEditor/'
         },

+ 2 - 1
src/main.js

@@ -13,7 +13,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' //directive
 import { download } from '@/utils/request'
-import { uploadUrl } from '@/utils/ruoyi'
+import { uploadUrl,judgmentNetworkReturnAddress } from '@/utils/ruoyi'
 import hasPermiDom from './directive/permission/hasPermiDom'
 
 import './assets/icons' // icon
@@ -65,6 +65,7 @@ Vue.prototype.spaceJudgment = spaceJudgment
 Vue.prototype.spaceJudgmentHTML = spaceJudgmentHTML
 Vue.prototype.isNum = isNum
 Vue.prototype.urlJudge = urlJudge
+Vue.prototype.judgmentNetworkReturnAddress = judgmentNetworkReturnAddress
 
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success", offset:100 });

+ 1 - 1
src/router/index.js

@@ -51,7 +51,7 @@ export const constantRoutes = [
       */
       {
         path: '/demo',
-        component: (resolve) => require(['@/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage'], resolve),
+        component: (resolve) => require(['@/views/demo'], resolve),
       },
     ]
   },

+ 2 - 2
src/utils/bigDataRequest.js

@@ -4,7 +4,7 @@ import router from '@/router'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams } from "@/utils/ruoyi";
+import { tansParams,judgmentNetworkReturnAddress } from "@/utils/ruoyi";
 
 //判定http或者https
 let urlText = window.location.href.split('://')[0]+'://';
@@ -24,7 +24,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: urlText+process.env.VUE_APP_BASE_API,
+  baseURL: urlText+judgmentNetworkReturnAddress(),
   // 超时
   timeout: 10000
 })

+ 2 - 3
src/utils/request.js

@@ -4,12 +4,11 @@ import router from '@/router'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams } from "@/utils/ruoyi";
+import { tansParams,judgmentNetworkReturnAddress } from "@/utils/ruoyi";
 
 //判定http或者https
 let urlText = window.location.href.split('://')[0]+'://';
 
-
 //分锅器
 let potType = false;
 
@@ -28,7 +27,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: urlText+process.env.VUE_APP_BASE_API,
+  baseURL: urlText+judgmentNetworkReturnAddress(),
   // 超时
   timeout: 10000
 })

+ 60 - 2
src/utils/ruoyi.js

@@ -3,7 +3,65 @@
  * Copyright (c) 2019 ruoyi
  */
 
-const baseURL = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API
+// 判断当前用户网络 外网/内网 返回接口地址
+
+
+
+export function judgmentNetworkReturnAddress() {
+  /*判断是否是内网IP*/
+    // 获取当前页面url
+    var curPageUrl = window.location.href;
+    // console.log('curPageUrl-0  '+curPageUrl);
+
+    var reg1 = /(http|ftp|https|www):\/\//g;//去掉前缀
+    curPageUrl =curPageUrl.replace(reg1,'');
+    // console.log('curPageUrl-1  '+curPageUrl);
+
+    var reg2 = /\:+/g;//替换冒号为一点
+    curPageUrl =curPageUrl.replace(reg2,'.');
+    // console.log('curPageUrl-2  '+curPageUrl);
+
+    curPageUrl = curPageUrl.split('.');//通过一点来划分数组
+    // console.log(curPageUrl);
+
+
+    var ipAddress = curPageUrl[0]+'.'+curPageUrl[1]+'.'+curPageUrl[2]+'.'+curPageUrl[3];
+
+    var isInnerIp = false;//默认给定IP不是内网IP
+    var ipNum = getIpNum(ipAddress);
+    /**
+     * 私有IP:A类  10.0.0.0    -10.255.255.255
+     *       B类  172.16.0.0  -172.31.255.255
+     *       C类  192.168.0.0 -192.168.255.255
+     *       D类   127.0.0.0   -127.255.255.255(环回地址)
+     **/
+    var aBegin = getIpNum("10.0.0.0");
+    var aEnd = getIpNum("10.255.255.255");
+    var bBegin = getIpNum("172.16.0.0");
+    var bEnd = getIpNum("172.31.255.255");
+    var cBegin = getIpNum("192.168.0.0");
+    var cEnd = getIpNum("192.168.255.255");
+    var dBegin = getIpNum("127.0.0.0");
+    var dEnd = getIpNum("127.255.255.255");
+    isInnerIp = isInner(ipNum,aBegin,aEnd) || isInner(ipNum,bBegin,bEnd) || isInner(ipNum,cBegin,cEnd) || isInner(ipNum,dBegin,dEnd);
+    // console.log('是否是内网:'+isInnerIp);
+    return isInnerIp?process.env.VUE_APP_BASE_LOCAL_API:process.env.VUE_APP_BASE_API;
+  /*获取IP数*/
+  function getIpNum(ipAddress) {
+    var ip = ipAddress.split(".");
+    var a = parseInt(ip[0]);
+    var b = parseInt(ip[1]);
+    var c = parseInt(ip[2]);
+    var d = parseInt(ip[3]);
+    var ipNum = a * 256 * 256 * 256 + b * 256 * 256 + c * 256 + d;
+    return ipNum;
+  }
+  function isInner(userIp,begin,end){
+    return (userIp>=begin) && (userIp<=end);
+  }
+}
+
+const baseURL = window.location.href.split('://')[0]+'://' + judgmentNetworkReturnAddress()
 
 // 日期格式化
 export function parseTime(time, pattern) {
@@ -268,7 +326,7 @@ export function urlJudge(url) {
   //   let text =  window.location.href.split('://')[0]+'://' + url.split('://')[1]
   //   src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(text))));
   // }else{
-  //   src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API +'/admin/'+ url))));
+  //   src = localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(window.location.href.split('://')[0]+'://' +judgmentNetworkReturnAddress() +'/admin/'+ url))));
   // }
   return location + url
 }

+ 2 - 1
src/utils/zipdownload.js

@@ -1,12 +1,13 @@
 import axios from 'axios'
 import { getToken } from '@/utils/auth'
+import { judgmentNetworkReturnAddress } from "@/utils/ruoyi";
 
 const mimeMap = {
   xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   zip: 'application/zip'
 }
 
-const baseUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API
+const baseUrl = window.location.href.split('://')[0]+'://' + judgmentNetworkReturnAddress()
 export function downLoadZip(str, filename) {
   var url = baseUrl + str
   axios({

+ 1 - 1
src/views/codeHtml.vue

@@ -78,7 +78,7 @@
       },
       safe_book(id){
         safe_book(id).then( data => {
-          this.form.content = window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_API + '/' + unescape(data.data.content);
+          this.form.content = window.location.href.split('://')[0]+'://'  + this.judgmentNetworkReturnAddress() + '/' + unescape(data.data.content);
           this.getNumPages();
         });
       },

+ 1 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -302,7 +302,7 @@ export default {
   },
   data(){
     return{
-      videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+      videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
       pageType:1,
       // 遮罩层
       loading: true,

+ 2 - 2
src/views/comprehensive/personnel/student/index.vue

@@ -230,7 +230,7 @@ export default {
     };
     return {
       tableButtonType:this.hasPermiDom(['system:user_student:query','system:user_student:query','system:user_student:edit','system:user_student:remove','system:user_student:resetpwd']),
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/student/importData", // 上传地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/student/importData", // 上传地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -287,7 +287,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/importData"
       },
       // 查询参数
       queryParams: {

+ 1 - 1
src/views/comprehensive/personnel/teacher/index.vue

@@ -381,7 +381,7 @@
     data() {
       return {
         tableButtonType:this.hasPermiDom(['system:user_teacher:query','system:user_teacher:query','system:user_teacher:edit','system:user_teacher:remove','system:user_teacher:resetpwd']),
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/teacher/importData", // 上传地址
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/teacher/importData", // 上传地址
         headers: {
           Authorization: "Bearer " + getToken(),
         },

+ 1 - 1
src/views/comprehensive/personnel/teacher/indexOne.vue

@@ -380,7 +380,7 @@
     data() {
       return {
         tableButtonType:this.hasPermiDom(['system:user_teacher:query','system:user_teacher:query','system:user_teacher:edit','system:user_teacher:remove','system:user_teacher:resetpwd']),
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/teacher/importData", // 上传地址
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/teacher/importData", // 上传地址
         headers: {
           Authorization: "Bearer " + getToken(),
         },

+ 1 - 1
src/views/comprehensive/system/publicConfig/indexOne.vue

@@ -209,7 +209,7 @@
     name: "publicConfig",
     data() {
       return {
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/file/upload", // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),
         },

+ 1 - 1
src/views/comprehensive/system/user/index.vue

@@ -366,7 +366,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/importData"
       },
       // 查询参数
       queryParams: {

+ 55 - 0
src/views/demo.vue

@@ -0,0 +1,55 @@
+<template>
+    <div class="demo-page">
+      <p>测试页面</p>
+      <el-upload
+        class="certificate-avatar-uploader"
+        :action="uploadImgUrl"
+        :show-file-list="false"
+        accept=""
+        :on-success="(res)=>handleAvatarSuccess(res)"
+        :headers="headers"
+        :before-upload="beforeAvatarUpload">
+        <i class="el-icon-plus avatar-uploader-icon" style="width:200px;">普通上传</i>
+      </el-upload>
+    </div>
+</template>
+
+<script>
+  import { getToken } from "@/utils/auth";
+  export default {
+    name: 'demo',
+    data() {
+      return {
+        uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+      };
+    },
+    created(){
+
+    },
+    mounted(){
+
+    },
+    methods: {
+      handleAvatarSuccess(res, type) {
+        if(res.code == 200){
+          console.log('上传成功res-',res);
+          this.msgSuccess('上传成功!')
+        }else{
+          this.msgError(res.msg)
+        }
+        this.$forceUpdate()
+      },
+      beforeAvatarUpload(file) {
+        console.log('上传类型检测已关闭-',file)
+        return true
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

+ 1 - 1
src/views/gasManage3_0/manage/infoRecord/abnormalRecordDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/infoRecord/detailsPage.vue

@@ -104,7 +104,7 @@
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
         ],
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[
           {id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},

+ 1 - 1
src/views/gasManage3_0/manage/infoRecord/enterRecordDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/infoRecord/useRecordDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/qualificationApply/qualificationApplyDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/qualificationManage/qualificationManageCheck.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/qualificationManage/qualificationManageDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/useGas/useGasDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/useGasManage/useGasManageCheck.vue

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

+ 1 - 1
src/views/gasManage3_0/manage/useGasManage/useGasManageDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/student/qualificationApply/qualificationApplyDetail.vue

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

+ 1 - 1
src/views/gasManage3_0/student/useGas/useGasDetail.vue

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

+ 1 - 1
src/views/gasManage_syd/manage/infoRecord/abnormalRecordDetail.vue

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

+ 1 - 1
src/views/gasManage_syd/manage/infoRecord/enterRecordDetail.vue

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

+ 1 - 1
src/views/gasManage_syd/manage/infoRecord/useRecordDetail.vue

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

+ 2 - 2
src/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail.vue

@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      lookImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API, // 图片服务器地址
+      lookImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress(), // 图片服务器地址
       pageType:1,
       headers: {
         Authorization: "Bearer " + getToken(),
@@ -91,7 +91,7 @@ export default {
     },
     /**查看图片  */
     lookFile(item){
-      let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item;
+      let visitUrl=window.location.href.split('://')[0]+'://'+this.judgmentNetworkReturnAddress()+'/admin/'+item;
       console.log(visitUrl)
       window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },

+ 1 - 1
src/views/gasManage_syd/student/useGas/useGasDetail.vue

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

+ 1 - 1
src/views/gasManage_syd/student/useRecord/useRecordDetail.vue

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

+ 1 - 1
src/views/hazardManagement/hazard/addLaboratory.vue

@@ -81,7 +81,7 @@ export default {
         BaseUrl: '',
         // serverUrl: '//192.168.1.8:9300/exec',
         //serverUrl: '//180.76.134.43:30002/base/exec',
-        serverUrl: '//'+process.env.VUE_APP_BASE_API+'/base/exec',
+        serverUrl: '//'+this.judgmentNetworkReturnAddress()+'/base/exec',
         UEDITOR_HOME_URL: '/public/ueditor-1.4.3.3/'
       },
       materialTypeList:[],

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -75,7 +75,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         searchData:{
           buttonList:[//按钮数组没有则为空
             {
@@ -214,7 +214,7 @@
           return
         }
         let obj = {
-          url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+          url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
         }
         this.$set(this,'videoTitle','开关锁视频');
         this.$set(this,'videoData',obj);

+ 3 - 3
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -82,7 +82,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         searchData:{
           buttonList:[//按钮数组没有则为空
             {
@@ -210,7 +210,7 @@
             return
           }
           let obj = {
-            url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.joinVideo
+            url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.joinVideo
           }
           this.$set(this,'videoTitle','操作视频');
           this.$set(this,'videoData',obj);
@@ -221,7 +221,7 @@
             return
           }
           let obj = {
-            url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+            url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
           }
           this.$set(this,'videoTitle','开关锁视频');
           this.$set(this,'videoData',obj);

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage.vue

@@ -100,7 +100,7 @@
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
         ],
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[
           {id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -113,7 +113,7 @@
         tableList:[],
         total:0,
         //开关锁视频相关数据
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
       }
@@ -133,7 +133,7 @@
         }
         let obj = {
           type:type,
-          url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+          url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
         };
         // if(type == 1){
         //   obj.url = row.unLockVideo;

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue

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

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/IntelligentTerminal/index.vue

@@ -166,7 +166,7 @@
         // table操作按钮校验
         tableButtonType:this.hasPermiDom(['laboratory:hardware5:edit','laboratory:hardware5: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(),
         },

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

@@ -165,7 +165,7 @@
         // 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(),
         },

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/rfidIdentifier/index.vue

@@ -165,7 +165,7 @@
         // table操作按钮校验
         tableButtonType:this.hasPermiDom(['laboratory:hardware7:edit','laboratory:hardware7: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(),
         },

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -278,7 +278,7 @@
         // table操作按钮校验
         tableButtonType:this.hasPermiDom(['laboratory:hardware8:edit','laboratory:hardware8: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(),
         },

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue

@@ -261,7 +261,7 @@
         // table操作按钮校验
         tableButtonType:this.hasPermiDom(['chemical:locklog:list','laboratory:hardware5:edit','laboratory:hardware5: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(),
         },

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue

@@ -113,7 +113,7 @@
         tableList:[],
         total:0,
         //开关锁视频相关数据
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
       }
@@ -133,7 +133,7 @@
         }
         let obj = {
           type:type,
-          url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+          url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
         }
         // if(type == 1){
         //   obj.url = row.unLockVideo;

+ 5 - 5
src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue

@@ -160,7 +160,7 @@
     },
     data(){
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",
@@ -183,7 +183,7 @@
             return
           }
           this.$set(this,'videoTitle','操作视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.outDetail.outVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.outDetail.outVideo;
         } else if(type == 2){
           //归还操作视频
           if(!this.infoData.returnDetail.returnVideo){
@@ -191,7 +191,7 @@
             return
           }
           this.$set(this,'videoTitle','操作视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.returnDetail.returnVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.returnDetail.returnVideo;
         } else if(type == 3){
           //领用开关锁视频
           if(!this.infoData.outDetail.outLockVideo){
@@ -199,7 +199,7 @@
             return
           }
           this.$set(this,'videoTitle','开关锁视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.outDetail.outLockVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.outDetail.outLockVideo;
         } else if(type == 4){
           //归还开关锁视频
           if(!this.infoData.returnDetail.returnLockVideo){
@@ -207,7 +207,7 @@
             return
           }
           this.$set(this,'videoTitle','开关锁视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.returnDetail.returnLockVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.returnDetail.returnLockVideo;
         }
         this.$set(this,'videoData',obj);
         this.videoType = true;

+ 1 - 1
src/views/mine/index.vue

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

+ 2 - 2
src/views/mine/indexOne.vue

@@ -328,8 +328,8 @@
       };
       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(),
         },

+ 1 - 1
src/views/newEvacuationBigData.vue

@@ -460,7 +460,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         //全局MQTT相关

+ 1 - 1
src/views/newEvacuationBigDataHome.vue

@@ -121,7 +121,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         containerType:false,

+ 1 - 1
src/views/safetyEducationExam/safeLearning/el_course/coursePreview.vue

@@ -54,7 +54,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         loading:false,
         playerOptions: {
           playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度

+ 1 - 1
src/views/safetyEducationExam/safeLearning/el_course/edit.vue

@@ -463,7 +463,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         selectTree: '',
         selectTreeValue: [],
         /******************基本信息-开始******************/

+ 5 - 5
src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -468,7 +468,7 @@ export default {
       richTextEditType:false,
       skip: false,
       options: {
-        target: httpHeader+process.env.VUE_APP_BASE_API+"/base/file/upload/chunk",
+        target: httpHeader+this.judgmentNetworkReturnAddress()+"/base/file/upload/chunk",
         // 开启服务端分片校验功能
         testChunks: true,
         single: true,
@@ -665,7 +665,7 @@ export default {
     },
     editUpClick(){
       let self = this;
-      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/exam/el_resources/update?cateId=" + this.editForm.cateId +'&id=' + this.editForm.id + '&title=' + this.editForm.title
+      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/exam/el_resources/update?cateId=" + this.editForm.cateId +'&id=' + this.editForm.id + '&title=' + this.editForm.title
       if(this.fileList[0]){
         setTimeout(function(){
           self.submitUpload();
@@ -875,7 +875,7 @@ export default {
       this.coursewareName='';
       this.editForm.cateId='';
       this.editForm.id='';
-      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/exam/el_resources?cateId=" + this.queryParams.cateId
+      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/exam/el_resources?cateId=" + this.queryParams.cateId
       this.upTextList = [];
       this.open = true;
       this.title = "添加课件资源";
@@ -978,7 +978,7 @@ export default {
        this.editForm.id=row.id
 
       this.reset();
-      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/exam/el_resources?cateId=" + this.queryParams.cateId
+      this.uploadImgUrl = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/exam/el_resources?cateId=" + this.queryParams.cateId
       this.upTextList = [];
       this.open = true;
       this.title = "修改课件资源";
@@ -1007,7 +1007,7 @@ export default {
 
       const result = JSON.parse(response);
       if (result.code==200 && !this.skip) {
-        axios.post(httpHeader+process.env.VUE_APP_BASE_API+"/base/file/upload/merge", {
+        axios.post(httpHeader+this.judgmentNetworkReturnAddress()+"/base/file/upload/merge", {
             identifier: file.uniqueIdentifier,
             filename: file.name,
             totalChunks: chunk.offset,

+ 1 - 1
src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue

@@ -85,7 +85,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         circularLogo:localStorage.getItem('circularLogo'),
         studyLoading:false,
         //时间

+ 1 - 1
src/views/safetyEducationExam/safeLearning/safe_book/index.vue

@@ -256,7 +256,7 @@ export default {
     },
     //上传
     handleAvatarSuccess(res, file) {
-      this.form.content = window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API + '/' + res.data.url;
+      this.form.content = window.location.href.split('://')[0]+'://' +this.judgmentNetworkReturnAddress() + '/' + res.data.url;
       this.form.realcontent =res.data.url;
       this.getNumPages();
       this.$forceUpdate()

+ 1 - 1
src/views/secureAccess/approval/infoPage.vue

@@ -172,7 +172,7 @@ import {optionHazard} from "@/api/laboratory/hazard";
     },
     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)));
 

+ 1 - 1
src/views/secureAccess/approval_handle/addPage.vue

@@ -359,7 +359,7 @@
       lookFile(item){
         console.log(item)
 
-        var originUrl = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API+'/admin/'+item; //要预览文件的访问地址
+        var originUrl = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress()+'/admin/'+item; //要预览文件的访问地址
 
         window.open(localStorage.getItem('filePreviewUrl') + '/onlinePreview?url='+encodeURIComponent(Base64.encode(originUrl)));
       },

+ 3 - 3
src/views/secureAccess/approval_handle/infoPage.vue

@@ -92,10 +92,10 @@ export default {
 
   methods: {
     lookFile(item){
-      window.open(window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item.url)
-      // let visitUrl=window.location.href.split('://')[0]+'://'+process.env.VUE_APP_BASE_API+'/admin/'+item.url;
+      window.open(window.location.href.split('://')[0]+'://'+this.judgmentNetworkReturnAddress()+'/admin/'+item.url)
+      // let visitUrl=window.location.href.split('://')[0]+'://'+this.judgmentNetworkReturnAddress()+'/admin/'+item.url;
       // console.log(visitUrl)
-      // window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
+      // window.open(window.location.href.split('://')[0]+'://'  + this.judgmentNetworkReturnAddress() + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
     //点击切换文件
     forClick(item,index,bigIndex){

+ 1 - 1
src/views/securityCheck/checkOption/index.vue

@@ -142,7 +142,7 @@ export default {
   data() {
     return {
       tableButtonType:this.hasPermiDom(['laboratory:checkOption:add','laboratory:checkOption:add','laboratory:checkOption:edit','laboratory:checkOption:remove']),
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/checkOption/import", // 上传的图片服务器地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/checkOption/import", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

+ 1 - 1
src/views/securityCheck/checkRecord/CheckRecordInfo.vue

@@ -312,7 +312,7 @@
     },
     data() {
       return {
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
+        uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
         uploadImgUrlTwo: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),

+ 1 - 1
src/views/securityCheck/checkRecord/addCheck.vue

@@ -441,7 +441,7 @@ export default {
     },
     //上传
     handleAvatarSuccess(res, file, index) {
-      //let url=window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API+"/"+res.data.url;
+      //let url=window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress()+"/"+res.data.url;
       this.form.detailsList[index].yhImg.push(res.data.url);
       this.$forceUpdate()
     },

+ 2 - 2
src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -454,7 +454,7 @@
               obj.yhlist[i].voice = [];
             }
             for(let x=0;x<obj.yhlist[i].voice.length;x++){
-              obj.yhlist[i].voice[x].url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + '/' + obj.yhlist[i].voice[x].url;
+              obj.yhlist[i].voice[x].url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + '/' + obj.yhlist[i].voice[x].url;
             }
             obj.yhlist[i].jcxId = obj.yhlist[i].jcxId.split(",");
             for(let o=0;o<obj.yhlist[i].jcxId.length;o++){
@@ -523,7 +523,7 @@
       },
       //上传
       handleAvatarSuccess(res, file, index) {
-        // let url=window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API+"/"+res.data.url;
+        // let url=window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress()+"/"+res.data.url;
         // this.form.detailsList[index].yhImg.push(url);
         // this.form.detailsList[index].yhImg.push(res.data.url);
         this.form.detailsList[index].yhImg.push(res.data.url);

+ 2 - 2
src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -76,7 +76,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         searchData:{
           searchList:[//搜索数组
             {
@@ -208,7 +208,7 @@
           return
         }
         let obj = {
-          url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+          url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
         }
         this.$set(this,'videoTitle','开关锁视频');
         this.$set(this,'videoData',obj);

+ 5 - 5
src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -154,7 +154,7 @@
     },
     data(){
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         videoType:false,
         videoData:{},
         videoTitle:"",
@@ -177,7 +177,7 @@
             return
           }
           this.$set(this,'videoTitle','操作视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.outDetail.outVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.outDetail.outVideo;
         } else if(type == 2){
           //归还操作视频
           if(!this.infoData.returnDetail.returnVideo){
@@ -185,7 +185,7 @@
             return
           }
           this.$set(this,'videoTitle','操作视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.returnDetail.returnVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.returnDetail.returnVideo;
         } else if(type == 3){
           //领用开关锁视频
           if(!this.infoData.outDetail.outLockVideo){
@@ -193,7 +193,7 @@
             return
           }
           this.$set(this,'videoTitle','开关锁视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.outDetail.outLockVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.outDetail.outLockVideo;
         } else if(type == 4){
           //归还开关锁视频
           if(!this.infoData.returnDetail.returnLockVideo){
@@ -201,7 +201,7 @@
             return
           }
           this.$set(this,'videoTitle','开关锁视频');
-          obj.url = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + this.infoData.returnDetail.returnLockVideo;
+          obj.url = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + this.infoData.returnDetail.returnLockVideo;
         }
         this.$set(this,'videoData',obj);
         this.videoType = true;

+ 3 - 3
src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -83,7 +83,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         searchData:{
           searchList:[//搜索数组
             {
@@ -204,7 +204,7 @@
             return
           }
           let obj = {
-            url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.joinVideo
+            url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.joinVideo
           }
           this.$set(this,'videoTitle','操作视频');
           this.$set(this,'videoData',obj);
@@ -215,7 +215,7 @@
             return
           }
           let obj = {
-            url:window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/admin/" + row.closeLockVideo
+            url:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + row.closeLockVideo
           }
           this.$set(this,'videoTitle','开关锁视频');
           this.$set(this,'videoData',obj);

+ 1 - 1
src/views/studentViews/studentMine/index.vue

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

+ 2 - 2
src/views/system/apkfile/index.vue

@@ -319,7 +319,7 @@
         //文件列表
         fileList:[],
         options: {
-          target: httpHeader+process.env.VUE_APP_BASE_API+"/base/file/upload/chunk",
+          target: httpHeader+this.judgmentNetworkReturnAddress()+"/base/file/upload/chunk",
           // 开启服务端分片校验功能
           testChunks: true,
           single: true,
@@ -635,7 +635,7 @@
       fileSuccess(rootFile, file, response, chunk) {
         const result = JSON.parse(response);
         if (result.code == 200 && !this.skip) {
-          axios.post(httpHeader+process.env.VUE_APP_BASE_API+"/base/file/upload/merge", {
+          axios.post(httpHeader+this.judgmentNetworkReturnAddress()+"/base/file/upload/merge", {
             identifier: file.uniqueIdentifier,
             filename: file.name,
             totalChunks: chunk.offset,

+ 1 - 1
src/views/system/user/profile/index.vue

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