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

guanqb

2022-11-15 f166bbfbcb7af4d1c906aa9f964a5965f03f8993

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

 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-11-12 10:59:23
 * @LastEditTime: 2022-11-14 14:12:46
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -414,14 +414,14 @@
                }
            ],
            activityDetails: {},
            boxShow: false,
            boxShow: true,
        }
    },
    created () {

    },
    mounted () {
        this.$parent.resize('400px')
        this.$parent.resize('400px', true)

        this.$nextTick(() => {
            this.activityList.forEach(item => {
@@ -864,6 +864,14 @@
        }
    }

    .second-container.spread {
        left: 410px
    }

    .second-container.take-back {
        left: 10px;
    }

    .activity-details-box {
        position: fixed;
        top: 90px;

 src/views/house/index.vue

@@ -21,7 +21,7 @@
            <div v-show="searchValBoxShow" class="search-val-box">
                <div>
                    <div @click="searchVlaClick(item)" v-for="(item, index) in searchArray" :key="index">{{
                    item.name
                            item.name
                    }}
                    </div>
                </div>
@@ -518,7 +518,7 @@
        this.levelList = this.ridgepoleNum1.unit[0].storey
    },
    mounted () {
        this.$parent.resize('400px')
        this.$parent.resize('400px', true)

        this.$nextTick(() => {
            this.searchHouse = this.$route.query.searchName

 src/views/lyout/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-11-12 11:00:36
 * @LastEditTime: 2022-11-14 14:13:45
 * @FilePath: \srs-police-affairs\src\views\lyout\index.vue
 * @Description: 
 * 
@@ -19,13 +19,8 @@

            <!-- 菜单导航 -->
            <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>

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

            <!-- 主体内容区域 -->
            <div
                class="main-content"
                id="MainContent"
                :class="{ 'spread': leftShow && show, 'take-back': leftShow && !show }"
            >
            <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>
@@ -70,7 +57,6 @@
                {
                    menuName: '社区感知',
                    path: '/lyout/house'

                },
                {
                    menuName: '警力资源',
@@ -88,7 +74,7 @@
                },
            ],

            show: false,
            show: true,

            leftShow: true,

@@ -152,6 +138,7 @@
            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 {
@@ -163,12 +150,29 @@
            }
        },

        resize (val) {
        resize (val, flag = false) {
            this.boxWidth = val

            this.show = false
            this.show = flag

            if (this.$refs['target-name'].boxResize) this.$refs['target-name'].boxResize(this.show)

            this.$nextTick(() => {
                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')
                }
            })
        },
    }
}
@@ -205,7 +209,7 @@
            overflow: hidden;
            letter-spacing: 6px;

            & > img {
            &>img {
                // width: 100%;
                height: 80%;
                margin: 0 10px 0 10px;
@@ -237,8 +241,7 @@
            }
        }

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

    .main-container {
@@ -256,7 +259,7 @@
            width: 400px;
        }

        .main-content.ake-back {
        .main-content.take-back {
            width: 0px;
        }
    }

 src/views/police/index.vue

@@ -324,7 +324,7 @@
        window.addEventListener('resize', this.setTableHeight)
    },
    mounted () {
        this.$parent.resize('400px')
        this.$parent.resize('400px', true)

        this.navClick(1)
    },

 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-11-12 10:52:42
 * @LastEditTime: 2022-11-14 14:03:14
 * @FilePath: \srs-police-affairs\src\views\video\index.vue
 * @Description: 辖区管理
 * 
@@ -83,7 +83,7 @@
    },

    mounted () {
        this.$parent.resize('400px')
        this.$parent.resize('400px', true)

        this.initMonitoringIcon()
        graphicLayer = new EntityDraw()