index && this.bottomOptionsList[pindex].list[index].check)) {
// 取消选中
// 沧州矿石人员定位关闭
if (this.gangkouActive === '00002' && urlType === 'peoplePosition') {
@@ -1977,7 +2103,9 @@ export default {
if (this.timer) {
clearInterval(this.timer)
}
- this.bottomOptionsList[pindex].list[index].check = false
+ if (this.bottomOptionsList[pindex].list.length > index) {
+ this.bottomOptionsList[pindex].list[index].check = false
+ }
this.clearCmtMqttPoint('person')
if (this.fwebsocket && this.fwebsocket.url) {
this.perLocArr = []
@@ -2012,7 +2140,9 @@ export default {
this.doUnSubscribe()
this.clearMqttPoint('1698584148364034050/UwbBQ/')
}
- this.bottomOptionsList[pindex].list[index].check = false
+ if (this.bottomOptionsList[pindex].list.length > index) {
+ this.bottomOptionsList[pindex].list[index].check = false
+ }
if (this.gangkouActive === '00004') {
this.cfdBottomOptionsList[pindex].list[index].check = false
}
@@ -2025,10 +2155,14 @@ export default {
})
} else {
// 选中
- this.bottomOptionsList[pindex].list[index].check = true
+ if (this.bottomOptionsList[pindex].list.length > index) {
+ this.bottomOptionsList[pindex].list[index].check = true
+ }
if (this.gangkouActive === '00004') {
this.cfdBottomOptionsList[pindex].list[index].check = true
- this.bottomOptionsList[pindex].list[index].check = false
+ if (this.bottomOptionsList[pindex].list.length > index) {
+ this.bottomOptionsList[pindex].list[index].check = false
+ }
}
if (this.gangkouActive === '00002' && urlType === 'peoplePosition') {
this.czksPeoplePosition()
@@ -3041,7 +3175,7 @@ export default {
if (item && item.list && item.list.length > 0) {
if (item.label === '消防管控') {
if (e.label === '消防救援队' && e.label === '报警设备') {
- if (this.gangkouActive === '00005') {
+ if (this.gangkouActive === '00005' || this.gangkouActive === '00004') {
return true
} else {
return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
@@ -3053,13 +3187,13 @@ export default {
}
if (item.label === '气象监测') {
if (e.label === '气象站') {
- return this.gangkouActive !== '00005'
+ return this.gangkouActive !== '00005' && this.gangkouActive !== '00004'
}
}
}
const CORP_INFO_ID = this.CORP_INFO_ID
- if (e.containAuthorization.length === 0) return true
- if (e.containAuthorization.includes(CORP_INFO_ID)) {
+ if (e.containAuthorization && e.containAuthorization.length === 0) return true
+ if (e.containAuthorization && e.containAuthorization.includes(CORP_INFO_ID)) {
return true
} else {
return false
diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js
index d245179..de2e2b2 100644
--- a/src/views/map/js/dragentity.js
+++ b/src/views/map/js/dragentity.js
@@ -4,7 +4,8 @@ const cameraImg = require('../../../assets/map/index/camera.png')
const Cesium = window.Cesium
const img0_0 = require('../../../assets/map/gangkou_index/point/ico1.png')
const img0_1 = require('../../../assets/map/gangkou_index/point/ico2.png')
-const img0_2 = require('../../../assets/map/gangkou_index/point/ico3.png')
+const img0_2 = require('../../../assets/map/gangkou_index/point/ico2.png')
+const img0_3 = require('../../../assets/map/gangkou_index/point/ico3.png')
const img1_0 = require('../../../assets/map/gangkou_index/point/ico4.png')
const img1_1 = require('../../../assets/map/gangkou_index/point/ico5.png')
@@ -12,6 +13,11 @@ const img1_2 = require('../../../assets/map/gangkou_index/point/ico6.png')
const img1_3 = require('../../../assets/map/gangkou_index/point/ico7.png')
const img1_4 = require('../../../assets/map/gangkou_index/point/ico8.png')
const img1_5 = require('../../../assets/map/gangkou_index/point/ico32.png')
+const cfd_img4_0 = require('../../../assets/map/gangkou_index/point/ico4.png')
+const cfd_img4_1 = require('../../../assets/map/gangkou_index/point/ico5.png')
+const cfd_img4_2 = require('../../../assets/map/gangkou_index/point/ico6.png')
+const cfd_img4_3 = require('../../../assets/map/gangkou_index/point/ico7.png')
+const cfd_img4_4 = require('../../../assets/map/gangkou_index/point/ico8.png')
const img2_0 = require('../../../assets/map/gangkou_index/point/ico9.png')
const img2_1 = require('../../../assets/map/gangkou_index/point/ico10.png')
@@ -41,6 +47,8 @@ const cfd_img1_0_2 = require('../../../assets/map/gangkou_index/point/icon28.png
const cfd_img1_0_3 = require('../../../assets/map/gangkou_index/point/icon29.png')
const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
+const cfd_img5_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
+const cfd_img5_1 = require('../../../assets/map/gangkou_index/point/ico26.png')
const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
@@ -53,7 +61,7 @@ const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
const imgMap = {
- img0_0, img0_1, img0_2,
+ img0_0, img0_1, img0_2, img0_3,
img1_0, img1_1, img1_2, img1_3, img1_4, img1_5,
img2_0, img2_1, img2_2, img2_3, img2_4, img2_5, img2_6, img2_7, cfd_img2_8,
cfd_img3_0, img3_0, img3_1,
@@ -62,7 +70,9 @@ const imgMap = {
img6_0, img6_1,
img7_0,
img8_0, img8_1, img8_2, img8_3,
- cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3
+ cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3,
+ cfd_img4_0, cfd_img4_1, cfd_img4_2, cfd_img4_3, cfd_img4_4,
+ cfd_img5_0, cfd_img5_1
}
export { imgMap }
@@ -83,6 +93,7 @@ export default class DragEntity {
}
addEntity(value) {
+ console.log(value)
let billboard = {}
let labelText = value.MAP_POINT_NAME.length > 5 ? value.MAP_POINT_NAME.substring(0, 5) + '...' : value.MAP_POINT_NAME
let labelPixelOffset = new Cesium.Cartesian2(0, -55)
@@ -123,6 +134,7 @@ export default class DragEntity {
}
// 曹妃甸使用
if (value.gangkou === '00004') {
+ console.log(66666666666)
if (value.label === '人员定位') {
if (value.color === 'red') {
billboard = {
@@ -187,6 +199,26 @@ export default class DragEntity {
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
disableDepthTestDistance: Number.POSITIVE_INFINITY
}
+ } else if (value.icon_type.indexOf('4_') !== -1) {
+ billboard = {
+ image: imgMap['cfd_img' + value.icon_type],
+ height: 36,
+ width: 30,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY
+ }
+ } else if (value.icon_type.indexOf('5_') !== -1) {
+ billboard = {
+ image: imgMap['cfd_img' + value.icon_type],
+ height: 36,
+ width: 30,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY
+ }
} else {
billboard = {
image: imgMap['img' + value.icon_type],
diff --git a/src/views/system/homepagepicture/components/indexList.vue b/src/views/system/homepagepicture/components/indexList.vue
index 4fa7e1f..e2af655 100644
--- a/src/views/system/homepagepicture/components/indexList.vue
+++ b/src/views/system/homepagepicture/components/indexList.vue
@@ -118,17 +118,17 @@ export default {
},
// 获取列表
getList() {
- this.listLoading = true
- requestFN(
- '/homepage/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
- { ...this.searchForm }
- ).then((data) => {
- this.listLoading = false
- this.varList = data.hImgs
- this.total = data.page.totalResult
- }).catch((e) => {
- this.listLoading = false
- })
+ // this.listLoading = true
+ // requestFN(
+ // '/homepage/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
+ // { ...this.searchForm }
+ // ).then((data) => {
+ // this.listLoading = false
+ // this.varList = data.hImgs
+ // this.total = data.page.totalResult
+ // }).catch((e) => {
+ // this.listLoading = false
+ // })
},
getCountryList() {
requestFN(