From 13fbc433b66909d1e793bb9cf1dbfa8661b57d3e Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 15:43:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
/dev/null | 147 ----------
src/components/table/summarySheets.vue | 55 ++-
src/components/table/components/tabHandover.vue | 24 -
src/assets/css/map/map-panel-style.less | 5
src/components/message/index.vue | 134 +++++++++
src/components/table/components/IndexStatistics.vue | 136 ++++-----
src/views/MapTemplate.vue | 9
src/components/emergency/index.vue | 3
src/components/table/components/componented/refinery.vue | 28 -
src/views/popup/Dialog.vue | 5
src/components/table/components/Warn.vue | 263 +++++++++---------
11 files changed, 388 insertions(+), 421 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 8ba44f8..0afa10b 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -823,3 +823,8 @@
width: 100%;
height: 1.5rem;
}
+
+.el-dialog__body{
+ padding: 5px;
+ color: #f2f2f2;
+}
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
index 98c2ea7..5a02419 100644
--- a/src/components/emergency/index.vue
+++ b/src/components/emergency/index.vue
@@ -214,9 +214,6 @@
/deep/ .el-dialog{
width: 450px;
}
- /deep/ .el-dialog__body{
- padding: 5px;
- }
.panel-title{
text-align: left;
padding: 5px 0 0 0;
diff --git a/src/components/message/index.vue b/src/components/message/index.vue
new file mode 100644
index 0000000..3f6c687
--- /dev/null
+++ b/src/components/message/index.vue
@@ -0,0 +1,134 @@
+<template>
+ <div class="message">
+ <el-tooltip :popper-class="'message-btn'" effect="dark" content="閫氱煡" placement="left">
+ <div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse" >
+ <i class="icon el-icon-bell" ></i>
+ </div>
+ </el-tooltip>
+ <el-dialog class="dialogMessage" :visible.sync="isShowMessage" title="閫氱煡" :modal="false" v-dialogDrag :before-close="handleClose">
+ <p class="conclusion">
+ 鎬讳綋姒傚喌锛氬寲闆嗗洟鎬诲叡鏈� <span>589</span> 涓洃娴嬬偣锛屾秹鍙� <span>44</span> 瀹朵紒涓氥�傚叾涓紝<span>453</span> 涓偣鎺掓斁杈炬爣锛�<span class="red">4</span> 涓嚭鐜拌秴鏍囥��
+ </p>
+ <ul class="detail">
+ <li>搴熸按鎶ヨ鏁伴噺锛�
+ <el-popover placement="bottom-end" trigger="click" popper-class="popovers" title="浜岀骇椋庨櫓鍦板潡">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
+ <u slot="reference" style="color: #00ffff">22</u>
+ </el-popover>
+ 涓�</li>
+ <li>纭寲姘㈤珮鎶ユ暟閲忥細<span>3</span>涓�</li>
+ <li>搴熸皵鎶ヨ鏁伴噺锛�<span>3</span>涓�</li>
+ <li>鍙噧姘旈珮鎶ユ暟閲忥細<span>3</span>涓�</li>
+ <li>鍥哄簾鎶ヨ鏁伴噺锛�<span>3</span>涓�</li>
+ <li>搴旀�ュ缃簨浠舵暟閲忥細<span>3</span>涓�</li>
+ </ul>
+ <div class="footer">
+ <el-button type="primary" size="mini" @click="btnForecastWarningDetails">棰勬姤璀︽槑缁�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+//
+import bus from '@/eventBus'
+import Refinery from '@components/table/components/componented/refinery'
+export default {
+ name: 'index',
+ components: {
+ Refinery
+ },
+ data () {
+ return {
+ selectGroup: false,
+ isShowMessage: false,
+ tableHeader1: [
+ { name: '浼佷笟鍚嶇О', width: '140', propS: 'value1' },
+ { name: '鐩戞祴鐐瑰悕绉�', width: '140', propS: 'value2' },
+ { name: '姹℃煋鐗�', width: '140', propS: 'value3' },
+ { name: '鐩戞祴鍊�', width: '140', propS: 'value4' },
+ { name: '鏍囧噯鍊�', width: '140', propS: 'value5' },
+ { name: '棰勮鍊�', width: '140', propS: 'value6' },
+ { name: '鎶ヨ鏃堕棿', width: '140', propS: 'value7' }
+ ],
+ tableContent1: [
+ { value1: '澶╂触鐭冲寲', value2: '鐐兼补鍖栧伐鎺掓薄姘�', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04锛�00' },
+ { value1: '澶╂触鐭冲寲', value2: '鐐兼补鍖栧伐鎺掓薄姘�', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04锛�00' },
+ { value1: '澶╂触鐭冲寲', value2: '鐐兼补鍖栧伐鎺掓薄姘�', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04锛�00' }
+ ]
+ }
+ },
+ mounted () {
+ const that = this
+ bus.$on('changeState', function (state) {
+ if (state.num !== 6 && state.type) {
+ that.selectGroup = false
+ }
+ })
+ },
+ methods: {
+ changeSelectMouse () {
+ this.selectGroup = !this.selectGroup
+ this.isShowMessage = this.selectGroup
+ if (this.selectGroup) {
+ this.isShow = []
+ } else {
+ this.isShow = !this.isShow
+ this.active = -1
+ }
+ const state = {
+ type: this.selectGroup,
+ num: 6
+ }
+ bus.$emit('changeState', state)
+ },
+ btnForecastWarningDetails () {
+ bus.$emit('forecastWarningDetails', '')
+ },
+ handleClose (done) {
+ this.selectGroup = false
+ this.isShowMessage = false
+ }
+ }
+}
+</script>
+
+<style scoped lang="less">
+ .message{
+ z-index: 2000;
+ position: absolute;
+ right: 0.14583rem;
+ top: 0.11979rem;
+ .dialogMessage{
+ /deep/ .el-dialog{
+ width: 30vw;
+ left: 60%;
+ }
+ .conclusion{
+ text-indent:2em;
+ span{color: #95F204;}
+ span.red{color: red}
+ }
+ .detail{
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 5px;
+ padding-top: 5px;
+ border-top: 1px solid rgba(0, 255, 246, 0.14);
+ border-bottom: 1px solid rgba(0, 255, 246, 0.14);
+ >li{
+ width: 50%;
+ margin-bottom: 5px;q
+ cursor: pointer;
+ display: flex;
+ span{padding: 0 5px;color: #00fff6;cursor: pointer}
+ }
+ }
+ .footer{
+ padding-top: 5px;
+ display: flex;
+ justify-content: flex-end;
+ }
+ }
+ }
+</style>
diff --git a/src/components/table/SummarySheet.vue b/src/components/table/SummarySheet.vue
deleted file mode 100644
index 741ed40..0000000
--- a/src/components/table/SummarySheet.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
- <div class="summary-sheets">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
- <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn">
- <i class="el-icon-tickets icon"></i>
- </div>
- </el-tooltip>
- <transition name="animationChange">
- <div class="subtopic" v-if="subtopic">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
- <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn('缁熻琛�')">
- <i class="icon iconfont iconbiaoge2"></i>
- <!--<span class="icon-name">缁熻琛�</span>-->
- </div>
- </el-tooltip>
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom">
- <div :class='["iconBtn",companyVisible ? "active-button" : ""]' @click="showStatisDialog('鎸囨爣')">
- <!-- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon"> -->
- <i class="el-icon-office-building icon"></i>
- </div>
- </el-tooltip>
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom">
- <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog('棰勬姤璀�')">
- <i class="icon iconfont iconbaojing01"></i>
- <!--<span class="icon-name">棰勬姤璀�</span>-->
- </div>
- </el-tooltip>
- </div>
- </transition>
- <tab-handover v-show="summaryVisible" ref="titleProp"></tab-handover>
- <Warn v-show="companyVisible" ref="titlePropWarn"></Warn>
- <index-statistics v-show="warnVisible" ref="titlePropStatics"></index-statistics>
- </div>
-</template>
-
-<script>
-import tabHandover from '@components/table/components/tabHandover'
-import Warn from './components/Warn'
-import IndexStatistics from '@components/table/components/IndexStatistics'
-import bus from '@/eventBus'
-
-export default {
- name: 'SummarySheet',
- components: {
- tabHandover,
- Warn,
- IndexStatistics
- },
- data () {
- return {
- summaryVisible: false,
- dialogShow: false,
- comp: Warn,
- warnVisible: false,
- companyVisible: false,
- subtopic: false
- }
- },
- methods: {
- subtopicBtn () {
- this.subtopic = !this.subtopic
- const state = {
- type: this.subtopic,
- num: 2
- }
- bus.$emit('changeState', state)
- },
- closeBtn (item) {
- this.$refs.titleProp.refsDatatitle(item)
- this.summaryVisible = !this.summaryVisible
- this.warnVisible = false
- this.companyVisible = false
- },
- showStatisDialog (item) {
- this.$refs.titlePropWarn.refsDatatitle(item)
- this.companyVisible = !this.companyVisible
- this.summaryVisible = false
- this.warnVisible = false
- },
- showWarnDialog (item) {
- this.$refs.titlePropStatics.refsDatatitle(item)
- this.warnVisible = !this.warnVisible
- this.summaryVisible = false
- this.companyVisible = false
- }
- }
-}
-</script>
-
-<style lang="less">
- .summary-sheets {
- position: absolute;
- display: inline-flex;
- overflow: hidden;
- top: 0.42979rem;
- left: 0.14583rem;
- /*width: 850px;*/
- /*height: 265px;*/
- z-index: 500;
-
- .subtopic {
- display: inline-flex;
-
- .iconBtn {
- margin-left: 0.03rem;
- border-color: #00fff6;
- color: #00fff6;
- }
-
- .iconBtn.active-button {
- //border-color:#00fff6 !important;
- //color:#00fff6 !important;
- }
- }
-
- .dialog {
- //width: 800px;
- //height: 300px;
- position: absolute;
- top: 15%;
- left: 3rem;
- }
-
- .animationChange-enter-active, .animationChange-leave-active {
- transition: all 0.5s;
- }
-
- .animationChange-enter, .animationChange-leave-to {
- opacity: 0;
- transform: translateX(-100px);
- }
-
- /*color: #fff;*/
-
- .el-icon-c-scale-to-original {
- width: 30px;
- height: 30px;
- font-size: 30px;
- }
-
- .el-dialog.el-dialog--center {
- left: 0.5rem;
- top: 0.73979rem;
- }
-
- }
-</style>
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index 27b0797..ef47519 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,82 +1,74 @@
<template>
- <Public>
- <template v-slot:title>
- <span>{{ titleProp }}</span>
- </template>
- <template v-slot:publicTable>
- <el-tabs v-model="activeName">
- <el-tab-pane label="鎸囨爣缁熻" name="first">
- <el-table :data="tableData" :lock-scroll="true" class="scroll">
- <el-table-column type="index" label="搴忓彿"></el-table-column>
- <el-table-column prop="date" label="鍗曚綅鍚嶇О"></el-table-column>
- <el-table-column prop="province" label="宸ヤ笟鍙栨按閲�(m3)"></el-table-column>
- <el-table-column prop="province" label="澶栨帓搴熸按閲�(m3)"></el-table-column>
- <el-table-column prop="province" label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"></el-table-column>
- <el-table-column label="COD(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- <el-table-column label="姘ㄦ爱(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- <el-table-column label="浜屾哀鍖栫～(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- <el-table-column label="姘哀鍖栫墿(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- <el-table-column label="VOCs(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(t)">
- <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
- </el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="浼佷笟鎺掑悕" name="second">
- <el-table :data="tableData">
- <el-table-column type="index" label="搴忓彿"></el-table-column>
- <el-table-column prop="date" label="浼佷笟鍚嶇О"></el-table-column>
- <el-table-column prop="name" label="搴熸按杈炬爣鐜�"></el-table-column>
- <el-table-column prop="province" label="鍚嶆"></el-table-column>
- <el-table-column prop="city" label="搴熸皵杈炬爣鐜�"></el-table-column>
- <el-table-column prop="address" label="鍚嶆"></el-table-column>
- <el-table-column prop="zip" label="浼犺緭鐜�"></el-table-column>
- <el-table-column prop="zip" label="鍚嶆"></el-table-column>
- <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
- <el-table-column prop="zip" label="鎺掑悕"></el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third">
- <el-table :data="tableData">
- <el-table-column type="index" label="搴忓彿"></el-table-column>
- <el-table-column prop="date" label="鎺掓斁鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="name" label="鎺掓斁绫诲瀷"></el-table-column>
- <el-table-column prop="province" label="杈炬爣鐜�"></el-table-column>
- <el-table-column prop="city" label="鍚嶆"></el-table-column>
- <el-table-column prop="address" label="浼犺緭鐜�"></el-table-column>
- <el-table-column prop="zip" label="鍚嶆"></el-table-column>
- <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
- <el-table-column prop="zip" label="鍚嶆"></el-table-column>
- </el-table>
- </el-tab-pane>
- </el-tabs>
- </template>
- </Public>
+ <div>
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="鎸囨爣缁熻" name="first">
+ <el-table :data="tableData" :lock-scroll="true" class="scroll">
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="鍗曚綅鍚嶇О"></el-table-column>
+ <el-table-column prop="province" label="宸ヤ笟鍙栨按閲�(m3)"></el-table-column>
+ <el-table-column prop="province" label="澶栨帓搴熸按閲�(m3)"></el-table-column>
+ <el-table-column prop="province" label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"></el-table-column>
+ <el-table-column label="COD(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ <el-table-column label="姘ㄦ爱(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ <el-table-column label="浜屾哀鍖栫～(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ <el-table-column label="姘哀鍖栫墿(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ <el-table-column label="VOCs(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="浼佷笟鎺掑悕" name="second">
+ <el-table :data="tableData">
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="name" label="搴熸按杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="province" label="鍚嶆"></el-table-column>
+ <el-table-column prop="city" label="搴熸皵杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="address" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="浼犺緭鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鎺掑悕"></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third">
+ <el-table :data="tableData">
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="鎺掓斁鐐瑰悕绉�"></el-table-column>
+ <el-table-column prop="name" label="鎺掓斁绫诲瀷"></el-table-column>
+ <el-table-column prop="province" label="杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="city" label="鍚嶆"></el-table-column>
+ <el-table-column prop="address" label="浼犺緭鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
</template>
<script>
-import Public from '@components/table/Public'
-
export default {
name: 'IndexStatistics',
- components: { Public },
data () {
return {
titleProp: '',
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index faf893a..0308373 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,162 +1,154 @@
<template>
- <Public>
- <template v-slot:title>
- <span>{{ titleProp }}</span>
- </template>
- <template v-slot:publicTable>
- <el-tabs v-model="activeName">
- <el-tab-pane label="瀹炴椂缁熻" name="first">
- <el-scrollbar style="width:100%">
- <el-table
- :data="tableData">
+ <div>
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="瀹炴椂缁熻" name="first">
+ <el-scrollbar style="width:100%">
+ <el-table
+ :data="tableData">
+ <el-table-column
+ prop="date"
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
<el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-scrollbar>
+ </el-tab-pane>
+ <el-tab-pane label="褰撴湀缁熻" name="second">
+ <el-table
+ :data="tableData">
+ <el-table-column
prop="date"
label="浼佷笟鍚嶇О">
- </el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
prop="name"
label="棰勮">
- </el-table-column>
- <el-table-column
+ </el-table-column>
+ <el-table-column
prop="name"
label="鎶ヨ">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
prop="name"
label="棰勮">
- </el-table-column>
- <el-table-column
+ </el-table-column>
+ <el-table-column
prop="name"
label="鎶ヨ">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- </el-table>
- </el-scrollbar>
- </el-tab-pane>
- <el-tab-pane label="褰撴湀缁熻" name="second">
- <el-table
- :data="tableData">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
<el-table-column
- prop="date"
- label="浼佷笟鍚嶇О">
+ prop="name"
+ label="棰勮">
</el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- </el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="涓婃湀缁熻" name="third">
- <el-table
- :data="tableData">
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
<el-table-column
- prop="date"
- label="浼佷笟鍚嶇О">
+ prop="name"
+ label="棰勮">
</el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ">
- </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
</el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ">
- </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="涓婃湀缁熻" name="third">
+ <el-table
+ :data="tableData">
+ <el-table-column
+ prop="date"
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
</el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
</el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
</el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
</el-table-column>
- </el-table>
- </el-tab-pane>
- </el-tabs>
- </template>
- </Public>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
</template>
<script>
-
-import Public from '@components/table/Public'
-
export default {
data () {
return {
@@ -193,7 +185,6 @@
}]
}
},
- components: { Public },
methods: {
refsDatatitle (item) {
this.titleProp = item
diff --git a/src/components/table/components/componented/refinery.vue b/src/components/table/components/componented/refinery.vue
index af87df9..c54ae24 100644
--- a/src/components/table/components/componented/refinery.vue
+++ b/src/components/table/components/componented/refinery.vue
@@ -17,23 +17,7 @@
name: 'refinery',
data () {
return {
- tableData: [{
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: ' 1518 寮�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: ' 1517 寮�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: ' 1519 寮�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: ' 1516 寮�'
- }]
+ tableData: []
}
},
props: {
@@ -49,6 +33,16 @@
}
}
}
+ },
+ watch: {
+ param: {
+ tableContent (newValue, oldValue) {
+ this.tableData = newValue
+ console.log(newValue)
+ },
+ deep: true
+ }
+
}
}
</script>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 794a621..1665928 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,22 +1,15 @@
<template>
- <Public>
- <template v-slot:title>
- <span>{{ titleProp }}</span>
- </template>
- <template v-slot:publicTable>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
- </el-tabs>
- <div>
- <component :is="gcComp"></component>
- </div>
- </template>
- </Public>
+ <div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
+ </el-tabs>
+ <div>
+ <component :is="gcComp"></component>
+ </div>
+ </div>
</template>
<script>
-
-import Public from '@components/table/Public'
import WasteWater from '@components/table/components/WasteWater'
import SoilGroundwater from '@components/table/components/SoilGroundwater'
@@ -29,7 +22,6 @@
export default {
name: 'tabHandover',
components: {
- Public,
WasteWater,
// WasteGas,
// SoilGroundwater,
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 6bc279f..37a4fa4 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,12 +1,12 @@
<template>
<div class="summary-sheets">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
- <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
+ <div :class='["iconBtn",selectGroup ? "active-button" : ""]' @click="subtopicBtn" >
<i class="el-icon-tickets icon"></i>
</div>
</el-tooltip>
<transition name="animationChange">
- <div class="subtopic" v-if="subtopic">
+ <div class="subtopic" v-show="selectGroup">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
<div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
<!-- -->
@@ -67,11 +67,35 @@
comp: Warn,
warnVisible: false,
companyVisible: false,
- subtopic: false
+ selectGroup: false
}
},
+ mounted () {
+ const that = this
+ // 鐩戝惉鏄惁鐐瑰嚮浜嗗綋鍓嶅浘鏍囨寜閽�
+ bus.$on('changeState', function (state) {
+ if (state.num !== 2 && state.type) {
+ that.selectGroup = false
+ }
+ })
+ // 澶栭儴璋冪敤 涓庢姤璀﹀脊妗�
+ bus.$on('forecastWarningDetails', function (state) {
+ that.showWarnDialog()
+ })
+ // 瀛愮粍浠朵簨浠舵帶鍒跺綋鍓嶅彉閲�
+ this.$nextTick(() => {
+ this.$refs.summarySheets.$on('closeDialog', () => {
+ that.summaryVisible = false
+ })
+ this.$refs.warnDialog.$on('closeDialog', () => {
+ that.warnVisible = false
+ })
+ this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
+ that.companyVisible = false
+ })
+ })
+ },
methods: {
-
closeBtn () {
this.$refs.summarySheets.show()
this.summaryVisible = true
@@ -85,32 +109,13 @@
this.companyVisible = true
},
subtopicBtn () {
- this.subtopic = !this.subtopic
+ this.selectGroup = !this.selectGroup
const state = {
- type: this.subtopic,
+ type: this.selectGroup,
num: 2
}
bus.$emit('changeState', state)
}
- },
- mounted () {
- const that = this
- bus.$on('changeState', function (state) {
- if (state.num !== 2 && state.type) {
- that.subtopic = false
- }
- })
- this.$nextTick(() => {
- this.$refs.summarySheets.$on('closeDialog', () => {
- that.summaryVisible = false
- })
- this.$refs.warnDialog.$on('closeDialog', () => {
- that.warnVisible = false
- })
- this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
- that.companyVisible = false
- })
- })
}
}
</script>
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e568cfc..a4bfcc5 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -19,6 +19,7 @@
<!-- <PublicBounced ref="PublicBounced"></PublicBounced>-->
<!-- <ReportPopup></ReportPopup>-->
<Emergency ref="Emergency"></Emergency>
+ <Message></Message>
</div>
</template>
@@ -29,8 +30,8 @@
import SgisLayerController from '@components/LayerController/LayerController'
import MonitorPanel from '@components/panel/RightSearchPanel'
// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
-// import summarySheets from '@components/table/summarySheets.vue'
-import SummarySheet from '@components/table/SummarySheet'
+// import summarySheets from '@components/table/summarySheets.vue'SummarySheet
+import SummarySheet from '@components/table/summarySheets'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
@@ -41,6 +42,7 @@
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
+import Message from '@components/message/index'
export default {
name: 'MapTemplate',
@@ -55,7 +57,8 @@
// summarySheets,
SummarySheet,
// PublicBounced,
- Emergency
+ Emergency,
+ Message
// ReportPopup
},
data () {
diff --git a/src/views/popup/Dialog.vue b/src/views/popup/Dialog.vue
index 516e523..e85e73c 100644
--- a/src/views/popup/Dialog.vue
+++ b/src/views/popup/Dialog.vue
@@ -1,9 +1,10 @@
<template>
- <el-dialog v-dialogDrag
+ <el-dialog
+ v-dialogDrag
:title="title"
:visible.sync="centerDialogVisible"
:modal="false"
- :close-on-click-modal="false"
+ :close-on-click-modal="true"
@close='closeDialog'
center>
<slot></slot>
--
Gitblit v1.8.0