shuishen
2023-08-01 f073251debed44e152c83d267387a469897426b5
部分修改
7 files modified
25 files deleted
365 ■■■■■ changed files
public/qp/11级切片.gm_source_def.xml 12 ●●●●● patch | view | raw | blame | history
public/qp/11级切片.htm 116 ●●●●● patch | view | raw | blame | history
public/qp/Z10/426/847.png patch | view | raw | blame | history
public/qp/Z10/426/848.png patch | view | raw | blame | history
public/qp/Z10/427/847.png patch | view | raw | blame | history
public/qp/Z10/427/848.png patch | view | raw | blame | history
public/qp/Z11/853/1695.png patch | view | raw | blame | history
public/qp/Z11/853/1696.png patch | view | raw | blame | history
public/qp/Z11/854/1694.png patch | view | raw | blame | history
public/qp/Z11/854/1695.png patch | view | raw | blame | history
public/qp/Z11/854/1696.png patch | view | raw | blame | history
public/qp/Z11/855/1694.png patch | view | raw | blame | history
public/qp/Z11/855/1695.png patch | view | raw | blame | history
public/qp/Z11/855/1696.png patch | view | raw | blame | history
public/qp/Z2/1/3.png patch | view | raw | blame | history
public/qp/Z4/6/13.png patch | view | raw | blame | history
public/qp/Z5/13/26.png patch | view | raw | blame | history
public/qp/Z6/26/52.png patch | view | raw | blame | history
public/qp/Z6/26/53.png patch | view | raw | blame | history
public/qp/Z7/53/105.png patch | view | raw | blame | history
public/qp/Z7/53/106.png patch | view | raw | blame | history
public/qp/Z8/106/211.png patch | view | raw | blame | history
public/qp/Z8/106/212.png patch | view | raw | blame | history
public/qp/Z9/213/423.png patch | view | raw | blame | history
public/qp/Z9/213/424.png patch | view | raw | blame | history
src/components/map/index.vue 2 ●●● patch | view | raw | blame | history
src/main.js 100 ●●●● patch | view | raw | blame | history
src/views/activity/index.vue 3 ●●●● patch | view | raw | blame | history
src/views/home/components/dialog/keyPersonBox.vue 2 ●●● patch | view | raw | blame | history
src/views/home/index.vue 4 ●●● patch | view | raw | blame | history
src/views/house/index.vue 84 ●●●● patch | view | raw | blame | history
src/views/policeInfor/index.vue 42 ●●●●● patch | view | raw | blame | history
public/qp/11级切片.gm_source_def.xml
File was deleted
public/qp/11级切片.htm
File was deleted
public/qp/Z10/426/847.png
Binary files differ
public/qp/Z10/426/848.png
Binary files differ
public/qp/Z10/427/847.png
Binary files differ
public/qp/Z10/427/848.png
Binary files differ
public/qp/Z11/853/1695.png
Binary files differ
public/qp/Z11/853/1696.png
Binary files differ
public/qp/Z11/854/1694.png
Binary files differ
public/qp/Z11/854/1695.png
Binary files differ
public/qp/Z11/854/1696.png
Binary files differ
public/qp/Z11/855/1694.png
Binary files differ
public/qp/Z11/855/1695.png
Binary files differ
public/qp/Z11/855/1696.png
Binary files differ
public/qp/Z2/1/3.png
Binary files differ
public/qp/Z4/6/13.png
Binary files differ
public/qp/Z5/13/26.png
Binary files differ
public/qp/Z6/26/52.png
Binary files differ
public/qp/Z6/26/53.png
Binary files differ
public/qp/Z7/53/105.png
Binary files differ
public/qp/Z7/53/106.png
Binary files differ
public/qp/Z8/106/211.png
Binary files differ
public/qp/Z8/106/212.png
Binary files differ
public/qp/Z9/213/423.png
Binary files differ
public/qp/Z9/213/424.png
Binary files differ
src/components/map/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-07-11 15:07:02
 * @LastEditTime: 2023-07-19 15:51:33
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
src/main.js
@@ -2,74 +2,74 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:34:58
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-28 23:55:47
 * @LastEditTime: 2023-07-19 15:26:51
 * @FilePath: \srs-police-affairs\src\main.js
 * @Description:
 *
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
 * @Description:
 *
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
 */
import Vue from 'vue'
import App from './App.vue'
import router from './router/page'
import store from './store'
import videoLoading from '@/components/loading'
import Vue from "vue";
import App from "./App.vue";
import router from "./router/page";
import store from "./store";
import videoLoading from "@/components/loading";
import { EventBus } from '@/eventBus/event-bus'
import { EventBus } from "@/eventBus/event-bus";
import * as echarts from 'echarts'
import * as echarts from "echarts";
import DivForms from '@/divForms/divForms'
import DivForms from "@/divForms/divForms";
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import './styles/index.scss'
import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css";
import "./styles/index.scss";
import 'font-awesome/css/font-awesome.min.css'
import "font-awesome/css/font-awesome.min.css";
import axios from './router/axios'
import axios from "./router/axios";
import * as baseAxios from "axios";
import VueAxios from "vue-axios";
import VueAxios from 'vue-axios'
import 'lib-flexible/flexible.js'
import './permission'
import "lib-flexible/flexible.js";
import "./permission";
//这一段是引入mock
// import '@/mock/index'
// 全局组件自动注册
import './components/autoRegister'
import "./components/autoRegister";
import DC from '@dvgis/dc-sdk/dist/dc.base.min' //基础包
import DcCore from '@dvgis/dc-sdk/dist/dc.core.min' //核心包
import DcChart from '@dvgis/dc-sdk/dist/dc.chart.min' //chart包
import DcMapv from '@dvgis/dc-sdk/dist/dc.mapv.min' //mapv包
import DcS3M from '@dvgis/dc-sdk/dist/dc.s3m.min' //s3m包
import '@dvgis/dc-sdk/dist/dc.core.min.css' // 主要样式
import DC from "@dvgis/dc-sdk/dist/dc.base.min"; //基础包
import DcCore from "@dvgis/dc-sdk/dist/dc.core.min"; //核心包
import DcChart from "@dvgis/dc-sdk/dist/dc.chart.min"; //chart包
import DcMapv from "@dvgis/dc-sdk/dist/dc.mapv.min"; //mapv包
import DcS3M from "@dvgis/dc-sdk/dist/dc.s3m.min"; //s3m包
import "@dvgis/dc-sdk/dist/dc.core.min.css"; // 主要样式
import * as turf from '@turf/turf'
import * as turf from "@turf/turf";
Vue.prototype.$echarts = echarts
Vue.prototype.$turf = turf
Vue.prototype.$echarts = echarts;
Vue.prototype.$turf = turf;
global.DC = DC
global.DC
global.echarts = echarts
global.viewer = null
global.DC = DC;
global.DC;
global.echarts = echarts;
global.viewer = null;
DC.DivForms = DivForms;
DC.DivForms = DivForms
DC.use(DcCore) //安装DC核心库
DC.use(DcChart) //安装DC图标库,使用前确保echarts为全局函数
DC.use(DcMapv) //安装Mapv库
DC.use(DcS3M) //安装DcS3M库
Vue.config.productionTip = false
Vue.prototype.$EventBus = EventBus
Vue.use(ElementUI)
Vue.use(VueAxios, axios)
Vue.use(videoLoading)
DC.use(DcCore); //安装DC核心库
DC.use(DcChart); //安装DC图标库,使用前确保echarts为全局函数
DC.use(DcMapv); //安装Mapv库
DC.use(DcS3M); //安装DcS3M库
Vue.config.productionTip = false;
Vue.prototype.$axios = baseAxios;
Vue.prototype.$EventBus = EventBus;
Vue.use(ElementUI);
Vue.use(VueAxios, axios);
Vue.use(videoLoading);
new Vue({
    router,
    store,
    render: h => h(App)
}).$mount('#app')
  router,
  store,
  render: (h) => h(App),
}).$mount("#app");
src/views/activity/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-24 16:36:55
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-07-12 10:12:11
 * @LastEditTime: 2023-07-28 10:37:53
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 
 * 
@@ -532,7 +532,6 @@
            this.$nextTick(() => {
                this.$refs.PublicIndexPage.closeActivityDetails()
            })
            this.showingSecurityId = ''
src/views/home/components/dialog/keyPersonBox.vue
@@ -152,7 +152,7 @@
            this.$store.commit('SET_ARCHITECTUREPOPUP', true)
            this.$store.commit('SET_ARCHITECTUREDATAPOPUP', { ...row, curDataTitle: '重点人员' })
            this.$store.commit('SET_ARCHITECTUREDATAPOPUP', { ...row, curDataTitle: '重点人员', curDataType: '茅家岭派出所' })
            // eslint-disable-next-line no-redeclare
            var popup = new global.DC.DivForms(global.viewer, {
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-07-19 15:07:05
 * @LastEditTime: 2023-07-21 09:37:36
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -2469,8 +2469,6 @@
        indexMethod (index) {
            return index + 1
        },
        /**
         * @description: 现有人员和重点人员列表弹窗关闭的事件
src/views/house/index.vue
@@ -74,20 +74,20 @@
                                <div class="p-r">
                                    <div>
                                        <div style="color:#0e88ff">{{ villageInfo.censusRegisterNumber ?
                                                                                    villageInfo.censusRegisterNumber
                                                                                    : '0' }}</div>
                                            villageInfo.censusRegisterNumber
                                            : '0' }}</div>
                                        <div>户籍人口</div>
                                    </div>
                                    <div>
                                        <div style="color:#71fdf7">{{ villageInfo.realExistenceNumber ?
                                                                                    villageInfo.realExistenceNumber :
                                                                                    '0' }}</div>
                                            villageInfo.realExistenceNumber :
                                            '0' }}</div>
                                        <div>实有人口</div>
                                    </div>
                                    <div>
                                        <div style="color:#ff796c">{{ villageInfo.emphasisNumber ?
                                                                                    villageInfo.emphasisNumber :
                                                                                    '0' }}</div>
                                            villageInfo.emphasisNumber :
                                            '0' }}</div>
                                        <div>重点人口</div>
                                    </div>
                                </div>
@@ -97,26 +97,26 @@
                                <div class="p-r">
                                    <div>
                                        <div style="color:#2a91f5">{{ villageInfo.busTotalNumber ?
                                                                                    villageInfo.busTotalNumber :
                                                                                    '0' }}</div>
                                            villageInfo.busTotalNumber :
                                            '0' }}</div>
                                        <div>户室总数</div>
                                    </div>
                                    <div>
                                        <div style="color:#eeeeee">{{ villageInfo.uncorrelatedNumber ?
                                                                                    villageInfo.uncorrelatedNumber :
                                                                                    '0' }}</div>
                                            villageInfo.uncorrelatedNumber :
                                            '0' }}</div>
                                        <div>未关联</div>
                                    </div>
                                    <div>
                                        <div style="color:#ee0000">{{ villageInfo.unexaminedNumber ?
                                                                                    villageInfo.unexaminedNumber :
                                                                                    '0' }}</div>
                                            villageInfo.unexaminedNumber :
                                            '0' }}</div>
                                        <div>未核实</div>
                                    </div>
                                    <div>
                                        <div style="color:#00ee00">{{ villageInfo.verifiedNumber ?
                                                                                    villageInfo.verifiedNumber
                                                                                    : '0' }}</div>
                                            villageInfo.verifiedNumber
                                            : '0' }}</div>
                                        <div>已核实</div>
                                    </div>
                                </div>
@@ -168,8 +168,8 @@
                                                :key="index" @click="buildingClick(item)"
                                                :class="{ on: buildingChoosed.name == item.name }" :title="item.name">
                                                {{
                                                                                                item.name
                                                                                                }}
                                                    item.name
                                                }}
                                                <div @click.stop title="显示/隐藏楼栋高亮">
                                                    <el-checkbox v-model="isBuildHighLightchecked"
                                                        v-show="buildingChoosed.name == item.name"
@@ -228,26 +228,26 @@
                                <div class="one">
                                    <div>
                                        <div style="color:#2a91f5">{{ buildingInfo.busTotalNumber ?
                                                                                    buildingInfo.busTotalNumber :
                                                                                    '0' }}</div>
                                            buildingInfo.busTotalNumber :
                                            '0' }}</div>
                                        <div>户室总数</div>
                                    </div>
                                    <div>
                                        <div style="color:#eeeeee">{{ buildingInfo.uncorrelatedNumber ?
                                                                                    buildingInfo.uncorrelatedNumber :
                                                                                    '0' }}</div>
                                            buildingInfo.uncorrelatedNumber :
                                            '0' }}</div>
                                        <div>未关联</div>
                                    </div>
                                    <div>
                                        <div style="color:#ee0000">{{ buildingInfo.unexaminedNumber ?
                                                                                    buildingInfo.unexaminedNumber :
                                                                                    '0' }}</div>
                                            buildingInfo.unexaminedNumber :
                                            '0' }}</div>
                                        <div>未核实</div>
                                    </div>
                                    <div>
                                        <div style="color:#00ee00">{{ buildingInfo.verifiedNumber ?
                                                                                    buildingInfo.verifiedNumber
                                                                                    : '0' }}</div>
                                            buildingInfo.verifiedNumber
                                            : '0' }}</div>
                                        <div>已核实</div>
                                    </div>
                                </div>
@@ -296,15 +296,15 @@
                                            <div :class="{ on: floorsType == index }" @click="floorsType = index"
                                                v-for="index in Math.ceil(unitChoosedArr.length / 5)" :key="index">
                                                {{ unitChoosedArr[index * 5 - 5].sname }}{{ unitChoosedArr[index * 5
                                                                                                - 5].sname ==
                                                                                                unitChoosedArr[unitChoosedArr.length - 1].sname ? '' : '-' }}{{
                                                                                                unitChoosedArr[index *
                                                                                                5
                                                                                                - 1] ? (unitChoosedArr[index * 5
                                                                                                - 1].sname) : (unitChoosedArr[index * 5 - 5].sname ==
                                                                                                unitChoosedArr[unitChoosedArr.length - 1].sname
                                                                                                ? '' : unitChoosedArr[unitChoosedArr.length - 1].sname)
                                                                                                }}层
                                                    - 5].sname ==
                                                    unitChoosedArr[unitChoosedArr.length - 1].sname ? '' : '-' }}{{
        unitChoosedArr[index *
        5
        - 1] ? (unitChoosedArr[index * 5
            - 1].sname) : (unitChoosedArr[index * 5 - 5].sname ==
                unitChoosedArr[unitChoosedArr.length - 1].sname
                ? '' : unitChoosedArr[unitChoosedArr.length - 1].sname)
    }}层
                                            </div>
                                        </div>
                                    </div>
@@ -512,7 +512,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.realName }}
                                    scope.row.realName }}
                            </span>
                        </template>
                    </el-table-column>
@@ -520,15 +520,15 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.phone }}
                                    scope.row.phone }}
                            </span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="cardNo" label="身份证号">
                    <el-table-column prop="cardNo" label="身份证号" width="200">
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.cardNo }}
                                    scope.row.cardNo }}
                            </span>
                        </template>
                    </el-table-column>
@@ -536,7 +536,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.relation }}
                                    scope.row.relation }}
                            </span>
                        </template>
                    </el-table-column>
@@ -544,7 +544,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.censusAddress }}
                                    scope.row.censusAddress }}
                            </span>
                        </template>
                    </el-table-column>
@@ -552,7 +552,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.personType == 1 ? '户籍人口' : '实有人口' }}
                                    scope.row.personType == 1 ? '户籍人口' : '实有人口' }}
                            </span>
                        </template>
                    </el-table-column>
@@ -560,8 +560,8 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                                                scope.row.zdryxl
                                                                }}
                                    scope.row.zdryxl
                                }}
                            </span>
                        </template>
                    </el-table-column>
src/views/policeInfor/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-06-20 16:48:41
 * @LastEditTime: 2023-07-19 15:26:58
 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
 * @Description: 辖区管理
 * 
@@ -631,6 +631,7 @@
        // 获取历史接警记录(不分页)
        getAlarmList (params) {
            const that = this
            this.loading()
            this.clearLayer()
@@ -651,39 +652,44 @@
                jjdwbh = this.userInfo.dept_id
            }
            getAlarmList({ ...params, jjdwbh, type: 3, bjlx: this.policeInforValue }).then(res => {
                if (res.data.data.length > 0) {
                    this.historyPoliceInforData = res.data.data.map((item, index) => {
            that.$axios.all([
                getAlarmList({ ...params, jjdwbh, type: 3, bjlx: that.policeInforValue }),
                getAlarmList({ ...params, jjdwbh, type: 3, bjlx: '' })
            ]).then(that.$axios.spread(function (classifyData, allData) {
                if (classifyData.data.data.length > 0) {
                    that.historyPoliceInforData = classifyData.data.data.map((item, index) => {
                        if (item.JJDWMC.indexOf('上饶市公安局') != -1) item.JJDWMC = item.JJDWMC.replace(/上饶市公安局/, '市局')
                        if (item.JJDWMC.indexOf('信州区分局') != -1) item.JJDWMC = item.JJDWMC.replace(/信州区分局/, '')
                        if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')
                        if (item.ZDDWXZB && item.ZDDWXZB != '' && item.ZDDWXZB > 0 && item.ZDDWXZB > 73) {
                            this.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 23 })
                        }
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                    })
                } else {
                    // this.pages.total = 0
                    this.historyPoliceInforData = []
                    this.realEmptyText = "暂无历史警情信息"
                    // that.pages.total = 0
                    that.historyPoliceInforData = []
                    that.realEmptyText = "暂无历史警情信息"
                }
                if (this.siteLayerShow) {
                    this.addPoliceInforSiteLayer(this.historyPoliceInforData)
                if (allData.data.data.length > 0) {
                    allData.data.data.forEach((item, index) => {
                        if (item.ZDDWXZB && item.ZDDWXZB != '' && item.ZDDWXZB > 0 && item.ZDDWXZB > 73) {
                            that.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 23 })
                        }
                    })
                }
                if (this.heatMapShow) {
                    this.heatMapData.length > 0 && this.addHeatmap(this.heatMapData)
                if (that.siteLayerShow) {
                    that.addPoliceInforSiteLayer(that.historyPoliceInforData)
                }
                if (that.heatMapShow) {
                    that.heatMapData.length > 0 && that.addHeatmap(that.heatMapData)
                }
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            }).catch(res => {
            })).catch(res => {
                setTimeout(() => {
                    loading && loading.close()
                }, 500)