From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue | 92 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue b/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
index e22182f..da459bf 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
+++ b/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
@@ -1,25 +1,61 @@
<template>
- <div>
- <!-- <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>-->
+ <div class="">
+ <!-- <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>-->
- <div class="" style="padding: 5px;">
- <!-- <div v-for="o in tableData" :key="o" class="text item">-->
- <!-- {{ o.content }}-->
- <!-- </div>-->
- <div>
- 1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦
- <div>
-
- </div>
- </div>
+ <!-- </el-table>-->
+ <div class="" style="padding: 5px;">
+ <!-- <div v-for="o in tableData" :key="o" class="text item">-->
+ <!-- {{ o.content }}-->
+ <!-- </div>-->
+ <div>
+ <h4 class="sub-title ">绠＄嚎鍩烘湰淇℃伅</h4>
+ <div>
+ 浜嬩欢绠＄嚎锛�
+ <div class="report-con">
+ 鐢熶骇1鍖虹绾緼锛屼粙璐ㄤ负鍚补姹℃按锛屽煁璁炬柟寮忎负鐩村煁锛屾潗璐ㄤ负鏃犵紳閽㈢锛岄檮灞炶鏂介榾闂ˋ銆�
+ </div>
+ 涓婃父绠＄嚎
+ <div class="report-con">
+ 鐢熶骇2鍖虹绾緽锛屼粙璐ㄤ负鍚补姹℃按锛屽煁璁炬柟寮忎负鐩村煁锛屾潗璐ㄤ负鏃犵紳閽㈢锛岄檮灞炶鏂介榾闂˙
+ </div>
+ <div class="report-con">
+ 鐢熶骇2鍖虹绾緾锛屼粙璐ㄤ负鍚补姹℃按锛屽煁璁炬柟寮忎负鐩村煁锛屾潗璐ㄤ负鏃犵紳閽㈢锛岄檮灞炶鏂介榾闂–
+ </div>
+ 涓嬫父绠＄嚎
+ <div class="report-con">
+ 鐢熶骇2鍖虹绾緿锛屼粙璐ㄤ负鍚补姹℃按锛屽煁璁炬柟寮忎负鐩村煁锛屾潗璐ㄤ负鏃犵紳閽㈢锛岄檮灞炶鏂介榾闂―
+ </div>
+ 浜嬩欢鑼冨洿鍐�
+ <div class="report-con">
+ 瑁呯疆鍖洪洦姘寸嚎锛屼粙璐ㄤ负闆ㄦ按绠＄嚎锛屽煁璁炬柟寮忎负鏄庢矡 锛屾潗璐ㄤ负鏃犳按娉ワ紝闄勫睘璁炬柦鎴祦闂�
+ </div>
+ <div class="report-con">
+ 瑁呯疆鍖洪洦姘寸嚎锛屼粙璐ㄤ负闆ㄦ按绠＄嚎锛屽煁璁炬柟寮忎负鏄庢矡 锛屾潗璐ㄤ负鏃犳按娉ワ紝闄勫睘璁炬柦鎴祦闂�
+ </div>
</div>
<div>
+ <h3 class="sub-title">鐜鍒嗘瀽鎶ュ憡</h3>
+ <el-table :data="envTableData" style="width: 100%">
+ <el-table-column prop="process" label="寤鸿澶勭疆鎺柦"></el-table-column>
+ <el-table-column prop="operation" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button class="link-btn" @click="handleClickView(scope.row)" type="text" size="mini">棰勮</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
+ <div>
+
+ </div>
+ </div>
</div>
+ <div>
+ </div>
+
+ </div>
</template>
<script>
@@ -109,14 +145,34 @@
lat: 32
}]
}
- }]
+ }],
+ envTableData: [
+ {
+ process: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦'
+ },
+ {
+ process: '2.閫氳繃璺ㄧ嚎/鏃佽矾锛圶XX姹℃按绠＄嚎锛夎繘琛屽娴�'
+ }, {
+ process: '3.灞曠ず鍙楀奖鍝嶆薄姘寸绾垮強澶栨帓鍙�'
+ }
+ ]
}
},
- methods: {}
+ methods: {
+ handleClickView (item) {
+ console.log(item)
+ },
+ handleClickDownload (item) {
+ console.log(item)
+ }
+ }
}
</script>
-<style scoped>
+<style lang="less" scoped>
+.report-con{
+ color: @color;
+}
</style>
--
Gitblit v1.8.0