From 4783886d2dd9ca05bca014f2aad2a409e4ae33b5 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 16:20:30 +0800
Subject: [PATCH] 公共弹框表格修改
---
src/api/request.js | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 106 ++++++++++++++++++++++++++++++++++++++++++++---------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 12 ++---
3 files changed, 94 insertions(+), 26 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index 5db8fa9..acdca70 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -9,7 +9,7 @@
})
}
export const FlueGas = (data = {}) => {
- return $http.post('/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
+ return $http.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
headers: {
'Content-Type': 'application/json'
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b9fae10..2a6d685 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -1,20 +1,27 @@
<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">
+ <el-col class="main-video">
+ <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>
</div>
</template>
@@ -24,7 +31,15 @@
props: ['requestSolidWasteData'],
data () {
return {
- data: []
+ data: [{
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }]
}
},
mounted () {
@@ -42,7 +57,62 @@
</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 {
+ //border: 1px solid #396d83;
+ width: 100%;
+ height: 100%;
+
+ 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>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ff6bfb2..1e15ccf 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-if="flag">
+ <div class="public-bounced" v-draw v-if="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,10 +7,10 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
- <GasECharts v-else></GasECharts>
- <!-- <PublicTable></PublicTable>-->
- <!-- <GasECharts></GasECharts>-->
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -95,7 +95,6 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
- //align-items: center;
justify-content: space-around;
padding: 10px;
@@ -107,7 +106,6 @@
.public-bounced-content-right {
flex: 2;
- //width: 48%;
height: 100%;
}
}
--
Gitblit v1.8.0