Merge branch 'develop_jzl'

gassafetyprogress-web/src/components/bigWindow/User.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-03-16 15:35:48
+ * @LastEditTime: 2022-03-17 09:05:30
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -16,10 +16,10 @@
       <img src="@/assets/mapImages/closeBtn.png" alt="" />
     </div>
 
-    <div class="top flex">
+    <div class="top flex top-top">
       <div class="group">
         <div class="left">联系人：</div>
-        <div class="right zzz">{{ deviceData.nickName }}</div>
+        <div class="right zzz">{{ 1 }}</div>
       </div>
       <div class="group">
         <div class="left">联系电话:</div>
@@ -169,6 +169,11 @@ export default {
     margin-bottom: 10px;
     border: 1px solid #cccccc;
     box-sizing: border-box;
+    &.top-top {
+      div{
+        width: 33%;
+      }
+    }
     .group {
       height: 30px;
       flex: 1;
@@ -184,6 +189,7 @@ export default {
         color: #ffffff;
         line-height: 30px;
         padding: 0 5px;
+
         &.last {
           border-right: none;
         }
@@ -195,7 +201,7 @@ export default {
     }
     &.top-bottom {
       .left {
-        flex:none;
+        flex: none;
         width: 192px !important;
       }
       .right {