Skip to content

G
gs1
Commit ce2a88e4 by tang
Options

Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1 

 Conflicts:
	src/views/Home/index.vue
parents ec54b948 c5807c9c
Showing with 799 additions and 493 deletions
src/assets/css/english.scss
......@@ -106,7 +106,7 @@ summary {
.col-md-2,
.col-lg-2,
.col-xs-3,
.col-sm-3,
.col-lsm-3,
.col-md-3,
.col-lg-3,
.col-xs-4,
......@@ -130,7 +130,7 @@ summary {
.col-md-8,
.col-lg-8,
.col-xs-9,
.col-sm-9,
.col-lsm-9,
.col-md-9,
.col-lg-9,
.col-xs-10,
......@@ -492,18 +492,17 @@ small,
}
@media (min-width: 768px) {
.col-sm-1,
.col-sm-2,
.col-sm-3,
.col-lsm-3,
.col-sm-4,
.col-sm-5,
.col-sm-6,
.col-sm-7,
.col-sm-8,
.col-sm-9,
.col-lsm-9,
.col-sm-10,
.col-sm-11,
.col-sm-12 {
......@@ -522,6 +521,14 @@ small,
float: left;
margin: 0;
}
.col-lsm-9 {
width: 75%;
}
.col-lsm-3 {
width: 25%;
}
}
@media (min-width: 992px) {
......@@ -565,10 +572,6 @@ small,
width: 970px;
}
.toolkit .carousel-inner .item .carousel-glyph {
display: none;
}
.banner {
height: 400px;
......@@ -589,3 +592,9 @@ small,
width: 1170px;
}
}
@media (max-width: 996px) {
.englishToolkit .slick-list .item .carousel-glyph {
display: none;
}
}
\ No newline at end of file
src/assets/css/englishComm.scss
......@@ -41,6 +41,8 @@
background: rgba(0, 0, 0, 0.15);
height: 42px;
line-height: 42px;
bottom: -20px !important;
position: absolute;
z-index: 99;
width: 100%;
}
}
\ No newline at end of file
src/axios/module/news.js
......@@ -135,6 +135,15 @@ const jcspList = (params = {}) => {
const jcspiInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}`)
}
// 零售
const retailList = (params = {}) => {
return POST(`${Prefix}/office/news/api/retailList`, params);
}
// 物流
const logostocsList = (params = {}) => {
return POST(`${Prefix}/office/news/api/logostocsList`, params);
}
export default {
......@@ -167,5 +176,7 @@ export default {
bzkydtList,
sdztList,
jcspList,
jcspiInfo
jcspiInfo,
retailList,
logostocsList
}
src/components/layout/englishHeader/HeaderBtn.vue
<template>
<div class="header-btn move-btn">
<el-button v-if="!user" type="primary" style="padding: 9px 30px;margin-right: 6px" size="small"
@click="handleToLogin">注册/登录
<div class="header-btn move-btn header-btn-english">
<a href="http://www.gs1.org/search/gss" target="_blank">
<el-button type="primary" style="padding: 9px 30px;margin-right: 6px" size="small">Search
</el-button>
<el-button v-else type="primary" style="padding: 9px 30px;margin-right: 6px" size="small" @click="handleExit">退出登录
</el-button>
<!-- Toggler -->
<button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-default">
<i class="bi-list"></i>
</span>
<span class="navbar-toggler-toggled">
<i class="bi-x"></i>
</span>
</button>
<!-- End Toggler -->
</a>
</div>
</template>
<script>
export default {
name: "HeaderBtn",
data() {
data () {
return {
user: null
}
},
methods: {
handleToLogin() {
this.$router.push({path: "/login"});
},
handleExit() {
localStorage.removeItem('loginInfo')
localStorage.removeItem('TOKEN')
localStorage.removeItem('gs-user')
// this.$router.push({path: "/"})
location.href = '/'
this.user = null
}
},
created() {
created () {
this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : null
},
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.header-btn {
button {
&:hover {
background: #CC3C0F;
background: #cc3c0f;
}
}
}
......
src/components/layout/topBanner.vue
<template>
<div class="container d-none d-xl-block d-lg-block">
<div class="top-banner">
<!-- <div>全球商业语言</div>
<div>全球商业语言</div>
<div class="top-banner-item language">
<el-dropdown class="language-dropdown">
<el-dropdown class="language-dropdown" @command="handleClick">
<span class="el-dropdown-link">
中文<i class="el-icon-arrow-down el-icon--right"></i>
{{languageTxt}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="language-dropdown-menu">
<el-dropdown-item>中文</el-dropdown-item>
<el-dropdown-item>英文</el-dropdown-item>
<el-dropdown-item command="中文">中文</el-dropdown-item>
<el-dropdown-item command="英文">英文</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div> -->
</div>
<div class="top-banner-item tb-hover">咨询电话：400-7000-690</div>
<div class="top-banner-item">
<img src="../../assets/image/head/wx.png" alt=""/>
<a
class="tb-hover"
target="_blank"
:href="`${urls.ancc}gs1cnweixin.aspx`"
>官方微信</a
>
<img src="../../assets/image/head/wx.png" alt="" />
<a class="tb-hover" target="_blank" :href="`${urls.ancc}gs1cnweixin.aspx`">官方微信</a>
</div>
<div class="top-banner-item">
<img src="../../assets/image/head/xlwb.png" alt=""/>
<a class="tb-hover" target="_blank" href="https://weibo.com/gs1cn"
>官方微博</a
>
<img src="../../assets/image/head/xlwb.png" alt="" />
<a class="tb-hover" target="_blank" href="https://weibo.com/gs1cn">官方微博</a>
</div>
<div class="top-banner-item tb-hover" @click="handleSearch">
<img src="../../assets/image/head/search.png" alt=""/>
<img src="../../assets/image/head/search.png" alt="" />
</div>
<!-- <span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>-->
<img v-if="user.username" @click="toAdmin" style="width:22px;cursor: pointer;margin-left: 20px"
......@@ -40,41 +33,54 @@
</template>
<script>
import {mapState} from "vuex";
import { mapState } from "vuex";
export default {
name: "topBanner",
computed: {
...mapState(["urls"]),
},
created() {
created () {
this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : {}
console.log(this.user)
},
data() {
data () {
return {
user: {}
user: {},
languageTxt: '中文'
}
},
methods: {
toAdmin() {
toAdmin () {
if ((this.user.userType === 1 && this.user.isXT !== 1) || (this.user.userType === 2 && this.user.isXT !== 1) || (this.user.userType === 3 && this.user.levels === null)) {
this.$router.push({path: '/MyManage/UnVerify/index'})
this.$router.push({ path: '/MyManage/UnVerify/index' })
} else if (this.user.isXT === 1) {
this.$router.push({path: '/MyManage/SystemMember/index'})
this.$router.push({ path: '/MyManage/SystemMember/index' })
} else if (this.user.levels === 0) {
this.$router.push({path: '/MyManage/admin/check'})
this.$router.push({ path: '/MyManage/admin/check' })
} else if (this.user.levels === 1) {
this.$router.push({path: '/MyManage/admin/check'})
this.$router.push({ path: '/MyManage/admin/check' })
} else if (String(this.user.levels).length === 4) {
this.$router.push({path: '/MyManage/admin/check'})
this.$router.push({ path: '/MyManage/admin/check' })
}
},
handleSearch() {
handleSearch () {
this.$router.push({
path: "/Home/sousuo",
});
},
handleClick (val) {
this.languageTxt = val
if (val == '中文') {
this.$router.push({
path: "/Home",
});
} else {
this.$router.push({
path: "/EnglishHome",
});
}
}
},
};
</script>
......
src/views/Business/GLN.vue
......@@ -112,7 +112,7 @@ export default {
},
methods: {
ckxqJump() {
window.open('/Knowledge/xts', '_blank');
window.open('/Knowledge/GS1System/goodsPosition', '_blank');
// this.$router.push({
// path: '/Knowledge/xts'
// })
......
src/views/Business/Guide1.vue
......@@ -163,6 +163,7 @@ export default {
handler(val) {
this.$nextTick(() => {
Object.keys(this.$refs).forEach((key) => {
console.log(this.$refs[key], "this.$refs");
this.$refs[key].setAttribute("class", "msg-title");
});
const top = this.$refs[val.query.id].offsetTop;
......
src/views/Business/index.vue
......@@ -357,76 +357,76 @@ export default {
},
],
},
// {
// name: "常见问题",
// path: "",
// active: "",
// children: [
// {
// name: "1.业务办理",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "ywbl",
// },
// noneChild: true,
// },
// {
// name: "2.产品信息通报",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "cpxxtb",
// },
// noneChild: true,
// },
// {
// name: "3.编码技术",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "bmjs",
// },
// noneChild: true,
// },
// {
// name: "4.法规与标准",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "fgybz",
// },
// noneChild: true,
// },
// {
// name: "5.条码质量",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "tmzl",
// },
// noneChild: true,
// },
// {
// name: "6.条码技术应用",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "tmjsyy",
// },
// noneChild: true,
// },
// {
// name: "7.其他",
// path: "/Business/Faq",
// active: "",
// query: {
// type: "other",
// },
// noneChild: true,
// },
// ],
// },
{
name: "常见问题",
path: "",
active: "",
children: [
{
name: "1.业务办理",
path: "/Business/Faq",
active: "",
query: {
type: "ywbl",
},
noneChild: true,
},
{
name: "2.产品信息通报",
path: "/Business/Faq",
active: "",
query: {
type: "cpxxtb",
},
noneChild: true,
},
{
name: "3.编码技术",
path: "/Business/Faq",
active: "",
query: {
type: "bmjs",
},
noneChild: true,
},
{
name: "4.法规与标准",
path: "/Business/Faq",
active: "",
query: {
type: "fgybz",
},
noneChild: true,
},
{
name: "5.条码质量",
path: "/Business/Faq",
active: "",
query: {
type: "tmzl",
},
noneChild: true,
},
{
name: "6.条码技术应用",
path: "/Business/Faq",
active: "",
query: {
type: "tmjsyy",
},
noneChild: true,
},
{
name: "7.其他",
path: "/Business/Faq",
active: "",
query: {
type: "other",
},
noneChild: true,
},
],
},
],
},
{
......
src/views/Djwh/index.vue
......@@ -293,8 +293,8 @@ export default {
}else{
const matche = [
{
name: "行业应用",
path: "/News/Application",
name: "深度专题",
path: "/News/DepthTopics",
}
];
this.setMatche(matche);
......
src/views/English/Home/components/trodList.vue
......@@ -17,8 +17,8 @@
<div class="col-xs-12">
<img src="@/assets/image/english/1.jpg" class="img-responsive"></div>
<div class="col-xs-12">
<p style="line-height: 28px; padding: 22px; font-size: 14px">
In order to address to the domestic demand of healthcare safety, GS1 China strengthened
<p class="pStyle">
111In order to address to the domestic demand of healthcare safety, GS1 China strengthened
and broadened the use of barcode technology in the healthcare sector in 2007, and
established Healthcare Workgroup in 2008 consists of staff from 20 branches all
around China. There are several projects including “Implantable medical device traceability
......@@ -39,7 +39,7 @@
<img src="@/assets/image/english/2.jpg" class="img-responsive">
<div class="col-xs-12">
</div>
<p style="line-height: 28px; padding: 22px; font-size: 14px">
<p class="pStyle">
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,
......@@ -131,4 +131,9 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/css/english";
.pStyle {
line-height: 28px !important;
padding: 22px;
font-size: 14px !important;
}
</style>
src/views/English/SecondaryMenu/Barcode.vue
......@@ -16,7 +16,7 @@
<section>
<h1>Commodity Barcode</h1>
<div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<h4 style="color: #f16333; border-bottom: none; padding-top:30px">
What are Barcodes</h4>
<table align="left" dir="rtl" style="width:200px">
......@@ -58,7 +58,7 @@
must contact GS1 China or its branches. We will provide you with a GS1 Company Prefix
and the specifications.</p>
</div>
<div class="col-sm-3">
<div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div>
<div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/ContactUs.vue
......@@ -16,7 +16,7 @@
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1 style="margin-bottom: 35px">Contact Us</h1>
<div class="content-module-wrapper" style="border-top: 7px solid #f26334"></div>
<div class="content-module content-module-padding" style="padding: 0px; background-color: #fff">
......@@ -48,7 +48,7 @@
</p>
</div>
</div>
<div class="col-sm-3" style="padding-top: 59px">
<div class="col-lsm-3" style="padding-top: 59px">
<div class="content-module-container">
<h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
......@@ -86,7 +86,7 @@ export default {
return {
map: {
label: "GS1 China",
center: { lng: 116.415108, lat: 39.961695 },
center: { lng: 116.415256, lat: 39.961205 },
zoom: 16,
show: false,
},
......
src/views/English/SecondaryMenu/ECommerce.vue
......@@ -16,7 +16,7 @@
<section>
<h1>ECommerce</h1>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height:30px">
The uniform product coding identification is not only an ID card for the products; it also can promote the
supply chain be visibility in each logistic point. It can provide the efficiency solutions for the issues
......@@ -47,7 +47,7 @@
information, share data, monitor and construct trusted e-commerce environment. </p>
</div>
<div class="col-sm-3" style="padding-top:30px">
<div class="col-lsm-3" style="padding-top:30px">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div>
<div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/EPC.vue
......@@ -16,7 +16,7 @@
<section>
<h1>EPC</h1>
<div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<img src="@/assets/image/english/EPC.jpg" alt="" class="img-responsive"
style="padding: 45px; padding-bottom:15px">
<p class="small" style="padding:25px; line-height:35px; padding-bottom:5px">
......@@ -34,7 +34,7 @@
assigned with EPC Manager Numbers.
</p>
</div>
<div class="col-sm-3">
<div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div>
<div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/GDSN.vue
......@@ -16,7 +16,7 @@
<section>
<h1>Global Data Synchronisation Network(GDSN)</h1>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height:30px">
GDSN (The Global Data Synchronisation Network) is a network of interoperable data pools and GS1 Global
Registry that, communicate product master data (Catalogue Item and Party) between trading partners. In
......@@ -40,7 +40,7 @@
China's product information.
</p>
</div>
<div class="col-sm-3">
<div class="col-lsm-3">
<img class="img-responsive center-block" src="@/assets/image/english/GDSN-2.jpg" alt="Foodservice"
style="padding-bottom:15px; padding-top:28px">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
......
src/views/English/SecondaryMenu/HanXinCode.vue
......@@ -16,7 +16,7 @@
<section>
<h1>Han Xin Code</h1>
<div class="row">
<div class="col-sm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<div class="col-lsm-9" style="background-color:#FFF;border-top: 7px solid #f16333">
<h4 style="color: #f16333; border-bottom: none; padding-top:30px; line-height:35px">
The background and the development of the Han Xin code</h4>
<p class="small" style="padding:25px; line-height:35px; padding-bottom:5px; padding-top:10px">
......@@ -120,7 +120,7 @@
will bring considerable economic profit as well as help global trading enterprises gaining powerful
information coding technological support and competitive advantage.</p>
</div>
<div class="col-sm-3">
<div class="col-lsm-3">
<div class="content-module-wrapper" style="border-top: 7px solid #002c6c">
</div>
<div class="content-module content-module-padding">
......
src/views/English/SecondaryMenu/InnovativeSectors.vue
<template>
<div class="container site-content flush-outside" style="width: 100%;max-width: 100%;">
<div class="container" style="padding-left:15px; padding-right:15px">
<div class="row" style="background-color: #FFF;margin-right: 0px;
<div class="row" style="margin-right: 0px;
margin-top: 20px">
<div class="row" style="margin-left: -15px; ">
<div class="col-xs-12 col-md-12 section-spacing" style="margin-top: 0px; padding-bottom: 0px">
......@@ -167,4 +167,8 @@ export default {
.toolkit .site-content {
margin-top: 0;
}
.row {
margin-left: 0px;
margin-right: 0px;
}
</style>
src/views/English/SecondaryMenu/Introduction.vue
......@@ -15,7 +15,7 @@
</section>
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1>Introduction</h1>
<p class="small" style="padding-top: 20px">
GS1 China, founded in 1988 under the authorization of the State Council of the People’s
......@@ -58,7 +58,7 @@
continued adoption of GS1 system around China and to create opportunities for new sectors which will
benefit the people, industry and business of our country.</p>
</div>
<div class="col-sm-3" style="padding-top:85px">
<div class="col-lsm-3" style="padding-top:85px">
<img class="img-responsive center-block" src="@/assets/image/english/ZCH.jpg" alt="Foodservice"
style="border-top: 7px solid #f16333">
</div>
......
src/views/English/SecondaryMenu/Structure.vue
......@@ -17,46 +17,30 @@
</section>
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1>Structure</h1>
<img
src="@/assets/image/english/structure.jpg"
alt=""
class="img-responsive"
/>
<img src="@/assets/image/english/structure.jpg" alt="" class="img-responsive" />
</div>
<div class="col-sm-3" style="padding-top: 85px">
<div class="col-lsm-3" style="padding-top: 85px">
<div class="content-module-container">
<h4></h4>
<div
class="content-module-wrapper"
style="border-top: 7px solid #7ac143"
></div>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
<div class="content-module content-module-padding">
<h4>Tools</h4>
<p class="small">
<a
href="http://www.gs1.org/check-digit-calculator"
target="_blank"
>Check digit calculator</a
><br />
<a href="http://www.gs1.org/check-digit-calculator" target="_blank">Check digit calculator</a><br />
Calculate correct check digit for barcodes.
</p>
<p class="small">
<a href="http://gepir.gs1.org" target="_blank"
>Who owns this barcode?</a
><br />
<a href="http://gepir.gs1.org" target="_blank">Who owns this barcode?</a><br />
Find companies linked to GS1 barcode numbers.
</p>
</div>
<div class="content-module content-module-padding">
<h4>Standards</h4>
<p class="small">
<a
href="http://www.gs1.org/how-gs1-standards-work"
target="_blank"
>See how GS1 standards work</a
><br />
<a href="http://www.gs1.org/how-gs1-standards-work" target="_blank">See how GS1 standards
work</a><br />
GS1 standards help you single out what really matters.
</p>
</div>
......@@ -69,11 +53,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/eLearning.vue
......@@ -16,7 +16,7 @@
<section>
<h1>e-Learning</h1>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<p class="small" style="padding-top: 20px; line-height: 30px">
GS1 LEARN is the home of GS1 China complete programme of eLearning
and classroom training courses for staff of GS1's 112 Member
......@@ -51,7 +51,7 @@
<a href="http://learn.gs1.org/" target="_blank"><img class="img-responsive center-block"
src="@/assets/image/english/prntscreen_course.gif" alt="" /></a>
</div>
<div class="col-sm-3" style="padding-top: 15px">
<div class="col-lsm-3" style="padding-top: 15px">
<div class="content-module-container">
<h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
......
src/views/English/TertiaryMenu/IndustryPromotion/FoodSafety.vue
......@@ -18,7 +18,7 @@
</section>
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1>Food safety</h1>
<p class="small" style="padding-top: 20px">
In recent years, food safety standards received widespread concern
......@@ -56,7 +56,7 @@
food safety tracking and tracing system.
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/FS-2.jpg" alt="Food satety" />
</div>
</div>
......
src/views/English/TertiaryMenu/IndustryPromotion/Healthcare.vue
......@@ -18,7 +18,7 @@
</section>
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1>Healthcare</h1>
<p class="small" style="padding-top: 20px">
In order to address to the domestic demand of healthcare safety,
......@@ -41,7 +41,7 @@
</a>
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/HC-2.jpg" alt="Healthcare" />
</div>
</div>
......
src/views/English/TertiaryMenu/IndustryPromotion/Others.vue
......@@ -18,7 +18,7 @@
</section>
<section>
<div class="row">
<div class="col-sm-9">
<div class="col-lsm-9">
<h1>Others</h1>
<p class="small" style="padding-top: 20px">
In 2007, due to the domestic and international concern, GS1 China
......@@ -66,7 +66,7 @@
Qingdao, Yantai, etc.
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<div class="col-lsm-3" style="padding-top: 85px">
<img class="img-responsive center-block" src="@/assets/image/english/TL-2.png" alt="Food satety" />
</div>
</div>
......
src/views/Home/comps/list2.vue
<template>
<div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li">
<span></span>
<span :title="tmp.title">{{tmp.title}}</span>
......@@ -12,10 +12,8 @@
export default {
props: ['list'],
methods: {
handelMsg() {
this.$router.push({
path: '/News/Msg'
});
handelMsg(obj) {
this.$emit('toList2Father', obj);
},
},
}
......
src/views/Home/comps/other-list.vue
<template>
<div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li">
<span></span>
<span :title="tmp.name">{{tmp.name}}</span>
<span :title="tmp.name">{{ tmp.name }}</span>
</div>
</div>
</div>
</template>
<script>
export default {
props: ['list'],
props: ["list"],
methods: {
handelMsg() {
this.$router.push({
path: '/News/Msg'
handelMsg(obj) {
let routeData = this.$router.resolve({
path: obj.url,
query: obj.query,
});
window.open(routeData.href, "_blank");
},
},
}
};
</script>
<style lang="scss" scoped>
.list {
......@@ -35,7 +37,7 @@ export default {
display: flex;
align-items: center;
font-size: 14px;
color: #7E8EA9;
color: #7e8ea9;
@include ellipsis;
span {
display: inline-block;
......
src/views/Home/comps/yyly-list.vue
<template>
<div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
<div class="col li">
<span></span>
<span :title="tmp.name">{{tmp.name}}</span>
......@@ -12,10 +12,8 @@
export default {
props: ['list'],
methods: {
handelMsg() {
this.$router.push({
path: '/News/Msg'
});
handelMsg(obj) {
window.open(obj.url, '_blank');
},
},
}
......
src/views/Home/index.vue
......@@ -156,7 +156,7 @@
<div class="col-lg-6 wsxtcy bgWhite">
<div class="ywdt-cate ywdt-cate-bj2">
<span>我是系统成员</span>
<span style="width: 148px;">（成员专区）</span>
<span style="width: 148px">（成员专区）</span>
</div>
<div class="row ywdt-kj wsxtcy-row">
<div
......@@ -309,7 +309,13 @@
</el-input>
</div>
<div class="col-lg-3 chaxun-right">
<button @click="toSearch(chaxun.type,chaxun.keywords,'company')">境内条码查询</button>
<button
@click="
toSearch(chaxun.type, chaxun.keywords, 'company')
"
>
境内条码查询
</button>
</div>
</div>
</div>
......@@ -410,7 +416,9 @@
<div class="col">
<div class="home-bottom-cont">
<div class="djwh">
<div class="home-bottom-cate">党建文化</div>
<div class="home-bottom-cate" @click="handelHomeBottomCate(1)">
党建文化
</div>
<div class="djwh-tp">
<a href="/djwh" target="blank"
><img
......@@ -418,10 +426,12 @@
alt=""
/></a>
</div>
<list2 :list="djwh.data" />
<list2 :list="djwh.data" @toList2Father="djwhReceive"/>
</div>
<div class="ztjj">
<div class="home-bottom-cate">专题聚焦</div>
<div class="home-bottom-cate" @click="handelHomeBottomCate(2)">
专题聚焦
</div>
<div class="djwh-tp">
<a href="/News/DepthTopics" target="blank"
><img
......@@ -429,14 +439,16 @@
alt=""
/></a>
</div>
<list2 :list="ztjj.data" />
<list2 :list="ztjj.data" @toList2Father="ztjjReceive"/>
</div>
<div class="yyly">
<div class="home-bottom-cate">应用领域</div>
<div class="home-bottom-cate" @click="handelHomeBottomCate(3)">
应用领域
</div>
<yylyList :list="yyly.data" />
</div>
<div class="other">
<div class="home-bottom-cate">
<div class="home-bottom-cate" @click="handelHomeBottomCate(4)">
质检中心/协会/杂志社/标准委/其他
</div>
<otherList :list="other.data" />
......@@ -688,7 +700,7 @@ export default {
{
ico: require("../../assets/image/home/wsxtcy-ico2.png"),
name: "我要续展",
type: 'link',
type: "link",
url: link.wyxz,
},
{
......@@ -808,8 +820,8 @@ export default {
ico: require("../../assets/image/home/dzfw-ico9.png"),
name: "国家物联网标识管理中心",
isChecked: true,
url: 'https://www.iotroot.com/',
type: 'link'
url: "https://www.iotroot.com/",
type: "link",
},
{
id: "9",
......@@ -862,58 +874,53 @@ export default {
data: [],
},
ztjj: {
data: [
{
title: "“扫”遍双十一 “码”上确定性",
},
{
title: "“码上”陪你笑傲电商江湖",
},
{
title: "进口商品如何发布全网，拿好这个跨境进口数据法宝",
},
{
title: "小条码，大未来",
},
{
title: "助力电商逆生长，“码”上加速有法宝",
},
],
data: [],
},
yyly: {
data: [
{
name: "零售",
url: '/News/Retail',
},
{
name: "物流",
url: '/News/Logistics',
},
{
name: "医疗卫生",
url: '/News/Health',
},
{
name: "食品安全追溯",
url: '/News/FoodSafety',
},
{
name: "电子商务",
url: '/News/ECommerce',
},
{
name: "移动商务",
url: '/News/MCommerce',
},
{
name: "物联网",
url: '/News/IoT',
},
{
name: "其他",
url: '/News/Other',
},
{
name: "国家食品（产品）安全追溯平台",
url: 'http://www.chinatrace.org/',
},
{
name: "国家产品质量信用平台",
url: 'http://zlxy.ancc.org.cn/',
},
{
name: "国家物联网标识管理与公共服务平台",
url: 'https://www.iotroot.com/',
},
],
},
......@@ -921,42 +928,94 @@ export default {
data: [
{
name: "国家射频识别产品质量检验检测中心",
url: '/Org/Sites',
query: {
id: '1-1'
}
},
{
name: "国家条码质量检验检测中心",
url: '/Org/Sites',
query: {
id: '1-2'
}
},
{
name: "中国自动识别技术协会",
url: '/Org/Sites',
query: {
id: '1-3'
}
},
{
name: "中国条码技术与应用协会",
url: '/Org/Sites',
query: {
id: '1-4'
}
},
{
name: "《中国自动识别技术》杂志社电子版",
url: '/Org/Sites',
query: {
id: '1-5'
}
},
{
name: "中国ECR委员会",
url: '/Org/Sites',
query: {
id: '1-6'
}
},
{
name: "全国物品编码标准化技术委员会",
url: '/Org/Sites',
query: {
id: '1-7'
}
},
{
name: "全国物流信息管理标准化技术委员会",
url: '/Org/Sites',
query: {
id: '1-8'
}
},
{
name: "全国自动识别与数据采集分委员会",
url: '/Org/Sites',
query: {
id: '1-9'
}
},
{
name: "物联网标识工作组",
url: '/Org/Sites',
query: {
id: '1-10'
}
},
{
name: "全球产品电子代码中国管理中心",
url: '/Org/Sites',
query: {
id: '1-11'
}
},
{
name: "中国UNSPSC动态维护管理中心",
url: '/Org/Sites',
query: {
id: '1-12'
}
},
{
name: "北京东方捷码科技开发中心",
url: '/Org/Sites',
query: {
id: '1-13'
}
},
],
},
......@@ -989,16 +1048,27 @@ export default {
this.getCustomServiceFromServer();
},
methods: {
handelHomeBottomCate(i) {
if (i === 1) {
window.open('/djwh', '_blank');
} else if (i === 2) {
window.open('/News/DepthTopics', '_blank');
} else if (i === 3) {
window.open('/News/index', '_blank');
} else if (i === 4) {
window.open('/Org/Sites', '_blank');
}
},
toSearch(type, keyword, infoType) {
console.log(type)
console.log(type);
this.$router.push({
path: '/search/internal',
path: "/search/internal",
query: {
keyword,
type,
infoType
}
})
infoType,
},
});
},
getCustomService() {
let service = localStorage.getItem("gs-custom-service") || "";
......@@ -1011,7 +1081,7 @@ export default {
async getCustomServiceFromServer() {
const searchGlnRes = await this.$api.home.customService();
const {returnCode, data} = searchGlnRes;
const { returnCode, data } = searchGlnRes;
if (returnCode === "0") {
localStorage.setItem("gs-custom-service", JSON.stringify(data));
this.showCustomService(data);
......@@ -1057,6 +1127,8 @@ export default {
this.homeNewGtin();
// 党建文化新闻列表
this.homeGet4PartyTopNews();
// 专题聚焦
this.homeGetsdztListTopNews();
// 首页小轮播图
this.homeSmallImages();
},
......@@ -1133,6 +1205,35 @@ export default {
this.djwh.data = data;
}
},
// 专题聚焦
async homeGetsdztListTopNews() {
const params = {
page: 1,
limit: 5,
};
const homeGetsdztListTopNewsRes = await this.$api.news.sdztList(
params
);
const { returnCode, data } = homeGetsdztListTopNewsRes;
if (returnCode === "0") {
console.log(homeGetsdztListTopNewsRes, "专题聚焦");
this.ztjj.data = data.list;
}
},
// 党建文化列表点击
djwhReceive(msg) {
let routeData = this.$router.resolve({
path: '/News/Msg',
query: {
id: msg.id
}
});
window.open(routeData.href, "_blank");
},
// 专题聚焦列表点击
ztjjReceive(msg) {
window.open(msg.directpath, "_blank");
},
// 首页小轮播图
async homeSmallImages() {
const homeSmallImagesRes = await this.$api.home.homeSmallImages();
......@@ -1180,7 +1281,7 @@ export default {
// 我是系统成员点击事件
wsxtcyHandelClick(i) {
console.log(i, "我是系统成员点击事件");
if (this.wsxtcy[i].type === 'link') {
if (this.wsxtcy[i].type === "link") {
window.open(this.wsxtcy[i].url, "_blank");
} else {
let routeData = this.$router.resolve({
......@@ -2294,6 +2395,7 @@ export default {
padding: 15px 0 15px 20px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
cursor: pointer;
}
.home-bottom-cont {
......
src/views/Knowledge/index.vue
......@@ -110,17 +110,7 @@
<div class="col bzwx">
<div class="card-body" style="padding-top:31px">
<p class="card-text row">
<el-button type="primary" class="cjwtbtn col-lg-4" >全部问题</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4">业务办理</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" >产品信息通报</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" >编码技术</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" >法规与标准</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" >条码质量</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" >条码技术应用</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4">其他</el-button>
<el-button type="primary" class="cjwtbtn col-lg-4" v-for="(tmp, i) in cjwt" :key="i" @click="cjwtHandelClick(tmp)">{{tmp.name}}</el-button>
</p>
</div>
</div>
......@@ -373,7 +363,6 @@
<script>
// import sousuoList from "../Home/comps/sousuo-list.vue";
export default {
components: {
// sousuoList,
......@@ -381,79 +370,141 @@ export default {
data() {
return {
chaxun: {
keyArr:[],
keyArr: [],
type: "all",
typeList:[],
typeList: [],
keywords: "",
},
changeColor:false,
xtsList:[],
bzwxList:[],
listResult:{
dwbm:[],
ebXML:[],
ecr:[],
epc:[],
ewtm:[],
gds:[],
gln:[],
rfid:[],
sptm:[],
zxcbm:[]
changeColor: false,
xtsList: [],
bzwxList: [],
listResult: {
dwbm: [],
ebXML: [],
ecr: [],
epc: [],
ewtm: [],
gds: [],
gln: [],
rfid: [],
sptm: [],
zxcbm: [],
},
hotListArr:[]
hotListArr: [],
cjwt: [
{
name: "全部问题",
path: "/Business/Faq",
query: {
type: "",
},
},
{
name: "业务办理",
path: "/Business/Faq",
query: {
type: "ywbl",
},
},
{
name: "产品信息通报",
path: "/Business/Faq",
query: {
type: "cpxxtb",
},
},
{
name: "编码技术",
path: "/Business/Faq",
query: {
type: "bmjs",
},
},
{
name: "法规与标准",
path: "/Business/Faq",
query: {
type: "fgybz",
},
},
{
name: "条码质量",
path: "/Business/Faq",
query: {
type: "tmzl",
},
},
{
name: "条码技术应用",
path: "/Business/Faq",
query: {
type: "tmjsyy",
},
},
{
name: "其他",
path: "/Business/Faq",
query: {
type: "other",
},
},
],
};
},
created() {
for (var i = 0; i < 26; i++) {
this.chaxun.keyArr.push(String.fromCharCode((65 + i)));
this.chaxun.keyArr.push(String.fromCharCode(65 + i));
}
this.xtsListFn()
this.xtsListFn();
this.ycListFn();
this.searchKnowledgeList('all','')
this.hotList()
this.searchKnowledgeInfoList()
this.searchKnowledgeList("all", "");
this.hotList();
this.searchKnowledgeInfoList();
},
methods: {
goGlossary(){
goGlossary() {
this.$router.push({
path: '/Knowledge/Glossary',
path: "/Knowledge/Glossary",
});
},
goGjbm(){
goGjbm() {
this.$router.push({
path: '/Knowledge/ANCCSystem',
path: "/Knowledge/ANCCSystem",
});
},
goGs1(){
goGs1() {
this.$router.push({
path: '/Knowledge/GS1System2',
path: "/Knowledge/GS1System2",
});
},
goSjzt(){
goSjzt() {
this.$router.push({
path: '/Knowledge/GS1System/sjzttx',
path: "/Knowledge/GS1System/sjzttx",
});
},
goBmtx(){
goBmtx() {
this.$router.push({
path: '/Knowledge/GS1System/bmtx',
path: "/Knowledge/GS1System/bmtx",
});
},
goSjjh(){
goSjjh() {
this.$router.push({
path: '/Knowledge/GS1System/sjjhtx',
path: "/Knowledge/GS1System/sjjhtx",
});
},
goKnowledgeList(){
goKnowledgeList() {
this.$router.push({
path: '/Knowledge/knowledgeList',
query: {type:this.chaxun.type,title:this.chaxun.keywords}
path: "/Knowledge/knowledgeList",
query: { type: this.chaxun.type, title: this.chaxun.keywords },
});
},
// 常见问题事件
cjwtHandelClick(obj) {
let routeData = this.$router.resolve({
path: obj.path,
query: obj.query
});
window.open(routeData.href, "_blank");
},
// 小贴士
async xtsListFn() {
......@@ -461,139 +512,126 @@ export default {
page: 1,
limit: 5,
};
const listRes =
await this.$api.knowledge.tips(params);
const listRes = await this.$api.knowledge.tips(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
let dataArr=data
this. xtsList= dataArr.slice(0,5)
let dataArr = data;
this.xtsList = dataArr.slice(0, 5);
}
},
getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
getInfo(id, directpath) {
if (directpath && directpath !== "" && directpath.length > 0) {
window.open(directpath, "_blank");
} else {
let link = this.$router.resolve({
path: `/Knowledge/article?id=${id}`,
});
window.open(link.href,'_blank')
window.open(link.href, "_blank");
}
},
// 标准文献列表
async ycListFn() {
const params = {
page: 1,
limit:5
limit: 5,
};
const policyListRes =
await this.$api.knowledge.xgbzList(params);
const policyListRes = await this.$api.knowledge.xgbzList(params);
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.bzwxList = data.list
this.bzwxList = data.list;
}
},
goInfo(id,directpath){
if(directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
goInfo(id, directpath) {
if (directpath !== "" && directpath.length > 0) {
window.open(directpath, "_blank");
} else {
let link = this.$router.resolve({
path: `/Knowledge/Statuteinfo?id=${id}`,
});
window.open(link.href,'_blank')
window.open(link.href, "_blank");
}
},
// 知识检索列表
async searchKnowledgeList(type,title) {
async searchKnowledgeList(type, title) {
const params = {
type: type,
title:title
title: title,
};
const policyListRes =
await this.$api.knowledge.searchKnowledgeInfo(params);
const policyListRes = await this.$api.knowledge.searchKnowledgeInfo(
params
);
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.listResult=data
this.listResult = data;
}
},
// 热点点击
async hotList() {
const policyListRes =
await this.$api.knowledge.hotList();
const policyListRes = await this.$api.knowledge.hotList();
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.hotListArr=data
this.hotListArr = data;
}
},
// 下拉
async searchKnowledgeInfoList() {
const policyListRes =
await this.$api.knowledge.searchKnowledgeInfoList();
const policyListRes = await this.$api.knowledge.searchKnowledgeInfoList();
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.chaxun.typeList=data
this.chaxun.typeList = data;
}
},
}
},
};
</script>
<style lang="scss">
.knowledge {
.knowledge-top-form {
@include elInput(50px, #414345, #414345, #fff, #cfdcea);
.el-select .el-input__inner{
.el-select .el-input__inner {
border-right: 0;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.knowledge-container{
.knowledge-container {
height: 290px;
}
}
@media screen and(max-width: 992px) {
.knowledge-top-form{
width: 100%!important;
.knowledge-top-form {
width: 100% !important;
}
}
@media screen and (max-width: 1401px) {
.gsbtn{
.gsbtn {
// padding: 9px 10px!important;
}
}
}
}
</style>
<style lang="scss" scoped>
.knowledge {
.knowledge-top {
.keyletter{
.keyletter {
overflow: hidden;
margin-top: 15px;
span{
span {
display: inline-block;
float: left;
width: 12px;
color: #F26335;
color: #f26335;
margin-right: 4px;
cursor: pointer;
font-size: 13px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #F26335;
color: #f26335;
line-height: 18px;
&:hover,&:active{
font-weight: 800!important;
&:hover,
&:active {
font-weight: 800 !important;
}
}
}
.knowledge-top-form {
display: flex;
......@@ -620,7 +658,7 @@ export default {
color: #999999;
margin-right: 20px;
}
&:nth-child(n+2){
&:nth-child(n + 2) {
cursor: pointer;
}
}
......@@ -629,56 +667,54 @@ export default {
.knowledge-middle {
background: #ffffff;
padding-bottom: 40px;
.container{
.container {
}
.more-des{
&:hover,&:active{
.more-des {
&:hover,
&:active {
cursor: pointer;
}
}
.knowledge-cnt{
.knowledge-title{
.knowledge-cnt {
.knowledge-title {
margin-bottom: 20px;
font-size: 18px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #0E2C6B;
color: #0e2c6b;
line-height: 25px;
margin-top: 40px;
position: relative;
cursor: pointer;
.leftIcon{
.leftIcon {
position: absolute;
left: 30px;
bottom: -20px;
}
.rightIcon{
.rightIcon {
position: absolute;
left: 140px;
bottom: -20px;
}
.xts{
.xts {
display: inline-block;
margin-left: 50px;
}
.changeColor{
color: #F26335
.changeColor {
color: #f26335;
}
}
.knowledge-container{
.knowledge-container {
width: 100%;
border: 1px solid #C5D8EE;
border: 1px solid #c5d8ee;
padding-left: 26px;
min-height: 290px;
img{
img {
width: 100%;
margin: 26px 0 0 0;
}
.bzwx{
.cjwtbtn{
.bzwx {
.cjwtbtn {
width: 130px;
height: 44px;
border-radius: 4px;
......@@ -686,90 +722,85 @@ export default {
padding: 0;
}
}
.gjwp .card-body{
.gjwp .card-body {
padding-left: 16px;
padding-top: 19px;
font-size: 15px;
padding-bottom: 0px;
.card-title{
color: #F26335;
.card-title {
color: #f26335;
}
.card-text{
.card-text {
// font-family: PingFangSC-Regular, PingFang SC;
color: #F26335;
color: #f26335;
line-height: 21px;
ul{
ul {
padding: 0;
}
li{
list-style-type:disc;
li {
list-style-type: disc;
line-height: 30px;
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space:nowrap;
white-space: nowrap;
display: inline-block;
width: 95%;
:hover,:active{
color: #F26335;
:hover,
:active {
color: #f26335;
}
}
li::before{
li::before {
content: "●";
color: #F26335;
color: #f26335;
margin-right: 10px;
}
}
}
.gsxt {
.card-body{
.card-body {
// padding: 0;
padding-top: 18px;
padding-right:30px;
padding-right: 30px;
padding-left: 16px;
padding-bottom: 16px;
.card-text{
.card-text {
font-size: 15px;
// font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #414345;
line-height: 28px;
margin: 0;
span{
color: #F26335;
span {
color: #f26335;
float: right;
font-size: 13px;
line-height: 28px;
}
}
.gsb-btn-cnt{
.gsb-btn-cnt {
overflow: hidden;
width: 100%;
}
.gsbtn{
.gsbtn {
height: 38px;
// background: #F26335;
border-radius: 4px;
color: #FFFFFF;
color: #ffffff;
line-height: 20px;
padding: 0;
font-size: 14px;
margin-top: 17px;
// margin-left: 14px;
}
.gsbtn:first-child{
.gsbtn:first-child {
// margin-left: 0px;
}
}
}
.bzwx{
li{
.bzwx {
li {
list-style: none;
font-size: 15px;
color: #414345;
......@@ -777,69 +808,66 @@ export default {
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space:nowrap;
white-space: nowrap;
display: inline-block;
width: 95%;
}
li:hover,li:active{
color: #F26335;
li:hover,
li:active {
color: #f26335;
}
li::before{
li::before {
content: "●";
color: #F26335;
color: #f26335;
margin-right: 10px;
}
}
}
}
}
.knowledge-bottom {
background: #F0F5FA;
background: #f0f5fa;
border-bottom: 1px solid rgba(0, 0, 0, 0.04);
padding: 20px 0 60px 0;
.knowledge-title{
.knowledge-title {
margin-bottom: 20px;
font-size: 18px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #0E2C6B;
color: #0e2c6b;
line-height: 25px;
margin-top: 40px;
position: relative;
cursor: pointer;
}
.card-body{
.card-body {
padding-left: 46px;
border: none;
border-radius: 0;
box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08);
}
li{
li {
list-style: none;
font-size: 15px;
color: #414345;
line-height: 51px;
cursor: pointer;
}
li::before{
li::before {
content: "●";
color: #F26335;
color: #f26335;
margin-right: 10px;
}
li:hover,li:active{
color: #F26335;
li:hover,
li:active {
color: #f26335;
}
li::before{
li::before {
content: "●";
color: #F26335;
color: #f26335;
margin-right: 10px;
}
}
}
</style>
\ No newline at end of file
src/views/Knowledge/knowledgeList.vue
......@@ -209,6 +209,7 @@
</div>
</div>
</div>
</div>
<div class="col-lg-4">
<!-- 热点点击 -->
......@@ -271,7 +272,7 @@ export default {
zxcbm:[]
},
hotListArr:[],
message:''
};
},
......@@ -317,10 +318,8 @@ export default {
});
},
goKnowledgeList(){
this.$router.push({
path: '/Knowledge/knowledgeList',
query: {type:this.chaxun.type,title:this.chaxun.keywords}
});
this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords)
},
getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
......@@ -354,6 +353,7 @@ export default {
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
this.listResult=data
this.message='查询无结果！'
}
......
src/views/News/Center.vue
......@@ -4,12 +4,12 @@
<cate :father="zxhdCate"></cate>
<div class="container">
<ul class="picNews-ul">
<li v-for="(tmp, i) in 4" :key="i">
<li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.pictureid,tmp.jumppath)">
<div class="picNews-li-tp">
<img src="../../assets/image/news/tpzx-tp1.jpg" alt="" />
<img :src="tmp.picFile" alt="" />
</div>
<div class="picNews-li-bt">
中国物品编码中心应邀出席食品安全智慧监管研讨会
{{tmp.title}}
</div>
</li>
</ul>
......@@ -47,10 +47,12 @@ export default {
pageSize:15,
totalCount:0
},
pictureListArr:[]
};
},
created() {
this.initListFn(this.tableResult.currPage);
this.pictureTop4()
},
methods: {
...mapMutations({
......@@ -60,6 +62,17 @@ export default {
lookMore() {
window.open('/News/PicNews', '_target');
},
// 图片资讯列表TOP4
async pictureTop4() {
const listRes =
await this.$api.news.pictureTop4();
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.pictureListArr = data
}
},
// 列表
async initListFn(page,limit) {
const params = {
......@@ -131,6 +144,8 @@ export default {
margin-bottom: 30px;
img {
width: 100%;
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
}
.picNews-li-bt {
width: 90%;
......
src/views/News/ECommerce.vue
......@@ -54,8 +54,8 @@
<!-- <span class="more">更多>></span> -->
</p>
<!-- <img src="../../assets/image/news/dzsw2.png" alt=""> -->
<video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video>
<img src="../../assets/image/news/dzsw2.png" alt="">
<!-- <video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video> -->
</div>
</div>
<div class="col-lg-6 lunbo ">
......
src/views/News/Notice.vue
......@@ -2,7 +2,7 @@
<div class="composite">
<cate :father="bzkydtCate"></cate>
<div class="container">
<p style="color:red;margin:15px 0 0 0 ;">【中心】</p>
<!-- <p style="color:red;margin:15px 0 0 0 ;">【中心】</p> -->
<list :list="tableResult.list" @getInfo='getInfo' />
<pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize" @getLimit='initListFn' />
</div>
......@@ -69,7 +69,7 @@ export default {
];
this.setMatche(matche);
let link = this.$router.resolve({
path: `/News/msg?id=${id}`,
path: `/News/NoticeArticle?id=${id}`,
});
window.open(link.href,'_blank')
}
......
src/views/News/index.vue
......@@ -126,7 +126,7 @@
</div>
<ul class="li-right-ul">
<li v-for="(tmpB, ii) in tmpA.list" :key="ii">
<span></span><span>{{ tmpB.name }}</span>
<span></span><span>{{ tmpB.title }}</span>
</li>
</ul>
</div>
......@@ -148,13 +148,13 @@ export default {
path:'/News/Retail',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -164,13 +164,13 @@ export default {
path:'/News/Logistics',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -180,13 +180,13 @@ export default {
path:'/News/Health',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -196,13 +196,13 @@ export default {
path:'/News/FoodSafety',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -212,13 +212,13 @@ export default {
path:'/News/ECommerce',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -228,13 +228,13 @@ export default {
path:'/News/MCommerce',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -244,13 +244,13 @@ export default {
path:'/News/IoT',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -260,13 +260,13 @@ export default {
path:'/News/Other',
list: [
{
name: "手机扫描商品条码：即时价格比较是零售业未来",
title: "手机扫描商品条码：即时价格比较是零售业未来",
},
{
name: "山东德州市场约两成零售商品的条码为假冒伪造",
title: "山东德州市场约两成零售商品的条码为假冒伪造",
},
{
name: "如何在非零售商品上使用商品条码——非零售商品的",
title: "如何在非零售商品上使用商品条码——非零售商品的",
},
],
},
......@@ -298,6 +298,16 @@ export default {
this.depthListFn();
//top
this.newsTop10()
//零售
this.retailList()
//物流
// this.logostocsList()
// 电子商务
this.yydtList()
//物联网
this.iotList()
// 其他
this.otherList()
},
methods:{
...mapMutations({
......@@ -323,6 +333,7 @@ export default {
path: path,
});
},
async initListFn(limit,classId) {
const params = {
page: 1,
......@@ -414,7 +425,79 @@ export default {
window.open(link.href,'_blank')
}
},
//零售列表
async retailList() {
const params = {
page: 1,
size: 3,
};
const listRes =
await this.$api.news.retailList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[0].list = data.list
}
},
//物流列表
async logostocsList() {
const params = {
page: 1,
size: 3,
};
const listRes =
await this.$api.news.logostocsList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[1].list = data.list
}
},
//电子商务列表
async yydtList() {
const params = {
page: 1,
limit: 3,
};
const listRes =
await this.$api.news.yydtList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[4].list = data.list
}
},
// 物联网列表
async iotList(page,limit) {
const params = {
page: 1,
limit: 3,
classId:30
};
const listRes =
await this.$api.news.iotList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[6].list = data.list
}
},
// 其他
async otherList(page,limit) {
const params = {
page: 1,
limit: 3,
};
const listRes =
await this.$api.news.otherList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.four[7].list = data.list
}
},
}
};
</script>
......@@ -439,6 +522,19 @@ export default {
</style>
<style lang="scss" scoped>
.news {
.picNews-top {
@include module-box;
}
.picNews-bottom {
@include module-box;
margin-top: 30px;
}
.picNews-li-tp{
img{
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
}
}
@mixin newsUl {
ul {
padding: 0;
......
src/views/News/msg.vue
......@@ -79,7 +79,7 @@
<div class="cate">
<span>公告通知</span>
</div>
<list2 :list="announceListArr" @getInfo="getInfo" />
<list2 :list="announceListArr" @getInfo="getNoticeInfo" />
</div>
</div>
<div class="zttj">
......@@ -232,6 +232,17 @@ export default {
window.open(link.href, "_blank");
}
},
getNoticeInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
let link = this.$router.resolve({
path: `/News/NoticeArticle?id=${id}`,
});
window.open(link.href,'_blank')
}
},
// weibo
toweibo() {
this.sharesinastring =
......
src/views/Org/Sites.vue
......@@ -3,7 +3,7 @@
<div class="guide-msg container">
<div class="msg-cont">
<div class="nsjg">
<Title :father="site.title1"></Title>
<Title :father="site.title1" ref="1-1"></Title>
<p>
依托于中国物品编码中心的国家条码质量检验检测中心，是原国家质量监督检验检疫总局授权的国家级产品质量监督检验中心（国认监认字225号）。质检中心筹建于1991年，并于1997年首次通过评审。2003年通过了中国实验室国家认可委员会认可（CNAL
No.
......@@ -15,7 +15,7 @@
</p>
</div>
<div class="nsjg">
<Title :father="site.title2"></Title>
<Title :father="site.title2" ref="1-2"></Title>
<p>
国家射频识别产品质量检验检测中心是国家级的专业射频识别相关产品检验机构，是我国射频识别领域的权威检测机构，是目前亚太地区唯一获得ARTC（Approved
RFID Test
......@@ -29,7 +29,7 @@
</p>
</div>
<div class="nsjg">
<Title :father="site.title3"></Title>
<Title :father="site.title3" ref="1-3"></Title>
<p>
中国自动识别技术协会（<a
href=" http://www.aimchina.org.cn"
......@@ -48,7 +48,7 @@
</p>
</div>
<div class="nsjg">
<Title :father="site.title4"></Title>
<Title :father="site.title4" ref="1-4"></Title>
<p>
<a href="http://www.cabc.net.cn/" target="_blank"
>中国条码技术与应用协会</a
......@@ -65,7 +65,7 @@
</p>
</div>
<div class="nsjg">
<Title :father="site.title5"></Title>
<Title :father="site.title5" ref="1-5"></Title>
<p>
2001年，中国物品编码中心发起成立了中国ECR委员会（<a
href="http://www.ecrchina.org/"
......@@ -80,37 +80,73 @@
</p>
</div>
<div class="nsjg">
<Title :father="site.title6"></Title>
<p>全国物品编码标准化技术委员会成立于2006年，其主要范围是负责商品、产品、服务、资产、物资等物品的分类编码、标识编码和属性编 码，物品品种编码，单件物品编码的国家标准制修订工作；全国物品编码的管理与服务及物品编码相关载体技术等方面的国家标准制修订工作。秘书处设在中国物品编码中心，受国家标准化管理委员会直接领导。</p>
<Title :father="site.title6" ref="1-6"></Title>
<p>
全国物品编码标准化技术委员会成立于2006年，其主要范围是负责商品、产品、服务、资产、物资等物品的分类编码、标识编码和属性编
码，物品品种编码，单件物品编码的国家标准制修订工作；全国物品编码的管理与服务及物品编码相关载体技术等方面的国家标准制修订工作。秘书处设在中国物品编码中心，受国家标准化管理委员会直接领导。
</p>
</div>
<div class="nsjg">
<Title :father="site.title7"></Title>
<p>全国物流信息管理标准化技术委员会（China Logistics Information Standardization Committee, 简称CLISC）主要负责物流信息基础、物流信息系统、物流信息安全、物流信息管理、物流信息应用等领域的标准化工作。其宗旨是：向国内企业引进世界最新的现代物流管理运作理念，推广现代物流管理新技术与成功的物流管理经验；协调、制定并推广相应的标准。秘书处设在中国物品编码中心，受国家标准化管理委员会的直接领导。</p>
<Title :father="site.title7" ref="1-7"></Title>
<p>
全国物流信息管理标准化技术委员会（China Logistics Information
Standardization Committee,
简称CLISC）主要负责物流信息基础、物流信息系统、物流信息安全、物流信息管理、物流信息应用等领域的标准化工作。其宗旨是：向国内企业引进世界最新的现代物流管理运作理念，推广现代物流管理新技术与成功的物流管理经验；协调、制定并推广相应的标准。秘书处设在中国物品编码中心，受国家标准化管理委员会的直接领导。
</p>
</div>
<div class="nsjg">
<Title :father="site.title8"></Title>
<p>全国信息技术标准化技术委员会自动识别与数据采集技术分技术委员会（ISO/IEC JTC1/SC31）是自动识别和数据采集技术及应用的标准化组织。主要职责是：为国家建立自动识别与数据采集技术标准化体系提供技术支持；负责自动识别与数据采集技术和应用领域相关国家标准组织制定、技术审查；为自动识别与数据采集技术在各领域中的应用提供技术支持；向国际标准组织提出本专业国际标准；对口国际ISO/IEC JTC1/SC31工作；协调与其它相关分技术委员会的关系。秘书处设在中国物品编码中心。</p>
<Title :father="site.title8" ref="1-8"></Title>
<p>
全国信息技术标准化技术委员会自动识别与数据采集技术分技术委员会（ISO/IEC
JTC1/SC31）是自动识别和数据采集技术及应用的标准化组织。主要职责是：为国家建立自动识别与数据采集技术标准化体系提供技术支持；负责自动识别与数据采集技术和应用领域相关国家标准组织制定、技术审查；为自动识别与数据采集技术在各领域中的应用提供技术支持；向国际标准组织提出本专业国际标准；对口国际ISO/IEC
JTC1/SC31工作；协调与其它相关分技术委员会的关系。秘书处设在中国物品编码中心。
</p>
</div>
<div class="nsjg">
<Title :father="site.title9"></Title>
<p>物联网编码标识技术作为是物联网最为基础的关键技术，编码标识技术体系由编码（代码）、数据载体、数据协议、信息系统、网络解析、发现服务、应用等共同构成的完整技术体系。物联网中的编码标识已成为当前的焦点和热点问题，各个国家和国际组织都在尝试提出一种适合于物联网应用的编码。“国家物联网编码标识项目组”将重点致力于我国物联网编码标识的基础技术标准制订、物联网在各个行业领域的编码标识体系制订，以及推广应用等工作…</p>
<Title :father="site.title9" ref="1-9"></Title>
<p>
物联网编码标识技术作为是物联网最为基础的关键技术，编码标识技术体系由编码（代码）、数据载体、数据协议、信息系统、网络解析、发现服务、应用等共同构成的完整技术体系。物联网中的编码标识已成为当前的焦点和热点问题，各个国家和国际组织都在尝试提出一种适合于物联网应用的编码。“国家物联网编码标识项目组”将重点致力于我国物联网编码标识的基础技术标准制订、物联网在各个行业领域的编码标识体系制订，以及推广应用等工作…
</p>
</div>
<div class="nsjg">
<Title :father="site.title10"></Title>
<p>中国自动识别技术杂志社是由国家质检总局主管，中国物品编码中心和中国自动识别技术协会联合主办的出版机构。按照国家新闻出版总署关于中央新闻出版业文化体制改革精神的要求，经国家质检总局同意，2013年3月，中国物品编码中心主办的《条码与信息系统》编辑部与中国自动识别技术协会主办的《中国自动识别技术》杂志社进行了改革重组，重组后的《中国自动识别技术》杂志社2013年3月15日正式运营，统筹开展两份期刊的出版发行工作…</p>
<Title :father="site.title10" ref="1-10"></Title>
<p>
中国自动识别技术杂志社是由国家质检总局主管，中国物品编码中心和中国自动识别技术协会联合主办的出版机构。按照国家新闻出版总署关于中央新闻出版业文化体制改革精神的要求，经国家质检总局同意，2013年3月，中国物品编码中心主办的《条码与信息系统》编辑部与中国自动识别技术协会主办的《中国自动识别技术》杂志社进行了改革重组，重组后的《中国自动识别技术》杂志社2013年3月15日正式运营，统筹开展两份期刊的出版发行工作…
</p>
</div>
<div class="nsjg">
<Title :father="site.title11"></Title>
<p>全球产品电子代码中国管理中心（EPCglobal China）作为EPCglobal在中国大陆地区的唯一组织成员，负责中国范围内产品电子代码的注册、管理和标准化工作，推广EPC系统，提供技术支持和培训产品电子代码系统用户。EPCglobal China由中国物品编码中心负责组织和管理。</p>
<p>
全球产品电子代码中国管理中心（EPCglobal
China）作为EPCglobal在中国大陆地区的唯一组织成员，负责中国范围内产品电子代码的注册、管理和标准化工作，推广EPC系统，提供技术支持和培训产品电子代码系统用户。EPCglobal
China由中国物品编码中心负责组织和管理。
</p>
</div>
<div class="nsjg">
<Title :father="site.title12"></Title>
<p>中国UNSPSC动态维护管理中心（UNSPSC China）是由联合国开发计划署委托开发的全球产品与服务分类体系，主要适用于电子商务和政府间采购，并由美国统一代码委员会（UCC）全权实时维护和管理。2004年，UCC正式授权中国物品编码中心独家负责UNSPSC中文版本的全部工作。中国UNSPSC动态维护管理中心成立，负责UNSPSC的本地化工作。</p>
<Title :father="site.title12" ref="1-12"></Title>
<p>
中国UNSPSC动态维护管理中心（UNSPSC
China）是由联合国开发计划署委托开发的全球产品与服务分类体系，主要适用于电子商务和政府间采购，并由美国统一代码委员会（UCC）全权实时维护和管理。2004年，UCC正式授权中国物品编码中心独家负责UNSPSC中文版本的全部工作。中国UNSPSC动态维护管理中心成立，负责UNSPSC的本地化工作。
</p>
</div>
<div class="nsjg">
<Title :father="site.title13"></Title>
<p>中国物品编码中心技术服务公司隶属于中国物品编码中心，成立于1992年。北京东方捷码科技开发中心（<a href="http://www.anccweb.com/" target="_blank" style="color: red">http://www.anccweb.com/</a>）成立于2000年，是中国物品编码中心技术服务公司的子公司。公司成立以后，研发和技术人员参与编制和审查自动识别技术与信息标准化相关的国家标准、行业标准、武警标准；承担国家科研项目和科研课题，将科研成果转化为应用产品；开发条码技术和射频技术的管理系统应用在国家管理部门、军队、武警、工业生产、物流仓储、农业养殖、商业、印刷业等领域。</p>
<p>北京东方捷码科技开发中心（<a href="http://www.anccweb.com/" target="_blank" style="color: red">http://www.anccweb.com/</a>）产品开发大部分涉及条码技术和RFID等自动识别技术，公司的研发和技术人员对条码等相关技术进行深入探究和追求，研发人员在条码技术和自动信息处理技术方面有较深的造诣。是国内专业开发和生产条码检测设备的企业，建立了拥有专利技术和自主知识产权的条码检测仪器的研发和生产基地，台式和便携式条码检测仪系列产品打破了国外技术的垄断，替代进口产品；C42A台式条码检测仪成为我国条码质检中心（国家级检测机构）和全部省级条码检测机构的基础检测仪器，便携式条码检测仪也已经应用到国家和地方的条码检测机构，大专院校，各类生产、物流、印刷、商业企业。</p>
<Title :father="site.title13" ref="1-13"></Title>
<p>
中国物品编码中心技术服务公司隶属于中国物品编码中心，成立于1992年。北京东方捷码科技开发中心（<a
href="http://www.anccweb.com/"
target="_blank"
style="color: red"
>http://www.anccweb.com/</a
>）成立于2000年，是中国物品编码中心技术服务公司的子公司。公司成立以后，研发和技术人员参与编制和审查自动识别技术与信息标准化相关的国家标准、行业标准、武警标准；承担国家科研项目和科研课题，将科研成果转化为应用产品；开发条码技术和射频技术的管理系统应用在国家管理部门、军队、武警、工业生产、物流仓储、农业养殖、商业、印刷业等领域。
</p>
<p>
北京东方捷码科技开发中心（<a
href="http://www.anccweb.com/"
target="_blank"
style="color: red"
>http://www.anccweb.com/</a
>）产品开发大部分涉及条码技术和RFID等自动识别技术，公司的研发和技术人员对条码等相关技术进行深入探究和追求，研发人员在条码技术和自动信息处理技术方面有较深的造诣。是国内专业开发和生产条码检测设备的企业，建立了拥有专利技术和自主知识产权的条码检测仪器的研发和生产基地，台式和便携式条码检测仪系列产品打破了国外技术的垄断，替代进口产品；C42A台式条码检测仪成为我国条码质检中心（国家级检测机构）和全部省级条码检测机构的基础检测仪器，便携式条码检测仪也已经应用到国家和地方的条码检测机构，大专院校，各类生产、物流、印刷、商业企业。
</p>
</div>
</div>
</div>
......@@ -168,6 +204,26 @@ export default {
},
};
},
watch: {
$route: {
handler(val) {
this.$nextTick(() => {
Object.keys(this.$refs).forEach((key) => {
this.$refs[key].$el.setAttribute("class", "zxcxgj-title");
});
if (val.query.id) {
const top = this.$refs[val.query.id].$el.offsetTop;
window.scrollTo(0, top);
this.$refs[val.query.id].$el.setAttribute(
"class",
"zxcxgj-title actived"
);
}
});
},
immediate: true,
},
},
};
</script>
<style lang="scss" scoped>
......
src/views/comps/title.vue
<template>
<div class="zxcxgj-title">
<span></span>{{ father.name }}
</div>
<div class="zxcxgj-title"><span></span>{{ father.name }}</div>
</template>
<script>
export default {
......@@ -11,7 +9,7 @@ export default {
<style lang="scss">
.zxcxgj-title {
font-size: 16px;
color: #04408d;
color: #008dbd;
border-bottom: 1px solid #c5d8ee;
padding: 14px 0;
display: flex;
......@@ -25,5 +23,8 @@ export default {
border-radius: 50%;
margin-right: 10px;
}
&.actived {
color: #04408d;
}
}
</style>
\ No newline at end of file
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