From 7cc388b27687343c0aa237cfdabf638d83dc2a5d Mon Sep 17 00:00:00 2001
From: wangrui <zephyrs0894@163.com>
Date: 星期六, 19 十二月 2020 01:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://www.xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
.idea/inspectionProfiles/Project_Default.xml | 6 +
src/router/routes.js | 37 ++++++
src/views/baseInfoMgr/pipeline/Index.vue | 55 +++++++++
src/views/baseInfoMgr/pipeline/PipeLineList.vue | 136 ++++++++++++++++++++++
.idea/.gitignore | 5
src/App2.vue | 36 ++++++
src/router/index.js | 15 ++
.idea/misc.xml | 6 +
.idea/vcs.xml | 6 +
.idea/modules.xml | 8 +
src/main.js | 4
.idea/SewerAndRainNetwork.iml | 12 ++
src/App.vue | 21 ---
13 files changed, 325 insertions(+), 22 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..b58b603
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/SewerAndRainNetwork.iml b/.idea/SewerAndRainNetwork.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/SewerAndRainNetwork.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+ <excludeFolder url="file://$MODULE_DIR$/temp" />
+ <excludeFolder url="file://$MODULE_DIR$/tmp" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+ <profile version="1.0">
+ <option name="myName" value="Project Default" />
+ <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+ </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="JavaScriptSettings">
+ <option name="languageLevel" value="ES6" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..894e756
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/SewerAndRainNetwork.iml" filepath="$PROJECT_DIR$/.idea/SewerAndRainNetwork.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 010714e..421bf83 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,17 @@
<template>
<div id="app" ref="app">
- <map-template></map-template>
+ <router-view/>
</div>
</template>
<script>
-import MapTemplate from './views/MapTemplate.vue'
export default {
name: 'App',
- components: {MapTemplate},
mounted(){
- this.$nextTick(()=>{
- let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //娴忚鍣ㄩ珮搴�
- let topH = this.$refs.app.offsetHeight;
- console.log(h)
- this.height = (h - topH) + "px"
- })
}
}
</script>
<style>
-html,body,#app {
- font-family: Avenir, Helvetica, Arial, sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- text-align: center;
- color: #2c3e50;
- padding: 0px;
- margin: 0px;
-
- text-align: left;
-}
</style>
diff --git a/src/App2.vue b/src/App2.vue
new file mode 100644
index 0000000..010714e
--- /dev/null
+++ b/src/App2.vue
@@ -0,0 +1,36 @@
+<template>
+ <div id="app" ref="app">
+ <map-template></map-template>
+ </div>
+</template>
+
+<script>
+import MapTemplate from './views/MapTemplate.vue'
+
+export default {
+ name: 'App',
+ components: {MapTemplate},
+ mounted(){
+ this.$nextTick(()=>{
+ let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //娴忚鍣ㄩ珮搴�
+ let topH = this.$refs.app.offsetHeight;
+ console.log(h)
+ this.height = (h - topH) + "px"
+ })
+ }
+}
+</script>
+
+<style>
+html,body,#app {
+ font-family: Avenir, Helvetica, Arial, sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-align: center;
+ color: #2c3e50;
+ padding: 0px;
+ margin: 0px;
+
+ text-align: left;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 9884502..96479c7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import App from './App.vue'
-// import router from './router'
+import router from './router'
import store from './store'
// import registerDirectives from './directive'
import echarts from 'echarts'
@@ -23,7 +23,7 @@
}
window.vm = new Vue({
- // router,
+ router,
store,
render: h => h(App),
}).$mount('#app')
diff --git a/src/router/index.js b/src/router/index.js
new file mode 100644
index 0000000..7477bf9
--- /dev/null
+++ b/src/router/index.js
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+import { routes } from './routes'
+import 'nprogress/nprogress.css'
+const appConfig = require('@/app.config')
+const { routeMode } = appConfig
+
+Vue.use(Router)
+const router = new Router({
+ base: appConfig.projectName,
+ mode: routeMode || 'hash',
+ routes: routes
+})
+
+export default router
diff --git a/src/router/routes.js b/src/router/routes.js
new file mode 100644
index 0000000..76a1402
--- /dev/null
+++ b/src/router/routes.js
@@ -0,0 +1,37 @@
+/**
+ * meta鍙厤缃殑鍙傛暟:
+ * meta: {
+ * title: { String } 鏄剧ず鍦ㄤ晶杈规爮銆侀潰鍖呭睉鍜屾爣绛炬爮鐨勬枃瀛�
+ * hideBread: (false) 璁句负true鍚庢绾ц矾鐢卞皢涓嶄細鍑虹幇鍦ㄩ潰鍖呭睉涓�
+ * hideMenu: (false) 璁句负true鍚庡湪宸︿晶鑿滃崟涓嶄細鏄剧ず璇ラ〉闈㈤�夐」
+ * notCache: (false) 璁句负true鍚庨〉闈㈠湪鍒囨崲鏍囩鍚庝笉浼氱紦瀛橈紝濡傛灉闇�瑕佺紦瀛橈紝鏃犻渶璁剧疆杩欎釜瀛楁锛岃�屼笖闇�瑕佽缃〉闈㈢粍浠秐ame灞炴�у拰璺敱閰嶇疆鐨刵ame涓�鑷�
+ * access: (null) 鍙闂椤甸潰鐨勬潈闄愭暟缁勶紝褰撳墠璺敱璁剧疆鐨勬潈闄愪細褰卞搷瀛愯矾鐢�
+ * }
+ */
+// 榛樿璺宠浆璺敱
+import App from "../App";
+import Index from "../views/baseInfoMgr/pipeline/Index";
+import MapTemplate from "../views/MapTemplate";
+
+// 搴旂敤涓氬姟鐩稿叧璺敱锛屾寕杞絤enu涓婄殑page
+export const routes = [{
+ path: '/',
+ name: 'Main',
+ component: App,
+ redirect: '/home',
+ children: [{
+ path: 'home',
+ name: 'Home',
+ meta: {
+ title: '棣栭〉'
+ },
+ component: MapTemplate
+ }, {
+ path: 'baseInfoMgr/pipeLine',
+ name: 'baseInfoMgr',
+ component: Index,
+ meta: {
+ title: '鍩虹鏁版嵁缁存姢'
+ }
+ }]
+}]
diff --git a/src/views/baseInfoMgr/pipeline/Index.vue b/src/views/baseInfoMgr/pipeline/Index.vue
new file mode 100644
index 0000000..049695d
--- /dev/null
+++ b/src/views/baseInfoMgr/pipeline/Index.vue
@@ -0,0 +1,55 @@
+<template>
+ <div class="full-screen">
+ <div id="map" ref="rootmap"></div>
+ <pipe-line-list></pipe-line-list>
+ </div>
+</template>
+
+<script>
+ import 'leaflet/dist/leaflet.css'
+ import Sgis from '@src/Sgis'
+ import PipeLineList from "./PipeLineList";
+ import {mapMutations} from 'vuex'
+
+ export default {
+ name: 'MapTemplate',
+ components: {PipeLineList},
+ mounted() {
+ this.$nextTick(() => {
+ this.init()
+ })
+ },
+ methods: {
+ ...mapMutations({
+ setMapObj: 'setMapObj',
+ setLayerHelper: 'setLayerHelper'
+ }),
+ init() {
+ const mapcontainer = this.$refs.rootmap
+ this.mapObj = Sgis.initMap(mapcontainer)
+ this.basemapHelper = Sgis.initBasemaps(this.mapObj.map, this.mapObj.L) // 鍒濆鍖栧簳鍥�
+ this.vectorLayerHelper = Sgis.initLayers(this.mapObj.map, this.mapObj.L, {}, this.$nodeEnv) // 鍒濆鍖栦笟鍔″浘灞�
+ this.setLayerHelper(this.vectorLayerHelper)
+ return this.map
+ },
+ setLayerHelper() {
+
+ }
+ }
+ }
+</script>
+
+<style lang="less">
+ .full-screen {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+
+ #map {
+ height: 100%;
+ width: 100%;
+ }
+ }
+</style>>
diff --git a/src/views/baseInfoMgr/pipeline/PipeLineList.vue b/src/views/baseInfoMgr/pipeline/PipeLineList.vue
new file mode 100644
index 0000000..59606ce
--- /dev/null
+++ b/src/views/baseInfoMgr/pipeline/PipeLineList.vue
@@ -0,0 +1,136 @@
+<template>
+ <div class="pipe-line-table">
+ <div class="table-header">
+ <div class="title">绠℃鍒楄〃淇℃伅</div>
+ <div class="form">
+ <el-form :inline="true" class="demo-form-inline">
+ <el-form-item label="绠＄嚎鐐规煡璇�:">
+ <el-input placeholder="瀹℃壒浜�" size="mini"></el-input>
+ </el-form-item>
+ <el-form-item label="杩愯鐘舵��:">
+ <el-select size="mini">
+ <el-option label="缂栬緫" value="shanghai"></el-option>
+ <el-option label="鎻愪氦" value="beijing"></el-option>
+ <el-option label="淇濆瓨" value="beijing"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini">鏌ヨ</el-button>
+ <el-button type="primary" size="mini">瀵煎叆绠℃灞炴�ц〃</el-button>
+ <el-button type="primary" size="mini">鍥惧舰鏄剧ず</el-button>
+ <el-button type="primary" size="mini">瀵煎嚭淇℃伅</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ <div class="table-list">
+ <el-table
+ :data="tableData"
+ style="width: 100%;height: 300px"
+ :default-sort="{prop: 'date', order: 'descending'}"
+ >
+ <el-table-column
+ prop="date"
+ label="搴忓彿"
+ sortable
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="缁存姢涓庢搷浣�"
+ sortable
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="绠℃缂栫爜">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鎵�灞炵绾垮悕绉�">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="绠″緞(mm)">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏉愯川">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="绠￠亾鍘嬪姏(Mpa)">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="娴佸悜">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="绠℃矡绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍩嬫病鏂瑰紡">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍩嬫病鏃堕棿">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鎺㈡祴鏃堕棿">
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+ import 'leaflet/dist/leaflet.css'
+
+ export default {
+ name: 'PipeLineList',
+ datas: {},
+ mounted() {
+ this.$nextTick(() => {
+ this.init()
+ })
+ },
+ methods: {}
+ }
+</script>
+
+<style lang="less">
+ .pipe-line-table {
+ z-index: 999;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+
+ .el-form--inline .el-form-item__content {
+ vertical-align: middle;
+ }
+
+ .table-header {
+ background-color: #D7D7D7;
+ width: 100%;
+ height: 40px;
+ line-height: 40px;
+
+ .title {
+ float: left;
+ width: 200px;
+ }
+
+ .form {
+ margin-left: 200px;
+ min-height: 330px;
+ }
+ }
+
+ .table-list {
+ height: 300px;
+ }
+ }
+</style>>
--
Gitblit v1.8.0