Browse Source

增加代理模式接口地址切换

chenwen 6 months ago
parent
commit
7bd21a0e3a
5 changed files with 12 additions and 9 deletions
  1. 2 2
      .env.development
  2. 1 1
      .env.production
  3. 5 4
      src/pages/Login.vue
  4. 1 1
      src/pages/multi/multiPatrol.vue
  5. 3 1
      src/utils/request.js

+ 2 - 2
.env.development

@@ -1,2 +1,2 @@
-VITE_API_PATH=http://127.0.0.1:8080/zl
-VITE_GATHERAPI_PATH=http://42.56.120.107:9602/zl-opd-gather
+VITE_API_PATH=http://42.56.120.107:9602/zl-opd-server
+VITE_API_PATH_PROXY=http://10.70.206.126:8098/zl-opd-server

+ 1 - 1
.env.production

@@ -1,2 +1,2 @@
 VITE_API_PATH=http://42.56.120.107:9602/zl-opd-server
 VITE_API_PATH=http://42.56.120.107:9602/zl-opd-server
-VITE_GATHERAPI_PATH=http://42.56.120.107:9602/zl-opd-gather
+VITE_API_PATH_PROXY=http://10.70.206.126:8098/zl-opd-server

+ 5 - 4
src/pages/Login.vue

@@ -22,13 +22,13 @@
 	                    </template>
 	                    </template>
 	                </el-input>
 	                </el-input>
 	            </el-form-item>
 	            </el-form-item>
-				<el-form-item prop="captchaCode">
+				<!-- <el-form-item prop="captchaCode">
 				    <el-input  placeholder="请输入验证码" v-model="loginForm.captchaCode" input-style="height:40px;" style="flex:1;" tabindex="3"
 				    <el-input  placeholder="请输入验证码" v-model="loginForm.captchaCode" input-style="height:40px;" style="flex:1;" tabindex="3"
 				        @keyup.enter="submitForm()">
 				        @keyup.enter="submitForm()">
 				        
 				        
 				    </el-input>
 				    </el-input>
 					<img :src="captchaImgUrl" style="z-index: 100;border-radius: 2px;cursor: pointer;" @click="loadCaptcha"/>
 					<img :src="captchaImgUrl" style="z-index: 100;border-radius: 2px;cursor: pointer;" @click="loadCaptcha"/>
-				</el-form-item>
+				</el-form-item> -->
 	            <div class="login-btn">
 	            <div class="login-btn">
 					<el-checkbox v-model="rembme" checked label="记住我" true-value="1" true-label="1" style="color:#fff;margin-right: 10px;"/>
 					<el-checkbox v-model="rembme" checked label="记住我" true-value="1" true-label="1" style="color:#fff;margin-right: 10px;"/>
 	                <el-button type="primary" @click="submitForm()" size="default" tabindex="3" :loading="isLoading">登录</el-button>
 	                <el-button type="primary" @click="submitForm()" size="default" tabindex="3" :loading="isLoading">登录</el-button>
@@ -63,7 +63,7 @@ import { useHomeStore } from "../store/home.js"
         const rules = {
         const rules = {
             loginId: [{required: true, message: "请输入用户名",trigger: "blur"}],
             loginId: [{required: true, message: "请输入用户名",trigger: "blur"}],
             pwd: [{ required: true, message: "请输入密码", trigger: "blur" }],
             pwd: [{ required: true, message: "请输入密码", trigger: "blur" }],
-			captchaCode: [{ required: true, message: "请输入验证码", trigger: "blur" }]
+			//captchaCode: [{ required: true, message: "请输入验证码", trigger: "blur" }]
         };
         };
 		const captchaImgUrl=ref(null)
 		const captchaImgUrl=ref(null)
 		const isLoading=ref(false)
 		const isLoading=ref(false)
@@ -113,7 +113,8 @@ import { useHomeStore } from "../store/home.js"
 				
 				
 			}
 			}
 			loadCaptcha()
 			loadCaptcha()
-			
+			app.putSetting("network",location.host.indexOf("10.")>=0?1:0)
+			//console.log(location.host)
 		})
 		})
 </script>
 </script>
 
 

+ 1 - 1
src/pages/multi/multiPatrol.vue

@@ -137,7 +137,7 @@
 	
 	
 	const getOrgInfo=(orgId)=>{
 	const getOrgInfo=(orgId)=>{
 		multiPatrolAPI.getMultiTemp(orgId).then(resp=>{
 		multiPatrolAPI.getMultiTemp(orgId).then(resp=>{
-			console.log(resp)
+			//console.log(resp)
 			if(resp.code!=0){
 			if(resp.code!=0){
 				ElMessage.error(resp.msg||'获取井站信息失败')
 				ElMessage.error(resp.msg||'获取井站信息失败')
 				return
 				return

+ 3 - 1
src/utils/request.js

@@ -6,9 +6,11 @@ const store=useHomeStore()
 
 
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
 
 
+let network=app.takeSetting('network')
+
 //axios  默认发送数据采用 application/json,传参用params,实际用的是get请求参数附加到url后,用data传参,参数放在request boy中
 //axios  默认发送数据采用 application/json,传参用params,实际用的是get请求参数附加到url后,用data传参,参数放在request boy中
 const service = axios.create({
 const service = axios.create({
-    baseURL:import.meta.env.VITE_API_PATH,    //http://127.0.0.1:8080/zl  //http://42.56.120.92:9602/zl-opd-server
+    baseURL:network?import.meta.env.VITE_API_PATH_PROXY:import.meta.env.VITE_API_PATH,    //http://127.0.0.1:8080/zl  //http://42.56.120.92:9602/zl-opd-server
     timeout: 15000
     timeout: 15000
 });
 });