Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

src/assets/scss/common.scss

@@ -36,7 +36,7 @@ body {
     text-align: left;
     background: url(../img/ntitle.png) no-repeat;
     background-size: 100% 100%;
-    text-indent: 50px;
+    text-indent: 40px;
     margin-bottom: 10px;
 }
 .addr{
@@ -107,7 +107,7 @@ body {
     height: calc(100vh - var(--header-height) - 24px);
     top: calc(var(--header-height) + 24px);
     width: 23vw;
-    // min-width: 463px;
+    min-width: 390px;
     // padding: 15px;
     box-sizing: border-box;
     // display: flex;

src/components/alarm.vue

@@ -150,6 +150,7 @@ export default {
   position: relative;
   width: 32vw;
   margin: 0 auto;
+  transform: translateX(10%);
   border: 1px solid rgba(186, 25, 25, 0.17);
   height: 2.998501rem;
   background: rgba(186, 25, 25, 0.17);
@@ -181,7 +182,7 @@ export default {
     width: 100%;
     height: 100%;
     img {
-      width: 150px;
+      width: 100px;
       border-radius: unset;
       cursor: default;
       pointer-events: auto;
@@ -266,12 +267,12 @@ ul {
 ul li {
   flex-shrink: 0;
   width: 100%;
-  padding-left: 10px;
+  // padding-left: 10px;
   box-sizing: border-box;
   text-align: left;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-size: 16px;
+  font-size: 15px;
 }
 
 ul {

src/dataSchema/scrollEventSchema.js

@@ -16,7 +16,7 @@ let scrollEventSchema = {
     oddRowBGC: 'transparent',//奇数行背景色
     evenRowBGC: 'rgba(0,175,169,.15)',//偶数行背景色	
     align: ['center', 'center', 'center', 'center', 'center'],//列对齐方式
-    columnWidth: [95, 190, 76, 'auto', 0],
+    columnWidth: [95, 160, 66, 'auto', 0],
     rowNum: 5,//表行数
     // waitTime: 999999
 }