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

shuishen

2022-11-12 ce034b4c0db0eec0928fa54ee35f91ff2005a75c

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

 package-lock.json

Diff too large

 src/components/shrink/index.vue

@@ -9,9 +9,7 @@
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved. 
-->
<template>
    <div class="shrink-box" @click="shrinkClick">
        {{ str }}
    </div>
    <div class="shrink-box" @click="shrinkClick">{{ str }}</div>
</template>

<script>
@@ -29,11 +27,15 @@
                this.str = '<<'
                document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
                document.querySelector('.image-switch-img-btn').classList.remove('shrink-btn')

            } else {
                this.str = '>>'
                document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                document.querySelector('.screen-full-btn').classList.add('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.add('shrink-btn')
                document.querySelector('.image-switch-img-btn').classList.add('shrink-btn')
            }
        }
    },
@@ -41,6 +43,8 @@
    beforeDestroy () {
        document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
        document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
        document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
        document.querySelector('.image-switch-img-btn').classList.remove('shrink-btn')
    }
}
</script>

 src/styles/dc/index.scss

@@ -114,6 +114,9 @@
    left: 410px;
    bottom: 500px; 
}
.image-switch-icon-btn.shrink-btn {
    left: 410px !important;
}
.image-switch-img-btn {
    display: flex;
    align-items: center;
@@ -156,4 +159,7 @@
.image-switch-img-btn.imgbottom {
        left: 446px;
        bottom: 490px;
}
.image-switch-img-btn.shrink-btn {
    left: 410px !important;
}

 src/views/home/components/leftContainer.vue

@@ -217,7 +217,8 @@
        initPersonOptions (xDate, yDate) {
            return {
                tooltip: {
                    trigger: 'item'
                    trigger: 'item',
                    formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}人</strong>'
                },
                xAxis: {
                    type: 'category',
@@ -246,18 +247,6 @@
                    {
                        data: yDate,
                        type: 'bar',
                        itemStyle: {
                            normal: {
                                label: {
                                    show: true,
                                    position: 'top',
                                    textStyle: {
                                        color: '#1a94a8',
                                        fontSize: 16
                                    }
                                }
                            }
                        }
                    }
                ],
                grid: {
@@ -296,7 +285,6 @@
        initHouseOptions (xDate, y1Date, y2Date) {
            return {
                tooltip: {
                    trigger: 'item'
                },
                color: ['#2967c4', '#112d54'],
                xAxis: {
@@ -333,33 +321,35 @@
                        data: y1Date,
                        type: 'bar',
                        zlevel: 2,
                        tooltip: {
                            trigger: 'item',
                            formatter: params => {
                                let msg
                                if (params.value > 10000) {
                                    msg = (params.value / 10000).toFixed(2) + '万人'
                                } else {
                                    msg = params.value + '人'
                                }
                                msg = ` <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #2d71d7;"></span> ${params.name}<strong style="margin-left:10px">${msg}</strong>'`
                                return msg
                            }
                        },
                    },
                    {
                        data: y2Date,
                        type: 'bar',
                        barGap: '-100%',
                        label: {
                            show: true,
                            color: '#fff',
                            position: 'right', // 标签右对齐
                            distance: 0,// 标签距离柱条的距离
                            formatter: params => {
                                let msg
                                if (params.data.realValue > 10000) {
                                    msg = (params.data.realValue / 10000).toFixed(2) + '万个'
                                } else {
                                    msg = params.data.realValue + '个'
                                }
                        tooltip: {
                            trigger: 'item',
                            show: false

                                return msg
                            }
                        }
                    }
                ],
                grid: {
                    top: '2%',
                    left: '60',
                    right: '40',
                    right: '-30',
                    bottom: '2%'
                },

@@ -392,7 +382,8 @@
        initLandOptions (xDate, yDate) {
            return {
                tooltip: {
                    trigger: 'item'
                    trigger: 'item',
                    formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}个</strong>'
                },
                xAxis: {
                    type: 'category',
@@ -421,18 +412,6 @@
                    {
                        data: yDate,
                        type: 'bar',
                        itemStyle: {
                            normal: {
                                label: {
                                    show: true,
                                    position: 'top',
                                    textStyle: {
                                        color: '#1a94a8',
                                        fontSize: 16
                                    }
                                }
                            }
                        }
                    }
                ],
                grid: {
@@ -580,7 +559,17 @@
        initkeyPersonOption (dataArr) {
            return {
                tooltip: {
                    trigger: 'item'
                    trigger: 'item',
                    formatter: params => {
                        let msg
                        if (params.value > 10000) {
                            msg = (params.value / 10000).toFixed(2) + '万人'
                        } else {
                            msg = params.value + '人'
                        }
                        msg = ` <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #5470c6;"></span> ${params.name}<strong style="margin-left:10px">${msg}</strong>'`
                        return msg
                    }
                },
                legend: {
                    left: '48%',
@@ -598,7 +587,7 @@
                            }
                        }
                        let v = tarValue
                        return `${name}     ${v} 个    `
                        return `${name}     ${v} 人    `
                    },
                },
                series: [

 src/views/home/components/rightContainer.vue

@@ -136,7 +136,8 @@
            return {
                tooltip: {
                    trigger: 'item',
                    confine: true
                    confine: true,
                    formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}人</strong>'
                },
                legend: {
                    left: '60%',
@@ -299,7 +300,8 @@
                series: [
                    {
                        data: seriesData,
                        type: 'line'
                        type: 'line',
                        smooth: true
                    }
                ],
                grid: {

 src/views/lyout/index.vue

@@ -19,10 +19,13 @@

            <!-- 菜单导航 -->
            <div class="menu-list">
                <div class="nav-list" :class="{ on: currentUrl == item.path }" @click="goToPath(item)"
                    v-for="(item, index) in menuList" :key="index">
                    {{ item.menuName }}
                </div>
                <div
                    class="nav-list"
                    :class="{ on: currentUrl == item.path }"
                    @click="goToPath(item)"
                    v-for="(item, index) in menuList"
                    :key="index"
                >{{ item.menuName }}</div>
            </div>

            <!-- 用户登录展示的 -->
@@ -34,16 +37,23 @@
            <mapBox ref="modalForm" />

            <!-- 主体内容区域 -->
            <div class="main-content" id="MainContent"
                :class="{ 'spread': leftShow && show, 'take-back': leftShow && !show }">
                <router-view ref='target-name'></router-view>
            <div
                class="main-content"
                id="MainContent"
                :class="{ 'spread': leftShow && show, 'take-back': leftShow && !show }"
            >
                <router-view ref="target-name"></router-view>
            </div>


            <el-button v-show='leftShow' class="flexible-btn"
            <el-button
                v-show="leftShow"
                class="flexible-btn"
                :class="{ 'spread': leftShow && show, 'take-back': leftShow && !show }"
                :icon="show ? 'el-icon-arrow-left' : 'el-icon-arrow-right'" id="FlexibleBtn" type="primary"
                @click="flexibelClick"></el-button>
                :icon="show ? 'el-icon-arrow-left' : 'el-icon-arrow-right'"
                id="FlexibleBtn"
                type="primary"
                @click="flexibelClick"
            ></el-button>
        </div>
    </div>
</template>
@@ -100,6 +110,8 @@
                this.$nextTick(() => {
                    document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                    document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                    document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
                    document.querySelector('.image-switch-img-btn').classList.remove('shrink-btn')
                })

                if (this.currentUrl == '/lyout/home') {
@@ -140,10 +152,14 @@
            if (this.show) {
                document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                document.querySelector('.screen-full-btn').classList.add('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.add('shrink-btn')
                document.querySelector('.image-switch-img-btn').classList.add('shrink-btn')
            } else {

                document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
                document.querySelector('.image-switch-img-btn').classList.remove('shrink-btn')
            }
        },

@@ -189,7 +205,7 @@
            overflow: hidden;
            letter-spacing: 6px;

            &>img {
            & > img {
                // width: 100%;
                height: 80%;
                margin: 0 10px 0 10px;
@@ -219,10 +235,10 @@
                cursor: pointer;
                border-bottom: 3px solid transparent;
            }

        }

        .user-infor {}
        .user-infor {
        }
    }

    .main-container {