duanxiaoduan преди 1 година
родител
ревизия
a1754b5180
променени са 2 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 3 3
      src/utils/request.js
  2. 8 0
      src/views/formulationPlan/pushMaterialPlan/index.vue

+ 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 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
 var browserUrl = window.location.hostname
 console.log("========url===",reg.test(browserUrl))
 console.log("========url===",reg.test(browserUrl))
-if (reg.test(browserUrl)){
-  URL = window.location.protocol +"//"+ browserUrl + ":80/"
-}
+// if (reg.test(browserUrl)){
+//   URL = window.location.protocol +"//"+ browserUrl + ":80/"
+// }
 
 
 Cookies.set('url',URL)
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

+ 8 - 0
src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -375,6 +375,14 @@ export default {
       console.log('点击了运行轨迹')
       console.log('点击了运行轨迹')
       this.run.dialogStatus = 'run'
       this.run.dialogStatus = 'run'
       this.run.dialogFormVisible = true
       this.run.dialogFormVisible = true
+      // let arr = [{"A":"4052.72555","N":"11312.94319"},{"A":"4052.725552","N":"11312.943192"}]
+      // let arrList = []
+      // for(let i=0;i<arr.length;i++){
+      //   let list = []
+      //   list.push(arr[i].A,arr[i].N)
+      //   arrList.push(list)
+      // }
+      // console.log(arrList,'arrList')
       this.initMap();
       this.initMap();
     },
     },
     async initMap() {
     async initMap() {