~xingchuan/SewerAndRainNetwork.git

			@@ -9,15 +9,15 @@
			<div class="main-video">
			<el-table
			tooltip-effect="dark"
			:data="data"
			:data="displayContentTable2"
			>
			<el-table-column prop="name" label="序号"></el-table-column>
			<el-table-column prop="name" label="类别"></el-table-column>
			<el-table-column prop="date" label="固废名称"></el-table-column>
			<el-table-column prop="address" label="代码"></el-table-column>
			<el-table-column prop="address" label="产生量"></el-table-column>
			<el-table-column prop="name" label="储存量"></el-table-column>
			<el-table-column prop="date" label="产生装置"></el-table-column>
			<el-table-column prop="StoragePlaceId" label="序号"></el-table-column>
			<el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>
			<el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column>
			<el-table-column prop="StorageZDMJ" label="代码"></el-table-column>
			<el-table-column prop="StorageZCNL" label="产生量"></el-table-column>
			<el-table-column prop="StorageZCL" label="储存量"></el-table-column>
			<el-table-column prop="StorageType" label="产生装置"></el-table-column>
			</el-table>
			</div>
			</div>
			@@ -27,29 +27,22 @@
			<script>
			export default {
			name: 'PublicTable',
			props: ['requestSolidWasteData'],
			props: ['displayContentTable'],
			data () {
			return {
			data: [{
			date: '2016-05-03',
			name: '王小虎',
			address: '上海市普陀区'
			}, {
			date: '2016-05-02',
			name: '王小虎',
			address: '上海市普陀区'
			}]
			}
			},
			mounted () {
			this.$nextTick(() => {
			this.getSolidWasteData()
			})
			},
			methods: {
			getSolidWasteData () {
			// const data = requestSolidWasteData
			// console.log(data)
			displayContentTable2: [
			{
			CompanyName: '中韩石化',
			StoragePlaceId: 3,
			StoragePlaceName: '灰渣场',
			StoragePlaceTypeName: '一般固废填埋场',
			StorageType: '粉煤灰、灰渣',
			StorageZCL: '38',
			StorageZCNL: '40.7',
			StorageZDMJ: '10.60798'
			}
			],
			displayContentTable3: []
			}
			}
			}
			@@ -64,12 +57,10 @@
			.main {
			width: 100%;
			height: 100%;
			//padding: 10px 6px;
			//border: 1px solid #396d83;

			.main-video {
			//border: 1px solid #396d83;
			width: 100%;
			height: 100%;
			min-height: 164px;

			video {
			width: 100%;