Skip to content

G
gs1
Commit f14d53c5 by liwenjin
Options

liwj提交

parent 4726cb76
Showing with 334 additions and 56 deletions
src/components/layout/englishFoor.vue
...@@ -95,4 +95,7 @@ ...@@ -95,4 +95,7 @@
</div> </div>
</div> </div>
</footer> </footer>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/components/layout/englishHeader/HeaderDropdown.vue
...@@ -72,18 +72,23 @@ export default { ...@@ -72,18 +72,23 @@ export default {
if(nav.class){ if(nav.class){
classNames.push(...nav.class) classNames.push(...nav.class)
} }
return ( // return (
// <div class={classNames.join(" ").trim()} style={{...nav.style}}>
// <div
// class="rect-title gs-hover"
// vOn:click={() => {
// this.$emit("itemClick", { ...nav, root: { ...this.nav } });
// }}
// >
// <span class="pointer">
// {nav.nameInHeaderNav ? nav.nameInHeaderNav : nav.name}
// </span>
// </div>
// <div class="rect-body">{children}</div>
// </div>
// );
return (
<div class={classNames.join(" ").trim()} style={{...nav.style}}> <div class={classNames.join(" ").trim()} style={{...nav.style}}>
<div
class="rect-title gs-hover"
vOn:click={() => {
this.$emit("itemClick", { ...nav, root: { ...this.nav } });
}}
>
<span class="pointer">
{nav.nameInHeaderNav ? nav.nameInHeaderNav : nav.name}
</span>
</div>
<div class="rect-body">{children}</div> <div class="rect-body">{children}</div>
</div> </div>
); );
......
src/components/layout/englishHeader/mock.js
...@@ -19,9 +19,9 @@ export const nav = [ ...@@ -19,9 +19,9 @@ export const nav = [
name: "About us", name: "About us",
nameInHeaderNav: "About us", nameInHeaderNav: "About us",
index: 0, index: 0,
link: "/Org", link: "/SecondaryMenu/Introduction",
style: { flex: '1 0 auto' }, style: { flex: '1 0 auto' },
breadcrumb: [{ name: "About us", path: "/Org" }, { name: "Introduction" }], breadcrumb: [{ name: "Home", path: "/EnglishHome" }, { name: "About us" }],
children: [ children: [
{ {
id: uuid("gs_nav"), id: uuid("gs_nav"),
...@@ -30,7 +30,7 @@ export const nav = [ ...@@ -30,7 +30,7 @@ export const nav = [
link: "/SecondaryMenu/Introduction", link: "/SecondaryMenu/Introduction",
style: { paddingRight: '160px' }, style: { paddingRight: '160px' },
breadcrumb: [ breadcrumb: [
{ name: "About us", path: "/Org" }, { name: "Home", path: "/EnglishHome" },
{ name: "Introduction" }, { name: "Introduction" },
], ],
}, },
...@@ -40,7 +40,7 @@ export const nav = [ ...@@ -40,7 +40,7 @@ export const nav = [
index: 0, index: 0,
link: "/SecondaryMenu/Structure", link: "/SecondaryMenu/Structure",
breadcrumb: [ breadcrumb: [
{ name: "About us", path: "/Org" }, { name: "Home", path: "/EnglishHome" },
{ name: "Structure" }, { name: "Structure" },
], ],
}, },
...@@ -48,14 +48,169 @@ export const nav = [ ...@@ -48,14 +48,169 @@ export const nav = [
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "Contact Us", name: "Contact Us",
index: 0, index: 0,
link: "/ContactUs", link: "/SecondaryMenu/ContactUs",
breadcrumb: [ breadcrumb: [
{ name: "About us", path: "/Org" }, { name: "Home", path: "/EnglishHome" },
{ name: "ContactUs" }, { name: "Contact Us" },
], ],
} }
], ],
}, },
], ],
}, },
{
id: "2",
name: "Business Brief",
index: 2,
link: "/Org",
rowNum: 7,
children: [
{
id: uuid("gs_nav"),
name: "Business Brief",
nameInHeaderNav: "Business Brief",
index: 0,
link: "/SecondaryMenu/Barcode",
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "Home", path: "/Home" }, { name: "Business Brief" }],
children: [
{
id: uuid("gs_nav"),
name: "BarCodes",
index: 0,
link: "/SecondaryMenu/Barcode",
style: { paddingRight: '160px' },
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "BarCodes" },
],
},
{
id: uuid("gs_nav"),
name: "EPC",
index: 0,
link: "/SecondaryMenu/EPC",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "EPC" },
],
},
{
id: uuid("gs_nav"),
name: "GDSN",
index: 0,
link: "/SecondaryMenu/GDSN",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "GDSN" },
],
},
{
id: uuid("gs_nav"),
name: "ECommerce",
index: 0,
link: "/SecondaryMenu/ECommerce",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "ECommerce" },
],
},
{
id: uuid("gs_nav"),
name: "Han Xin Code",
index: 0,
link: "/SecondaryMenu/HanXinCode",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "Han Xin Code" },
],
},
{
id: uuid("gs_nav"),
name: "Innovative Sectors",
index: 0,
link: "/SecondaryMenu/InnovativeSectors",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "Innovative Sectors" },
],
},
{
id: uuid("gs_nav"),
name: "Industry Promotion",
index: 0,
link: "/SecondaryMenu/industryPromotion",
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "Industry Promotion" },
],
}
],
},
],
},
{
id: "3",
name: "Training & Learning",
index: 3,
link: "/Org",
rowNum: 2,
children: [
{
id: uuid("gs_nav"),
name: "Training & Learning",
nameInHeaderNav: "Training & Learning",
index: 0,
link: "/SecondaryMenu/eLearning",
style: { flex: '1 0 auto' },
breadcrumb: [{ name: "Home", path: "/EnglishHome" }, { name: "Training & Learning" }],
children: [
{
id: uuid("gs_nav"),
name: "E-Learning",
index: 0,
link: "/SecondaryMenu/eLearning",
style: { paddingRight: '160px' },
breadcrumb: [
{ name: "Home", path: "/EnglishHome" },
{ name: "E-Learning" },
],
},
{
id: uuid("gs_nav"),
name: "Glossary",
index: 2,
link: "http://ocp.gs1.org/sites/glossary/en-gb",
},
],
},
],
},
{
id: "4",
name: "Events",
index: 4,
link: "http://www.gs1.org/news-events",
},
{
id: "5",
name: "Useful Links",
index: 5,
children: [
{
id: uuid("gs_nav"),
name: "GS1 Member Links",
style: { flex: '1 0 auto' },
index: 0,
children: [
{
id: uuid("gs_nav"),
name: "GS1 Member Links",
index: 0,
link: "http://www.gs1.org/contact/overview",
}
],
},
],
},
]; ];
src/router/index.js
...@@ -1326,7 +1326,7 @@ const routes = [{ ...@@ -1326,7 +1326,7 @@ const routes = [{
path: "/SecondaryMenu", path: "/SecondaryMenu",
name: "SecondaryMenu", name: "SecondaryMenu",
component: blankMain, component: blankMain,
redirect: '/SecondaryMenu/industryPromotion', // redirect: '/SecondaryMenu/industryPromotion',
children: [{ children: [{
path: "/SecondaryMenu/industryPromotion", path: "/SecondaryMenu/industryPromotion",
name: "IndustryPromotion", name: "IndustryPromotion",
...@@ -1381,11 +1381,14 @@ const routes = [{ ...@@ -1381,11 +1381,14 @@ const routes = [{
path: "/SecondaryMenu/eLearning", path: "/SecondaryMenu/eLearning",
name: "eLearning", name: "eLearning",
component: () => import("@/views/English/SecondaryMenu/eLearning"), component: () => import("@/views/English/SecondaryMenu/eLearning"),
} },
{
path: "/IndustryPromotion/FoodSafety",
name: "FoodSafety",
component: () => import("@/views/English/TertiaryMenu/IndustryPromotion/FoodSafety"),
},
] ]
} },
]; ];
const router = new VueRouter({ const router = new VueRouter({
mode: "history", mode: "history",
......
src/views/English/Home/components/columnFourList.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="content-module-container"> <div class="content-module-container">
<h4> <h4>
<a <a
href="/GS1ChinaEN/GS1ChinaENTest/foodsafety.aspx" @click="handleGo('/IndustryPromotion/FoodSafety')"
target="_blank" target="_blank"
style="text-decoration: none; color: #002c6c" style="text-decoration: none; color: #002c6c"
>Food safety</a >Food safety</a
...@@ -146,9 +146,18 @@ ...@@ -146,9 +146,18 @@
</template> </template>
<script> <script>
export default { export default {
data(){
return{
}
},
methods:{
handleGo(val){
this.$router.push({path: val})
}
}
} }
</script> </script>
<style scoped> <style scoped lang="scss" >
@import "@/assets/css/english";
</style> </style>
\ No newline at end of file
src/views/English/Home/components/trodList.vue
...@@ -101,4 +101,6 @@ ...@@ -101,4 +101,6 @@
<script> <script>
export default {}; export default {};
</script> </script>
<style scoped></style> <style lang="scss" scoped>
@import "@/assets/css/english";
</style>
src/views/English/Home/index.vue
...@@ -68,6 +68,6 @@ export default { ...@@ -68,6 +68,6 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style scoped lang="scss" >
@import "@/assets/css/english"; @import "@/assets/css/english";
</style> </style>
src/views/English/SecondaryMenu/Barcode.vue
...@@ -97,4 +97,7 @@ ...@@ -97,4 +97,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/ContactUs.vue
...@@ -60,4 +60,7 @@ ...@@ -60,4 +60,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/ECommerce.vue
...@@ -85,4 +85,7 @@ ...@@ -85,4 +85,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/EPC.vue
...@@ -73,4 +73,7 @@ ...@@ -73,4 +73,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/GDSN.vue
...@@ -80,4 +80,7 @@ ...@@ -80,4 +80,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/HanXinCode.vue
...@@ -159,4 +159,7 @@ ...@@ -159,4 +159,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/InnovativeSectors.vue
...@@ -145,4 +145,7 @@ ...@@ -145,4 +145,7 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/Introduction.vue
...@@ -67,5 +67,6 @@ ...@@ -67,5 +67,6 @@
</div> </div>
</div> </div>
</template> </template>
<style lang="scss"> <style scoped lang="scss" >
</style> @import "@/assets/css/english";
\ No newline at end of file </style>
src/views/English/SecondaryMenu/Structure.vue
...@@ -45,4 +45,7 @@ ...@@ -45,4 +45,7 @@
</section> </section>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/eLearning.vue
...@@ -101,3 +101,6 @@ ...@@ -101,3 +101,6 @@
</div> </div>
</div> </div>
</template> </template>
<style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/SecondaryMenu/industryPromotion.vue
...@@ -78,4 +78,7 @@ ...@@ -78,4 +78,7 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
\ No newline at end of file <style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/TertiaryMenu/IndustryPromotion/FoodSafety.vue 0 → 100644
<template>
<div class="container site-content flush-outside">
<div class="container">
<section>
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<li>
<a href="/GS1ChinaEN/GS1ChinaENTest/index.aspx">Home</a>
</li>
<li>
<a href="/GS1ChinaEN/GS1ChinaENTest/promotion.aspx"
>Industry Promotion</a
>
</li>
<li class="active">Food safety</li>
</ol>
</ul>
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-sm-9">
<h1>Food safety</h1>
<p class="small" style="padding-top: 20px">
In recent years, food safety standards received widespread concern
throughout the world. Through efforts, GS1 China obtained
significant achievements in food tracking and tracing, which
contributed to the national product quality and food safety
initiative set forth by government.
</p>
<p class="small" style="padding-top: 20px">
To promote the application of the barcode in the food safety
tracking and tracing for the Olympic Games, GS1 China signed an
agreement with the Administration of Industry and Commerce and
Beijing Food safety Inspection Coordination Office called the
"Beijing Olympic food tracking and tracing system ". In addition,
GS1 China developed "Coding rule for Food Safety Tracking and
Tracing for the Olympic Games" and "Catalogue Norm of Food Safety
Data for the Olympic Games" with its Beijing Branch.
</p>
<p class="small" style="padding-top: 20px">
During the Barcode Technology Promotion Week in 2007, a food
safety tracking and tracing conference was held which allowed
domestic and international experts in the field to exchange their
experiences. In order to promote the awareness of GS1 system in
the area of food safety, we held a press conference for the GS1
Traceability System in China at the GS1 Advisory Council Meeting
in Beijing.
</p>
<p class="small" style="padding-top: 20px">
Barcode applications have been extended to the food safety area
with great efforts and a number of food safety tracking and
tracing system demonstrations have been established on a range of
products such as Shandong seafood, Xinjiang cantaloupe, Yunnan
pork, Sichuan tea, and the Hetian chicken of Fujian, this
consolidates the critical role the barcode plays in our national
food safety tracking and tracing system.
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<img
class="img-responsive center-block"
src="@/assets/image/english/FS-2.jpg"
alt="Food satety"
/>
</div>
</div>
</section>
</div>
</div>
</template>
<style scoped lang="scss" >
@import "@/assets/css/english";
</style>
src/views/English/blankMain.vue
<template> <template>
<div class="toolkit" style="background-color: #f4f4f4"> <div class="toolkit" style="background-color: #f4f4f4">
<TopBanner></TopBanner>
<Header></Header> <Header></Header>
<router-view></router-view> <div>
<router-view></router-view>
</div>
<Footer></Footer> <Footer></Footer>
</div> </div>
</template> </template>
<script> <script>
import TopBanner from '@/components/layout/topBanner.vue'
import Header from '@/components/layout/englishHeader' import Header from '@/components/layout/englishHeader'
import Footer from "@/components/layout/englishFoor.vue" import Footer from "@/components/layout/englishFoor.vue"
export default { export default {
components: { components: {
Footer, Footer,
Header Header,
TopBanner
}, },
} }
</script> </script>
......
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