shuishen
2023-04-01 35b546e2c3afb8cc790ee1bf7672e99012bf4077
首页及删除弹框调整
10 files modified
114 ■■■■■ changed files
src/components/select/index.vue 24 ●●●● patch | view | raw | blame | history
src/styles/base/index.scss 5 ●●●●● patch | view | raw | blame | history
src/styles/media/index.scss 2 ●●● patch | view | raw | blame | history
src/views/activity/components/policeCarChange.vue 1 ●●●● patch | view | raw | blame | history
src/views/activity/components/policePersonChange.vue 1 ●●●● patch | view | raw | blame | history
src/views/activity/components/polygonPlot.vue 1 ●●●● patch | view | raw | blame | history
src/views/activity/components/polylinePlot.vue 1 ●●●● patch | view | raw | blame | history
src/views/activity/index.vue 2 ●●●●● patch | view | raw | blame | history
src/views/home/index.vue 66 ●●●●● patch | view | raw | blame | history
src/views/video/list.vue 11 ●●●● patch | view | raw | blame | history
src/components/select/index.vue
@@ -1,26 +1,16 @@
<template>
    <div class="selects-container">
        <!-- 选择框 -->
        <div
            :class="{ 'selects-box-show': !optionsShow, 'selects-box-hide': optionsShow, 'select-choosable': selectAllClass }"
            class="selects-box"
            @click="selectClick"
        >
        <div :class="{ 'selects-box-show': !optionsShow, 'selects-box-hide': optionsShow, 'select-choosable': selectAllClass }"
            class="selects-box" @click="selectClick">
            <div class="text" v-text="checkValue"></div>
            <i class="el-icon-arrow-down"></i>
        </div>
        <!-- 下拉框大盒子 -->
        <div
            :class="{ 'options-box-show': !optionsShow, 'options-box-hide': optionsShow, issel: options.length >= 4 }"
            class="select-options"
            :style="{ height: 35 * options.length + 'px' }"
        >
        <div :class="{ 'options-box-show': !optionsShow, 'options-box-hide': optionsShow, issel: options.length >= 4 }"
            class="select-options">
            <!-- 下拉框 -->
            <div
                @click="cutValue(item, index)"
                v-for="(item, index) in options"
                :key="index"
            >{{ item[optionsName] }}</div>
            <div @click="cutValue(item, index)" v-for="(item, index) in options" :key="index">{{ item[optionsName] }}</div>
        </div>
    </div>
</template>
@@ -126,12 +116,12 @@
    //当下拉框数量超过4个时 使用固定高度
    .issel {
        height: 140px !important;
        max-height: 140px !important;
    }
    .select-options {
        width: 100%;
        height: 140px;
        max-height: 140px;
        overflow: auto;
        border: 1px solid rgba(20, 50, 123, 1); //下拉框边框颜色
        border-top: none;
src/styles/base/index.scss
@@ -1324,4 +1324,9 @@
            border-color: #66b1ff !important;
        }
    }
}
.btn-custom-cancel {
    float: right;
    margin-left: 10px;
}
src/styles/media/index.scss
@@ -357,7 +357,7 @@
                            }
                            .selects-container .issel {
                                height: countSizeVh(170) !important;
                                max-height: countSizeVh(140) !important;
                            }
                        }
src/views/activity/components/policeCarChange.vue
@@ -174,6 +174,7 @@
        // 点击删除
        deletePoliceElement () {
            this.$confirm('确定要删除吗?', '提示', {
                cancelButtonClass: "btn-custom-cancel",
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
src/views/activity/components/policePersonChange.vue
@@ -220,6 +220,7 @@
        // 点击删除
        deletePoliceElement () {
            this.$confirm('确定要删除吗?', '提示', {
                cancelButtonClass: "btn-custom-cancel",
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
src/views/activity/components/polygonPlot.vue
@@ -183,6 +183,7 @@
        // 删除标绘
        deletePlot () {
            this.$confirm('确定要删除吗?', '提示', {
                cancelButtonClass: "btn-custom-cancel",
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
src/views/activity/components/polylinePlot.vue
@@ -129,6 +129,7 @@
        // 删除巡逻路线
        deleteLine () {
            this.$confirm('确定要删除吗?', '提示', {
                cancelButtonClass: "btn-custom-cancel",
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
src/views/activity/index.vue
@@ -882,6 +882,8 @@
    },
    destroyed () {
        loading && loading.close()
        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'activityLayers',
            type: 'VectorLayer'
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: 2023-04-01 11:53:43
 * @LastEditTime: 2023-04-01 17:44:36
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -54,7 +54,7 @@
                :optionsName="'name'"></map-select>
            <map-select class="map-select" @selectCheck="housingSelect" :checkValue="housingCheckValue"
                :options="housingOptions" :optionsName="'name'"></map-select>
                :options="housingOptions" :optionsName="'name'" :selectAllClass="selectHouseClass"></map-select>
        </div>
        <el-dialog :title="panoramaTitle" :modal="true" :visible.sync="panoramaVisible" :before-close="panoramaBeforeClose"
@@ -131,17 +131,17 @@
    <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="keyPerson-details-box">
        <!-- <div class="header" v-show="!isMaoJiaLin">
                                                                                                                                                                                                                                                                                                                                                                                    <div>
                                                                                                                                                                                                                                                                                                                                                                                        人员名称:
                                                                                                                                                                                                                                                                                                                                                                                        <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                                                                                                                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                                                                                                                    <div>
                                                                                                                                                                                                                                                                                                                                                                                        联系电话:
                                                                                                                                                                                                                                                                                                                                                                                        <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                                                                                                                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                                                                                                                    <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
                                                                                                                                                                                                                                                                                                                                                                                    <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
                                                                                                                                                                                                                                                                                                                                                                                </div> -->
                                                                                                                                                                                                                                                                                                                                                                                                                                                <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                    人员名称:
                                                                                                                                                                                                                                                                                                                                                                                                                                                    <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                    联系电话:
                                                                                                                                                                                                                                                                                                                                                                                                                                                    <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
                                                                                                                                                                                                                                                                                                                                                                                                                                            </div> -->
            <el-table :data="keyPersonDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
@@ -169,10 +169,10 @@
            </el-table>
            <!-- <div class="pages all-pagination-sty" ref="tablePagination" v-show="!isMaoJiaLin">
                                                                                                                                                                                                                                                                                                                                                                   <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                                                                                                                                                                                                                                                                                                                                                                       :total="peoplePage.total" :current-page="peoplePage.currentPage"
                                                                                                                                                                                                                                                                                                                                                                       @current-change="handlePersonPageChange"></el-pagination>
                                                                                                                                                                                                                                                                                                                                                             </div> -->
                                                                                                                                                                                                                                                                                                                                                                                                                               <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                                                                                                                                                                                                                                                                                                                                                                                                                                   :total="peoplePage.total" :current-page="peoplePage.currentPage"
                                                                                                                                                                                                                                                                                                                                                                                                                                   @current-change="handlePersonPageChange"></el-pagination>
                                                                                                                                                                                                                                                                                                                                                                                                                         </div> -->
        </el-dialog>
        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
@@ -531,6 +531,7 @@
            // 是否显示辖区
            areaPolygonLayerShow: true,
            selectAllClass: false,
            selectHouseClass: false,
            // 是否显示第一级select
            houseLayerShow: true,
            carLayerShow: false,
@@ -797,8 +798,15 @@
                        id: 1
                    })
                } else {
                    this.housingOptions = res.data.data
                    this.initHousingLayer()
                    if (res.data.data.length == 0 || JSON.stringify(res.data.data) === "{}") {
                        this.selectHouseClass = true
                        this.housingCheckValue = '该责任区暂无小区'
                        return
                    }
                    this.selectHouseClass = false
                    this.housingCheckValue = '请选择小区'
                    this.housingOptions = res.data.data
                    this.housingOptions.unshift({
                        name: '全部',
                        id: 1
@@ -931,6 +939,7 @@
            if (this.policeStationCheckValue == item.name) return
            this.policeStationCheckValue = item.name
            this.selectHouseClass = true
            if (item.name == "全部") {
                this.clearPolygonLayer()
@@ -974,13 +983,11 @@
            if (item.name == "全部") {
                this.initAreaOptionLayer()
                this.housingOptions = []
                this.housingCheckValue = '请选择小区'
            } else {
                this.housingCheckValue = '请选择小区'
                this.getPoliceStationTree(3, item.id)
                this.areaChecked = item
            }
        },
@@ -1019,6 +1026,12 @@
                    layerName: 'areaPolygonLabel',
                    flag: true
                })
                this.$EventBus.$emit('layerShow', {
                    layerName: 'polygonLayer',
                    flag: true
                })
            } else {
                DataSourcesArray.forEach(i => i.show = false)
@@ -1026,6 +1039,12 @@
                    layerName: 'areaPolygonLabel',
                    flag: false
                })
                this.$EventBus.$emit('layerShow', {
                    layerName: 'polygonLayer',
                    flag: false
                })
            }
        },
@@ -2075,12 +2094,11 @@
    },
    destroyed () {
        loading.close()
        loading && loading.close()
        this.clearPolygonLayer()
        // cylinderLayer != null && cylinderLayer != undefined && cylinderLayer != '' && cylinderLayer.remove()
        this.$store.commit('SET_DETAILSPOPUP', {
src/views/video/list.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-01 17:09:18
 * @LastEditTime: 2023-04-01 17:47:19
 * @FilePath: \srs-police-affairs\src\views\video\list.vue
 * @Description: 辖区管理
 * 
@@ -297,6 +297,7 @@
        },
        searchChange (e) {
            this.$store.commit('SET_VIDEOLISTPOPUP', false)
            this.inputpopup = false
            plot.stop()
@@ -390,6 +391,8 @@
        },
        removeDrawLayer () {
            this.$store.commit('SET_VIDEOLISTPOPUP', false)
            this.inputpopup = false
            plot.stop()
@@ -408,6 +411,8 @@
        },
        searchDraw () {
            this.$store.commit('SET_VIDEOLISTPOPUP', false)
            this.searchLazyFlag = false
            this.searchValue = ''
@@ -694,9 +699,9 @@
    },
    destroyed () {
        this.$store.commit('SET_VIDEOLISTPOPUP', false)
        loading.close()
        loading && loading.close()
        this.$store.commit('SET_VIDEOLISTPOPUP', false)
        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'treeValAllLayer',
            type: 'VectorLayer'