Skip to content

G
gs1
Commit 77c2ec0b by Tang
Options

Merge remote-tracking branch 'origin/master'

parents bb860909 2dcda9fa
Showing with 240 additions and 121 deletions
src/components/layout/header/mock.js
...@@ -69,6 +69,18 @@ export const nav = [ ...@@ -69,6 +69,18 @@ export const nav = [
}, },
{ {
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "物联网标识工作组",
index: 0,
link: "/Org/wly",
isHiddenMenu: true,
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "质检中心/协会/杂志社/标委会/其他", path: "/Org/Sites" },
{ name: "物联网标识工作组" },
],
},
{
id: uuid("gs_nav"),
name: "地方编码分支机构", name: "地方编码分支机构",
index: 0, index: 0,
link: "/Org/Branch", link: "/Org/Branch",
......
src/router/index.js
...@@ -79,6 +79,14 @@ const routes = [{ ...@@ -79,6 +79,14 @@ const routes = [{
component: () => import("@/views/Org/Sites.vue"), component: () => import("@/views/Org/Sites.vue"),
}, },
{ {
path: "/Org/wly",
name: "Sites",
meta: {
name: "质检中心/协会/杂志社/标委会/其他",
},
component: () => import("@/views/Org/wly.vue"),
},
{
path: "/Org/Branch", path: "/Org/Branch",
name: "Branch", name: "Branch",
meta: { meta: {
......
src/views/Home/comps/other-list.vue
<template> <template>
<div class="list"> <div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)"> <div v-for="(tmp, i) in list" :key="i" class="row">
<div class="col li"> <div class="col li">
<span></span> <span></span>
<span :title="tmp.name">{{ tmp.name }}</span> <span :title="tmp.name" @click="handelUrl(tmp)">{{ tmp.name }}</span>
<span :title="tmp.subName" @click="handelSubUrl(tmp)"
><a>{{ tmp.subName }}</a></span
>
</div> </div>
</div> </div>
</div> </div>
...@@ -12,12 +15,31 @@ ...@@ -12,12 +15,31 @@
export default { export default {
props: ["list"], props: ["list"],
methods: { methods: {
handelMsg(obj) { handelUrl(obj) {
let routeData = this.$router.resolve({ let routeData;
path: obj.url, if (obj.type && obj.type === "link") {
query: obj.query, routeData = obj.url;
}); window.open(routeData, "_blank");
window.open(routeData.href, "_blank"); } else {
routeData = this.$router.resolve({
path: obj.url,
query: obj.query,
});
window.open(routeData.href, "_blank");
}
},
handelSubUrl(obj) {
let routeData;
if (obj.type && obj.type === "link") {
routeData = obj.subUrl;
window.open(routeData, "_blank");
} else {
routeData = this.$router.resolve({
path: obj.subUrl,
query: obj.query,
});
window.open(routeData.href, "_blank");
}
}, },
}, },
}; };
...@@ -48,9 +70,11 @@ export default { ...@@ -48,9 +70,11 @@ export default {
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
&:nth-child(2) { &:nth-child(3) {
flex: 1; a {
@include ellipsis; text-decoration: underline;
color: #ff7f24;
}
} }
} }
} }
......
src/views/Home/index.vue
...@@ -892,10 +892,8 @@ export default { ...@@ -892,10 +892,8 @@ export default {
data: [ data: [
{ {
name: "国家射频识别产品质量检验检测中心", name: "国家射频识别产品质量检验检测中心",
url: "/Org/Sites", url: "http://www.spjc.org.cn/",
query: { type: 'link',
id: "1-1",
},
}, },
{ {
name: "国家条码质量检验检测中心", name: "国家条码质量检验检测中心",
...@@ -906,59 +904,50 @@ export default { ...@@ -906,59 +904,50 @@ export default {
}, },
{ {
name: "中国自动识别技术协会", name: "中国自动识别技术协会",
url: "/Org/Sites", url: "http://www.aimchina.org.cn/",
query: { type: 'link',
id: "1-3",
},
}, },
{ {
name: "中国条码技术与应用协会", name: "中国条码技术与应用协会",
url: "/Org/Sites", url: "http://www.cabc.net.cn/",
query: { type: 'link',
id: "1-4",
},
}, },
{ {
name: "《中国自动识别技术》杂志社电子版", name: "《中国自动识别技术》杂志社",
url: "/Org/Sites", subName: "电子版",
query: { url: "http://www.aidchina.com.cn/",
id: "1-5", subUrl: "http://www.aidchina.com.cn/zzzq/index.htm",
}, type: 'link',
}, },
{ {
name: "中国ECR委员会", name: "中国ECR委员会",
url: "/Org/Sites", url: "http://www.ecrchina.org/",
query: { type: 'link',
id: "1-6",
},
}, },
{ {
name: "全国物品编码标准化技术委员会", name: "全国物品编码标准化技术委员会",
url: "/Org/Sites", url: "/Org/Sites",
query: { query: {
id: "1-7", id: "1-6",
}, },
}, },
{ {
name: "全国物流信息管理标准化技术委员会", name: "全国物流信息管理标准化技术委员会",
url: "/Org/Sites", url: "/Org/Sites",
query: { query: {
id: "1-8", id: "1-7",
}, },
}, },
{ {
name: "全国自动识别与数据采集分委员会", name: "全国自动识别与数据采集分委员会",
url: "/Org/Sites", url: "/Org/Sites",
query: { query: {
id: "1-9", id: "1-8",
}, },
}, },
{ {
name: "物联网标识工作组", name: "物联网标识工作组",
url: "/Org/Sites", url: "/Org/wly",
query: {
id: "1-10",
},
}, },
{ {
name: "全球产品电子代码中国管理中心", name: "全球产品电子代码中国管理中心",
...@@ -976,10 +965,8 @@ export default { ...@@ -976,10 +965,8 @@ export default {
}, },
{ {
name: "北京东方捷码科技开发中心", name: "北京东方捷码科技开发中心",
url: "/Org/Sites", url: "http://www.anccweb.com/",
query: { type: 'link',
id: "1-13",
},
}, },
], ],
}, },
...@@ -1093,7 +1080,10 @@ export default { ...@@ -1093,7 +1080,10 @@ export default {
// 商品全球身份证 // 商品全球身份证
this.homeNewGtin(); this.homeNewGtin();
// 党建文化新闻列表 // 党建文化新闻列表
this.homeGet4PartyTopNews(); Promise.all([this.homeGet4PartyTopNews(), this.homeGet1PartyTopNews()]).then((result => {
console.log(result, '党建文化新闻列表集合');
this.djwh.data = [].concat(result[0], result[1]);
}));
// 专题聚焦 // 专题聚焦
this.homeGetsdztListTopNews(); this.homeGetsdztListTopNews();
// 首页小轮播图 // 首页小轮播图
...@@ -1160,7 +1150,7 @@ export default { ...@@ -1160,7 +1150,7 @@ export default {
// 党建文化新闻列表 // 党建文化新闻列表
async homeGet4PartyTopNews() { async homeGet4PartyTopNews() {
const params = { const params = {
count: 5, count: 4,
classid: 428, classid: 428,
}; };
const homeGet4PartyTopNewsRes = await this.$api.home.homeGet4PartyTopNews( const homeGet4PartyTopNewsRes = await this.$api.home.homeGet4PartyTopNews(
...@@ -1169,7 +1159,23 @@ export default { ...@@ -1169,7 +1159,23 @@ export default {
const { returnCode, data } = homeGet4PartyTopNewsRes; const { returnCode, data } = homeGet4PartyTopNewsRes;
if (returnCode === "0") { if (returnCode === "0") {
console.log(homeGet4PartyTopNewsRes, "党建文化新闻列表"); console.log(homeGet4PartyTopNewsRes, "党建文化新闻列表");
this.djwh.data = data; // this.djwh.data = data;
return data;
}
},
async homeGet1PartyTopNews() {
const params = {
count: 1,
classid: 429,
};
const homeGet1PartyTopNewsRes = await this.$api.home.homeGet4PartyTopNews(
params
);
const { returnCode, data } = homeGet1PartyTopNewsRes;
if (returnCode === "0") {
console.log(homeGet1PartyTopNewsRes, "党建文化新闻列表");
// this.djwh.data = data;
return data;
} }
}, },
// 专题聚焦 // 专题聚焦
......
src/views/Org/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<breadcrumb /> <breadcrumb />
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-lg-3">
<left :list="routes"/> <left :list="routes" />
</div> </div>
<div class="col-lg-9"> <div class="col-lg-9">
<router-view></router-view> <router-view></router-view>
...@@ -23,84 +23,90 @@ export default { ...@@ -23,84 +23,90 @@ export default {
data() { data() {
return { return {
routeList: [ routeList: [
{ {
name: "中心简介", name: "中心简介",
path: "/Org/Intro", path: "/Org/Intro",
active: "Intro", active: "Intro",
}, },
{ {
name: "中心领导", name: "中心领导",
path: "/Org/Leadership", path: "/Org/Leadership",
active: "Leadership", active: "Leadership",
}, },
{ {
name: "内设机构", name: "内设机构",
path: "/Org/Departments", path: "/Org/Departments",
active: "Departments", active: "Departments",
}, },
{ {
name: "质检中心/协会/杂志社/标委会/其他", name: "质检中心/协会/杂志社/标委会/其他",
path: "/Org/Sites", path: "/Org/Sites",
active: "Sites", active: "Sites",
}, },
{ {
name: "地方编码分支机构", name: "物联网标识工作组",
path: "/Org/Branch", path: "/Org/wly",
active: "Branch", active: "Sites",
}, hidden: true,
{ },
name: "地方编码分支机构详情", {
path: "/Org/BranchMsg", name: "地方编码分支机构",
active: "Branch", path: "/Org/Branch",
hidden: true, active: "Branch",
}, },
{ {
name: "国际物品编码组织(GS1)", name: "地方编码分支机构详情",
path: "https://www.gs1.org/", path: "/Org/BranchMsg",
type: "link", active: "Branch",
}, hidden: true,
{ },
name: "国际物品编码组织（GS1）成员网站", {
path: "/Org/GS1Members", name: "国际物品编码组织(GS1)",
active: "GS1Members", path: "https://www.gs1.org/",
}, type: "link",
{ },
name: "质量管理体系", {
path: "/Org/ISO", name: "国际物品编码组织（GS1）成员网站",
children: [ path: "/Org/GS1Members",
{ active: "GS1Members",
name: "指导思想", },
path: "/Org/ISO/Ideology", {
active: "Ideology", name: "质量管理体系",
}, path: "/Org/ISO",
{ children: [
name: "质量方针", {
path: "/Org/ISO/Policy", name: "指导思想",
active: "Policy", path: "/Org/ISO/Ideology",
}, active: "Ideology",
{ },
name: "质量目标", {
path: "/Org/ISO/Goal", name: "质量方针",
active: "Goal", path: "/Org/ISO/Policy",
}, active: "Policy",
{ },
name: "质量管理手册", {
path: "/Org/ISO/Manual", name: "质量目标",
active: "Manual", path: "/Org/ISO/Goal",
}, active: "Goal",
{ },
name: "程序文件", {
path: "/Org/ISO/Files", name: "质量管理手册",
active: "Files", path: "/Org/ISO/Manual",
}, active: "Manual",
], },
}, {
], name: "程序文件",
path: "/Org/ISO/Files",
active: "Files",
},
],
},
],
}; };
}, },
computed: { computed: {
routes() { routes() {
let newRouteList = [] let newRouteList = [];
const currentPath = this.$route.path; const currentPath = this.$route.path;
newRouteList = this.deepFindRoutes(this.routeList, currentPath); newRouteList = this.deepFindRoutes(this.routeList, currentPath);
return newRouteList; return newRouteList;
...@@ -130,6 +136,7 @@ export default { ...@@ -130,6 +136,7 @@ export default {
} }
}; };
deep(menuList, activePath); deep(menuList, activePath);
console.log(current, "current");
return current; return current;
}, },
}, },
......
src/views/Org/wly.vue 0 → 100644
<template>
<div class="guide">
<div class="guide-msg container">
<div class="msg-cont">
<dl>
<dt>工作组全称</dt>
<dd>国家物联网基础标准工作组编码标识项目组</dd>
<dt>工作组介绍</dt>
<dd>
2011年10月21日，国家物联网基础工作组第三次全体会议在无锡市千禧大酒店顺利召开，来自全国近40余家单位、近60位代表出席了本次会议。国家标准化技术委员会方向主任在会上正式宣布了在国家物联网基础工作组下成立“国家物联网编码标识项目组”，组长单位设在中国物品编码中心。同时宣布成立的还有物联网总体架构项目组、国家物联网信息安全项目组。
</dd>
<dd>
物联网编码标识技术作为是物联网最为基础的关键技术，编码标识技术体系由编码（代码）、数据载体、数据协议、信息系统、网络解析、发现服务、应用等共同构成的完整技术体系。物联网中的编码标识已成为当前的焦点和热点问题，各个国家和国际组织都在尝试提出一种适合于物联网应用的编码。“国家物联网编码标识项目组”将重点致力于我国物联网编码标识的基础技术标准制订、物联网在各个行业领域的编码标识体系制订，以及推广应用等工作。
</dd>
<dd>
“国家物联网编码标识项目组”目前已有成员包括中国互联网中心、北京交通大学、山东省标准化院、清华大学、无锡物联网研究院、公安部第三研究所等近二十家成员单位。项目组目前正面向全国招收新成员单位，并全面征求项目组的工作建议，关注我国物联网编码标识标准化工作的单位或个人，可尽快同国家物联网编码标识项目组直接联系。
</dd>
<dt>工作组目标</dt>
<dd>
构建我国物联网统一编码标识标准体系，做好顶层规划，推动我国物联网编码标识标准化；
</dd>
<dd>制定关键基础标准，完善国家物联网基础标准体系；</dd>
<dd>结合国家重点行业，从编码标识标准化化方面支持行业物联网建设；</dd>
<dd>
成为构建我国物联网编码标识研究平台：联合国内有影响力的产学研机构，组建一批专家队伍。
</dd>
</dl>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
<style lang="scss" scoped>
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
font-size: 14px;
font-weight: 300;
.msg-cont {
padding: 0 15px;
}
dl {
line-height: 28px;
dt {
font-weight: bold;
}
dd {
text-indent: 2em;
}
}
}
}
</style>
\ No newline at end of file
src/views/comps/left.vue
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
}, },
computed: { computed: {
currentName() { currentName() {
console.log(this.$route.name, 'this.$route.name');
return this.$route.name; return this.$route.name;
}, },
}, },
......
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