From 434fda2bd16d78e9596fc98f7ec290e90103037c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 16:01:11 +0800
Subject: [PATCH] 阈值卡片调整、登录路由

---
 src/views/login.vue                             |    9 ++++++---
 src/views/system/work-order/threshold/index.vue |   17 +++++++++--------
 src/views/system/check/result/detail/index.vue  |    6 +-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index ba59cc7..38204ec 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -105,6 +105,7 @@
       loginInfo: {
         firstLogin: 1
       },
+      roles:[],
       newPassword: undefined,
       confirmPassword: undefined,
       loginRules: {
@@ -185,13 +186,15 @@
           this.$store.dispatch("Login", this.loginForm).then((res) => {
             getInfo().then(loginInfo => {
               this.loginInfo = loginInfo.user
+              this.roles = loginInfo.roles
               //濡傛灉杩斿洖涓�1姝e父璺宠浆
               if (this.loginInfo.firstLogin == 1) {
                 // this.$router.push({ path: "/" }).catch(() => { });
                 // return;
-                if (this.loginInfo.roles.includes("admin") || this.loginInfo.roles.includes("city_leader") || this.loginInfo.roles.includes("county_leader")) {
-                  this.$router.push({path: this.redirect || "/screen"}).catch(() => {
-                  });
+                if (this.roles .includes("admin") || this.roles .includes("city_leader") || this.roles .includes("county_leader")) {
+                  this.$router.push({
+                    path: '/screen'
+                  })
                 } else {
                   this.$router.push({path: this.redirect || "/index"}).catch(() => {
                   });
diff --git a/src/views/system/check/result/detail/index.vue b/src/views/system/check/result/detail/index.vue
index b5edb8b..f72a15c 100644
--- a/src/views/system/check/result/detail/index.vue
+++ b/src/views/system/check/result/detail/index.vue
@@ -190,7 +190,7 @@
       return department ? department.value : '鏈煡';
     },
     /** 瀵艰埅鍒囨崲 */
-    handlefSelect(key) {
+    handleSelect(key) {
       this.activeIndex = key;
       this.queryParams.examineTag = key;
       this.queryParamsList.examineTag = key;
@@ -367,10 +367,6 @@
       observer.unobserve(this.$refs.chartContent);
     }
   },
-  handleSelect(key, keyPath) {
-    console.log(key, keyPath);
-  },
-
 }
 </script>
 
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 0ab6263..4287d0f 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -14,8 +14,8 @@
     <!--      </el-col>-->
     <!--    </el-row>-->
     <el-row>
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
-        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
           <div style="display: flex; justify-content: space-between">
             <div class="header鈥攖ext">瑙嗛</div>
             <div>
@@ -103,8 +103,8 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
-        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
           <div style="display: flex; justify-content: space-between">
             <div class="header鈥攖ext">浜鸿劯</div>
             <div>
@@ -193,8 +193,8 @@
           </div>
         </el-card></el-col
       >
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
-        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
           <div style="display: flex; justify-content: space-between">
             <div class="header鈥攖ext">杞﹁締</div>
             <div>
@@ -230,13 +230,13 @@
                   font-size: small;
                   display: flex;
                   flex-direction: row-reverse;
-                  width: 232px;
+                  width: 206px;
                 "
               >
                 宸ュ崟闃堝��
               </div>
               <div>
-                <el-form ref="form" label-width="180px">
+                <el-form ref="form" label-width="160px">
                   <el-form-item
                     v-for="(item, index) in thresholdList.car"
                     :label="item.name + '锛�'"
@@ -774,6 +774,7 @@
 
 .header鈥攖ext {
   font-weight: bold;
+  font-size: large;
 }
 ::v-deep .el-form-item {
   margin-bottom: 0px; /* 鏍规嵁闇�姹傝皟鏁磋繖涓�� */

--
Gitblit v1.8.0