From 4907618343198c0c772fce47e1a4a44500637c1f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 15:40:53 +0800
Subject: [PATCH] 弹出框表格问题修改
---
src/assets/css/map/map-panel-style.less | 3 -
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 16 ++++++--
src/components/panel/topicSearch/SolidWasteSearch.vue | 56 ++++++++++++++-------------
3 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 7f2e9ef..5bb940e 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -409,9 +409,6 @@
.el-table td, .el-table th.is-leaf {
font-size: 0.08rem;
}
-.el-table td, .el-table th.is-leaf {
- border-bottom: none;
-}
.el-table .warning-row {
background: #27304d;
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTable.vue b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
index 4b610e3..1515187 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
@@ -13,7 +13,7 @@
<span></span>
<span></span>
<div class="main-table">
- <el-table :data="listData" style="width: 100%" height="255px" :row-class-name="tableRowClassName">
+ <el-table :data="listData" style="width: 100%" height="325px" :row-class-name="tableRowClassName">
<el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
:label="item.label" :show-overflow-tooltip="true"></el-table-column>
</el-table>
@@ -62,7 +62,7 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push(this.displayContentTable[0], {}, {})
+ this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
})
},
methods: {
@@ -100,8 +100,12 @@
// //border: 1px red solid;
// }
//}
-/deep/ .el-table td, .el-table th.is-leaf {
- border-bottom: none;
+/deep/ .el-table td {
+ border-bottom: none !important;
+}
+
+/deep/ .el-table th.is-leaf {
+ border-bottom: none !important;
}
/deep/ .el-table td {
@@ -109,6 +113,10 @@
line-height: 45px !important;
}
+/deep/ .el-table tbody tr:hover > td {
+ background: none !important
+}
+
.main {
position: relative;
background: rgba(33, 41, 69, 0.9);
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 676551d..76793a7 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,7 +15,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-radio-group v-model="form.type" class="levelOfRisk">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
<span class="levelOfRisk-type">{{ item.name }}</span>
</el-radio>
@@ -115,47 +115,49 @@
key: 'length'
}]
}],
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
- ],
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
- transferData: ''
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: []
}
},
methods: {
- setBounced (val) {
- const pos = [val.Latitude, val.Longitude]
- window.map.flyTo(pos, 11)
- },
- handlePipelineType (val) {
- this.solidWasteTypeOptions.forEach(item => {
- if (val === item.value) {
- this.handleSearch(item.value)
- }
- })
- },
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
console.log(result)
this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
+ handlePipelineType (val) {
+ this.solidWasteTypeOptions.forEach(item => {
+ if (val === item.value) {
+ this.handleSearch(item.value)
+ }
+ })
}
}
}
--
Gitblit v1.8.0