From 94ae577b548d2f4c51f82f57feadde0048a69f9a Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 13:35:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue | 51 -----
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 3
src/components/base-page/RiskSource/RiskSourceIndex.vue | 2
src/components/base-page/RiskSource/PublicTabs.vue | 36 ++-
src/components/base-page/RiskSource/PublicTable.vue | 44 +++-
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 280 +++++++++++++++++-----------------
src/router/index.js | 5
src/utils/utils.js | 1
8 files changed, 207 insertions(+), 215 deletions(-)
diff --git a/src/components/base-page/RiskSource/PublicTable.vue b/src/components/base-page/RiskSource/PublicTable.vue
index b71482e..4a869d0 100644
--- a/src/components/base-page/RiskSource/PublicTable.vue
+++ b/src/components/base-page/RiskSource/PublicTable.vue
@@ -6,13 +6,13 @@
<span></span>
<div class="main-table">
<div class="">
- <ul>
- <li>椋庨櫓璇勪及杩囩▼</li>
- <li>鍒濆璇勪环缁撴灉:{{ riskSourceAssess }}</li>
+ <ul style="margin-bottom: .02rem">
+ <li><h3>椋庨櫓璇勪及杩囩▼</h3></li>
+ <li>鍒濆璇勪环缁撴灉锛歿{ riskSourceAssess }}</li>
</ul>
</div>
- <div>
- <table border="1">
+ <div class="EvaluationTable">
+ <table border="1" style="border-color: rgba(118,132,189,0.77)" >
<tr>
<th colspan="2">椋庨櫓鎺у埗</th>
<th>璇勪及鎸囨爣</th>
@@ -95,10 +95,13 @@
</tr>
</table>
</div>
- <el-table :data="riskSourceDetail" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
- :label="item.label" :show-overflow-tooltip="true"></el-table-column>
- </el-table>
+ <h3>鐜椋庨櫓璇勪及缁撴灉</h3>
+ <div class="pTable">
+ <el-table :data="riskSourceDetail" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label" :show-overflow-tooltip="true"></el-table-column>
+ </el-table>
+ </div>
</div>
</div>
</template>
@@ -171,7 +174,12 @@
</script>
<style lang="less" scoped>
-
+/deep/ .el-table .warning-row{
+ background-color: rgba(0, 0, 0, 0) !important;
+}
+/deep/ .el-table .success-row{
+ background-color: rgba(48, 69, 95, .6) !important;
+}
/deep/ .el-table thead tr {
color: #02a6b5 !important;
//.el-table .has-gutter tr th .cell {
@@ -199,13 +207,21 @@
/deep/ .el-table tbody tr:hover > td {
background: none !important
}
-
+.pTable{
+ box-shadow: 0 0 10px rgba(129,211,248,.35) inset;
+ padding: 0.04rem;
+ margin-top: .06rem;
+}
.slotChildTable {
position: relative;
- background: rgba(33, 41, 69, 0.9);
-
+ background: rgba(0, 16, 30, 0.7);
+ box-shadow: 0 0 10px rgba(129,211,248,.35) inset;
+ color: #00fff6;
+ padding: 0.04rem;
+ border: 1px solid #396d83;
.main-table {
- border: 1px #396d83 solid;
+ max-height: 2rem;
+ overflow: hidden auto;
}
}
diff --git a/src/components/base-page/RiskSource/PublicTabs.vue b/src/components/base-page/RiskSource/PublicTabs.vue
index b1beb91..b1ed89b 100644
--- a/src/components/base-page/RiskSource/PublicTabs.vue
+++ b/src/components/base-page/RiskSource/PublicTabs.vue
@@ -6,10 +6,9 @@
<span></span>
<div class="tabs-content">
<ul>
- <li>椋庨櫓鍚嶇О:{{ riskSourceBaseInfo.riskname }}</li>
- <li>椋庨櫓绾у埆:{{ riskSourceBaseInfo.riskLevel }}</li>
- <li>椋庨櫓鎻忚堪:{{ riskSourceBaseInfo.depiction }}</li>
- <li class="lastli"></li>
+ <li>椋庨櫓鍚嶇О锛歿{ riskSourceBaseInfo.riskname }}</li>
+ <li :style="{boxShadow: riskLevel[riskSourceBaseInfo.riskLevel]}">椋庨櫓绾у埆锛歿{ riskSourceBaseInfo.riskLevel }}</li>
+ <li>椋庨櫓鎻忚堪锛歿{ riskSourceBaseInfo.depiction }}</li>
</ul>
</div>
</div>
@@ -22,7 +21,13 @@
name: 'PublicTabs',
data () {
return {
- riskSourceBaseInfo: []
+ riskSourceBaseInfo: [],
+ riskLevel: {
+ 1: '0 0 10px rgba(246,16,43,.7) inset',
+ 2: '0 0 10px rgba(244,142,88,.7) inset',
+ 3: '0 0 10px rgba(253,238,13,.7) inset',
+ 4: '0 0 10px rgba(38,144,2,.7) inset'
+ }
}
},
mounted () {
@@ -44,7 +49,7 @@
.slotChildTabs {
position: relative;
- margin-bottom: 0.1rem;
+ margin-bottom: 0.06rem;
background-color: @background-color;
.tabs-content {
@@ -56,21 +61,26 @@
ul {
display: flex;
align-items: center;
- justify-content: space-around;
flex-wrap: wrap;
-
+ padding: 0 .03rem;
li {
margin-bottom: 0.04rem;
- text-align: center;
min-width: 30%;
- background-color: #243a55;
- color: #00d0f9;
+ box-shadow: 0 0 10px rgba(129,211,248,.35) inset;
+ color: #00fff6;
border-radius: 0.02rem;
font-size: 0.08rem;
line-height: 0.09rem;
- padding: 0.03rem .5%;
+ padding: 0.05rem .8%;
}
-
+ li:nth-child(2){
+ margin-left: .03rem;
+ }
+ li:last-child {
+ text-align: left;
+ line-height: .12rem;
+ margin-bottom: 0;
+ }
.lastli {
visibility: hidden
}
diff --git a/src/components/base-page/RiskSource/RiskSourceIndex.vue b/src/components/base-page/RiskSource/RiskSourceIndex.vue
index 11b0a01..0303409 100644
--- a/src/components/base-page/RiskSource/RiskSourceIndex.vue
+++ b/src/components/base-page/RiskSource/RiskSourceIndex.vue
@@ -83,7 +83,7 @@
.public-bounced-content {
//padding: 0.1rem;
- display: flex;
+
//align-items: center;
//justify-content: space-around;
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
index 45d885a..145b040 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
@@ -1,27 +1,5 @@
<template>
<div class="location-lon-and-lat">
- <!-- <el-row>-->
- <!-- <el-form :model="lonlatpos" label-width="60px">-->
- <!-- <el-col :span="12">-->
- <!-- <el-form-item label="缁忓害:">-->
- <!-- <el-input type="text" v-model="lonlatpos.longPos"></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- <el-col :span="12">-->
- <!-- <el-form-item label="绾害:">-->
- <!-- <el-input type="text" v-model="lonlatpos.latPos"></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- </el-form>-->
- <!-- <el-row>-->
- <!-- <el-col :span="12" style="text-align: center;margin: 5px 0">-->
- <!-- <el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>-->
- <!-- </el-col>-->
- <!-- <el-col :span="12" style="text-align: center;margin: 5px 0">-->
- <!-- <el-button type="primary" size="small" @click="dataPoints">鏁版嵁璇嗗彇</el-button>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
- <!-- </el-row>-->
<el-form :model="lonlatpos" label-width="60px">
<el-row class="pipe-line-search">
<el-col :span="12">
@@ -41,10 +19,10 @@
<el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>
</el-col>
<el-col :span="12" style="text-align: center;margin: 5px 0">
- <el-button type="primary" size="small" @click="dataPoints">鏁版嵁璇嗗彇</el-button>
+ <el-button type="primary" size="small" @click="dataPoints">浣嶇疆鎷惧彇</el-button>
</el-col>
</el-row>
- <el-row class="place-bottom" style="text-align: right;margin: 5px">
+ <el-row style="text-align: right;margin: 5px">
<el-button type="primary" @click="confirm" size="small">纭</el-button>
</el-row>
</div>
@@ -88,12 +66,12 @@
window.map.addLayer(this.marker)
this.layersGroupArrList.push(this.marker)
window.map.off('click')
+ // this.lonlatpos.latPos = ''
+ // this.lonlatpos.longPos = ''
})
},
// 閫氳繃鏁版嵁瀹氫綅
dataPoints () {
- // this.lonlatpos.latPos = ''
- // this.lonlatpos.longPos = ''
if (this.lonlatpos.latPos !== '' && this.lonlatpos.longPos !== '') {
const as = [this.lonlatpos.latPos, this.lonlatpos.longPos]
window.map.setView(as, 17)
@@ -127,25 +105,4 @@
</script>
<style lang="less" scoped>
- .place-box {
- display: flex;
- align-items: center;
- justify-content: space-around;
- }
-
- .place {
- text-align: center;
-
- .place-top {
- display: flex;
- align-items: center;
- justify-content: space-around;
-
- .place-right {
- .el-button {
- margin: 15px;
- }
- }
- }
- }
</style>
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index 63fa1f4..d25e3f2 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -136,11 +136,14 @@
// 杩斿洖鏁版嵁绫诲瀷 1锛堟櫘閫歅OI锛�
if (res.resultType === 1) {
this.searchList = res.pois
+ // this.total = res.count
this.total = res.pois.length
} else if (res.resultType === 2) {
// 杩斿洖鏁版嵁绫诲瀷 2锛堢粺璁�
this.searchListStatistics = res.statistics.priorityCitys
this.total = res.statistics.priorityCitys.length
+ } else if (res.resultType === 3) {
+ // 杩斿洖鏁版嵁绫诲瀷 3 area 鍖哄煙
}
})
},
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index c1b30ae..30102e4 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -1,106 +1,110 @@
<template>
- <div class="search-panel">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢鐘舵�侊細" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" value-key="code"
- :popper-class="'select-down'" @change="handleDataType">
- <el-option
- v-for="item in subItems"
- :key="item.code"
- :label="item.name"
- :value="item">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷锛�">
- <el-radio-group v-model="form.transferData" class="levelOfRisk">
- <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"
- @change="redioChange(item.name)">
- <span class="levelOfRisk-type">{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
- <div class="page_total">
- <p>鍏辫
- <span>{{total}}</span>
- 鏉¤褰�
- </p>
- </div>
- <div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-button class="el-icon-search" @click="handleSearch"></el-button>
- </div>
- </el-form>
- <el-scrollbar style="height:286.22px">
- <!-- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''" @click="accordPopup(item)">-->
- <!-- <!– <i class="state"></i>–>-->
- <!-- <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>-->
- <!-- <div>-->
- <!-- <h3 @click="handleLocation(item,index)">浜嬩欢鍚嶇О:XXX浜嬩欢</h3>-->
- <!-- <h5>-->
- <!-- 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�-->
- <!-- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button>-->
- <!-- </h5>-->
- <!-- <p>-->
- <!-- 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>-->
- <!-- </p>-->
- <!-- <p>浜嬩欢绫诲瀷锛�<span>{{ item.properties.pipecode }}</span>-->
- <!-- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">浜嬩欢绠＄悊-->
- <!-- </el-button>-->
- <!-- </p>-->
- <!-- </div>-->
- <!-- </div>-->
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>
- <span @click="disposalfx">浜嬩欢鍚嶇О:XXX浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="startAnalysis">
- <span>寮�濮嬪垎鏋�</span>
- </el-button>
- </h3>
- <h5>
- <span>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</span>
- <el-button class="rt btn00fff6" size="mini" style="margin: 0.04rem 0.1rem;">鍒犻櫎</el-button>
- </h5>
- <p>
- 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>
- </p>
- <p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="accordPopup()">
- <span>浜嬩欢澶勭疆</span>
- </el-button>
- </p>
- </div>
- </div>
- </el-scrollbar>
- <div class="event-report">
- <el-dialog
- custom-class="event-report-dialog"
- title="浜嬩欢涓婃姤"
- :visible.sync="dialogVisible"
- :append-to-body="true"
- :modal="false"
- v-dialogDrag
- >
- <EventsReported></EventsReported>
- </el-dialog>
- </div>
+ <div class="search-panel">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鐘舵�侊細" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷锛�">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
+ <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"
+ @change="redioChange(item.name)">
+ <span class="levelOfRisk-type">{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{ total }}</span>
+ 鏉¤褰�
+ </p>
+ </div>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ <el-scrollbar style="height:286.22px">
+ <!-- <div class="environmental-risk-list">-->
+ <!-- <i class="state"></i>-->
+ <!-- <el-row>-->
+ <!-- <h3>-->
+ <!-- <span @click="handleLocation">浜嬩欢鍚嶇О:XXX浜嬩欢</span>-->
+ <!-- <el-button class="rt btn00fff6" size="mini" @click="startAnalysis">寮�濮嬪垎鏋�</el-button>-->
+ <!-- </h3>-->
+ <!-- <h5>-->
+ <!-- <span>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</span>-->
+ <!-- <el-button class="rt btn00fff6" size="mini">鍒犻櫎</el-button>-->
+ <!-- </h5>-->
+ <!-- <p>-->
+ <!-- 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>-->
+ <!-- <el-button class="rt btn00fff6" size="mini" @click="accordPopup()">浜嬩欢澶勭疆</el-button>-->
+ <!-- </p>-->
+ <!-- <p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span></p>-->
+ <!-- </el-row>-->
+ <!-- </div>-->
+ <el-row class="environmental-risk-list">
+ <el-col :span="1">
+ <i class="state"></i>
+ </el-col>
+ <el-col :span="19">
+<!-- <div>-->
+<!-- <el-row>-->
+ <h3>
+ <span @click="handleLocation">浜嬩欢鍚嶇О:XXX浜嬩欢</span>
+ <!-- <el-button class="rt btn00fff6" size="mini" @click="startAnalysis">寮�濮嬪垎鏋�</el-button>-->
+ </h3>
+ <h5>
+ <span>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</span>
+ <!-- <el-button class="rt btn00fff6" size="mini">鍒犻櫎</el-button>-->
+ </h5>
+ <p>
+ 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>
+ <!-- <el-button class="rt btn00fff6" size="mini" @click="accordPopup()">浜嬩欢澶勭疆</el-button>-->
+ </p>
+ <p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span></p>
+<!-- </el-row>-->
+<!-- </div>-->
+ </el-col>
+ <el-col :span="4">
+ <el-button class="rt btn00fff6" size="mini" @click="startAnalysis" style="margin: 0.01rem">寮�濮嬪垎鏋�</el-button>
+ <el-button class="rt btn00fff6" size="mini" style="margin: 0.05rem">鍒犻櫎</el-button>
+ <el-button class="rt btn00fff6" size="mini" @click="accordPopup()" style="margin: 0.02rem">浜嬩欢澶勭疆</el-button>
+ </el-col>
+ </el-row>
+ </el-scrollbar>
+ <div class="event-report">
+ <el-dialog
+ custom-class="event-report-dialog"
+ title="浜嬩欢涓婃姤"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDrag
+ >
+ <EventsReported></EventsReported>
+ </el-dialog>
</div>
+ </div>
</template>
<script>
@@ -108,10 +112,10 @@
// import WfsHelper from '@components/helpers/WfsHelper'
// import AjaxUtils from '@utils/AjaxUtils'
-import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
-// import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
import eventBus from '../../../../eventBus'
+import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
import EventsReported from '../../../base-page/enterprise-emergency/events-reported/EventsReported'
+// import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
export default {
name: 'EventQuery',
@@ -120,12 +124,11 @@
},
data () {
return {
+ // 寮规缁戝畾 鏄剧ず/闅愯棌 鏁版嵁
dialogVisible: false,
- list: [],
- total: 0,
- activeNum: -1,
- items: [],
- subItems: [],
+ // wfs鏁版嵁璇锋眰
+ WfsHelper: null,
+ // form 琛ㄥ崟缁戝畾鏁版嵁
form: {
pipelineType: '',
dataType: '',
@@ -142,39 +145,35 @@
}
]
},
- WfsHelper: null
+ // active index
+ activeNum: -1,
+ // 鍥惧眰
+ items: [],
+ subItems: [],
+ // 璇锋眰鏁版嵁灞曠ず鍒楄〃
+ list: [],
+ // 鍒嗛〉鍔熻兘 鎬绘暟閲�
+ total: 0
}
},
mounted () {
// this.wfsHelper = new WfsHelper()
+ // 鎺ユ敹 鏁版嵁 鐢ㄦ潵鎺у埗 寮瑰嚭妗� 鐨勯殣钘�
eventBus.$on('event-report-popup', (obj) => {
this.dialogVisible = obj
})
},
methods: {
+ // 浜嬩欢涓婃姤鎸夐挳 鐐瑰嚮浜嬩欢 鎺у埗寮规鐨勬樉绀�/闅愯棌
dialogVisibleChange () {
this.dialogVisible = !this.dialogVisible
},
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
- // eventBus.$emit('disposal-analysis', true)
-
},
// 寮�濮嬪垎鏋�
startAnalysis () {
eventBus.$emit('event-handling', {})
- },
- disposalfx () {
- window.$layer.open({
- content: {
- comp: DisposalEvent, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢淇℃伅'
- })
},
// radio鏁版嵁閫夋嫨
redioChange (item) {
@@ -207,26 +206,31 @@
// 鎼滅储鐨勬暟鎹� de 鐐瑰嚮浜嬩欢
handleLocation () {
console.log('val')
+ // 鏃堕棿淇℃伅 寮瑰嚭妗�
+ window.$layer.open({
+ content: {
+ comp: DisposalEvent, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ }
+ },
+ title: '浜嬩欢淇℃伅'
+ })
}
}
}
</script>
<style lang="less" scoped>
- /*/deep/ .event-report-dialog {*/
- /* left: 3rem;*/
- /* top: 1rem;*/
- /*}*/
- /*.event-report {*/
- /deep/ .el-dialog {
- width: 3.343545rem;
- }
- /*}*/
+/deep/ .el-dialog {
+ width: 3.343545rem;
+}
- /deep/ .event-report-dialog {
- left: 3rem;
- top: 1rem;
- margin-top: 2rem;
- margin-left: 2rem;
- }
+/deep/ .event-report-dialog {
+ left: 3rem;
+ top: 1rem;
+ margin-top: 2rem;
+ margin-left: 2rem;
+}
</style>
diff --git a/src/router/index.js b/src/router/index.js
index b95bcd3..bcc7434 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,9 +21,10 @@
const token = getToken()
if (!token && to.name !== LOGIN_PAGE_ROUTE_NAME) {
// 鏈櫥褰曚笖瑕佽烦杞殑椤甸潰涓嶆槸鐧诲綍椤�
- next({
+ /* next({
name: LOGIN_PAGE_ROUTE_NAME // 璺宠浆鍒扮櫥褰曢〉
- })
+ }) */
+ next() // 璺宠浆
} else if (!token && to.name === LOGIN_PAGE_ROUTE_NAME) {
// 鏈櫥闄嗕笖瑕佽烦杞殑椤甸潰鏄櫥褰曢〉
next() // 璺宠浆
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c187b1c..702b36c 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -27,6 +27,7 @@
* 鑴夊啿鏁堟灉
*/
export function pulseEffect (xy) {
+ window.mapManager.clearHighlight()
let times = 1000
const colors = ['#00f100', '#ff0000']
// 鎻掍欢 鏁堟灉瀹炵幇
--
Gitblit v1.8.0