diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/zhangqiu/components/showItem.vue b/src/views/zhangqiu/components/showItem.vue new file mode 100644 index 0000000..4f194c1 --- /dev/null +++ b/src/views/zhangqiu/components/showItem.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/zhangqiu/components/showItem.vue b/src/views/zhangqiu/components/showItem.vue new file mode 100644 index 0000000..4f194c1 --- /dev/null +++ b/src/views/zhangqiu/components/showItem.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue new file mode 100644 index 0000000..a834e73 --- /dev/null +++ b/src/views/zhangqiu/components/tableData.vue @@ -0,0 +1,84 @@ + + + + + + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/zhangqiu/components/showItem.vue b/src/views/zhangqiu/components/showItem.vue new file mode 100644 index 0000000..4f194c1 --- /dev/null +++ b/src/views/zhangqiu/components/showItem.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue new file mode 100644 index 0000000..a834e73 --- /dev/null +++ b/src/views/zhangqiu/components/tableData.vue @@ -0,0 +1,84 @@ + + + + + + diff --git a/src/views/zhangqiu/components/topHeader.vue b/src/views/zhangqiu/components/topHeader.vue deleted file mode 100644 index e67306d..0000000 --- a/src/views/zhangqiu/components/topHeader.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/zhangqiu/components/showItem.vue b/src/views/zhangqiu/components/showItem.vue new file mode 100644 index 0000000..4f194c1 --- /dev/null +++ b/src/views/zhangqiu/components/showItem.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue new file mode 100644 index 0000000..a834e73 --- /dev/null +++ b/src/views/zhangqiu/components/tableData.vue @@ -0,0 +1,84 @@ + + + + + + diff --git a/src/views/zhangqiu/components/topHeader.vue b/src/views/zhangqiu/components/topHeader.vue deleted file mode 100644 index e67306d..0000000 --- a/src/views/zhangqiu/components/topHeader.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js new file mode 100644 index 0000000..1ca77ce --- /dev/null +++ b/src/views/zhangqiu/js/data.js @@ -0,0 +1,37 @@ + +const option2 = { + color : ["#F79709","#AAEEEE","#1A94E6"], + title: { + // text: '畅销饮料占比饼状图', + // style: { + // fill: '#FFF', + // fontSize: 14, + // fontWeight: 'bold', + // textAlign: 'center', + // textBaseline: 'bottom', + // } + show:false + }, + series: [ + { + type: 'pie', + data: [ + { name: '中燃燃气', value: 2000 }, + { name: '圣井燃气', value: 2400 }, + { name: '正和燃气', value: 3200 }, + ], + radius : 60, + insideLabel: { //内部标签 + show: true, + }, + outsideLabel:{ + labelLineBendGap:10, + labelLineEndLength:12, + } + + } + ] +} + + + export {option2} diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js index 5b9b78e..b68060b 100644 --- a/public/config/mapConfig.js +++ b/public/config/mapConfig.js @@ -1,23 +1,90 @@ // 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:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + crs:'EPSG:4490', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) basemaps:[ { - name:'天地图影像', // 图层名称 - type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, - key:'xxxx', // 密钥 - url:'' // 地址 + 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 } ],// 地图图层 - threedlayers:[ + layers:[ { - name:'管网图层', - type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 - url:'', // 地址 + 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 } diff --git a/src/assets/zhangqiu/1.png b/src/assets/zhangqiu/1.png new file mode 100644 index 0000000..51a59ca --- /dev/null +++ b/src/assets/zhangqiu/1.png Binary files differ diff --git a/src/assets/zhangqiu/31.png b/src/assets/zhangqiu/31.png new file mode 100644 index 0000000..9cffbce --- /dev/null +++ b/src/assets/zhangqiu/31.png Binary files differ diff --git a/src/assets/zhangqiu/border.png b/src/assets/zhangqiu/border.png new file mode 100644 index 0000000..44a05d3 --- /dev/null +++ b/src/assets/zhangqiu/border.png Binary files differ diff --git a/src/assets/zhangqiu/deviceInstalledIcon.png b/src/assets/zhangqiu/deviceInstalledIcon.png new file mode 100644 index 0000000..7f3822b --- /dev/null +++ b/src/assets/zhangqiu/deviceInstalledIcon.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle1.png b/src/assets/zhangqiu/handlingAlarmCircle1.png new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle1.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle2.png b/src/assets/zhangqiu/handlingAlarmCircle2.png new file mode 100644 index 0000000..523f402 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle2.png Binary files differ diff --git a/src/assets/zhangqiu/handlingAlarmCircle3.png b/src/assets/zhangqiu/handlingAlarmCircle3.png new file mode 100644 index 0000000..79bd1a6 --- /dev/null +++ b/src/assets/zhangqiu/handlingAlarmCircle3.png Binary files differ diff --git a/src/assets/zhangqiu/headerTitle.png b/src/assets/zhangqiu/headerTitle.png new file mode 100644 index 0000000..4c5861b --- /dev/null +++ b/src/assets/zhangqiu/headerTitle.png Binary files differ diff --git a/src/assets/zhangqiu/littleTitle.png b/src/assets/zhangqiu/littleTitle.png new file mode 100644 index 0000000..ce8a809 --- /dev/null +++ b/src/assets/zhangqiu/littleTitle.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png new file mode 100644 index 0000000..0e08c03 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusBottom.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png new file mode 100644 index 0000000..fc5afc7 --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusIcon.png Binary files differ diff --git a/src/assets/zhangqiu/sevenDaysOperationStatusTop.png b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png new file mode 100644 index 0000000..b328d3f --- /dev/null +++ b/src/assets/zhangqiu/sevenDaysOperationStatusTop.png Binary files differ diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 0e8adac..c786253 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -3,7 +3,7 @@ * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 * @returns {Object} */ -export function getMapLayers(type = 'file') { +export function getMapConfig(type = 'file') { if (type === 'file') { return window.mapConfig } else { diff --git a/src/utils/request.js b/src/utils/request.js index 74b96ed..7a5db00 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,15 +13,13 @@ service.interceptors.request.use( config => { if (store.getters.token) { - console.log('request.js gettoken') config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - console.log(config.headers['token']) } return config }, error => { // Do something with request error - console.log(error) // for debug + console.error(error) // for debug Promise.reject(error) } ) @@ -39,20 +37,22 @@ } else if (res.code !== 200) { // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { - // 开发完页面以后下面的这个注释需要打开 - MessageBox.confirm( - '你已被登出，可以取消继续留在该页面，或者重新登录', - '确定登出', - { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug + if (!window.message401) { // 此操作避免重复弹窗 + window.message401 = true + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) }) - }) + } } else { Message({ showClose: true, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index aa8e734..383928d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -220,7 +220,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -233,7 +233,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(/,|;/) for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url }) diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9833884..83e0adb 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/zhangqiu/components/chart.vue b/src/views/zhangqiu/components/chart.vue new file mode 100644 index 0000000..ff757e4 --- /dev/null +++ b/src/views/zhangqiu/components/chart.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue new file mode 100644 index 0000000..c4f3d68 --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue new file mode 100644 index 0000000..8149bfd --- /dev/null +++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue new file mode 100644 index 0000000..c9c1618 --- /dev/null +++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue new file mode 100644 index 0000000..c515076 --- /dev/null +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/zhangqiu/components/headerTitle.vue b/src/views/zhangqiu/components/headerTitle.vue new file mode 100644 index 0000000..e0b41d6 --- /dev/null +++ b/src/views/zhangqiu/components/headerTitle.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue new file mode 100644 index 0000000..b99d3d3 --- /dev/null +++ b/src/views/zhangqiu/components/lineDepartment/lineDepartment.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue new file mode 100644 index 0000000..39f195e --- /dev/null +++ b/src/views/zhangqiu/components/map3d.vue @@ -0,0 +1,883 @@ + + + + + + diff --git a/src/views/zhangqiu/components/progressBar.vue b/src/views/zhangqiu/components/progressBar.vue new file mode 100644 index 0000000..cbdae3b --- /dev/null +++ b/src/views/zhangqiu/components/progressBar.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue new file mode 100644 index 0000000..eba28dc --- /dev/null +++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/zhangqiu/components/showItem.vue b/src/views/zhangqiu/components/showItem.vue new file mode 100644 index 0000000..4f194c1 --- /dev/null +++ b/src/views/zhangqiu/components/showItem.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue new file mode 100644 index 0000000..a834e73 --- /dev/null +++ b/src/views/zhangqiu/components/tableData.vue @@ -0,0 +1,84 @@ + + + + + + diff --git a/src/views/zhangqiu/components/topHeader.vue b/src/views/zhangqiu/components/topHeader.vue deleted file mode 100644 index e67306d..0000000 --- a/src/views/zhangqiu/components/topHeader.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js new file mode 100644 index 0000000..1ca77ce --- /dev/null +++ b/src/views/zhangqiu/js/data.js @@ -0,0 +1,37 @@ + +const option2 = { + color : ["#F79709","#AAEEEE","#1A94E6"], + title: { + // text: '畅销饮料占比饼状图', + // style: { + // fill: '#FFF', + // fontSize: 14, + // fontWeight: 'bold', + // textAlign: 'center', + // textBaseline: 'bottom', + // } + show:false + }, + series: [ + { + type: 'pie', + data: [ + { name: '中燃燃气', value: 2000 }, + { name: '圣井燃气', value: 2400 }, + { name: '正和燃气', value: 3200 }, + ], + radius : 60, + insideLabel: { //内部标签 + show: true, + }, + outsideLabel:{ + labelLineBendGap:10, + labelLineEndLength:12, + } + + } + ] +} + + + export {option2} diff --git a/src/views/zhangqiu/zqindex.vue b/src/views/zhangqiu/zqindex.vue index 3603f5d..a5623fd 100644 --- a/src/views/zhangqiu/zqindex.vue +++ b/src/views/zhangqiu/zqindex.vue @@ -1,33 +1,96 @@ -