Skip to content

G
gs1
Commit bf443424 by Jianli Ou
Options

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

parents eb96b772 63ec0a43
Showing with 780 additions and 205 deletions
src/axios/api.js
...@@ -20,6 +20,8 @@ import org from "./module/org.js" ...@@ -20,6 +20,8 @@ import org from "./module/org.js"
import business from "./module/business.js" import business from "./module/business.js"
import search from "./module/search.js" import search from "./module/search.js"
import service from "./module/service.js" import service from "./module/service.js"
import knowledge from "./module/knowledge.js"
import news from "./module/news.js"
const api = { const api = {
home, home,
...@@ -27,6 +29,8 @@ const api = { ...@@ -27,6 +29,8 @@ const api = {
business, business,
search, search,
service, service,
knowledge,
news,
getCaptcha, getCaptcha,
} }
......
src/axios/module/knowledge.js 0 → 100644
import {
POST,
GET
} from "../fetch.js"
const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
// 政策法规列表
const policyList = (params = {}) => {
return POST(`${Prefix}/office/policy/api/policyList`, params)
}
// 政策法规详情
const policyInfo = (params = {}) => {
return GET(`${Prefix}/office/policy/api/info/${params.id}`)
}
// 小贴士
const tips = (params = {}) => {
return POST(`${Prefix}/office/news/api/tips`, params)
}
export default {
policyList,
policyInfo,
tips
}
src/axios/module/news.js 0 → 100644
import {
POST,
GET
} from "../fetch.js"
const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
// 图片资讯列表
const pictureList = (params = {}) => {
return POST(`${Prefix}/office/picture/api/pictureList`, params)
}
// 政图片资讯详情
const pictureInfo = (params = {}) => {
return GET(`${Prefix}/office/picture/api/info/${params.id}`)
}
// 行业应用
const industryApplication = (params = {}) => {
return POST(`${Prefix}/office/news/api/industryApplication`, params)
}
// 食品追溯
const foodSafetyList = (params = {}) => {
return POST(`${Prefix}/office/news/api/foodSafetyList`, params)
}
// 电子商务应用动态
const yydtList = (params = {}) => {
return POST(`${Prefix}/office/news/api/yydtList`, params)
}
// 电子商务视频动态
const spList = (params = {}) => {
return POST(`${Prefix}/office/news/api/spList`, params)
}
// 公告通知
const announceList = (params = {}) => {
return POST(`${Prefix}/office/news/api/announceList`, params)
}
// 公告通知详情
const announInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/announInfo/${params.id}`)
}
// 其他
const otherList = (params = {}) => {
return POST(`${Prefix}/office/news/api/otherList`, params)
}
export default {
pictureList,
pictureInfo,
industryApplication,
foodSafetyList,
yydtList,
spList,
announceList,
announInfo,
otherList
}
src/components/layout/header/mock.js
...@@ -665,7 +665,7 @@ export const nav = [ ...@@ -665,7 +665,7 @@ export const nav = [
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "应用领域", name: "应用领域",
index: 5, index: 5,
link: "/News", link: "/News/index",
style:{flex:'1 0 auto'}, style:{flex:'1 0 auto'},
children: [ children: [
{ {
...@@ -675,7 +675,7 @@ export const nav = [ ...@@ -675,7 +675,7 @@ export const nav = [
link: "/News/Retail", link: "/News/Retail",
style:{paddingRight:'132px'}, style:{paddingRight:'132px'},
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "零售" }, { name: "零售" },
], ],
}, },
...@@ -685,7 +685,7 @@ export const nav = [ ...@@ -685,7 +685,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/Logistics", link: "/News/Logistics",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "物流" }, { name: "物流" },
], ],
}, },
...@@ -695,7 +695,7 @@ export const nav = [ ...@@ -695,7 +695,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/Health", link: "/News/Health",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "医疗卫生" }, { name: "医疗卫生" },
], ],
}, },
...@@ -705,7 +705,7 @@ export const nav = [ ...@@ -705,7 +705,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/FoodSafety", link: "/News/FoodSafety",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "食品安全追溯" }, { name: "食品安全追溯" },
], ],
}, },
...@@ -715,7 +715,7 @@ export const nav = [ ...@@ -715,7 +715,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/ECommerce", link: "/News/ECommerce",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "电子商务" }, { name: "电子商务" },
], ],
}, },
...@@ -725,7 +725,7 @@ export const nav = [ ...@@ -725,7 +725,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/MCommerce", link: "/News/MCommerce",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "移动商务" }, { name: "移动商务" },
], ],
}, },
...@@ -735,7 +735,7 @@ export const nav = [ ...@@ -735,7 +735,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/IoT", link: "/News/IoT",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "物联网" }, { name: "物联网" },
], ],
}, },
...@@ -745,7 +745,7 @@ export const nav = [ ...@@ -745,7 +745,7 @@ export const nav = [
index: 5, index: 5,
link: "/News/Other", link: "/News/Other",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News" }, { name: "资讯中心", path: "/News/index" },
{ name: "其他" }, { name: "其他" },
], ],
}, },
......
src/router/index.js
...@@ -550,6 +550,7 @@ const routes = [ ...@@ -550,6 +550,7 @@ const routes = [
}, },
component: () => import("@/views/News/Notice.vue"), component: () => import("@/views/News/Notice.vue"),
}, },
{ {
path: "/News/FoodSafety", path: "/News/FoodSafety",
name: "FoodSafety", name: "FoodSafety",
...@@ -585,6 +586,14 @@ const routes = [ ...@@ -585,6 +586,14 @@ const routes = [
] ]
}, },
{ {
path: "/News/NoticeArticle",
name: "NoticeArticle",
meta: {
name: "公告详情",
},
component: () => import("@/views/News/NoticeArticle.vue"),
},
{
path: "/News/msg", path: "/News/msg",
name: "msg", name: "msg",
meta: { meta: {
...@@ -842,6 +851,11 @@ const routes = [ ...@@ -842,6 +851,11 @@ const routes = [
}, },
component: () => import("@/views/Knowledge/Statute.vue"), component: () => import("@/views/Knowledge/Statute.vue"),
}, },
{
path: "/Knowledge/Statuteinfo",
name: "Statuteinfo",
component: () => import("@/views/Knowledge/Statuteinfo"),
},
//成员专区 //成员专区
{ {
path: "/Member", path: "/Member",
...@@ -851,6 +865,7 @@ const routes = [ ...@@ -851,6 +865,7 @@ const routes = [
}, },
component: () => import("@/views/Member/index.vue"), component: () => import("@/views/Member/index.vue"),
}, },
// 党建文化列表
{ {
path: "/djwhlist", path: "/djwhlist",
name: "djwhlist", name: "djwhlist",
......
src/views/Djwh/index.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="header"> <div class="header">
<img src="../../assets/image/djwh/top_pho.jpg" /> <img src="../../assets/image/djwh/top_pho.jpg" />
<p> <p>
<a href="/Home">返回编码中心首页</a> <a href="/Home" target="_blank">返回编码中心首页</a>
</p> </p>
</div> </div>
<!-- container --> <!-- container -->
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="border-div list-style"> <div class="border-div list-style">
<div class="middle-title"> <div class="middle-title">
<h4>活动报道</h4> <h4>活动报道</h4>
<a href="/djwhlist">更多>></a> <a href="/djwhlist" >更多>></a>
</div> </div>
<div class="middle-list"> <div class="middle-list">
<ul> <ul>
...@@ -146,27 +146,13 @@ ...@@ -146,27 +146,13 @@
</div> </div>
<div class="middle-list"> <div class="middle-list">
<ul> <ul>
<li> <li><a href=" " target="_blank">《中国共产党第十九届中央委员会第五次全体会议公报》</a></li>
<a href="#">《中国共产党第十九届中央委员会第</a> <li><a :href="path+'/djwh/download/19thfile/党的十九大报告全文.docx'" target="_blank">党的十九大报告全文</a></li>
</li> <li><a :href="path+'/djwh/download/19thfile/质检总局党组关于认真学习宣传贯彻党的十九大精神的通知.doc'" target="_blank">质检总局党组关于认真学习宣传贯彻党的十九大精神的通知</a></li>
<li> <li><a :href="path+'/djwh/download/19thfile/质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知.doc'" target="_blank">质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知</a></li>
<a href="#">党的十九大报告全文</a> <li><a :href="path+'/djwh/download/19thfile/中共中央关于认真学习宣传贯彻党的十九大精神的决定.docx'" target="_blank">中共中央关于认真学习宣传贯彻党的十九大精神的决定</a></li>
</li> <li><a :href="path+'/djwh/download/19thfile/中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知.pdf'" target="_blank">中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知</a></li>
<li> <li><a :href="path+'/djwh/download/19thfile/中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知.PDF'" target="_blank">中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知</a></li>
<a href="#">“质检总局党组关于认真学习宣传贯</a>
</li>
<li>
<a href="#">质检总局党组关于印发质检系统学习</a>
</li>
<li>
<a href="#">中共中央关于认真学习宣传贯彻党的十九大精神的决定</a>
</li>
<li>
<a href="#">中共中央宣传部关于印发《党的十九</a>
</li>
<li>
<a href="#">中国物品编码中心关于印发学习宣传</a>
</li>
</ul> </ul>
</div> </div>
...@@ -271,6 +257,7 @@ export default { ...@@ -271,6 +257,7 @@ export default {
}, },
data() { data() {
return { return {
path:process.env.VUE_APP_HOST_URL,
animate:false, animate:false,
items:[ //消息列表对应的数组 items:[ //消息列表对应的数组
{name:"学习贯彻十九届五中全会精神1"}, {name:"学习贯彻十九届五中全会精神1"},
......
src/views/Knowledge/ANCCSystem.vue
...@@ -80,6 +80,7 @@ export default { ...@@ -80,6 +80,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
img{ img{
width: 80%; width: 80%;
......
src/views/Knowledge/GS1System/GS1System.vue
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
img{ img{
......
src/views/Knowledge/GS1System/bmtx.vue
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
img{ img{
......
src/views/Knowledge/GS1System/dwbm.vue
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/ebxml.vue
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/ewbm.vue
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/goodsEpc.vue
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/goodsGln.vue
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/goodsPosition.vue
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/gxfECR.vue
...@@ -100,6 +100,7 @@ export default { ...@@ -100,6 +100,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System/sjjhtx.vue
...@@ -67,6 +67,7 @@ export default { ...@@ -67,6 +67,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
img{ img{
width: 80%; width: 80%;
......
src/views/Knowledge/GS1System/sjzttx.vue
...@@ -94,6 +94,7 @@ export default { ...@@ -94,6 +94,7 @@ export default {
p { p {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
margin-bottom: 10px;
line-height: 28px; line-height: 28px;
} }
.pcenter{ .pcenter{
......
src/views/Knowledge/GS1System/zxcbm.vue
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/GS1System2.vue
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/Glossary.vue
...@@ -152,6 +152,7 @@ export default { ...@@ -152,6 +152,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
.keyletter{ .keyletter{
overflow: hidden; overflow: hidden;
......
src/views/Knowledge/Standard.vue
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/Knowledge/Statute.vue
...@@ -15,19 +15,20 @@ ...@@ -15,19 +15,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item, i) of fileList" :key="i"> <tr v-for="(item, i) of policyList.list" :key="i">
<td> <td style="width:50%">
<ul> <ul>
<li> <li>
<a :href="item.path" role="button" :data="item.id"> {{item.title}}</a> <a @click="getInfo(item.id)" role="button" > {{item.title}}</a>
</li> </li>
</ul> </ul>
</td> </td>
<td>{{item.promulgationTime}}</td> <td>{{item.releasedate}}</td>
<td>{{item.implementationTime}}</td> <td>{{item.updatedate}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<pages :total="policyList.totalCount" :currPage="policyList.currPage" @getLimit='policyListFn' />
</div> </div>
...@@ -38,69 +39,27 @@ ...@@ -38,69 +39,27 @@
<div class="title">相关标准</div> <div class="title">相关标准</div>
<ul> <ul>
<li v-for="(item,i) of fileList2" :key="i"> <li v-for="(item,i) of fileList2" :key="i">
<a :href="item.path" role="button" :data="item.id"> {{item.title}}</a> <a role="button" > {{item.title}}</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import breadcrumb from "../comps/breadcrumb.vue"; import breadcrumb from "../comps/breadcrumb.vue";
import pages from "../comps/pages.vue";
export default { export default {
components: { components: {
pages,
breadcrumb, breadcrumb,
}, },
data() { data() {
return { return {
fileList:[
{
id:1,
title:'商品条码管理办法',
path:'',
promulgationTime:'【2005-05-30】',
implementationTime:'【2005-10-01】'
},
{
id:2,
title:'商品条码印刷资格认定工作实施办法',
path:'',
promulgationTime:'【2000-07-29】',
implementationTime:'【2000-07-29】'
},
{
id:3,
title:'中华人民共和国标准化法',
path:'',
promulgationTime:'【2017-11-04】',
implementationTime:'【2018-01-01】'
},
{
id:4,
title:'新疆维吾尔自治区商品条码管理办法',
path:'',
promulgationTime:'【2015-09-02】',
implementationTime:'【2016-01-01】'
},
{
id:5,
title:'广西壮族自治区商品条码管理办法',
path:'',
promulgationTime:'【2014-10-19】',
implementationTime:'【2014-12-01】'
},
{
id:5,
title:'广西壮族自治区商品条码管理办法',
path:'',
promulgationTime:'【2014-10-19】',
implementationTime:'【2014-12-01】'
},
],
fileList2:[ fileList2:[
{ {
id:1, id:1,
...@@ -127,7 +86,13 @@ export default { ...@@ -127,7 +86,13 @@ export default {
title:'商品条码 参与方位置编码与条码表示 GB/T …', title:'商品条码 参与方位置编码与条码表示 GB/T …',
link:'' link:''
}, },
] ],
policyList:{
list:[],
currPage:1,
pageSize:15,
totalCount:0
}
}; };
}, },
computed: { computed: {
...@@ -136,8 +101,32 @@ export default { ...@@ -136,8 +101,32 @@ export default {
}, },
}, },
created() { created() {
this.policyListFn(this.policyList.currPage);
},
methods:{
// 政策法规列表
async policyListFn(page,limit) {
const params = {
page: page,
limit: 15,
};
const policyListRes =
await this.$api.knowledge.policyList(params);
const { returnCode, data } = policyListRes;
if (returnCode === "0") {
console.log(data, "政策法规列表");
this.policyList = data
}
}, },
getInfo(id){
console.log(id,'id')
this.$router.push({
path: `/Knowledge/Statuteinfo?id=${id}`,
});
}
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
...@@ -179,8 +168,7 @@ export default { ...@@ -179,8 +168,7 @@ export default {
font-size: 14px; font-size: 14px;
background: #fff; background: #fff;
padding-bottom: 30px; padding: 20px 5% 30px;
padding-top: 20px;
.title { .title {
padding: 0px 0px 10PX 0; padding: 0px 0px 10PX 0;
font-size: 18px; font-size: 18px;
...@@ -258,8 +246,7 @@ export default { ...@@ -258,8 +246,7 @@ export default {
table{ table{
border-collapse:separate; border-collapse:separate;
margin: 0; margin: 0;
width: 90%; width: 100%;
margin-left: 5%;
// mask-border: 30px; // mask-border: 30px;
border: none; border: none;
thead{ thead{
......
src/views/Knowledge/Statuteinfo.vue 0 → 100644
<template>
<div class="org container">
<breadcrumb />
<div class="row status-container">
<p class="title-style">{{title}}</p>
<div v-html="content"></div>
</div>
</div>
</template>
<script>
import breadcrumb from "../comps/breadcrumb.vue";
import pages from "../comps/pages.vue";
export default {
components: {
pages,
breadcrumb,
},
data() {
return {
id:this.$route.query.id,
content:'',
title:''
};
},
computed: {
routes() {
},
},
created() {
this.policyInfoFn();
},
mounted() {
console.log(2)
// 面包屑单独处理
},
methods:{
// 政策法规列表
async policyInfoFn() {
const params = {
id:this.id,
};
const policyInfoRes =
await this.$api.knowledge.policyInfo(params);
const { returnCode, data } = policyInfoRes;
if (returnCode === "0") {
console.log(data, "政策法规详情");
this.content=data.content;
this.title=data.title
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "知识中心", path: "/Knowledge" },
{ name: "政策法规", path: "/Knowledge/Statute" },
{ name: this.title },
]);
console.log(1)
}
},
}
};
</script>
<style lang="scss" scoped>
@media screen and(min-width: 992px) {
}
@media screen and (max-width: 992px) {
}
</style>
<style lang="scss" scoped>
.org {
padding-bottom: 20px;
.title-style{
font-size: 24px;
text-align: center;
padding: 30px;
border-bottom: 1px solid #b2b2b8;
color: #002c6c;
margin-bottom: 10px;
}
.status-container{
border-top: 7px solid #002c6c;
background: #fff;
padding:0 20px;
>div{
font-size: 14px;
padding-bottom: 20px;
}
}
}
</style>
\ No newline at end of file
src/views/Knowledge/xts.vue
...@@ -4,53 +4,60 @@ ...@@ -4,53 +4,60 @@
<div class="msg-cont"> <div class="msg-cont">
<div class="title">小贴士</div> <div class="title">小贴士</div>
<ul> <ul>
<li v-for="(item,i) of fileList" :key="i"> <li v-for="(item,i) of tableResult.list" :key="i">
<a :href="item.path" role="button" :data="item.id"> {{item.title}}</a> <a :href="item.path" role="button" :data="item.id"> {{item.title}}</a>
</li> </li>
</ul> </ul>
<pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Title from "../comps/title.vue"; import Title from "../comps/title.vue";
import pages from "../comps/pages.vue";
export default { export default {
components: { components: {
Title, Title,
pages,
}, },
data() { data() {
return { return {
fileList:[ tableResult:{
{ list:[],
id:1, currPage:1,
title:'《中国商品条码系统成员证书》新版说明', pageSize:15,
path:'' totalCount:0
}, }
{
id:2, };
title:'校验码计算工具',
path:''
},
{
id:3,
title:'GTIN分配规则',
path:''
},
{
id:4,
title:'校验码的计算方法说明',
path:''
}, },
{ created() {
id:5, this.initListFn(this.tableResult.currPage);
title:'EAN商品条码符号的放大系数，模块宽度及主要尺寸对照表',
path:''
}, },
] methods:{
// 行业应用
async initListFn(page,limit) {
const params = {
page: page,
limit: 20,
}; };
const listRes =
await this.$api.knowledge.tips(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult.list = data
this.tableResult.totalCount = data.length
}
}, },
// getInfo(id){
// console.log(id,'id')
// this.$router.push({
// path: `/Knowledge/Statuteinfo?id=${id}`,
// });
// }
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
...@@ -98,6 +105,7 @@ export default { ...@@ -98,6 +105,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
ul{ ul{
display: inline-block; display: inline-block;
......
src/views/News/Application.vue
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="composite"> <div class="composite">
<cate :father="bzkydtCate"></cate> <cate :father="bzkydtCate"></cate>
<div class="container"> <div class="container">
<list :list="list" /> <list :list="tableResult.list" />
<pages /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</template> </template>
...@@ -38,9 +38,40 @@ export default { ...@@ -38,9 +38,40 @@ export default {
time: "2017/08/18", time: "2017/08/18",
}, },
], ],
tableResult:{
list:[],
currPage:1,
pageSize:15,
totalCount:0
}
}; };
}, },
methods: {}, created() {
this.initListFn(this.tableResult.currPage);
},
methods:{
// 行业应用
async initListFn(page,limit) {
const params = {
page: page,
limit: 20,
};
const listRes =
await this.$api.news.industryApplication(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
},
getInfo(id){
console.log(id,'id')
this.$router.push({
path: `/Knowledge/Statuteinfo?id=${id}`,
});
}
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/News/ECommerce.vue
...@@ -41,11 +41,7 @@ ...@@ -41,11 +41,7 @@
</p> </p>
<div class="list-style"> <div class="list-style">
<ul > <ul >
<li >中国物品编码中心赴广东格力、美的集团开展调研 广东省标准化研究院张定康院…</li> <li v-for="(tmp, i) in tableResult.list" :key="i"><a :href="tmp" target="_blank">{{tmp.title}}</a></li>
<li >中国物品编码中心赴广东格力、美的集团开展调研 广东省标准化研究院张定康院…</li>
<li >中国物品编码中心赴广东格力、美的集团开展调研 广东省标准化研究院张定康院…</li>
<li >中国物品编码中心赴广东格力、美的集团开展调研 广东省标准化研究院张定康院…</li>
<li >中国物品编码中心赴广东格力、美的集团开展调研 广东省标准化研究院张定康院…</li>
</ul> </ul>
</div> </div>
...@@ -58,22 +54,22 @@ ...@@ -58,22 +54,22 @@
<span class="more">更多>></span> <span class="more">更多>></span>
</p> </p>
<img src="../../assets/image/news/dzsw2.png" alt=""> <!-- <img src="../../assets/image/news/dzsw2.png" alt=""> -->
<video controls="controls" src="" width="100%" height="100%" webkit-playsinline=""></video>
</div> </div>
</div> </div>
<div class="col-lg-6 lunbo "> <div class="col-lg-6 lunbo ">
<div class="lunbo-cnt"> <div class="lunbo-cnt">
<p class="lunbo-title"> <p class="lunbo-title">
<span>资料下载</span> <span>资料下载</span>
<span class="more">更多>></span> <!-- <span class="more">更多>></span> -->
</p> </p>
<div class="list-style"> <div class="list-style">
<ul > <ul >
<li >《电子商务商品条码应用指南》</li> <li ><a href='http://www.gs1cn.org/Manage/down/201601Ecomm.pdf' target="_blank">《电子商务商品条码应用指南》</a></li>
<li >《商品条码在电子商务领域的应用》</li> <li ><a href='http://www.gs1cn.org/Manage/down/2016Ecommerce.pdf' target="_blank">《商品条码在电子商务领域的应用》</a></li>
<li >《ebXML标准技术规范——全球电子商务标准》</li> <li ><a href='http://www.gs1cn.org/News/viewsub.aspx?id=38' target="_blank">《ebXML标准技术规范——全球电子商务标准》</a></li>
<li >GLN</li> <li ><a href='http://www.gs1cn.org/Manage/down/201204GLN.pdf' target="_blank">GLN</a></li>
</ul> </ul>
</div> </div>
...@@ -155,17 +151,60 @@ export default { ...@@ -155,17 +151,60 @@ export default {
}, },
] ],
tableResult:{
list:[],
},
tableResult2:{
list:[],
}
}; };
}, },
created(){
this.initListFn(this.tableResult.currPage);
this.spListFn()
},
mounted() { mounted() {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "应用领域", path: "/New" }, { name: "应用领域", path: "/News/index" },
{ name: "电子商务" }, { name: "电子商务" },
]); ]);
}, },
methods: {}, methods: {
// 应用动态
async initListFn() {
const params = {
page: 1,
limit: 5,
};
const listRes =
await this.$api.news.yydtList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
},
// 视频动态
async spListFn() {
const params = {
page: 1,
limit: 1,
};
const listRes =
await this.$api.news.spList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
// this.videoStr = data.list[0].
}
},
},
}; };
</script> </script>
...@@ -247,6 +286,9 @@ export default { ...@@ -247,6 +286,9 @@ export default {
color: #C1D82F; color: #C1D82F;
margin-right: 10px; margin-right: 10px;
} }
a{
color: #414345;
}
} }
} }
......
src/views/News/FoodSafety.vue
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
</div> </div>
<list :list="list" /> <list :list="tableResult.list" />
<pages /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</template> </template>
...@@ -101,21 +101,75 @@ export default { ...@@ -101,21 +101,75 @@ export default {
list: [ list: [
{ {
name: "GS1标准助力澳大利亚肉制品的出口追溯", name: "GS1全球追溯标准（第二版）",
path:'http://www.gs1cn.org/Manage/down/GS1全球追溯标准（第二版）.pdf'
}, },
{ {
name: "GS1总部最新追溯视频——GS1追溯标准助力供应链可视化和效率提升", name: "GS1生鲜果蔬追溯实施指南",
path:"http://www.gs1cn.org/Manage/down/GS1生鲜果蔬追溯实施指南.pdf"
}, },
{ {
name: "全球统一标识系统——全球通用的食品追溯语言", name: "GS1肉禽追溯指南",
path:'http://www.gs1cn.org/Manage/down/GS1肉禽追溯指南.pdf'
},
{
name: "GS1鱼类、海鲜和水产养殖追溯指南",
path:'http://www.gs1cn.org/Manage/down/GS1鱼类、海鲜和水产养殖追溯指南.pdf'
},
{
name: "GS1标准助力食品安全全程追溯",
path:'http://www.gs1cn.org/Manage/down/GS1标准助力食品安全全程追溯.pdf'
},
{
name: "食品追溯 我来教你怎么做",
path:'http://www.gs1cn.org/Manage/down/食品追溯我来教你怎么做.pdf'
},
{
name: "GS1标准在食品安全领域中的应用",
path:'http://www.gs1cn.org/Manage/down/GS1全球追溯标准在食品安全领域中的应用.pdf'
},
{
name: "中国食品的跨国追溯",
path:'http://www.gs1cn.org/Manage/down/中国食品的跨国追溯.pdf'
},
{
name: "商品条码食品安全追溯案例集",
path:'http://www.gs1cn.org/Manage/down/shangpintiaomaanquanzhuisuanliji.pdf'
},
{
name: "乳制品、熟食品与烘烤食品追溯实施指南（美国）",
path:'http://www.gs1cn.org/Manage/down/ruzhipinshushipin.pdf'
}, },
], ],
tableResult:{
list:[],
currPage:1,
pageSize:15,
totalCount:0
}
};
},
created(){
this.initListFn(this.tableResult.currPage);
},
methods: {
// 食品追溯
async initListFn(page,limit) {
const params = {
page: page,
limit: 15,
}; };
const listRes =
await this.$api.news.foodSafetyList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
},
}, },
methods: {},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/News/Health.vue
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
mounted() { mounted() {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "应用领域", path: "/New" }, { name: "应用领域", path: "/News/index" },
{ name: "医疗卫生" }, { name: "医疗卫生" },
]); ]);
}, },
......
src/views/News/Logistics.vue
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
mounted() { mounted() {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "应用领域", path: "/New" }, { name: "应用领域", path: "/News/index" },
{ name: "物流" }, { name: "物流" },
]); ]);
}, },
......
src/views/News/Notice.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<cate :father="bzkydtCate"></cate> <cate :father="bzkydtCate"></cate>
<div class="container"> <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="list" /> <list :list="tableResult.list" @getInfo='getInfo' />
<pages /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</template> </template>
...@@ -25,23 +25,41 @@ export default { ...@@ -25,23 +25,41 @@ export default {
name: "公告通知", name: "公告通知",
ico: "", ico: "",
}, },
list: [ tableResult:{
{ list:[],
name: "Ecode平台运维项目招标公告", currPage:1,
pageSize:15,
}, totalCount:0
{ }
name: "关于《汉信码的嵌入式识读软硬件系统开发》和《商品二维码生成工具服务平台开发》项目立项论证结果的公示", };
}, },
{ created() {
name: "关于召开超高频RFID GEN2 v3标准升级需求研讨会的通知", this.initListFn(this.tableResult.currPage);
}, },
], methods:{
// 行业应用
async initListFn(page,limit) {
const params = {
page: page,
limit: 15,
}; };
const listRes =
await this.$api.news.announceList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
}, },
methods: {},
getInfo(id){
console.log(id,'id')
this.$router.push({
path: `/News/NoticeArticle?id=${id}`,
});
}
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/News/NoticeArticle.vue 0 → 100644
<template>
<div class="org container">
<breadcrumb />
<div class="row status-container">
<div class="title-style">
<p><b>{{title}}</b></p>
<p>
<span style="float:left">作者{{author}}</span>
<span style="float:right">日期{{showtime}}</span>
</p>
</div>
<div class="showHtml" v-html="content"></div>
</div>
</div>
</template>
<script>
import breadcrumb from "../comps/breadcrumb.vue";
import pages from "../comps/pages.vue";
export default {
components: {
pages,
breadcrumb,
},
data() {
return {
id:this.$route.query.id,
content:'',
title:'',
showtime:'',
author:''
};
},
computed: {
routes() {
},
},
created() {
this.InfoFn();
},
mounted() {
console.log(2)
// 面包屑单独处理
},
methods:{
// 政策法规列表
async InfoFn() {
const params = {
id:this.id,
};
const listRes =
await this.$api.news.announInfo(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
console.log(data, "公告详情");
this.content=data.content;
this.title=data.title
this.showtime = data.showtime
this.author=data.author
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/New/index" },
{ name: "公告通知", path: "/News/Notice" },
{ name: this.title },
]);
}
},
}
};
</script>
<style lang="scss" scoped>
@media screen and(min-width: 992px) {
}
@media screen and (max-width: 992px) {
}
</style>
<style lang="scss" scoped>
.org {
padding-bottom: 20px;
.title-style{
font-size: 24px;
text-align: center;
border-bottom: 1px solid #b2b2b8;
color: #002c6c;
margin-bottom: 10px;
P{
&:first-child{
padding: 30px;
font-size: 24px;
margin-bottom: 15px;
}
&:last-child{
color: #666666;
font-size: 12px;
}
}
}
.status-container{
border-top: 7px solid #002c6c;
background: #fff;
padding:0 20px;
padding-bottom: 20px;
>div{
font-size: 14px;
padding-bottom: 15px;
}
.showHtml{
border-bottom: 1px solid #b2b2b8;
padding-bottom: 30px;
margin-bottom: 25px;
}
}
}
</style>
\ No newline at end of file
src/views/News/Other.vue
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
</div> </div>
<list :list="list" /> <list :list="tableResult.list" />
<pages /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</template> </template>
...@@ -41,31 +41,49 @@ export default { ...@@ -41,31 +41,49 @@ export default {
ico: "", ico: "",
}, },
list: [
{
name: "《建材行业商品条码应用指南》",
},
{
name: "江苏镇江实施气瓶条码管理不走过场 气瓶“身份证”帮了监管忙",
},
{
name: "北京烟花将贴身份证 防止“黑花炮”流入市场",
},
],
list2:[ list2:[
{ {
name:'《建材行业商品条码应用指南》', name:'《建材行业商品条码应用指南》',
path:'http://www.gs1cn.org/Manage/down/建材行业商品条码应用指南.pdf'
}, },
{ {
name:' 服装行业商品条码应用指南', name:' 服装行业商品条码应用指南',
path:'http://www.gs1cn.org/Manage/down/服装行业商品条码应用指南.pdf'
}
],
tableResult:{
list:[],
currPage:1,
pageSize:15,
totalCount:0
} }
]
}; };
}, },
methods: {}, created() {
this.initListFn(this.tableResult.currPage);
},
methods:{
// 行业应用
async initListFn(page,limit) {
const params = {
page: page,
limit: 20,
};
const listRes =
await this.$api.news.otherList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
},
// getInfo(id){
// console.log(id,'id')
// this.$router.push({
// path: `/Knowledge/Statuteinfo?id=${id}`,
// });
// }
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/News/PicNews.vue
...@@ -18,16 +18,16 @@ ...@@ -18,16 +18,16 @@
<div class="picNews-bottom"> <div class="picNews-bottom">
<div class="container"> <div class="container">
<ul class="picNews-ul"> <ul class="picNews-ul">
<li v-for="(tmp, i) in 12" :key="i"> <li v-for="(tmp, i) in tableResult.list" :key="i">
<div class="picNews-li-tp"> <div class="picNews-li-tp">
<img src="../../assets/image/news/tpzx-tp1.jpg" alt="" /> <img :src="tmp.picFile" alt="" />
</div> </div>
<div class="picNews-li-bt"> <div class="picNews-li-bt">
中国物品编码中心应邀出席食品安全智慧监管研讨会 {{tmp.title}}
</div> </div>
</li> </li>
</ul> </ul>
<pages /> <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" @getLimit='initListFn' />
</div> </div>
</div> </div>
</div> </div>
...@@ -48,8 +48,17 @@ export default { ...@@ -48,8 +48,17 @@ export default {
name: "图片资讯 ", name: "图片资讯 ",
ico: "", ico: "",
}, },
tableResult:{
list:[],
currPage:1,
pageSize:15,
totalCount:0
}
}; };
}, },
created(){
this.initListFn(this.tableResult.currPage);
},
methods: { methods: {
...mapMutations({ ...mapMutations({
setMatche: "setMatche", setMatche: "setMatche",
...@@ -66,6 +75,21 @@ export default { ...@@ -66,6 +75,21 @@ export default {
path: "/News/msg", path: "/News/msg",
}); });
}, },
// 图片资讯列表
async initListFn(page,limit) {
const params = {
page: page,
limit: 16,
};
const listRes =
await this.$api.news.pictureList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.tableResult = data
}
},
}, },
}; };
</script> </script>
...@@ -122,5 +146,11 @@ export default { ...@@ -122,5 +146,11 @@ export default {
@include module-box; @include module-box;
margin-top: 30px; margin-top: 30px;
} }
.picNews-li-tp{
img{
height: 140px;
background: url('../../assets/image/news/tpzx-tp1.jpg') 100% 100%;
}
}
} }
</style> </style>
\ No newline at end of file
src/views/News/Retail.vue
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
mounted() { mounted() {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "应用领域", path: "/New" }, { name: "应用领域", path: "/News/index" },
{ name: "零售" }, { name: "零售" },
]); ]);
}, },
......
src/views/News/StatuteDes.vue
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "首页", path: "/" }, { name: "首页", path: "/" },
{ name: "行业应用", path: "/New" }, { name: "行业应用", path: "/News/index" },
{ name: "医疗卫生", path: "/News/Health" }, { name: "医疗卫生", path: "/News/Health" },
{ name: "政策法规", path: "/Knowledge/Statute" }, { name: "政策法规", path: "/Knowledge/Statute" },
{ name: "药品" }, { name: "药品" },
......
src/views/News/comps/list.vue
<template> <template>
<div class="list"> <div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row"> <div v-for="(tmp, i) in list" :key="i" class="row" @click="giveId(tmp.id)">
<div class="col-lg-6 list-left"> <div class="col-lg-6 list-left">
<span></span> <span></span>
<span>{{tmp.name}}</span> <span>{{tmp.title}}</span>
</div> </div>
<div class="col-lg-2 list-right">{{tmp.time}}</div> <div class="col-lg-2 list-right">{{tmp.showtime}}</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: ['list'], props: ['list'],
methods:{
giveId(id){
this.$emit('getInfo',id)
}
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/News/comps/list2.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div v-for="(tmp, i) in list" :key="i" class="list-li"> <div v-for="(tmp, i) in list" :key="i" class="list-li">
<div> <div>
<span></span> <span></span>
<span>{{tmp.name}}</span> <span><a :href="tmp.path" target="_blank">{{tmp.name}}</a></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -41,6 +41,13 @@ export default { ...@@ -41,6 +41,13 @@ export default {
flex: 1; flex: 1;
@include ellipsis; @include ellipsis;
cursor: pointer; cursor: pointer;
a{
color: #008dbd;
&:hover{
color: #002c6c;
}
}
} }
} }
} }
......
src/views/News/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="col-lg-8 tpzx"> <div class="col-lg-8 tpzx">
<div class="cate"> <div class="cate">
<span>图片资讯</span> <span>图片资讯</span>
<span>查看更多>></span> <span @click="goNewPic">查看更多>></span>
</div> </div>
<div class="tpzx-ul"> <div class="tpzx-ul">
<div class="tpzx-li" v-for="(tmp, i) in 3" :key="i"> <div class="tpzx-li" v-for="(tmp, i) in 3" :key="i">
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<div class="sdzt"> <div class="sdzt">
<div class="cate borderBottom"> <div class="cate borderBottom">
<span>深度专题</span> <span>深度专题</span>
<span>查看更多>></span> <span @click="goDepth">查看更多>></span>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
</div> </div>
<div class="jcsp"> <div class="jcsp">
<div class="cate borderBottom"> <div class="cate borderBottom">
<span>深度专题</span> <span>精彩视频</span>
<span>查看更多>></span> <span @click="goVideo">查看更多>></span>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
...@@ -271,6 +271,24 @@ export default { ...@@ -271,6 +271,24 @@ export default {
], ],
}; };
}, },
methods:{
goNewPic(){
this.$router.push({
path: '/News/PicNews',
});
},
goDepth(){
this.$router.push({
path: '/News/DepthTopics',
});
},
goVideo(){
this.$router.push({
path: '/News/Video',
});
},
}
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
...@@ -387,6 +405,7 @@ export default { ...@@ -387,6 +405,7 @@ export default {
background: #f0f5fa; background: #f0f5fa;
padding: 20px 0 40px 0; padding: 20px 0 40px 0;
.two-kj { .two-kj {
padding: 10px 0;
background: #ffffff; background: #ffffff;
&:hover{ &:hover{
box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08); box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08);
...@@ -437,9 +456,7 @@ export default { ...@@ -437,9 +456,7 @@ export default {
cursor: pointer; cursor: pointer;
padding: 2px; padding: 2px;
box-sizing: border-box; box-sizing: border-box;
transition: all 0.22s;
&:hover{ &:hover{
transform: translate(0px, -10px) scale(1.03);
box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08); box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08);
} }
.four-li-left { .four-li-left {
......
src/views/Org/Departments.vue
...@@ -119,6 +119,7 @@ export default { ...@@ -119,6 +119,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
} }
} }
......
src/views/Org/ISO/Goal.vue
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
} }
} }
......
src/views/Org/ISO/Ideology.vue
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
} }
} }
......
src/views/Org/ISO/Manual.vue
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
} }
} }
......
src/views/Org/Intro.vue
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
} }
.zzjg { .zzjg {
img { img {
......
src/views/Org/Sites.vue
...@@ -188,6 +188,7 @@ export default { ...@@ -188,6 +188,7 @@ export default {
margin-left: 15px; margin-left: 15px;
text-indent: 32px; text-indent: 32px;
line-height: 28px; line-height: 28px;
margin-bottom: 10px;
a { a {
text-decoration: none; text-decoration: none;
&.red { &.red {
......
src/views/comps/pages.vue
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
<div class="pages-middle"> <div class="pages-middle">
<button class="pages-btn" v-if="false">首页</button> <button class="pages-btn" v-if="false">首页</button>
<el-pagination <el-pagination
:current-page="pages.currentPage" :page-size="15"
:page-size="pages.pageSize" :current-page="currPage"
layout="prev, pager, next" layout="prev, pager, next"
:total="pages.total" :total="total"
@size-change="changeSize"
@current-change="goPage"
background background
@current-change="handleCurrentChange"
> >
</el-pagination> </el-pagination>
<button class="pages-btn" v-if="false">尾页</button> <button class="pages-btn" v-if="false">尾页</button>
...@@ -39,18 +40,36 @@ ...@@ -39,18 +40,36 @@
</template> </template>
<script> <script>
export default { export default {
props: ['pages'], props: {
currPage: {
default: 0,
type: Number,
},
total: {
default: 0,
type: Number,
}
},
data() { data() {
return { return {
sizeList: [10, 20], sizeList: [10, 20],
pages: {
size: 10,
},
}; };
}, },
methods: { mounted(){
// 当前页 console.log(this.currPage)
handleCurrentChange(val) {
this.$emit('toPagesFather', val)
}, },
methods:{
changeSize(i){
this.$emit('getLimit',this.currPage)
}, },
goPage(i){
this.$emit('getLimit',i)
}
}
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
......
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