Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/chart/work/index.vue

@@ -6,9 +6,9 @@
                <el-card>
                  <el-form :rules="rules" ref="formInline" :inline="true"
                  :model="formInline" class="demo-form-inline">
                    <el-form-item prop="date">
                      <p><span>*</span>检测日期:</p>
                    <el-form-item prop="date" label="检测日期:">
                      <el-date-picker
                        size="small"
                        v-model="formInline.date"
                        format="yyyy-MM-dd"
                        value-format="yyyy-MM-dd"
@@ -18,17 +18,16 @@
                        end-placeholder="结束日期">
                      </el-date-picker>
                    </el-form-item>
                    <el-form-item prop="type">
                      <p><span>*</span>检验类型:</p>
                      <el-select v-model="formInline.type" placeholder="采购入库">
                    <el-form-item prop="type" label="检验类型:">
                      <el-select size="small" v-model="formInline.type" placeholder="采购入库">
                        <el-option label="原材料" value="0"></el-option>
                        <el-option label="成品" value="1"></el-option>
                        <el-option label="委托品" value="2"></el-option>
                      </el-select>
                    </el-form-item>
                    <el-form-item class="buttons">
                      <el-button @click="resetForm('formInline')">清空</el-button>
                      <el-button type="primary" @click="onSubmit('formInline')">查询</el-button>
                      <el-button size="small" @click="resetForm('formInline')">清空</el-button>
                      <el-button size="small" type="primary" @click="onSubmit('formInline')">查询</el-button>
                    </el-form-item>
                  </el-form>
                </el-card>
@@ -64,7 +63,7 @@
        </el-row>
      </div>
      <div class="work-foot">
        <el-button type="primary">数据导出</el-button>
        <el-button size="small" type="primary">数据导出</el-button>
      </div>
  </div>
</template>
@@ -326,6 +325,9 @@
              axisPointer: {
                type: 'shadow'
              },
              nameTextStyle:{
                padding:20
              }
            }
          ],
          yAxis: [
@@ -374,7 +376,7 @@
                  return value + ' %';
                }
              },
              data: [{value:20},{value:40}],
              data: data2,
              itemStyle: {
                color: '#d2eec5'
              }
@@ -498,24 +500,14 @@
      z-index: 10;
      .demo-form-inline{
        margin: 0px 10px;
        p{
          margin: 0;
          font-size: 16px;
          font-weight: bold;
          span{
            font-size: 16px;
            font-weight: bold;
            color: red;
          }
        }
        .buttons{
          margin: 40px 0px 0px 50%;
          margin-left: 10%;
        }
      }
    }
    .work-center{
      margin: 0px 0px 150px 10px;
      padding: 18vh 0px 5px 0px;
      padding: 13vh 0px 5px 0px;
      .el-card{
        margin: 5px 0px;
        height:500px;