From 1e40f7d8824d8859a6edbec3ae3fd0d857115553 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期二, 05 一月 2021 12:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/MapTemplate.vue | 98 +++++++++---------
src/components/panel/TopEnterprisePanel.vue | 149 +++++++++++++++++++++++++++++
2 files changed, 198 insertions(+), 49 deletions(-)
diff --git a/src/components/panel/TopEnterprisePanel.vue b/src/components/panel/TopEnterprisePanel.vue
new file mode 100644
index 0000000..2c6b240
--- /dev/null
+++ b/src/components/panel/TopEnterprisePanel.vue
@@ -0,0 +1,149 @@
+<template>
+ <div class="top-enterprise-panel">
+ <el-form :inline="true" :model="formInline" ref="form" style="margin-left:5px">
+ <el-form-item label="鍒嗙被锛�">
+ <el-select v-model="form.regionType" @change="handlePipelineType">
+ <el-option
+ v-for="item in regionTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浼佷笟鍚嶇О锛�">
+ <el-select v-model="form.pipelineType" @change="handlePipelineType">
+ <el-option
+ v-for="item in pipelineTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妯＄硦鎼滅储锛�">
+ <el-input v-model="form.name" placeholder="鍦ㄦ杈撳叆杞藉叿鍙�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'TopEnterprisePanel',
+ components: {},
+ data() {
+ return {
+ isPanelVisible: false,
+ total: 0,
+ list: [],
+ regionTypeOptions: [{
+ value: '1',
+ label: '闀挎睙娴佸煙'
+ }, {
+ value: '2',
+ label: '榛勬渤娴佸煙'
+ }, {
+ value: '3',
+ label: '鍗楅儴娌挎捣姘村煙'
+ }, {
+ value: '4',
+ label: '鐜袱娴锋按鍩�'
+ }, {
+ value: '5',
+ label: '鍏朵粬鍦板煙'
+ }, {
+ value: '6',
+ label: '鍌寲鍓傚叕鍙�'
+ }],
+ enterpriseOptions: [{
+ value: '1',
+ label: '鍖楁捣鐐煎寲'
+ }, {
+ value: '2',
+ label: '鑼傚悕鐭冲寲'
+ }, {
+ value: '3',
+ label: '婀涙睙涓滃叴'
+ }, {
+ value: '4',
+ label: '骞垮窞鐭冲寲'
+ }, {
+ value: '5',
+ label: '娴峰崡鐐煎寲'
+ }, {
+ value: '6',
+ label: '鑼傚悕娑︽粦娌�'
+ }],
+ form: {
+ regionType: '',
+ }
+ }
+ },
+ methods: {
+ handleClose(done) {
+ console.log(done)
+ },
+ handleClick(tab, event) {
+ console.log(tab, event)
+ },
+ handleSearch() {
+
+ },
+ onSubmit() {
+
+ }
+ },
+ mounted() {
+ this.handleSearch()
+ }
+}
+</script>
+
+<style lang="less">
+.top-enterprise-panel {
+ position: absolute;
+ margin:0 auto;
+ left: 0; right: 0; top: 0;bottom: 0;
+ z-index: 1000;
+ width: 940px;
+ height: 50px;
+ padding-top: 15px;
+ background: #07325b;
+ border:2px solid #2A8FD4;
+ border-radius:10px;
+
+ .el-form-item__label{
+ color: #ffffff;
+ }
+ .el-message-box__content {
+ background-color: #030D2E;
+ }
+
+ .search-form .el-form-item {
+ margin: 0px;
+ }
+
+ .search-form .el-icon-search {
+ display: grid;
+ line-height: 30px;
+ font-size: 18px;
+ }
+
+ .search-panel {
+ border: #07325B;
+ background-color: #07325B;
+ }
+
+ .search-result {
+ margin: 5px 0px 0px 0px;
+ padding: 0px;
+ border: #051842;
+ overflow-y: scroll;
+ background-color: #051842;
+ }
+}
+</style>
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 126b29f..c945854 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,13 +1,14 @@
<template>
<div class="full-screen">
- <div id="map" ref="rootmap"></div>
- <sgis-layer-controller :preset="'warningPreset'">
- <lc-basemap></lc-basemap>
- <div class="bar-line"></div>
- <lc-service-layer></lc-service-layer>
- </sgis-layer-controller>
- <lc-service-layer-filter v-show="showServiceLayerFilter" ref="serviceLayerFilter"></lc-service-layer-filter>
- <monitor-panel></monitor-panel>
+ <div id="map" ref="rootmap"></div>
+ <sgis-layer-controller :preset="'warningPreset'">
+ <lc-basemap></lc-basemap>
+ <div class="barline"></div>
+ <lc-service-layer></lc-service-layer>
+ </sgis-layer-controller>
+ <lc-service-layer-filter v-show="showServiceLayerFilter" ref="serviceLayerFilter"></lc-service-layer-filter>
+ <monitor-panel></monitor-panel>
+ <top-enterprise-panel></top-enterprise-panel>
</div>
</template>
@@ -20,76 +21,75 @@
import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
import MonitorPanel from '@components/panel/MonitorPanel'
-// import { mapMutations, mapState } from 'vuex'
+import TopEnterprisePanel from "@components/panel/TopEnterprisePanel";
export default {
name: 'MapTemplate',
- components: { SgisLayerController, MonitorPanel, LcBasemap, LcServiceLayer, LcServiceLayerFilter },
- data () {
+ components: {TopEnterprisePanel, SgisLayerController, MonitorPanel, LcBasemap, LcServiceLayer, LcServiceLayerFilter},
+ data(){
return {
basemapHelper: {},
serviceLayerHelper: {},
vectorLayerHelper: {}
}
},
- computed: {
- showServiceLayerFilter () {
+ computed:{
+ showServiceLayerFilter(){
return this.$store.state.map.showServiceLayerFilter
},
- mapConfig () {
+ mapConfig(){
return this.$store.state.map.mapConfig
}
},
- beforeMount () {
- this.$nextTick(() => {
- this.init()
- })
+ beforeMount(){
+ this.$nextTick(() => {
+ this.init()
+ })
},
- methods: {
- saveMapStatus () {
- this.$store.commit('setMapObj', this.mapObj)
- this.$store.commit('setBasemapHelper', this.basemapHelper)
- this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
- this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper)
+ methods:{
+ saveMapStatus(){
+ this.$store.commit('setMapObj', this.mapObj);
+ this.$store.commit('setBasemapHelper', this.basemapHelper);
+ this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper);
+ this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper);
},
- init () {
- const mapcontainer = this.$refs.rootmap
- this.mapObj = Sgis.initMap(mapcontainer)
+ init() {
+ const mapcontainer = this.$refs.rootmap
+ this.mapObj = Sgis.initMap(mapcontainer)
- this.basemapHelper = Sgis.initBasemapsHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.mapConfig, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
+ this.basemapHelper = Sgis.initBasemapsHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
+ this.basemapHelper.initBasemap(this.mapConfig, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
- this.serviceLayerHelper = Sgis.initTileLayersHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
- this.serviceLayerHelper.initServiceLayers(this.mapConfig)
+ this.serviceLayerHelper = Sgis.initTileLayersHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
+ this.serviceLayerHelper.initServiceLayers(this.mapConfig)
- this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
- this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+ this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
+ this.vectorLayerHelper.initVectorLayers(this.mapConfig)
- this.saveMapStatus()
- // this.setMapObj(this.mapObj)
- // this.setBasemapHelper(this.basemapHelper)
- // this.setServiceLayerHelper(this.serviceLayerHelper)
- // this.setVectorLayerHelper(this.vectorLayerHelper)
- }
+
+ this.saveMapStatus()
+ // this.setMapObj(this.mapObj)
+ // this.setBasemapHelper(this.basemapHelper)
+ // this.setServiceLayerHelper(this.serviceLayerHelper)
+ // this.setVectorLayerHelper(this.vectorLayerHelper)
+ }
}
}
</script>
<style lang="less">
-.full-screen {
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- position: absolute;
-
- #map {
+.full-screen{
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ #map{
height: 100%;
width: 100%;
}
-
- .bar-line {
+ .barline{
width: 100%;
height: 1px;
background-color: #0661AE;
--
Gitblit v1.8.0