菜单挪到扫码应用下面;
部分功能分页点击异常处理;
部分功能定位坐标系转换;
6 files modified
168 ■■■■ changed files
src/styles/media/index.scss 4 ●●●● patch | view | raw | blame | history
src/views/antiFraudShow/index.vue 51 ●●●● patch | view | raw | blame | history
src/views/contradictionEventShow/index.vue 11 ●●●●● patch | view | raw | blame | history
src/views/layout/index.vue 70 ●●●●● patch | view | raw | blame | history
src/views/rentalInfo/index.vue 15 ●●●●● patch | view | raw | blame | history
src/views/scanOrCode/index.vue 17 ●●●●● patch | view | raw | blame | history
src/styles/media/index.scss
@@ -56,13 +56,13 @@
                        &.left {
                            .sub-nav-list {
                                left: countSizeVw(-72, 1920);
                                left: countSizeVw(12, 1920);
                            }
                        }
                        &.right {
                            .sub-nav-list {
                                left: countSizeVw(72, 1920);
                                left: countSizeVw(-12, 1920);
                            }
                        }
                    }
src/views/antiFraudShow/index.vue
@@ -13,14 +13,14 @@
                    <el-button @click="searchBtn" icon="el-icon-search" class="bjnr-btn">搜索</el-button>
                    <el-button @click="resetBtn" icon="el-icon-delete" class="bjnr-btn">清除</el-button>
                </div>
                <div class="search-item-box" style="overflow-wrap: break-word;" v-if=" chooseTab == 1">
                <div class="search-item-box" style="overflow-wrap: break-word;" v-if="chooseTab == 1">
                    <el-button @click="filterAppBtn(1)" class="bjnr-btn"
                        :class="{ isOneClick: criminalRecordFlag == 1 }">已下载反炸app({{ isFzAppNum ? isFzAppNum :
            '0'
                        }}) 宣防人员数({{ isFzAppPersonNum ? isFzAppPersonNum :
            '0' }})</el-button>
                </div>
                <div class="search-item-box" style="overflow-wrap: break-word;" v-if=" chooseTab == 1">
                <div class="search-item-box" style="overflow-wrap: break-word;" v-if="chooseTab == 1">
                    <el-button @click="filterAlarmBtn(1)" class="bjnr-btn"
                        :class="{ isOneClick: criminalRecordFlag == 1 }">打开预警功能({{ isOpenAlarmNum ? isOpenAlarmNum :
            '0'
@@ -88,12 +88,12 @@
    data () {
        return {
            isFzAppNum:0,
            isFzAppPersonNum:0,
            isOpenAlarmNum:0,
            isOpenAlarmPersonNum:0,
            isFzApp:null,
            isOpenAlarm:null,
            isFzAppNum: 0,
            isFzAppPersonNum: 0,
            isOpenAlarmNum: 0,
            isOpenAlarmPersonNum: 0,
            isFzApp: null,
            isOpenAlarm: null,
            chooseTab: 1,
            searchKey: '',
            realEmptyText: "",
@@ -155,23 +155,23 @@
    methods: {
        // 过滤
        filterAppBtn(isFzApp){
            this.isFzApp = isFzApp;
        filterAppBtn (isFzApp) {
            this.isFzApp = isFzApp
            this.getList()
        },
        filterAlarmBtn(isOpenAlarm){
            this.isOpenAlarm = isOpenAlarm;
        filterAlarmBtn (isOpenAlarm) {
            this.isOpenAlarm = isOpenAlarm
            this.getList()
        },
        getStatistic(){
        getStatistic () {
            var that = this
            getStatistic({
                searchKey: this.searchKey,
            }).then(res=>{
                that.isFzAppNum = res.data.data.isFzApp;
                that.isFzAppPersonNum = res.data.data.isFzAppPersonNum;
                that.isOpenAlarmNum = res.data.data.isOpenAlarm;
                that.isOpenAlarmPersonNum = res.data.data.isOpenAlarmPersonNum;
            }).then(res => {
                that.isFzAppNum = res.data.data.isFzApp
                that.isFzAppPersonNum = res.data.data.isFzAppPersonNum
                that.isOpenAlarmNum = res.data.data.isOpenAlarm
                that.isOpenAlarmPersonNum = res.data.data.isOpenAlarmPersonNum
            })
        },
        // 切换tab
@@ -182,9 +182,12 @@
        // 点击定位
        rowClick (row) {
            let lng = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[0]
            let lat = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[1]
            this.$EventBus.$emit('toPosition', {
                siteJd: row.lng,
                siteWd: row.lat,
                siteJd: lng,
                siteWd: lat,
                siteGd: 200
            })
            this.$EventBus.$emit('mapClearLayer', {
@@ -196,8 +199,8 @@
                type: "billboard",
                params: {
                    ...row,
                    lng: row.lng,
                    lat: row.lat,
                    lng: lng,
                    lat: lat,
                    alt: 1,
                    url: `/img/icon/location.png`
                },
@@ -301,8 +304,8 @@
        getList () {
            this.loading()
            let params = {
                isFzApp:this.isFzApp,
                isOpenAlarm:this.isOpenAlarm,
                isFzApp: this.isFzApp,
                isOpenAlarm: this.isOpenAlarm,
                searchKey: this.searchKey,
                size: this.pages.pageSize,
                current: this.pages.currentPage
src/views/contradictionEventShow/index.vue
@@ -181,9 +181,12 @@
        // 点击定位
        rowClick (row) {
            let lng = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[0]
            let lat = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[1]
            this.$EventBus.$emit('toPosition', {
                siteJd: row.lng,
                siteWd: row.lat,
                siteJd: lng,
                siteWd: lat,
                siteGd: 200
            })
            this.$EventBus.$emit('mapClearLayer', {
@@ -195,8 +198,8 @@
                type: "billboard",
                params: {
                    ...row,
                    lng: row.lng,
                    lat: row.lat,
                    lng: lng,
                    lat: lat,
                    alt: 1,
                    url: `/img/icon/location.png`
                },
src/views/layout/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-04-10 16:48:10
 * @LastEditTime: 2024-05-07 11:17:07
 * @FilePath: \srs-police-affairs\src\views\layout\index.vue
 * @Description: 
 * 
@@ -38,6 +38,7 @@
                        {{
                        item.menuName }}
                    </span>
                    <div class="sub-nav-list" v-show="item.children && item.childrenFlag">
                        <div :class="{ on: currentUrl.indexOf(subItem.path) != -1 }"
                            v-for="(subItem, subIndex) in item.children" :key="subIndex"
@@ -59,42 +60,6 @@
                    <div class="triangle"></div>
                    <div class="userName">用户名:{{ currentUserInfo.user_name }}</div>
                    <div class="userBtn">
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/contradictionEventShow' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/contradictionEventShow')">
                            <i class="el-icon-phone-outline"></i>
                            矛盾纠纷
                        </div>
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/antiFraudShow' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/antiFraudShow')">
                            <i class="el-icon-monitor"></i>
                            反诈宣防
                        </div>
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/rentalInfo' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/rentalInfo')">
                            <i class="el-icon-s-home"></i>
                            租赁信息
                        </div>
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/positionManage' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/positionManage')">
                            <i class="el-icon-s-grid"></i>
                            阵地管理
                        </div>
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/practitionersManage' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/practitionersManage')">
                            <i class="el-icon-s-custom"></i>
                            从业人员
                        </div>
                        <div class="back-system"
                            :style="{ color: currentUrl == '/layout/policeAlarmRecordsManage' ? '#fcbd56' : '#fff' }"
                            @click="goToPage('/layout/policeAlarmRecordsManage')">
                            <i class="el-icon-full-screen"></i>
                            扫码报警
                        </div>
                        <div class="back-system" v-if="permission.operation_manager" @click="goToBack">
                            <i class="el-icon-user-back"></i>
                            运维管理
@@ -267,7 +232,31 @@
                        {
                            menuName: '九小场所',
                            path: '/layout/site'
                        }
                        },
                        {
                            menuName: '矛盾纠纷',
                            path: '/layout/contradictionEventShow'
                        },
                        {
                            menuName: '反诈宣防',
                            path: '/layout/antiFraudShow'
                        },
                        {
                            menuName: '租赁信息',
                            path: '/layout/rentalInfo'
                        },
                        {
                            menuName: '阵地管理',
                            path: '/layout/positionManage'
                        },
                        {
                            menuName: '从业人员',
                            path: '/layout/practitionersManage'
                        },
                        {
                            menuName: '扫码报警',
                            path: '/layout/policeAlarmRecordsManage'
                        },
                    ]
                },
                {
@@ -621,6 +610,7 @@
                width: 100%;
                cursor: default;
                z-index: 999;
                transform-origin: top;
                div {
                    height: 36px;
@@ -652,14 +642,14 @@
            &.left {
                .sub-nav-list {
                    left: -72px;
                    left: 12px;
                    transform: skew(-61.5deg);
                }
            }
            &.right {
                .sub-nav-list {
                    left: 72px;
                    left: -12px;
                    transform: skew(61.5deg);
                }
            }
src/views/rentalInfo/index.vue
@@ -40,8 +40,8 @@
                        <el-button @click="resetSearch" icon="el-icon-delete" class="bjnr-btn">清除</el-button>
                    </div>
                    <div class="search-item-box" style="justify-content: flex-start;" v-if="chooseTab == '租客管理'">
                        <el-button @click="filterBtn" class="bjnr-btn"
                            :class="{ isOneClick: keyManFlag == 3 }">重点人员({{ zdryNum }})</el-button>
                        <el-button @click="filterBtn" class="bjnr-btn" :class="{ isOneClick: keyManFlag == 3 }">重点人员({{
            zdryNum }})</el-button>
                    </div>
                </div>
                <div class="list police-info" ref="tableBox">
@@ -245,9 +245,12 @@
        // 点击定位
        rowClick (row) {
            let lng = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[0]
            let lat = global.DC.CoordTransform.GCJ02ToWGS84(row.lng, row.lat)[1]
            this.$EventBus.$emit('toPosition', {
                siteJd: row.lng,
                siteWd: row.lat,
                siteJd: lng,
                siteWd: lat,
                siteGd: 200
            })
            this.$EventBus.$emit('mapClearLayer', {
@@ -259,8 +262,8 @@
                type: "billboard",
                params: {
                    ...row,
                    lng: row.lng,
                    lat: row.lat,
                    lng: lng,
                    lat: lat,
                    alt: 1,
                    url: `/img/icon/location.png`
                },
src/views/scanOrCode/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-02-06 11:41:44
 * @LastEditTime: 2024-05-07 18:15:29
 * @FilePath: \srs-police-affairs\src\views\scanOrCode\index.vue
 * @Description: 辖区管理
 * 
@@ -567,9 +567,12 @@
        // 点击定位
        rowClick (row) {
            let lng = global.DC.CoordTransform.GCJ02ToWGS84(row.x, row.y)[0]
            let lat = global.DC.CoordTransform.GCJ02ToWGS84(row.x, row.y)[1]
            this.$EventBus.$emit('toPosition', {
                siteJd: row.x,
                siteWd: row.y,
                siteJd: lng,
                siteWd: lat,
                siteGd: 2000
            })
            this.$EventBus.$emit('mapClearLayer', {
@@ -581,8 +584,8 @@
                type: "billboard",
                params: {
                    ...row,
                    lng: row.x,
                    lat: row.y,
                    lng: lng,
                    lat: lat,
                    alt: 1,
                    url: `/img/icon/location.png`
                },
@@ -597,8 +600,8 @@
                position: [
                    global.DC.Transform.transformWGS84ToCartesian(
                        new global.DC.Position(
                            Number(row.x),
                            Number(row.y),
                            Number(lng),
                            Number(lat),
                            0
                        )
                    )