From 8311b651398c1805769259b334a542e5f000fe35 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 21 Oct 2023 19:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/alert.vue                | 14 +++++-----
 src/components/toast.vue                |  8 +++---
 src/pages/modules/login/login.vue       |  5 +---
 src/pages/modules/systemmanage/role.vue | 35 ++++++++++---------------
 src/style/common.styl                   |  3 +++
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/components/alert.vue b/src/components/alert.vue
index 2f3954f..403ee57 100644
--- a/src/components/alert.vue
+++ b/src/components/alert.vue
@@ -85,15 +85,15 @@ export default {
   color #929292
   z-index 2018
 .text
-  padding 14px 73px
+  padding 20px 50px
   max-height 60%
-  min-height 44px
+  min-height 80px
   overflow-y auto
   text-align center
   -webkit-overflow-scrolling touch
   white-space pre-wrap
-  font-size 14px
-  line-height 24px
+  font-size 30px
+  line-height 40px
   color #606266
 [class*='hairline']
   position relative
@@ -113,9 +113,9 @@ export default {
   border-top-width 1px
 .button--large
   width 100%
-  height 32px
-  line-height 32px
-  font-size 14px
+  height 80px
+  line-height 80px
+  font-size 30px
   color #e74f1a
   background-color #dadee2
 </style>
diff --git a/src/components/toast.vue b/src/components/toast.vue
index b78e8fd..14119aa 100644
--- a/src/components/toast.vue
+++ b/src/components/toast.vue
@@ -26,19 +26,19 @@ export default {
     position fixed
     z-index 10001
     width 90%
-    min-height 48px
+    min-height 80px
     text-align center
     left 50%
     top 50%
     transform translate(-50%, -50%)
     .text
-      line-height 32px
+      line-height 40px
       display inline-block
       width auto
       text-align center
-      padding 14px 30px
+      padding 20px 50px
       border-radius 16px
       background #858586
-      font-size 14px
+      font-size 30px
       color #fff
 </style>
diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue
index 817d27e..eb21864 100644
--- a/src/pages/modules/login/login.vue
+++ b/src/pages/modules/login/login.vue
@@ -40,10 +40,6 @@
         </div>
       </div>
     </div>
-    <div class="footer_wraper">
-      <div class="footer_p1">Copyright © www.noblelift.cn, All Rights Reserved.</div>
-      <div class="footer_p2">国内唯一（全球仅四家）能够同时提供物料搬运设备、智能立体仓库、智能输送分拣系统、AGV及其系统、供应链综合系统软件以及智能制造全系统整体解决方案的公司。</div>
-    </div>
     <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
   </div>
 </template>
@@ -133,6 +129,7 @@ export default {
         this.$router.push('/index/home')
       } catch (err) {
         this.disabled = false
+        this.toast(err)
       }
     },
     show (e) {
diff --git a/src/pages/modules/systemmanage/role.vue b/src/pages/modules/systemmanage/role.vue
index c7ed9bc..47dfe61 100644
--- a/src/pages/modules/systemmanage/role.vue
+++ b/src/pages/modules/systemmanage/role.vue
@@ -15,13 +15,13 @@
               <th>创建日期</th>
               <th width="330px">操作</th>
             </tr>
-            <tr v-for="(e, i) in datalist" :key="i" :class="{'tr_selected': pkId === e.roleId}" @click="toCheck(e)">
+            <tr v-for="(e, i) in datalist" :key="i" :class="{'tr_selected': pkId === e.roleId}">
               <!-- <td>
                 <div class="radio__input icon_radio_checked"><i class="icon_radio"></i></div>
               </td> -->
-              <td>{{ e.name }}</td>
-              <td>{{ e.remark }}</td>
-              <td>{{ e.createTime }}</td>
+              <td @click="toCheck(e)">{{ e.name }}</td>
+              <td @click="toCheck(e)">{{ e.remark }}</td>
+              <td @click="toCheck(e)">{{ e.createTime }}</td>
               <td width="330px">
                 <div class="row">
                   <button class="button button--primary grid_button" @click="showDialog('2', e)">修改</button>
@@ -67,14 +67,10 @@
     <div v-show="active1" class="dialog_wrapper">
       <div class="dialog dialog_1">
         <div class="dialog_header">
-          <span class="dialog_title">角色名称</span>
+          <span class="dialog_title">{{ pkObj.name }}</span>
         </div>
         <div class="dialog_body dialog_body_1">
           <div class="tree_wrapper">
-            <!-- <div class="tree_header">
-              <span>角色名称</span>
-              <button class="button button--primary grid_button button1" :class="{'button--info': pkId === '' || $refs.tree.getCheckedKeys().length === 0}" :disabled="disabled" @click="toSave">保存</button>
-            </div> -->
             <div class="tree_body_container">
               <el-tree
                 :data="tree"
@@ -280,16 +276,17 @@ export default {
           this.toast(res.desc)
           this.pkId = ''
           this.checkedKeys = []
-          this.tree.map(e => {
-            this.$refs.tree.setChecked(e, false, true)
-          })
           this._sysRoleQuery()
         } else {
           this.toast(res.desc)
+          this.pkId = ''
+          this.checkedKeys = []
         }
         this.disabled = false
       } catch (e) {
         this.disabled = false
+        this.pkId = ''
+        this.checkedKeys = []
       }
     },
     toSave () {
@@ -297,7 +294,6 @@ export default {
         return
       }
       this.active1 = false
-      this.pkId = ''
       let arr1 = this.$refs.tree.getCheckedKeys()
       let arr2 = this.$refs.tree.getHalfCheckedKeys()
       arr2.map((e, i) => {
@@ -317,20 +313,17 @@ export default {
     },
     toCheck (e) {
       this.pkId = this.pkId === e.roleId ? '' : e.roleId
+      this.pkObj = this.pkId === e.roleId ? e : []
       this.active1 = this.pkId === e.roleId
-      this.checkedKeys = this.pkId === e.roleId ? e.menus1 : []
-      this.tree.map(e => {
-        this.$refs.tree.setChecked(e, false, true)
+      this.checkedKeys = [...e.menus1]
+      this.$nextTick(() => {
+        this.$refs.tree.setCheckedKeys(this.checkedKeys)
       })
-      if (this.pkId === e.roleId) {
-        this.checkedKeys = e.menus1
-      } else {
-        this.checkedKeys = []
-      }
     },
     toCancle1 () {
       this.active1 = false
       this.pkId = ''
+      this.checkedKeys = []
     },
     show (e) {
       this.input = e.target
diff --git a/src/style/common.styl b/src/style/common.styl
index f6bf789..588575a 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -494,6 +494,9 @@
 .el-checkbox__input.is-indeterminate .el-checkbox__inner
   &::before
     top 17px
+.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content
+  background: none;
+
 
 // 车辆信息
 .state_wrap