~xingchuan/SewerAndRainNetwork.git

派生自 wuyushui/SewerAndRainNetwork

parent: b5a1f4ca | 补丁 | 提交 | show whitespace

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

ChenZeping02609

2021-05-13 5aa19a5070b49f164c0b9db8dcd239f41bd14b8a

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

2个文件已修改

	src/components/panel/RightSearchPanel.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/conf/Topic.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/components/panel/RightSearchPanel.vue

@@ -154,7 +154,7 @@
        case '管道信息':
          this.gcComp = PipeInformationSearch
          break
        case '应急图层':
        case '企业应急':
          this.gcComp = ReportSearch
          break
      }

 src/conf/Topic.js

@@ -62,7 +62,7 @@
  icon: 'iconguanxianxuncha',
  comp: ''
}, {
  name: '应急图层',
  name: '企业应急',
  id: 8,
  checked: false,
  isShow: false,

			@@ -154,7 +154,7 @@
			case '管道信息':
			this.gcComp = PipeInformationSearch
			break
			case '应急图层':
			case '企业应急':
			this.gcComp = ReportSearch
			break
			}

			@@ -62,7 +62,7 @@
			icon: 'iconguanxianxuncha',
			comp: ''
			}, {
			name: '应急图层',
			name: '企业应急',
			id: 8,
			checked: false,
			isShow: false,