diff --git a/package-lock.json b/package-lock.json index fced032..98cfe66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2278,6 +2278,11 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "bootstrap": { + "version": "3.3.7", + "resolved": "http://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + }, "brace-expansion": { "version": "1.1.11", "resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index dbb3e03..93a6ae9 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "bootstrap": "^3.3.7", "es6-promise": "^4.2.5", "vue": "^2.5.17", "vue-awesome-swiper": "^3.1.3", diff --git a/src/assets/css/content_pages.css b/src/assets/css/content_pages.css index ee46c57..a1da9d2 100644 --- a/src/assets/css/content_pages.css +++ b/src/assets/css/content_pages.css @@ -6,7 +6,8 @@ vertical-align: top; margin: 0 auto 0 auto; padding-top: 7em; - min-height: 100vh; + height: 100vh; + } /* CONTENT TABLES */ @@ -19,10 +20,10 @@ } .contentTableRight { - width: 50%; + width: 75%; padding-top: 3.5em; padding-left: 4.0em; - padding-right: 12em; + padding-right: 4.0em; vertical-align: top; } diff --git a/src/components/icontent.vue b/src/components/icontent.vue index c00a1de..4a19a25 100644 --- a/src/components/icontent.vue +++ b/src/components/icontent.vue @@ -1,6 +1,6 @@ @@ -16,4 +16,8 @@ export default { diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue index b3d5cff..74f80d1 100644 --- a/src/components/leftMenu.vue +++ b/src/components/leftMenu.vue @@ -56,4 +56,8 @@ export default { diff --git a/src/main.js b/src/main.js index 0ccfb34..007a00b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,4 @@ + import './assets/css/cookieconsent.min.css' import './assets/css/common.css' import 'swiper/dist/css/swiper.css' diff --git a/src/router.js b/src/router.js index 276fa99..fc965b4 100644 --- a/src/router.js +++ b/src/router.js @@ -3,14 +3,16 @@ import Router from "vue-router" import index from './views/index' +import aboutUs from './views/aboutUs/aboutUs' import cooperateWithUs from './views/aboutUs/cooperateWithUs' import propystTechnology from './views/aboutUs/propystTechnology' +import fulEdge from './views/fulEdge/fulEdge' import mobileSolution from './views/fulEdge/mobileSolution' import other from './views/fulEdge/other' - +import ourPlan from './views/ourPlan/ourPlan' import estateManagement from './views/ourPlan/estateManagement' import facilityManagement from './views/ourPlan/facilityManagement' import iot from './views/ourPlan/iot' @@ -23,6 +25,7 @@ import technologyIntegration from './views/ourPlan/technologyIntegration' Vue.use(Router); export default new Router({ + mode: 'history', base: process.env.BASE_URL, routes: [ { @@ -39,8 +42,9 @@ export default new Router({ }, { path: '/aboutUs', - component: cooperateWithUs, + component: aboutUs, children: [ + { path:'/',component:cooperateWithUs, }, { path: 'cooperateWithUs', component: cooperateWithUs }, { path: 'propystTechnology', component: propystTechnology }, @@ -48,8 +52,9 @@ export default new Router({ }, { path: '/fulEdge', - component: mobileSolution, + component: fulEdge, children: [ + { path:'/',component:mobileSolution, }, { path: 'mobileSolution', component: mobileSolution }, { path: 'other', component: other }, @@ -57,8 +62,9 @@ export default new Router({ }, { path: '/ourPlan', - component: estateManagement, + component: ourPlan, children: [ + { path:'/',component:estateManagement, }, { path: 'estateManagement', component: estateManagement }, { path: 'facilityManagement', component: facilityManagement }, { path: 'iot', component: iot }, diff --git a/src/views/infoDtl.vue b/src/views/aboutUs/aboutUs.vue similarity index 79% rename from src/views/infoDtl.vue rename to src/views/aboutUs/aboutUs.vue index 25db7b1..b59445c 100644 --- a/src/views/infoDtl.vue +++ b/src/views/aboutUs/aboutUs.vue @@ -5,7 +5,9 @@
- + + +
diff --git a/src/views/aboutUs/cooperateWithUs.vue b/src/views/aboutUs/cooperateWithUs.vue index 1c9d81e..5039578 100644 --- a/src/views/aboutUs/cooperateWithUs.vue +++ b/src/views/aboutUs/cooperateWithUs.vue @@ -1,18 +1,35 @@ @@ -21,15 +38,48 @@ export default { data() { return { - msg: "Welcome to Your Vue.js App" + }; }, mounted: function() { - console.log("mounted"); + } }; diff --git a/src/views/aboutUs/propystTechnology.vue b/src/views/aboutUs/propystTechnology.vue index 25db7b1..8d6f218 100644 --- a/src/views/aboutUs/propystTechnology.vue +++ b/src/views/aboutUs/propystTechnology.vue @@ -1,28 +1,22 @@ diff --git a/src/views/fulEdge/fulEdge.vue b/src/views/fulEdge/fulEdge.vue new file mode 100644 index 0000000..cb86b2c --- /dev/null +++ b/src/views/fulEdge/fulEdge.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/views/fulEdge/mobileSolution.vue b/src/views/fulEdge/mobileSolution.vue index 25db7b1..ba9b53d 100644 --- a/src/views/fulEdge/mobileSolution.vue +++ b/src/views/fulEdge/mobileSolution.vue @@ -1,14 +1,6 @@ @@ -18,7 +10,7 @@ export default { data() { return { - msg: "Welcome to Your Vue.js App" + }; } }; diff --git a/src/views/fulEdge/other.vue b/src/views/fulEdge/other.vue index 25db7b1..0ec065c 100644 --- a/src/views/fulEdge/other.vue +++ b/src/views/fulEdge/other.vue @@ -1,14 +1,6 @@ @@ -18,7 +10,7 @@ export default { data() { return { - msg: "Welcome to Your Vue.js App" + }; } }; diff --git a/src/views/ourPlan/estateManagement.vue b/src/views/ourPlan/estateManagement.vue index 25db7b1..8dd1728 100644 --- a/src/views/ourPlan/estateManagement.vue +++ b/src/views/ourPlan/estateManagement.vue @@ -1,14 +1,6 @@ diff --git a/src/views/ourPlan/facilityManagement.vue b/src/views/ourPlan/facilityManagement.vue index 25db7b1..d40a41a 100644 --- a/src/views/ourPlan/facilityManagement.vue +++ b/src/views/ourPlan/facilityManagement.vue @@ -1,14 +1,6 @@ diff --git a/src/views/ourPlan/iot.vue b/src/views/ourPlan/iot.vue index 25db7b1..926bed8 100644 --- a/src/views/ourPlan/iot.vue +++ b/src/views/ourPlan/iot.vue @@ -1,25 +1,19 @@ diff --git a/src/views/ourPlan/ourPlan.vue b/src/views/ourPlan/ourPlan.vue new file mode 100644 index 0000000..b59445c --- /dev/null +++ b/src/views/ourPlan/ourPlan.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/views/ourPlan/reaEstate.vue b/src/views/ourPlan/reaEstate.vue index f966a65..abf8a72 100644 --- a/src/views/ourPlan/reaEstate.vue +++ b/src/views/ourPlan/reaEstate.vue @@ -1,14 +1,6 @@ diff --git a/src/views/ourPlan/technologyIntegration.vue b/src/views/ourPlan/technologyIntegration.vue index b101272..c042d19 100644 --- a/src/views/ourPlan/technologyIntegration.vue +++ b/src/views/ourPlan/technologyIntegration.vue @@ -1,14 +1,6 @@