| src/components/map/components/mapPopup.vue | ●●●●● patch | view | raw | blame | history | |
| src/styles/media/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/views/house/index.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/policeInfor/index.vue | ●●●●● patch | view | raw | blame | history |
src/components/map/components/mapPopup.vue
@@ -14,10 +14,7 @@ <div class="label-wrap"> <div class="title"> 警情信息 <div class="details-btn" @click="popupDetailShow"> 详情 <span>>>></span> </div> <div class="close" @click="closePopup" title="关闭"></div> </div> <div class="change-btn" v-show="detailsPopup.showBtn"> src/styles/media/index.scss
@@ -2034,7 +2034,7 @@ } } @@ -2900,4 +2900,17 @@ height: calc(100% - countSizeVh(60)) !important; } } .police-infor-table.el-table { th, td { padding: 0 !important; .cell { line-height: countSizeVh(24) !important; } } } } src/views/house/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-06 18:13:00 * @LastEditTime: 2023-04-09 15:48:43 * @FilePath: \srs-police-affairs\src\views\house\index.vue * @Description: 小区-栋-层-房屋 * @@ -189,7 +189,7 @@ :class="{ on: floorChoosed == value.properties.fojcu }"> {{ value.properties.fojcu }} <!-- <div class="flow"></div> <div class="warning"></div>--> <div class="warning"></div>--> </div> </div> </div> @@ -250,12 +250,24 @@ <el-table :data="callPoliceData" style="width: 100%" :height="currentTableHeight" :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }" :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" :row-class-name="tableRowClassName" @row-click="clickData" :empty-text="jqNoDataText"> :row-class-name="tableRowClassName" :empty-text="jqNoDataText" class="police-infor-table"> <el-table-column prop="JJDWMC" :show-overflow-tooltip="true" label="接警单位" min-width="34%"></el-table-column> <el-table-column label="报警时间" prop="BJSJ"> min-width="80%"></el-table-column> <el-table-column label="报警时间" prop="BJSJ" min-width="50%"> </el-table-column> <el-table-column prop="BJLX" :show-overflow-tooltip="true" label="报警类型"></el-table-column> <el-table-column label="操作" align="center" min-width="36%"> <template slot-scope="scope"> <el-button v-if="!whetherPosition(scope.row)" @click="clickData(scope.row)" type="text" size="small" title="定位"> <i class="el-icon-location" :style="{ color: positionColor(scope.row) }"></i> </el-button> <el-button @click="housingPoliceSiteClick(scope.row)" type="text" size="small" title="详情"> <i class="el-icon-document"></i> </el-button> </template> </el-table-column> </el-table> <div class="pages all-pagination-sty" ref="ElPagination"> @@ -546,6 +558,24 @@ } }, computed: { whetherPosition () { return (row) => { return !(row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0) } }, positionColor () { return (row) => { if (row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0) { return "#1AFA29" } else { return "#ccc" } } } }, created () { // 首页跳转社区包含参数 if (this.$route.query.id) { @@ -816,7 +846,6 @@ this.pictLoading = true this.buildingList = [] getSearchExtensivelyBgAoiDeepdata(ak, region, ids, infos).then((res) => { console.log(res, 'getSearchExtensivelyBgAoiDeepdata---then') let baseUrl if (process.env.NODE_ENV == "development") { // 开发 @@ -826,7 +855,6 @@ baseUrl = "http://10.141.11.11/" } console.log(res.data.result[0], 'getSearchExtensivelyBgAoiDeepdata') // 小区名称类型地址 let villageData = res.data.result[0] @@ -912,7 +940,6 @@ this.callPolicePage.currentPage = 1 this.getAlarmList() }).catch(res => { console.log(res, 'getSearchExtensivelyBgAoiDeepdata---catch') setTimeout(() => { this.villageInfoLoading = false this.BuildListLoading = false @@ -928,7 +955,6 @@ if (res.data.data == null) { setTimeout(() => { this.pictLoading = false console.log('getHouses---if-null--') }, 3000) this.isShowHouseBox = false } else { @@ -1027,14 +1053,12 @@ } setTimeout(() => { this.pictLoading = false console.log('getHouses---if-null--') }, 3000) } else { this.isShowHouseBox = false this.isHaveResidentData = false setTimeout(() => { this.pictLoading = false console.log('getHouses---if-null--') }, 3000) } }) @@ -1083,7 +1107,6 @@ buildingClick (item, aoiArr) { this.unitHouseChoosed = [] console.log('buildingClick==============') this.pictLoading = true if (!aoiArr) { this.$EventBus.$emit("clearHouse3D") @@ -1318,6 +1341,10 @@ this.callPoliceData = res.data.data.records.map((item, index) => { const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0] ? BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE : '' 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(/信州/, '') return { ...item, index: index + 1, 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-04-04 17:38:34 * @LastEditTime: 2023-04-09 15:35:12 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue * @Description: 辖区管理 * @@ -28,7 +28,7 @@ <el-table :data="realPoliceInforData" style="width: 100%" :height="currentTableHeight" :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }" :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }" :row-class-name="tableRowClassName"> :row-class-name="tableRowClassName" class="police-infor-table"> <template slot="empty"> <div>{{ realEmptyText }}</div> </template> @@ -40,7 +40,7 @@ </el-table-column> <el-table-column label="操作" align="center" min-width="32%"> <template slot-scope="scope"> <el-button :disabled="whetherPosition(scope.row)" @click="clickData(scope.row)" type="text" <el-button v-if="!whetherPosition(scope.row)" @click="clickData(scope.row)" type="text" size="small" title="定位"> <i class="el-icon-location" :style="{ color: positionColor(scope.row) }"></i> </el-button> @@ -56,7 +56,7 @@ <el-table :data="historyPoliceInforData" style="width: 100%" :height="currentTableHeight" :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }" :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }" :row-class-name="tableRowClassName"> :row-class-name="tableRowClassName" class="police-infor-table"> <template slot="empty"> <div>{{ historyEmptyText }}</div> </template> @@ -68,7 +68,7 @@ </el-table-column> <el-table-column label="操作" align="center" min-width="32%"> <template slot-scope="scope"> <el-button :disabled="whetherPosition(scope.row)" @click="clickData(scope.row)" type="text" <el-button v-if="!whetherPosition(scope.row)" @click="clickData(scope.row)" type="text" size="small" title="定位"> <i class="el-icon-location" :style="{ color: positionColor(scope.row) }"></i> </el-button> @@ -369,6 +369,10 @@ this.realPoliceInforData = res.data.map((item, index) => { const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0] ? BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE : '' 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(/信州/, '') return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText } }) this.addPoliceInforSiteLayer(this.realPoliceInforData) @@ -483,11 +487,15 @@ this.historyPoliceInforData = [] this.historyEmptyText = "" getAlarmList({ ...params, size: this.pages.size, jjdwbh: this.userInfo.dept_id, type: 3 }).then(res => { console.log('------------getAlarmList----------', res.data.data, 1122) if (res.data.data.length > 0) { // this.pages.total = res.data.data.pages this.historyPoliceInforData = res.data.data.map((item, index) => { const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0] ? BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE : '' 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(/信州/, '') return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText } }) } else {