Merge remote-tracking branch 'origin/master'

jiang

2024-01-29 750bcef194d5e114d684e204b75b4581bb94183a

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java

@@ -94,13 +94,17 @@
                        String s3 = string.split(StringUtils.SPACE)[1];
                        if (StringUtils.isNotEmpty(s3)){
                            int i = Integer.parseInt(s3);
                            temp.put(i,size);
                            temp.put(i+1,size);
                        }
                    }
                }
                for (int i = 8; i < 23; i++) {
                    if (i==8){
                        arr.add(0);
                    }else {
                    arr.add(temp.getOrDefault(i, 0));
                }
                }
                vo.setData(arr);
                vo.setType("line");
                result.add(vo);

 jcdm-ui/src/views/dashboard/LineChart.vue

@@ -87,11 +87,16 @@
          boundaryGap: false,
          axisTick: {
            show: false
          }
          },
          type: 'category',
          axisLabel: {
            interval: 0,
            rotate: 45,
          },
        },
        grid: {
          left: 10,
          right: 10,
          left: 20,
          right: 20,
          bottom: 20,
          top: 30,
          containLabel: true
@@ -106,7 +111,9 @@
        yAxis: {
          axisTick: {
            show: false
          }
          },
          min:0,
          max: this.data.length === 0 ? 100 : null
        },
        legend: {
          data: this.legendTitle

 jcdm-ui/src/views/dashboard/PanelGroup.vue

@@ -14,7 +14,7 @@
            <span class="nextLine">{{data1}}</span>
          </div>
        </div>
        <div class="transition-box" style="background-color: cornflowerblue">
        <div class="transition-box" style="background-color: orange">
          <i class="el-icon-setting"></i>
          <el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
          <div>
@@ -31,7 +31,7 @@
            <span class="nextLine">{{data3}}</span>
          </div>
        </div>
        <div class="transition-box" style="background-color: green">
        <div class="transition-box" style="background-color: cornflowerblue">
          <i class="el-icon-cpu"></i>
          <el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
          <div>
@@ -39,7 +39,7 @@
            <span class="nextLine">{{data4}}</span>
          </div>
        </div>
        <div class="transition-box" style="background-color: orange">
        <div class="transition-box" style="background-color: green">
          <i class="el-icon-upload2"></i>
          <el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
          <div>

 jcdm-ui/src/views/main/bs/formulaChild/index.vue

@@ -236,7 +236,7 @@
          <el-input v-model="form.processesCode" placeholder="请输入工序" />
        </el-form-item>
        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="productCode" placeholder="请输入产品编号" />
          <el-input v-model="headerInformationData.productCode" :disabled="true" placeholder="请输入产品编号" />
        </el-form-item>
        <el-form-item label="操作内容" prop="operationSteps">
          <el-input v-model="form.operationSteps" placeholder="请输入操作内容" />
@@ -337,6 +337,7 @@
      // 总条数
      total: 0,
      formulaCode:  "",
      productCode:   "",
      // 配方配置子信息表格数据
      formulaChildList: [],
      // 弹出层标题
@@ -369,6 +370,7 @@
    this.queryParams.formulaCode = formulaCode;
    this.formulaCode = formulaCode;
    this.form.formulaCode = formulaCode;

    this.headerInformation();
    this.getList();
  },