新增其他相关页面

README.md

@@ -9,15 +9,14 @@
 
 #### 安装教程
 
-1. xxxx
+1. npm install   安装依赖项
-2. xxxx
+2
-3. xxxx
 
 #### 使用说明
 
-1. xxxx
+
-2. xxxx
+2. npm run serve  运行项目
-3. xxxx
+3. npm run build  编译项目
 
 #### 参与贡献
 

package-lock.json

@@ -4106,6 +4106,11 @@
         "is-symbol": "^1.0.1"
       }
     },
+    "es6-promise": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
+      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz",
@@ -12149,6 +12154,11 @@
       "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=",
       "dev": true
     },
+    "vuex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
+      "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
+    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz",

package.json

@@ -8,10 +8,12 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "es6-promise": "^4.2.5",
     "vue": "^2.5.17",
     "vue-awesome-swiper": "^3.1.3",
     "vue-router": "^3.0.1",
-    "vue-swiper": "^0.5.0"
+    "vue-swiper": "^0.5.0",
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.0.3",

src/assets/static/config.js

@@ -6,39 +6,39 @@ window.config = {
         },
         {
             name: "我们的方案",
-            url: "/solution",
+            url: "/facilityManagement",
             child: [{
                     name: "设施管理",
-                    url: "/solution",
+                    url: "/facilityManagement",
                 },
                 {
                     name: "房地产",
-                    url: "/solution",
+                    url: "/reaEstate",
                 },
                 {
                     name: "物业管理",
-                    url: "/solution",
+                    url: "/estateManagement",
                 },
                 {
                     name: "系统智能建筑和物联网（iot）",
-                    url: "/solution",
+                    url: "/iot",
                 },
                 {
                     name: "技术和集成",
-                    url: "/solution",
+                    url: "/technologyIntegration",
                 },
             ]
         },
         {
             name: "前沿",
-            url: "/cuttingEdge",
+            url: "/mobileSolution",
             child: [{
                     name: "移动解决方案",
-                    url: "/cuttingEdge",
+                    url: "/mobileSolution",
                 },
                 {
                     name: "其他",
-                    url: "/cuttingEdge",
+                    url: "/other",
                 }
             ]
         },
@@ -47,11 +47,11 @@ window.config = {
             url: "/aboutUs",
             child: [{
                     name: "与我们合作",
-                    url: "/aboutUs",
+                    url: "/acooperateWithUs",
                 },
                 {
                     name: "丙维科技",
-                    url: "/aboutUs",
+                    url: "/PropystTechnology",
                 },
             ]
         },

src/component.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import i_head from './components/i_head.vue'
 import i_footer from './components/i_footer.vue'
+import i_content from './components/i_content.vue'
+import leftMenu from './components/leftMenu.vue'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 
 class Component {
@@ -8,6 +10,8 @@ class Component {
     register() {
         Vue.component("i_head", i_head);
         Vue.component("i_footer", i_footer);
+        Vue.component("i_content", i_content);
+        Vue.component("leftMenu", leftMenu);
         Vue.component("swiper", swiper);
         Vue.component("swiperSlide", swiperSlide);
         

src/components/leftMenu.vue

@@ -1,14 +1,74 @@
 <template>
-  <div>
 
 
-  </div>
+    <div class="contentTableLeft" id="navSidebar"> 
+      
+      <div id="navAccordion" class="accordion" style="opacity: 1;">
+		
+		<div class="h1"><font style="vertical-align: inherit;"><font style="vertical-align: inherit;">	移动解决方案</font></font></div>
+
+		<ul class="content">
+
+			<li class="category">
+
+				<a href="mobila-losningar.php" class="categoryHead h2 linkProduct strong active">
+					<div class="triangle rotateRight expanded"></div><font style="vertical-align: inherit;"><font style="vertical-align: inherit;">
+				</font></font></a>
+				<div class="mobileContent" style="display: none;">
+					<h1 data-contact-link="mobila lösningar">Mobila lösningar</h1>
+
+<p>Vår lösning är en BYOD-lösning (Bring Your Own Device-lösning). Vi har utvecklat appar som du kan använda för att hantera det dagliga arbetet inom Facilities Management.</p>
+<p>Med vår lösning kan du utföra dina arbetsuppgifter var du än befinner dig.</p>					<p class="contactUs">
+	Vill du veta mer?&nbsp;&nbsp;<a href="#" class="linkContactUs">Kontakta oss&nbsp;&nbsp;&gt;&gt;</a>
+</p>				</div>
+			</li>
+
+			<li class="category">
+
+				<a href="ifrs16.php" class="categoryHead h2 linkProduct">
+					<div class="triangle"></div><font style="vertical-align: inherit;"><font style="vertical-align: inherit;">
+					IFRS16
+				</font></font></a>
+				<div class="mobileContent">
+					<h1 data-contact-link="IFRS16">IFRS16</h1>
+
+          <p>Vår lösning kan hantera IFRS16. Från och med 1 januari 2019 blir IFRS16
+          obligatoriskt. Det innebär att leasetagare från och med 1 januari 2019 måste
+          redovisa i princip alla leasingavtal med en nyttjanderätt som en tillgång och en
+          skuld i balansräkningen.</p>
+          <p>I dag hjälper vi ett flertal av våra kunder att hantera IFRS16.</p>					<p class="contactUs">
+            Vill du veta mer?&nbsp;&nbsp;<a href="#" class="linkContactUs">Kontakta oss&nbsp;&nbsp;&gt;&gt;</a>
+          </p>				</div>
+                </li>
+
+                <li class="category">
+
+                  <a href="gdpr.php" class="categoryHead h2 linkProduct">
+                    <div class="triangle"></div><font style="vertical-align: inherit;"><font style="vertical-align: inherit;">
+                    GDPR
+                  </font></font></a>
+                  <div class="mobileContent" >
+                    <h1 data-contact-link="GDPR">GDPR</h1>
+
+          <p>Nu har den nya europeiska dataskyddsförordningen GDPR trätt i kraft. Den nya dataskyddsförordningen 
+          ställer högre krav på rutiner och processer för säker hantering av personuppgifter. Vi är redo att hantera GDPR.</p>					<p class="contactUs">
+            Vill du veta mer?&nbsp;&nbsp;<a href="#" class="linkContactUs">Kontakta oss&nbsp;&nbsp;&gt;&gt;</a>
+          </p>				</div>
+			</li>
+
+		</ul>
+
+	</div>
+       </div>
+
 </template>
-
 <script>
 export default {
   data() {
-    return {};
+    return {
+
+      
+    };
   }
 };
 </script>

src/main.js

@@ -5,18 +5,24 @@ import 'swiper/dist/css/swiper.css'
 import './assets/static/config.js'
 import './assets/static/jquery.js'
 import './assets/static/common.js'
-
+import 'es6-promise/auto'
 
 
 import Vue from 'vue'
 import App from './App.vue'
+import Vuex from 'vuex'
 import router from './router'
+
 import {component} from './component'
 
 Vue.config.productionTip = false;
 
+Vue.use(Vuex)
+
 component.register();
 
+
+
 new Vue({
   router,
   render: h => h(App)

src/router.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from "vue-router"
 
 import index from './views/index'
-import solution from './views/solution'
+import infoDtl from './views/infoDtl'
 
 Vue.use(Router);
 
@@ -22,9 +22,8 @@ export default new Router({
       component: index
     },
     {
-      path: '/solution',
+      path: '/infoDtl',
-   
+      component: infoDtl
-      component: solution
     },
   ]
 })

src/views/infoDtl.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/estateManagement.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/facilityManagement.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/iot.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/reaEstate.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/technologyIntegration.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+import "../assets/css/content_pages.css";
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/solution.vue

@@ -1,59 +0,0 @@
-<template>
-  <div>
-    	<i_head></i_head>
-<div class="contentPage">
-
-		<table class="contentTable"><tbody><tr>
-			<td class="contentTableLeft" id="navSidebar">
-			
-			<!-- NAV BREADCRUMB -->
-			<div id="navBreadcrumb" class="breadcrumb">
-					<router-link to="solution">设施管理	</router-link>
-			</div>			
-		</td>
-			<td class="contentTableRight bread">				
-				<h1 data-contact-link="Facilities Management">设施管理</h1>
-			
-			<p>
-					设施管理是一门涵盖多个学科的专业，旨在保护建筑环境的功能。
-				通过将模式，场所，流程和技术相互整合。
-				无论您是要购买，租赁，租赁还是翻新您的房产，都可以帮助我们做出明智的决定
-				显示趋势和实时数据的当前图形关键值。
-				在我们的解决方案中，所有功能都相互完全集成，但用于单独使用。
-			</p>
-
-			<div class="bottomTwoColumn">
-				<div class="column">
-					<div class="productCustomers">
-						<div class="customerIcons">
-							<img src="../assets/img/ic_coor.png" alt="Coor">
-							<img src="../assets/img/ic_dalarna.png" alt="Landstinget Dalarna">
-							<img src="../assets/img/ic_lund.png" alt="Lund University">
-						</div>
-					</div>
-				</div>
-			</div>
-			</td>			
-		</tr>
-		</tbody>
-		</table>
-	</div>
-  	<i_footer></i_footer>
-  </div>
-
-</template>
-
-<script>
-import "../assets/css/content_pages.css";
-export default {
-  data() {
-    return {
-      msg: "Welcome to Your Vue.js App"
-    };
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>