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

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

@@ -458,7 +458,7 @@ export default {
 <style lang="scss">
 .knowledge {
   
-  .knowledge-top-form {
+  .knowledge-top-form {  
     @include elInput(50px, #414345, #414345, #fff, #cfdcea);
     .el-select .el-input__inner{
       border-right: 0;
@@ -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>