fix 作业指导

wujian

2024-01-19 717bf861cecf28eacc3cb1488f1b6acae3fee4cb

fix 作业指导

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -35,6 +35,8 @@
    @Autowired
    private ProductProcessService productProcessService;

    private static final String ZERO = "0";

    /**
     * 查询配方配置子信息列表
     */
@@ -49,7 +51,8 @@
            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
            formulaChildInfo.setImg(formulaChildInfo.getPicture());
        }
        list = list.stream().sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
        list = list.stream()
                .filter(x -> !ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
        return getDataTable(list);
    }


 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -149,7 +149,7 @@
  mounted() {
    this.getStationConf()
    // this.changeProducts(this.productCode)
    this.changeProducts("2V91")
    // this.changeProducts("2V91")
    this.getNowTime()
    // this.autoShow()
  },
@@ -166,8 +166,12 @@
        listStationConf(queryParams).then(response => {
          this.locationName = response.rows[0].processesName
          this.locationCode = response.rows[0].processesCode
          console.log('llllll',this.locationCode)
          this.changeProducts("2V91")
        });

      });

    },
    //获取当前时间
    getNowTime () {
@@ -198,6 +202,10 @@
    setImg(index) {
      this.address = this.tableData[index].address
      this.src = this.tableData[index].img
    },
    cleanImg(){
      this.address = ''
      this.src = ''
    },
    setBg() {
      if (document.getElementById('outerDiv' + (this.tableData.length - 1)).style.background === 'yellow') {
@@ -238,10 +246,10 @@
    },
    changeProducts(val){

      this.getStationConf()

      console.log("------更换图片",val)
      console.log("------目录==============",this.tableData)
      console.log("locationCode",this.locationCode)
      this.productCode = val
      const _this = this

@@ -251,6 +259,7 @@
      this.queryParams.processesCode = this.locationCode
      listFormulaChild(this.queryParams).then(response => {
        this.tableData = [];
        this.cleanImg()
        this.tableData = response.rows;
        this.$nextTick(() => {
          clearInterval(this.intervalId);