loulijun2021
2022-09-23 699b2c16fe39f8a38f104f29b343bd06d1e53e82
1.修改品质异常排行echarts图2.调整收搜栏顶部与按钮对齐
已修改31个文件
187 ■■■■■ 文件已修改
src/styles/global.css 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/blmx.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/bzgz.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/pzyc.vue 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/rygz.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/wwgx.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/wxmx.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/jsqd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/wldw.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/yhqd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/zzjg.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/bybw.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/bybz.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djbw.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djbz.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djjl.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/sbqd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gdplgb.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/scdd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/template.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/ckdy.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/kwdy.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjybz.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjyjl.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjyxm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/qxdy.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/chda.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gxdy.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gylx.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/styles/global.css
@@ -39,6 +39,12 @@
  padding: 10px;
}
.bodySearchReset {
  display: flex;
  align-items: start;
  margin-top: 3px;
}
.bodyTopFormExpand {
  display: flex;
  justify-content: center;
src/views/bbgl/blmx.vue
@@ -55,7 +55,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/bbgl/bzgz.vue
@@ -42,7 +42,7 @@
            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作时间">
            <el-form-item v-show="isExpandForm" label="操作时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
                type="daterange"
@@ -59,7 +59,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/bbgl/pzyc.vue
@@ -1,8 +1,11 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="margin: 30px auto;width: 1600px;" :style="{height:mainHeight+'px'}">
        <div id="Echarts" style="width: 100%;height: 100%" />
      <div style="margin: 10px auto;width: 1680px;background-color: #fff" :style="{height:mainHeight+'px'}">
        <div style="margin: 20px auto;width: 1600px" :style="{height:(mainHeight-60)+'px'}">
          <div id="Echarts" style="width: 100%;height: 100%" />
        </div>
      </div>
    </div>
  </div>
@@ -50,12 +53,13 @@
          textAlign: 'center',
          textStyle: {
            // color: '#fff',
            color: '#00ffff',
            color: '#000',
            fontSize: '20',
            fontWeight: 'bolder'
          }
        },
        backgroundColor: '#323a5e',
        // backgroundColor: '#323a5e',
        backgroundColor: 'transparent',
        tooltip: {
          trigger: 'axis',
          axisPointer: { // 坐标轴指示器,坐标轴触发有效
@@ -69,29 +73,36 @@
          top: '15%',
          containLabel: true
        },
        legend: {
          data: ['1', '2', '3'],
          right: 10,
          top: 12,
          textStyle: {
            color: '#fff'
          },
          itemWidth: 12,
          itemHeight: 10
          // itemGap: 35
        },
        // legend: {
        //   data: ['1', '2', '3'],
        //   right: 10,
        //   top: 12,
        //   textStyle: {
        //     color: '#fff'
        //   },
        //   itemWidth: 12,
        //   itemHeight: 10
        //   // itemGap: 35
        // },
        xAxis: {
          name: '种类',
          nameTextStyle: {
            // color: ,
            color: '#000',
            fontSize: 16,
            lineHeight: 20
          },
          type: 'category',
          data: this.echartsData.map(r => r.name),
          splitLine: {
            show: false
          },
          axisTick: {
            show: true
          },
          axisLine: {
            show: true,
            lineStyle: {
              color: 'white'
              color: '#000'
            }
          },
          axisLabel: {
@@ -99,6 +110,7 @@
            rotate: 20,
            textStyle: {
              fontSize: 16,
              color: '#000',
              fontFamily: 'Microsoft YaHei'
            }
          }
@@ -106,25 +118,37 @@
        yAxis: {
          name: '数量',
          nameTextStyle: {
            // color: ,
            color: '#000',
            fontSize: 16,
            lineHeight: 20
          },
          type: 'value',
          // max: '1200',
          axisTick: {
            show: true
          },
          axisLine: {
            show: false,
            show: true,
            lineStyle: {
              color: 'white'
              color: '#000'
            }
          },
          splitLine: {
            show: true,
            show: false,
            lineStyle: {
              color: 'rgba(255,255,255,0.3)'
              // color: 'rgba(255,255,255,0.3)'
              color: '#000'
            }
          },
          axisLabel: {}
          axisLabel: {
            // interval: 0,
            // rotate: 20,
            textStyle: {
              fontSize: 16,
              color: '#000',
              fontFamily: 'Microsoft YaHei'
            }
          }
        },
        dataZoom: [{
          show: true,
@@ -138,21 +162,24 @@
          handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
          handleSize: '110%',
          handleStyle: {
            color: '#d3dee5'
            // color: '#d3dee5'
            color: '#000'
          },
          textStyle: {
            color: '#fff'
            color: '#000'
          },
          borderColor: '#90979c'
          // borderColor: '#90979c'
          borderColor: '#000',
          fillerColor: `rgba(42, 197, 137, 0.1)`
        }, {
          type: 'inside',
          show: true,
          height: 15,
          start: 1,
          end: 35
        }],
        }
        ],
        series: [{
          name: '数量',
          type: 'bar',
@@ -161,10 +188,12 @@
            normal: {
              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                offset: 0,
                color: '#fccb05'
                // color: '#fccb05'
                color: `rgba(42, 197, 137, 1)`// 0% 处的颜色
              }, {
                offset: 1,
                color: '#f5804d'
                color: `rgba(187, 236, 218, 1)` // 100% 处的颜色
                // color: '#f5804d'
              }]),
              barBorderRadius: 12
            }
@@ -186,7 +215,6 @@
          //         }]),
          //         barBorderRadius: 11,
          //     }
          //   },
          //   data: [400, 500, 500, 500, 500, 400,400, 500, 500]
          // },
src/views/bbgl/rygz.vue
@@ -42,7 +42,7 @@
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间">
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
@@ -59,7 +59,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/bbgl/wwgx.vue
@@ -61,7 +61,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/bbgl/wxmx.vue
@@ -63,7 +63,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/jcsz/jsqd.vue
@@ -47,7 +47,7 @@
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/jcsz/wldw.vue
@@ -49,7 +49,7 @@
              <el-input v-model="form.CreateUser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/jcsz/yhqd.vue
@@ -71,7 +71,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: flex-start;margin-top: 3px">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/jcsz/zzjg.vue
@@ -22,7 +22,13 @@
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="组织类型" style=" display: flex;">
              <el-select v-model="form.OrgType" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.OrgType"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.value"
@@ -35,7 +41,7 @@
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
@@ -472,13 +478,15 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
.el-icon-edit-outline {
  margin-right: 15px;
}
::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
@@ -536,8 +544,8 @@
  background-color: #f8f8fa;
}
::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -554,6 +562,15 @@
  margin-bottom: 0;
}
//::v-deep .cell {
//  display: flex;
//  flex-wrap: nowrap;
//}
//
//::v-deep .has-gutter .cell {
//  display: flex;
//  flex-wrap: nowrap;
//}
</style>
<style>
src/views/sbgl/bybw.vue
@@ -36,7 +36,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/sbgl/bybz.vue
@@ -25,7 +25,7 @@
              <el-input v-model="form.repairstanddescr" placeholder="请输入" style="width: 200px" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/sbgl/djbw.vue
@@ -45,7 +45,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/sbgl/djbz.vue
@@ -32,7 +32,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/sbgl/djjl.vue
@@ -62,7 +62,7 @@
            <!--              </el-select>-->
            <!--            </el-form-item>-->
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/sbgl/sbqd.vue
@@ -96,7 +96,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/scgl/gd.vue
@@ -93,7 +93,7 @@
            </el-form-item>
          </div>
          <div>
            <div style="display: flex;align-items: start;justify-content:end;margin-top: 5px;z-index: 2">
            <div class="bodySearchReset">
              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
              <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
            </div>
src/views/scgl/gdplgb.vue
@@ -53,7 +53,7 @@
              <el-input v-model="form.createdate" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/scgl/scdd.vue
@@ -96,7 +96,7 @@
            </el-form-item>
          </div>
          <div>
            <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
            <div class="bodySearchReset">
              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
              <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
            </div>
src/views/template.vue
@@ -35,7 +35,7 @@
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/wlgl/ckdy.vue
@@ -37,7 +37,7 @@
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/wlgl/kwdy.vue
@@ -46,7 +46,7 @@
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zlgl/gxjybz.vue
@@ -25,7 +25,7 @@
              <el-input v-model="form.staneddescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zlgl/gxjyjl.vue
@@ -55,7 +55,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zlgl/gxjyxm.vue
@@ -25,7 +25,7 @@
              <el-input v-model="form.itemdescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zlgl/qxdy.vue
@@ -26,7 +26,7 @@
              <el-input v-model="form.defectdescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zzmx/chda.vue
@@ -96,7 +96,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zzmx/gxdy.vue
@@ -58,7 +58,7 @@
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zzmx/gylx.vue
@@ -29,7 +29,7 @@
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
src/views/zzmx/jpgj.vue
@@ -88,7 +88,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>