更新了一些报错提示

src/views/dashboard/pasture/index.vue

@@ -767,9 +767,11 @@ export default {
           }]
         }]
       }
-      this.row2.chart1.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row2.chart1.chartLine.resize()
+      this.row2.chart1.chartLine.setOption(option)
+      if (this.row2.chart1.chartLine != null) {
+        window.onresize = function() {
+          this.row2.chart1.chartLine.resize()
+        }
       }
       var that = this
       that.row2.chart1.chartLine.on('mouseover', e => {
@@ -807,9 +809,11 @@ export default {
         }],
         color: ['#529ae4', '#e4e7ec']
       }
-      this.row2.chart2.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row2.chart2.chartLine.resize()
+      this.row2.chart2.chartLine.setOption(option)
+      if (this.row2.chart2.chartLine != null) {
+        window.onresize = function() {
+          this.row2.chart2.chartLine.resize()
+        }
       }
       var that = this
       that.row2.chart2.chartLine.on('mouseover', e => {
@@ -911,11 +915,11 @@ export default {
         ]
       }
       this.row2.chart3.chartLine.setOption(option)
-      setTimeout(()=> {
+      if (this.row2.chart3.chartLine != null) {
         window.onresize = function() {
           this.row2.chart3.chartLine.resize()
         }
-      }, 100);
+      }
     },
     getCarLength() {
       this.row2.chart3.listLoading2 = true
@@ -1161,9 +1165,11 @@ export default {
           { name: '计划准确率（去除取消重量）', type: 'line', symbol: 'none', smooth: true, itemStyle: { normal: { lineStyle: { color: '#fd8d75' }}}, data: chartLine_data.data4 }
         ]
       }
-      this.row3.chart1.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row3.chart1.chartLine.resize()
+      this.row3.chart1.chartLine.setOption(option)
+      if (this.row3.chart1.chartLine != null) {
+        window.onresize = function() {
+          this.row3.chart1.chartLine.resize()
+        }
       }
     },
     // 泌乳牛干物质采食量
@@ -1222,9 +1228,11 @@ export default {
           itemStyle: { barBorderRadius: [18, 18, 0, 0], normal: { color: '#36c293' }}, yAxisIndex: 1, data: chartLine_data.data3
         }]
       }
-      this.row3.chart2.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row3.chart2.chartLine.resize()
+      this.row3.chart2.chartLine.setOption(option)
+      if (this.row3.chart2.chartLine != null) {
+        window.onresize = function() {
+          this.row3.chart2.chartLine.resize()
+        }
       }
     },
 
@@ -1289,11 +1297,11 @@ export default {
         }]
       }
       this.row4.chart1.chartLine.setOption(option)
-      setTimeout(()=> {
+      if (this.row4.chart1.chartLine != null) {
         window.onresize = function() {
           this.row4.chart1.chartLine.resize()
         }
-      }, 100);
+      }
     },
 
     // 混料实际重量统计
@@ -1344,9 +1352,11 @@ export default {
           name: '重量', type: 'bar', stack: '广告', itemStyle: { normal: { color: '#36C293' }}, data: chartLine_data.data2
         }]
       }
-      this.row4.chart2.chartLine.setOption(option)
-      window.onresize = function() {
-        this.row4.chart2.chartLine.resize()
+      this.row4.chart2.chartLine.setOption(option)
+      if (this.row4.chart2.chartLine != null) {
+        window.onresize = function() {
+          this.row4.chart2.chartLine.resize()
+        }
       }
     },
 

src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -60,7 +60,7 @@ export default {
       dialogStatus: '',
       rules: {},
       date: '',
-      parentActiveName: '',
+      // parentActiveName: '',
       temp: {},
       title: '',
       isDhedFormula: true,

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -269,7 +269,7 @@
             <div>撒料:</div>
             <div class="spreadingMaterialList">
               <!-- 注释内容后续版本更 -->
-              <!-- <draggable
+              <draggable
                 :disabled="isDropState"
                 id="1"
                 data-source="juju"
@@ -283,7 +283,7 @@
                 @change="changeLog1(create.temp)"
                 @start="start1"
                 @end="end1(create.temp)"
-              > -->
+              >
               <!-- 注释内容后续版本更 -->
                 <div v-for="element in create.list2" :key="element.name" class="list-group-item2 item">
                   <div class="arr-l" :style="{'background':element.tbackground}">
@@ -343,7 +343,7 @@
                   </div>
                 </div>
               <!-- 注释内容后续版本更 -->
-              <!-- </draggable> -->
+              </draggable>
               <!-- 注释内容后续版本更 -->
             </div>
           </div>
@@ -802,7 +802,7 @@ export default {
       console.log('新增车次')
       this.create.temp = { sel: 1, tmrid: '', tmrid2: '', maxweight: '', issplit: 1, begintime: '', sumweight: 0, display: '', times: 1, ftid: '', ftname: '', tmrname: '', maxweight: '' }
       // 注释内容后续版本更
-      // this.create.temp.times = this.table.getdataListParm.parammaps.times
+      this.create.temp.times = this.table.getdataListParm.parammaps.times
       // 注释内容后续版本更
       this.getDownList()
       this.isDispaly = false

src/views/formulationPlan/recipeTemplate/index.vue

@@ -1068,7 +1068,7 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkfttype,checkbigcowclass,checkFeedtemplet,checkFeed,insertFTUpload,insertFTdetailUpload',
+        name: 'checkfttype,checkbigcowclass,checkFeed,insertFTUpload,insertFTdetailUpload',
         importParams: '配方名称,牲畜类别,配方类型,备注,饲料组,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
         sheetname: 'Sheet1',
         // 登录牧场

src/views/formulationPlan/recipeTemplate/index改.vue

@@ -1071,7 +1071,7 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkfttype,checkbigcowclass,checkFeedtemplet,checkFeed,insertFTUpload,insertFTdetailUpload',
+        name: 'checkfttype,checkbigcowclass,checkFeed,insertFTUpload,insertFTdetailUpload',
         importParams: '配方名称,牲畜类别,配方类型,备注,饲料组,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
         sheetname: 'Sheet1',
         // 登录牧场

src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -386,8 +386,10 @@ export default {
         ]
       }
       this.chartLine.setOption(option)
-      window.onresize = function() {
-        this.chartLine.resize()
+      if (this.chartLine != null) {
+        window.onresize = function() {
+          this.chartLine.resize()
+        }
       }
     },
     rowClick(row, column, event) {

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

@@ -119,18 +119,18 @@
         </div>
         <div v-else>
           <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
-            <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop>
-              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
-                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+            <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop">
+                <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
+                  <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+                </u-table-column>
               </u-table-column>
-            </u-table-column>
-          </u-table>
+            </u-table>
         </div>
         <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
       </el-tab-pane>
     </el-tabs>
   </div>
-  </div>
+</div>
 
 </template>
 
@@ -523,8 +523,8 @@ export default {
               this.tab3.table.list = []
               myList = []
             }
-            this.$refs.plTable3.reloadData(myList)
             setTimeout(() => {
+             this.$refs.plTable3.reloadData(myList)
               this.tab3.table.listLoading = false
             }, 100)
           })

src/views/statisticalAnalysis/inventoryManagement/pasture/index1.vue

@@ -1,95 +0,0 @@
-<template>
-  <div class="app-content">
-    <el-radio v-model="radio2" label="1" @change="changeRadio2">牲畜类别</el-radio>
-    <el-radio v-model="radio2" label="2" @change="changeRadio2">栏舍名称</el-radio>
-    <template v-if="aa">
-      <u-table  ref="plTable" v-loading="listLoading" :max-height="height" use-virtual @table-body-scroll="tableScroll" :data-changes-scroll-top="radio === 1" :row-height="rowHeight" border>
-        <u-table-column v-for="(item,key) in tableConfig" :key="'a'+key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop" :fixed="key==0">
-          <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="'B'+key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
-            <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="'C'+key2" :label="item2.label" :prop="item2.prop" />
-          </u-table-column>
-        </u-table-column>
-      </u-table>
-    </template>
-    
-  </div>
-</template>
-
-<script>
-  import { postJson } from '@/api/common'
-  export default {
-    name: 'PastureInventoryManagement',
-    data() {
-      return {
-        radio: 1,
-        height: document.documentElement.clientHeight - 125,
-        rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-        rowHeight: 30,
-        listLoading:false,
-        tableConfig:[],
-        radio2: '1',
-        aa:false
-      }
-    },
-    mounted() {
-      this.setData()
-    },
-    methods: {
-      setData() {
-          this.aa = false
-          
-          setTimeout(()=>{
-            this.aa = true
-            this.$nextTick(() => {
-              let list = []
-              let url = 'authdata/GetReportform'
-              let data = {
-                "name":"",
-                "page":1,
-                "offset":1,
-                "returntype":"Map",
-                "checked":0,
-                "parammaps":{
-                  "pastureid":"1647481173",
-                  "startTime":"2022-03-11",
-                  "stopTime":"2022-03-17",
-                  "fname":"",
-                  },
-                }
-                if(this.radio2 == '1'){
-                  data.name = 'getMaterialAnalysisLS'
-                }else if(this.radio2 == '2'){
-                  data.name = 'getMaterialAnalysisSC'
-                }
-              this.listLoading = true
-              postJson(url,data).then(response => {
-                this.listLoading = false
-                this.tableConfig = response.data.list.data2
-                list = response.data.list.data1
-                 this.$refs.plTable.reloadData(list)
-              })
-            })
-          },50)
-          
-          
-
-      },
-      tableScroll({ scrollTop, scrollLeft, table, judgeFlse }) {
-        // {scrollTop， scrollLeft, table, judgeFlse: 这个参数返回一个boolean值，为true则代表表格滚动到了底部了，false没有滚动到底部，必须开起大数据渲染模式才能有值哦}, event
-        // console.log(scrollTop, scrollLeft, table, judgeFlse)
-      },
-      changeRadio2() {
-        console.log(this.radio2)
-        if (this.radio2 == '1') {
-          this.setData()
-        } else if (this.radio2 == '2') {
-          this.setData()
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-content{padding: 20px 20px}
-</style>