Skip to content

G
gs1
Commit 17fd6242 by Lyan
Options

提交

parent 0b6cbe2a
Showing with 210 additions and 24 deletions
package.json
......@@ -61,5 +61,4 @@
"volta": {
"node": "14.21.3"
}
}
src/axios/module/barcode.js
......@@ -19,16 +19,27 @@ const queryGRAIAIList = (params = {}) => {
const generateBarcode = (params = {}) => {
return POST(`${Prefix}/office/barcodegeneration/api/createQRcode`, params)
}
// 下载条形码
const updateBarcode = (params = {}) => {
return POST(`${Prefix}/office/ssccCodeImage/api/update`, params)
}
// 查询校验码
const queryCheckCode = (params = {}) => {
return POST(`${Prefix}/office/barcodegeneration/api/checkGS1Code`, params)
}
// 下载校验码
const updateCheckCode = (params = {}) => {
return POST(`${Prefix}/office/graiCodeImage/api/update`, params)
}
export default {
querySSCCAIList,
queryGRAIAIList,
queryGRAIAIList,
generateBarcode,
updateBarcode,
queryCheckCode,
updateCheckCode
}
src/components/layout/header/mock.js
......@@ -898,6 +898,7 @@ export const nav = [
link: "/News/Logistics",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "物流" },
],
},
......@@ -918,6 +919,7 @@ export const nav = [
link: "/News/FoodSafety",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "食品安全追溯" },
],
},
......@@ -928,6 +930,7 @@ export const nav = [
link: "/News/ECommerce",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "电子商务" },
],
},
......@@ -938,6 +941,7 @@ export const nav = [
link: "/News/MCommerce",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "移动商务" },
],
},
......@@ -948,6 +952,7 @@ export const nav = [
link: "/News/IoT",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "物联网" },
],
},
......@@ -958,6 +963,7 @@ export const nav = [
link: "/News/Other",
breadcrumb: [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "其他" },
],
},
......@@ -969,7 +975,7 @@ export const nav = [
id: "6",
name: "知识中心",
index: 6,
link: "/Knowledge/index",
link: "/Knowledge",
rowNum: 6,
children: [
{
......@@ -1065,7 +1071,7 @@ export const nav = [
index: 2,
link: "/Knowledge/Standard",
breadcrumb: [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "知识中心", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "标准文献" },
],
......
src/views/BarCode/GRAI.vue
......@@ -28,7 +28,7 @@
</div>
<!-- 条码生成区域end -->
<!-- 条码生成成功区域start -->
<generate-success :codePicture="codePicture" v-if="showSuccess"></generate-success>
<generate-success :codePicture="codePicture" v-if="showSuccess" :title="title"></generate-success>
<!-- 条码生成成功区域end -->
<!-- 友情提示 -->
<code-footer></code-footer>
......@@ -55,6 +55,7 @@ export default {
inputInfo: {},
showSuccess: false,
codePicture: '',
title:'GRAI'
};
},
watch: {
......
src/views/BarCode/SSCC.vue
......@@ -109,6 +109,7 @@
<!-- 条码生成成功区域start -->
<generate-success
:codePicture="codePicture"
:title="title"
v-if="showSuccess"
></generate-success>
<!-- 条码生成成功区域end -->
......@@ -139,6 +140,8 @@ export default {
showSuccess: false,
codePicture: "",
isGenerate: true,
title:'SSCC'
};
},
watch: {
......@@ -189,6 +192,7 @@ export default {
return item.codeValue === event;
});
this.writeCodeList[i].cValue = "";
this.writeCodeList[i].checkCode = "";
this.writeCodeList[i].format = obj.format;
this.writeCodeList[i].isCheck = obj.isCheck;
this.writeCodeList[i].isDate = obj.isDate;
......@@ -257,7 +261,7 @@ export default {
if(item.isVariable === 1) {
param.push(`${item.flag},${item.cValue}ñ`);
} else {
param.push(`${item.flag},${item.cValue}`);
param.push(`${item.flag},${item.cValue},${item.checkCode}`);
}
}
return item;
......@@ -272,11 +276,14 @@ export default {
this.showSuccess = true;
this.codePicture = data;
console.log(this.codePicture);
} else {
this.showSuccess = false;
this.$message.error("生成失败，请稍后重试~");
}
},
},
};
</script>
......
src/views/BarCode/generateSuccess.vue
......@@ -23,14 +23,28 @@ export default {
type: String,
default: "",
},
title:{
type: String,
default: "",
}
},
data() {
return {};
return {
codeId:this.getParamQueryString(this.codePicture,'codeId')
};
},
created() {
},
created() {},
mounted() {},
methods: {
downPicture() {
if(this.title=='SSCC'){
this.updateBarcode()
}else{
this.updateCheckCode()
}
this.getUrlBase64(this.codePicture).then((base64) => {
let link = document.createElement("a");
link.href = base64;
......@@ -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>
......
src/views/Business/Notice.vue
<template>
<div class="tmgg">
<cate :father="tmggCate"></cate>
<div class="container">
<div class="container" v-loading="loading">
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li
class="nav-item"
......@@ -78,6 +78,7 @@ export default {
total: 0,
},
logoutFlag: "1",
loading:false
};
},
watch: {
......@@ -102,13 +103,16 @@ export default {
setLogoutFlag(currentTab) {
if (currentTab === "zhuce") {
this.logoutFlag = 0;
} else {
this.logoutFlag = 1;
}
this.pageParams.currPage=1
this.businessGetEanUpcByCondition();
},
// 条码注册/注销公告
async businessGetEanUpcByCondition() {
this.loading=true
const params = {
page: this.pageParams.currPage,
limit: this.pageParams.pageSize,
......@@ -138,6 +142,7 @@ export default {
this.list[key].data = data.list;
// console.log(this.list, "this.list");
}
this.loading=false
},
// 接收分页子组件传过来的值
receivePagesChild(val) {
......
src/views/Home/index.vue
......@@ -52,7 +52,7 @@
<div class="djwh-tp">
<a href="http://wsdt.gs1cn.org/anccoh/login.jsp" target="blank"
><img
src="../../assets/image/home/top1.png"
src="../../assets/image/home/top1.jpg"
alt=""
/>
<div class="top-p"><span>网上业务大厅</span><i></i></div>
......@@ -646,7 +646,27 @@ export default {
data() {
return {
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: {
arrows: true,
autoplay: true,
......@@ -1338,6 +1358,28 @@ export default {
if (returnCode === "0") {
this.banner = data;
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, "首页大轮播图");
},
......@@ -1982,6 +2024,18 @@ export default {
.carousel-title {
font-size: 25px;
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 {
......@@ -2074,6 +2128,9 @@ export default {
.carousel-title {
color: #ffffff;
// word-break: break-all;
}
.carousel-note {
......@@ -2082,6 +2139,10 @@ export default {
line-height: 24px;
margin: 30px 0;
cursor: pointer;
// word-break: break-all;
}
.carousel-btn {
......@@ -2771,7 +2832,8 @@ export default {
border-radius: 8px;
img {
width: 100%;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
}
}
......
src/views/Knowledge/GS1System2.vue
......@@ -97,7 +97,15 @@ export default {
},
created(){
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>
<style lang="scss" scoped>
......
src/views/Knowledge/Glossary.vue
......@@ -98,6 +98,14 @@ export default {
},
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "专业术语" },
]);
},
methods:{
searchInfo(i){
this.keyArrStr=i
......
src/views/Knowledge/Standard.vue
......@@ -36,6 +36,14 @@ export default {
created(){
this.ycListFn(this.policyList.currPage)
},
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "知识中心", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "标准文献" },
]);
},
methods:{
...mapMutations({
setMatche: "setMatche",
......
src/views/Knowledge/xts.vue
......@@ -36,6 +36,14 @@ export default {
created() {
this.initListFn(this.tableResult.currPage);
},
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "小贴士" },
]);
},
methods:{
...mapMutations({
setMatche: "setMatche",
......
src/views/News/HealthDetail.vue
......@@ -63,7 +63,7 @@ export default {
.health-detail {
margin-top: 20px;
line-height: 28px;
font-size: 14px;
// font-size: 14px;
text-indent: 28px;
color: #454545;
/deep/p {
......
src/views/News/Logistics.vue
......@@ -212,6 +212,7 @@ export default {
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/News/index" },
{ name: "应用领域", path: "/News/index" },
{ name: "物流" },
]);
......
src/views/Org/BranchMsg.vue
......@@ -5,8 +5,8 @@
<div class="branchMsg-cont">
<div class="branchMsg-message">
<div class="row">
<div class="col-lg-6"></div>
<div class="tip col-lg-6 col-12" v-show="msg.addressDescription">
<div class=""></div>
<div class="tip " v-show="msg.addressDescription">
<div class="tip-title"><span>重要提示</span></div>
<div class="tip-text">
<p></p>
......@@ -96,8 +96,19 @@ export default {
};
</script>
<style lang="scss">
.branchMsg {
@media screen and (min-width: 992px) {
.branchMsg {
@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 {
position: absolute;
width: 100%;
......@@ -108,6 +119,8 @@ export default {
// justify-content: flex-end;
pointer-events: none;
.tip {
margin: 0 15px;
width: 40%;
pointer-events: auto;
p{
margin-bottom: 0 !important;
......
src/views/Search/gln.vue
......@@ -48,10 +48,10 @@
<span style="color: #969799;">未查到该信息</span>
</template>
<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 prop="address.streetAddressOne" label="中文地址"></el-table-column>
<el-table-column prop="status" 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>
</template>
<span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span>
......
src/views/Service/Partners/caseList.vue
......@@ -59,7 +59,7 @@ export default {
total: 0,
},
search: {
service: "",
service: this.$route.query.service || "",
},
serviceList: [
{value: "", label: "全部服务行业"},
......
src/views/Service/Partners/index.vue
......@@ -44,7 +44,7 @@
<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>
<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>
......
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