Merge remote-tracking branch 'origin/master'

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TDetectorUserVO.java

@@ -18,6 +18,9 @@ public class TDetectorUserVO
     /** 用户id */
     private Long userId;
 
+    /** 图标类型 */
+    private String iconType;
+
     /** 用户账号 */
     private String username;
 

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java

@@ -84,6 +84,7 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
             userVO.setHistoryAlarmNum(historyAlarmNum);
             userVO.setCancelAlarmNum(cancelAlarmNum);
             userVO.setProcessingAlarmNum(Math.abs(historyAlarmNum - cancelAlarmNum));
+            userVO.setIconType("6");
 
             list.add(userVO);
         }

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/PipeColor.vue

@@ -8,32 +8,26 @@
 -->
 <template>
   <div>
-    <div class="pipePressure">
-      <!-- <div>管道压力</div> -->
+    <!-- <div class="pipePressure">
 
       <div style="float: left;margin-right: 5px;">
         <div class="hasColorBox">
-          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
           <img src="../../assets/image/bigtyx.svg" alt="">
           调压箱
         </div>
         <div class="hasColorBox">
-          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
           <img src="../../assets/image/bigfmj.svg" alt="">
           阀门井
         </div>
         <div class="hasColorBox">
-          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
           <img src="../../assets/image/bigcz.svg" alt="">
           厂站
         </div>
         <div class="hasColorBox">
-          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
           <img src="../../assets/image/biguser.svg" alt="">
           用户
         </div>
         <div class="hasColorBox">
-          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
           <img src="../../assets/image/bigjk.svg" alt="">
           监控
         </div>
@@ -56,7 +50,7 @@
           高压管线
         </div>
       </div>
-      </div>
+    </div> -->
 
     <div class="mapChange">
       <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-26 21:27:45
+ * @LastEditTime: 2022-02-28 10:01:07
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -23,7 +23,7 @@
       </div>
       <div class="group">
         <div class="left">联系电话:</div>
-        <div class="right zzz">
+        <div v-unValue class="right zzz">
           {{ deviceData.phone }}
         </div>
       </div>
@@ -46,7 +46,7 @@
         <div class="last">报警中</div>
       </div>
       <div class="tbody flex">
-        <div class="first zzz">{{ 123 }}</div>
+        <div v-unValue class="first zzz">{{  }}</div>
         <div class="">{{ deviceData.detectorCount }}</div>
         <div v-unValue class="">
           {{ deviceData.onLineNum }}

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

@@ -34,9 +34,9 @@
       </div>
   </div>
   <div id="main1" style="width: 100%;height: 280px;"></div>
-    <div class="echarts-two" style="margin-top: 30px;width: 430px;margin-left: 10px;">
+    <!-- <div class="echarts-two" style="margin-top: 30px;width: 430px;margin-left: 10px;"> -->
       <div>
-        <div class="item1">
+        <div class="item1" style="margin-top: 30px;">
           <span class="dot">
             <span class="dot-inner"></span>
           </span>
@@ -69,7 +69,7 @@
         <div class="el-left">其他</div>
         <el-progress class="el-progress_text" :text-inside="true" :stroke-width="18" :percentage="50" status="exception"></el-progress>
       </div>
-    </div>
+    <!-- </div> -->
   </div>
 </template>
 

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 }}
@@ -93,21 +92,20 @@
           </el-table-column>
         </el-table>
 </div> -->
-        
-        <div class="echarts-one" style="margin-top: 10px;width: 430px;margin-left: 10px;">
-            <div>
-              <div class="item1">
+        <div>
+            <div class="item1" style="margin-top: 10px;">
                 <span class="dot">
-                  <span class="dot-inner"></span>
+                    <span class="dot-inner"></span>
                 </span>
                 <span>资源统计</span>
                 <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
                 <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
                 <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
-              </div>
             </div>
-            <div id="myChartone" :style="{width: '420px', height: '250px'}"></div>
-          </div>
+        </div>
+        <div class="echarts-one" style="margin-top: 10px;width: 430px;margin-left: 10px;">
+            <div id="myChartone" :style="{width: '420px', height: '240px'}"></div>
+        </div>
         <!-- <div>
             <div class="item1">
               <span class="dot">
@@ -500,10 +498,10 @@
                   trigger: "item"
               },
               grid: {
-                  top: "15%",
+                  top: "8%",
                   left: "8%",
-                  right: "12%",
-                  bottom: "15%",
+                  right: "8%",
+                  bottom: "13%",
                   containLabel: true
               },
               xAxis: {
@@ -752,7 +750,7 @@
     font-size: 30px;
 }
 .item1{
-    width: 90%;
+    width: 93%;
     height: 30px;
     font-size: 18px;
     line-height: 30px;

gassafetyprogress-web/src/views/bigWindow/index.vue

@@ -94,7 +94,6 @@
         margin-left: 15px;
         left: 0;
         z-index: 999;
-        width: 300px;
         height: 50px;
       "
     >
@@ -103,7 +102,7 @@
         scrolling="no"
         src="https://tianqiapi.com/api.php?style=tz&skin=pitaya&color=339CC9"
         frameborder="0"
-        width="400"
+        width="450"
         height="30"
         allowtransparency="true"
       ></iframe>

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;