From dddcf8840e52a212e7b49ec034aec7763b5917f5 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 10:56:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 121 +++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 26 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b9fae10..f2c0f64 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -1,48 +1,117 @@
<template>
- <div class="public-table">
- <el-col class="el-col">
- <el-table
- border
- tooltip-effect="dark"
- :data="data"
- >
- <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>
- </el-col>
+ <div class="win">
+ <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <div class="main">
+ <div class="main-video">
+<!-- <el-table-->
+<!-- tooltip-effect="dark"-->
+<!-- :data="displayContentTable2"-->
+<!-- >-->
+<!-- <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>-->
+ <span>{{ displayContentTable3.StoragePlaceTypeName }}</span>
+ </div>
+ </div>
</div>
</template>
<script>
export default {
name: 'PublicTable',
- props: ['requestSolidWasteData'],
+ props: ['displayContentTable'],
data () {
return {
- data: []
+ displayContentTable2: [
+ {
+ CompanyName: '涓煩鐭冲寲',
+ StoragePlaceId: 3,
+ StoragePlaceName: '鐏版福鍦�',
+ StoragePlaceTypeName: '涓�鑸浐搴熷～鍩嬪満',
+ StorageType: '绮夌叅鐏般�佺伆娓�',
+ StorageZCL: '38',
+ StorageZCNL: '40.7',
+ StorageZDMJ: '10.60798'
+ }
+ ],
+ displayContentTable3: []
}
},
mounted () {
this.$nextTick(() => {
- this.getSolidWasteData()
+ this.displayContentTable.forEach(item => {
+ this.displayContentTable3 = item
+ })
})
- },
- methods: {
- getSolidWasteData () {
- // const data = requestSolidWasteData
- // console.log(data)
- }
}
}
</script>
<style lang="less" scoped>
-.public-table {
+.win {
+ position: relative;
+ background-color: rgba(33, 41, 69, 0.9);
+}
+.main {
+ width: 100%;
+ height: 100%;
+
+ .main-video {
+ width: 100%;
+ min-height: 195px;
+
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
+ }
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 14px;
+ height: 14px;
+ background: rgba(0, 0, 0, 0);
+ border: 1.5px solid #47d5ea;
+}
+
+.border_corner_left_top {
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+
+.border_corner_right_top {
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+
+.border_corner_left_bottom {
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+}
+
+.border_corner_right_bottom {
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
}
</style>
--
Gitblit v1.8.0