官网修改

d08b6038 · Lyan · b45c7370 · d08b6038 · d08b6038 · d08b6038
Commit d08b6038 authored Apr 27, 2023 by Lyan
31 changed files
--- a/.env.development
+++ b/.env.development
 NODE_ENV = "development"
 VUE_APP_CURRENTMODE = "development"
-VUE_APP_HOST_URL = "http://116.204.118.109:9091"
+VUE_APP_HOST_URL = "http://192.168.0.81:9091"
 VUE_APP_API_URL = "/"
 VUE_APP_GDS_URL = "/gds"
 VUE_APP_LOG = true
--- a/src/assets/image/djwh/1.jpg
+++ b/src/assets/image/djwh/1.jpg
--- a/src/assets/image/djwh/2.jpg
+++ b/src/assets/image/djwh/2.jpg
--- a/src/assets/image/djwh/3.jpg
+++ b/src/assets/image/djwh/3.jpg
--- a/src/assets/image/djwh/4.jpg
+++ b/src/assets/image/djwh/4.jpg
--- a/src/assets/image/djwh/dsjy-title_new.jpg
+++ b/src/assets/image/djwh/dsjy-title_new.jpg
--- a/src/assets/image/home/dzfw-ico143.png
+++ b/src/assets/image/home/dzfw-ico143.png
--- a/src/assets/image/home/tmgg.png
+++ b/src/assets/image/home/tmgg.png
--- a/src/assets/image/home/top5.png
+++ b/src/assets/image/home/top5.png
--- a/src/assets/image/home/wtjd.png
+++ b/src/assets/image/home/wtjd.png
--- a/src/assets/image/news/dzsw1.png
+++ b/src/assets/image/news/dzsw1.png
--- a/src/assets/image/news/ls1.png
+++ b/src/assets/image/news/ls1.png
--- a/src/axios/module/news.js
+++ b/src/axios/module/news.js
@@ -182,5 +182,6 @@ export default {
 	jcspiInfo,
 	retailList,
 	logostocsList,
-	getList3ByType
+	getList3ByType,
 }
--- a/src/components/layout/englishTopBanner.vue
+++ b/src/components/layout/englishTopBanner.vue
@@ -94,7 +94,7 @@ export default {
    },
    handleSearch () {
      this.$router.push({
-        path: "/Home/sousuo",
+        path: "/home/sousuo",
      });
    },
    handleClick (val) {

--- a/src/components/layout/header/HeaderBtn.vue
+++ b/src/components/layout/header/HeaderBtn.vue
@@ -46,7 +46,7 @@ export default {
    },
     handleSearch () {
      this.$router.push({
-        path: "/Home/sousuo",
+        path: "/home/sousuo",
      });
    },
  },

--- a/src/components/layout/header/index.vue
+++ b/src/components/layout/header/index.vue
@@ -120,9 +120,9 @@ export default {
    // 监听路由 处理nav高亮 和面包屑 和subnav
    initNav() {
      nav.forEach((nav_) => {
        if (this.$route.path.startsWith(nav_.link)) {
          this.currentNav = nav_.id;
          // nav_.children &&
          //   nav_.children.length > 0 &&
          //   this.$store.commit("system/SET_SUB_NAV", nav_.children);
@@ -134,7 +134,7 @@ export default {
            // TODO 去dropdown里面精确查找当前的路径
            let result;
            result = deepFindBreadcrumb(nav_.children, this.$route.path);
-            // console.log(this.$route.path, result, 'resultresultresult');
+            console.log(this.$route.path, result, 'resultresultresult');
            if (result.length === 0 && Object.keys(this.$route.query).length > 0) {
              const queryString = Qs.stringify(cleanObject(this.$route.query));
              let path = `${this.$route.path}?${queryString}`;

--- a/src/components/layout/header/mock.js
+++ b/src/components/layout/header/mock.js
@@ -1084,13 +1084,15 @@ export const nav = [
        id: "7",
        name: "党建文化",
        index: 7,
-        link: "/djwh",
+        rowNum: 6,
+        link: "/djwhIndex",
        children: [],
    },
    {
        id: "8",
        name: "成员专区",
        index: 8,
+        rowNum: 8,
        link: "/Member",
        children: [],
    },

--- a/src/components/layout/header/service.js
+++ b/src/components/layout/header/service.js
@@ -67,7 +67,7 @@ export default  {
                    id: uuid("gs_nav"),
                    name: "进口商品数据通报",
                    index: 6,
-                    link: "https://www.ebrun.com/kh/2019gs1crossborder/index-pc.html",
+                    link: "https://import.gds.org.cn/#/home/index",
                },
                {
                    id: uuid("gs_nav"),

--- a/src/components/layout/topBanner.vue
+++ b/src/components/layout/topBanner.vue
@@ -99,7 +99,7 @@ export default {
    },
    handleSearch () {
      this.$router.push({
-        path: "/Home/sousuo",
+        path: "/home/sousuo",
      });
    },
    handleClick (val) {

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,7 @@ const routes = [{
        component: () => import("@/views/Home/index"),
      },
      {
-        path: "/Home/sousuo",
+        path: "/home/sousuo",
        name: "sousuo",
        component: () => import("@/views/Home/sousuo"),
      },
@@ -1215,7 +1215,7 @@ const routes = [{
      },
      // 党建文化列表
      {
-        path: "/djwhlist",
+        path: "/djwhIndex/djwhlist",
        name: "djwhlist",
        component: () => import("@/views/Djwh/djwhlist"),
      },
@@ -1437,8 +1437,8 @@ const routes = [{
  {
-    path: "/djwh",
+    path: "/djwhIndex",
-    name: "djwh",
+    name: "djwhIndex",
    component: () => import("@/views/Djwh/index"),
  },

--- a/src/views/Djwh/djwhlist.vue
+++ b/src/views/Djwh/djwhlist.vue
@@ -9,7 +9,7 @@
 </template>
 <script>
-import { mapMutations } from "vuex";
+import { mapState,mapMutations } from "vuex";
 import list from "./comps/list.vue";
 import pages from "../comps/pages2.vue";
 import breadcrumb from "../comps/breadcrumb.vue";
@@ -19,6 +19,11 @@ export default {
    list,
    pages,
  },
+  computed: {
+    ...mapState({
+      matche: (state) => state.matche,
+    }),
+  },
  data() {
    return {
      gjzzCate: {
@@ -34,9 +39,10 @@ export default {
    };
  },
   mounted() {
+    console.log(this.matche)
    // 面包屑单独处理
    this.$store.commit("system/SET_BREADCRUMB", [
-      { name: "党建文化", path: "/djwh" },
+      { name: "党建文化", path: "/djwhIndex" },
      { name: "活动报道" },
    ]);
  },

--- a/src/views/Djwh/index.vue
+++ b/src/views/Djwh/index.vue
@@ -42,7 +42,7 @@
                  <div class="border-div  list-style">
                      <div class="middle-title">
                        <h4>活动报道</h4>
-                        <a href="/djwhlist" target="_blank" >更多>></a>
+                        <a href="/djwhIndex/djwhlist" target="_blank" >更多>></a>
                      </div>
                      <div class="middle-list">
                          <ul>
@@ -54,14 +54,17 @@
                </div>
                <div  style="margin-top:15px;overflow:hidden;width:100%">
-                    <div class="ds">
+                    <div class="ds" style="padding-bottom: 14px;">
-                      <div>
+                      <!-- <div>
                        <img src="../../assets/image/djwh/dsjy-title.gif" alt="">
-                      </div>
+                      </div> -->
                      <div>
-                        <div class="list-style">
+                        <img src="../../assets/image/djwh/dsjy-title_new.jpg" alt="">
+                        <div class="list-style" style="width: 98%;margin-left: 8px;border-radius: 30px;margin-top: 5px;">
                          <ul>
-                          <li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)" >{{item.title}}</a></li>
+                            <li><a href="/News/msg?id=10977" target="_blank">编码中心召开学习贯彻习近平新时代中国特色社会主义思想主题教育动员部署会</a></li>
+                            <li><a href="/News/msg?id=10979" target="_blank">编码中心党委理论学习中心组举行2023年第三次集体学习</a></li>
+                          <!-- <li v-for="(item, i) in dsList" :key="i"><a href="#" @click="goInfo(item.id,item.directpath)" >{{item.title}}</a></li> -->
                          </ul>
                        </div>
                      </div>
@@ -178,7 +181,28 @@ export default {
        ruleList:[],
        centerList:[],
        dsList:[],
-        pictureListArr:[]
+        pictureListArr:[
+          {
+            articleId : 10977,
+            directpath :'',
+            picFile:require('../../assets/image/djwh/1.jpg')
+          },
+          {
+            articleId : 10942,
+            directpath :'',
+            picFile:require('../../assets/image/djwh/2.jpg')
+          },
+          {
+            articleId : 10828,
+            directpath :'',
+            picFile:require('../../assets/image/djwh/3.jpg')
+          },
+          {
+            articleId : 10815,
+            directpath :'',
+            picFile:require('../../assets/image/djwh/4.jpg')
+          }
+        ]
    };
  },
@@ -200,7 +224,7 @@ export default {
    this.dsListFn()
    this.centerFn();
    this.ruleFn()
-    this.pictureTop4()
+    // this.pictureTop4()
  },
  mounted () {
    this.timer1= setInterval(this.scroll,2000)
@@ -285,16 +309,16 @@ export default {
      }
    },
     // 图片资讯列表TOP4
-    async pictureTop4() {
+    // async pictureTop4() {
-      const listRes =
+    //   const listRes =
-        await this.$api.news.pictureTop4();
+    //     await this.$api.news.pictureTop4();
-      const { returnCode, data } = listRes;
+    //   const { returnCode, data } = listRes;
-      if (returnCode === "0") {
+    //   if (returnCode === "0") {
-        this.pictureListArr = data
+    //     this.pictureListArr = data
-      }
+    //   }
-    },
+    // },
    goInfo(id,directpath){
      if(directpath &&directpath!==''&& directpath.length>0){
        window.open(directpath,'_blank');
@@ -531,7 +555,7 @@ a{
       img{
        width: 100%;
        height: 100%;
-        background: url('../../assets/image/djwh/2020122802.jpg') 100%;
+        // background: url('../../assets/image/djwh/2020122802.jpg') 100%;
      }
     }

--- a/src/views/Home/comps/notice.vue
+++ b/src/views/Home/comps/notice.vue
@@ -20,11 +20,9 @@
            </div>
            <div class="notice-nr-kj">
              <p class="notice-note">
-                为切实减轻企业负担，中国物品编码中心研究决定自2023年4月1日至2023年6月30日，继续执行疫情期间阶段性条码服务费优惠措施。<span
+                为切实减轻企业负担，中国物品编码中心研究决定自2023年4月1日至2023年6月30日，继续执行疫情期间阶段性条码服务费优惠措施。
-                  @click="handelJump"
-                  >点击查看收费公示表</span
-                >
              </p>
+              <p class="notice-note">优惠收费标准如下：</p>
              <div class="notice-cont">
                <div class="cont-cate">
                  <span></span>
@@ -69,6 +67,9 @@
                  </tbody>
                </table>
              </div>
+              <div class="notice-note" style="margin-top: 20px;">
+                <span @click="handelJump" >点击查看收费公示表</span>
+              </div>
              <div class="notice-note" style="text-align: right">
                <br />2023年3月30日
              </div>

--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
--- a/src/views/News/comps/list2.vue
+++ b/src/views/News/comps/list2.vue
@@ -3,7 +3,7 @@
    <div v-for="(tmp, i) in list" :key="i" class="list-li" @click="giveId(tmp.id,tmp.directpath)">
      <div>
        <span></span>
-        <span >{{tmp.title}}</span>
+        <span v-html=" tmp.title">{{tmp.title}}</span>
      </div>
    </div>
  </div>

--- a/src/views/News/index.vue
+++ b/src/views/News/index.vue
@@ -101,8 +101,16 @@
              </ul>
              <span v-else>暂无数据</span>
            </div>
-            <div class="col-lg-8">
+            <div class="col-lg-6">
-              <img src="../../assets/image/news/jcsp-tp1.png" alt="" @click="goVideo" />
+              <video
+                controls="controls"
+                :src="videoSrc"
+                width="100%"
+                height="100%"
+                webkit-playsinline=""
+                autoplay="true"
+              ></video>
+              <!-- <img src="../../assets/image/news/jcsp-tp1.png" alt="" @click="goVideo" /> -->
            </div>
          </div>
        </div>
@@ -134,6 +142,7 @@
      </div>
    </div>
  </div>
 </template>
 <script>
 import { mapMutations,mapState } from "vuex";
@@ -291,7 +300,8 @@ export default {
      localList:[],
      depthList:[],
      topData:[],
+      videoSrc:'',
+      content:''
    };
  },
  created(){
@@ -391,6 +401,7 @@ export default {
      }
    },
    async picListFn() {
      const params = {
        page: 1,
@@ -428,6 +439,7 @@ export default {
      const { returnCode, data } = listRes;
      if (returnCode === "0") {
        this.videoList = data.list
+        this.videoSrc=data.list[0].wavname
      }
    },

--- a/src/views/News/msg.vue
+++ b/src/views/News/msg.vue
@@ -5,8 +5,7 @@
      <div class="col-lg-9">
        <div class="msg-cont">
          <div class="container">
-            <div class="msg-title">
+            <div class="msg-title" v-html="title">
-              {{ title }}
            </div>
            <div class="msg-head">
              <div class="msg-head-left">
@@ -229,7 +228,7 @@ export default {
      };
      const listRes = await this.$api.news.newsInfo(params);
      const { returnCode, data } = listRes;
-      if (returnCode === "0") {
+      if (returnCode === "0" && data !=null) {
        // let matche = this.matcheList.filter((item) => item.classid ===data.classid)[0];
        // if(typeof(matche)==='undefined'){
        //   matche = [
@@ -247,6 +246,7 @@ export default {
        this.source = data.source;
        this.editor = data.editor;
        this.breadcrumb = this.breadcrumb.concat(this.matche);
        this.breadcrumb.push({
          name: this.title,
        });

--- a/src/views/Org/Leadership.vue
+++ b/src/views/Org/Leadership.vue
@@ -56,7 +56,7 @@ export default {
          photo: require("../../assets/image/org/chenweiqing.jpg"),
          name: "陈伟清同志",
          position: "纪委书记",
-          work: "分管信息化部、质量检测部。",
+          work: "分管信息化部、质量检测部、通用物资编目研究部。",
        },
        {
          photo: require("../../assets/image/org/zhengjian.jpg"),

--- a/src/views/Search/external.vue
+++ b/src/views/Search/external.vue
@@ -2,7 +2,7 @@
  <div class="search-content">
    <div class="banner-box">
      <img src="./img/query_external_banner.jpeg"
-           @click="openUrl(`${file}Manage/down/Import_Data_Guideline.pdf`)"/>
+           @click="openUrl(`https://import.gds.org.cn/#/home/index`)"/>
    </div>
    <div class="title">境外条码信息查询</div>
    <div class="body">

--- a/src/views/Service/GDS.vue
+++ b/src/views/Service/GDS.vue
@@ -3,7 +3,7 @@
    <div class="title">中国商品信息服务平台</div>
    <div class="body" style="padding-top: 9px">
      <p>
-        <a href="https://www.gds.org.cn/" target="_blank">中国商品信息服务平台</a>（以下简称“平台”）是由中国物品编码中心（以下简称“编码中心”）依照GS1数据池国际标准构建的，集产品管理与服务于一体的商品信息公共服务平台。
+        <a href="https://www.gds.org.cn/" target="_blank">中国商品信息服务平台</a>（以下简称“平台”）由中国物品编码中心建设维护，以商品条码为基础，遵循全球物品编码协会（GS1）数据属性和产品分类等国际标准，是目前全球最大的商品条码数据中心。平台致力于保障我国商品条码准确与规范应用，开展商品信息通报工作，推动商品信息查询与商品条码验证应用，有效助力我国商品顺利流通；同时，平台基于商品条码和商品信息推出一系列增值服务，帮助企业开展深度商品信息应用，提升行业企业标准化、数字化水平。
      </p>
      <div class="notice text-center">
@@ -11,7 +11,7 @@
        <h6 style="margin-top: 15px">中国商品信息服务平台首页</h6>
      </div>
-      <p>
+      <!-- <p>
        平台遵循产品标识、产品属性、产品分类、数据交换等全球统一标准，以商品条码为基础，直接由中国商品条码系统成员填报商品信息，有效保证了信息的准确性、时效性与持续性。
      </p>
      <p>
@@ -26,12 +26,26 @@
      <p>
        服务政府&mdash;&mdash;平台拥有高效的技术支持力量与培训服务机制，为政府管理部门与企业之间建立起畅通的信息沟通渠道，方便管理部门有效整合商品信息，推动产品质量监管工作的执行，也在很大程度上了帮助企业提升了信誉和市场竞争力。2012年，编码中心承担了质检总局专项任务，以平台为基础开发产品质量信用信息平台，实现了产品质量的跟踪与追溯，为我国产品质量诚信体系建设提供了有效的服务。
      </p>
      <div class="notice text-center">
        <h6 style="margin-bottom: 15px">中国商品信息服务平台首页</h6>
        <img src="./img/2015-GDS-join-flow.jpg" alt="">
-      </div>
+      </div> -->
+      <ul class="listInfo">
+        <li>
+          <p><b>商品信息通报</b> 商品条码系统成员企业申请商品条码后，按照《商品条码管理办法》第十四条规定“系统成员应当按照有关国家标准编制商品代码，向所在地的编码分支机构通报编码信息”要求，使用中国物品编码中心统一发放的“条码卡“登录平台，获取或填报商品条码，录入商品基础信息，形成标准化商品信息记录。</p>
+        </li>
+        <li>
+          <p><b>商品信息查询</b> 平台推动商品条码信息公开查询服务，社会大众可通过中国物品编码中心官网、中国商品信息服务平台、中国编码APP、条码追溯小程序等官方渠道，以及第三方互联网平台扫码查询服务，进行商品条码搜索或扫描以获取相关商品详情。</p>
+        </li>
+        <li>
+           <p><b>商品条码验证</b> 支持政府部门、行业企业实时查验商品条码，结合与商品信息详情对比与核实，快速把握商品条码有效性及商品信息准确性。</p>
+        </li>
+        <li>
+          <p><b>增值服务</b> 平台基于商品条码和商品信息不断研发产品与服务，帮助企业用户快速实现数字胶片制作、<a href="http://www.2dcode.org/" target="_blank">商品二维码应用</a>、<a href="https://www.gds.org.cn/#/udi/index" target="_blank">UDI实施</a>、<a href="https://import.gds.org.cn/#/home/index" target="_blank">进口商品信息通报</a>、<a href="http://www.chinatrace.org/" target="_blank">产品质量追溯</a>、物资编目等。</p>
+        </li>
+      </ul>
    </div>
  </div>
 </template>
@@ -41,6 +55,15 @@ export default {};
 </script>
 <style lang="scss">
+.listInfo{
+  padding: 0 20px;
+  li {
+      list-style-type: disc;
+      p{
+        text-indent: 0!important;
+      }
+    }
+}
 .n-service.gds {
  .notice {
    margin: 10px 0 30px;

--- a/src/views/comps/breadcrumb.vue
+++ b/src/views/comps/breadcrumb.vue
@@ -11,8 +11,8 @@
            v-else
            :key="item.path"
            aria-current="page"
+            v-html="item.name"
          >
-            {{ item.name }}
          </li>
        </template>
      </ol>