merge: 处理冲突

nezha-fronted/src/components/page/dashboard/overview/overview2.vue

@@ -1566,89 +1566,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-  @import "./overview2.scss";
-
-  .leaflet-control-zoom{
-    border: 1px solid #E7EAED !important;
-    box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77) !important;
-    .leaflet-control-zoom-out,.leaflet-control-zoom-in{
-      opacity: .7;
-      background: #FFF;
-    }
-  }
-  .leaflet-control-attribution{
-    background-color: unset !important;
-    color: rgba(178, 178, 178, 0.77);
-  }
-  @keyframes error-animation{
-    0% {fill-opacity:.5}
-    50% {fill-opacity:0.75}
-    100% {fill-opacity:1}
-  }
-  .error-item{
-    color: #FADED7 ;
-    animation: error-animation 1s infinite ease-in-out;
-    animation-direction:normal;
-  }
-  .real-marker{
-    pointer-events: none;
-  }
-  .error-color{
-
-  }
-  .my-pane {
-    position: fixed;
-    width: 1px;
-    z-index: 99999;
-    height: 1px;
-    background-color: transparent;
-  }
-  .leaflet-bottom{
-    z-index: 409;
-  }
-  .el-carousel--horizontal{
-    height: 100%;
-  }
-  .el-carousel__container{
-    height: calc(100% - 36px);
-  }
-  .el-carousel__item .project-name {
-    font-size: 18px;
-    margin: 0;
-    position: absolute;
-    z-index: 1;
-  }
-
-  .el-carousel__item:nth-child(2n) {
-    /*background-color: #99a9bf;*/
-  }
-
-  .el-carousel__item:nth-child(2n+1) {
-    /*background-color: #d3dce6;*/
-  }
-</style>
-<style scoped>
-  .maskLayer{
-    width: 100%;
-    height: 100%;
-    opacity: 0;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 10;
-    cursor: pointer;
-  }
-  /deep/ .el-carousel__indicator--horizontal .el-carousel__button{
-    background-color: #C0C4CC;
-    opacity: .24;
-    height: 10px;
-    width: 10px;
-    border-radius: 50%;
-  }
-  /deep/ .el-carousel__indicator--horizontal.is-active .el-carousel__button{
-    opacity: 1;
-  }
-
-</style>