Commit 98cf0c78 authored by liangjingpeng's avatar liangjingpeng

父组件修改

parent f6cbcf54
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- 高德api key-->
<script src="https://webapi.amap.com/loader.js"></script>
<!-- <script type="text/javascript" src="http://49.232.167.247:20016/web-apps/apps/api/documents/api.js"></script> --> <!-- <script type="text/javascript" src="http://49.232.167.247:20016/web-apps/apps/api/documents/api.js"></script> -->
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">--> <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
<title>融创软通</title> <title>融创软通</title>
......
<template> <template>
<div id="container" class="map-container"></div> <div id="container" class="map-container" />
</template> </template>
<script> <script>
...@@ -9,40 +9,40 @@ export default { ...@@ -9,40 +9,40 @@ export default {
data() { data() {
return { return {
map: null, map: null,
marker: null, marker: null
}; }
}, },
mounted() { mounted() {
this.initMap(); this.initMap()
}, },
methods: { methods: {
initMap() { initMap() {
window._AMapSecurityConfig = { window._AMapSecurityConfig = {
securityJsCode: "9236cc9d8ca5060f5cd017efe2ca1a3a", securityJsCode: '9236cc9d8ca5060f5cd017efe2ca1a3a'
}; }
AMapLoader.load({ AMapLoader.load({
key: "1e37d7eb9484c25acf469c3657775679", // 申请好的Web端开发者 Key,调用 load 时必填 key: '1e37d7eb9484c25acf469c3657775679', // 申请好的Web端开发者 Key,调用 load 时必填
version: "2.0", // 指定要加载的 JS API 的版本,缺省时默认为 1.4.15 version: '2.0' // 指定要加载的 JS API 的版本,缺省时默认为 1.4.15
}) })
.then((AMap) => { .then((AMap) => {
this.map = new AMap.Map("container", { this.map = new AMap.Map('container', {
zoom: 17, zoom: 17,
center: [117.041262, 39.1066], center: [117.041262, 39.1066],
keyboardEnable:false, keyboardEnable: false,
doubleClickZoom: false, doubleClickZoom: false
}); })
this.marker = new AMap.Marker({ this.marker = new AMap.Marker({
position: [117.040249,39.107839], position: [117.040249, 39.107839],
title: "融创软通", title: '融创软通'
}) })
this.map.add(this.marker) this.map.add(this.marker)
}) })
.catch((e) => { .catch((e) => {
console.error(e); // 加载错误提示 console.error(e) // 加载错误提示
}); })
} }
}, }
}; }
</script> </script>
<style scoped> <style scoped>
......
...@@ -3,17 +3,17 @@ import Router from 'vue-router' ...@@ -3,17 +3,17 @@ import Router from 'vue-router'
import Framework from '@/components/Framework' import Framework from '@/components/Framework'
import Index from '@/components/Index' import Index from '@/components/Index'
Vue.use(Router) Vue.use(Router)
/*/!*export const constantRoutes = [ export const constantRoutes = [
{ {
path: '/', path: '/',
redirect: '/index', redirect: '/index',
hidden: true hidden: true
}, },
/!* { /* {
path: '/login', path: '/login',
component: (resolve) => require(['@/views/login/login.vue'], resolve), component: (resolve) => require(['@/views/login/login.vue'], resolve),
hidden: true hidden: true
},*!/ },*/
{ {
path: '/', path: '/',
component: Framework, component: Framework,
...@@ -51,94 +51,34 @@ Vue.use(Router) ...@@ -51,94 +51,34 @@ Vue.use(Router)
// 默认子路由(首页) // 默认子路由(首页)
] ]
} }
/!* { /* {
path: '/404', path: '/404',
component: () => import('@/views/404'), component: () => import('@/views/404'),
hidden: true hidden: true
}*!/ }*/
]*!/ ]
/!** /**
* 有权限的路由 * 有权限的路由
* 需要动态判断权限并通过 addRoutes 动态添加的页面。 * 需要动态判断权限并通过 addRoutes 动态添加的页面。
*!/ */
export const asyncRoutes = [ export const asyncRoutes = [
// 404 page must be placed at the end !!! // 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true } { path: '*', redirect: '/404', hidden: true }
] ]
/!*const createRouter = () => new Router({ const createRouter = () => new Router({
// mode: 'history', // require service support // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
})*!/ })
/!*const router = createRouter() const router = createRouter()
// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
export function resetRouter() { export function resetRouter() {
const newRouter = createRouter() const newRouter = createRouter()
router.matcher = newRouter.matcher // reset router router.matcher = newRouter.matcher // reset router
}*!/*/ }
export default new Router({
/* mode:'histroy',*/
routes: [
// {
// path: '/',
// name: 'frameworkIndex',
// component: frameworkIndex
// },
{
path: '/',
component: Framework,
children: [
// 重定向到默认子路由 (首页)
{
path: '',
redirect: 'index' // 访问 '/' 时重定向到 '/index'
},
// 默认子路由(首页)
{
path: 'index',
name: 'Index',
component: Index
},
// 业务服务
{
path: 'businessServices',
name: 'BusinessServices',
component: () => import('@/components/BusinessServices') // 懒加载 BusinessServices 组件
},
// 产教融合
{
path: 'edutainment',
name: 'Edutainment',
component: () => import('@/components/Edutainment') // 懒加载 Edutainment 组件
},
// 加入我们
{
path: 'joinUs',
name: 'JoinUs',
component: () => import('@/components/JoinUs') // 懒加载 JoinUs 组件
},
// 关于我们 export default router
{
path: "About",
name: "About",
component: () => import('@/components/About') // 懒加载 About 组件
}
]
}
],
scrollBehavior(to, from, savedPosition) {
// 如果是返回上次保存的滚动位置,直接返回
if (savedPosition) {
return savedPosition;
} else {
// 否则始终滚动到页面顶部
return { x: 0, y: 0 };
}
}
})
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
@import "./utils.scss"; @import "./utils.scss";
@import './btn.scss'; @import './btn.scss';
body { body {
height: 100%;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment