Merge branch 'release/v1.1.0' into feature/hss

src/utils/request.js

@@ -20,9 +20,7 @@ if (reg.test(browserUrl)){
 }
 
 Cookies.set('url',URL)
-console.log(process.env.VUE_APP_BASE_API,'===========URL1111')
-console.log(URL,'===========URL')
-
+// test
 const service = axios.create({
   baseURL: URL, // url = base url + request url
   withCredentials: true, // send cookies when cross-domain requests

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -226,7 +226,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            max-height="200px"
+            max-height="260px"
           >
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="栏舍名称" min-width="70px" align="center" prop="fname" />
@@ -281,7 +281,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            max-height="200px"
+            max-height="260px"
           >
             <el-table-column label="操作编号" min-width="110px" align="center">
               <template slot-scope="scope">
@@ -316,7 +316,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            max-height="200px"
+            max-height="260px"
           >
             <el-table-column label="操作编号" min-width="110px" align="center" prop="sort" />
             <el-table-column label="转投栏舍" min-width="110px" align="center" prop="fname" />
@@ -412,7 +412,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            max-height="200px"
+            max-height="260px"
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
@@ -522,7 +522,7 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
-            max-height="200px"
+            max-height="260px"
           >
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="70px" align="center" prop="fname" />