Skip to content

G
gs1
Commit 50c62351 by Lyan
Options

禅道bug

parent 01d60788
Showing with 235 additions and 107 deletions
src/views/Djwh/index.vue
...@@ -9,85 +9,88 @@ ...@@ -9,85 +9,88 @@
<a href="/Home" target="_blank">返回编码中心首页</a> <a href="/Home" target="_blank">返回编码中心首页</a>
</p> </p>
</div> </div>
<!-- container --> <!-- container -->
<div class="djwh-container"> <div class="djwh-container " >
<div class="cnt-left" > <div class="cnt-left row" style="margin-left:0">
<div class="row-left" > <div class="row-left " >
<div class="left-img"> <div class="left-img">
<div class="border-div"> <div class="border-div">
<a href="https://www.12371.cn/special/19jlzqh/"> <a href="https://www.12371.cn/special/19jlzqh/">
<img src="../../assets/image/djwh/ssjwzqh.jpg" alt=""> <img src="../../assets/image/djwh/ssjwzqh.jpg" alt="">
</a> </a>
<a href="http://www.samr.gov.cn/zt/bwcx/"> <a href="http://www.samr.gov.cn/zt/bwcx/">
<img src="../../assets/image/djwh/19thpic1.jpg" alt=""> <img src="../../assets/image/djwh/19thpic1.jpg" alt="">
</a> </a>
</div>
</div> </div>
<div class=" middle-header" >
<div class="border-div ">
<a href="http://www.samr.gov.cn/zt/bwcx/">
<img src="../../assets/image/djwh/tt_pho.gif" alt="">
</a>
<div id="box">
<div id="con1" ref="con1" :class="{anim:animate==true}" :style="{ marginTop: marginTop + 'px' }" @mouseenter="mEnter" @mouseleave="mLeave">
<p v-for='(item,index) in hotList' :key="index" >{{item.title}}</p>
</div>
</div>
</div>
<div class=" middle-header" >
<div class="border-div ">
<a href="http://www.samr.gov.cn/zt/bwcx/">
<img src="../../assets/image/djwh/tt_pho.gif" alt="">
</a>
<div id="box">
<div id="con1" ref="con1" :class="{anim:animate==true}" :style="{ marginTop: marginTop + 'px' }" @mouseenter="mEnter" @mouseleave="mLeave">
<p v-for='(item,index) in hotList' :key="index" >{{item.title}}</p>
</div>
</div>
</div>
<div class="border-div list-style">
<div class="middle-title">
<h4>活动报道</h4>
<a href="/djwhlist" target="_blank" >更多>></a>
</div>
<div class="middle-list">
<ul>
<li v-for="(item, i) in reportList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)">{{item.title}}</a></li>
</ul>
</div>
</div> </div>
<div class="border-div list-style">
<div class="middle-title">
<h4>活动报道</h4>
<a href="/djwhlist" target="_blank" >更多>></a>
</div>
<div class="middle-list">
<ul>
<li v-for="(item, i) in reportList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)">{{item.title}}</a></li>
</ul>
</div>
</div> </div>
<div style="margin-top:15px;overflow:hidden;width:100%">
</div> <div class="ds">
<div style="margin-top:15px;overflow:hidden;width:100%"> <div>
<div class="ds"> <img src="../../assets/image/djwh/dsjy-title.gif" alt="">
<div> </div>
<img src="../../assets/image/djwh/dsjy-title.gif" alt=""> <div>
</div> <div class="list-style">
<div> <ul>
<div class="list-style"> <li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)" >{{item.title}}</a></li>
<ul> </ul>
<li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)" >{{item.title}}</a></li> </div>
</ul>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="" style="overflow:hidden">
<div class="" style="overflow:hidden"> <div class="ds hdtp">
<div class="ds hdtp"> <div>
<div> <img src="../../assets/image/djwh/pho_bg5.gif" alt="">
<img src="../../assets/image/djwh/pho_bg5.gif" alt=""> </div>
</div> <div>
<div> <div class="list-style">
<div class="list-style"> <!-- <a href=""> <img src="../../assets/image/djwh/2020122801.jpg" alt=""></a>
<!-- <a href=""> <img src="../../assets/image/djwh/2020122801.jpg" alt=""></a> <a href=""> <img src="../../assets/image/djwh/2020122802.jpg" alt=""></a>
<a href=""> <img src="../../assets/image/djwh/2020122802.jpg" alt=""></a> <a href=""> <img src="../../assets/image/djwh/2020122803.jpg" alt=""></a>
<a href=""> <img src="../../assets/image/djwh/2020122803.jpg" alt=""></a> <a href=""> <img src="../../assets/image/djwh/2020122804.jpg" alt=""></a> -->
<a href=""> <img src="../../assets/image/djwh/2020122804.jpg" alt=""></a> --> <a v-for="(item,i) in pictureListArr" :key="i" @click="goInfo(item.articleId,item.directpath)"> <img :src="item.picFile" ></a>
<a v-for="(item,i) in pictureListArr" :key="i" @click="goInfo(item.articleId,item.directpath)"> <img :src="item.picFile" ></a> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class=" foottp" style="overflow:hidden;">
<div class=" foottp" style="overflow:hidden;"> <img src="../../assets/image/djwh/19th.gif" alt="">
<img src="../../assets/image/djwh/19th.gif" alt=""> </div>
</div> </div>
</div> </div>
</div>
<div class=" right-con"> <div class=" right-con">
<div class="border-div list-style"> <div class="border-div list-style">
<div class="middle-title"> <div class="middle-title">
<h4>党的十九大文件</h4> <h4>党的十九大文件</h4>
...@@ -131,7 +134,7 @@ ...@@ -131,7 +134,7 @@
<div class="border-div list-style xglj"> <div class="border-div list-style xglj">
<div class="middle-title"> <div class="middle-title">
<h4>相关链接</h4> <h4>相关链接</h4>
<a href="http://www.12371.cn/special/xg19thjs/"> <img src="../../assets/image/djwh/19th_rmw.jpg" alt=""></a> <a href="http://www.12371.cn/special/xg19thjs/"> <img src="../../assets/image/djwh/19th_rmw.jpg" alt=""></a>
<a href="http://www.samr.gov.cn/zt/fdqh/"> <img src="../../assets/image/djwh/dsxx.jpg" alt=""></a> <a href="http://www.samr.gov.cn/zt/fdqh/"> <img src="../../assets/image/djwh/dsxx.jpg" alt=""></a>
<a href="http://lxyz.12371.cn"> <img src="../../assets/image/djwh/lxyz_xxjyw.png" alt=""></a> <a href="http://lxyz.12371.cn"> <img src="../../assets/image/djwh/lxyz_xxjyw.png" alt=""></a>
<a href="http://lxyz.people.cn/GB/index.html"> <img src="../../assets/image/djwh/lxyz_rmw.png" alt=""></a> <a href="http://lxyz.people.cn/GB/index.html"> <img src="../../assets/image/djwh/lxyz_rmw.png" alt=""></a>
...@@ -142,6 +145,7 @@ ...@@ -142,6 +145,7 @@
</div> </div>
</div> </div>
</div> </div>
<Footer></Footer> <Footer></Footer>
</div> </div>
...@@ -362,6 +366,7 @@ html{ ...@@ -362,6 +366,7 @@ html{
.djwh { .djwh {
background: #fff; background: #fff;
.header{ .header{
margin-bottom: 20px;
img{ img{
width: 100%; width: 100%;
} }
...@@ -388,16 +393,24 @@ html{ ...@@ -388,16 +393,24 @@ html{
.border-div{ .border-div{
width: 100%; width: 100%;
border:1px solid #BADFF2; border:1px solid #BADFF2;
} }
.clear{
clear: both;
}
.djwh-container{ .djwh-container{
display: inline;
overflow: hidden;
background: #fff; background: #fff;
margin-top: 20px;
.cnt-left{ .cnt-left{
overflow: hidden;
float: left; float: left;
width: 723px; width: 723px;
margin-right: 15px; margin-right: 15px;
} }
.left-img{ .left-img{
float: left; float: left;
...@@ -531,6 +544,7 @@ html{ ...@@ -531,6 +544,7 @@ html{
transition: all 1s ; transition: all 1s ;
} }
.right-con{ .right-con{
overflow: hidden;
width: 237px; width: 237px;
float: left; float: left;
h4{ h4{
......
src/views/Knowledge/article.vue
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
.org { .org {
padding-bottom: 20px; padding-bottom: 20px;
.title-style { .title-style {
width: 100%;
padding: 35px 0 10px; padding: 35px 0 10px;
border-bottom: 1px solid #b2b2b8; border-bottom: 1px solid #b2b2b8;
color: #002c6c; color: #002c6c;
......
src/views/Knowledge/knowledgeList.vue
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords"></el-input> <el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords" style="margin-left:-30px"></el-input>
<div class="top-form-btn col-lg-2" @click="goKnowledgeList"> <div class="top-form-btn col-lg-2" @click="goKnowledgeList" style="margin-left:-15px">
<img src="../../assets/image/home/sousuo-ico1.png" alt="" /> <img src="../../assets/image/home/sousuo-ico1.png" alt="" />
</div> </div>
</div> </div>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.sptm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.sptm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'商品条码')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.epc" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.epc" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'产品电子代码（EPC）')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.gds" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.gds" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'全球数据同步（GDS）')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.gln" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.gln" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'全球位置编码（GLN）')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.zxcbm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.zxcbm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'自称车编码')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.dwbm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.dwbm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'动物编码')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.ewtm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.ewtm" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'二维条码')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.ecr" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.ecr" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'高效消费者响应（ECR）')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<!-- EbXML --> <!-- EbXML -->
<div class="knowledge-cnt" v-if="listResult.ebXML && listResult.ebXML.length>0"> <div class="knowledge-cnt" v-if="listResult.ebXML && listResult.ebXML.length>0">
<div class="knowledge-title"> <div class="knowledge-title">
EbXML ebXML
</div> </div>
<div class="knowledge-container card "> <div class="knowledge-container card ">
<div class="row g-2 "> <div class="row g-2 ">
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.ebXML" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.ebXML" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'ebXML')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<div class="card-body"> <div class="card-body">
<p class="card-text"> <p class="card-text">
<ul style="padding-left:0"> <ul style="padding-left:0">
<li v-for="(item,i) of listResult.rfid" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li> <li v-for="(item,i) of listResult.rfid" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath,'RFID')">{{item.Title}}</li>
</ul> </ul>
</p> </p>
</div> </div>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</template> </template>
<script> <script>
// import sousuoList from "../Home/comps/sousuo-list.vue"; // import sousuoList from "../Home/comps/sousuo-list.vue";
import { mapMutations } from "vuex";
export default { export default {
components: { components: {
...@@ -291,7 +291,50 @@ export default { ...@@ -291,7 +291,50 @@ export default {
rfid:[] rfid:[]
}, },
hotListArr:[], hotListArr:[],
message:'' message:'',
matcheList:[
{
name: "商品条码",
path: "/Knowledge/GS1System/goodsGln",
},
{
name: "产品电子代码（EPC）",
path: "/Knowledge/GS1System/goodsEpc",
},
{
name: "全球数据同步（GDS）",
path: "/Knowledge/GS1System/goodsGDS",
},
{
name: "全球位置编码（GLN）",
path: "/Knowledge/GS1System/goodsPosition",
},
{
name: "自行车编码",
path: "/Knowledge/GS1System/zxcbm",
},
{
name: "动物编码",
path: "/Knowledge/GS1System/dwbm",
},
{
name: "二维条码",
path: "/Knowledge/GS1System/ewbm",
},
{
name: "高效消费者响应（ECR）",
path: "/Knowledge/GS1System/gxfECR",
},
{
name: "ebXML",
path: "/Knowledge/GS1System/ebxml",
},
{
name: "小贴士",
path: "/Knowledge/xts",
},
]
}; };
}, },
...@@ -306,6 +349,9 @@ export default { ...@@ -306,6 +349,9 @@ export default {
this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords) this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords)
}, },
methods: { methods: {
...mapMutations({
setMatche: "setMatche",
}),
goGlossary(){ goGlossary(){
this.$router.push({ this.$router.push({
path: '/Knowledge/Glossary', path: '/Knowledge/Glossary',
...@@ -340,10 +386,18 @@ export default { ...@@ -340,10 +386,18 @@ export default {
this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords) this.searchKnowledgeList(this.chaxun.type,this.chaxun.keywords)
}, },
getInfo(id,directpath){ getInfo(id,directpath,name){
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
let matche = this.matcheList.filter((item) => item.name === name)[0];
if(typeof(matche)==='undefined'){
matche = [{
name:'技术知识',
path:'/Knowledge/index'
}]
}
this.setMatche(matche);
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/Knowledge/article?id=${id}`, path: `/Knowledge/article?id=${id}`,
}); });
...@@ -351,10 +405,11 @@ export default { ...@@ -351,10 +405,11 @@ export default {
} }
}, },
goInfo(id,directpath){ goInfo(id,directpath,name){
if(directpath!==''&& directpath.length>0){ if(directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/Knowledge/Statuteinfo?id=${id}`, path: `/Knowledge/Statuteinfo?id=${id}`,
}); });
......
src/views/Member/index.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<p>6. 应用市场：面向系统成员提供商品条码标准化应用与信息化产品的开放式应用中心，服务内容涉及软件应用、系统集成开发、技术支持与培训、定制化服务等标准化与信息化解决方案。</p> <p>6. 应用市场：面向系统成员提供商品条码标准化应用与信息化产品的开放式应用中心，服务内容涉及软件应用、系统集成开发、技术支持与培训、定制化服务等标准化与信息化解决方案。</p>
<p>继续使用该专区功能，请使用条码卡卡号及密码登录。</p> <p>继续使用该专区功能，请使用条码卡卡号及密码登录。</p>
<p style="text-align:center"><el-button type="primary" style="padding: 9px 30px;margin-right: 6px" @click="handleToLogin">登录 <p style="text-align:center;text-indent:0"><el-button type="primary" style="padding: 9px 30px;" @click="handleToLogin">登录
</el-button></p> </el-button></p>
</div> </div>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<div class="listStyle xgbz"> <div class="listStyle xgbz">
<div class="title">中国物品编码中心分支机构培训计划公告</div> <div class="title">中国物品编码中心分支机构培训计划公告</div>
<p>为更好的开展我国商品条码系统成员教育培训工作，使我国商品条码系统成员第一时间了解各地区分支机构培训时间及培训内容，现将中国物品编码中心全国分支机构培训计划进行公布，如需了解请按下方提示点击进入。</p> <p>为更好的开展我国商品条码系统成员教育培训工作，使我国商品条码系统成员第一时间了解各地区分支机构培训时间及培训内容，现将中国物品编码中心全国分支机构培训计划进行公布，如需了解请按下方提示点击进入。</p>
<p style="text-align:center;margin-top:110px"> <p style="text-align:center;margin-top:110px;text-indent:0">
<el-button type="primary" style="padding: 9px 30px;margin-right: 6px" @click="goTraining">分支机构季度培训计划 <el-button type="primary" style="padding: 9px 30px;" @click="goTraining">分支机构季度培训计划
</el-button></p> </el-button></p>
</div> </div>
</div> </div>
......
src/views/MyManage/UnVerify/index.vue
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证） 厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证）
</p> </p>
<p> <p>
<i class="bi bi-check-circle-fill"></i <i class="bi bi-check-circle-fill"></i>
>您已成为中国物品编码中心实名认证企业！ 您已成为中国物品编码中心实名认证企业！
</p> </p>
<p v-if="isShowGDS" style="padding-left:24px"> <p v-if="isShowGDS" style="padding-left:24px">
您可以——前往 您可以——前往
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
display: inline-block; display: inline-block;
width: 11px; width: 11px;
height: 11px; height: 11px;
background: #50c96b; // background: #50c96b;
margin-left: 3px; margin-left: 3px;
margin-right: 9px; margin-right: 9px;
border-radius: 50%; border-radius: 50%;
......
src/views/News/MCommerce.vue
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
}, },
created() { created() {
this.urlDown = process.env.VUE_APP_HOST_URL;
}, },
...@@ -112,10 +112,10 @@ export default { ...@@ -112,10 +112,10 @@ export default {
this.list2=[ this.list2=[
{ {
title:'移动商务（宣传折页）', title:'移动商务（宣传折页）',
directpath: `${this.url}/office/uploadFileResource/manage/down/20130620GS1 MobileCom.pdf` directpath: `${this.urlDown}/office/uploadFileResource/manage/down/20130620GS1 MobileCom.pdf`
} }
] ]
console.log(this.url) console.log(this.urlDown)
}, },
methods: { methods: {
...mapMutations({ ...mapMutations({
......
src/views/News/NoticeArticle.vue
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
this.showtime = data.showtime; this.showtime = data.showtime;
this.author = data.author; this.author = data.author;
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/New/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "公告通知", path: "/News/Notice" }, { name: "公告通知", path: "/News/Notice" },
{ name: this.title }, { name: this.title },
]); ]);
......
src/views/News/index.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<span @click="goNewPic">查看更多>></span> <span @click="goNewPic">查看更多>></span>
</div> </div>
<div class="tpzx-ul"> <div class="tpzx-ul">
<div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.articleId,tmp.jumppath)"> <div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.articleId,tmp.jumppath,'图片资讯')">
<div class="tpzx-li-tp"> <div class="tpzx-li-tp">
<img :src="tmp.picFile" alt="" /> <img :src="tmp.picFile" alt="" />
</div> </div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<div class="two-kj"> <div class="two-kj">
<ul class="two-ul"> <ul class="two-ul">
<li v-for="(tmp, i) in centerList" :key="i" @click="goInfo(tmp.id,tmp.directpath)"> <li v-for="(tmp, i) in centerList" :key="i" @click="goInfo(tmp.id,tmp.directpath,'中心活动')">
<span></span><span>{{tmp.title}}</span> <span></span><span>{{tmp.title}}</span>
</li> </li>
</ul> </ul>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<div class="two-kj"> <div class="two-kj">
<ul class="two-ul"> <ul class="two-ul">
<li v-for="(tmp, i) in localList" :key="i" @click="goInfo(tmp.id,tmp.directpath)"> <li v-for="(tmp, i) in localList" :key="i" @click="goInfo(tmp.id,tmp.directpath,'地方动态')">
<span></span><span>{{tmp.title}}</span> <span></span><span>{{tmp.title}}</span>
</li> </li>
</ul> </ul>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<ul v-if="depthList.length > 0"> <ul v-if="depthList.length > 0">
<li v-for="(tmp, i) in depthList" :key="i" @click="goInfo(tmp.id,tmp.directpath)"> <li v-for="(tmp, i) in depthList" :key="i" @click="goDepInfo(tmp.id,tmp.directpath)">
<span></span><span>{{tmp.title}}</span> <span></span><span>{{tmp.title}}</span>
</li> </li>
</ul> </ul>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
<ul v-if="videoList.length > 0"> <ul v-if="videoList.length > 0">
<li v-for="(tmp, i) in videoList" :key="i" @click="getVideoInfo(tmp.id)"> <li v-for="(tmp, i) in videoList" :key="i" @click="getVideoInfo(tmp.id,tmp.directpath)">
<span></span><span>{{tmp.title}}</span> <span></span><span>{{tmp.title}}</span>
</li> </li>
</ul> </ul>
...@@ -142,10 +142,24 @@ import { ...@@ -142,10 +142,24 @@ import {
} from "@/config/constant"; } from "@/config/constant";
export default { export default {
computed: { computed: {
...mapState(["url"]), ...mapState(["urls"]),
}, },
data() { data() {
return { return {
pathList:[
{
name:'图片资讯',
path:'/News/PicNews'
},
{
name:'中心活动',
path:'/News/Center'
},
{
name:'地方动态',
path:'/News/Local'
}
],
four: [ four: [
{ {
ico: require("../../assets/image/news/icon_lingshou.png"), ico: require("../../assets/image/news/icon_lingshou.png"),
...@@ -170,15 +184,15 @@ export default { ...@@ -170,15 +184,15 @@ export default {
list: [ list: [
{ {
title: "GBT 16830-2008 商品条码 储运包装商品编码与条码表示", title: "GBT 16830-2008 商品条码 储运包装商品编码与条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062272-GBT 16830-2008 商品条码 储运包装商品编码与条码表示.pdf`, directpath: `${this.urlDown}/2021-12-18/1472207864411062272-GBT 16830-2008 商品条码 储运包装商品编码与条码表示.pdf`,
}, },
{ {
title: "GBT 18127-2009 商品条码 物流单元编码与条码表示", title: "GBT 18127-2009 商品条码 物流单元编码与条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062273-GBT 18127-2009 商品条码 物流单元编码与条码表示.pdf`, directpath: `${this.urlDown}/2021-12-18/1472207864411062273-GBT 18127-2009 商品条码 物流单元编码与条码表示.pdf`,
}, },
{ {
title: "GBT 31005-2014 托盘编码及条码表示", title: "GBT 31005-2014 托盘编码及条码表示",
directpath: `${FILE_PREFIX}/2021-12-18/1472207864411062274-GBT 31005-2014 托盘编码及条码表示.PDF`, directpath: `${this.urlDown}/2021-12-18/1472207864411062274-GBT 31005-2014 托盘编码及条码表示.PDF`,
} }
], ],
}, },
...@@ -312,14 +326,31 @@ export default { ...@@ -312,14 +326,31 @@ export default {
this.foodList() this.foodList()
// 医疗 // 医疗
this.getList3ByType() this.getList3ByType()
this.urlDown = process.env.VUE_APP_HOST_URL;
console.log(this.urlDown)
}, },
mounted(){ mounted(){
this.four[5].list=[ this.four[5].list=[
{ {
title:'移动商务（宣传折页）', title:'移动商务（宣传折页）',
directpath: `${this.url}/Manage/down/20130620GS1 MobileCom.pdf` directpath: `${this.urlDown}/office/uploadFileResource/manage/down/20130620GS1 MobileCom.pdf`
} }
] ]
this.four[1].list= [
{
title: "GBT 16830-2008 商品条码 储运包装商品编码与条码表示",
directpath: `${this.urlDown}/office/uploadFileResource/2021-12-18/1472207864411062272-GBT 16830-2008 商品条码 储运包装商品编码与条码表示.pdf`,
},
{
title: "GBT 18127-2009 商品条码 物流单元编码与条码表示",
directpath: `${this.urlDown}/office/uploadFileResource/2021-12-18/1472207864411062273-GBT 18127-2009 商品条码 物流单元编码与条码表示.pdf`,
},
{
title: "GBT 31005-2014 托盘编码及条码表示",
directpath: `${this.urlDown}/office/uploadFileResource/2021-12-18/1472207864411062274-GBT 31005-2014 托盘编码及条码表示.PDF`,
}
],
console.log(this.four[5].list)
}, },
methods:{ methods:{
...mapMutations({ ...mapMutations({
...@@ -405,6 +436,15 @@ export default { ...@@ -405,6 +436,15 @@ export default {
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
let matche = this.four.filter((item) => item.name === name)[0];
if(typeof(matche)==='undefined'){
matche = this.pathList.filter((item) => item.name === name)[0];
if(typeof(matche)==='undefined'){
matche = []
}
}
this.setMatche(matche);
if(name=='医疗'){ if(name=='医疗'){
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/News/HealthDetail?id=${id}`, path: `/News/HealthDetail?id=${id}`,
...@@ -452,6 +492,23 @@ export default { ...@@ -452,6 +492,23 @@ export default {
} }
}, },
goDepInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
const matche = [
{
name: "深度专题",
path: "/News/DepthTopics",
}
];
this.setMatche(matche);
let link = this.$router.resolve({
path: `/News/msgVideo?id=${id}`,
});
window.open(link.href,'_blank')
}
},
//零售列表 //零售列表
async retailList() { async retailList() {
const params = { const params = {
......
src/views/News/viewsub.vue
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
this.showtime = data.showtime this.showtime = data.showtime
this.author=data.author this.author=data.author
this.$store.commit("system/SET_BREADCRUMB", [ this.$store.commit("system/SET_BREADCRUMB", [
{ name: "资讯中心", path: "/New/index" }, { name: "资讯中心", path: "/News/index" },
{ name: "深度资讯", path: "/News/DepthTopics" }, { name: "深度资讯", path: "/News/DepthTopics" },
{ name: this.title }, { name: this.title },
]); ]);
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
padding-bottom: 15px; padding-bottom: 15px;
} }
.showHtml{ .showHtml{
width: 100%;
border-bottom: 1px solid #b2b2b8; border-bottom: 1px solid #b2b2b8;
padding-bottom: 30px; padding-bottom: 30px;
margin-bottom: 25px; margin-bottom: 25px;
......
src/views/User/register.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
message: '注：用户名不能全为数字，且长度不得超过10字符', message: '注：用户名不能全为数字，且长度不得超过10字符',
},]"> },]">
<el-input v-model='form.userName' autocomplete='off'></el-input> <el-input v-model='form.userName' autocomplete='off'></el-input>
<p style="font-size: 13px;font-weight: 400;color: #F23535;line-height: 20px">注：用户名不能全为数字，且长度不得超过10字符</p> <!-- <p style="font-size: 13px;font-weight: 400;color: #F23535;line-height: 20px">注：用户名不能全为数字，且长度不得超过10字符</p> -->
</el-form-item> </el-form-item>
<el-form-item label='E-mail地址' <el-form-item label='E-mail地址'
......
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