Merge branch 'bfMonitor' of http://47.97.1.152:5880/r/~whycq/private into b...

whycq

2022-10-22 b6a9f27e73f8c2e3923b984f0959f722ed751edd

 Monitor-APP/pages/index/data.js

@@ -29,70 +29,63 @@
//          {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0}],
//          "emptyMk":false}]} 
   getEEE() {
      var  result = {'data':{"msg":"操作成功","code":200,"data":"操作成功"}}
      var result = ycqdata.dataEEE
      let that = this
      let res = result.data
      if (res.data) {
      if (res.data && res.data !== "") {
         that.title = ''
         that.staNo = ''
         that.pakinShow = false
         that.errorShow = true
         that.newspaper = res.data
         that.move = false
         that.errorPaper = res.data
         that.move = false // 显示
      } else {
         that.errorPaper = ''
         that.errorShow = false
         if (that.pakinShow) {
            return;
         } else {
            that.move = true // 隐藏
         }
      }
   },
   getYYY() {
      var result = {
         'data':{"msg":"操作成功","code":200,"data":[{
            "title":"全板出库",
            "workNo":7016,
            "ioType":101, 
            "staNo":188,
            "sourceStaNo":null,
            "locNo":null,
            "sourceLocNo":"0900107",
            "matDtos":[
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037502300","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505146","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504801","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507729","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507727","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507731","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504807","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504805","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504797","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504794","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504791","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504793","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505141","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507728","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504810","count":1.0},
               {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0},
               ],
               "emptyMk":false}]} }
      var result = ycqdata.dataYYY
      let that = this
      var newsData = ''
      var str = ''
      let res = result.data
      if (res.data[0].matDtos.length > 0) {
         if (res.data[0].ioType === 101) {
            that.title = '全板出库'
         } else if(res.data[0].ioType === 103) {
            that.title = '检料出库'
         }
         that.staNo = '目标站' + res.data[0].staNo
         for (var i = 0; i < res.data[0].matDtos.length; i++) {
            str = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch + '\n'
            newsData = newsData + str 
         }
         if (that.errorShow) {
            return;
      if(res.data && res.data !== null) {
         if (res.data[0].matDtos.length > 0) {
            that.pakinShow = true
            that.pakinGun = true
            if (res.data[0].ioType === 101) {
               that.title = '全板出库'
            } else if(res.data[0].ioType === 103) {
               that.title = '检料出库'
            }
            that.staNo = '目标站' + res.data[0].staNo
            for (var i = 0; i < res.data[0].matDtos.length; i++) {
               str = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch + '\n'
               newsData = newsData + str 
            }
            if (that.errorShow) {
               // that.pakinShow = false
               return;
            } else {
               that.newspaper = newsData
               that.move = false
            }
            if (res.data[0].matDtos.length <= 8) {
               that.errorShow = true
               that.pakinShow = true
               that.pakinGun  = false
            }
         } else {
            that.newspaper = newsData
            that.move = false
         }
            that.move = true
            }
      } else {
         that.move = true
      }
		
   },