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

zhangshuaibao

2021-04-14 80eb8d433418b8e0f4556b96ddab2782a91f7433

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

 src/assets/css/map/map-panel-style.less

@@ -252,6 +252,11 @@
}

.hover-bottom:hover,
.hover-bottom.hover{
  box-shadow: 0 0 0.03rem #fff700 inset !important;
  color: #fff700 !important;
  cursor: pointer;
}
.active-button {
  border: 0.00521rem solid #fff700 !important;
  box-shadow: 0 0 0.03rem #fff700 !important;
@@ -365,10 +370,8 @@
    height: 0;
    background: none;
  }

  .cell {
    padding: 0 3px !important;

    i {
      display: block;
      font-style: normal;
@@ -393,7 +396,6 @@
}

.el-table th > .cell {
  border: 1px #396d83 solid;
  color: #00fff6;
}


 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -21,7 +21,7 @@
          </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
      <div class="public-bounced-content-right" >
        <public-video></public-video>
      </div>
    </div>

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

@@ -83,10 +83,8 @@
<style scoped lang="less">
.win {
  position: relative;
  /*margin-bottom: 13px;*/
  background:@background-color;
  border: 0.8px solid #396d83;
  /*height: 1.5rem;*/
}

.border_corner {
@@ -129,16 +127,17 @@
.tab {
  display: flex;
  border-bottom: 1px solid #396d83;
    padding:5px 10px
    padding:0.02rem 0.04rem;
}

.tab li {
  background-color: #243a55;
  line-height: 25px;
  line-height:0.15rem;
    height: 0.15rem;
  text-align: center;
  border-radius: 5px;
    margin-right: 10px;
    padding:0 15px
    margin-right: 0.04rem;
    padding:0 0.04rem;
}
.tab li.hover,
.tab li:hover {
@@ -148,20 +147,22 @@
}
.legend{
    position: absolute;
    top:10px;
    top:0.05rem;
    right: 0;
    display: flex;
    justify-items: center;
}
.legend i {
    display: block;
    width: 35px;
    height: 15px;
    margin:0 10px 0 3px;
    border-radius: 3px;
    width: 0.2rem;
    height: 0.09rem;
    margin:0 0.1rem 0 0.05rem;
    border-radius: 0.02rem;
}
.legend span{
    line-height: 15px;
    line-height: 0.09rem;
    height: 0.09rem;
    font-size: 0.06rem;
}

</style>

 src/components/BaseNav/PublicBounced/common/PublicTabs.vue

@@ -54,7 +54,7 @@

.win {
  position: relative;
  margin-bottom: 10px;
  margin-bottom: 0.04rem;
  background-color: @background-color;
  //width: 6rem;
  //height: 0.5rem;
@@ -65,11 +65,10 @@
  //height: 100%;

  .main-matter {
    font-size: 13px;
    font-size: 0.06rem;
    font-weight: normal;
    padding: 6px;
    padding: 0.04rem 0;
    border: 1px solid #396d83;

    ul {
      //width: 100%;
      //height: 100%;
@@ -77,22 +76,19 @@
      align-items: center;
      justify-content: space-around;
      flex-wrap: wrap;
      margin-bottom: -6px;

      margin-bottom: -0.04rem;
      li {
        margin-bottom: 6px;
        margin-bottom: 0.04rem;
        text-align: center;
        min-width: 32%;
        min-width: 31%;
        background-color: #243a55;
        color: #00d0f9;
        border-radius: 3px;
        border-radius: 0.02rem;
        font-size: 0.08rem;
        line-height: 0.09rem;
        padding: 0.03rem .5%;
      }

      //li:last-child {
      //  visibility: hidden
      //}
      .lastli {
      li:last-child {
        visibility: hidden
      }
    }

 src/components/BaseNav/PublicBounced/common/PublicVideo.vue

@@ -27,14 +27,13 @@
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  //height: 2rem;
  width: 3rem;

}

.main {
  border: 1px solid #396d83;
  //padding: 5px;
  height: 2rem;

  width: 2.5rem;
  height: 2.5rem;
  video {
    width: 100%;
    height: 100%;

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue

@@ -35,8 +35,8 @@
<!--            <el-option label="100" value="100"></el-option>-->
<!--          </el-select>-->
<!--        </div>-->
        <div class="detailbtn"  @click="onSubmit">查询</div>
        <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
        <div class="detailbtn hover-bottom"  @click="onSubmit">查询</div>
        <div class="detailbtn hover-bottom" @click="dialogVisible = true" >明细表</div>
      </div>
      <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
      </div>
@@ -682,42 +682,20 @@
</script>

<style scoped lang="less">
//.animation{
//  padding: 0 1rem;
//  overflow: hidden;
//  //width: 1rem;
//  .infomation{
//    display: flex;
//    //margin: 0 1rem;
//    overflow: hidden;
//    animation: move 1s linear 0s infinite;
//    @keyframes move {
//      0% {
//      }
//      100% {
//        transform: translateX(-10%);
//      }
//    }
//    /* 鼠标经过marquee 就停止动画 */
//    &:hover {
//      //z-index: 9999999;
//      animation-play-state: paused;
//    }
//  }
//}
  .grid-content {
    font-size: 8px;
    background-color: #2e4967;
    text-align: center;
    border-radius: 2px;
    margin-right: 10px;
    padding:0 10px
  }

.animation {
  //width: 600px;
  //height: 0.06rem;
  .infomation {
    padding: 5px 10px;
    padding: 0.02rem 0.04rem;
    .grid-content {
      font-size: 0.08rem;
      background-color: #2e4967;
      text-align: center;
      border-radius: 0.01rem;
      height: 0.15rem;
      line-height: 0.15rem;
      margin-right: 0.04rem;
      padding:0 0.04rem
    }
  }
}
    .form-echrts {
@@ -726,7 +704,7 @@
        //margin: 10px 10px 10px 10px;
        .from-search{
          display: flex;
          padding:5px;
          padding:0.02rem;
          >div{margin-left: 10px}
            .pickerMon{
              display: flex;
@@ -747,33 +725,26 @@
            }
            /deep/.el-input__inner{
                position: relative;
                width:140px;
                width:1rem;
                background-color: #2e4967;
                color: #fff;
                font-size: 12px;
                height: 24px;
                font-size: 0.08rem;
                height: 0.15rem;
                padding: 0;
                border-color:#00fff6;
              text-align: center;
                border:none;
                text-align: center;
                //padding-left:20px ;
                //padding: 0!important;
            }
          /deep/.el-input__icon{
            display: block;
            width: 140px;
            height: 22px;
            line-height: 22px;
            width:1rem;
            height: 0.15rem;
            line-height: 0.15rem;
            cursor: pointer;
            font-size: 0;
          }
            .echatsInput{
              color: #00ffff;
              background-color: #2e4967;
              border: none;
              border-radius: 6px;
              width: 80px;
              height: 22px;
            }

          input::-webkit-calendar-picker-indicator {
            opacity: 100;
          }
@@ -781,23 +752,18 @@
                background-color:#2e4967;
                text-align: center;
                padding: 0 7px;
                line-height: 20px;
                height: 0.15rem;
                line-height: 0.15rem;
                border-radius: 4px;
                margin-right: 6px;
            }
        }
        .el-dialog-div {
            //height: 50vh!important;
            overflow: auto;
            //overflow: hidden;
        }

        #echarts {
            margin: 0;
            padding: 0;
            //height: 3rem;
            //border: 1px solid #396d83;
            //margin: 10px 10px 10px 10px;
        }
    }
</style>

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

@@ -554,99 +554,87 @@
</script>

<style scoped lang="less">
.grid-content{
    font-size: 8px;
    background-color: #2e4967;
    text-align: center;
    border-radius: 2px;
    margin-right: 10px;
    padding:0 10px
}
.infomation {
  padding: 5px 10px;
}

.form-echrts {
    width: 100%;
    border-top: 1px solid #396d83;
    //margin: 10px 10px 10px 10px;
    .from-search{
        display: flex;
        padding:5px;
        >div{margin-left: 10px}
        .pickerMon{
            display: flex;
            >div:first-child {
                margin-right: 10px;
    .animation {
        .infomation {
            padding: 0.02rem 0.04rem;
            .grid-content {
                font-size: 0.08rem;
                background-color: #2e4967;
                text-align: center;
                border-radius: 0.01rem;
                height: 0.15rem;
                line-height: 0.15rem;
                margin-right: 0.04rem;
                padding:0 0.04rem
            }
            .pickerData{
                flex: 1;
        }
    }
    .form-echrts {
        width: 100%;
        border-top: 1px solid #396d83;
        //margin: 10px 10px 10px 10px;
        .from-search{
            display: flex;
            padding:0.02rem;
            >div{margin-left: 10px}
            .pickerMon{
                display: flex;
                >span{line-height: 22px}
                .pickerTable {
                    margin-left: 3px;
                >div:first-child {
                    margin-right: 10px;
                }
                .pickerData{
                    flex: 1;
                    display: flex;
                    >span{line-height: 22px}
                    .pickerTable {
                        margin-left: 3px;
                    }
                }
            }
        }
        /deep/.el-date-editor--datetime{
            width: 100%;
        }
        /deep/.el-input__inner{
            position: relative;
            width:140px;
            background-color: #2e4967;
            color: #ffffff;
            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;
            border: none;
            border-radius: 6px;
            width: 80px;
            height: 22px;
            text-align: center;
        }
        input::-webkit-calendar-picker-indicator {
            opacity: 100;
        }
        .detailbtn{
            background-color:#2e4967;
            text-align: center;
            padding: 0 7px;
            line-height: 24px;
            border-radius: 4px;
            margin-right: 6px;
        }
        .detailbtn:hover{
            box-shadow: 0 0 0.03rem #fff700 !important;
            color:#fff700 !important;
            cursor: pointer;
        }
    }
    .el-dialog-div {
        //height: 50vh!important;
        overflow: auto;
        //overflow: hidden;
    }
            /deep/.el-date-editor--datetime{
                width: 100%;
            }
            /deep/.el-input__inner{
                position: relative;
                width:1rem;
                background-color: #2e4967;
                color: #fff;
                font-size: 0.08rem;
                height: 0.15rem;
                padding: 0;
                border:none;
                text-align: center;
                //padding-left:20px ;
                //padding: 0!important;
            }
            /deep/.el-input__icon{
                display: block;
                width:1rem;
                height: 0.15rem;
                line-height: 0.15rem;
                cursor: pointer;
                font-size: 0;
            }

    #echarts {
        margin: 0;
        padding: 0;
            input::-webkit-calendar-picker-indicator {
                opacity: 100;
            }
            .detailbtn{
                background-color:#2e4967;
                text-align: center;
                padding: 0 7px;
                height: 0.15rem;
                line-height: 0.15rem;
                border-radius: 4px;
                margin-right: 6px;
            }
        }
        .el-dialog-div {
            overflow: auto;
        }
        #echarts {
            margin: 0;
            padding: 0;
        }
    }
}
</style>