Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-04-14 69818a26487f546e62eee96d2d6c4733b01c54a2

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue

@@ -38,7 +38,7 @@
        <div class="detailbtn"  @click="onSubmit">查询</div>
        <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
      </div>
      <div style="width:6rem;height:2rem;" id="echarts" ref="main">
      <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
      </div>
    </div>
    <!-- 明细弹框 -->
@@ -143,6 +143,9 @@
    this.onSubmit()
    // this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
  },
  updated () {
    this.onSubmit()
  },
  methods: {
    onSubmit () {
      console.log('submit!')

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

@@ -15,19 +15,14 @@
                    <div class="pickerData">
                        <span> 开始时间:</span>
                        <span class="pickerTable">
                          <el-date-picker  type="datetime"   v-model="formInline.timeStart">
                      </el-date-picker>
                      </span>
                          <el-date-picker  type="datetime"   v-model="formInline.timeStart"></el-date-picker>
                        </span>
                    </div>
                    <div class="pickerData">
                        <span >结束时间:</span>
                        <span class="pickerTable">
                        <el-date-picker
                                type="datetime"
                                v-model="formInline.timeEnd"
                        >
                      </el-date-picker>
                      </span>
                            <el-date-picker  type="datetime" v-model="formInline.timeEnd" ></el-date-picker>
                        </span>
                    </div>
                </div>
<!--                <div>-->
@@ -43,8 +38,7 @@
                <div class="detailbtn"  @click="onSubmit">查询</div>
                <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
             </div>
            <div style="width:676px;height:200px;" id="echarts" ref="main">
            </div>
            <div style="width:5rem;height:1.5rem;" id="echarts" ref="main"></div>
        </div>
        <!-- 明细弹框 -->
        <el-dialog :visible.sync="dialogVisible"
@@ -150,6 +144,9 @@
    this.onSubmit()
    // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
  },
  updated () {
    this.onSubmit()
  },
  methods: {
    onSubmit () {
      this.CreateChart()

 src/components/helpers/WfsHelper.js

@@ -5,7 +5,7 @@
function WfsHelper () {
  this.filters = []
  this.typeNames = []
  this.url = MapConfig.BLUEMAP_HOST + '/server/ogcserver/PipeLine/wfs'
  this.url = MapConfig.PIPELINE_WFS
  this.params = {
    REQUEST: 'getfeature',
    OUTPUTFORMAT: 'JSON',

 src/conf/MapConfig.js

@@ -11,7 +11,7 @@
// service主机配置
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'

const PIPELINE_WFS = APP_GIS_HOST + '/server/ogcserver/PipeLine2/wfs'
// 自定义主机配置
const BLUEMAP_HOST = APP_GIS_HOST // 公司发布的地图服务，用于测试的地址

@@ -21,7 +21,7 @@
const mapOptions = {
  crs: L.CRS.EPSG4326,
  minZoom: 3,
  maxZoom: 18,
  maxZoom: 17,
  // center: [26, 104],
  center: [38.828558921813965, 117.41676807403564],
  // center: [29.454345703125, 113.40362548828125],
@@ -80,7 +80,8 @@
  mapOptions,
  mapConfig,
  TokenConfig,
  BLUEMAP_HOST
  BLUEMAP_HOST,
  PIPELINE_WFS
  // mapTokenArray
  // MagicMaker
}

 src/conf/layers/LayerAirQuality.js

@@ -1,8 +1,8 @@
/**
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerAirQuality = {
  code: 'sewersAirQuality',
  name: '空气质量',

 src/conf/layers/LayerArea.js

@@ -1,8 +1,8 @@
/**
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerArea = {
  code: 'sewersArea',
  name: '区域信息',

 src/conf/layers/LayerBasin.js

@@ -1,8 +1,8 @@
/**
 * 流域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerBasin = {
  code: 'sewersBasin',
  name: '区域图层',

 src/conf/layers/LayerEnvRisk.js

@@ -1,8 +1,8 @@
/**
 * 环境风险
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerEnvRisk = {
  code: 'sewersEnvRisk',
  name: '环境风险',

 src/conf/layers/LayerFsss.js

@@ -1,8 +1,8 @@
/**
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerFsss = {
  code: 'sewersFsss',
  name: '附属设施',

 src/conf/layers/LayerHbss.js

@@ -1,8 +1,8 @@
/**
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerHbss = {
  code: 'sewersHbss',
  name: '环保设施',

 src/conf/layers/LayerPipeLines.js

@@ -4,8 +4,8 @@
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'

const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS

export const LayerPipeLines = {
  code: 'sewersPipeLines',

 src/conf/layers/LayerPk.js

@@ -1,8 +1,8 @@
/**
 * 排口
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerPk = {
  code: 'sewersPk',
  name: '排口',

 src/conf/layers/LayerSewers.js

File was deleted

 src/conf/layers/LayerSoilGroundWater.js

@@ -1,8 +1,8 @@
/**
 * 土壤及地下水
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
import MapConfig from '../../conf/MapConfig'
const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerSoilGroundWater = {
  code: 'sewersSoilGroundWater',
  name: '土壤及地下水',