Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-04-12 c63087b698d27edf8d5867a78a04a0713498a0c2

 src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue

@@ -15,31 +15,25 @@
          <div class="pickerData">
            <span> 开始时间:</span>
            <span class="pickerTable">
                          <el-date-picker  type="datetime"   v-model="value1">
                      </el-date-picker>
                      </span>
              <el-date-picker  type="datetime"   v-model="value1"></el-date-picker>
            </span>
          </div>
          <div class="pickerData">
            <span >结束时间:</span>
            <span class="pickerTable">
                        <el-date-picker
                            type="datetime"
                            v-model="value2"
                        >
                      </el-date-picker>
                      </span>
              <el-date-picker type="datetime"  v-model="value2"></el-date-picker>
            </span>
          </div>
        </div>
        <div>
          采样点数:
          <input list="source" id="ipt" class="echatsInput" @change="datalistBtn">
          <datalist id="source" @click="datalistBtn">
            <option value="0" />
            <option value="25" />
            <option value="50" />
            <option value="75" />
            <option value="100" />
          </datalist>
          <el-select v-model="formInline.region" placeholder="50">
            <el-option label="0" value="0"></el-option>
            <el-option label="25" value="25"></el-option>
            <el-option label="50" value="50"></el-option>
            <el-option label="75" value="75"></el-option>
            <el-option label="100" value="100"></el-option>
          </el-select>
        </div>
        <div class="detailbtn"  @click="onSubmit">查询</div>
        <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
@@ -88,7 +82,6 @@
  },
  methods: {
    onSubmit () {
      console.log(this.value1)
      console.log('submit!')
    },
    drawChart: function () {
@@ -309,21 +302,18 @@
//  }
//}
  .grid-content {
    font-size: 8px !important;
    font-size: 8px;
    background-color: #2e4967;
    text-align: center;
    margin: 0 2px 4px 2px;
    border-radius: 2px;
    >i{
      font-style: normal;
      color: #eef309;
    }
    margin-right: 10px;
    padding:0 10px
  }
.animation {
  //width: 600px;
  //height: 0.06rem;
  .Infomation {
    margin-left: 10px;
  .infomation {
    padding: 5px 10px;
  }
}
    .form-echrts {
@@ -343,18 +333,8 @@
                    flex: 1;
                    display: flex;
                      >span{line-height: 22px}
                    .pickerTable{
                        margin-left: 6px;
                      /deep/.el-input{
                        font-size: 0px;
                        .el-input__prefix{
                          width: 100%;
                        }
                      }
                        /deep/.el-input__icon {
                          width: 100%;
                            font-size: 0;
                        }
                    .pickerTable {
                      margin-left: 3px;
                    }
                }
            }
@@ -363,16 +343,25 @@
            }
            /deep/.el-input__inner{
                position: relative;
                width: 0.9rem!important;
                height: 0.125rem!important;
                width:140px;
                background-color: #2e4967;
                color: #ffffff;
                color: #fff;
                font-size: 12px;
                height: 24px;
                padding: 0;
                border-color:#00fff6;
              text-align: center;
                //padding-left:20px ;
                //padding: 0!important;
            }
          /deep/.el-input__icon{
            display: block;
            width: 140px;
            height: 22px;
            line-height: 22px;
            cursor: pointer;
            font-size: 0;
          }
            .echatsInput{
              color: #00ffff;
              background-color: #2e4967;