From fca7c928af9af52bc0a10e2e73dc0f1310882160 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期四, 20 五月 2021 10:55:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/emergency/index.vue | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
index 5a02419..26867ae 100644
--- a/src/components/emergency/index.vue
+++ b/src/components/emergency/index.vue
@@ -72,20 +72,13 @@
<el-button type="primary" size="mini">妯旱鏂潰</el-button>
<el-button type="primary" size="mini" @click="showCalculate=!showCalculate">浜嬫晠姘磋绠�</el-button>
</div>
- <table>
- <tr>
- <th>寤鸿澶勭疆鎺柦</th>
- <th>棰勮</th>
- </tr>
- <tr>
- <td> 1.鍏抽棴闃�闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦</td>
- <td></td>
- </tr>
- <tr>
- <td> 1.鍏抽棴闃�闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦</td>
- <td></td>
- </tr>
- </table>
+ <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%">
+ <el-table-column prop="define" label="寤鸿澶勭疆鎺柦" show-overflow-tooltip></el-table-column>
+ <el-table-column type="selection" label="棰勮" width="55"></el-table-column>
+ <!-- <el-table-column label="鏃ユ湡" width="120">
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column> -->
+ </el-table>
</div>
<div class="filteringInformation">
<div class="header">
@@ -164,7 +157,7 @@
data () {
return {
tit: '浜嬩欢澶勭疆',
- showSchedule: true,
+ showSchedule: false,
tableData: [
{ name: '棰勬A', define: '缁煎悎棰勬', hierarchy: '浜岀骇鍗曚綅', classification: '鐜繚' },
{ name: '棰勬B', define: '涓撻」棰勬', hierarchy: '鐩村睘浼佷笟', classification: '鐜繚' },
--
Gitblit v1.8.0