Merge remote-tracking branch 'origin/develop' into develop

wangqi

2021-03-30 f7ba8b6aab4a763feee8938e93c97079b52baf1d

 src/conf/Constants.js

@@ -4,6 +4,12 @@
  POLYGON: 'polygon'
}

export const logicMapper = {
  fsqy: 'Sample.js',
  fspfk: 'Sample.js',
  fsjcd: 'Sample.js'
}

export const props = {
  pipename: '管线名称',
  pipecode: '管线编码',
@@ -27,5 +33,9 @@
  embeddingmode: '埋设方式',
  pipetrenchtype: '管沟类型',
  datecollected: '探测时间',
  operationalstatus: '运行状态'
  operationalstatus: '运行状态',
  acquisitionpeople: '采集人',
  acquisitiondate: '采集日期',
  fourtype: '四通类型',
  fourm: '四通材料'
}