From b25421d2fb6cc01343bc5eaa327a3838268ed068 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 15:55:51 +0800
Subject: [PATCH] 问题修改
---
/dev/null | 36 ------------------
src/components/table/SummarySheet.vue | 15 +++++--
src/components/table/components/tabHandover.vue | 2
src/conf/MapConfig.js | 8 ++--
src/components/table/Public.vue | 7 ++-
5 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/src/components/table/Public.vue b/src/components/table/Public.vue
index 5193020..fec41b2 100644
--- a/src/components/table/Public.vue
+++ b/src/components/table/Public.vue
@@ -1,5 +1,6 @@
<template>
- <div class="report-bounced map-background" v-drag>
+ <div class="report-bounced map-background">
+<!-- <div class="report-bounced map-background" v-drag>-->
<div class="public-bounced-title">
<slot name='title'></slot>
</div>
@@ -23,8 +24,8 @@
.report-bounced {
z-index: 2000;
position: fixed;
- top: 35%;
- left: 35%;
+ top: 15%;
+ left: 5%;
.public-bounced-title {
text-align: center;
diff --git a/src/components/table/ReportBounced.vue b/src/components/table/ReportBounced.vue
deleted file mode 100644
index 05a7bc1..0000000
--- a/src/components/table/ReportBounced.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
- <public>
- <template v-slot:title>
- <span>{{ titleProp }}</span>
- </template>
- <template v-slot:publicTable>
- <tab-handover></tab-handover>
- </template>
- </public>
-</template>
-
-<script>
-import Public from '@components/table/Public'
-import tabHandover from '../table/components/tabHandover'
-
-export default {
- name: 'ReportBounced',
- components: {
- Public,
- tabHandover
- },
- data () {
- return {
- titleProp: ''
- }
- },
- methods: {
- refsDatatitle (item) {
- this.titleProp = item
- }
- }
-}
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/src/components/table/SummarySheet.vue b/src/components/table/SummarySheet.vue
index bbfaf98..c23dcd5 100644
--- a/src/components/table/SummarySheet.vue
+++ b/src/components/table/SummarySheet.vue
@@ -9,7 +9,6 @@
<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>
@@ -80,14 +79,20 @@
closeBtn (item) {
this.$refs.titleProp.refsDatatitle(item)
this.summaryVisible = !this.summaryVisible
- },
- showWarnDialog (item) {
- this.$refs.titlePropStatics.refsDatatitle(item)
- this.warnVisible = !this.warnVisible
+ 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
},
subtopicBtn () {
this.subtopic = !this.subtopic
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index cd396fc..794a621 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -39,7 +39,7 @@
data () {
return {
titleProp: '',
- activeName: 'first',
+ activeName: 'gcComp',
topicList: TopicList,
gcComp: AirQuality
}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 8a600ba..2343ab8 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -22,10 +22,10 @@
minZoom: 3,
maxZoom: 17,
// center: [26, 104],
- // center: [38.828558921813965, 117.41676807403564],
- // zoom: 5,
- center: [32.25853085517883, 118.78592848777771],
- zoom: 15,
+ center: [34.828558921813965, 117.41676807403564],
+ zoom: 5,
+ // center: [32.25853085517883, 118.78592848777771],
+ // zoom: 15,
worldCopyJump: true,
inertia: true,
zoomControl: false,
--
Gitblit v1.8.0