春风项目四线(合箱线、总装线)
wujian
2024-01-27 2720ac86c1ff922f3335d2152ab00963b2e8e2f7
change 首页样式
已修改3个文件
29 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/dashboard/LineChart.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/dashboard/PanelGroup.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -94,12 +94,16 @@
                        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++) {
                    arr.add(temp.getOrDefault(i, 0));
                    if (i==8){
                        arr.add(0);
                    }else {
                        arr.add(temp.getOrDefault(i, 0));
                    }
                }
                vo.setData(arr);
                vo.setType("line");
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>