Browse Source

修改日执行计划table的高度

Shan9312 1 year ago
parent
commit
6988c9bda5

+ 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')

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

@@ -1130,7 +1130,7 @@ export default {
       },
       isokDisable: false,
       requestParam: {},
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      rowStyle: { height: 80 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       isShowDialog: false,
       activeName: '栏舍配方',
@@ -1594,7 +1594,7 @@ export default {
       } else {
         if (column.label !== '操作') {
           this.isDetail = true // 点击行显示详情
-          this.myheight = document.documentElement.clientHeight - 85 - 265 - 230+140
+          this.myheight = 80*5+50;
         }
       }
       this.table2.getdataListParm.parammaps.havebutton = row.havebutton

+ 17 - 19
src/views/statisticalAnalysis/pushingplan/index.vue

@@ -153,10 +153,9 @@
         </div>
       </template>
       <!-- <div style="margin-bottom: 20px;background-image: url('http://niu305.cn:8091/uploads/image/headphoto1.png');background-position: top right;"> -->
-        <div class="run-box">
-          <div ref="map" class="map-container"></div>
+        <div>
+          <h3>推料计划详情</h3>
           <div class="run-box-rg">
-            <h3>推料计划详情</h3>
             <div>
               <span>推料车:</span>{{runDate?.tname || '暂无'}}
             </div>
@@ -183,6 +182,7 @@
               <span>推料栏舍顺序:</span>{{ runDate?.bname || '暂无' }}
             </div>
           </div>
+          <div ref="map" class="map-container"></div>
         </div>
 
       <!-- </div> -->
@@ -491,33 +491,31 @@ export default {
 </script>
 <style lang="scss" scoped>
 .run-box{
-  display: flex;
-  justify-content: space-between;
   height: 600px;
 }
 .run-box-rg{
-  flex: 1;
-  padding-left: 20px;
-  min-width:300px;
+  display: flex;
+  justify-content:left;
+  flex-direction: row;
+  flex-wrap: wrap;
+  padding:  0px 20px;
   font-size:16px;
+  border-bottom:1px dotted #eee;
+}
+.run-box-rg div{
+  margin-bottom:10px;
+  margin-right:15px;
 }
 .run-box-rg div>span{
     font-size: 16px!important;
-    padding-right: 8px;
-    display: inline-block;
-    width: 120px;
-    text-align:right;
-    margin-bottom: 5px;
-  }
-  .run-box-rg>div{
-    margin: 8px 0;
-  }
+    font-weight: 600;
 
+  }
 
 .map-container {
   height: 600px;
-  width: 840px;
-  border-right:1px dotted #eee;
+  // width: 840px;
+  // border-right:1px dotted #eee;
   padding:0 10px;
 }
 .search {