Merge branch 'develop_jzl'

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-26 23:06:21
+ * @LastEditTime: 2022-02-28 09:45:42
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -99,8 +99,8 @@ export default {
     return {
       companyType,
       deviceType,
-      profile:
-        "公司位于长江三角洲经济快速增长、风景秀丽的太湖之畔——无锡。 公司自1984年成立至今，已经过了3次跨越式的发展。2004年至今公司投入5000多万元资金建设新的生产基地，目前已竣工并投入生产，占地面积达40000m2，厂房面积近15000m2。公司2004年的年产值达4350多万元，并且每年以平均30%的速度快速增长。",
+      profile:"暂无"
+
     };
   },
   computed: {

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

 <!--
  * @Author: your name
  * @Date: 2022-01-27 14:25:45
- * @LastEditTime: 2022-02-25 17:53:43
+ * @LastEditTime: 2022-02-28 09:52:51
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /hello-world/src/views/components/User.vue
@@ -42,7 +42,7 @@
 
     <div class="group flex">
       <div class="left first">管道走向：</div>
-      <div class="right">{{ deviceData.pipeTrend }}</div>
+      <div class="right zzz" :title="deviceData.pipeTrend">{{ deviceData.pipeTrend }}</div>
       <div class="left">权属单位：</div>
       <div :title="deviceData.powerCompany" class="right last zzz">
         {{ deviceData.powerCompany }}
@@ -52,7 +52,7 @@
       <div class="first left">建设年代：</div>
       <div class="right">{{ deviceData.buildyear }}</div>
       <div class="left">建设单位：</div>
-      <div class="last right">{{ deviceData.buildCompany }}</div>
+      <div class="last right zzz" :title="deviceData.buildCompany">{{ deviceData.buildCompany }}</div>
     </div>
 
     <div class="group flex">
@@ -108,7 +108,7 @@ export default {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 400px;
+  width: 500px;
   .title {
     font-size: 14px;
     line-height: 14px;
@@ -142,7 +142,7 @@ export default {
     .right {
       box-sizing: border-box;
       text-align: left;
-      padding: 0 1em;
+      padding: 0 5px;
     }
     .last {
       border: none;

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

@@ -22,7 +22,6 @@
                   <el-table
                     size="mini"
                     :data="tableData"
-                    style="width: 92%"
                     :height="tableHeight"
                     class="el-bottom"
                     ref="table"
@@ -50,7 +49,7 @@
                     </el-table-column>
                     <el-table-column prop="alarmTime" label="预警时间" width="140">
                     </el-table-column>
-                    <el-table-column prop="handledStatus" label="状态" width="">
+                    <el-table-column prop="handledStatus" label="状态" width="70">
                       <template slot-scope="scope">
                         <div class="ddd" :title="scope.row.handledStatus">
                           {{ scope.row.handledStatus }}
@@ -94,7 +93,7 @@
         </el-table>
 </div> -->
         
-        <div class="echarts-one" style="margin-top: 10px;width: 430px;margin-left: 10px;">
+        <div class="echarts-one" style="margin-top: 10px;">
             <div>
               <div class="item1">
                 <span class="dot">
@@ -752,7 +751,7 @@
     font-size: 30px;
 }
 .item1{
-    width: 90%;
+    width: 93%;
     height: 30px;
     font-size: 18px;
     line-height: 30px;

gassafetyprogress-web/src/views/login.vue

@@ -186,7 +186,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .login {
   display: flex;
   justify-content: center;