Merge branch 'develop_jzl'

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-03-01 16:17:34
+ * @LastEditTime: 2022-03-01 16:29:17
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -29,7 +29,7 @@
       </div>
       <div class="group">
         <div class="left">经营区域：</div>
-        <div v-unValue :title="deviceData.deviceAddr" class="right last">
+        <div v-unValue :title="deviceData.businessArea" class="right last zzz">
           {{ deviceData.businessArea }}
         </div>
       </div>
@@ -44,10 +44,17 @@
       </div>
     </div>
 
-    <div v-unValue class="foot">
+    <div class="middle">
+      <div class="left">
+        <div>备注信息：</div>
+      </div>
+      <div v-unValue title="123" class="right">
         {{ deviceData.remarks }}
       </div>
     </div>
+
+    】
+  </div>
 </template>
 
 <script>
@@ -143,7 +150,6 @@ export default {
     display: flex;
     border: 1px solid #cccccc;
     border-top: none;
-    margin-bottom: 10px;
 
     & > div {
       box-sizing: border-box;