Skip to content

G
gs1
Commit a031facb by Lyan
Options

修改一些bug

parent 9d0ab2fe
Showing with 185 additions and 45 deletions
src/views/Djwh/index.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div> <div>
<div class="list-style"> <div class="list-style">
<ul> <ul>
<li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)">{{item.title}}</a></li> <li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)" >{{item.title}}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<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.pictureid,item.directpath)"> <img :src="item.picFile" alt=""></a> <a v-for="(item,i) in pictureListArr" :key="i" @click="goInfo(item.pictureid,item.directpath)"> <img :src="item.picFile" ></a>
</div> </div>
</div> </div>
</div> </div>
...@@ -94,11 +94,11 @@ ...@@ -94,11 +94,11 @@
</div> </div>
<div class="middle-list"> <div class="middle-list">
<ul> <ul>
<li><a href=" " target="_blank">《中国共产党第十九届中央委员会第五次全体会议公报》</a></li> <li><a href="http://www.xinhuanet.com/politics/2020-10/29/c_1126674147.htm" target="_blank">《中国共产党第十九届中央委员会第五次全体会议公报》</a></li>
<li><a :href="path+'/djwh/download/19thfile/党的十九大报告全文.docx'" target="_blank">党的十九大报告全文</a></li> <li><a :href="path+'/djwh/download/19thfile/党的十九大报告全文.docx'" target="_blank">党的十九大报告全文</a></li>
<li><a :href="path+'/djwh/download/19thfile/质检总局党组关于认真学习宣传贯彻党的十九大精神的通知.doc'" target="_blank">质检总局党组关于认真学习宣传贯彻党的十九大精神的通知</a></li> <li><a :href="path+'/djwh/download/19thfile/质检总局党组关于认真学习宣传贯彻党的十九大精神的通知.doc'" target="_blank">质检总局党组关于认真学习宣传贯彻党的十九大精神的通知</a></li>
<li><a :href="path+'/djwh/download/19thfile/质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知.doc'" target="_blank">质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知</a></li> <li><a :href="path+'/djwh/download/19thfile/质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知.doc'" target="_blank">质检总局党组关于印发质检系统学习宣传贯彻党的十九大精神工作方案的通知</a></li>
<li><a :href="path+'/djwh/download/19thfile/中共中央关 于认真学习宣传贯彻党的十九大精神的决定.docx'" target="_blank">中共中央关于认真学习宣传贯彻党的十九大精神的决定</a></li> <li><a :href="path+'/djwh/download/19thfile/中共中央关于认真学习宣传贯彻党的十九大精神的决定.docx'" target="_blank">中共中央关于认真学习宣传贯彻党的十九大精神的决定</a></li>
<li><a :href="path+'/djwh/download/19thfile/中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知.pdf'" target="_blank">中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知</a></li> <li><a :href="path+'/djwh/download/19thfile/中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知.pdf'" target="_blank">中共中央宣传部关于印发《党的十九大精神宣讲提纲》的通知</a></li>
<li><a :href="path+'/djwh/download/19thfile/中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知.PDF'" target="_blank">中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知</a></li> <li><a :href="path+'/djwh/download/19thfile/中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知.PDF'" target="_blank">中国物品编码中心关于印发学习宣传贯彻党的十九大精神工作方案的通知</a></li>
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
}, },
data() { data() {
return { return {
path:process.env.VUE_APP_HOST_URL, path:'',
animate:false, animate:false,
marginTop:0, marginTop:0,
hotList:[], hotList:[],
...@@ -194,6 +194,7 @@ export default { ...@@ -194,6 +194,7 @@ export default {
}, },
mounted () { mounted () {
this.timer1= setInterval(this.scroll,2000) this.timer1= setInterval(this.scroll,2000)
this.path=`${this.urls.gs1cnTwo}`
}, },
methods: { methods: {
...mapMutations({ ...mapMutations({
......
src/views/Home/comps/sousuo-list.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<li v-for="(tmp, i) in list" :key="i" > <li v-for="(tmp, i) in list" :key="i" >
<div class="sousuoList-top"> <div class="sousuoList-top">
<span>【资讯动态】</span> <span>【资讯动态】</span>
<span v-html="tmp.title" @click="handelMsg(tmp.urlid)"></span> <span v-html="tmp.title" @click="handelMsg(tmp.urlid,tmp.type)"></span>
</div> </div>
<div class="sousuoList-middle" v-html="changeText(tmp.content)"></div> <div class="sousuoList-middle" v-html="changeText(tmp.content)"></div>
<div class="sousuoList-bottom"> <div class="sousuoList-bottom">
...@@ -30,11 +30,23 @@ export default { ...@@ -30,11 +30,23 @@ export default {
} }
}, },
methods: { methods: {
handelMsg(id) { handelMsg(id,type) {
this.InfoFn(id) // this.InfoFn(id,type)
if(type==2){
this.$router.push({
path: `/Knowledge/Statuteinfo?id=${id}`,
});
}else if(type==6){
this.$router.push({
path: `/Knowledge/article?id=${id}`,
});
}else{
this.$router.push({
path: `/News/msg?id=${id}`,
});
}
}, },
async InfoFn(id) { async InfoFn(id,type) {
const params = { const params = {
id:id, id:id,
}; };
...@@ -46,9 +58,8 @@ export default { ...@@ -46,9 +58,8 @@ export default {
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
this.$router.push({
path: `/News/msg?id=${id}`,
});
} }
} }
......
src/views/Knowledge/GS1System/dwbm.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 列表 // 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "动物编码",
path: "/Knowledge/GS1System/dwbm",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/ebxml.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 列表 // 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "ebXML",
path: "/Knowledge/GS1System/ebxml",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/ewbm.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -43,6 +43,9 @@ export default { ...@@ -43,6 +43,9 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 列表 // 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -58,6 +61,13 @@ export default { ...@@ -58,6 +61,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "二维条码",
path: "/Knowledge/GS1System/ewbm",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/goodsEpc.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 行业应用 // 行业应用
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "产品电子代码（EPC）",
path: "/Knowledge/GS1System/goodsEpc",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/goodsGDS.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
this.initListFn(this.tableResult.currPage,); this.initListFn(this.tableResult.currPage,);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 行业应用 // 行业应用
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "全球数据同步（GDS）",
path: "/Knowledge/GS1System/goodsGDS",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/goodsGln.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,7 +45,10 @@ export default { ...@@ -45,7 +45,10 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
// 行业应用 ...mapMutations({
setMatche: "setMatche",
}),
// 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
page: page, page: page,
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "商品条码",
path: "/Knowledge/GS1System/goodsGln",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/goodsPosition.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,7 +45,10 @@ export default { ...@@ -45,7 +45,10 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
// 行业应用 ...mapMutations({
setMatche: "setMatche",
}),
// 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
page: page, page: page,
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "全球位置编码（GLN）",
path: "/Knowledge/GS1System/goodsPosition",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/gxfECR.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 列表 // 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
...@@ -60,6 +63,13 @@ export default { ...@@ -60,6 +63,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "高效消费者响应（ECR）",
path: "/Knowledge/GS1System/gxfECR",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/GS1System/zxcbm.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue"; import pages from "../../comps/pages2.vue";
export default { export default {
components: { components: {
...@@ -45,7 +45,11 @@ export default { ...@@ -45,7 +45,11 @@ export default {
this.initListFn(this.tableResult.currPage); this.initListFn(this.tableResult.currPage);
}, },
methods:{ methods:{
...mapMutations({
setMatche: "setMatche",
}),
// 列表 // 列表
async initListFn(page) { async initListFn(page) {
const params = { const params = {
page: page, page: page,
...@@ -60,6 +64,13 @@ export default { ...@@ -60,6 +64,13 @@ export default {
} }
}, },
getInfo(id,directpath){ getInfo(id,directpath){
const matche = [
{
name: "自行车编码",
path: "/Knowledge/GS1System/zxcbm",
}
];
this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){ if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank'); window.open(directpath,'_blank');
}else{ }else{
......
src/views/Knowledge/article.vue
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<span>{{title}}</span> <span>{{title}}</span>
<span>日期：{{checkTime(showtime)}}</span> <span>日期：{{checkTime(showtime)}}</span>
</p> </p>
<div v-html="content"></div> <div class="showHtml" v-html="content"></div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { mapState } from "vuex";
import breadcrumb from "../comps/breadcrumb.vue"; import breadcrumb from "../comps/breadcrumb.vue";
import pages from "../comps/pages2.vue"; import pages from "../comps/pages2.vue";
export default { export default {
...@@ -24,13 +24,14 @@ export default { ...@@ -24,13 +24,14 @@ export default {
id:this.$route.query.id, id:this.$route.query.id,
content:'', content:'',
title:'', title:'',
showtime:'' showtime:'',
breadcrumb: [{ name: "技术与标准", path: "/Knowledge" }],
}; };
}, },
computed: { computed: {
routes() { ...mapState({
matche: (state) => state.matche,
}, }),
}, },
created() { created() {
this.initInfoFn(); this.initInfoFn();
...@@ -56,11 +57,11 @@ export default { ...@@ -56,11 +57,11 @@ export default {
this.content=data.content; this.content=data.content;
this.title=data.title this.title=data.title
this.showtime=data.inputdate this.showtime=data.inputdate
this.$store.commit("system/SET_BREADCRUMB", [ this.breadcrumb = this.breadcrumb.concat(this.matche);
{ name: "技术与标准 ", path: "/Knowledge" }, this.breadcrumb.push({
{ name: "技术知识", path: "/Knowledge/" }, name: this.title,
{ name: this.title }, });
]); this.$store.commit("system/SET_BREADCRUMB", this.breadcrumb);
console.log(1) console.log(1)
} }
...@@ -110,6 +111,19 @@ export default { ...@@ -110,6 +111,19 @@ export default {
font-size: 14px; font-size: 14px;
padding-bottom:30px; padding-bottom:30px;
} }
.showHtml{
border-bottom: 1px solid #b2b2b8;
padding-bottom: 30px;
margin-bottom: 25px;
margin-top: 20px;
line-height: 28px;
font-size: 14px;
text-indent: 28px;
color: #454545;
/deep/p{
margin: 0 0 10px
}
}
} }
} }
......
src/views/Knowledge/index.vue
...@@ -719,6 +719,7 @@ export default { ...@@ -719,6 +719,7 @@ export default {
img { img {
width: 100%; width: 100%;
margin: 26px 0 0 0; margin: 26px 0 0 0;
cursor: pointer;
} }
.bzwx { .bzwx {
.cjwtbtn { .cjwtbtn {
...@@ -736,6 +737,7 @@ export default { ...@@ -736,6 +737,7 @@ export default {
padding-bottom: 0px; padding-bottom: 0px;
.card-title { .card-title {
color: #f26335; color: #f26335;
cursor: pointer;
} }
.card-text { .card-text {
// font-family: PingFangSC-Regular, PingFang SC; // font-family: PingFangSC-Regular, PingFang SC;
......
src/views/Knowledge/knowledgeList.vue
...@@ -209,7 +209,25 @@ ...@@ -209,7 +209,25 @@
</div> </div>
</div> </div>
</div> </div>
<!-- EbXML -->
<div class="knowledge-cnt" v-if="listResult.rfid && listResult.rfid.length>0">
<div class="knowledge-title">
RFID
</div>
<div class="knowledge-container card ">
<div class="row g-2 ">
<div class="col bzwx">
<div class="card-body">
<p class="card-text">
<ul style="padding-left:0">
<li v-for="(item,i) of listResult.rfid" :key="i" @click="getInfo(item.knowledgeInfoID,item.directpath)">{{item.Title}}</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<!-- 热点点击 --> <!-- 热点点击 -->
...@@ -269,7 +287,8 @@ export default { ...@@ -269,7 +287,8 @@ export default {
gln:[], gln:[],
rfid:[], rfid:[],
sptm:[], sptm:[],
zxcbm:[] zxcbm:[],
rfid:[]
}, },
hotListArr:[], hotListArr:[],
message:'' message:''
......
src/views/News/Other.vue
...@@ -89,16 +89,17 @@ export default { ...@@ -89,16 +89,17 @@ export default {
}, },
getInfo(id,directpath){ getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){ const matche = [
window.open(directpath,'_blank');
}else{
const matche = [
{ {
name: "其他", name: "其他",
path: "/News/Other", path: "/News/Other",
} }
]; ];
this.setMatche(matche); this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/News/msg?id=${id}`, path: `/News/msg?id=${id}`,
}); });
......
src/views/News/PicNews.vue
...@@ -91,16 +91,17 @@ export default { ...@@ -91,16 +91,17 @@ export default {
}, },
// 详情 // 详情
getInfo(id,directpath){ getInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){ const matche = [
window.open(directpath,'_blank');
}else{
const matche = [
{ {
name: "图片资讯", name: "图片资讯",
path: "/News/PicNews", path: "/News/PicNews",
} }
]; ];
this.setMatche(matche); this.setMatche(matche);
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
let link = this.$router.resolve({ let link = this.$router.resolve({
path: `/News/msg?id=${id}`, path: `/News/msg?id=${id}`,
}); });
......
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