From 881c1cfbe23c2fc5033bf8656fe37547df43e9d8 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 18 五月 2021 15:17:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/service/WmsLayerService.js | 1
src/components/BaseNav/WasteWater/WasteWaterRealChart.vue | 2
src/main.js | 2
src/components/BaseNav/PublicSector.vue | 2
src/components/emergency/index.vue | 266 ++++++++++++++++++++++++++++++++++++++++++++---------
src/Sgis.js | 2
src/components/LayerController/service/WmsLayerGroupService.js | 1
7 files changed, 228 insertions(+), 48 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index 64977a5..a3e10a0 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -16,6 +16,7 @@
import '@components/plugin/pulse/Pulse.css' // marker 澶栧湀娉� css
import BasemapHelper from './components/helpers/BasemapHelper'
import VectorLayerHelper from './components/helpers/VectorLayerHelper'
+// import '@/components/plugin/flowline'
// import eventBus from './eventBus'
let map = null
@@ -35,7 +36,6 @@
return map
}
-
/**
* 鍩虹搴曞浘鍒濆鍖�
* @param map
diff --git a/src/components/BaseNav/PublicSector.vue b/src/components/BaseNav/PublicSector.vue
index 8daedcb..328b263 100644
--- a/src/components/BaseNav/PublicSector.vue
+++ b/src/components/BaseNav/PublicSector.vue
@@ -30,7 +30,7 @@
left: 20%;
.public-bounced-content {
- padding: 0.1rem;
+ padding: 0.05rem;
display: flex;
.public-bounced-content-left {
diff --git a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
index 2c7a925..b332667 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
@@ -13,7 +13,7 @@
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch()">鏌ヨ</el-button>
- <!-- <el-button>鏄庣粏琛�</el-button>-->
+ <!-- <el-button>鏄庣粏琛�</el-button>-->
</div>
<div class="echarts-chart">
<div ref="echarts"></div>
diff --git a/src/components/LayerController/service/WmsLayerGroupService.js b/src/components/LayerController/service/WmsLayerGroupService.js
index 6f948d5..0955ffe 100644
--- a/src/components/LayerController/service/WmsLayerGroupService.js
+++ b/src/components/LayerController/service/WmsLayerGroupService.js
@@ -22,6 +22,7 @@
this.L.tileLayer.wms(PIPELINE_WMS, {
format: 'image/png', // 杩斿洖鐨勬暟鎹牸寮�
transparent: true,
+ maxZoom: 21,
layers: k // todo
}).addTo(this.layer).bringToFront()
}
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index 4706862..df7c090 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -19,6 +19,7 @@
INFO_FORMAT: 'application/json',
TRANSPARENT: true,
FEATURE_COUNT: 50,
+ maxZoom: 21,
SRS: 'EPSG:4326',
EXCEPTIONS: 'application/vnd.ogc.se_inimage'
}
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
index 3467c7b..98c2ea7 100644
--- a/src/components/emergency/index.vue
+++ b/src/components/emergency/index.vue
@@ -1,51 +1,160 @@
<template>
- <el-dialog class="emergency" :visible.sync="showSchedule" :title="tit" :modal="false" v-dialogDrag >
- <!-- 鍩虹淇℃伅 -->
- <div class="basicInformation">
- <div>
- <h3 class="panel-title">婕旂粌淇℃伅</h3>
- <ul>
- <li>浜嬩欢绫诲瀷锛�</li>
- <li>浜嬩欢浣嶇疆锛�</li>
- <li>浣嶇疆鎻忚堪锛�</li>
- <li>浜嬩欢鏃堕棿锛�</li>
- <li>闄勪欢锛�<a href="javascript:;">闄勪欢1</a><a href="javascript:;">闄勪欢1</a></li>
- </ul>
- <h3 class="panel-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 href="javascript:;">棰勬</a>
- </template>
- </el-table-column>
- </el-table>
- <el-button type="primary" size="mini">鍒嗘瀽</el-button>
- </div>
- <!-- <div>
- <div class="panel-title">澶勭疆鍒嗘瀽</div>
- <div class="area-selected">
- <el-button type="primary" class="el-icon-location" size="mini"></el-button>
- <el-button type="primary" class="el-icon-location" size="mini"></el-button>
- <el-select v-model="value" filterable placeholder="璇烽�夋嫨" size="mini">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
- </el-select>
- <el-button type="primary" class="el-icon-search" size="mini"></el-button>
- </div>
+ <div class="emergency">
+ <el-dialog :class="CZFX?'':'widt800'" :visible.sync="showSchedule" :title="tit" :modal="false" v-dialogDrag >
+ <!-- 鍩虹淇℃伅 -->
+ <div class="basicInformation" v-if="CZFX">
<div>
- <div class="analysis-btn">
- <div>
- <el-button type="primary" size="mini" >閲嶇疆鍒嗘瀽鏉′欢</el-button>
- <el-button type="primary" size="mini" >寮�濮嬪垎鏋�</el-button>
+ <h3 class="panel-title">婕旂粌淇℃伅</h3>
+ <ul>
+ <li>浜嬩欢绫诲瀷锛�</li>
+ <li>浜嬩欢浣嶇疆锛�</li>
+ <li>浣嶇疆鎻忚堪锛�</li>
+ <li>浜嬩欢鏃堕棿锛�</li>
+ <li>闄勪欢锛�<a href="javascript:;">闄勪欢1</a><a href="javascript:;">闄勪欢1</a></li>
+ </ul>
+ <h3 class="panel-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 href="javascript:;">棰勬</a>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-button type="primary" size="mini" @click="isShowFenXi=!isShowFenXi">鍒嗘瀽</el-button>
+ </div>
+ <!-- 鍒嗘瀽鐣岄潰 -->
+ <div v-if="isShowFenXi">
+ <div class="panel-title">澶勭疆鍒嗘瀽</div>
+ <div class="area-selected">
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-select v-model="value" filterable placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ </el-select>
+ <el-button type="primary" class="el-icon-search" size="mini"></el-button>
+ </div>
+ <div>
+ <div class="analysis-btn">
+ <div>
+ <el-button type="primary" size="mini" >閲嶇疆鍒嗘瀽鏉′欢</el-button>
+ <el-button type="primary" size="mini" @click="CZFX=!CZFX" >寮�濮嬪垎鏋�</el-button>
+ </div>
</div>
</div>
</div>
- </div> -->
- </div>
- </el-dialog>
+ </div>
+ <!-- 寮�濮嬪垎鏋愮晫闈� -->
+ <div v-else class="fenXiChuZhi">
+ <div>
+ <div class="panel-title">浜嬩欢鍩烘湰淇℃伅</div>
+ <ul>
+ <li>
+ <p>浜嬩欢绠＄嚎</p>
+ <span>鐢熶骇涓�鍖虹绾緼</span>
+ <span>鍚补姹℃按</span>
+ <span>鐩村煁</span><span>鏃犵紳閽㈢</span><span>鎷︽埅璁炬柦锛�<i>a闃�闂�</i></span>
+ </li>
+ <li>
+ <p>浜嬩欢涓婃父绠＄嚎</p>
+ <span>鐢熶骇涓�鍖虹绾緼</span>
+ <span>鍚补姹℃按</span>
+ <span>鐩村煁</span><span>鏃犵紳閽㈢</span><span>鎷︽埅璁炬柦锛�<i>a闃�闂�</i></span>
+ </li>
+ </ul>
+ </div>
+ <div>
+ <div class="panel-title">寤鸿澶勭疆鎺柦</div>
+ <div class="footer">
+ <el-button type="primary" size="mini">妯旱鏂潰</el-button>
+ <el-button type="primary" size="mini" @click="showCalculate=!showCalculate">浜嬫晠姘磋绠�</el-button>
+ </div>
+ <table>
+ <tr>
+ <th>寤鸿澶勭疆鎺柦</th>
+ <th>棰勮</th>
+ </tr>
+ <tr>
+ <td> 1.鍏抽棴闃�闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td> 1.鍏抽棴闃�闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦</td>
+ <td></td>
+ </tr>
+ </table>
+ </div>
+ <div class="filteringInformation">
+ <div class="header">
+ <div>
+ <ul>
+ <li>鍐呮帓鍙� <span>鍏�1鏉�</span></li>
+ <li>澶栨帓鍙�<span>鍏�2鏉�</span></li>
+ <li>鍐呮帓鍙� <span>鍏�1鏉�</span></li>
+ <li>澶栨帓鍙�<span>鍏�2鏉�</span></li>
+ <li>鍐呮帓鍙� <span>鍏�1鏉�</span></li>
+ <li>澶栨帓鍙�<span>鍏�2鏉�</span></li>
+ </ul>
+ </div>
+ <div class="area-selected" style="justify-items: center">
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-select v-model="value" filterable placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ </el-select>
+ <el-button type="primary" class="el-icon-search" size="mini"></el-button>
+ <el-input placeholder="瀹℃壒浜�" size="mini" style="width: 60px"></el-input>
+ <el-button type="primary" size="mini">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div class="content">
+ <ul>
+ <li><el-button type="primary" size="mini">搴旀�ュ熀纭�</el-button></li>
+ <li><el-button type="primary" size="mini">搴旀�ュ熀纭�</el-button></li>
+ <li><el-button type="primary" size="mini">搴旀�ュ熀纭�</el-button></li>
+ <li><el-button type="primary" size="mini">搴旀�ュ熀纭�</el-button></li>
+ </ul>
+ <el-table :data="tableData2" style="width: 80%">
+ <el-table-column prop="date" label="鏃ユ湡" width="180"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" width="180"></el-table-column>
+ <el-table-column prop="address" label="鍦板潃"></el-table-column>
+ </el-table>
+ </div>
+ <div class="footer">
+ <el-button type="primary" size="mini">鐢熸垚鎶ュ憡</el-button>
+ <el-button type="primary" size="mini" @click="CZFX=!CZFX">杩斿洖</el-button>
+ </div>
+ </div>
+ </div>
+ <!-- -->
+ </el-dialog>
+ <el-dialog class="calculate" :visible.sync="showCalculate" title="浜嬫晠姘存湁鏁堝绉绠�" :modal="false" v-dialogDrag>
+ <ul>
+ <li>浜嬫晠姘存祦閲忥細<el-input size="mini" style="width: 60px"></el-input>m3/h</li>
+ <li>浜嬫晠鏃堕棿锛�<el-input size="mini" style="width: 60px"></el-input>h</li>
+ <li>浜嬫晠鐗╂枡閲忥細<el-input size="mini" style="width: 60px"></el-input>m3</li>
+ <li>杞瓨閲忥細<el-input size="mini" style="width: 60px"></el-input>m3</li>
+ <li>娑堥槻姘存祦閲忥細<el-input size="mini" style="width: 60px"></el-input>h</li>
+ <li>娑堥槻鏃堕棿锛�<el-input size="mini" style="width: 60px"></el-input>h</li>
+ <li>闄嶉洦閲忥細<el-input size="mini" style="width: 60px"></el-input>mm</li>
+ <li>姹囨按闈㈢Н锛�<el-input size="mini" style="width: 60px"></el-input>m2</li>
+ <li>鐢熶骇搴熸按閲忥細<el-input size="mini" style="width: 60px"></el-input>m3</li>
+ <li>鏀堕泦姹犱綑閲忥細<el-input size="mini" style="width: 60px"></el-input>m3</li>
+ </ul>
+ <ul>
+ <li>浜嬫晠姘村绉細<el-input size="mini" style="width: 60px"></el-input>m3</li>
+ <li>鏄惁澶т簬鏀堕泦姹犱綑閲忥細<el-input size="mini" style="width: 60px"></el-input></li>
+ </ul>
+ <div class="footer">
+ <el-button type="primary" size="mini">璁＄畻</el-button>
+ <el-button type="primary" size="mini">纭</el-button>
+ <el-button type="primary" size="mini">閲嶇疆</el-button>
+ </div>
+ </el-dialog>
+ </div>
</template>
<script>
@@ -55,7 +164,7 @@
data () {
return {
tit: '浜嬩欢澶勭疆',
- showSchedule: false,
+ showSchedule: true,
tableData: [
{ name: '棰勬A', define: '缁煎悎棰勬', hierarchy: '浜岀骇鍗曚綅', classification: '鐜繚' },
{ name: '棰勬B', define: '涓撻」棰勬', hierarchy: '鐩村睘浼佷笟', classification: '鐜繚' },
@@ -68,7 +177,27 @@
cities: cityOptions,
isIndeterminate: true,
value: '',
- options: [{ value: '500', label: '500m' }, { value: '1000', label: '1km' }, { value: '2000', label: '2km' }, { value: '5000', label: '5km' }, { value: '10000', label: '10km' }]
+ options: [{ value: '500', label: '500m' }, { value: '1000', label: '1km' }, { value: '2000', label: '2km' }, { value: '5000', label: '5km' }, { value: '10000', label: '10km' }],
+ isShowFenXi: false,
+ CZFX: true,
+ tableData2: [{
+ 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 寮�'
+ }],
+ showCalculate: false
}
},
methods: {
@@ -84,6 +213,9 @@
.emergency{
/deep/ .el-dialog{
width: 450px;
+ }
+ /deep/ .el-dialog__body{
+ padding: 5px;
}
.panel-title{
text-align: left;
@@ -101,5 +233,49 @@
align-items : center;
}
}
+ .fenXiChuZhi{
+ display: flex;
+ flex-wrap: wrap;
+ >div{width: 50%}
+ .filteringInformation{
+ width: 100%;
+ .header{
+ display: flex;
+ justify-content: space-between;
+ ul{
+ display: flex;
+ li{
+ span{
+ display: block;
+ }
+ }
+ }
+ }
+ .content{
+ display: flex;
+ }
+ }
+ }
+ .footer{
+ display: flex;
+ justify-content:flex-end
+ }
+ .calculate{
+ ul{
+ display: flex;
+ flex-wrap: wrap;
+ li{
+ width: 50%;
+ }
+ }
+ /deep/ .el-dialog{
+ left: 810px;
+ }
+ }
}
+ .emergency .widt800{
+ /deep/ .el-dialog{
+ width: 800px;
+ }
+ }
</style>
diff --git a/src/main.js b/src/main.js
index be81e98..a2d5681 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,8 @@
import '@components/plugin/leaflet-measure-path/leaflet-measure-path.css'
import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
import '@components/plugin/PathDrag'
+// import '@components/plugin/flowline'
+
import layer from './components/layer'
const appConfig = require('@/app.config')
Vue.config.productionTip = false
--
Gitblit v1.8.0