+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
最新告警 >
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
- 最新告警 >
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/components/personLine.vue b/src/pages/ywts/zyhj/yl/components/personLine.vue
index ca45d22..bbdfe42 100644
--- a/src/pages/ywts/zyhj/yl/components/personLine.vue
+++ b/src/pages/ywts/zyhj/yl/components/personLine.vue
@@ -1,19 +1,13 @@
-
-
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/components/personLine.vue b/src/pages/ywts/zyhj/yl/components/personLine.vue
index ca45d22..bbdfe42 100644
--- a/src/pages/ywts/zyhj/yl/components/personLine.vue
+++ b/src/pages/ywts/zyhj/yl/components/personLine.vue
@@ -1,19 +1,13 @@
-
-
diff --git a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
最新告警 >
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/components/personLine.vue b/src/pages/ywts/zyhj/yl/components/personLine.vue
index ca45d22..bbdfe42 100644
--- a/src/pages/ywts/zyhj/yl/components/personLine.vue
+++ b/src/pages/ywts/zyhj/yl/components/personLine.vue
@@ -1,19 +1,13 @@
-
-
diff --git a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/index.vue b/src/pages/ywts/zyhj/yl/index.vue
index c46b432..a9192f5 100644
--- a/src/pages/ywts/zyhj/yl/index.vue
+++ b/src/pages/ywts/zyhj/yl/index.vue
@@ -1,13 +1,17 @@
-
@@ -17,7 +21,7 @@
import TimeManager from "@/components/TimeManager";
import YlPop from "./ylPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, AddLabelPoint } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -25,12 +29,13 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
+import { getDevice } from '@/api/ywts/zyhj/yl'
import ListPage from "@/components/ListPage";
export default {
name: 'Yl',
- components: {YlPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { YlPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -47,19 +52,19 @@
},
caseTotal: 0,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -73,13 +78,24 @@
name: '园林设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
+ {
+ type: "1", typename: "球机", total: "111",
+ children: [
+ {
+ typename: '球机',
+ name: '111球机',
+ lng: '114.864044',
+ lat: '25.764514',
+ },
+ ]
+ },
],
// others: [
// {type : "1", typename: "****设备", total: "111"},
@@ -90,7 +106,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -98,7 +114,8 @@
},
methods: {
async btnClick(e) {
- clearUpMap()
+ console.log(e.target.id)
+ clearResetMap()
this.isListPage = false
this.isShow = false
this.selectIndex = e.target.id
@@ -111,28 +128,32 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
- arr.splice(0,1) // todo: 测试第一个错误数据
+ arr.splice(0, 1) // todo: 测试第一个错误数据
heat(arr)
}
})
break
+ case "layerBtn":
+ // 获取园林设备数据
+ this.fetchDeviceList()
+ break
}
},
// 设备图层控制
layer(item) {
// clearUpMap()
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'yl-dev', item,
null)
})
@@ -143,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
@@ -167,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -175,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'yl', item,
this.clickYl)
})
@@ -194,7 +215,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -230,13 +251,13 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -245,12 +266,18 @@
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
this.time = time
}
+ },
+ // 获取园林设备
+ fetchDeviceList(params) {
+ getDevice(params).then(res => {
+ console.log(res.data, '园林设备')
+ })
}
}
}
diff --git a/src/api/csdz/videoCloud.js b/src/api/csdz/videoCloud.js
index d73ba78..68305e8 100644
--- a/src/api/csdz/videoCloud.js
+++ b/src/api/csdz/videoCloud.js
@@ -13,8 +13,32 @@
// 事件列表
export function getEventList(data) {
return request({
- url: 'api/videoCloud/caseListPage',
+ url: 'spy-gktj/spy/spysjlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
+
+// 视频云-视频云场景列表
+export function getSenceList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
method: 'post',
data
})
}
+
+// 视频云点位列表
+export function getPointList(data) {
+ return request({
+ url: 'spy-gktj/spy/spydwlb',
+ method: 'post',
+ data,
+ params: {
+ ...data
+ }
+ })
+}
diff --git a/src/api/ywts/zyhj/yl.js b/src/api/ywts/zyhj/yl.js
new file mode 100644
index 0000000..6417a10
--- /dev/null
+++ b/src/api/ywts/zyhj/yl.js
@@ -0,0 +1,13 @@
+/**
+ * 资源环境-园林接口
+ */
+import request from '@/utils/request'
+
+// 园林-设备点位列表
+export function getDevice(params) {
+ return request({
+ url: 'api/park/caseLotList',
+ method: 'get',
+ params
+ })
+}
diff --git "a/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..3909414
--- /dev/null
+++ "b/src/assets/images/layerControl/\350\247\206\351\242\221\350\256\276\345\244\207.png"
Binary files differ
diff --git "a/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png" "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
new file mode 100644
index 0000000..7a3e3b5
--- /dev/null
+++ "b/src/assets/images/layerControl/\351\227\250\347\246\201\350\256\276\345\244\207.png"
Binary files differ
diff --git a/src/assets/mapJson/map.json b/src/assets/mapJson/map.json
index e57f120..c4cf6db 100644
--- a/src/assets/mapJson/map.json
+++ b/src/assets/mapJson/map.json
@@ -4,7 +4,7 @@
"蓉江新区边界": "http://11.100.6.9:18088//cim-proxy/cluster_848/FreedoMetaSvc/service/meta/wmts/dataset/1.0.0/WMTSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=3034a3d8-55c0-43a3-bd6b-2c65e05902d7&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
"CIM2": {
- "地形": "http://11.100.6.9:8088/cim-gateway//cluster_430/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=jP2vT0AfONx1mLHvtTsW_siD-dRo-pLkydfLNdpiq6vcSdx2SMENx2_xcRddOt5ye3vwCOeT11U5uEdSZMyGE61dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8kcYWYCzTjsipMF3FvkftQIzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw7jhfaRKscA6l82ngDgTGU9wOjdOsRCXUNmwuGv8j2r-CUeDvT8d02S22Y7CBLxaKw==&id=d71aca28-3566-40fe-8e64-5a25f8c07b9f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
+ "地形": "http://11.100.6.9:18088//cim-proxy/cluster_865/FreedoMetaSvc/service/meta/wets/dataset/1.1.0/WETSCapabilities.xml?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=d81d0927-19c0-4092-8636-d396ccfd418a&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（带纹理）": "http://11.100.6.9:18088//cim-proxy/cluster_851/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=019446f9-2952-49a3-9a8f-404679643855&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"CIM2建筑（纯白色）": "http://11.100.6.9:18088//cim-proxy/cluster_850/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=72af4205-59c9-4b2d-a394-df1399cc81db&freedoToken=21232f297a57a5a743894a0e4a801fc3"
},
@@ -19,4 +19,4 @@
"智慧交通-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_861/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b2c69d2c-d30b-444c-9d7a-50b45f835c5f&freedoToken=21232f297a57a5a743894a0e4a801fc3",
"智慧园林-手工模型": "http://11.100.6.9:18088//cim-proxy/cluster_859/FreedoMetaSvc/service/meta/pmts/dataset/1.1.0/PMTSCapabilities.json?token=RoVinIN04xLQXlwIB9Ho7I0L8JnIUH10tceYF6xEGgb8qh_iJqSVTJBUdIOjvIpW7NN6DqCMa1Mfb25nNuoNpq1dRaIYvmZIQP6L9htZK0eztH0DrwiueFtUAesMAuzCZDYEz2_DBphxcM5iOMpPi_r6_6AF0BfsB6oF1K1IG8nwlq27TG2lL-YV0TRQBOekzaKzdM3AiRHJZC2GeWVgy1iEsKFwrG6c_e_x54UqqN8vVn_Wz_pr04VpEZuseV16p3f2RkYn9L98u1kyF2Gpw15MCo_u2gvOZDcmb9B8SNHidQSkLwDv6-O2mn4oxiZI9boe8T6Jv83BK2cUD618fQ==&id=b4623832-faff-48a2-9b6e-29c25156e9b2&freedoToken=21232f297a57a5a743894a0e4a801fc3"
}
-}
+}
\ No newline at end of file
diff --git a/src/components/ListPage/index.vue b/src/components/ListPage/index.vue
index 23173fe..4af50e0 100644
--- a/src/components/ListPage/index.vue
+++ b/src/components/ListPage/index.vue
@@ -10,7 +10,7 @@
-
+
{{item.eventname}}
{{item.createtime}}
@@ -183,12 +183,16 @@
},
// 改变当前页
handleCurrentChange(val) {
- this.query.offset = val
+ // this.query.offset = val
this.$emit('change', { page: val })
},
close() {
this.$emit('close')
- }
+ },
+ menuClick(e) {
+ console.log(e, '列表点击')
+ this.$emit('menuClick', e)
+ },
}
}
diff --git a/src/pages/components/otherLine.vue b/src/pages/components/otherLine.vue
index 4d5d157..7e03ef9 100644
--- a/src/pages/components/otherLine.vue
+++ b/src/pages/components/otherLine.vue
@@ -108,6 +108,9 @@
this.width = document.getElementById('other-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('other-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/powerLine.vue b/src/pages/components/powerLine.vue
index 0527f08..c161fc3 100644
--- a/src/pages/components/powerLine.vue
+++ b/src/pages/components/powerLine.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('power-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('power-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffBar1.vue b/src/pages/components/staffBar1.vue
index 4b39e1e..3837490 100644
--- a/src/pages/components/staffBar1.vue
+++ b/src/pages/components/staffBar1.vue
@@ -101,6 +101,9 @@
this.width = document.getElementById('staff-bar1').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-bar1')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine.vue b/src/pages/components/staffLine.vue
index 64a5e1b..99040c4 100644
--- a/src/pages/components/staffLine.vue
+++ b/src/pages/components/staffLine.vue
@@ -88,6 +88,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/staffLine1.vue b/src/pages/components/staffLine1.vue
index d3b0a95..d59ed1e 100644
--- a/src/pages/components/staffLine1.vue
+++ b/src/pages/components/staffLine1.vue
@@ -105,6 +105,9 @@
this.width = document.getElementById('staff-line').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('staff-line')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/components/visitBar.vue b/src/pages/components/visitBar.vue
index 19acf7d..1143c03 100644
--- a/src/pages/components/visitBar.vue
+++ b/src/pages/components/visitBar.vue
@@ -110,6 +110,9 @@
this.width = document.getElementById('visit-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('visit-bar')) {
+ return
+ }
that.reload()
})
this.fetchData()
diff --git a/src/pages/csdz/iot/index.vue b/src/pages/csdz/iot/index.vue
index e8bb650..4828597 100644
--- a/src/pages/csdz/iot/index.vue
+++ b/src/pages/csdz/iot/index.vue
@@ -78,7 +78,7 @@
methods: {
btnClick(e) {
this.selectIndex = e.target.id
- console.log(e.target.dataset.tip, '456')
+ console.log(e.target.id, '456')
if (e.target.dataset.tip === '图层管理') {
clearUpMap()
this.search()
diff --git a/src/pages/csdz/smartCard/index.vue b/src/pages/csdz/smartCard/index.vue
index 47998fb..634d662 100644
--- a/src/pages/csdz/smartCard/index.vue
+++ b/src/pages/csdz/smartCard/index.vue
@@ -1,9 +1,10 @@
@@ -13,10 +14,12 @@
import LayerManagerMix from "@/components/LayerManagerMix";
import KeywordManager from "@/components/KeywordManager";
import TimeManager from "@/components/TimeManager";
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import { getStatistics } from '../../../api/csdz/smartCard'
+import { heat } from '@/utils/freedo/heat'
export default {
name: 'smartCard',
- components: {TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
ktSelect: '',
@@ -32,19 +35,632 @@
}],
menus: {
base: [
- {type : "1", typename: "场馆", total: "111"},
- {type : "2", typename: "食堂", total: "111"},
- {type : "3", typename: "园区", total: "111"}
+ { type: "1", typename: "场馆", total: "111" },
+ { type: "2", typename: "食堂", total: "111" },
+ { type: "3", typename: "园区", total: "111" }
],
device: [
- {type : "1", typename: "门禁", total: "111"}
+ { type: "1", typename: "门禁", total: "111" }
]
}
}
},
methods: {
btnClick(e) {
- this.selectIndex = e.target.id
+ clearResetMap()
+ this.selectIndex = e.target.id
+ console.log(this.selectIndex, 'this.selectIndex')
+ if (this.selectIndex === 'publicBtn') {
+ // 绘制热力图
+ heat([
+ {
+ "lng": "114.852609",
+ "value": "0",
+ "lat": "25.771518"
+ },
+ {
+ "lng": "114.86954796018512",
+ "value": "0",
+ "lat": "25.772834147724332"
+ },
+ {
+ "lng": "114.89472931",
+ "value": "0",
+ "lat": "25.80084573"
+ },
+ {
+ "lng": "114.9052",
+ "value": "187",
+ "lat": "25.779955"
+ },
+ {
+ "lng": "114.89739311",
+ "value": "340",
+ "lat": "25.80916062"
+ },
+ {
+ "lng": "114.873637",
+ "value": "704",
+ "lat": "25.767449"
+ },
+ {
+ "lng": "114.904471",
+ "value": "814",
+ "lat": "25.780307"
+ },
+ {
+ "lng": "114.90180144",
+ "value": "0",
+ "lat": "25.80153227"
+ },
+ {
+ "lng": "114.888354",
+ "value": "0",
+ "lat": "25.802942"
+ },
+ {
+ "lng": "114.9050345",
+ "value": "0",
+ "lat": "25.7976029"
+ },
+ {
+ "lng": "114.891698",
+ "value": "0",
+ "lat": "25.796913"
+ },
+ {
+ "lng": "114.903365",
+ "value": "0",
+ "lat": "25.721499"
+ },
+ {
+ "lng": "114.90117079",
+ "value": "0",
+ "lat": "25.77566326"
+ },
+ {
+ "lng": "114.907952",
+ "value": "0",
+ "lat": "25.786445"
+ },
+ {
+ "lng": "114.87828827",
+ "value": "61",
+ "lat": "25.72393167"
+ },
+ {
+ "lng": "114.867403",
+ "value": "103",
+ "lat": "25.790731"
+ },
+ {
+ "lng": "114.89831161",
+ "value": "258",
+ "lat": "25.8067614"
+ },
+ {
+ "lng": "114.90189704",
+ "value": "295",
+ "lat": "25.79580584"
+ },
+ {
+ "lng": "114.90823684",
+ "value": "1313",
+ "lat": "25.79854603"
+ },
+ {
+ "lng": "114.901514",
+ "value": "0",
+ "lat": "25.780173"
+ },
+ {
+ "lng": "114.875663",
+ "value": "0",
+ "lat": "25.759203"
+ },
+ {
+ "lng": "114.88988207442962",
+ "value": "0",
+ "lat": "25.79880148166368"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.893485",
+ "value": "0",
+ "lat": "25.785402"
+ },
+ {
+ "lng": "114.86783394",
+ "value": "91",
+ "lat": "25.77203393"
+ },
+ {
+ "lng": "114.8902791",
+ "value": "230",
+ "lat": "25.7899092"
+ },
+ {
+ "lng": "114.895461",
+ "value": "1252",
+ "lat": "25.785735"
+ },
+ {
+ "lng": "114.90791487",
+ "value": "0",
+ "lat": "25.78412055"
+ },
+ {
+ "lng": "114.869815",
+ "value": "0",
+ "lat": "25.791709"
+ },
+ {
+ "lng": "114.87878087481697",
+ "value": "0",
+ "lat": "25.77663963682264"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.880149",
+ "value": "0",
+ "lat": "25.765288"
+ },
+ {
+ "lng": "114.88322",
+ "value": "0",
+ "lat": "25.771672"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.906792",
+ "value": "2",
+ "lat": "25.764324"
+ },
+ {
+ "lng": "114.900793",
+ "value": "109",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.904047",
+ "value": "239",
+ "lat": "25.781464"
+ },
+ {
+ "lng": "114.90056457",
+ "value": "714",
+ "lat": "25.78335089"
+ },
+ {
+ "lng": "114.885698",
+ "value": "2063",
+ "lat": "25.762593"
+ },
+ {
+ "lng": "114.89559788",
+ "value": "0",
+ "lat": "25.79712599"
+ },
+ {
+ "lng": "114.892712",
+ "value": "0",
+ "lat": "25.772652"
+ },
+ {
+ "lng": "114.88997655",
+ "value": "0",
+ "lat": "25.81716686"
+ },
+ {
+ "lng": "114.90593",
+ "value": "0",
+ "lat": "25.781083"
+ },
+ {
+ "lng": "114.87537515229907",
+ "value": "0",
+ "lat": "25.771905277442915"
+ },
+ {
+ "lng": "114.871678",
+ "value": "0",
+ "lat": "25.791199"
+ },
+ {
+ "lng": "",
+ "value": "0",
+ "lat": ""
+ },
+ {
+ "lng": "114.84897",
+ "value": "0",
+ "lat": "25.753554"
+ },
+ {
+ "lng": "114.898712",
+ "value": "29",
+ "lat": "25.813012"
+ },
+ {
+ "lng": "114.88167185702406",
+ "value": "444",
+ "lat": "25.784920522149285"
+ },
+ {
+ "lng": "114.86357824",
+ "value": "0",
+ "lat": "25.74034598"
+ },
+ {
+ "lng": "114.896149",
+ "value": "0",
+ "lat": "25.788156"
+ },
+ {
+ "lng": "114.88299497",
+ "value": "0",
+ "lat": "25.76366772"
+ },
+ {
+ "lng": "114.90531018",
+ "value": "0",
+ "lat": "25.80701165"
+ },
+ {
+ "lng": "114.904818",
+ "value": "0",
+ "lat": "25.781645"
+ },
+ {
+ "lng": "114.873339",
+ "value": "0",
+ "lat": "25.791198"
+ },
+ {
+ "lng": "114.89974",
+ "value": "0",
+ "lat": "25.805838"
+ },
+ {
+ "lng": "114.90789027",
+ "value": "0",
+ "lat": "25.78821431"
+ },
+ {
+ "lng": "114.887856",
+ "value": "3",
+ "lat": "25.798275"
+ },
+ {
+ "lng": "114.88948336",
+ "value": "18",
+ "lat": "25.82079933"
+ },
+ {
+ "lng": "114.89489856",
+ "value": "48",
+ "lat": "25.81239956"
+ },
+ {
+ "lng": "114.907943",
+ "value": "67",
+ "lat": "25.803726"
+ },
+ {
+ "lng": "114.901954",
+ "value": "86",
+ "lat": "25.778339"
+ },
+ {
+ "lng": "114.894247",
+ "value": "113",
+ "lat": "25.774295"
+ },
+ {
+ "lng": "114.916563",
+ "value": "115",
+ "lat": "25.797593"
+ },
+ {
+ "lng": "114.898713",
+ "value": "225",
+ "lat": "25.778099"
+ },
+ {
+ "lng": "114.87098412",
+ "value": "237",
+ "lat": "25.75914086"
+ },
+ {
+ "lng": "114.89971222",
+ "value": "288",
+ "lat": "25.78478469"
+ },
+ {
+ "lng": "114.82614306",
+ "value": "339",
+ "lat": "25.81122899"
+ },
+ {
+ "lng": "114.90010527",
+ "value": "480",
+ "lat": "25.8099684"
+ },
+ {
+ "lng": "114.86652004",
+ "value": "853",
+ "lat": "25.77338177"
+ },
+ {
+ "lng": "114.887978",
+ "value": "1053",
+ "lat": "25.805816"
+ },
+ {
+ "lng": "114.895732",
+ "value": "0",
+ "lat": "25.771463"
+ },
+ {
+ "lng": "114.888064",
+ "value": "0",
+ "lat": "25.785451"
+ },
+ {
+ "lng": "114.88478481571872",
+ "value": "0",
+ "lat": "25.790735278581476"
+ },
+
+ {
+ "lng": "114.885379",
+ "value": "0",
+ "lat": "25.788672"
+ },
+ {
+ "lng": "114.865757",
+ "value": "0",
+ "lat": "25.780003"
+ },
+ {
+ "lng": "114.83476236",
+ "value": "24",
+ "lat": "25.784232"
+ },
+ {
+ "lng": "114.84974977",
+ "value": "59",
+ "lat": "25.81164526"
+ },
+ {
+ "lng": "114.900793",
+ "value": "123",
+ "lat": "25.778052"
+ },
+ {
+ "lng": "114.84334098",
+ "value": "135",
+ "lat": "25.74457324"
+ },
+ {
+ "lng": "114.897388",
+ "value": "149",
+ "lat": "25.780622"
+ },
+ {
+ "lng": "114.88574",
+ "value": "705",
+ "lat": "25.786367"
+ },
+ {
+ "lng": "114.91010039",
+ "value": "1403",
+ "lat": "25.79712676"
+ },
+ {
+ "lng": "114.894279",
+ "value": "1542",
+ "lat": "25.786385"
+ },
+ {
+ "lng": "114.87801334",
+ "value": "0",
+ "lat": "25.79278345"
+ },
+ {
+ "lng": "114.8533278",
+ "value": "0",
+ "lat": "25.736264"
+ },
+ {
+ "lng": "114.88294401",
+ "value": "0",
+ "lat": "25.80743122"
+ },
+ {
+ "lng": "114.89515",
+ "value": "0",
+ "lat": "25.786011"
+ },
+ {
+ "lng": "114.89282269389948",
+ "value": "0",
+ "lat": "25.77896492990762"
+ },
+ {
+ "lng": "114.88996631671216",
+ "value": "0",
+ "lat": "25.775159246641998"
+ },
+ {
+ "lng": "114.89631270377998",
+ "value": "0",
+ "lat": "25.781281399916015"
+ },
+ {
+ "lng": "114.91632466379747",
+ "value": "0",
+ "lat": "25.78683215401286"
+ },
+ {
+ "lng": "114.89233215",
+ "value": "52",
+ "lat": "25.77633179"
+ },
+ {
+ "lng": "114.84410307",
+ "value": "218",
+ "lat": "25.81850066"
+ },
+ {
+ "lng": "114.914015",
+ "value": "300",
+ "lat": "25.787286"
+ },
+ {
+ "lng": "114.903443",
+ "value": "1002",
+ "lat": "25.783608"
+ },
+ {
+ "lng": "114.84074062",
+ "value": "0",
+ "lat": "25.794645"
+ },
+ {
+ "lng": "114.860205",
+ "value": "0",
+ "lat": "25.762702"
+ },
+ {
+ "lng": "114.89860705",
+ "value": "0",
+ "lat": "25.79843808"
+ },
+ {
+ "lng": "114.894791",
+ "value": "0",
+ "lat": "25.819415"
+ },
+ {
+ "lng": "114.903807",
+ "value": "0",
+ "lat": "25.792156"
+ },
+ {
+ "lng": "114.89165243",
+ "value": "14",
+ "lat": "25.81860601"
+ },
+ {
+ "lng": "114.902386",
+ "value": "22",
+ "lat": "25.77421"
+ },
+ {
+ "lng": "114.89188222",
+ "value": "57",
+ "lat": "25.81545329"
+ },
+ {
+ "lng": "",
+ "value": "101",
+ "lat": ""
+ },
+ {
+ "lng": "114.8988477",
+ "value": "220",
+ "lat": "25.80379084"
+ },
+ {
+ "lng": "114.898902",
+ "value": "288",
+ "lat": "25.801992"
+ },
+ {
+ "lng": "114.90212106",
+ "value": "383",
+ "lat": "25.78934498"
+ },
+ {
+ "lng": "114.905185",
+ "value": "483",
+ "lat": "25.806424"
+ },
+ {
+ "lng": "114.90494692",
+ "value": "582",
+ "lat": "25.78681484"
+ },
+ {
+ "lng": "114.886686",
+ "value": "0",
+ "lat": "25.785846"
+ },
+ {
+ "lng": "114.87008520141764",
+ "value": "0",
+ "lat": "25.774054295378242"
+ },
+ {
+ "lng": "114.913365",
+ "value": "0",
+ "lat": "25.795124"
+ },
+ {
+ "lng": "114.89386282",
+ "value": "0",
+ "lat": "25.80107134"
+ },
+ {
+ "lng": "114.874196",
+ "value": "0",
+ "lat": "25.792612"
+ },
+ {
+ "lng": "114.89246029158107",
+ "value": "0",
+ "lat": "25.80311746175271"
+ },
+ {
+ "lng": "114.88907555",
+ "value": "6",
+ "lat": "25.80536721"
+ },
+ {
+ "lng": "114.89071942",
+ "value": "12",
+ "lat": "25.82069276"
+ },
+ {
+ "lng": "114.88490378",
+ "value": "75",
+ "lat": "25.77259112"
+ },
+ {
+ "lng": "114.887436",
+ "value": "132",
+ "lat": "25.788445"
+ },
+ {
+ "lng": "114.894761",
+ "value": "1184",
+ "lat": "25.785151"
+ }
+ ])
+ }
},
changeState(v) {
this.ktSelect = v
diff --git a/src/pages/csdz/videoCloud/components/eventList.vue b/src/pages/csdz/videoCloud/components/eventList.vue
index 4c5ebd9..c3a765a 100644
--- a/src/pages/csdz/videoCloud/components/eventList.vue
+++ b/src/pages/csdz/videoCloud/components/eventList.vue
@@ -114,10 +114,9 @@
width: 500px;
background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
background-size: 100% 101% !important;
- height: calc(100% - 5rm - 4rem);
+ height: calc(100vh- 5rm - 4rem);
overflow-y: scroll;
overflow-x: hidden;
-
}
.children-item {
diff --git a/src/pages/csdz/videoCloud/eventPop.vue b/src/pages/csdz/videoCloud/eventPop.vue
index 5702688..3409f91 100644
--- a/src/pages/csdz/videoCloud/eventPop.vue
+++ b/src/pages/csdz/videoCloud/eventPop.vue
@@ -1,49 +1,28 @@
-
@@ -35,12 +46,15 @@
import offlineVideo from "./components/offlineVideo.vue";
import eventList1 from "./components/eventList.vue";
import eventPop from "./eventPop.vue";
+import ListPage from "@/components/ListPage";
+import { showPositin } from '@/utils/freedo/index'
import { getStatistics, getEventList } from '@/api/csdz/videoCloud'
import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
+
import videoPop from './videoPop'
export default {
name: 'VideoCloud',
- components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop },
+ components: { TimeManager, KeywordManager, LayerManager, CommonBtn, videoPop, offlineVideo, eventList1, eventPop, ListPage },
data() {
return {
isShowPop: false, // 是否展示点位弹窗
@@ -52,6 +66,12 @@
isShowEvent: false, // 展示监测事件
isShowEventPop: false, // 是否展示事件弹窗
ktSelect: '',
+ eventParams: {
+ pageNo: 1,
+ pageSize: 5,
+ keywords: '',
+ }, // 事件列表查询条件
+ eventTotal: 0, // 事件列表条数
selectIndex: 'layerBtn',
caseBg: require('@/assets/images/function/视频云/视频检测事件未选中.png'),
caseHover: require('@/assets/images/function/视频云/视频检测事件选中.png'),
@@ -263,7 +283,7 @@
else if (this.selectIndex === 'caseBtn') {
// 监测事件
this.isShowEvent = true
- this.fetchEventList({ pageNo: 1, pageSize: 10 })
+ this.fetchEventList(this.eventParams)
}
},
changeState(v) {
@@ -573,53 +593,56 @@
// 获取事件列表
fetchEventList(params) {
const icon = require('@/assets/images/icon/视频云/坐标.png')
- getEventList({}).then((res) => {
- this.eventList = [
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.818903',
- lat: '25.743833',
- code: new Date().getTime(),
- deviceName: '111球机',
- eventName: '突发事件',
- urgencyName: '紧急高',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '村头新村北100米',
- imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
- createTime: '2024-22-19 09:30:11',
- report: '自动上报',
- cover: '',
- },
- {
- id: new Date().getTime(),
- deviceId: new Date().getTime(),
- alarmId: new Date().getTime(),
- lon: '114.866776',
- lat: '25.764915',
- code: new Date().getTime(),
- deviceName: '枪机2',
- eventName: '突发事件',
- urgencyName: '紧急',
- eventSource: '视频识别',
- dutyDeptName: 'xxx部门',
- evenTypeName: '市容市貌',
- eventStatusName: '待立案',
- location: '宋溏村委会',
- imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
- createTime: '2024-22-17 10:44:14',
- report: '自动上报',
- cover: '',
- },
- ]
+ this.$refs.caseListPage.initDialog()
+ getEventList(params).then((res) => {
+ this.eventTotal = res.data.valueSize
+ this.eventList= res.data.value
+ // this.eventList = [
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.818903',
+ // lat: '25.743833',
+ // code: new Date().getTime(),
+ // deviceName: '111球机',
+ // eventName: '突发事件',
+ // urgencyName: '紧急高',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '村头新村北100米',
+ // imgUrl: 'https://img1.baidu.com/it/u=1696860963,3804811236&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500',
+ // createTime: '2024-22-19 09:30:11',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // {
+ // id: new Date().getTime(),
+ // deviceId: new Date().getTime(),
+ // alarmId: new Date().getTime(),
+ // lon: '114.866776',
+ // lat: '25.764915',
+ // code: new Date().getTime(),
+ // deviceName: '枪机2',
+ // eventName: '突发事件',
+ // urgencyName: '紧急',
+ // eventSource: '视频识别',
+ // dutyDeptName: 'xxx部门',
+ // evenTypeName: '市容市貌',
+ // eventStatusName: '待立案',
+ // location: '宋溏村委会',
+ // imgUrl: 'https://img2.baidu.com/it/u=1889999577,862790646&fm=253&fmt=auto&app=120&f=JPEG?w=750&h=500',
+ // createTime: '2024-22-17 10:44:14',
+ // report: '自动上报',
+ // cover: '',
+ // },
+ // ]
this.eventList.forEach((item) => {
AddLabelPoint(
item.id || new Date().getTime(),
- item.eventName,
+ item.eventName || item.eventname,
icon,
[item.lon, item.lat, 0], 'gd', item,
this.clickCaseIncon
@@ -648,11 +671,16 @@
},
// 事件列表点击
menuEventClick(e) {
- this.clickCaseIncon({
- _data: {
- data: e
- }
- })
+ console.log(e, 'e')
+ // this.clickCaseIncon({
+ // _data: {
+ // data: e
+ // }
+ // })
+ if(e.lon && e.lat) {
+ showPositin(e.lon, e.lat)
+ }
+
},
// 关闭事件列表
closeEvent() {
@@ -660,7 +688,8 @@
},
// 事件列表页面条数变化
changePage(val) {
- console.log(val, '页面变化')
+ this.eventParams.pageNo = val.page
+ this.fetchEventList(this.eventParams)
}
},
diff --git a/src/pages/ywts/cszl/gd/components/caseLineBar.vue b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/cszl/gd/components/caseLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/cszl/gd/components/eduLineBar.vue b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/cszl/gd/components/eduLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/personBar.vue b/src/pages/ywts/cszl/gd/components/personBar.vue
index d0673a9..8f0e3a9 100644
--- a/src/pages/ywts/cszl/gd/components/personBar.vue
+++ b/src/pages/ywts/cszl/gd/components/personBar.vue
@@ -128,6 +128,9 @@
this.width = document.getElementById('person-bar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('person-bar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
+++ b/src/pages/ywts/cszl/gd/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/cszl/gd/index.vue b/src/pages/ywts/cszl/gd/index.vue
index 933a9db..e3bce64 100644
--- a/src/pages/ywts/cszl/gd/index.vue
+++ b/src/pages/ywts/cszl/gd/index.vue
@@ -2,16 +2,16 @@
-
@@ -58,10 +37,24 @@
list: ['', '', '', ''],
gdInfo: {},
windowPostion: {x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+ defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+ statusColor: {
+ 1: '#a1a1a1',
+ 2: '#f8e31a',
+ 3: '#5ab1fc',
+ 4: '#f89835',
+ 5: '#3def83',
+ },
+ urgencyColor: {
+ 'C':'#2f8d00',
+ 'B':'#c4ad00',
+ 'A':'#8d0000'
+ },
}
},
methods: {
initData(item) {
+ if(!item.lon || !item.lat) { return }
showPositin(item.lon, item.lat)
// 弹窗位置
if(window.localStorage.getItem('mousePosition')){
@@ -105,7 +98,7 @@
.bottom{
z-index: 111111111111;
width: 100%;
- height: 180px;
+ height: 200px;
width: 35rem;
position: absolute;
bottom: 10px;
@@ -186,4 +179,72 @@
align-items: center;
}
}
+.list-down {
+ margin-top: 10px;
+ // overflow-y: scroll;
+ width: 100%;
+ // height: calc(100% - 6rem);
+ padding: 0px 10px;
+}
+.list-item {
+ width: calc(100% - 35px);
+ height: 12rem;
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ flex-wrap: wrap;
+ font-size: 1.4rem;
+ padding: 0.8rem 10px;
+ margin: 0.2rem 0rem;
+ letter-spacing: 2px;
+ cursor: pointer;
+ background-size: 100% 100% !important;
+ color: white;
+ border-top: 2px solid #0494f3;
+ border-radius: 10px;
+}
+.list-item:hover {
+ background-size: cover !important;
+ background: url('../../../assets/images/right/选中.png') !important;
+ background-size: 100% 100% !important;
+}
+.item-title {
+ width: 90%;text-align: left;margin-bottom: 5px;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
+.item-line {
+ display: flex;
+ font-size: 1.2rem;
+ color: #aed2f3;
+ padding-left: 20px;
+ line-height: 1.8rem;
+ width: 95%;
+ word-break: break-all;
+ text-align: left;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 设置最大行数 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.colorbox-text {
+ background-color: #0a88fc;
+ border-radius: 10px;
+ color: white;
+ font-size: 1rem;
+ padding: 0rem 0.4rem;
+ margin-left: 5px;
+ text-align: center;
+ width: 5rem;
+ margin-bottom: 4px;
+ cursor: pointer;
+}
+.one-line {
+ display: block !important;
+ white-space: nowrap; /* 防止换行 */
+ overflow: hidden; /* 溢出隐藏 */
+ text-overflow: ellipsis; /* 文本显示为省略号 */
+}
diff --git a/src/pages/csdz/videoCloud/index.vue b/src/pages/csdz/videoCloud/index.vue
index bd8d77a..f81f3dd 100644
--- a/src/pages/csdz/videoCloud/index.vue
+++ b/src/pages/csdz/videoCloud/index.vue
@@ -20,8 +20,19 @@
-
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventStatusName }}
- {{ gdInfo.eventName }}
-
-
-
- {{ gdInfo.urgencyName }}
- {{ gdInfo.urgencyName }}
-
+
+
-
+
+ {{gdInfo.eventname}}
+ {{gdInfo.createtime}}
+ {{gdInfo.eventsource}}
+ {{gdInfo.eventypename}}
+ {{gdInfo.dutydeptname}}
+ {{gdInfo.location}}
+
+
+
+ {{gdInfo.eventstatusname}}
+ {{gdInfo.urgencyname}}
+
+
+
+
+
+
- {{ `统一编码：${gdInfo.code}` }}
-
-
-
-
-
- ![]()
-
-
-
- 事件来源：{{ gdInfo.report }}
- 事件类别：{{ gdInfo.evenTypeName }}
-
-
- 识别设备：{{ gdInfo.deviceName }}
- 责任部门：{{ gdInfo.dutyDeptName }}
-
-
- 时间：{{ gdInfo.createTime }}
-
-
- 位置：{{ gdInfo.location }}
-
-
-
-
-
-
@@ -24,16 +23,16 @@
import { getStatistics, getPointList, getPointInfo, getHeat, getDevice } from '@/api/ywts/shms/jy'
import { AddLabelPoint } from '@/utils/freedo'
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap } from '@/utils/freedo'
-import {focusPoint} from "../../../../utils/freedo";
+import { clearUpMap, initPosition } from '@/utils/freedo'
+import { focusPoint } from "../../../../utils/freedo";
import gridJson from "@/assets/mapJson/grid.json";
import mapJson from "@/assets/mapJson/map.json";
import modelJson from "@/assets/mapJson/school.json";
-import {eventBus} from "../../../../main";
+import { eventBus } from "../../../../main";
export default {
name: 'Jy',
- components: {SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+ components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
data() {
return {
isShow: false,
@@ -57,8 +56,8 @@
},
menus: {
device: [
- {type : "1", typename: "视频设备", total: "111"},
- {type : "2", typename: "门禁设备", total: "111"}
+ { type: "1", typename: "视频设备", total: "111" },
+ { type: "2", typename: "门禁设备", total: "111" }
]
}
}
@@ -71,14 +70,14 @@
name: 'jy',
autoFlyto: true,
})
- eventBus.$emit('change-layer', { id:1, checked: false});
- eventBus.$emit('change-layer', { id:2, checked: false});
- eventBus.$emit('change-layer', { id:3, checked: false});
- eventBus.$emit('change-layer', { id:4, checked: false});
- eventBus.$emit('change-layer', { id:5, checked: true});
- eventBus.$emit('change-layer', { id:41, checked: true});
- eventBus.$emit('change-layer', { id:21, checked: true});
- eventBus.$emit('change-layer', { id:12, checked: true});
+ eventBus.$emit('change-layer', { id: 1, checked: false });
+ eventBus.$emit('change-layer', { id: 2, checked: false });
+ eventBus.$emit('change-layer', { id: 3, checked: false });
+ eventBus.$emit('change-layer', { id: 4, checked: false });
+ eventBus.$emit('change-layer', { id: 5, checked: true });
+ eventBus.$emit('change-layer', { id: 41, checked: true });
+ eventBus.$emit('change-layer', { id: 21, checked: true });
+ eventBus.$emit('change-layer', { id: 12, checked: true });
// // 教育模型
// window.pmtsManager.add({
// id: "智慧教育-手工模型",
@@ -123,7 +122,9 @@
},
methods: {
async btnClick(e) {
+ console.log(e.target.id, 'e.target.id')
clearUpMap(true)
+ initPosition()
this.isShow = false
this.selectIndex = e.target.id
switch (this.selectIndex) {
@@ -132,11 +133,14 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
heat(res.data.value.filter(item => item.lng !== "" && item.lng !== null)) // 热力图
}
})
break
+ case 'layerBtn':
+ this.searchDevice()
+ break
}
},
// 点击icon事件
@@ -150,18 +154,18 @@
// 查询学校点位
search() {
const icon = require('@/assets/images/icon/教育地图点位/学校.png')
- const icon1 = require('@/assets/images/icon/事件/已撤案.png')
+ const icon1 = require('@/assets/images/icon/事件/已撤案.png')
const wgs84 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
const nad83 = '+proj=longlat +datum=NAD83 +no_defs'
const cgcs2000 = '+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs';
const transform = proj4(wgs84, nad83)
- getPointList({keywords: this.keyword}).then(response => {
- if(response.code === 200) {
+ getPointList({ keywords: this.keyword }).then(response => {
+ if (response.code === 200) {
this.keywordList = response.data.value
response.data.value.forEach(item => {
const transformedCoords = transform.forward([Number(item.lon), Number(item.lat)])
- if(transformedCoords[0] !== 0) {
+ if (transformedCoords[0] !== 0) {
// console.log([item.lon, item.lat, 0], 'before')
// console.log([transformedCoords[0], transformedCoords[1], 0],'after')
AddLabelPoint(item.id, item.name, icon, [transformedCoords[0], transformedCoords[1], 0], 'jy', item, this.clickJY)
@@ -180,11 +184,19 @@
id: this.selectIndex
}
}
+ initPosition()
+ this.search()
this.btnClick(item)
this.ktSelect = 'keywordBtn'
},
localPoint(item) {
focusPoint(item.lon, item.lat)
+ },
+ // 搜索学校设备
+ searchDevice() {
+ getDevice({}).then(res => {
+ console.log('学校数据')
+ })
}
}
}
diff --git a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
index 47a94b7..95ef152 100644
--- a/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/caseLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('case-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('case-linebar')) {
+ return
+ }
that.reload()
})
diff --git a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
index 2acfddb..84460ef 100644
--- a/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/eduLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('edu-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function() {
+ if(!document.getElementById('edu-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/components/personLine.vue b/src/pages/ywts/zyhj/yl/components/personLine.vue
index ca45d22..bbdfe42 100644
--- a/src/pages/ywts/zyhj/yl/components/personLine.vue
+++ b/src/pages/ywts/zyhj/yl/components/personLine.vue
@@ -1,19 +1,13 @@
-
-
diff --git a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
index 1cb5bf2..c9023f5 100644
--- a/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
+++ b/src/pages/ywts/zyhj/yl/components/scoreLineBar.vue
@@ -144,6 +144,9 @@
this.width = document.getElementById('score-linebar').clientWidth - 10 + 'px'
const that = this
window.addEventListener('resize', function () {
+ if(!document.getElementById('score-linebar')) {
+ return
+ }
that.reload()
})
},
diff --git a/src/pages/ywts/zyhj/yl/index.vue b/src/pages/ywts/zyhj/yl/index.vue
index c46b432..a9192f5 100644
--- a/src/pages/ywts/zyhj/yl/index.vue
+++ b/src/pages/ywts/zyhj/yl/index.vue
@@ -1,13 +1,17 @@
-
@@ -17,7 +21,7 @@
import TimeManager from "@/components/TimeManager";
import YlPop from "./ylPop";
import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, AddLabelPoint } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
import {
getHeat,
getArea,
@@ -25,12 +29,13 @@
getStatistics,
getCasePointList, getCaseInfo
} from "../../../../api/ywts/cszl/gd";
-import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
+import { AddDivPointHighlight, AddLabel } from "../../../../utils/freedo";
+import { getDevice } from '@/api/ywts/zyhj/yl'
import ListPage from "@/components/ListPage";
export default {
name: 'Yl',
- components: {YlPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
+ components: { YlPop, TimeManager, LayerManagerMix, ListPage, CommonBtn },
data() {
return {
isListPage: false,
@@ -47,19 +52,19 @@
},
caseTotal: 0,
caseIcon: {
- 1: require('@/assets/images/icon/事件/已撤案.png'),
- 2: require('@/assets/images/icon/事件/指派中.png'),
- 3: require('@/assets/images/icon/事件/处置中.png'),
- 4: require('@/assets/images/icon/事件/已办结.png'),
- 5: require('@/assets/images/icon/事件/已结案.png'),
- },
+ 1: require('@/assets/images/icon/事件/已撤案.png'),
+ 2: require('@/assets/images/icon/事件/指派中.png'),
+ 3: require('@/assets/images/icon/事件/处置中.png'),
+ 4: require('@/assets/images/icon/事件/已办结.png'),
+ 5: require('@/assets/images/icon/事件/已结案.png'),
+ },
caseColor: {
- 1: '#ffffff',
- 2: '#fdeb56',
- 3: '#85c8ff',
- 4: '#ffba74',
- 5: '#87f6b3',
- },
+ 1: '#ffffff',
+ 2: '#fdeb56',
+ 3: '#85c8ff',
+ 4: '#ffba74',
+ 5: '#87f6b3',
+ },
time: {
startTime: '',
endTime: '',
@@ -73,13 +78,24 @@
name: '园林设备',
value: 'device'
}
- // , {
- // name: '环监设备',
- // value: 'others'
- // }
+ // , {
+ // name: '环监设备',
+ // value: 'others'
+ // }
],
menus: {
device: [
+ {
+ type: "1", typename: "球机", total: "111",
+ children: [
+ {
+ typename: '球机',
+ name: '111球机',
+ lng: '114.864044',
+ lat: '25.764514',
+ },
+ ]
+ },
],
// others: [
// {type : "1", typename: "****设备", total: "111"},
@@ -90,7 +106,7 @@
},
mounted() {
getStatistics().then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
this.menus.device = response.data.value
}
})
@@ -98,7 +114,8 @@
},
methods: {
async btnClick(e) {
- clearUpMap()
+ console.log(e.target.id)
+ clearResetMap()
this.isListPage = false
this.isShow = false
this.selectIndex = e.target.id
@@ -111,28 +128,32 @@
break
case "personBtn":
getHeat().then(res => {
- if(res.code === 200) {
+ if (res.code === 200) {
const arr = res.data.value.filter(item => item.lng !== "" && item.lng !== null)
- arr.splice(0,1) // todo: 测试第一个错误数据
+ arr.splice(0, 1) // todo: 测试第一个错误数据
heat(arr)
}
})
break
+ case "layerBtn":
+ // 获取园林设备数据
+ this.fetchDeviceList()
+ break
}
},
// 设备图层控制
layer(item) {
// clearUpMap()
- const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
- const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
- getDevList({type: item.type}).then(response => {
- if(response.code === 200) {
+ const iconOnline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '在线.png')
+ const iconOffline = require('@/assets/images/icon/工地地图点位/' + item.typename.replace(/ /g, '') + '离线.png')
+ getDevList({ type: item.type }).then(response => {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
AddLabelPoint(
item.id,
'',
- item.status === '1'? iconOnline: iconOffline,
+ item.status === '1' ? iconOnline : iconOffline,
[item.lon, item.lat, 0], 'yl-dev', item,
null)
})
@@ -143,11 +164,11 @@
casePoint() {
console.log(this.time)
getCasePointList(this.time).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
const data = []
response.data.value.forEach(item => {
- if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
+ if (!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
data.push(item)
}
})
@@ -167,7 +188,7 @@
const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
getArea({}).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
clearUpMap()
response.data.value.forEach(item => {
// console.log(item.areaboundary)
@@ -175,7 +196,7 @@
AddLabelPoint(
item.id,
item.name,
- item.status === '2' ? iconDoing: iconDone,
+ item.status === '2' ? iconDoing : iconDone,
[item.lon, item.lat, 0], 'yl', item,
this.clickYl)
})
@@ -194,7 +215,7 @@
clickCase(eventArg) {
const item = eventArg._data.data
// 恢复上一个marker
- if(this.preCase !== null ) {
+ if (this.preCase !== null) {
window.mmManager.removeById(this.preCase.id)
AddLabelPoint(
this.preCase.id,
@@ -230,13 +251,13 @@
searchCaseMarkerList() {
// getCaseInfo(this.caseListQuery).then(response => {
getCaseInfo(this.caseListQuery).then(response => {
- if(response.code === 200) {
+ if (response.code === 200) {
console.log(response.data.value)
// 右侧看板
- this.caseList = response.data.value
+ this.caseList = response.data.value
// todo
// this.caseTotal = response.data.value.length
- this.caseTotal = 12
+ this.caseTotal = 12
}
})
},
@@ -245,12 +266,18 @@
},
handleTimeRange(time) {
this.isListPage = false
- if(this.time.startTime !== '') {
+ if (this.time.startTime !== '') {
this.time = time
this.casePoint()
} else {
this.time = time
}
+ },
+ // 获取园林设备
+ fetchDeviceList(params) {
+ getDevice(params).then(res => {
+ console.log(res.data, '园林设备')
+ })
}
}
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 84607f9..0e72bc8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,8 @@
// 创建axios实例
const service = axios.create({
- baseURL: 'http://11.100.6.149:8083/monitor2/proxy/',
- timeout: 50000 // 请求超时时间
+ baseURL: 'http://11.100.6.149:8083/monitor2/mock/proxy/',
+ timeout: 50000 * 10 // 请求超时时间
})
// request拦截器