6f1fc9b6 by unknown

'20191214'

1 parent 1674b3d9
...@@ -1774,9 +1774,9 @@ ...@@ -1774,9 +1774,9 @@
1774 "dev": true 1774 "dev": true
1775 }, 1775 },
1776 "serialize-javascript": { 1776 "serialize-javascript": {
1777 "version": "2.1.0", 1777 "version": "2.1.2",
1778 "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.0.tgz?cache=0&sync_timestamp=1567600506467&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.0.tgz", 1778 "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
1779 "integrity": "sha1-kxAnaBnv0OsSgli7NBlX9usvxXA=", 1779 "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
1780 "dev": true 1780 "dev": true
1781 }, 1781 },
1782 "slash": { 1782 "slash": {
...@@ -4170,9 +4170,9 @@ ...@@ -4170,9 +4170,9 @@
4170 } 4170 }
4171 }, 4171 },
4172 "serialize-javascript": { 4172 "serialize-javascript": {
4173 "version": "2.1.0", 4173 "version": "2.1.2",
4174 "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.0.tgz?cache=0&sync_timestamp=1567600506467&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.0.tgz", 4174 "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
4175 "integrity": "sha1-kxAnaBnv0OsSgli7NBlX9usvxXA=", 4175 "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
4176 "dev": true 4176 "dev": true
4177 }, 4177 },
4178 "slash": { 4178 "slash": {
...@@ -6326,6 +6326,11 @@ ...@@ -6326,6 +6326,11 @@
6326 } 6326 }
6327 } 6327 }
6328 }, 6328 },
6329 "font-awesome": {
6330 "version": "4.7.0",
6331 "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
6332 "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
6333 },
6329 "for-in": { 6334 "for-in": {
6330 "version": "1.0.2", 6335 "version": "1.0.2",
6331 "resolved": "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz", 6336 "resolved": "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz",
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 "dependencies": { 11 "dependencies": {
12 "ant-design-vue": "^1.4.10", 12 "ant-design-vue": "^1.4.10",
13 "core-js": "^3.4.3", 13 "core-js": "^3.4.3",
14 "font-awesome": "^4.7.0",
14 "vue": "^2.6.10", 15 "vue": "^2.6.10",
15 "vue-router": "^3.1.3" 16 "vue-router": "^3.1.3"
16 }, 17 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:08 3 * @Date: 2019-12-03 22:31:08
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-14 00:41:13 5 * @LastEditTime: 2019-12-14 12:23:24
6 * @FilePath: \superglobevue\public\index.html 6 * @FilePath: \superglobevue\public\index.html
7 --> 7 -->
8 <!DOCTYPE html> 8 <!DOCTYPE html>
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:08 3 * @Date: 2019-12-03 22:31:08
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-14 00:35:28 5 * @LastEditTime: 2019-12-14 12:28:02
6 * @FilePath: \superglobevue\src\App.vue 6 * @FilePath: \superglobevue\src\App.vue
7 --> 7 -->
8 <template> 8 <template>
9 <a-layout id="components-layout-demo-top-side-2"> 9 <a-layout id="components-layout-demo-top-side-2">
10 <a-layout-header class="header"> 10 <a-layout-header class="header" style="background-color:#3578b1; padding: 0px 25px;">
11 <a-icon type="compass" />&nbsp;&nbsp;温州项目VUE 3DMap示例(v10.0) 11 <span class="fa fa-globe fa-lg"></span>&nbsp;&nbsp;温州项目VUE 3DMap示例(v10.0)
12 <a-menu 12 <a-menu
13 theme="dark" 13 theme="dark"
14 mode="horizontal" 14 mode="horizontal"
...@@ -19,36 +19,7 @@ ...@@ -19,36 +19,7 @@
19 </a-layout-header> 19 </a-layout-header>
20 <a-layout> 20 <a-layout>
21 <a-layout-sider width="200" style="background: #fff"> 21 <a-layout-sider width="200" style="background: #fff">
22 <a-menu 22 <MyMenu></MyMenu>
23 mode="inline"
24 :defaultSelectedKeys="['1']"
25 :defaultOpenKeys="['sub1']"
26 :style="{ height: '100%', borderRight: 0 }"
27 >
28 <a-sub-menu key="sub1">
29 <span slot="title"><a-icon type="user" />3D展示</span>
30 <a-menu-item key="1_1"><router-link :to="'/'">建筑物白模</router-link></a-menu-item>
31 <a-menu-item key="1_2"><router-link :to="'/tdt'">天地图</router-link></a-menu-item>
32 <a-menu-item key="1_3"><router-link :to="'/changeview'">固定视图</router-link></a-menu-item>
33 <a-menu-item key="1_4"><router-link :to="'/split'">多视图展示</router-link></a-menu-item>
34 </a-sub-menu>
35 <a-sub-menu key="sub2">
36 <span slot="title"><a-icon type="laptop" />倾斜摄影</span>
37 <a-menu-item key="2_1"><router-link :to="'/ms3m'">多模型图层</router-link></a-menu-item>
38 <a-menu-item key="2_2"><router-link :to="'/s3m'">倾斜摄影数据</router-link></a-menu-item>
39 <a-menu-item key="2_3"><router-link :to="'/s3m_single_box'">单体化查询1</router-link></a-menu-item>
40 <a-menu-item key="2_4"><router-link :to="'/s3m_single'">单体化查询2</router-link></a-menu-item>
41 <a-menu-item key="2_5"><router-link :to="'/hyp'">大场景图层淹没</router-link></a-menu-item>
42 </a-sub-menu>
43 <a-sub-menu key="sub3">
44 <span slot="title"><a-icon type="notification" />空间分析与查询</span>
45 <a-menu-item key="9"><router-link :to="'/fire'">火灾分析</router-link></a-menu-item>
46 <a-menu-item key="10"><router-link :to="'/underground'">地面开挖</router-link></a-menu-item>
47 <a-menu-item key="11"><router-link :to="'/ymo'">地形淹没分析</router-link></a-menu-item>
48 <a-menu-item key="12"><router-link :to="'/spatial1'">空间点查询</router-link></a-menu-item>
49 <a-menu-item key="13"><router-link :to="'/spatial2'">空间面查询</router-link></a-menu-item>
50 </a-sub-menu>
51 </a-menu>
52 </a-layout-sider> 23 </a-layout-sider>
53 <a-layout style="padding: 10px 10px 10px 10px"> 24 <a-layout style="padding: 10px 10px 10px 10px">
54 <a-layout-content :style="{ background: '#fff', padding: '12px', margin: 0, minHeight: '500px' }"> 25 <a-layout-content :style="{ background: '#fff', padding: '12px', margin: 0, minHeight: '500px' }">
...@@ -59,12 +30,11 @@ ...@@ -59,12 +30,11 @@
59 </a-layout> 30 </a-layout>
60 </a-layout> 31 </a-layout>
61 </a-layout> 32 </a-layout>
62 <!-- <div id="app">
63 <router-view/>
64 </div> -->
65 </template> 33 </template>
66 34
67 <script> 35 <script>
36 import MyMenu from './components/menu/MyMenu';
37
68 export default { 38 export default {
69 name: 'App', 39 name: 'App',
70 data() { 40 data() {
...@@ -72,17 +42,20 @@ export default { ...@@ -72,17 +42,20 @@ export default {
72 collapsed: false, 42 collapsed: false,
73 }; 43 };
74 }, 44 },
45 components:{
46 MyMenu
47 }
75 } 48 }
76 </script> 49 </script>
77 50
78 <style lang="scss"> 51 <style lang="scss">
79 .ant-layout-header { 52 .ant-layout-header {
80 height: 64px; 53 height: 64px;
81 padding: 0 50px; 54 padding: 0 25px;
82 line-height: 64px; 55 line-height: 64px;
83 background: #0b5296; 56 background: #0b5296;
84 color: white; 57 color: white;
85 font-size: 30px; 58 font-size: 26px;
86 border-bottom: 2px solid #bb5905; 59 border-bottom: 2px solid #bb5905;
87 } 60 }
88 .ant-layout { 61 .ant-layout {
......
1 <!--
2 * @Author: jiangbotao
3 * @Date: 2019-12-14 12:19:33
4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-14 12:25:10
6 * @FilePath: \superglobevue\src\components\menu\MyMenu.vue
7 -->
8 <template>
9 <a-menu
10 mode="inline"
11 :defaultSelectedKeys="['1']"
12 :defaultOpenKeys="['sub1']"
13 :style="{ height: '100%', borderRight: 0 }">
14 <a-sub-menu key="sub1">
15 <span slot="title"><a-icon type="user" />3D展示</span>
16 <a-menu-item key="1_1"><router-link :to="'/'">建筑物白模</router-link></a-menu-item>
17 <a-menu-item key="1_2"><router-link :to="'/tdt'">天地图</router-link></a-menu-item>
18 <a-menu-item key="1_3"><router-link :to="'/changeview'">固定视图</router-link></a-menu-item>
19 <a-menu-item key="1_4"><router-link :to="'/split'">多视图展示</router-link></a-menu-item>
20 </a-sub-menu>
21 <a-sub-menu key="sub2">
22 <span slot="title"><a-icon type="laptop" />倾斜摄影</span>
23 <a-menu-item key="2_1"><router-link :to="'/ms3m'">多模型图层</router-link></a-menu-item>
24 <a-menu-item key="2_2"><router-link :to="'/s3m'">倾斜摄影数据</router-link></a-menu-item>
25 <a-menu-item key="2_3"><router-link :to="'/s3m_single_box'">单体化查询1</router-link></a-menu-item>
26 <a-menu-item key="2_4"><router-link :to="'/s3m_single'">单体化查询2</router-link></a-menu-item>
27 <a-menu-item key="2_5"><router-link :to="'/hyp'">大场景图层淹没</router-link></a-menu-item>
28 </a-sub-menu>
29 <a-sub-menu key="sub3">
30 <span slot="title"><a-icon type="notification" />空间分析与查询</span>
31 <a-menu-item key="9"><router-link :to="'/fire'">火灾分析</router-link></a-menu-item>
32 <a-menu-item key="10"><router-link :to="'/underground'">地面开挖</router-link></a-menu-item>
33 <a-menu-item key="11"><router-link :to="'/ymo'">地形淹没分析</router-link></a-menu-item>
34 <a-menu-item key="12"><router-link :to="'/spatial1'">空间点查询</router-link></a-menu-item>
35 <a-menu-item key="13"><router-link :to="'/spatial2'">空间面查询</router-link></a-menu-item>
36 </a-sub-menu>
37 </a-menu>
38 </template>
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 * @Author: jiangbotao 3 * @Author: jiangbotao
4 * @Date: 2019-12-03 22:52:56 4 * @Date: 2019-12-03 22:52:56
5 * @LastEditors: jiangbotao 5 * @LastEditors: jiangbotao
6 * @LastEditTime: 2019-12-14 00:42:39 6 * @LastEditTime: 2019-12-14 12:17:11
7 * @FilePath: \superglobevue\src\components\viewer.vue 7 * @FilePath: \superglobevue\src\components\viewer.vue
8 --> 8 -->
9 <template> 9 <template>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:08 3 * @Date: 2019-12-03 22:31:08
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-13 19:57:31 5 * @LastEditTime: 2019-12-14 12:28:56
6 * @FilePath: \superglobevue\src\main.js 6 * @FilePath: \superglobevue\src\main.js
7 */ 7 */
8 import Vue from 'vue' 8 import Vue from 'vue'
...@@ -10,6 +10,7 @@ import Antd from 'ant-design-vue' ...@@ -10,6 +10,7 @@ import Antd from 'ant-design-vue'
10 import App from './App' 10 import App from './App'
11 import router from './router' 11 import router from './router'
12 import 'ant-design-vue/dist/antd.css' 12 import 'ant-design-vue/dist/antd.css'
13 import 'font-awesome/css/font-awesome.css'
13 14
14 Vue.config.productionTip = false 15 Vue.config.productionTip = false
15 Vue.use(Antd) 16 Vue.use(Antd)
......