Commit 17fd6242 by Lyan

提交

parent 0b6cbe2a
...@@ -61,5 +61,4 @@ ...@@ -61,5 +61,4 @@
"volta": { "volta": {
"node": "14.21.3" "node": "14.21.3"
} }
} }
...@@ -19,16 +19,27 @@ const queryGRAIAIList = (params = {}) => { ...@@ -19,16 +19,27 @@ const queryGRAIAIList = (params = {}) => {
const generateBarcode = (params = {}) => { const generateBarcode = (params = {}) => {
return POST(`${Prefix}/office/barcodegeneration/api/createQRcode`, params) return POST(`${Prefix}/office/barcodegeneration/api/createQRcode`, params)
} }
// 下载条形码
const updateBarcode = (params = {}) => {
return POST(`${Prefix}/office/ssccCodeImage/api/update`, params)
}
// 查询校验码 // 查询校验码
const queryCheckCode = (params = {}) => { const queryCheckCode = (params = {}) => {
return POST(`${Prefix}/office/barcodegeneration/api/checkGS1Code`, params) return POST(`${Prefix}/office/barcodegeneration/api/checkGS1Code`, params)
} }
// 下载校验码
const updateCheckCode = (params = {}) => {
return POST(`${Prefix}/office/graiCodeImage/api/update`, params)
}
export default { export default {
querySSCCAIList, querySSCCAIList,
queryGRAIAIList, queryGRAIAIList,
generateBarcode, generateBarcode,
updateBarcode,
queryCheckCode, queryCheckCode,
updateCheckCode
} }
...@@ -898,6 +898,7 @@ export const nav = [ ...@@ -898,6 +898,7 @@ export const nav = [
link: "/News/Logistics", link: "/News/Logistics",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "物流" }, { name: "物流" },
], ],
}, },
...@@ -918,6 +919,7 @@ export const nav = [ ...@@ -918,6 +919,7 @@ export const nav = [
link: "/News/FoodSafety", link: "/News/FoodSafety",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "食品安全追溯" }, { name: "食品安全追溯" },
], ],
}, },
...@@ -928,6 +930,7 @@ export const nav = [ ...@@ -928,6 +930,7 @@ export const nav = [
link: "/News/ECommerce", link: "/News/ECommerce",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "电子商务" }, { name: "电子商务" },
], ],
}, },
...@@ -938,6 +941,7 @@ export const nav = [ ...@@ -938,6 +941,7 @@ export const nav = [
link: "/News/MCommerce", link: "/News/MCommerce",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "移动商务" }, { name: "移动商务" },
], ],
}, },
...@@ -948,6 +952,7 @@ export const nav = [ ...@@ -948,6 +952,7 @@ export const nav = [
link: "/News/IoT", link: "/News/IoT",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "物联网" }, { name: "物联网" },
], ],
}, },
...@@ -958,6 +963,7 @@ export const nav = [ ...@@ -958,6 +963,7 @@ export const nav = [
link: "/News/Other", link: "/News/Other",
breadcrumb: [ breadcrumb: [
{ name: "资讯中心", path: "/News/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "其他" }, { name: "其他" },
], ],
}, },
...@@ -969,7 +975,7 @@ export const nav = [ ...@@ -969,7 +975,7 @@ export const nav = [
id: "6", id: "6",
name: "知识中心", name: "知识中心",
index: 6, index: 6,
link: "/Knowledge/index", link: "/Knowledge",
rowNum: 6, rowNum: 6,
children: [ children: [
{ {
...@@ -1065,7 +1071,7 @@ export const nav = [ ...@@ -1065,7 +1071,7 @@ export const nav = [
index: 2, index: 2,
link: "/Knowledge/Standard", link: "/Knowledge/Standard",
breadcrumb: [ breadcrumb: [
{ name: "技术与标准", path: "/Knowledge/index" }, { name: "知识中心", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" }, { name: "技术知识", path: "/Knowledge/index" },
{ name: "标准文献" }, { name: "标准文献" },
], ],
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<!-- 条码生成区域end --> <!-- 条码生成区域end -->
<!-- 条码生成成功区域start --> <!-- 条码生成成功区域start -->
<generate-success :codePicture="codePicture" v-if="showSuccess"></generate-success> <generate-success :codePicture="codePicture" v-if="showSuccess" :title="title"></generate-success>
<!-- 条码生成成功区域end --> <!-- 条码生成成功区域end -->
<!-- 友情提示 --> <!-- 友情提示 -->
<code-footer></code-footer> <code-footer></code-footer>
...@@ -55,6 +55,7 @@ export default { ...@@ -55,6 +55,7 @@ export default {
inputInfo: {}, inputInfo: {},
showSuccess: false, showSuccess: false,
codePicture: '', codePicture: '',
title:'GRAI'
}; };
}, },
watch: { watch: {
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
<!-- 条码生成成功区域start --> <!-- 条码生成成功区域start -->
<generate-success <generate-success
:codePicture="codePicture" :codePicture="codePicture"
:title="title"
v-if="showSuccess" v-if="showSuccess"
></generate-success> ></generate-success>
<!-- 条码生成成功区域end --> <!-- 条码生成成功区域end -->
...@@ -139,6 +140,8 @@ export default { ...@@ -139,6 +140,8 @@ export default {
showSuccess: false, showSuccess: false,
codePicture: "", codePicture: "",
isGenerate: true, isGenerate: true,
title:'SSCC'
}; };
}, },
watch: { watch: {
...@@ -189,6 +192,7 @@ export default { ...@@ -189,6 +192,7 @@ export default {
return item.codeValue === event; return item.codeValue === event;
}); });
this.writeCodeList[i].cValue = ""; this.writeCodeList[i].cValue = "";
this.writeCodeList[i].checkCode = "";
this.writeCodeList[i].format = obj.format; this.writeCodeList[i].format = obj.format;
this.writeCodeList[i].isCheck = obj.isCheck; this.writeCodeList[i].isCheck = obj.isCheck;
this.writeCodeList[i].isDate = obj.isDate; this.writeCodeList[i].isDate = obj.isDate;
...@@ -257,7 +261,7 @@ export default { ...@@ -257,7 +261,7 @@ export default {
if(item.isVariable === 1) { if(item.isVariable === 1) {
param.push(`${item.flag},${item.cValue}ñ`); param.push(`${item.flag},${item.cValue}ñ`);
} else { } else {
param.push(`${item.flag},${item.cValue}`); param.push(`${item.flag},${item.cValue},${item.checkCode}`);
} }
} }
return item; return item;
...@@ -272,11 +276,14 @@ export default { ...@@ -272,11 +276,14 @@ export default {
this.showSuccess = true; this.showSuccess = true;
this.codePicture = data; this.codePicture = data;
console.log(this.codePicture); console.log(this.codePicture);
} else { } else {
this.showSuccess = false; this.showSuccess = false;
this.$message.error("生成失败,请稍后重试~"); this.$message.error("生成失败,请稍后重试~");
} }
}, },
}, },
}; };
</script> </script>
......
...@@ -23,14 +23,28 @@ export default { ...@@ -23,14 +23,28 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
title:{
type: String,
default: "",
}
}, },
data() { data() {
return {}; return {
codeId:this.getParamQueryString(this.codePicture,'codeId')
};
},
created() {
}, },
created() {},
mounted() {}, mounted() {},
methods: { methods: {
downPicture() { downPicture() {
if(this.title=='SSCC'){
this.updateBarcode()
}else{
this.updateCheckCode()
}
this.getUrlBase64(this.codePicture).then((base64) => { this.getUrlBase64(this.codePicture).then((base64) => {
let link = document.createElement("a"); let link = document.createElement("a");
link.href = base64; link.href = base64;
...@@ -55,6 +69,41 @@ export default { ...@@ -55,6 +69,41 @@ export default {
}; };
}); });
}, },
async updateCheckCode() {
const params = {
id:this.codeId
};
const listRes = await this.$api.barcode.updateCheckCode(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
console.log('记录成功')
}
},
async updateBarcode() {
const params = {
id:this.codeId
};
const listRes = await this.$api.barcode.updateBarcode(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
console.log('记录成功')
}
},
getParamQueryString (url, name) {
let subStr = name + '='
if (url.indexOf(subStr) !== -1) {
let arr = url.split(subStr)
let sub1 = arr[1]
if (sub1.indexOf('&') !== -1) {
let arr2 = sub1.split('&')
let sub2 = arr2[0]
return sub2
} else {
return sub1
}
}
return ''
},
}, },
}; };
</script> </script>
......
<template> <template>
<div class="tmgg"> <div class="tmgg">
<cate :father="tmggCate"></cate> <cate :father="tmggCate"></cate>
<div class="container"> <div class="container" v-loading="loading">
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
<li <li
class="nav-item" class="nav-item"
...@@ -78,6 +78,7 @@ export default { ...@@ -78,6 +78,7 @@ export default {
total: 0, total: 0,
}, },
logoutFlag: "1", logoutFlag: "1",
loading:false
}; };
}, },
watch: { watch: {
...@@ -102,13 +103,16 @@ export default { ...@@ -102,13 +103,16 @@ export default {
setLogoutFlag(currentTab) { setLogoutFlag(currentTab) {
if (currentTab === "zhuce") { if (currentTab === "zhuce") {
this.logoutFlag = 0; this.logoutFlag = 0;
} else { } else {
this.logoutFlag = 1; this.logoutFlag = 1;
} }
this.pageParams.currPage=1
this.businessGetEanUpcByCondition(); this.businessGetEanUpcByCondition();
}, },
// 条码注册/注销公告 // 条码注册/注销公告
async businessGetEanUpcByCondition() { async businessGetEanUpcByCondition() {
this.loading=true
const params = { const params = {
page: this.pageParams.currPage, page: this.pageParams.currPage,
limit: this.pageParams.pageSize, limit: this.pageParams.pageSize,
...@@ -138,6 +142,7 @@ export default { ...@@ -138,6 +142,7 @@ export default {
this.list[key].data = data.list; this.list[key].data = data.list;
// console.log(this.list, "this.list"); // console.log(this.list, "this.list");
} }
this.loading=false
}, },
// 接收分页子组件传过来的值 // 接收分页子组件传过来的值
receivePagesChild(val) { receivePagesChild(val) {
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="djwh-tp"> <div class="djwh-tp">
<a href="http://wsdt.gs1cn.org/anccoh/login.jsp" target="blank" <a href="http://wsdt.gs1cn.org/anccoh/login.jsp" target="blank"
><img ><img
src="../../assets/image/home/top1.png" src="../../assets/image/home/top1.jpg"
alt="" alt=""
/> />
<div class="top-p"><span>网上业务大厅</span><i></i></div> <div class="top-p"><span>网上业务大厅</span><i></i></div>
...@@ -646,7 +646,27 @@ export default { ...@@ -646,7 +646,27 @@ export default {
data() { data() {
return { return {
keywords: "", keywords: "",
banner: [], // 首页大轮播图 banner: [{
brief: "国际物品编码组织(GS1)是全球性的、中立的非营利国际组织,致力于通过制定全球统一的产品标识和电子商务标准,实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔,目前,在全球拥有116个成员组织。",
briefShow: "国际物品编码组织(GS1)是全球性的、中立的非营利国际组织,致力于通过制定全球统一的产品标识和电子商务标准,实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔,目前,在全球拥有116个成员组织。",
checkIndexAuthor: "pwindqq",
checkflagIndex: 1,
classnum: "大轮播",
colorBackground: "#002c6c !important",
colorBrief: "#FFF",
colorMore: "orange",
directpath: "http://www.gs1.org/",
editorIndex: "liun",
id: 6,
isShow: "1",
lasteditorIndex: "pwindqq",
levels: 1,
levelsIndex: 0,
picIndexPath: "http://dynamic.gs1cn.org/office/uploadFileResource/img/demo/index-banner2.jpg",
starttimeIndex: "2018-05-02 10:20:00",
title: "GS1",
updatetimeIndex: "2023-03-09 10:22:32",
}], // 首页大轮播图
bannerSettings: { bannerSettings: {
arrows: true, arrows: true,
autoplay: true, autoplay: true,
...@@ -1338,6 +1358,28 @@ export default { ...@@ -1338,6 +1358,28 @@ export default {
if (returnCode === "0") { if (returnCode === "0") {
this.banner = data; this.banner = data;
console.log(this.banner, "this.banner"); console.log(this.banner, "this.banner");
}else{
this.banner=[{
brief: "国际物品编码组织(GS1)是全球性的、中立的非营利国际组织,致力于通过制定全球统一的产品标识和电子商务标准,实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔,目前,在全球拥有116个成员组织。",
briefShow: "国际物品编码组织(GS1)是全球性的、中立的非营利国际组织,致力于通过制定全球统一的产品标识和电子商务标准,实现供应链的高效运作与可视化。GS1总部设在布鲁塞尔,目前,在全球拥有116个成员组织。",
checkIndexAuthor: "pwindqq",
checkflagIndex: 1,
classnum: "大轮播",
colorBackground: "#002c6c !important",
colorBrief: "#FFF",
colorMore: "orange",
directpath: "http://www.gs1.org/",
editorIndex: "liun",
id: 6,
isShow: "1",
lasteditorIndex: "pwindqq",
levels: 1,
levelsIndex: 0,
picIndexPath: "http://dynamic.gs1cn.org/office/uploadFileResource/img/demo/index-banner2.jpg",
starttimeIndex: "2018-05-02 10:20:00",
title: "GS1",
updatetimeIndex: "2023-03-09 10:22:32",
}]
} }
console.log(homeBigImagesRes, "首页大轮播图"); console.log(homeBigImagesRes, "首页大轮播图");
}, },
...@@ -1982,6 +2024,18 @@ export default { ...@@ -1982,6 +2024,18 @@ export default {
.carousel-title { .carousel-title {
font-size: 25px; font-size: 25px;
line-height: 30px; line-height: 30px;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 这里是超出几行省略 */
}
.carousel-note{
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3; /* 这里是超出几行省略 */
} }
} }
.newsBanner { .newsBanner {
...@@ -2074,6 +2128,9 @@ export default { ...@@ -2074,6 +2128,9 @@ export default {
.carousel-title { .carousel-title {
color: #ffffff; color: #ffffff;
// word-break: break-all;
} }
.carousel-note { .carousel-note {
...@@ -2082,6 +2139,10 @@ export default { ...@@ -2082,6 +2139,10 @@ export default {
line-height: 24px; line-height: 24px;
margin: 30px 0; margin: 30px 0;
cursor: pointer; cursor: pointer;
// word-break: break-all;
} }
.carousel-btn { .carousel-btn {
...@@ -2771,7 +2832,8 @@ export default { ...@@ -2771,7 +2832,8 @@ export default {
border-radius: 8px; border-radius: 8px;
img { img {
width: 100%; width: 100%;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
} }
} }
......
...@@ -97,7 +97,15 @@ export default { ...@@ -97,7 +97,15 @@ export default {
}, },
created(){ created(){
this.urlDown = process.env.VUE_APP_HOST_URL; this.urlDown = process.env.VUE_APP_HOST_URL;
} },
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "GS1系统" },
]);
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -98,6 +98,14 @@ export default { ...@@ -98,6 +98,14 @@ export default {
}, },
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "专业术语" },
]);
},
methods:{ methods:{
searchInfo(i){ searchInfo(i){
this.keyArrStr=i this.keyArrStr=i
......
...@@ -36,6 +36,14 @@ export default { ...@@ -36,6 +36,14 @@ export default {
created(){ created(){
this.ycListFn(this.policyList.currPage) this.ycListFn(this.policyList.currPage)
}, },
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "知识中心", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "标准文献" },
]);
},
methods:{ methods:{
...mapMutations({ ...mapMutations({
setMatche: "setMatche", setMatche: "setMatche",
......
...@@ -36,6 +36,14 @@ export default { ...@@ -36,6 +36,14 @@ export default {
created() { created() {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "小贴士" },
]);
},
methods:{ methods:{
...mapMutations({ ...mapMutations({
setMatche: "setMatche", setMatche: "setMatche",
......
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
.health-detail { .health-detail {
margin-top: 20px; margin-top: 20px;
line-height: 28px; line-height: 28px;
font-size: 14px; // font-size: 14px;
text-indent: 28px; text-indent: 28px;
color: #454545; color: #454545;
/deep/p { /deep/p {
......
...@@ -212,6 +212,7 @@ export default { ...@@ -212,6 +212,7 @@ export default {
mounted() { mounted() {
// 面包屑单独处理 // 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" }, { name: "应用领域", path: "/News/index" },
{ name: "物流" }, { name: "物流" },
]); ]);
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="branchMsg-cont"> <div class="branchMsg-cont">
<div class="branchMsg-message"> <div class="branchMsg-message">
<div class="row"> <div class="row">
<div class="col-lg-6"></div> <div class=""></div>
<div class="tip col-lg-6 col-12" v-show="msg.addressDescription"> <div class="tip " v-show="msg.addressDescription">
<div class="tip-title"><span>重要提示</span></div> <div class="tip-title"><span>重要提示</span></div>
<div class="tip-text"> <div class="tip-text">
<p></p> <p></p>
...@@ -97,7 +97,18 @@ export default { ...@@ -97,7 +97,18 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.branchMsg { .branchMsg {
@media screen and (min-width: 992px) { @media screen and (max-width: 1200px) {
.branchMsg-message{
.row {
justify-content: flex-end!important;
}
}
.tip {
width: 100%!important;
}
}
@media screen and (min-width: 1200px) {
.branchMsg-message { .branchMsg-message {
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -108,6 +119,8 @@ export default { ...@@ -108,6 +119,8 @@ export default {
// justify-content: flex-end; // justify-content: flex-end;
pointer-events: none; pointer-events: none;
.tip { .tip {
margin: 0 15px;
width: 40%;
pointer-events: auto; pointer-events: auto;
p{ p{
margin-bottom: 0 !important; margin-bottom: 0 !important;
......
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
<span style="color: #969799;">未查到该信息</span> <span style="color: #969799;">未查到该信息</span>
</template> </template>
<el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GLN" width="160"></el-table-column> <el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GLN" width="160"></el-table-column>
<el-table-column prop="address.name" label="企业名称(含英文)" width="220"> <el-table-column prop="address.name" label="企业名称(含英文)" >
</el-table-column> </el-table-column>
<el-table-column prop="address.streetAddressOne" label="中文地址"></el-table-column> <!-- <el-table-column prop="address.streetAddressOne" label="中文地址"></el-table-column>
<el-table-column prop="status" label="英文地址"></el-table-column> <el-table-column prop="status" label="英文地址"></el-table-column> -->
</el-table> </el-table>
</template> </template>
<span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span> <span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span>
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
total: 0, total: 0,
}, },
search: { search: {
service: "", service: this.$route.query.service || "",
}, },
serviceList: [ serviceList: [
{value: "", label: "全部服务行业"}, {value: "", label: "全部服务行业"},
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div style="font-size: 18px;padding: 8px 0;border-bottom: 1px solid #248ece;">医疗</div> <div style="font-size: 18px;padding: 8px 0;border-bottom: 1px solid #248ece;">医疗</div>
<div style="margin-top: 15px;margin-bottom: 15px;"><span style="">汇集医疗领域的优质解决方案服务商,以优质的技术和服务,为用户解决GS1编码的“最后一公里”问题。</span> <div style="margin-top: 15px;margin-bottom: 15px;"><span style="">汇集医疗领域的优质解决方案服务商,以优质的技术和服务,为用户解决GS1编码的“最后一公里”问题。</span>
</div> </div>
<div class="text-right"><a href="/Service/Partners/CaseHealthcare">更多»</a></div> <div class="text-right"><a href="/Service/Partners/CaseList?service=医疗">更多»</a></div>
</div> </div>
</div> </div>
</div> </div>
......
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