轨迹详情

src/utils/request.js

@@ -15,9 +15,9 @@ 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}
 var browserUrl = window.location.hostname
 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)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

src/views/statisticalAnalysis/pushingplan/index.vue

@@ -134,13 +134,47 @@
             class="avue-crud__dialog__menu"
             @click="dialogFull ? (dialogFull = false) : (dialogFull = true)"
           >
+
             <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
             <svg-icon v-else icon-class="fullscreen" />
           </div>
         </div>
       </template>
       <!-- <div style="margin-bottom: 20px;background-image: url('http://niu305.cn:8091/uploads/image/headphoto1.png');background-position: top right;"> -->
-      <div ref="map" class="map-container"></div>
+        <div class="run-box">
+          <div ref="map" class="map-container"></div>
+          <div class="run-box-rg">
+            <h3>运动轨迹详情</h3>
+            <div>
+              <span>推料车:</span>{{1}}
+            </div>
+            <div>
+              <span>推料车:</span>{{1}}
+            </div>
+            <div>
+              <span>计划开始时间:</span>{{1}}
+            </div>
+            <div>
+              <span>实际开始时间:</span>{{1}}
+            </div>
+            <div>
+              <span>实际结束时间:</span>{{1}}
+            </div>
+            <div>
+              <span>实际时长:</span>{{1}}
+            </div>
+            <div>
+              <span>偏差分钟数:</span>{{1}}
+            </div>
+            <div>
+              <span>备注:</span>{{1}}
+            </div>
+            <div>
+              <span>计划推料顺序(栏舍):</span>{{1}}
+            </div>
+          </div>
+        </div>
+
       <!-- </div> -->
       <div slot="footer" class="dialog-footer">
         <el-button
@@ -428,9 +462,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.run-box{
+  border:1px solid red;
+  display: flex;
+  justify-content: space-between;
+  height: 600px;
+}
+.run-box-rg{
+  flex: 1;
+  border:1px solid green;
+  .run-box-rg span{
+    font-size: 16px!important;
+  }
+  .run-box-rg div{
+    margin: 15px 0;
+  }
+}
+
 .map-container {
   height: 600px;
-  width: 1000px;
+  width: 800px;
 }
 .search {
   clear: both;