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

guanqb

2022-09-27 27403bb0b28a40baa57f8ae16c6dc234e8821163

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

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

@@ -1,8 +1,7 @@
// 表格  el-table!
// ------------------------------------------------------------------

.el-table tr th {
    background: rgba(0, 92, 169, 1.0) !important;
    background: rgb(1, 76, 137) !important;
    color: #fff !important;
}


 src/views/activity/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-26 16:23:34
 * @LastEditTime: 2022-09-27 11:14:20
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -525,6 +525,7 @@
        height: 100%;
        color: #fff;
        background: $bg-color;

        .title {
            height: 51px;
            line-height: 58px;
@@ -532,6 +533,7 @@
            font-size: 24px;
            letter-spacing: 20px;
        }

        .search-box {
            padding: 0 10px;

@@ -548,37 +550,42 @@
                .category-value {
                    flex: 1;
                }

                input {
                    width: 209px;
                    height: 32px;
                    font-size: 12px;
                    text-indent: 1em;
                    color: #ffffff;
                    background-color: rgba(20, 50, 123, 1);
                    border: 1px solid rgba(20, 50, 123, 1);
                    background-color: transparent;
                    border: 1px solid rgb(0, 92, 169);
                    border-radius: 5px 0 0 5px;
                }

                input:focus {
                    outline: none;
                }

                input::-webkit-input-placeholder {
                    color: rgba(238, 238, 238, 0.7);
                }

                button {
                    font-size: 20px;
                    font-weight: 700;
                    width: 60px;
                    height: 32px;
                    background-color: rgba(29, 38, 105, 1);
                    background-color: rgb(0, 92, 169);
                    color: #fff;
                    border: 1px solid rgba(29, 38, 105, 1);
                    border: 1px solid rgb(0, 92, 169);
                    cursor: pointer;
                    border-radius: 0 5px 5px 0;
                    vertical-align: top;
                }

                button:active {
                    background-color: rgba(20, 50, 123, 1);
                    border: 1px solid rgba(20, 50, 123, 1);
                    background-color: rgb(0, 92, 169);
                    border: 1px solid rgb(0, 92, 169);
                }
            }
        }
@@ -598,8 +605,9 @@
                .row-box {
                    margin: 10px;
                    padding: 10px;
                    background: rgba(15, 31, 50, 0.5);
                    background: rgba(29, 38, 105, 1);
                    cursor: pointer;
                    font-size: 14px;

                    .row-content {
                        & > div {
@@ -620,11 +628,11 @@
                    }
                }
                .row-box:hover {
                    background-color: rgba(222, 176, 176, 0.2);
                    background-color: rgb(1, 76, 137);
                }

                .row-box.on {
                    background: rgba(222, 176, 176, 0.2);
                    background: rgb(1, 76, 137);
                }

                :deep(.el-dialog) {
@@ -643,6 +651,7 @@
            }
        }
    }

    .second-container {
        position: absolute;
        top: 0;
@@ -650,13 +659,13 @@
        left: 405px;
        flex-direction: column;
        width: 240px;
        color: #fff;
        background: $bg-color;

        :deep(.el-tree-node__content) {
            background: transparent;
        }
        :deep(.el-tree-node) {
            background: #0f1e2d;
            background: $bg-color;
            color: #fff;
        }
    }

@@ -666,6 +675,7 @@
        right: 0;
        width: 400px;
        padding: 10px;

        border-radius: 10px 0 0 10px;
        color: #fff;
        background: $bg-color;

 src/views/home/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-26 17:17:00
 * @LastEditTime: 2022-09-27 14:12:13
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -14,13 +14,8 @@
        <div class="left-container">
            <div class="person-box">
                <div class="title">
                    <div class="one-level">现有人员</div>
                    <i></i> 现有人员
                </div>

                <!-- <div class="sub-title">
                    <div class="one-level">实有人口总数</div>
                    <div class="two-level">183.16万人</div>
                </div>-->

                <div class="sub-tab">
                    <div class="tab">
@@ -41,7 +36,7 @@
            </div>
            <div class="land-box">
                <div class="title">
                    <div class="one-level">现有房屋</div>
                    <i></i> 现有房屋
                </div>

                <div class="sub-tab">
@@ -59,7 +54,7 @@
            </div>
            <div class="equipment-box">
                <div class="title">
                    <div class="one-level">现有设备</div>
                    <i></i> 现有设备
                </div>

                <div id="EquipmentEcharts" class="echarts-box"></div>
@@ -69,24 +64,21 @@
        <div class="right-container">
            <div class="case-box">
                <div class="title">
                    <div class="one-level">警情动态</div>
                    <i></i> 警情动态
                </div>

                <div id="EventChangeEcharts" class="echarts-box"></div>
            </div>
            <div class="alert-box">
                <div class="title">
                    <div class="one-level">历史警情(近一年)</div>
                    <i></i> 历史警情(近一年)
                </div>
                <!-- <div class="sub-title">
                    <div class="one-level">警情、案事件总量</div>
                    <div class="two-level">555578起</div>
                </div>-->

                <div id="EventCountEcharts" class="echarts-box"></div>
            </div>
            <div class="crowd-box">
                <div class="title">
                    <div class="one-level">重点人群</div>
                    <i></i> 重点人群
                </div>

                <div id="peopleList" class="echarts-box">
@@ -106,19 +98,19 @@
        </div>

        <div class="center-container">
            <div class="layers-control-btn">
            <div class="layers-control-btn house">
                <el-checkbox v-model="houseLayerShow" @change="houseChange">小区</el-checkbox>
            </div>
            <div class="layers-control-btn">
            <div class="layers-control-btn car">
                <el-checkbox v-model="carLayerShow" @change="carChange">警车</el-checkbox>
            </div>
            <div class="layers-control-btn">
            <div class="layers-control-btn phone">
                <el-checkbox v-model="phoneLayerShow" @change="phoneChange">手台</el-checkbox>
            </div>
            <div class="layers-control-btn">
            <div class="layers-control-btn moitor">
                <el-checkbox v-model="monitoringLayerShow" @change="monitoringChange">监控</el-checkbox>
            </div>
            <div class="layers-control-btn">
            <div class="layers-control-btn panorama">
                <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
            </div>
        </div>
@@ -197,7 +189,9 @@
            class="phone-details-box"
        >
            <div style="flex: 1; display: flex; flex-direction: column; width: 100%; height: 100%;">
                <div style="display: flex; justify-content: space-between; align-items: center;">
                <div
                    style="flex: 1; display: flex; justify-content: space-between; align-items: center;"
                >
                    <div>责任人：</div>
                    <div>{{phoneDetails.person}}</div>
                </div>
@@ -1122,6 +1116,7 @@
            height: 35%;

            .echarts-box {
                overflow-x: hidden;
                overflow-y: auto;
            }
        }
@@ -1140,10 +1135,23 @@
            padding: 0 10px;

            .title {
                display: flex;
                justify-content: space-between;
                align-items: center;
                padding: 0 18px;
                position: relative;
                text-align: left;
                height: 40px;
                line-height: 40px;
                font-size: 20px;

                i {
                    position: absolute;
                    top: 6px;
                    left: 0;
                    width: 8px;
                    height: 28px;
                    border-radius: 4px;
                    background: #43bafe;
                    box-shadow: 0px 0px 8px 2px #43bafe;
                }
            }

            .sub-title {
@@ -1190,9 +1198,84 @@
            justify-content: center;
            align-items: center;
            margin: 0 10px;
            width: 78px;
            height: 29px;
            background-color: rgba(16, 29, 74, 0.9);
            width: 96px;
            height: 40px;
            border-radius: 20px;
            background-color: $bg-color;

            :deep(.el-checkbox__inner) {
                border-radius: 50%;
            }
        }

        .house {
            :deep(.el-checkbox__inner) {
                background: rgb(255, 221, 136);
                border-color: rgb(255, 221, 136);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(255, 183, 0);
                    border-color: rgb(255, 183, 0);
                }
            }
        }

        .car {
            :deep(.el-checkbox__inner) {
                background: rgb(79, 114, 252);
                border-color: rgb(79, 114, 252);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(0, 24, 120);
                    border-color: rgb(0, 24, 120);
                }
            }
        }

        .phone {
            :deep(.el-checkbox__inner) {
                background: rgb(209, 179, 255);
                border-color: rgb(209, 179, 255);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(102, 0, 255);
                    border-color: rgb(102, 0, 255);
                }
            }
        }

        .moitor {
            :deep(.el-checkbox__inner) {
                background: rgb(147, 190, 255);
                border-color: rgb(147, 190, 255);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(96, 160, 255);
                    border-color: rgb(96, 160, 255);
                }
            }
        }

        .panorama {
            :deep(.el-checkbox__inner) {
                background: rgb(184, 206, 239);
                border-color: rgb(184, 206, 239);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(18, 91, 201);
                    border-color: rgb(18, 91, 201);
                }
            }
        }
    }


 src/views/house/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-26 17:03:10
 * @LastEditTime: 2022-09-27 10:45:10
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -693,8 +693,8 @@
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: transparent;
            border: 1px solid rgb(0, 92, 169);
            border-radius: 20px 0 0 20px;
        }
        input:focus {
@@ -708,15 +708,15 @@
            font-weight: 700;
            width: 80px;
            height: 100%;
            background-color: rgba(29, 38, 105, 1);
            background-color: rgb(0, 92, 169);
            color: #fff;
            border: 1px solid rgba(29, 38, 105, 1);
            border: 1px solid rgb(0, 92, 169);
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }
        button:active {
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: rgb(0, 92, 169);
            border: 1px solid rgb(0, 92, 169);
        }
    }

@@ -1000,30 +1000,6 @@
            }
        }
        .police-info {
            :deep(.el-table tr:nth-child(2n)) {
                background: #324e75;
                color: #fff;
            }
            :deep(.el-table tr:nth-child(2n-1)) {
                background: #26426a;
                color: #fff;
            }
            :deep(.el-table tr:hover td) {
                cursor: pointer;
                background-color: rgba(222, 176, 176, 0.2);
            }
            :deep(.el-table::before) {
                height: 0px;
            }
            :deep(.el-dialog__header) {
                margin-top: 150px;
            }
            :deep(.el-dialog__title) {
                line-height: 24px;
                font-size: 24px;
                font-weight: 700;
                color: #303133;
            }
            .tableClass {
                margin: 0 auto;
                width: 600px;

 src/views/police/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-26 16:23:49
 * @LastEditTime: 2022-09-27 14:12:35
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -116,7 +116,9 @@
            class="phone-details-box"
        >
            <div style="flex: 1; display: flex; flex-direction: column; width: 100%; height: 100%;">
                <div style="display: flex; justify-content: space-between; align-items: center;">
                <div
                    style="flex: 1; display: flex; justify-content: space-between; align-items: center;"
                >
                    <div>责任人：</div>
                    <div>{{phoneDetails.person}}</div>
                </div>
@@ -283,15 +285,14 @@
            height: 50px;
            line-height: 50px;
            text-align: center;
            color: rgb(104, 94, 94);
            color: #fff;
            font-size: 24px;
            cursor: pointer;
            background-color: rgba(29, 38, 105, 1);
            border-bottom: 1px solid #33566c;
        }

        .choosed {
            background-color: rgba(20, 50, 123, 1);
            color: #fff;
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: rgb(0, 92, 169);
        }
    }

@@ -306,8 +307,8 @@
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: transparent;
            border: 1px solid rgb(0, 92, 169);
            border-radius: 20px 0 0 20px;
        }
        input:focus {
@@ -321,15 +322,15 @@
            font-weight: 700;
            width: 80px;
            height: 100%;
            background-color: rgba(29, 38, 105, 1);
            background-color: rgb(0, 92, 169);
            color: #fff;
            border: 1px solid rgba(29, 38, 105, 1);
            border: 1px solid rgb(0, 92, 169);
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }
        button:active {
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: rgb(0, 92, 169);
            border: 1px solid rgb(0, 92, 169);
        }
    }


 src/views/video/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-26 17:02:55
 * @LastEditTime: 2022-09-27 09:19:30
 * @FilePath: \srs-police-affairs\src\views\video\index.vue
 * @Description: 辖区管理
 * 
@@ -154,6 +154,8 @@

<style scoped lang="scss">
.container {
    display: flex;
    flex-direction: column;
    position: relative;
    width: 400px;
    height: 100%;
@@ -170,37 +172,49 @@
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: transparent;
            border: 1px solid rgb(0, 92, 169);
            border-radius: 20px 0 0 20px;
        }

        input:focus {
            outline: none;
        }

        input::-webkit-input-placeholder {
            color: rgba(238, 238, 238, 0.7);
        }

        button {
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 100%;
            background-color: rgba(29, 38, 105, 1);
            background-color: rgb(0, 92, 169);
            color: #fff;
            border: 1px solid rgba(29, 38, 105, 1);
            border: 1px solid rgb(0, 92, 169);
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }

        button:active {
            background-color: rgba(20, 50, 123, 1);
            border: 1px solid rgba(20, 50, 123, 1);
            background-color: rgb(0, 92, 169);
            border: 1px solid rgb(0, 92, 169);
        }
    }

    .list-show {
        height: 765px;
        .list-box {
            height: 765px;
        flex: 1;

        & > div {
            height: 100%;
            display: flex;
            flex-direction: column;

            // background-color: #fff;
            .list-box {
                flex: 1;
            }
        }
    }
}