+
@@ -54,24 +56,38 @@
import Mars3dMap from '@/components/Mars3D/Mars3dMap'
import { polylineC, polylineVolumeP } from '@/components/Mars3D/utils/ArcGisWfsLayer'
import { createPointLayer, createPointModelLayer } from '@/components/Mars3D/utils/GeoJsonLayer'
-import { Tetrahedron } from '@/components/Mars3D/utils/GraphicLayer'
+import {Graphic_Point, Tetrahedron} from '@/components/Mars3D/utils/GraphicLayer'
+import LineSearch from "@/views/overview/components/lineSearch";
let layer2021 = null
let layer2020 = null
// 设备
let dev_layer = []
let alarm_layer = null
-const rqline_layer = []
+let rqline_layer = []
let rqwell_layer = null
let rqbox_layer = null
let underground = null
export default {
name: 'Overview3D',
- components: { Mars3dMap, MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList },
+ components: {LineSearch, Mars3dMap, MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList },
data() {
return {
- layerName: ['燃气阀门井', '燃气调压箱', '中燃燃气标识器', '圣井燃气标识器', '正和燃气标识器', '华润燃气标识器', '华气燃气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台', '燃气管线'],
- labelName: ['燃气管线', '燃气阀门井', '燃气调压箱', '中燃-圣井-正和-华润-华气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台'],
+ layerName: ['燃气阀门井', '燃气调压箱', '中燃燃气标识器', '圣井燃气标识器', '正和燃气标识器', '华润燃气标识器', '华气燃气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台', '可燃气体监测终端','燃气管线'],
+ layerColor: [
+ '#fd7ee8',
+ '#99999a',
+ '#0095fe',
+ '#0095fe',
+ '#0095fe',
+ '#0095fe',
+ '#0095fe',
+ '#0095fe',
+ '#fdc401',
+ '#fcd03a',
+ '#fd7ee8',
+ '#2aa416'],
+ labelName: ['燃气管线', '燃气阀门井', '燃气调压箱', '中燃-圣井-正和-华润-华气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台', '可燃气体监测终端'],
basemap: 1112,
baseLayer: 'dark', // 底图图层
layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'line', name: '管线图层', children: [] }, { id: 'dev', name: '设备图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表
@@ -82,7 +98,7 @@
refreshType: this.baseConfig.refreshType, // 刷新数据方式：clock定时器或websocket推送
searchResultSize: [24, 30],
searchResultOffset: [-12, -30],
- mapLoading: true,
+ mapLoading: false,
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
alpha: 80,
@@ -90,10 +106,12 @@
menus: {
menuList: [
// { icon: 'search', menu: 'dataFilter', name: '数据筛选' },
- { icon: 'coordinate', menu: 'location', name: '坐标定位' }
+ { icon: 'coordinate', menu: 'location', name: '坐标定位' },
+ { icon: 'search', menu: 'line', name: '管线筛选' },
],
dataFilterWindowShow: false, // 数据筛选窗口是否显示
- locationWindowShow: false // 坐标定位窗口是否显示
+ locationWindowShow: false, // 坐标定位窗口是否显示
+ lineWindowShow: false
}, // 工具栏菜单
listQuery: {
keywords: '', // 关键字
@@ -156,7 +174,6 @@
created() {
this.fetchWellType()
this.resultList = []
- console.log('create', ' 时间(s):', new Date().getSeconds())
},
mounted() {
this.$nextTick(() => {
@@ -204,36 +221,36 @@
bodyHeight -= 5
store.dispatch('settings/ChangeHeight', bodyHeight)
},
- initBaseMap() {
- const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
-
- var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
- url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
- layer: 'wzmap_map',
- style: 'default',
- tileMatrixSetID: 'default028mm',
- format: 'image/png',
- tilingScheme: new Cesium.GeographicTilingScheme(),
- tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
- })
- layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
- layer2021.alpha = this.alpha / 100
-
- layerProvider = new Cesium.WebMapTileServiceImageryProvider({
- url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
- layer: 'wzmap_map',
- style: 'default',
- tileMatrixSetID: 'default028mm',
- format: 'image/png',
- tilingScheme: new Cesium.GeographicTilingScheme(),
- tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
- })
- layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
- layer2020.alpha = this.alpha / 100
-
- layer2021.show = false
- },
+ // initBaseMap() {
+ // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
+ //
+ // var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ // url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ // layer: 'wzmap_map',
+ // style: 'default',
+ // tileMatrixSetID: 'default028mm',
+ // format: 'image/png',
+ // tilingScheme: new Cesium.GeographicTilingScheme(),
+ // tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ // })
+ // layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ // layer2021.alpha = this.alpha / 100
+ //
+ // layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ // url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ // layer: 'wzmap_map',
+ // style: 'default',
+ // tileMatrixSetID: 'default028mm',
+ // format: 'image/png',
+ // tilingScheme: new Cesium.GeographicTilingScheme(),
+ // tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ // })
+ // layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ // layer2020.alpha = this.alpha / 100
+ //
+ // layer2021.show = false
+ // },
// 初始化放这里
onMapload(map, center) {
window.map = map
@@ -246,14 +263,16 @@
this.initPoint()
window.map.on(mars3d.EventType.cameraChanged, this.cameraChange, this)
},
- async initLine() {
+ async initLine(where='1<>1') {
+ rqline_layer.forEach(item => window.map.removeLayer(item))
+ rqline_layer = []
// 三维管线
- rqline_layer.push(polylineVolumeP('0', '#FF7FE9', '燃气管线', 0.1))
+ rqline_layer.push(polylineVolumeP('0', '#FF7FE9', '燃气管线', 0.1, '', where))
// 二维管线
- rqline_layer.push(polylineC('0', '#FF7FE9', '燃气管线', 3))
+ rqline_layer.push(polylineC('0', '#FF7FE9', '燃气管线', 3, where))
},
async initPoint(condition = '') {
- this.mapLoading = true
+ // this.mapLoading = true
if (rqwell_layer !== null) {
window.map.removeLayer(rqwell_layer['2D'])
window.map.removeLayer(rqwell_layer['3D'])
@@ -271,10 +290,10 @@
const rq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'"
const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'"
- rqwell_layer = createPointModelLayer('1', '燃气阀门井', '../static/images/燃气阀门井.png', '../static/model/rq.gltf', 1.5, rq)
- rqbox_layer = createPointModelLayer('2', '燃气调压箱', '../static/images/燃气调压箱.png', '../static/model/tyx.glb', 0.1, rq)
- for (let i = 2; i < 11; i++) {
- dev_layer.push(createPointLayer(this.layerName[i], i + 1, i <= 6 ? '../static/images/标识器.png' : '../static/images/' + this.layerName[i] + '.png', bsq))
+ rqwell_layer = createPointModelLayer('1', '燃气阀门井', '../static/images/燃气阀门井.png', '../static/model/rq.gltf', 1.5, rq,this.layerColor[0])
+ rqbox_layer = createPointModelLayer('2', '燃气调压箱', '../static/images/燃气调压箱.png', '../static/model/tyx.glb', 0.1, rq,this.layerColor[1])
+ for (let i = 2; i < 12; i++) {
+ dev_layer.push(createPointLayer(this.layerName[i], i + 1, i <= 6 ? '../static/images/标识器.png' : '../static/images/' + this.layerName[i] + '.png', bsq, this.layerColor[i]))
}
const that = this
rqwell_layer['2D'].on(mars3d.EventType.load, function(event) {
@@ -284,8 +303,6 @@
// 控制二维线的显隐
// todo
cameraChange() {
- // console.log('map-level:' + window.map.level)
- // console.log('alpha:' + this.alpha)
if (window.map.level >= 19 && this.alpha < 90) {
// 展示该展示的
rqwell_layer['3D'].show = this.checkedLayer.indexOf('well-燃气阀门井') !== -1
@@ -403,7 +420,7 @@
id: 'line-' + item,
name: item
}
- }).splice(11, 1)
+ }).splice(12, 1)
}
const devLayer = {
id: 'dev',
@@ -413,7 +430,7 @@
id: 'dev-' + item,
name: item
}
- }).splice(2, 9)
+ }).splice(2, 10)
}
this.layers.splice(0, 1, wellLayer)
this.layers.splice(1, 1, lineLayer)
@@ -423,7 +440,9 @@
this.checkedLayer = ['well', 'line', 'dev']
wellLayer.children.forEach(item => this.checkedLayer.push('well-' + item.name))
lineLayer.children.forEach(item => this.checkedLayer.push('line-' + item.name))
- devLayer.children.forEach(item => this.checkedLayer.push('dev-' + item.name))
+ devLayer.children.forEach(item => {
+ this.checkedLayer.push('dev-' + item.name)
+ })
// this.checkedLayer = [...this.checkedLayer, 'well', this.wellTypeList.map(item => 'well-' + item.value)]
} else {
this.checkedLayer = [...this.checkedLayer]
@@ -488,7 +507,7 @@
}
}
this.loading = false
- this.mapLoading = false
+ // this.mapLoading = false
})
},
// 刷新报警列表
@@ -500,41 +519,9 @@
if (this.showAlarm && this.checkedLayer.indexOf('alarm') == -1) {
this.checkedLayer.push('alarm')
}
+ // 删除所有适量数据
alarm_layer.closePopup().clear()
- this.alarmWells.forEach(item => {
- const point = rqwell_layer['2D'].graphics.filter(rq => {
- return rq.options.id === item.wellCode
- })[0]
- if (point !== undefined) {
- const attr = point.options.attr || {}
- this.$delete(attr, '报警内容')
- this.$delete(attr, '报警数值')
- this.$delete(attr, '报警时间')
- point.setStyle({
- image: '../static/images/燃气附属物.png',
- scale: 0.6,
- hasPixelOffset: true,
- pixelOffsetY: -10,
- scaleByDistance: true,
- scaleByDistance_far: 20000,
- scaleByDistance_farValue: 0.6,
- scaleByDistance_near: 0,
- scaleByDistance_nearValue: 1.4
- }).unbindHighlight()
- point.unbindPopup()
- var str = `
`
- for (const j in attr) {
- if (j === 'FID') continue
- str += `
-
- ${attr[j]}
`
- }
- str += `
`
- point.bindPopup(str)
- // alarm_layer.addGraphic(point)
- // this.initAlarmPoint(point, item)
- }
- })
+ // todo
getAlarmsNowZq().then(response => {
if (response.code === 200) {
this.loading = false
@@ -552,49 +539,23 @@
}
}
this.alarmFirstAmount = false // 初次加载完毕
+
// 获取当前报警列表
this.alarmList = response.data // 要显示的报警列表
- this.alarmWells = [] // 报警的井列表
- for (const alarm of response.data) {
- if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
- this.alarmWells.push(alarm)
+ this.alarmList.forEach(item => {
+ const popup = {
+ '设备编号': item.devcode,
+ '井编号': item.wellCode,
+ '井类型': item.wellTypeName,
+ '报警内容': item.alarmContent,
+ '报警数值': item.alarmValue,
+ '报警时间': item.alarmTime,
+ '报警位置': item.position,
+ '经纬度': item.coordinateX + '，' + item.coordinateY,
}
- }
- console.log('alarmWells Length', this.alarmWells.length)
- this.alarmWells.forEach(item => {
- const point = rqwell_layer['2D'].graphics.filter(rq => {
- return rq.options.id === item.wellCode
- })[0]
- if (point !== undefined) {
- const attr = point.options.attr || {}
- attr['报警内容'] = item.alarmContent
- attr['报警数值'] = item.alarmValue
- attr['报警时间'] = item.alarmTime
- Tetrahedron(alarm_layer, point.options.position, attr)
- point.setStyle({
- image: '../static/images/alarm.png',
- scale: 0.8,
- hasPixelOffset: true,
- pixelOffsetY: -20,
- scaleByDistance: true,
- scaleByDistance_far: 20000,
- scaleByDistance_farValue: 0.8,
- scaleByDistance_near: 0,
- scaleByDistance_nearValue: 1.6,
- visibleDepth: false
- }).unbindHighlight()
- point.unbindPopup()
- var str = `
`
- for (const j in attr) {
- if (j === 'FID') continue
- str += `
-
- ${attr[j]}
`
- }
- str += `
`
- point.bindPopup(str)
- // this.initAlarmPoint(point, item)
- }
+ Tetrahedron(alarm_layer, [item.coordinateX, item.coordinateY], item)
+ Graphic_Point(alarm_layer, [item.coordinateX, item.coordinateY], item, popup)
+ console.log(alarm_layer)
})
}
})
@@ -607,21 +568,31 @@
},
// 点击报警列表
alarmRowClick(row) {
- if (!this.isAll) {
- this.$message.info('当前搜索条件不为空，请重新搜索')
- return
+ // if (!this.isAll) {
+ // this.$message.info('当前搜索条件不为空，请重新搜索')
+ // return
+ // }
+ // const wellId = row.wellId
+ // const point = rqwell_layer['2D'].graphics.filter(item => {
+ // return item.options.id === row.wellCode
+ // })[0]
+ // if (point === undefined) {
+ // this.$message.warning('当前建设无次井，请联系管理员！')
+ // return
+ // }
+ // var center = { lat: point.options.position[1], lng: point.options.position[0], alt: 300, heading: 360, pitch: -90 }
+ // window.map.setCameraView(center)
+ // point.openPopup()
+ if (this.showAlarm && this.checkedLayer.indexOf('alarm') == -1) {
+ this.checkedLayer.push('alarm')
}
- const wellId = row.wellId
- const point = rqwell_layer['2D'].graphics.filter(item => {
- return item.options.id === row.wellCode
+ const point = alarm_layer.graphics.filter(item => {
+ return item.options.id === row.alarmId
})[0]
- if (point === undefined) {
- this.$message.warning('当前建设无次井，请联系管理员！')
- return
- }
var center = { lat: point.options.position[1], lng: point.options.position[0], alt: 300, heading: 360, pitch: -90 }
window.map.setCameraView(center)
point.openPopup()
+
},
// 点击工具箱菜单, menu:{menu:'xxx', name:''}, 建议菜单menu属性的命名与自定义弹窗的show属性名称保持同一规则
clickMenu(menu) {
@@ -672,9 +643,40 @@
marker.setMap(window.map)
this.tempMarker = marker
},
+ setLine(query) {
+ console.log(query)
+ const year = new Date().getFullYear()
+ let where = '1<>1'
+ if(query.deptName !== '') {
+ where = "权属单位 LIKE '%" + query.deptName + "%'"
+ }
+ // const rq = "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'"
+
+ switch (query.age) {
+ case '':
+ break
+ case '大于5年':
+ where = where === '1<>1'? `建设年代 <= '${year-5}'`: where + ` and 建设年代 <= '${year-5}'`
+ break
+ case '大于10年':
+ where = where === '1<>1'? `建设年代 <= '${year-10}'`: where + ` and 建设年代 <= '${year-10}'`
+ break
+ case '大于15年':
+ where = where === '1<>1'? `建设年代 <= '${year-15}'`: where + ` and 建设年代 <= '${year-15}'`
+ break
+ case '大于20年':
+ where = where === '1<>1'? `建设年代 <= '${year-20}'`: where + ` and 建设年代 <= '${year-20}'`
+ break
+ }
+ console.log(where)
+ this.initLine(where)
+ },
// TODO: 关闭坐标定位窗口， 清除地图上的标注
closePopupLocation() {
Object.assign(this.menus, { locationWindowShow: false })
+ },
+ closeLineSearch() {
+ Object.assign(this.menus, { lineWindowShow: false })
}
}
}
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
new file mode 100644
index 0000000..8013299
--- /dev/null
+++ b/src/views/support/support.vue
@@ -0,0 +1,213 @@
+
+
+
+ 设备最新数据
+
+
+ 设备报警统计结果
+
+
设备类型*
+
+
+
+
查询时间范围*
+
+
导 出
+
设备上报数据统计结果
+
+
设备类型*
+
+
+
+
查询时间范围*
+
+
导 出
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
index 37db9bd..a5352b3 100644
--- a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
@@ -143,17 +143,18 @@
initDialog: function(dialogStatus, dialogFormVisible, tenantId, row = null) {
this.dialogStatus = dialogStatus
this.dialogFormVisible = dialogFormVisible
- this.fetchData(tenantId, row.name)
+ this.fetchData(tenantId, row.name, row.deviceType)
if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
this.disableEdit = false
} else {
this.disableEdit = true
}
},
- fetchData(tenantId, name) {
+ fetchData(tenantId, name, deviceType) {
const params = {
tenantId: tenantId,
- name: name
+ name: name,
+ deviceType: deviceType
}
getAlarmLevelByType(params).then(response => {
this.list = response.data
@@ -191,6 +192,7 @@
},
// 解析form数据为List
parseFormToList() {
+ debugger
for (const item of this.list) {
if (item.level === 1) {
item.highValue = parseFloat(this.form.firstHighValue)
diff --git a/src/views/wellManage/editLine.vue b/src/views/wellManage/editLine.vue
new file mode 100644
index 0000000..b5d4acc
--- /dev/null
+++ b/src/views/wellManage/editLine.vue
@@ -0,0 +1,390 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wellManage/listLine.vue b/src/views/wellManage/listLine.vue
new file mode 100644
index 0000000..826e0a9
--- /dev/null
+++ b/src/views/wellManage/listLine.vue
@@ -0,0 +1,317 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+ 导出记录
+
+
+
+
+ 批量导入
+
+
+
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 详情
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index f0bd847..b420901 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"@amap/amap-jsapi-loader": "^1.0.1",
"@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
+ "@turf/turf": "^6.5.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
"clipboard": "^2.0.8",
@@ -21,8 +22,9 @@
"element-ui": "^2.15.7",
"js-cookie": "^3.0.0",
"jsencrypt": "^3.2.1",
- "mars3d": "^3.4.7",
- "mars3d-space": "^3.4.7",
+ "mars3d": "^3.6.16",
+ "mars3d-cesium": "^1.112.0",
+ "mars3d-space": "3.6.16",
"mockjs": "^1.1.0",
"node-polyfill-webpack-plugin": "^2.0.1",
"normalize.css": "^8.0.1",
diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js
deleted file mode 100644
index b68060b..0000000
--- a/public/config/mapConfig.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// 3维地图有关配置
-const config = {
- scene:{
- // 默认视角参数
- center: { lat:36.290705 , lng:117.424668 , alt: 30000, heading: 360, pitch: -45 },
- showSun: true,
- // mapProjection: new Cesium.MapProjection.
- // showMoon: true,
- // showSkyBox: true,
- showSkyAtmosphere: false, // 关闭球周边的白色轮廓 map.scene.skyAtmosphere = false
- fog: true,
- fxaa: true,
- // 以下是Cesium.Globe对象相关参数
- globe: {
- depthTestAgainstTerrain: true, // 是否启用深度监测
- baseColor: '#1A2126', // 地球默认背景色
- showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
- enableLighting: false // 是否显示昼夜区域
- },
- control: {
- infoBox: false
- },
- // 以下是Cesium.ScreenSpaceCameraController对象相关参数
- cameraController: {
- zoomFactor: 3.0, // 鼠标滚轮放大的步长参数
- minimumZoomDistance: 1, // 地球放大的最小值（以米为单位）
- maximumZoomDistance: 5000000, // 地球缩小的最大值（以米为单位）
- enableRotate: true, // 2D和3D视图下，是否允许用户旋转相机
- enableTranslate: true, // 2D和哥伦布视图下，是否允许用户平移地图
- enableTilt: true, // 3D和哥伦布视图下，是否允许用户倾斜相机
- enableZoom: true, // 是否允许 用户放大和缩小视图
- enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
- }
- },
- terrian:{
- type: 'xyz', // 地形类型，xyz: 标准xyz服务，none: 无地形，arcgis arcgis地形服务
- url:'http://data.mars3d.cn/terrain'
- }, // 地形，地形只支持一个
- crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000)
- basemaps:[
- {
- name: "天地图影像(EPSG:3857)",
- icon: "img/basemaps/tdt_img.png",
- type: "tdt",
- layer: "img_d",
- key: '216ee92889e17ab1b083fae665d522b8',
- show: true
- },
- {
- name:'2020影像图', // 图层名称
- type:'wmts', //图层类型： tdt天地图，gaode高德地图，wmts, wms,
- url:'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png', // 地址
- key:'', // 密钥
- crs:'EPSG:4490',
- layer:'wzmap_map',
- style:'default',
- format:'image/png',
- tileMatrixSetID:'default028mm',
- show: true
- },
- {
- name:'2021电子地图', // 图层名称
- type:'wmts', //图层类型： tdt天地图，gaode高德地图，wmts, wms,
- url:'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}', // 地址
- key:'', // 密钥
- crs:'EPSG:4490',
- layer:'wzmap_map',
- style:'default',
- format:'image/png',
- tileMatrixSetID:'default028mm',
- show: true
- }
- ],// 地图图层
- layers:[
- {
- name:'燃气管线',
- type:'arcgisWfs', // 矢量图层类型: wfs矢量图层服务， S3M超图，tiles 3DTiles模型， gltf glTF小模型
- url:'http://111.198.10.15:13002/arcgis/rest/services/gas/MapServer/1', // 地址
- minimumLevel: 19,
- symbol:{
- type: 'polylineVolumeP', // 矢量数据的style样式， polylineVolumeP是管道线 Primitive图元
- style:{
- color: '#eb6b0c', // 管道颜色
- shape: 'pipeline', // 形状类型：pipeline空心管, circle实心管
- radius: 0.1 // 默认半径
- }
- },
- center: {}, // 中心位置
- flyto: true
- }
- ] // 矢量图层
-}
-window.mapConfig = config
-
diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json
index 498d918..9b96e4e 100644
--- a/public/config/mars3dConfig.json
+++ b/public/config/mars3dConfig.json
@@ -1,7 +1,7 @@
{
"scene": {
"center": {
- "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45
+ "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45
},
"requestRenderMode": true,
"showSun": false,
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 7c4ca91..4b60b89 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,8 +2,8 @@
"title": "管网运行监测系统",
"subtitle": "",
"theme":"blue",
- "baseUrl": "http://11.100.6.182:5001/",
- "wsUrl": "ws://11.100.6.182:5001/websocket/",
+ "baseUrl": "http://192.168.182.39:11308/",
+ "wsUrl": "ws://60.208.121.150:5001/websocket/",
"mainPage": "http://111.198.10.15:11404/dcms/#",
"amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
"amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
@@ -17,5 +17,6 @@
"provinceCode":"360000",
"cityCode":"361000",
"areaCode":"361024",
- "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/"
+ "arcgisUrl": "http://124.128.226.219:5004/arcgis/rest/services/zqgis/MapServer/"
}
+
diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json
index 7c4ca91..b6e51e5 100644
--- a/public/config/project.configgz.json
+++ b/public/config/project.configgz.json
@@ -2,8 +2,8 @@
"title": "管网运行监测系统",
"subtitle": "",
"theme":"blue",
- "baseUrl": "http://11.100.6.182:5001/",
- "wsUrl": "ws://11.100.6.182:5001/websocket/",
+ "baseUrl": "http://11.100.6.182:5006/",
+ "wsUrl": "ws://11.100.6.182:5006/websocket/",
"mainPage": "http://111.198.10.15:11404/dcms/#",
"amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
"amapKey": "1733551f35b56f6d8e9c0a9d4c2523b",
diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json
index 4021326..e3c60d3 100644
--- a/public/config/project.configzq.json
+++ b/public/config/project.configzq.json
@@ -17,5 +17,6 @@
"provinceCode":"360000",
"cityCode":"361000",
"areaCode":"361024",
- "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/"
+ "arcgisUrl": "http://124.128.226.219:5004/arcgis/rest/services/zqgis/MapServer/"
}
+
diff --git a/public/index.html b/public/index.html
index 33f84ea..85e5a80 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
<%= htmlWebpackPlugin.options.title %>
-
+