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

徐旺旺

2021-04-09 68ce857d08df35806175b44e710fb4b2d01e3a36

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

@@ -59,14 +59,16 @@
                    <div class="pickerData">
                      <span> 开始时间:</span>
                      <span class="pickerTable"><el-date-picker
                          type="date">
                          type="datetime"
                          v-model="value1">
                      </el-date-picker></span>
                    </div>
                    <div class="pickerData">
                      <span >结束时间:</span>
                      <span class="pickerTable">
                        <el-date-picker
                            type="date"
                            type="datetime"
                            v-model="value2"
                        >
                      </el-date-picker>
                      </span>
@@ -74,25 +76,15 @@
                  </div>
                </el-col>
                <el-col :span="5">
<!--                  采样点数:-->
<!--                  <input list="source" id="ipt" class="echatsInput">-->
<!--                  <datalist id="source">-->
<!--                    <option value="0" />-->
<!--                    <option value="25" />-->
<!--                    <option value="50" />-->
<!--                    <option value="75" />-->
<!--                    <option value="100" />-->
<!--                  </datalist>-->
                  <div data-tap-disabled="true">
                    采样点数:
                    <select id="source">
                      <option value="1">0</option>
                      <option value="2">25</option>
                      <option value="3">50</option>
                      <option value="4">75</option>
                      <option value="5">100</option>
                    </select>
                  </div>
                  <input list="source" id="ipt" class="echatsInput">
                  <datalist id="source">
                    <option value="0" />
                    <option value="25" />
                    <option value="50" />
                    <option value="75" />
                    <option value="100" />
                  </datalist>
                </el-col>
                <el-col class="detailbtn" :span="2" @click="onSubmit">查询</el-col>
                <el-col :span="3">
@@ -111,7 +103,7 @@
                </el-col>
              </el-row>
            </div>
            <div style="width:100%;height:200px;" id="echarts" ref="main">
            <div style="width:100%;height:300px;" id="echarts" ref="main">
            </div>
        </div>
    </div>
@@ -127,6 +119,8 @@
  },
  data () {
    return {
      value1: '',
      value2: '',
      watchData: [],
      dialogVisible: false,
      dataDate: [],
@@ -347,7 +341,7 @@

.form-echrts {
  width: 100%;
  height: 1rem;
  height: 2rem;
  border-top: 1px solid #396d83;
  //margin: 10px 10px 10px 10px;
  .from-search{
@@ -360,17 +354,27 @@
        .pickerTable{
          margin-left: 6px;
          width: 40px;
          /deep/.el-icon-date {
            display:none;

          /deep/.el-input__icon {
            width: 0.9rem;
            font-size: 0;
          }
        }
      }
    }
    /deep/.el-date-editor--datetime{
      width: 100%;
    }
    /deep/.el-input__inner{
      width: 60px!important;
      height: 16px!important;
      position: relative;
      width: 0.9rem!important;
      height: 0.125rem!important;
      background-color: #2e4967;
      padding: 0!important;
      color: #ffffff;
      font-size: 8px;
      padding: 0;
      //padding-left:20px ;
      //padding: 0!important;
    }
    .echatsInput{
      color: #00ffff;