'20191213'

unknown
Showing 12 changed files with 189 additions and 27 deletions
package-lock.json
package.json
public/index.html
src/App.vue
src/components/viewer_changeview.vue
src/components/viewer_ms3m.vue
src/components/viewer_s3m_single_box.vue
src/components/viewer_s3mbhyp.vue
src/components/viewer_split.vue
src/components/viewer_underground.vue
src/main.js
src/router/index.js
--- a/package-lock.json
View file @1674b3d
+++ b/package-lock.json
View file @1674b3d
--- a/package.json
View file @1674b3d
+++ b/package.json
View file @1674b3d
@@ -9,6 +9,7 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
+    "ant-design-vue": "^1.4.10",
    "core-js": "^3.4.3",
    "vue": "^2.6.10",
    "vue-router": "^3.1.3"
--- a/public/index.html
View file @1674b3d
+++ b/public/index.html
View file @1674b3d
@@ -2,7 +2,7 @@
 * @Author: jiangbotao
 * @Date: 2019-12-03 22:31:08
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 17:35:42
+ * @LastEditTime: 2019-12-14 00:41:13
 * @FilePath: \superglobevue\public\index.html
 -->
 <!DOCTYPE html>
@@ -30,11 +30,11 @@
 			}
 		</style>
  </head>
-  <body>
+  <body style="padding: 0px; margin: 0px; overflow: hidden;">
    <noscript>
      <strong>We're sorry but superglobevue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>
    <div id="app"></div>
    <!-- built files will be auto injected -->
-  </body>
+  </body s>
 </html>
--- a/src/App.vue
View file @1674b3d
+++ b/src/App.vue
View file @1674b3d
@@ -2,25 +2,100 @@
 * @Author: jiangbotao
 * @Date: 2019-12-03 22:31:08
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 10:16:09
+ * @LastEditTime: 2019-12-14 00:35:28
 * @FilePath: \superglobevue\src\App.vue
 -->
 <template>
-  <div id="app">
+<a-layout id="components-layout-demo-top-side-2">
+    <a-layout-header class="header">
+      <a-icon type="compass" />&nbsp;&nbsp;温州项目VUE 3DMap示例(v10.0)
+      <a-menu
+        theme="dark"
+        mode="horizontal"
+        :defaultSelectedKeys="['2']"
+        :style="{ lineHeight: '64px' }"
+      >
+      </a-menu>
+    </a-layout-header>
+    <a-layout>
+      <a-layout-sider width="200" style="background: #fff">
+        <a-menu
+          mode="inline"
+          :defaultSelectedKeys="['1']"
+          :defaultOpenKeys="['sub1']"
+          :style="{ height: '100%', borderRight: 0 }"
+        >
+          <a-sub-menu key="sub1">
+            <span slot="title"><a-icon type="user" />3D展示</span>
+            <a-menu-item key="1_1"><router-link :to="'/'">建筑物白模</router-link></a-menu-item>
+            <a-menu-item key="1_2"><router-link :to="'/tdt'">天地图</router-link></a-menu-item>
+            <a-menu-item key="1_3"><router-link :to="'/changeview'">固定视图</router-link></a-menu-item>
+            <a-menu-item key="1_4"><router-link :to="'/split'">多视图展示</router-link></a-menu-item>
+          </a-sub-menu>
+          <a-sub-menu key="sub2">
+            <span slot="title"><a-icon type="laptop" />倾斜摄影</span>
+            <a-menu-item key="2_1"><router-link :to="'/ms3m'">多模型图层</router-link></a-menu-item>
+            <a-menu-item key="2_2"><router-link :to="'/s3m'">倾斜摄影数据</router-link></a-menu-item>
+            <a-menu-item key="2_3"><router-link :to="'/s3m_single_box'">单体化查询1</router-link></a-menu-item>
+            <a-menu-item key="2_4"><router-link :to="'/s3m_single'">单体化查询2</router-link></a-menu-item>
+            <a-menu-item key="2_5"><router-link :to="'/hyp'">大场景图层淹没</router-link></a-menu-item>
+          </a-sub-menu>
+          <a-sub-menu key="sub3">
+            <span slot="title"><a-icon type="notification" />空间分析与查询</span>
+            <a-menu-item key="9"><router-link :to="'/fire'">火灾分析</router-link></a-menu-item>
+            <a-menu-item key="10"><router-link :to="'/underground'">地面开挖</router-link></a-menu-item>
+            <a-menu-item key="11"><router-link :to="'/ymo'">地形淹没分析</router-link></a-menu-item>
+            <a-menu-item key="12"><router-link :to="'/spatial1'">空间点查询</router-link></a-menu-item>
+            <a-menu-item key="13"><router-link :to="'/spatial2'">空间面查询</router-link></a-menu-item>
+          </a-sub-menu>
+        </a-menu>
+      </a-layout-sider>
+      <a-layout style="padding: 10px 10px 10px 10px">
+        <a-layout-content :style="{ background: '#fff', padding: '12px', margin: 0, minHeight: '500px' }">
+          <div id="app" style="position: relative; width:100%;">
            <router-view/>
          </div>
+        </a-layout-content>
+      </a-layout>
+    </a-layout>
+  </a-layout>
+  <!-- <div id="app">
+    <router-view/>
+  </div> -->
 </template>
-<style lang="scss">
+<script>
-body{
+export default {
-  padding: 0px;
+  name: 'App',
-  margin: 0px;
+  data() {
-}
+    return {
-#app {
+      collapsed: false,
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+    };
-  -webkit-font-smoothing: antialiased;
+  },
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
 }
+</script>
+<style lang="scss">
+  .ant-layout-header {
+    height: 64px;
+    padding: 0 50px;
+    line-height: 64px;
+    background: #0b5296;
+    color: white;
+    font-size: 30px;
+    border-bottom: 2px solid #bb5905;
+  }
+  .ant-layout {
+    height: 100%;
+  }
+  #components-layout-demo-top-side-2 .logo {
+    width: 120px;
+    height: 31px;
+    background: rgba(255, 255, 255, 0.2);
+    margin: 16px 28px 16px 0;
+    float: left;
+  }
+  #app{
+    height: 100%;
+  }
 </style>
--- a/src/components/viewer_changeview.vue
View file @1674b3d
+++ b/src/components/viewer_changeview.vue
View file @1674b3d
@@ -4,7 +4,7 @@
 * 当到一定尺度后开始可以改变视角
 * @Date: 2019-12-03 21:30:29
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-04 20:25:49
+ * @LastEditTime: 2019-12-13 19:59:16
 * @FilePath: \WebGL_Webpack_Vue\components\viewer6.vue
 -->
 <template>
--- a/src/components/viewer_ms3m.vue
View file @1674b3d
+++ b/src/components/viewer_ms3m.vue
View file @1674b3d
@@ -3,7 +3,7 @@
 * 添加倾斜摄影场景和倾斜摄影图层
 * @Date: 2019-12-02 09:05:50
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-12 14:02:01
+ * @LastEditTime: 2019-12-13 20:04:38
 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
 -->
 <template>
--- a/src/components/viewer_s3m_single_box.vue
View file @1674b3d
+++ b/src/components/viewer_s3m_single_box.vue
View file @1674b3d
@@ -6,7 +6,7 @@
 * 3、使用Popup来弹出倾斜摄影覆盖面的信息
 * @Date: 2019-12-03 22:52:56
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 10:39:05
+ * @LastEditTime: 2019-12-13 20:05:50
 * @FilePath: \superglobevue\src\components\viewer.vue
 -->
 <template>
--- a/src/components/viewer_s3mbhyp.vue
View file @1674b3d
+++ b/src/components/viewer_s3mbhyp.vue
View file @1674b3d
@@ -4,7 +4,7 @@
 * 使用场景中的HYP对象
 * @Date: 2019-12-02 09:05:50
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 13:52:58
+ * @LastEditTime: 2019-12-14 00:46:44
 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
 -->
 <template>
@@ -170,7 +170,7 @@ export default {
 	color: black;
 }
 #setingBar{
-	width:150px;
+	/* width:150px; */
 	height:110px;
 	background: rgba(42, 42, 42, 0.4);
 	padding: 8px;
--- a/src/components/viewer_split.vue
View file @1674b3d
+++ b/src/components/viewer_split.vue
View file @1674b3d
@@ -3,7 +3,7 @@
 * @Author: jiangbotao
 * @Date: 2019-12-03 22:52:56
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-10 11:01:35
+ * @LastEditTime: 2019-12-14 00:42:39
 * @FilePath: \superglobevue\src\components\viewer.vue
 -->
 <template>
@@ -156,6 +156,15 @@ export default {
 .sm-zoom {
 	top: 130px;
 }
+.param-container {
+    background-color: rgba(255, 255, 255, 0.75);
+    padding: 5px;
+    border: 1px solid #267eb7;
+    border-radius: 10px;
+    color: black;
+    border-radius: 5px;
+    padding: 2px;
+}
 label {
    display: inline-block;
    margin-right: 1rem;
--- a/src/components/viewer_underground.vue
View file @1674b3d
+++ b/src/components/viewer_underground.vue
View file @1674b3d
@@ -3,7 +3,7 @@
 * @Author: jiangbotao
 * @Date: 2019-12-07 14:24:01
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-09 11:46:57
+ * @LastEditTime: 2019-12-14 00:49:56
 * @FilePath: \superglobevue\src\components\viewer_3dmodel.vue
 -->
 <template>
@@ -31,7 +31,6 @@
 		</div>
 		<div id="toolbar" class="param-container tool-bar">
 			<div>
-				<label style="color:#FFFFFF ">图层开挖:</label>
 				<button id="excavation" >绘制挖掘面</button>
 				<button id="dig" >进行倾斜开挖</button>
 			</div>
@@ -175,4 +174,14 @@ export default {
 	background-color:#78c300;
 	border-color:#c5e591;
 }
+#dig {
+	color:rgb(255, 255, 255);
+	font-size:14px;padding-top:4px;padding-bottom:4px;padding-left:33px;padding-right:33px;
+	border-width:2px;border-color:rgb(74, 99, 31);border-style:solid;border-radius:11px;
+	background-color:rgb(44, 89, 128);}
+#dig:hover{
+	color:#ffffff;
+	background-color:#78c300;
+	border-color:#c5e591;
+}
 </style>
\ No newline at end of file
--- a/src/main.js
View file @1674b3d
+++ b/src/main.js
View file @1674b3d
@@ -2,14 +2,17 @@
 * @Author: jiangbotao
 * @Date: 2019-12-03 22:31:08
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-07 13:39:25
+ * @LastEditTime: 2019-12-13 19:57:31
 * @FilePath: \superglobevue\src\main.js
 */
 import Vue from 'vue'
+import Antd from 'ant-design-vue'
 import App from './App'
 import router from './router'
+import 'ant-design-vue/dist/antd.css'
 Vue.config.productionTip = false
+Vue.use(Antd)
 new Vue({
  router,
--- a/src/router/index.js
View file @1674b3d
+++ b/src/router/index.js
View file @1674b3d
@@ -2,7 +2,7 @@
 * @Author: jiangbotao
 * @Date: 2019-12-03 22:31:08
 * @LastEditors: jiangbotao
- * @LastEditTime: 2019-12-04 08:09:41
+ * @LastEditTime: 2019-12-13 20:08:15
 * @FilePath: \superglobevue\src\router\index.js
 */
 import Vue from 'vue';
@@ -14,7 +14,72 @@ const routes = [
    {
        path: "/",
        name: "home",
-        component: () => import("../views/Home.vue")
+        component: () => import("./../components/viewer_3dmodel.vue")
+    },
+    {
+        path: "/tdt",
+        name: "home",
+        component: () => import("./../components/viewer_tdt.vue")
+    },
+    {
+        path: "/changeview",
+        name: "home",
+        component: () => import("./../components/viewer_changeview.vue")
+    },
+    {
+        path: "/split",
+        name: "home",
+        component: () => import("./../components/viewer_split.vue")
+    },
+    {
+        path: "/fire",
+        name: "home",
+        component: () => import("./../components/viewer_fire.vue")
+    },
+    {
+        path: "/underground",
+        name: "home",
+        component: () => import("./../components/viewer_underground.vue")
+    },
+    {
+        path: "/ymo",
+        name: "home",
+        component: () => import("./../components/viewer_ymo.vue")
+    },
+    {
+        path: "/s3m",
+        name: "home",
+        component: () => import("./../components/viewer_s3m.vue")
+    },
+    {
+        path: "/ms3m",
+        name: "home",
+        component: () => import("./../components/viewer_ms3m.vue")
+    },
+    {
+        path: "/s3m_single_box",
+        name: "home",
+        component: () => import("./../components/viewer_s3m_single_box.vue")
+    },
+    {
+        path: "/s3m_single",
+        name: "home",
+        component: () => import("./../components/viewer_s3m_single.vue")
+    },
+    {
+        path: "/hyp",
+        name: "home",
+        component: () => import("./../components/viewer_s3mbhyp.vue")
+    },
+    {
+        path: "/spatial1",
+        name: "home",
+        component: () => import("./../components/viewer_spatialquery.vue")
+    },
+    {
+        path: "/spatial2",
+        name: "home",
+        component: () => import("./../components/viewer_spatialquery_tl.vue")
    }
 ];