Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

shuishen

2022-09-26 73a4210649216075716f7e25de7f18862d124e9b

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/styles/dc/index.css

New file
@@ -0,0 +1,57 @@
.dc-distance-legend .label {
  color: #000 !important;
}

.dc-distance-legend .scale-bar {
  border-color: #000 !important;
}

.dc-location-bar {
  left: 50% !important;
  bottom: 10px !important;
  transform: translate(-50%, 0);
  background-color: rgba(16, 29, 74, 0.9) !important;
}

.dc-zoom-controller {
  top: auto !important;
  bottom: 56px !important;
  left: 420px !important;
  width: 36px !important;
  height: auto !important;
  border-radius: 5px !important;
  background: #fff !important;
  z-index: 101 !important;
  background-color: rgba(16, 29, 74, 0.9) !important;
}

.dc-zoom-controller > div {
  display: flex;
  align-items: center;
  justify-content: center;
  width: 36px !important;
  height: 36px !important;
}

.dc-zoom-controller > div svg {
  width: 20px !important;
  height: 20px !important;
  fill: #fff !important;
}

.screen-full-btn {
  display: flex;
  align-items: center;
  justify-content: center;
  position: absolute;
  left: 420px;
  bottom: 10px;
  width: 36px;
  height: 36px;
  font-size: 20px;
  color: #fff;
  background: #fff;
  border-radius: 5px;
  z-index: 99;
  background-color: rgba(16, 29, 74, 0.9) !important;
}

 src/styles/dc/index.min.css

New file
@@ -0,0 +1 @@
.dc-distance-legend .label{color:#000 !important}.dc-distance-legend .scale-bar{border-color:#000 !important}.dc-location-bar{left:50% !important;bottom:10px !important;transform:translate(-50%, 0);background-color:rgba(16,29,74,0.9) !important}.dc-zoom-controller{top:auto !important;bottom:56px !important;left:420px !important;width:36px !important;height:auto !important;border-radius:5px !important;background:#fff !important;z-index:101 !important;background-color:rgba(16,29,74,0.9) !important}.dc-zoom-controller>div{display:flex;align-items:center;justify-content:center;width:36px !important;height:36px !important}.dc-zoom-controller>div svg{width:20px !important;height:20px !important;fill:#fff !important}.screen-full-btn{display:flex;align-items:center;justify-content:center;position:absolute;left:420px;bottom:10px;width:36px;height:36px;font-size:20px;color:#fff;background:#fff;border-radius:5px;z-index:99;background-color:rgba(16,29,74,0.9) !important}

 src/styles/dc/index.scss

@@ -13,6 +13,8 @@
    left: 50% !important;
    bottom: 10px !important;
    transform: translate(-50%, 0);
    background-color: rgba(16, 29, 74, 0.9)!important;

}

.dc-zoom-controller {
@@ -24,6 +26,7 @@
    border-radius: 5px !important;
    background: #fff !important;
    z-index: 101 !important;
    background-color: rgba(16, 29, 74, 0.9)!important;

    &>div {
        display: flex;
@@ -36,7 +39,7 @@
        svg {
            width: 20px !important;
            height: 20px !important;
            fill: #666 !important;
            fill: #fff !important;
        }
    }
}
@@ -51,10 +54,12 @@
    width: 36px;
    height: 36px;
    font-size: 20px;
    color: #5a5e66;
    color: #fff;
    background: #fff;
    border-radius: 5px;
    z-index: 99;
    background-color: rgba(16, 29, 74, 0.9)!important;


    // &.hover-effect {
    //     cursor: pointer;

 src/styles/element-ui/element-ui.css

@@ -195,3 +195,31 @@
  border: none;
  border-top: 2px solid #293f6f !important;
}

.el-checkbox {
  display: flex;
  align-items: center;
}

.el-checkbox .el-checkbox__input.is-focus .el-checkbox__inner {
  border-color: #14327b !important;
  font-size: 16px;
}

.el-checkbox .el-checkbox__inner {
  width: 20px;
  height: 20px;
  border-radius: 2px;
}

.el-checkbox .el-checkbox__inner::after {
  height: 12px;
  left: 7px;
}

.el-checkbox .el-checkbox__label {
  line-height: 20px;
  padding-left: 8px;
  font-size: 16px;
  color: #fff;
}

 src/styles/element-ui/element-ui.min.css

@@ -1 +1 @@
.el-table tr th{background:#005ca9 !important;color:#fff !important}.el-table tr:nth-child(2n){background:#14327b;color:#fff !important}.el-table tr:nth-child(2n-1){background:#1d2669;color:#fff}.el-table tr:hover td{cursor:pointer;background-color:rgba(222,176,176,0.2) !important}.el-table::before{height:0px}.el-pagination.is-background .el-pager li:not(.disabled).active{background-color:#005ca9;color:#ffffff !important}.el-pagination.is-background .btn-next,.el-pagination.is-background .btn-prev,.el-pagination.is-background .el-pager li{background-color:#fff}.el-pagination.is-background .el-pager li:hover{color:#1a3252}.el-input--suffix .el-input__inner{padding-right:84px}.el-input__inner{background-color:#14327b;color:#fff;border:1px solid #005ca9}.el-select-dropdown{border:1px solid #005ca9}.el-select-dropdown__item{font-size:7px;color:#fff;font-weight:200;background-color:#26426a !important}.el-select-dropdown__list{padding:0}.el-popper[x-placement^="bottom"]{margin-top:0px}.el-popper .popper__arrow,.el-popper .popper__arrow::after{display:none}.el-select-dropdown__item:hover{background-color:rgba(0,92,169,0.3) !important}.el-select-dropdown__item:onBlur{background-color:rgba(0,92,169,0.3)}.el-picker-panel{background-color:#14327b;color:#ffffff;border:1px solid #93bee7 !important}.el-picker-panel .el-date-range-picker__time-header{border-bottom:1px solid #93bee7 !important}.el-picker-panel__icon-btn{width:8px;height:10px;color:#5a81fd !important}.el-picker-panel .el-input__inner{background-color:#19466f;border:#75ebf2;color:#e8fdff}.el-picker-panel .el-date-range-picker__content.is-left,.el-picker-panel .el-date-range-picker__content.is-right{border-right:1px solid #93bee7 !important;background-size:100% 100%}.el-picker-panel .el-date-range-picker__header{color:#75ebf2}.el-picker-panel .el-date-table th{color:#c3e3ec}.el-picker-panel .el-date-table td.available{width:14px;height:14px;font-size:16px;font-family:Source Han Sans CN;font-weight:bold;color:#6ce6cb}.el-picker-panel .el-date-table td.available:hover{color:#ffffff}.el-date-table td.in-range div,.el-date-table td.in-range div:hover,.el-date-table.is-week-mode .el-date-table__row.current div,.el-date-table.is-week-mode .el-date-table__row:hover div{background-color:#4c77b3 !important}.el-time-panel{background-color:#1b3e6f !important;border:1px solid #93bee7 !important}.el-time-spinner__item{color:#c3e3ec !important}.el-time-spinner__item:hover:not(.disabled):not(.active){background:#4c77b3 !important}.el-time-panel__btn{color:#adcfff !important}.el-picker-panel__footer{background-color:#1b3e6f !important}.el-icon-d-arrow-left{color:#1475e3 !important}.el-date-table th{border-bottom:1px solid #293f6f !important}.el-time-panel__content::after,.el-time-panel__content::before{border-bottom:1px solid #293f6f !important;border-top:1px solid #293f6f !important}.el-time-panel{background-color:#040d27 !important}.el-time-panel__btn.confirm{background-color:#040d27 !important;color:#1475e3 !important}.el-time-panel__btn.cancel{background-color:#040d27 !important;color:#6397d1 !important}.el-time-panel__footer{border-top:none !important}.el-time-panel{border:none;border-top:2px solid #293f6f !important}
.el-table tr th{background:#005ca9 !important;color:#fff !important}.el-table tr:nth-child(2n){background:#14327b;color:#fff !important}.el-table tr:nth-child(2n-1){background:#1d2669;color:#fff}.el-table tr:hover td{cursor:pointer;background-color:rgba(222,176,176,0.2) !important}.el-table::before{height:0px}.el-pagination.is-background .el-pager li:not(.disabled).active{background-color:#005ca9;color:#ffffff !important}.el-pagination.is-background .btn-next,.el-pagination.is-background .btn-prev,.el-pagination.is-background .el-pager li{background-color:#fff}.el-pagination.is-background .el-pager li:hover{color:#1a3252}.el-input--suffix .el-input__inner{padding-right:84px}.el-input__inner{background-color:#14327b;color:#fff;border:1px solid #005ca9}.el-select-dropdown{border:1px solid #005ca9}.el-select-dropdown__item{font-size:7px;color:#fff;font-weight:200;background-color:#26426a !important}.el-select-dropdown__list{padding:0}.el-popper[x-placement^="bottom"]{margin-top:0px}.el-popper .popper__arrow,.el-popper .popper__arrow::after{display:none}.el-select-dropdown__item:hover{background-color:rgba(0,92,169,0.3) !important}.el-select-dropdown__item:onBlur{background-color:rgba(0,92,169,0.3)}.el-picker-panel{background-color:#14327b;color:#ffffff;border:1px solid #93bee7 !important}.el-picker-panel .el-date-range-picker__time-header{border-bottom:1px solid #93bee7 !important}.el-picker-panel__icon-btn{width:8px;height:10px;color:#5a81fd !important}.el-picker-panel .el-input__inner{background-color:#19466f;border:#75ebf2;color:#e8fdff}.el-picker-panel .el-date-range-picker__content.is-left,.el-picker-panel .el-date-range-picker__content.is-right{border-right:1px solid #93bee7 !important;background-size:100% 100%}.el-picker-panel .el-date-range-picker__header{color:#75ebf2}.el-picker-panel .el-date-table th{color:#c3e3ec}.el-picker-panel .el-date-table td.available{width:14px;height:14px;font-size:16px;font-family:Source Han Sans CN;font-weight:bold;color:#6ce6cb}.el-picker-panel .el-date-table td.available:hover{color:#ffffff}.el-date-table td.in-range div,.el-date-table td.in-range div:hover,.el-date-table.is-week-mode .el-date-table__row.current div,.el-date-table.is-week-mode .el-date-table__row:hover div{background-color:#4c77b3 !important}.el-time-panel{background-color:#1b3e6f !important;border:1px solid #93bee7 !important}.el-time-spinner__item{color:#c3e3ec !important}.el-time-spinner__item:hover:not(.disabled):not(.active){background:#4c77b3 !important}.el-time-panel__btn{color:#adcfff !important}.el-picker-panel__footer{background-color:#1b3e6f !important}.el-icon-d-arrow-left{color:#1475e3 !important}.el-date-table th{border-bottom:1px solid #293f6f !important}.el-time-panel__content::after,.el-time-panel__content::before{border-bottom:1px solid #293f6f !important;border-top:1px solid #293f6f !important}.el-time-panel{background-color:#040d27 !important}.el-time-panel__btn.confirm{background-color:#040d27 !important;color:#1475e3 !important}.el-time-panel__btn.cancel{background-color:#040d27 !important;color:#6397d1 !important}.el-time-panel__footer{border-top:none !important}.el-time-panel{border:none;border-top:2px solid #293f6f !important}.el-checkbox{display:flex;align-items:center}.el-checkbox .el-checkbox__input.is-focus .el-checkbox__inner{border-color:#14327b !important;font-size:16px}.el-checkbox .el-checkbox__inner{width:20px;height:20px;border-radius:2px}.el-checkbox .el-checkbox__inner::after{height:12px;left:7px}.el-checkbox .el-checkbox__label{line-height:20px;padding-left:8px;font-size:16px;color:#fff}

 src/styles/element-ui/element-ui.scss

@@ -194,3 +194,38 @@
    border-top: 2px solid #293f6f !important;
  }
  


  

//复选框   el-checkbox
// ------------------------------------------------------------------

.el-checkbox {
    display: flex;
    align-items: center;
    .el-checkbox__input.is-focus .el-checkbox__inner {
        border-color: rgba(20, 50, 123, 1.0)!important;
        font-size: 16px;
      }
    .el-checkbox__inner {
      width: 20px;
      height: 20px;
      border-radius: 2px;

       //对勾大小和位置
      &::after {
        height: 12px;
        left: 7px;
      }
    }
    .el-checkbox__label {
      line-height: 20px;
      padding-left: 8px;
      font-size: 16px;
      color: #fff;
    }
}


  

 src/views/home/index.vue

@@ -105,8 +105,8 @@
                        :cell-style="{'text-align':'center','borderColor':'#324e75'}"
                        :row-class-name="tableRowClassName"
                    >
                        <el-table-column prop="type" label="人员类型" width="80"></el-table-column>
                        <el-table-column prop="num" label="人数" width="180"></el-table-column>
                        <el-table-column prop="type" label="人员类型" width="100"></el-table-column>
                        <el-table-column prop="num" label="人数" width="160"></el-table-column>
                        <el-table-column prop="radio" label="占比" width="120"></el-table-column>
                    </el-table>
                </div>
@@ -1240,7 +1240,7 @@
        display: flex;
        position: fixed;
        left: 50%;
        bottom: 80px;
        bottom: 40px;
        transform: translate(-50%, 0);

        .layers-control-btn {
@@ -1248,9 +1248,9 @@
            justify-content: center;
            align-items: center;
            margin: 0 10px;
            width: 160px;
            height: 60px;
            background: rgba(7, 22, 37, 0.8);
            width: 78px;
            height: 29px;
            background-color: rgba(16, 29, 74, 0.9);
        }
    }


 src/views/house/index.vue

@@ -44,9 +44,24 @@
            </div>

            <div class="nav-tab">
                <div class="nav" @click="navClick" data-type="0">基本信息</div>
                <div class="nav" @click="navClick" data-type="1">警务信息</div>
                <div class="nav" @click="navClick" data-type="2">预警信息</div>
                <div
                    class="nav"
                    :class="navType == 0?'choosed':''"
                    @click="navClick"
                    data-type="0"
                >基本信息</div>
                <div
                    class="nav"
                    :class="navType == 1?'choosed':''"
                    @click="navClick"
                    data-type="1"
                >警务信息</div>
                <div
                    class="nav"
                    :class="navType == 2?'choosed':''"
                    @click="navClick"
                    data-type="2"
                >预警信息</div>
            </div>

            <div class="base-info" v-show="navType == 0">
@@ -724,6 +739,9 @@
                border-bottom: 1px solid #33566c;
                cursor: pointer;
            }
            .choosed {
                background-color: rgba(0, 92, 169, 1);
            }
        }

        .base-info {