Selaa lähdekoodia

固定时不调用接口

Shan9312 1 vuosi sitten
vanhempi
commit
5c033c3f6c

+ 2 - 2
.env.development

@@ -4,9 +4,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
+VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 
 # 许义平后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.96:8081/'

+ 3 - 3
src/utils/request.js

@@ -14,9 +14,9 @@ if (DoMainString) {
 var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
 var browserUrl = window.location.hostname
 console.log("========url===",reg.test(browserUrl))
-// if (reg.test(browserUrl)){
-//   URL = window.location.protocol +"//"+ browserUrl + ":8082"
-// }
+if (reg.test(browserUrl)){
+  URL = window.location.protocol +"//"+ browserUrl + ":8082"
+}
 
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1643,7 +1643,7 @@ export default {
         this.table2.getdataListParm.parammaps.id = row.id
         this.table3.getdataListParm.parammaps.id = row.id
         this.table3.getdataListParm.parammaps.lpplantype = row.lpplantype
-        this.getList2()
+        // this.getList2() // 如果是固定式则不调用 getDownloadplandtl1ListV2的接口
         this.getList3()
       } else if (row.lpplantype == 2) {
         // 撒料计划-撒料