派生自 wuyushui/SewerAndRainNetwork

chenzeping
2021-04-01 7cf298a7995b835af4d1b6a1ef2b4d0f5ce7decc
Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
3个文件已修改
24 ■■■■ 已修改文件
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/WasteGas.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/WasteWater.js 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -34,14 +34,14 @@
       </div>
        <div v-else-if="value == 'feishui'">
          <el-row type="flex" class="row-bg row-item-one" justify="space-around">
            <el-col :span="8">监测点名称:{{ setWasteGasdata.Name }}</el-col>
            <el-col :span="8">生产单位:{{ setWasteGasdata.DeptSname }}</el-col>
            <el-col :span="8">排放类型加载:{{ setWasteGasdata.MonTypeName }}</el-col>
            <el-col :span="8">监测点名称:{{ displayContentTab.Name }}</el-col>
            <el-col :span="8">生产单位:{{ displayContentTab.porltName }}</el-col>
            <el-col :span="8">排放类型名称:{{ displayContentTab.MonTypeName }}</el-col>
          </el-row>
          <el-row type="flex" class="row-bg" justify="space-around">
            <el-col :span="8">排放去向:{{ setWasteGasdata.EmissDirecti }}</el-col>
            <el-col :span="8">控制级别名称:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
            <el-col :span="8">内/外排口:{{ setWasteGasdata.OrOutPortName }}</el-col>
            <el-col :span="8">排放去向:{{ displayContentTab.EmissDirecti }}</el-col>
            <el-col :span="8">控制级别名称:{{ displayContentTab.ContrLevelShowName }}</el-col>
            <el-col :span="8">内/外排口:{{ displayContentTab.OrOutPortName }}</el-col>
          </el-row>
        </div>
      </div>
src/components/LayerController/logic/WasteGas.js
@@ -57,6 +57,7 @@
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setGasData(e.layer.options.test, 'feiqi')
    console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)
  }
src/components/LayerController/logic/WasteWater.js
@@ -52,14 +52,15 @@
  this.clickListener = async (e) => {
    // console.log(e)
    this.animalService.pulseEffect(e.latlng)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
    const result = await mapApi.getWasteWater(dataValue)
    // const dataValue = {
    //   StoragePlaceId: e.layer.options.test.StoragePlaceId
    // }
    // const result = await mapApi.getWasteWater(dataValue)
    // console.log(result)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setGasData(result, 'feishui')
    instance.setGasData(e.layer.options.test, 'feishui')
    console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)
  }