Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

src/assets/css/_mixin.scss

@@ -334,9 +334,7 @@
 
 // 超宽显示省略号
 @mixin ellipsis {
-	@media screen and (min-width: 992px){
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;	
-	}	
 }
\ No newline at end of file

src/components/layout/footer.vue

@@ -56,6 +56,33 @@ export default {
 </script>
 
 <style lang="scss">
+@media screen and (max-width: 992px) {
+  .foot{
+    .link{
+      div{
+        width: 100%;
+        text-align: center;
+      }
+    }
+    .foot-bottom{
+      div{
+        font-size: 12px !important;
+      }
+    }
+    .copright{
+      div{
+        width: 100%;
+        text-align: center;
+        
+      }
+    }
+    .beian{
+      span{
+        padding: 0 8px !important;
+      }
+    }
+  }
+}
 </style>
 <style lang="scss" scoped>
 .foot {

src/components/layout/header/HeaderBtn.vue

@@ -28,3 +28,12 @@ export default {
   },
 }
 </script>
+<style lang="scss">
+.header-btn{
+  button{
+    &:hover{
+      background: #CC3C0F;
+    }
+  }
+}
+</style>

src/components/layout/header/mock.js

@@ -343,7 +343,8 @@ export const nav = [
                         link: "/Business/Code1",
                         breadcrumb: [
                             { name: "业务大厅", path: "/Business" },
-                            { name: "我是系统成员", path: "/Service/Training" },
+                            { name: "我是系统成员", path: "/Business/Register" },
+                            { name: "我要编码", path: "/Business/Code1?id=1-1" },
                             { name: "零售商品" },
                         ],
                     },
@@ -354,7 +355,8 @@ export const nav = [
                         link: "/Business/Code2",
                         breadcrumb: [
                             { name: "业务大厅", path: "/Business" },
-                            { name: "我是系统成员", path: "/Service/Training" },
+                            { name: "我是系统成员", path: "/Business/Register" },
+                            { name: "我要编码", path: "/Business/Code1?id=1-1" },
                             { name: "非零售商品" },
                         ],
                     },
@@ -365,7 +367,8 @@ export const nav = [
                         link: "/Business/Code3",
                         breadcrumb: [
                             { name: "业务大厅", path: "/Business" },
-                            { name: "我是系统成员", path: "/Service/Training" },
+                            { name: "我是系统成员", path: "/Business/Register" },
+                            { name: "我要编码", path: "/Business/Code1?id=1-1" },
                             { name: "物流单元" },
                         ],
                     },

src/views/Home/comps/list.vue

 <template>
   <div class="list">
     <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
-      <div class="col-lg-10 list-left">
+      <div class="col-9 col-lg-10 list-left">
         <span></span>
-        <span>{{tmp.title}}</span>
+        <span :title="tmp.title">{{tmp.title}}</span>
       </div>
-      <div class="col-lg-2 list-right">{{tmp.time}}</div>
+      <div class="col-3 col-lg-2 list-right">{{tmp.time}}</div>
     </div>
     <div class="row">
       <div class="col">
@@ -73,13 +73,25 @@ export default {
     display: flex;
     align-items: center;
     cursor: pointer;
-    background: #F26335;
+    background: #CD3C0D;
     border-radius: 4px;
     position: relative;
     &:hover{
-      background: #A82C04;
+      background: #A82C05;
       img{
-        right: 14px;
+        right: 17px;
+      }
+    }
+    &:focus{
+      background: #CD3C0D;
+      img{
+        right: 20px;
+      }
+    }
+    &:active{
+      background: #912305;
+      img{
+        right: 17px;
       }
     }
     span{

src/views/Home/comps/list2.vue

@@ -3,7 +3,7 @@
     <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
       <div class="col li">
         <span></span>
-        <span>{{tmp.title}}</span>
+        <span :title="tmp.title">{{tmp.title}}</span>
       </div>
     </div>
   </div>

src/views/Home/comps/other-list.vue

@@ -3,7 +3,7 @@
     <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
       <div class="col li">
         <span></span>
-        <span>{{tmp.name}}</span>
+        <span :title="tmp.name">{{tmp.name}}</span>
       </div>
     </div>
   </div>

src/views/Home/comps/yyly-list.vue

@@ -3,7 +3,7 @@
     <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
       <div class="col li">
         <span></span>
-        <span>{{tmp.name}}</span>
+        <span :title="tmp.name">{{tmp.name}}</span>
       </div>
     </div>
   </div>

src/views/Knowledge/Glossary.vue

@@ -111,7 +111,10 @@ export default {
       height: 290px;
     }
   }
-  @media screen and(min-width: 992px) {
+  @media screen and(max-width: 992px) {
+    .knowledge-top-form{
+      width: 100%!important;
+    }
  
   }
   @media screen and (max-width: 1401px) {
@@ -169,7 +172,7 @@ export default {
       .knowledge-top-form {
         display: flex;
         margin-top: 15px;
-        
+        width: 65%;
         .top-form-btn {
           width: 100px;
           height: 50px;

src/views/Knowledge/index.vue

@@ -468,8 +468,12 @@ export default {
     .knowledge-container{
       height: 290px;
     }
+    
+  }
+  @media screen and(max-width: 992px) {
+  .knowledge-top-form{
+    width: 100%!important;
   }
-  @media screen and(min-width: 992px) {
  
   }
   @media screen and (max-width: 1401px) {
@@ -502,6 +506,7 @@ export default {
     .knowledge-top-form {
       display: flex;
       margin-top: 15px;
+      width: 65%;
       .top-form-btn {
         width: 100px;
         height: 50px;

src/views/MyManage/comps/dialog.vue

+<template>
+ 
+    <el-dialog
+    :title="title"
+    :visible.sync="showmodel2"
+    :fullscreen='fullscreen'
+    :width="width"
+    top="30vh"
+    :handleClose='handleClose'
+    >
+    <span>变更检验检测/校准客户信息，请您联系：</span>
+    <p>王工&nbsp;&nbsp;&nbsp;&nbsp;010-84295493&nbsp;&nbsp;&nbsp;&nbsp;wanghy@ancc.org.cn&nbsp;&nbsp;QQ:&nbsp;2308350380</p>
+    <p>胡工&nbsp;&nbsp;&nbsp;&nbsp;010-84295499&nbsp;&nbsp;&nbsp;&nbsp;hum@ancc.org.cn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;QQ:&nbsp;1246978728</p>
+              
+    
+    </el-dialog>
+</template>
+
+<script>
+    export default{
+        
+        props:{
+            fullscreen: {
+                type: Boolean,
+                default: false
+            },
+            showmodel: {
+                type: Boolean,
+                default: true
+            },
+            width: {
+                type: String,
+                default: '50%'
+            },
+            title: {
+                type: String,
+                default: ''
+            },
+           
+           
+        },
+        data() {
+            return {
+                showmodel2:this.showmodel
+            }
+        },
+        
+        methods:{
+           handleClose() {
+                this.$emit("update:showmodel",false);
+            },
+        },
+        created(){
+        },
+        mounted(){
+            
+        }
+    }
+</script>
+
+<style lang="scss">
+$dialog-border-radius: 20px;
+.el-dialog{
+    // margin-top:30vh!important;
+}
+
+    .el-dialog__header {
+        display: flex;
+        flex-flow: row nowrap;
+        justify-content: center;
+        align-items: center;
+        padding: 13px 0 13px 20px;
+        height: 40px;
+        background: #F26335;
+
+       
+        .el-dialog__title {
+            flex: 1;
+            font-size: 14px;
+            color:#fff!important;
+            line-height: 60px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .el-dialog__headerbtn {
+            font-size: 20px;
+            top: 5px;
+            right: 10px;
+
+            .el-dialog__close {
+                color: #EFEFF7;
+            }
+        }
+    }
+    .el-dialog__body{
+        padding: 20px!important;
+        span{
+            display: inline-block;
+            color: #F26335;
+            font-size: 14px;
+            
+            margin-bottom: 10px;
+            line-height: 26px;
+        }
+        p{
+            font-size: 14px;
+            color: #454545;
+            margin: 0;
+            line-height: 24px;
+          
+            
+
+        }
+    }
+
+   
+
+
+</style>

src/views/Org/Branch.vue

@@ -17,7 +17,7 @@
         />
       </svg>
       <div>
-        在地为下列市或直辖市或自治区的企业，办理条码申办及相关业务时，请联系以下编码分支机构：
+        所在地为下列市或直辖市或自治区的企业，办理条码申办及相关业务时，请联系以下编码分支机构：
       </div>
     </div>
 
@@ -91,6 +91,7 @@ export default {
             "吉林分中心",
             "长春分中心",
             "黑龙江分中心",
+            "哈尔滨分中心",
           ],
         },
         {