From e3608132cc667c16ea10f450807e0feddaf55d1f Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期日, 30 五月 2021 13:32:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/DisposalEvent.vue | 196 +++++++++++++++++++++++++++++++-----------------
1 files changed, 127 insertions(+), 69 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/DisposalEvent.vue b/src/components/base-page/enterprise-emergency/DisposalEvent.vue
index e7eb185..c7c4c15 100644
--- a/src/components/base-page/enterprise-emergency/DisposalEvent.vue
+++ b/src/components/base-page/enterprise-emergency/DisposalEvent.vue
@@ -1,72 +1,105 @@
<template>
- <div class="disposal-event">
- <h4 class="sub-title ">浜嬩欢鍩烘湰淇℃伅</h4>
- <div :model="form">
- <el-row>
- <el-col class="info-label" :span="6">浜嬩欢鍚嶇О锛�</el-col>
- <el-col class="info-text" :span="18">{{ form.nameOfEvent }}</el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" :span="6">
- 浜嬩欢浣嶇疆锛�
- </el-col>
- <el-col class="info-text" :span="18">
- <label>{{ form.eventLocation }}</label>
- </el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" :span="6">
- 浣嶇疆鎻忚堪锛�
- </el-col>
- <el-col class="info-text" :span="18">
- <label>{{ form.positionDesc }}</label>
- </el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" :span="6">
- 浜嬩欢鍗曚綅锛�
- </el-col>
- <el-col class="info-text" :span="18">
- {{ form.incidentUnit }}
- </el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" :span="6">
- 浜嬪彂鏃堕棿锛�
- </el-col>
- <el-col class="info-text" :span="18">
- {{ form.atTime }}
- </el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" :span="6">浜嬩欢鎻忚堪锛�</el-col>
- <el-col class="info-text" :span="18">{{ form.eventDesc }}</el-col>
- </el-row>
- <el-row>
- <el-col class="info-label" span="6">闄勪欢锛�</el-col>
- <el-col class="info-text" :span="18"><a class="link-btn" href="javascript:">闄勪欢</a>
-
- <a class="link-btn" href="javascript:">闄勪欢</a>
- </el-col>
- </el-row>
+ <div>
+ <el-scrollbar >
+ <div class="disposal-event">
+<!-- <el-collapse v-model="activeNames" @change="handleChange">-->
+<!-- <el-collapse-item title="浜嬩欢鍩烘湰淇℃伅" name="1">-->
+ <div>
+ <h4 class="sub-title ">浜嬩欢鍩烘湰淇℃伅</h4>
+ <div :model="form">
+ <el-row>
+ <el-col class="info-label" :span="6">浜嬩欢鍚嶇О锛�</el-col>
+ <el-col class="info-text" :span="18">{{ form.nameOfEvent }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" :span="6">
+ 浜嬩欢浣嶇疆锛�
+ </el-col>
+ <el-col class="info-text" :span="18">
+ <label>{{ form.eventLocation }}</label>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" :span="6">
+ 浣嶇疆鎻忚堪锛�
+ </el-col>
+ <el-col class="info-text" :span="18">
+ <label>{{ form.positionDesc }}</label>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" :span="6">
+ 浜嬩欢鍗曚綅锛�
+ </el-col>
+ <el-col class="info-text" :span="18">
+ {{ form.incidentUnit }}
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" :span="6">
+ 浜嬪彂鏃堕棿锛�
+ </el-col>
+ <el-col class="info-text" :span="18">
+ {{ form.atTime }}
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" :span="6">浜嬩欢鎻忚堪锛�</el-col>
+ <el-col class="info-text" :span="18">{{ form.eventDesc }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col class="info-label" span="6">闄勪欢锛�</el-col>
+ <el-col class="info-text" :span="18"><a class="link-btn" href="javascript:">闄勪欢</a>
+
+ <a class="link-btn" href="javascript:">闄勪欢</a>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+<!-- </el-collapse-item>-->
+<!-- <el-collapse-item title="棰勬鍖归厤" name="2">-->
+ <div>
+<!-- <h3 class="sub-title">棰勬鍖归厤</h3>-->
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column prop="name" label="棰勬鍚嶇О"></el-table-column>
+ <el-table-column prop="define" label="棰勬瀹氫箟"></el-table-column>
+ <el-table-column prop="hierarchy" label="棰勬灞傜骇"></el-table-column>
+ <el-table-column prop="classification" label="棰勬鍒嗙被"></el-table-column>
+ <el-table-column label="闄勪欢">
+ <template>
+ <a class="link-btn" href="javascript:">棰勬</a>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+<!-- </el-collapse-item>-->
+<!-- <el-collapse-item title="鐜鍒嗘瀽鎶ュ憡" name="3">-->
+ <div>
+ <h3 class="sub-title">鐜鍒嗘瀽鎶ュ憡</h3>
+ <el-table :data="envTableData" style="width: 100%">
+ <el-table-column prop="no" label="搴忓彿"></el-table-column>
+ <el-table-column prop="radius" label="鏌ヨ鍗婂緞"></el-table-column>
+ <el-table-column prop="reporterTime" label="鐢熸垚鎶ュ憡鏃堕棿"></el-table-column>
+ <el-table-column prop="classification" label="鎿嶄綔">
+ <template slot-scope="scope" >
+ <el-button class="link-btn" @click="handleClickView(scope.row)" type="text" size="small">鏌ョ湅</el-button>
+ <el-button class="link-btn" @click="handleClickDownload(scope.row)" type="text" size="small">涓嬭浇</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+<!-- </el-collapse-item>-->
+<!-- </el-collapse>-->
+
</div>
- <h3 class="sub-title">棰勬鍖归厤</h3>
- <el-table :data="tableData" style="width: 100%">
- <el-table-column prop="name" label="棰勬鍚嶇О"></el-table-column>
- <el-table-column prop="define" label="棰勬瀹氫箟"></el-table-column>
- <el-table-column prop="hierarchy" label="棰勬灞傜骇"></el-table-column>
- <el-table-column prop="classification" label="棰勬鍒嗙被"></el-table-column>
- <el-table-column label="闄勪欢">
- <template>
- <a class="link-btn" href="javascript:">棰勬</a>
- </template>
- </el-table-column>
- </el-table>
+ </el-scrollbar>
<div class="event-management">
+ <el-input></el-input>
<el-button type="primary" size="mini" @click="ToManagement">寮�濮嬪垎鏋�</el-button>
<!-- <el-button size="mini">鍏抽棴</el-button>-->
</div>
</div>
+
</template>
<script>
@@ -77,6 +110,7 @@
name: 'DisposalEvent',
data () {
return {
+ activeNames: ['1'],
form: {
nameOfEvent: '***************浜嬩欢',
eventLocation: '**********瑁呯疆',
@@ -116,6 +150,23 @@
hierarchy: '鍩哄眰鍗曚綅',
classification: '鐢熶骇'
}
+ ],
+ envTableData: [
+ {
+ no: '1',
+ radius: '500m',
+ reporterTime: '2021-6-1 18:00:00',
+ data: [],
+ downloadUrl: ''
+ },
+ {
+ no: '2',
+ radius: '1km',
+ reporterTime: '2021-6-1 18:00:00',
+ data: [],
+ downloadUrl: ''
+ }
+
]
}
},
@@ -123,6 +174,15 @@
// 寮�濮嬪垎鏋�
ToManagement () {
eventBus.$emit('event-handling', {})
+ },
+ handleClickView (item) {
+ console.log(item)
+ },
+ handleClickDownload (item) {
+ console.log(item)
+ },
+ handleChange (val) {
+ console.log(val)
}
}
}
@@ -131,7 +191,7 @@
<style lang="less" scoped>
.disposal-event {
padding: 5px;
-
+height: 400px;
.fixed-width {
width: 3.2459893rem;
min-width: 3.2459893rem;
@@ -144,11 +204,6 @@
/deep/ .el-form-item__label {
color: @color;
font-size: 0.08rem;
- }
-
- .event-management {
- text-align: right;
- margin: 15px;
}
.sub-title {
@@ -170,5 +225,8 @@
text-align: left;
}
}
-
+.event-management {
+ text-align: right;
+ margin: 15px;
+}
</style>
--
Gitblit v1.8.0