Skip to content

G
gs1
Commit 59b0875b by Lyan
Options

修改

parent 17fd6242
Showing with 146 additions and 59 deletions
src/axios/module/news.js
......@@ -37,7 +37,11 @@ const announceList = (params = {}) => {
}
// 公告通知详情
const announInfo = (params = {}) => {
if(params.token){
return GET(`${Prefix}/office/news/api/announInfo/${params.id}/${params.token}`)
}else{
return GET(`${Prefix}/office/news/api/announInfo/${params.id}`)
}
}
// 其他
const otherList = (params = {}) => {
......@@ -50,7 +54,12 @@ const newsList = (params = {}) => {
}
// 资讯中心详情
const newsInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/info/${params.id}/${params.token}`)
if(params.token){
return GET(`${Prefix}/office/news/api/info/${params.id}/${params.token}`)
}else{
return GET(`${Prefix}/office/news/api/info/${params.id}`)
}
}
//物联网列表
const iotList = (params = {}) => {
......@@ -103,7 +112,12 @@ const zttjList = (params = {}) => {
}
//专题资讯详情
const newsTopicInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/newsTopicInfo/${params.id}/${params.token}`)
if(params.token){
return GET(`${Prefix}/office/news/api/newsTopicInfo/${params.id}/${params.token}`)
}else{
return GET(`${Prefix}/office/news/api/newsTopicInfo/${params.id}`)
}
}
//相关链接
const relatedLinks = (params = {}) => {
......@@ -133,7 +147,12 @@ const jcspList = (params = {}) => {
//精彩视频详情
const jcspiInfo = (params = {}) => {
return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}/${params.token}`)
if(params.token){
return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}/${params.token}`)
}else{
return GET(`${Prefix}/office/news/api/jcspiInfo/${params.id}`)
}
}
// 零售
const retailList = (params = {}) => {
......
src/components/layout/header/service.js
......@@ -124,13 +124,13 @@ export default {
},
{
id: uuid("gs_nav"),
name: "射频识别（RFID)测试与认证",
name: "射频识别（RFID）测试与认证",
index: 3,
link: "/Service/jcyxz/RFID",
breadcrumb: [
{ name: "服务中心", path: "/Service/BarcodeV" },
{ name: "条码/RFID/软件检测服务", path: "/Service/jcyxz/Barcode" },
{ name: "射频识别（RFID)测试与认证" },
{ name: "射频识别（RFID）测试与认证" },
],
},
{
......
src/views/BarCode/generateSuccess.vue
......@@ -30,12 +30,21 @@ export default {
},
data() {
return {
codeId:this.getParamQueryString(this.codePicture,'codeId')
codeId:''
};
},
created() {
},
watch: {
codePicture: {
handler(val) {
this.codeId=this.getParamQueryString(val,'codeId')
},
immediate: true,
},
},
mounted() {},
methods: {
downPicture() {
......
src/views/Business/Corppaynew.vue
......@@ -113,7 +113,7 @@
<td>
《国家发展改革委 市场监管总局关于清理整治政府部门下属单位涉企收费、中介机构收费的通知》（发改电〔2019〕55号）<br />
《市场监管总局办公厅关于进一步加强收费管理工作的通知》（市监科财函〔2019〕236号）<br />
《中国物品编码中心关于继续执行疫情期间阶段性条码服务费优惠的通知》（物编函〔2023〕37号）
《中国物品编码中心关于继续执行疫情期间阶段性条码服务费优惠的通知》（物编函〔2023〕92号）
</td>
<td>
提供符合国家标准、国际通用、系统成员享有专用权的厂商识别代码。<br />
......@@ -214,7 +214,7 @@
<td width="80%">
《国家发展改革委 市场监管总局关于清理整治政府部门下属单位涉企收费、中介机构收费的通知》（发改电〔2019〕55号）<br />
《市场监管总局办公厅关于进一步加强收费管理工作的通知》（市监科财函〔2019〕236号）<br />
《中国物品编码中心关于继续执行疫情期间阶段性条码服务费优惠的通知》（物编函〔2023〕37号）
《中国物品编码中心关于继续执行疫情期间阶段性条码服务费优惠的通知》（物编函〔2023〕92号）
</td>
</tr>
<tr>
......
src/views/Home/comps/notice.vue
......@@ -20,7 +20,7 @@
</div>
<div class="notice-nr-kj">
<p class="notice-note">
为切实减轻企业负担，中国物品编码中心研究决定自2023年4月1日至2023年6月30日，继续执行疫情期间阶段性条码服务费优惠措施。
为切实减轻企业负担，中国物品编码中心研究决定自2023年4月1日至2023年9月30日，继续执行疫情期间阶段性条码服务费优惠措施。
</p>
<p class="notice-note">优惠收费标准如下：</p>
<div class="notice-cont">
......
src/views/Home/comps/sousuo-list.vue
......@@ -40,39 +40,53 @@ export default {
// 6 【技术知识】 /Knowledge/article
// 31 【资讯动态】/News/msg
// 32 【资讯动态】 /News/Video
let url;
if(type==1){
this.$router.push({
path: `/News/msg?id=${id}`,
});
url = this.$router.resolve({
path:"/Knowledge/Statuteinfo",
query:{ id:id }
})
}else if(type==2){
this.$router.push({
path: `/Knowledge/Statuteinfo?id=${id}`,
});
url = this.$router.resolve({
path:"/Knowledge/Statuteinfo",
query:{ id:id }
})
}else if(type==3){
this.$router.push({
path: `/News/msg?id=${id}`,
});
url = this.$router.resolve({
path:"/News/msg",
query:{ id:id }
})
}else if(type==5){
this.$router.push({
path: `/News/msg?id=${id}`,
});
url = this.$router.resolve({
path:"/News/msg",
query:{ id:id }
})
}else if(type==6){
this.$router.push({
path: `/Knowledge/article?id=${id}`,
});
url = this.$router.resolve({
path:"/Knowledge/article",
query:{ id:id }
})
}else if(type==31){
this.$router.push({
path: `/News/viewsub?id=${id}`,
});
url = this.$router.resolve({
path:"/News/viewsub",
query:{ id:id }
})
}else if(type==32){
this.$router.push({
path: `/News/msgVideo?id=${id}`,
});
url = this.$router.resolve({
path:"/News/msgVideo",
query:{ id:id }
})
}else{
this.$router.push({
path: `/News/msg?id=${id}`,
});
url = this.$router.resolve({
path:"/News/msg",
query:{ id:id }
})
}
window.open(url.href , '_blank');
},
async InfoFn(id,type) {
const params = {
......@@ -95,6 +109,7 @@ export default {
},
changeText(val){
val=(val ||'').replace(/<[^>]+>/g,"").replace(/<br\/>/g, '\n').replace(/&nbsp;/g, '');
return val
}
},
......
src/views/Home/index.vue
......@@ -2,7 +2,7 @@
<div class="home">
<!-- Banner图 -->
<div class="banner">
<VueSlickCarousel v-bind="bannerSettings" v-if="banner.length > 0">
<VueSlickCarousel v-bind="bannerSettings" v-if="banner.length > 0" ref="bigPic" :key="keyBanner">
<div v-for="(el, i) in banner" :key="i">
<div class="banner-item" :style="{ background: el.colorBackground }">
<div class="container">
......@@ -547,6 +547,7 @@
</template>
</VueSlickCarousel>
</div>
<div class="smallPCImages H5">
<VueSlickCarousel
v-bind="smallH5ImagesSettings"
......@@ -646,7 +647,9 @@ export default {
data() {
return {
keywords: "",
banner: [{
keyBanner:0,
banner: [
{
brief: "国际物品编码组织（GS1）是全球性的、中立的非营利国际组织，致力于通过制定全球统一的产品标识和电子商务标准，实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔，目前，在全球拥有116个成员组织。",
briefShow: "国际物品编码组织（GS1）是全球性的、中立的非营利国际组织，致力于通过制定全球统一的产品标识和电子商务标准，实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔，目前，在全球拥有116个成员组织。",
checkIndexAuthor: "pwindqq",
......@@ -666,11 +669,12 @@ export default {
starttimeIndex: "2018-05-02 10:20:00",
title: "GS1",
updatetimeIndex: "2023-03-09 10:22:32",
}], // 首页大轮播图
},
], // 首页大轮播图
bannerSettings: {
arrows: true,
autoplay: true,
autoplaySpeed: 4000,
autoplaySpeed: 2000,
dots: true,
centerMode: true,
centerPadding: "0% 0% 0%",
......@@ -691,14 +695,14 @@ export default {
], // 要闻左侧图片
newsBannerSettingsA: {
arrows: false,
autoplay: false,
autoplay: true,
dots: false,
slidesToShow: 1,
slidesToScroll: 1,
},
newsBannerSettingsB: {
arrows: true,
autoplay: false,
autoplay: true,
dots: false,
slidesToShow: 1,
slidesToScroll: 1,
......@@ -1141,15 +1145,17 @@ export default {
smallH5Images: [],
smallPCImagesSettings: {
arrows: true,
autoplay: false,
autoplay: true,
autoplaySpeed: 2000,
dots: false,
slidesToShow: 1,
slidesToScroll: 1,
},
smallH5ImagesSettings: {
arrows: true,
autoplay: false,
autoplay: true,
dots: true,
autoplaySpeed: 2000,
slidesToShow: 1,
slidesToScroll: 1,
},
......@@ -1181,6 +1187,7 @@ export default {
this.getCustomService();
// 从后端获取最新的定制服务
this.getCustomServiceFromServer();
},
methods: {
handelHomeBottomCate(i) {
......@@ -1357,8 +1364,9 @@ export default {
const { returnCode, data } = homeBigImagesRes;
if (returnCode === "0") {
this.banner = data;
console.log(this.banner, "this.banner");
this.keyBanner= Math.random();
}else{
this.banner=[{
brief: "国际物品编码组织（GS1）是全球性的、中立的非营利国际组织，致力于通过制定全球统一的产品标识和电子商务标准，实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔，目前，在全球拥有116个成员组织。",
briefShow: "国际物品编码组织（GS1）是全球性的、中立的非营利国际组织，致力于通过制定全球统一的产品标识和电子商务标准，实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔，目前，在全球拥有116个成员组织。",
......@@ -1381,7 +1389,6 @@ export default {
updatetimeIndex: "2023-03-09 10:22:32",
}]
}
console.log(homeBigImagesRes, "首页大轮播图");
},
// 了解更多
learnMore(i) {
......@@ -1762,7 +1769,7 @@ export default {
}
.slick-dots {
display: none !important;
// display: none !important;
bottom: 25px !important;
display: flex;
align-items: center;
......
src/views/Home/sousuo.vue
......@@ -7,7 +7,7 @@
placeholder="请输入内容"
clearable
v-model="search.keywords"
@input="e => search.keywords = validSpecialZf(e)"
@keyup.enter.native ="initListFn(1,'')"
></el-input>
<div class="top-form-btn" @click="initListFn(1,'')">
<img src="../../assets/image/home/sousuo-ico1.png" alt="" />
......
src/views/Knowledge/Statuteinfo.vue
<template>
<div class="org container">
<div class="org container" v-loading="loading">
<breadcrumb />
<div class="row status-container" v-loading="loading">
<p class="title-style" v-html="title"></p>
......@@ -46,7 +46,7 @@ export default {
const policyInfoRes = await this.$api.knowledge.policyInfo(params);
const { returnCode, data ,returnMsg} = policyInfoRes;
if (returnCode === "0") {
this.loading = false;
this.content = data.content;
this.title = data.title;
if(data.class1=='法律法规'){
......@@ -65,6 +65,7 @@ export default {
}else{
this.$message.error(returnMsg)
}
this.loading = false;
},
},
};
......
src/views/Knowledge/article.vue
<template>
<div class="org container">
<div class="org container" v-loading="loading">
<div class="row status-container">
<p class="title-style">
<span>{{ title }}</span>
......@@ -22,6 +22,7 @@ export default {
},
data() {
return {
loading:false,
id: this.$route.query.id,
content: "",
title: "",
......@@ -46,6 +47,7 @@ export default {
},
//
async initInfoFn() {
this.loading=true
const params = {
id: this.id,
token:this.$route.query.token ||''
......@@ -54,6 +56,9 @@ export default {
const { returnCode, data ,returnMsg} = infoRes;
if (returnCode === "0") {
console.log(data);
if (data.directpath && data.directpath !== "" && data.directpath.length > 0) {
window.open(data.directpath, "_self");
}
this.content = data.content;
this.title = data.title;
this.showtime = data.inputdate;
......@@ -146,6 +151,7 @@ export default {
}else{
this.$message.error(returnMsg);
}
this.loading=false
},
},
};
......
src/views/News/ECommerce.vue
......@@ -170,6 +170,7 @@ export default {
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "电子商务" },
]);
......
src/views/News/HealthDetail.vue
<template>
<div class="container">
<div class="container" v-loading="loading">
<breadcrumb />
<!-- <div class="msg-cont">
<div class="container"> -->
......@@ -21,6 +21,7 @@ export default {
},
data() {
return {
loading:false,
detailInfo: '',
};
},
......@@ -37,6 +38,7 @@ export default {
},
methods: {
async medicalAndHealthDetailById(item) {
this.loading=true
const id = this.$route.query && this.$route.query.id ? this.$route.query.id : '';
const params = {
id, // id
......@@ -45,11 +47,15 @@ export default {
const listRes = await this.$api.news.medicalAndHealthDetailById(params);
const { returnCode, data ,returnMsg} = listRes;
if (returnCode === "0") {
if (data.jumppath && data.jumppath !== "" && data.jumppath.length > 0) {
window.open(data.jumppath, "_self");
}
console.log('medicalAndHealthDetailById', returnCode, data)
this.detailInfo = data.content;
}else{
this.$message.error(returnMsg);
}
this.loading=false
},
},
};
......@@ -63,7 +69,7 @@ export default {
.health-detail {
margin-top: 20px;
line-height: 28px;
// font-size: 14px;
font-size: 16px;
text-indent: 28px;
color: #454545;
/deep/p {
......
src/views/News/NoticeArticle.vue
<template>
<div class="org container">
<div class="org container" v-loading="loading">
<breadcrumb />
<div class="row status-container">
<div class="title-style">
......@@ -28,6 +28,7 @@ export default {
},
data() {
return {
loading:false,
id: this.$route.query.id,
content: "",
title: "",
......@@ -48,6 +49,7 @@ export default {
methods: {
// 详情
async InfoFn() {
this.loading=true
const params = {
id: this.id,
token:this.$route.query.token ||''
......@@ -68,6 +70,7 @@ export default {
}else{
this.$message.error(returnMsg)
}
this.loading=false
},
},
};
......
src/views/News/msg.vue
<template>
<div class="msg container">
<div class="msg container" v-loading="loading">
<breadcrumb />
<div class="row">
<div class="col-lg-9">
......@@ -113,6 +113,7 @@ export default {
},
data() {
return {
loading:false,
config: {
sites: ["weibo", "wechat"],
wechatQrcodeTitle: "微信扫一扫：分享",
......@@ -213,6 +214,7 @@ export default {
};
},
created() {
this.InfoFn();
this.newsTop10();
this.announceList();
......@@ -224,6 +226,7 @@ export default {
setMatche: "setMatche",
}),
async InfoFn() {
this.loading=true
const params = {
id: this.id,
token:this.$route.query.token ||''
......@@ -231,6 +234,9 @@ export default {
const listRes = await this.$api.news.newsInfo(params);
const { returnCode, data ,returnMsg} = listRes;
if (returnCode === "0" && data !=null) {
if (data.directpath && data.directpath !== "" && data.directpath.length > 0) {
window.open(data.directpath, "_self");
}
let matche = this.matcheList.filter((item) => item.classid ===data.classid)[0];
if(typeof(matche)==='undefined'){
matche = [
......@@ -258,6 +264,7 @@ export default {
}else{
this.$message.error(returnMsg)
}
this.loading=false
},
// getBreadcrumb(classId){
......
src/views/News/msgVideo.vue
<template>
<div class="msg container">
<div class="msg container" v-loading="loading">
<breadcrumb />
<div class="row">
<div class="col-lg-9">
......@@ -34,7 +34,7 @@
</div>
</div>
<div class="msg-text" v-html="content"></div>
<div class="msg-text" v-if="content==''||content==null||content==undefined">没有可显示的内容!</div>
<!-- <div class="msg-text" v-if="content==''||content==null||content==undefined">没有可显示的内容!</div> -->
<div class="videoStyle" v-if="videoStr&&videoStr!=null&&videoStr!=''">
<video
controls="controls"
......@@ -122,6 +122,7 @@ export default {
},
data() {
return {
loading:false,
config: {
sites: ["weibo", "wechat"],
wechatQrcodeTitle: "微信扫一扫：分享",
......@@ -168,6 +169,7 @@ export default {
},
methods: {
async InfoFn() {
this.loading=true
const params = {
id: this.id,
token:this.$route.query.token ||''
......@@ -175,6 +177,9 @@ export default {
const listRes = await this.$api.news.jcspiInfo(params);
const { returnCode, data ,returnMsg} = listRes;
if (returnCode === "0") {
if (data.directpath && data.directpath !== "" && data.directpath.length > 0) {
window.open(data.directpath, "_self");
}
this.content = data.brief;
this.title = data.title;
this.showtime = data.showtime;
......@@ -191,6 +196,7 @@ export default {
}else{
this.$message.error(returnMsg)
}
this.loading=false
},
// top列表
async newsTop10() {
......
src/views/News/viewsub.vue
<template>
<div class="org container">
<div class="org container" v-loading="loading">
<breadcrumb />
<div class="row status-container">
<div class="showHtml" v-html="content"></div>
<div class="showHtml" v-if="content==''||content==null||content==undefined">没有可显示的内容!</div>
<!-- <div class="showHtml" v-if="content==''||content==null||content==undefined">没有可显示的内容!</div> -->
</div>
</div>
......@@ -19,6 +19,7 @@ export default {
},
data() {
return {
loading:false,
id:this.$route.query.id,
content:'',
title:'',
......@@ -42,6 +43,7 @@ export default {
methods:{
// 详情
async InfoFn() {
this.loading=true
const params = {
id:this.id,
token:this.$route.query.token ||''
......@@ -51,6 +53,9 @@ export default {
console.log(listRes)
const { returnCode, data,returnMsg } = listRes;
if (returnCode === "0") {
if (data.directpath && data.directpath !== "" && data.directpath.length > 0) {
window.open(data.directpath, "_self");
}
this.content=data.content;
this.title=data.title
this.showtime = data.showtime
......@@ -64,7 +69,7 @@ export default {
}else{
this.$message.error(returnMsg)
}
this.loading=false
},
}
......
src/views/Org/ISO/Files.vue
......@@ -91,6 +91,7 @@ export default {
</script>
<style lang="scss" scoped>
.files {
font-size: 14px;
@include module-box;
@include module-box;
.files-cont {
......
src/views/Org/comps/table.vue
......@@ -23,6 +23,7 @@ export default {
</script>
<style lang="scss" scoped>
.fqtable {
font-size: 14px;
.fqthead {
// background: #f7f7f7;
border-radius: 4px;
......
src/views/comps/breadcrumb.vue
......@@ -2,8 +2,8 @@
<div class="bread-crumb">
<nav style="--bs-breadcrumb-divider: '>'" aria-label="breadcrumb">
<ol class="breadcrumb">
<template v-for="item in bread">
<li class="breadcrumb-item" v-if="!item.active" :key="item.path">
<template v-for="(item,index) in bread">
<li class="breadcrumb-item" v-if="!item.active" :key="index">
<a :href="item.path">{{ item.name }}</a>
</li>
<li
......
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