From a6135ffcbf7dca73c3ff39ad6f7718880c3abe9a Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期二, 11 五月 2021 10:47:19 +0800
Subject: [PATCH] 企业应急修改
---
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue | 91 +++++++++++++++++++++++-------
src/conf/MapConfig.js | 8 +-
src/views/MapTemplate.vue | 2
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 31 ++++------
4 files changed, 86 insertions(+), 46 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
index bca7924..018817d 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -1,13 +1,13 @@
<template>
- <div class="report-popup map-background" v-drag v-show="flags">
+ <div class="report-popup map-background" v-drag v-show="!flags">
<div class="public-bounced-title panel-title">
<span>涓婃姤浜嬩欢</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="report-content">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
- <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent">
- <el-input v-model="ruleForm.nameEvent" class="report-input"></el-input>
+ <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent" class="input-event-name">
+ <el-input v-model="ruleForm.nameEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-radio-group v-model="ruleForm.eventType">
@@ -54,6 +54,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎鍚嶇О" prop="region" class="search-panel-item">
+ <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎绫诲瀷" prop="name">
+ <label for="">鑷姩甯﹀嚭涓嶅彲淇敼</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item>
<el-upload
class="upload-demo"
@@ -68,18 +80,21 @@
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
- <el-form-item label="娑堟伅鎺ㄩ��" prop="resource">
- <el-radio-group v-model="ruleForm.resource">
- <el-radio label="鐭俊鎺ㄩ��"></el-radio>
- <el-radio label="鎵嬫満搴旂敤鎺ㄩ��"></el-radio>
+ <el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
+ <el-radio-group v-model="ruleForm.beingPush">
+ <el-radio v-for="(item,index) in ruleForm.beingPushList" :label="item.value" :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
+ <div v-show="wayTo">
+ <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </div>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
<el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
@@ -130,9 +145,21 @@
value: 3
}
],
- atTime: ''
+ atTime: '',
+ beingPush: '',
+ beingPushList: [
+ {
+ name: '鐭俊鎺ㄩ��',
+ value: 1
+ },
+ {
+ name: '鎵嬫満搴旂敤鎺ㄩ��',
+ value: 2
+ }
+ ]
},
fileList: [],
+ wayTo: false,
rules: {
name: [
{
@@ -205,19 +232,39 @@
</script>
<style lang="less" scoped>
+ .report-popup {
+ width: 35%;
+ z-index: 999;
+ position: absolute;
+ top: 15%;
+ left: 35%;
+ }
+
+ /deep/ input {
+ border-radius: 0;
+ background-color: rgba(0, 255, 246, 0.14);
+ border: solid 1px #00fff6;
+ color: #C0C4CC;
+ font-size: 0.01rem;
+ padding: 0 15px;
+ }
+
+ /deep/ .input-event-name {
+ margin: 15px 0;
+ width: 55%;
+
+ .el-input__inner {
+ width: 100%;
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+ }
+ }
+
/deep/ .el-form-item__label {
color: @color;
}
/deep/ .el-radio__label {
color: @color;
- }
-
- .report-popup {
- width: 35%;
- z-index: 999;
- position: absolute;
- top: 35%;
- left: 20%;
}
</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index a717a7a..d7d9af9 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -13,7 +13,7 @@
<!-- <el-scrollbar style="height:450px">-->
<!-- <el-card shadow="hover">-->
<span class="fixed-style">璧峰绠℃</span>
- <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" @row-click="linkSelectStart" highlight-current-row style="width: 100%" size="mini">
+ <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" highlight-current-row style="width: 100%" size="mini">
<el-table-column prop="datasource" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
@@ -112,16 +112,16 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
- <div>
+ <el-row>
<el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
<el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
<el-button type="primary" @click="jdmClear" size="mini" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
- </div>
+ </el-row>
<!-- <el-card class="box-card">-->
<div slot="header" class="fixed-style">
<span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table class="tableBox" :data="tableData" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
+ <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column prop="pipename" label="绠℃鍚嶇О"></el-table-column>
<el-table-column prop="mediumtype" label="绠℃绫诲瀷" width="80"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">
@@ -247,27 +247,21 @@
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
- console.log(e)
+ // console.log(e)
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
- // if () {
- // // 鍏抽棴寮圭獥
- // window.layerFactory.clickSwitch = false
- // } else {
- // window.layerFactory.clickSwitch = true
- // }
},
// 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
async getPipeLine (point) {
const param = {
x: point[0],
y: point[1],
- radius: 5
+ radius: 3
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res)
+ console.log(res.pipesegcode)
if (this.activeName === 'first') {
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
@@ -305,6 +299,7 @@
},
// 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectStart (e) {
+ // console.log(e)
// console.log('閫夋嫨璧峰绠℃')
// this.$refs.singleTable.setCurrentRow(e)
this.currentSelectStart = e
@@ -331,7 +326,7 @@
},
// 杩為�氭�� 缁撴潫绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectEnd (e) {
- console.log('閫夋嫨缁撴潫绠℃')
+ // console.log('閫夋嫨缁撴潫绠℃')
this.currentSelectEnd = e
// 鍋氬垽鏂璻emove
@@ -345,15 +340,15 @@
style: function (feature) {
return {
weight: 10,
- color: 'rgba(255, 247, 0, 0.6)'
+ color: 'rgba(255, 247, 0, 0.7)'
}
}
}).addTo(window.map)
window.map.panInsideBounds(this.currentSelectEndLine.getBounds())
},
- // 杩為�氭�ф煡璇�
+ // 杩為�氭�ф煡璇� 缁撴灉
async linkQuery () {
- // 姣忔鏌ヨ鍒嗘瀽缁撴灉涓虹┖
+ // 姣忔鏌ヨ鍒嗘瀽缁撴灉鍒剁┖
this.tableDataLinkResult = []
if (this.linkPipeline.length > 1) {
this.linkPipeline.forEach((itm) => {
@@ -380,9 +375,7 @@
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
// 杩涜鍒ゆ柇
- // if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
this.currentLinkIsTrue = '涓嶈繛閫�'
- // }
return
}
this.tableDataLinkResult = res.data
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 2343ab8..f3a720e 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -22,10 +22,10 @@
minZoom: 3,
maxZoom: 17,
// center: [26, 104],
- center: [34.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: 16,
worldCopyJump: true,
inertia: true,
zoomControl: false,
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 38605bf..23d4259 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,7 +17,7 @@
<!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
<!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
<PublicBounced ref="PublicBounced"></PublicBounced>
- <!-- <ReportPopup></ReportPopup>-->
+<!-- <ReportPopup></ReportPopup>-->
</div>
</template>
--
Gitblit v1.8.0