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

wangqi

2021-04-02 c3b1af220f56a85491badc2b11ed2c89fee14622

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

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -9,7 +9,7 @@
      <div class="main-video">
        <el-table
            tooltip-effect="dark"
            :data="displayContentTable2"
            :data="displayContentTableData"
        >
          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>
          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>
@@ -30,20 +30,16 @@
  props: ['displayContentTable'],
  data () {
    return {
      displayContentTable2: [
        {
          CompanyName: '中韩石化',
          StoragePlaceId: 3,
          StoragePlaceName: '灰渣场',
          StoragePlaceTypeName: '一般固废填埋场',
          StorageType: '粉煤灰、灰渣',
          StorageZCL: '38',
          StorageZCNL: '40.7',
          StorageZDMJ: '10.60798'
      displayContentTableData: []
        }
      ],
      displayContentTable3: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.displayContentTable.forEach(item => {
        this.displayContentTableData = item
        // console.log(item[0])
      })
    })
  }
}
</script>
@@ -60,7 +56,7 @@

  .main-video {
    width: 100%;
    min-height: 164px;
    min-height: 195px;

    video {
      width: 100%;

 src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue

@@ -62,7 +62,7 @@
    this.$nextTick(() => {
      this.displayContentTab.forEach(item => {
        this.displayContentTab2 = item
        console.log(item)
        // console.log(item)
      })
    })
  }

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,9 +6,10 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
        <PublicTabs :displayContentTab="displayContentTab" :value="value"
                    :setWasteGasdata="setWasteGasdata"></PublicTabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <PublicChart v-else></PublicChart>
        </div>
      </div>

 src/components/LayerController/logic/SolidWaste.js

@@ -89,7 +89,7 @@
    const instance = new PublicBounced()
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 200)
  }

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -28,24 +28,12 @@
        </el-input>
      </el-form>
      <el-card class="box-card"
               v-for="(item,index) in searchDataDisplay.slice((currentPage-1)*PageSize,currentPage*PageSize)"
               v-for="(item,index) in searchDataDisplay"
               :key="index">
        <div v-if="totalCount > 0">
        <div>
          {{ item.CompanyName }}
        </div>
      </el-card>
      <div class="search-pagination">
        <el-pagination
            small
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
            :current-page="currentPage"
            :page-sizes="[1, 2, 3]"
            :page-size="1"
            layout="total, sizes, prev, pager, next, jumper"
            :total='totalCount'>
        </el-pagination>
      </div>
    </div>
    <!--      <el-scrollbar style="height:100%">-->
    <!--      </el-scrollbar>-->
@@ -133,27 +121,10 @@
        // 数据的传递
        transferData: ''
      },
      searchDataDisplay: [],
      // 默认显示第几页
      currentPage: 1,
      // 总条数，根据接口获取数据长度(注意：这里不能为空)
      totalCount: 1,
      // 个数选择器（可修改）
      pageSizes: [1, 2, 3, 4],
      // 默认每页显示的条数（可修改）
      PageSize: 1
      searchDataDisplay: []
    }
  },
  methods: {
    // 每页显示的条数
    handleSizeChange (val) {
      this.PageSize = val
      this.currentPage = 1
    },
    // 显示第几页
    handleCurrentChange (val) {
      this.currentPage = val
    },
    handlePipelineType (val) {
      // console.log(val)
      this.solidWasteTypeOptions.forEach(item => {
@@ -172,7 +143,6 @@
      const result = await mapApi.getSolidWasteSurveyDetail(data)
      // console.log(result)
      this.searchDataDisplay = result.Result.DataInfo
      this.totalCount = result.Result.DataInfo.length
    }
  }
}
@@ -223,11 +193,6 @@
  }

  .box-card {
    margin: 15px auto;
  }

  .search-pagination {
    padding: 0;
    margin: 15px auto;
  }
}