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

guanqb

2022-09-26 cfae4c5af923ab5d809e370aa3ee51cdb79d8074

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

 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 16:23:15
 * @LastEditTime: 2022-09-26 16:56:45
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -17,10 +17,10 @@
                    <div class="one-level">现有人员</div>
                </div>

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

                <div class="sub-tab">
                    <div class="tab">
@@ -70,7 +70,6 @@
            <div class="case-box">
                <div class="title">
                    <div class="one-level">警情动态</div>
                    <div class="two-level">当前16</div>
                </div>

                <div id="EventChangeEcharts" class="echarts-box"></div>
@@ -88,7 +87,6 @@
            <div class="crowd-box">
                <div class="title">
                    <div class="one-level">重点人群</div>
                    <div class="two-level">当前38</div>
                </div>

                <div id="peopleList" class="echarts-box">
@@ -589,14 +587,23 @@
                xAxis: {
                    type: 'category',
                    data: ['湖北', '上海', '北京', '广东', '浙江'],

                    axisLabel: {
                        color: "#fff"
                    },
                    axisLine: {
                        lineStyle: {
                            color: "#fff"
                        }
                    }
                },
                yAxis: {
                    type: 'value',
                    splitLine: {
                        show: true,
                        lineStyle: {
                            color: "rgba(0,0,255,0.1)"
                        }
                        show: false
                    },
                    axisLabel: {
                        color: "#fff"
                    }
                },
                series: [
@@ -640,10 +647,7 @@
                xAxis: {
                    type: 'value',
                    splitLine: {
                        show: true,
                        lineStyle: {
                            color: "rgba(0,0,255,0.1)"
                        }
                        show: false
                    },
                    axisLine: {
                        show: false
@@ -662,10 +666,12 @@
                    axisLine: {
                        show: false
                    },
                    axisLabel: {
                        color: "#fff"
                    },
                    axisTick: {
                        show: false
                    },

                },
                series: [
                    {
@@ -798,20 +804,33 @@
            option = {
                xAxis: {
                    type: 'category',
                    data: ['3-26', '3-27', '3-28', '3-29', '3-30', '3-31', '4-1']
                    data: ['3-26', '3-27', '3-28', '3-29', '3-30', '3-31', '4-1'],
                    axisLabel: {
                        color: "#fff"
                    },
                    axisLine: {
                        lineStyle: {
                            color: "#fff"
                        }
                    }
                },
                yAxis: {
                    type: 'value',
                    splitLine: {
                        show: true,
                        lineStyle: {
                            color: "rgba(0,0,255,0.1)"
                        }
                        show: false
                    },
                    axisLabel: {
                        color: "#fff"
                    },
                    axisLine: {
                        lineStyle: {
                            color: "#fff"
                        }
                    }
                },
                series: [
                    {
                        data: [0, 1, 0, 2, 0, 1, 0],
                        data: [10, 9, 12, 6, 4, 14, 8],
                        type: 'line'
                    }
                ],
@@ -1101,8 +1120,9 @@
        .alert-box,
        .crowd-box {
            height: 35%;
            .el-table__row.statistics-warning-row {
                background: #ff0000;

            .echarts-box {
                overflow-y: auto;
            }
        }
    }
@@ -1117,11 +1137,12 @@
        .crowd-box {
            display: flex;
            flex-direction: column;
            padding: 10px;
            padding: 0 10px;

            .title {
                display: flex;
                justify-content: space-between;
                align-items: center;
                height: 40px;
            }