duanxiaoduan 2 rokov pred
rodič
commit
e34180dab4

BIN
dist.zip


+ 2 - 1
src/views/inventoryManagement/warehousing/index.vue

@@ -377,7 +377,8 @@ export default {
           laiddate: '', feedid: '', feedname: '', operateweight: '', providerid: '', providername: '', startweight: '', priceold: '', contractcode: '', pricenew: '', sumprice: '', grossweight: '', tareweight: '', licence: '', pcpde: '', createemp: '', createdate: '', remark: '', 'wagonnumber': ''
         },
         rules: {
-          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
           pricenew: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
         },

+ 3 - 3
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -2277,10 +2277,10 @@ export default {
         if (response.data.list !== null) {
           console.log('汇总统计/混料table数据', response.data.list)
           this.tab.table.list = response.data.list
-          this.tab.table.total = response.data.total
         } else {
           this.tab.table.list = []
         }
+        this.tab.table.total = response.data.total
         setTimeout(() => {
           this.tab.table.listLoading = false
         }, 100)
@@ -2305,10 +2305,10 @@ export default {
         if (response.data.list !== null) {
           console.log('汇总统计/撒料table数据', response.data.list)
           this.tab.table2.list = response.data.list
-          this.tab.table2.total = response.data.total
         } else {
           this.tab.table2.list = []
         }
+        this.tab.table2.total = response.data.total
         setTimeout(() => {
           this.tab.table2.listLoading = false
         }, 100)
@@ -3903,7 +3903,7 @@ export default {
           this.optdevice = row.配方名称
           this.titlefname = '准确性详情——配方名称:' + row.配方名称
         } else if (this.tab.radio == 2) {
-          this.methodname = 'getDownloadedplanByBarHL'
+          this.methodName = 'getDownloadedplanByBarHL'
           this.optdevice = row.栏舍名称
           this.titlefname = '准确性详情——栏舍名称:' + row.栏舍名称
         } else if (this.tab.radio == 3) {

+ 3 - 3
src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -370,7 +370,7 @@ export default {
       this.chartLine = echarts.init(document.getElementById('chartLine'))
       var option = {
         title: { text: '', subtext: '' },
-        color: ['#38c193', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话,legend的颜色和折线的自定义颜色就一致了
+        color: ['#ff0000', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话,legend的颜色和折线的自定义颜色就一致了
         legend: [{
           itemWidth: 15, itemHeight: 7, right: '25%', textStyle: { fontSize: 12 },
           data: [{ name: '设计重量' }, { name: '实际重量' }]
@@ -420,7 +420,7 @@ export default {
           {type:'slider' },  //用于添加滑动条缩放,
         ],
         series: [
-          { symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#38c193' }}}},
+          { symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#ff0000' }}}},
           { symbol: 'none', name: '设计重量', type: 'line', step: 'middle', data: chartLine_data.data2 },
           { name: '开始重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
           { name: '结束重量', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
@@ -443,7 +443,7 @@ export default {
     },
     rowStyle({ row, rowIndex }) {
         let stylejson = {};
-        if (row.labnormal == 1) {
+        if (row.abnormal == 1) {
             stylejson.background = "#fb8072";// 背景颜色
             stylejson.maxHeight = '30px';// 背景颜色
             stylejson.height = '30px';// 背景颜色