From da54b137ffa56d0053555ad29d2ca19ec4b7ceae Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sun, 8 Oct 2023 10:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/alert.vue                      |  10 +-
 src/components/time.vue                       |   4 +-
 src/components/toast.vue                      |   6 +-
 src/pages/modules/login/login.vue             |   8 +-
 src/pages/modules/systemmanage/developer.vue  |   8 +-
 src/pages/modules/systemmanage/role.vue       |  13 +--
 src/pages/modules/systemmanage/user.vue       |   2 +-
 .../vehicleinformation/vehiclestatus.vue      |  14 +--
 src/pages/shells/index/index.vue              |  20 ++--
 src/style/common.styl                         | 100 +++++++++---------
 src/style/reset.css                           |   4 +-
 11 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/src/components/alert.vue b/src/components/alert.vue
index e7e675c..2f3954f 100644
--- a/src/components/alert.vue
+++ b/src/components/alert.vue
@@ -92,8 +92,8 @@ export default {
   text-align center
   -webkit-overflow-scrolling touch
   white-space pre-wrap
-  font-size 32px
-  line-height 40px
+  font-size 14px
+  line-height 24px
   color #606266
 [class*='hairline']
   position relative
@@ -113,9 +113,9 @@ export default {
   border-top-width 1px
 .button--large
   width 100%
-  height 88px
-  line-height 88px
-  font-size 32px
+  height 32px
+  line-height 32px
+  font-size 14px
   color #e74f1a
   background-color #dadee2
 </style>
diff --git a/src/components/time.vue b/src/components/time.vue
index e425269..e0efe28 100644
--- a/src/components/time.vue
+++ b/src/components/time.vue
@@ -58,7 +58,7 @@ export default {
   height 61px
   padding-left 40px
 .date-wraper
-  _font(28px, 30px, #909399,,)
+  _font(16px, 26px, #909399,,)
 .time-wraper
-  _font(28px, 30px, #909399,,)
+  _font(16px, 26px, #909399,,)
 </style>
diff --git a/src/components/toast.vue b/src/components/toast.vue
index 0c01d26..b78e8fd 100644
--- a/src/components/toast.vue
+++ b/src/components/toast.vue
@@ -32,13 +32,13 @@ export default {
     top 50%
     transform translate(-50%, -50%)
     .text
-      line-height 40px
+      line-height 32px
       display inline-block
       width auto
       text-align center
-      padding 14px 73px
+      padding 14px 30px
       border-radius 16px
       background #858586
-      font-size 32px
+      font-size 14px
       color #fff
 </style>
diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue
index 48b7f10..79cc692 100644
--- a/src/pages/modules/login/login.vue
+++ b/src/pages/modules/login/login.vue
@@ -196,7 +196,7 @@ export default {
   background-color #fff
   border-radius 20px
 .login-logo-wraper
-  width 50%
+  width 40%
   padding 20px
   _fj(center,,column)
 .login-logo
@@ -211,11 +211,11 @@ export default {
 .login-logo-txt2
   _font(20px, 34px, #464646,,center)
 .login-content
-  width 50%
-  padding 20px
+  width 60%
+  padding 20px 10px
 .login-content_wraper
   width 100%
-  padding 0 15%
+  padding 0 10%
   margin 0 auto
   _fj(center,,column)
 .dl
diff --git a/src/pages/modules/systemmanage/developer.vue b/src/pages/modules/systemmanage/developer.vue
index e3f023e..df4774f 100644
--- a/src/pages/modules/systemmanage/developer.vue
+++ b/src/pages/modules/systemmanage/developer.vue
@@ -150,12 +150,12 @@ export default {
   z-index 2
 .tabs_item
   padding 0 40px
-  height 80px
+  height 40px
   box-sizing border-box
-  line-height 80px
+  line-height 40px
   display inline-block
   list-style none
-  font-size 28px
+  font-size 14px
   font-weight 500
   position relative
   transition all .3s cubic-bezier(.645,.045,.355,1)
@@ -176,7 +176,7 @@ export default {
   padding: 15px;
 .tab_pane
   _wh(100%,100%)
-  _font(24px, 40px, #323232,,)
+  _font(14px, 21px, #323232,,)
   white-space pre-line
   word-break break-all
   overflow-y auto
diff --git a/src/pages/modules/systemmanage/role.vue b/src/pages/modules/systemmanage/role.vue
index e6fb39f..57ac213 100644
--- a/src/pages/modules/systemmanage/role.vue
+++ b/src/pages/modules/systemmanage/role.vue
@@ -12,9 +12,9 @@
           <tr>
             <!-- <th>选中</th> -->
             <th width="20%">角色名称</th>
-            <th width="40%">描述</th>
-            <th width="20%">创建日期</th>
-            <th width="20%">操作</th>
+            <th width="20%">描述</th>
+            <th width="30%">创建日期</th>
+            <th width="30%">操作</th>
           </tr>
           <tr v-for="(e, i) in datalist" :key="i" :class="{'tr_selected': pkId === e.roleId}" @click="toCheck(e)">
             <!-- <td>
@@ -369,12 +369,13 @@ export default {
   top -1px
   z-index 99
   background #d7d7d7
-  _font(24px, 33px, #323232, bold, center)
-  padding 24px 20px
+  _font(14px, 23px, #323232, bold, center)
+  padding 12px 10px
 .button1
   position absolute
   right 10px
-  top 10px
+  top 50%
+  transform translateY(-50%)
 .tree_body_container
   height calc(100% - 47px)
   padding 12px 10px
diff --git a/src/pages/modules/systemmanage/user.vue b/src/pages/modules/systemmanage/user.vue
index 120662b..2caa1d7 100644
--- a/src/pages/modules/systemmanage/user.vue
+++ b/src/pages/modules/systemmanage/user.vue
@@ -388,6 +388,6 @@ export default {
 <style lang="stylus" scoped>
 @import '~@style/mixin'
 .grid_wrapper
-  height calc(100% - 120px)
+  height calc(100% - 70px)
   overflow-y auto
 </style>
diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue
index 26671c1..0be870b 100644
--- a/src/pages/modules/vehicleinformation/vehiclestatus.vue
+++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue
@@ -17,23 +17,23 @@
       <div class="state_wrap">
         <div class="state_tip">传感器状态</div>
         <div class="state_content state_content__h2">
-          <div class="state_item_2" :class="result1.stopButton_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
+          <div class="state_item_2" :class="result1.stopButton_status === '1' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">急停按钮</span>
           </div>
-          <div class="state_item_2" :class="result1.speedReduction_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
+          <div class="state_item_2" :class="result1.speedReduction_status === '1' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">避障减速</span>
           </div>
-          <div class="state_item_2" :class="result1.resetButton_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
+          <div class="state_item_2" :class="result1.resetButton_status === '1' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">复位按钮</span>
           </div>
-          <div class="state_item_2" :class="result1.speedStop_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
+          <div class="state_item_2" :class="result1.speedStop_status === '1' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">避障停车</span>
           </div>
-          <div class="state_item_2" :class="result1.securityTentacle_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
+          <div class="state_item_2" :class="result1.securityTentacle_status === '1' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">安全触边</span>
           </div>
@@ -159,9 +159,9 @@ export default {
   margin-right 3%
   margin-bottom .24rem
 .site_btn_disabled
-  opacity 0.5
+  // opacity 0.5
   .state_item_2_dot
-    background-color #c6c6c6
+    background-color #fa6400
 .site_btn_active
   opacity 1
   .state_item_2_dot
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index 28624c4..9095cd5 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -394,7 +394,7 @@ export default {
   position relative
   _wh(100%, 100%)
 .header-container
-  position absolute
+  position fixed
   left 0
   top 0
   z-index 150
@@ -415,7 +415,7 @@ export default {
 >>>.el-menu--horizontal>.el-menu-item
   line-height 80px
   height 80px
-  font-size 32px
+  font-size 18px
 >>>.el-menu.el-menu--horizontal
   border-bottom 0
 .time-container
@@ -423,10 +423,10 @@ export default {
 .state-item
   border 1px solid #54C0B3
   border-radius 4px
-  _font(32px,60px,#54C0B3,,center)
-  padding 0 35px
+  _font(16px,32px,#54C0B3,,center)
+  padding 0 15px
 .state-line
-  _wh(2px,60px)
+  _wh(2px,32px)
   opacity 0.3
   background #8991A6
   margin 0 20px
@@ -441,7 +441,7 @@ export default {
 .elec-qty
   position absolute
   width 100%
-  height 90%
+  height 100%
   left 0
   bottom 0
 .elec-qty-top
@@ -453,7 +453,7 @@ export default {
   z-index 152
   border 1px solid #ddd
 .elec-txt
-  _font(28px, 60px, #909399,,left)
+  _font(16px, 60px, #909399,,left)
 .icon_admin
   _font(32px, 60px, #54C0B3,,left)
   margin-right 2px
@@ -471,7 +471,7 @@ export default {
 .header_user_wraper_inn
   _fj()
   _wh(100%, 100%)
-  padding 0 30px
+  padding 0 15px
 .header_dropdown_wraper
   position absolute
   top 90%
@@ -489,7 +489,7 @@ export default {
     width 100%
     li
       width 100%
-      _font(28px, 60px, #909399,,center)
+      _font(16px, 32px, #909399,,center)
       padding 0 10px
       &:hover
         background-color #ffc3a7
@@ -525,7 +525,7 @@ export default {
     >>>.el-menu-item a
         color #909399
     >>>.el-menu-item
-        font-size 28px
+        font-size 18px
         line-height 80px
         height 80px
     >>>.is-active
diff --git a/src/style/common.styl b/src/style/common.styl
index 3c8e4b7..b9576e5 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -133,9 +133,9 @@
   -moz-user-select: none;
   -webkit-user-select: none;
   -ms-user-select: none;
-  padding: 28px 58px;
-  font-size: 32px;
-  border-radius: 28px;
+  padding: 12px 20px;
+  font-size: 14px;
+  border-radius: 20px;
   &:disabled
     color: #fff;
     background-color: $gray;
@@ -195,8 +195,8 @@
 .dialog_body
   padding: 30px 20px;
   color: #606266;
-  font-size: 28px;
-  line-height: 40px
+  font-size: 14px;
+  line-height: 32px
   word-break: break-all;
 .form_wraper
   width 100%
@@ -209,23 +209,23 @@
   .form_item+.form_item
     margin-left 4%
 .form_item__label
-  width: 160px;
+  width: 100px;
   text-align: left;
   vertical-align: middle;
   float: left;
-  font-size: 28px;
+  font-size: 14px;
   color: #606266;
-  line-height: 40px;
-  padding: 20px 10px;
+  line-height: 32px;
+  padding: 0 10px;
   box-sizing: border-box;
   i
     color $red2
 .form_item__content
-  width: calc(100% - 160px)
-  margin-left: 160px;
-  line-height: 80px;
+  width: calc(100% - 100px)
+  margin-left: 100px;
+  line-height: 32px;
   position: relative;
-  font-size: 28px;
+  font-size: 14px;
 .form_item__input
   width 100%
   -webkit-appearance: none;
@@ -236,28 +236,28 @@
   box-sizing: border-box;
   color: #696969;
   display: inline-block;
-  font-size: 28px;
-  height: 80px;
-  line-height: 80px;
+  font-size: 14px;
+  height: 32px;
+  line-height: 30px;
   outline: none;
-  padding: 0 15px;
+  padding: 0 10px;
   transition: border-color .2s cubic-bezier(.645,.045,.355,1);
   width: 100%;
-  border-radius: 16px
+  border-radius: 8px
 .form_item__textarea
-  line-height 40px
-  height 110px
-  padding 15px
+  line-height 30px
+  height 120px
+  padding 10px
 .form_item__radio
   color: #606266;
   font-weight: 500;
-  line-height: 80px;
+  line-height: 32px;
   position: relative;
   cursor: pointer;
   display: inline-block;
   white-space: nowrap;
   outline: none;
-  font-size: 28px;
+  font-size: 14px;
   margin-right: 30px;
   -moz-user-select: none;
   -webkit-user-select: none;
@@ -275,7 +275,7 @@
   border-radius 50%
 .radio__label
   display: inline-block;
-  font-size: 28px;
+  font-size: 14px;
   padding-left: 20px;
 .icon_radio_checked
   background-color $green1
@@ -292,9 +292,9 @@
 .el-select
   width 100%
 .el-input, .el-select .el-input .el-select__caret, .el-select-dropdown__item
-  font-size 28px
-  line-height 80px
-  height 80px
+  font-size 14px
+  line-height 30px
+  height 30px
 .el-select:hover .el-input__inner, .el-input__inner
   border-color $gray1
 .el-select .el-input__inner:focus, .el-select .el-input.is-focus .el-input__inner
@@ -303,9 +303,9 @@
   color $red2
 .el-input__inner
   color #696969
-  font-size 28px
-  line-height 80px
-  height 80px
+  font-size 14px
+  line-height 30px
+  height 30px
 .dialog_footer
   padding: 10px 20px 20px;
   text-align: center;
@@ -347,23 +347,23 @@
       position: sticky;
       top: -1px;
       background: #d7d7d7;
-      font-size: 24px;
-      line-height: 33px;
+      font-size: 14px;
+      line-height: 23px;
       color: #323232;
       font-weight: bold;
       z-index: 99;
-      padding 24px 20px;
+      padding 12px 10px;
     td
       box-sizing: border-box;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
-      padding: 20px 10px;
+      padding: 12px 10px;
       border-bottom: 1px dashed $gray1;
       border-right: 1px dashed $gray1;
       text-align: center;
-      font-size: 28px;
-      line-height: 40px;
+      font-size: 14px;
+      line-height: 23px;
       color: #323232;
       background: #fff;
       &:last-child
@@ -379,7 +379,7 @@
 	left: 0;
 	z-index: 99;
 .grid_button
-  padding 15px 50px
+  padding 12px 20px
 
 // tree
 .el-checkbox__inner:hover, .el-checkbox__input.is-focus .el-checkbox__inner
@@ -509,16 +509,16 @@
       margin-left: -98px;
 
 // tree
-.el-tree-node__content
-  height 60px
-.el-tree-node__expand-icon,.el-checkbox,.el-tree-node__label
-  font-size 28px
-.el-checkbox__inner
-  width 28px
-  height 28px
-.el-checkbox__input.is-indeterminate .el-checkbox__inner::before
-  top 12px
-.el-checkbox__input.is-checked .el-checkbox__inner::after
-  left: 11px;
-  top: 9px;
-  transform: rotate(45deg) scaleY(2)
\ No newline at end of file
+// .el-tree-node__content
+//   height 60px
+// .el-tree-node__expand-icon,.el-checkbox,.el-tree-node__label
+//   font-size 28px
+// .el-checkbox__inner
+//   width 28px
+//   height 28px
+// .el-checkbox__input.is-indeterminate .el-checkbox__inner::before
+//   top 12px
+// .el-checkbox__input.is-checked .el-checkbox__inner::after
+//   left: 11px;
+//   top: 9px;
+//   transform: rotate(45deg) scaleY(2)
\ No newline at end of file
diff --git a/src/style/reset.css b/src/style/reset.css
index a4a2aeb..79c9a27 100644
--- a/src/style/reset.css
+++ b/src/style/reset.css
@@ -68,8 +68,8 @@ html,body {
      height: 100%; */
      font-size: 16px;
      /* min-width: 1440px; */
-     width: 2560px;
-     height: 1440px;
+     width: 1920px;
+     height: 1080px;
      /* max-width: 1920px; */
 }