From 790e98df98a425bfb507dce53224da6115384c7e Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 18 Dec 2024 18:17:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml  | 12 +++++------
 .../src/main/resources/application.yml        | 21 ++++++++++---------
 .../src/views/alarmMonitor/bound/index.vue    |  5 +++--
 ruoyi-ui/src/views/home/index.vue             |  4 ++--
 ruoyi-ui/src/views/system/user/index.vue      |  7 +++----
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml b/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml
index c54df10..83c6d2a 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml
+++ b/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        #                url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
-        #                username: root
-        #                password: password
-        url: jdbc:oracle:thin:@10.169.28.44:1521/orcl
-        username: spg_voc
-        password: SPG$spgvoc_24!
+        url: jdbc:oracle:thin:@218.58.79.146:17521/orcl
+        username: system
+        password: oracle
+#        url: jdbc:oracle:thin:@10.169.28.44:1521/orcl
+#        username: spg_voc
+#        password: SPG$spgvoc_24!
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
diff --git a/RuoYi-Vue-Oracle/src/main/resources/application.yml b/RuoYi-Vue-Oracle/src/main/resources/application.yml
index 226797b..9253a09 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/application.yml
+++ b/RuoYi-Vue-Oracle/src/main/resources/application.yml
@@ -72,18 +72,19 @@ spring:
       enabled: true
   # redis 配置
   redis:
-    # 地址
-    #    host: 192.168.31.105
-    host: 127.0.0.1
-    # 端口，默认为6379
+    host: 192.168.1.115
     port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: 123456
-    #    password: admin123!
+    password: Liwen073898!
+#  redis:
+#    # 地址
+#    host: 127.0.0.1
+#    port: 6379
+#    # 数据库索引
+#    database: 0
+#    # 密码
+#    password: 123456
     # 连接超时时间
-    timeout: 10s
+#    timeout: 10s
     lettuce:
       pool:
         # 连接池中的最小空闲连接
diff --git a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue
index ccf6c38..377970b 100644
--- a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue
+++ b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue
@@ -79,7 +79,7 @@
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-thumb" @click="handleUpdate(scope.row)">下发通知</el-button>
+          <el-button  v-if="checkRole(['admin', 'notice'])" size="mini" type="text" icon="el-icon-thumb" @click="handleUpdate(scope.row)">下发通知</el-button>
           <!--v-if="userName == scope.row.dealUser" -->
           <el-button size="mini" type="text" icon="el-icon-dish-1" @click="handleAlarm(scope.row)">处理报警</el-button>
           <el-button size="mini" type="text" icon="el-icon-location-information"
@@ -159,7 +159,7 @@
 </template>
 
 <script>
-
+import { checkRole } from "@/utils/permission";
 import { listAlarm } from "@/api/demostrate/monitor";
 import sendMsg from "@/views/demostrate/alarm/sendMsg";
 import dealAlarm from "@/views/demostrate/alarm/dealAlarm";
@@ -246,6 +246,7 @@ export default {
     this.init();
   },
   methods: {
+    checkRole,
     openDetailWindows(row) {
       this.detailParams = row
       this.isOpenDetail = true
diff --git a/ruoyi-ui/src/views/home/index.vue b/ruoyi-ui/src/views/home/index.vue
index 409369a..dc2b2f4 100644
--- a/ruoyi-ui/src/views/home/index.vue
+++ b/ruoyi-ui/src/views/home/index.vue
@@ -9,12 +9,12 @@
     </div>
   
     <!--左侧-->
-    <div v-if="showBeside" class="reservoir-left">
+    <div class="reservoir-left">
 
     <left />
     </div>
     <!--右侧-->
-    <div  v-if="showBeside" class="reservoir-right">
+    <div   class="reservoir-right">
       <right />
     </div>
     <div class="reservoir-map">
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index c5b21a5..8a8b208 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -606,7 +606,8 @@ export default {
         this.roleOptions = response.roles;
         this.open = true;
         this.title = "添加用户";
-        this.form.password = this.initPassword;
+       // this.form.password = this.initPassword;
+       this.form.password ='Gkjt123...';
       });
     },
     /** 修改按钮操作 */
@@ -642,9 +643,7 @@ export default {
         if (!hasUpperCase || !hasLowerCase || !hasNumber || !hasSpecialCharacter) {
           this.$message.error("密码不符合要求：密码长度10-20位，包含大小写、数字以及特殊字符");
         } else {
-          let values =encrypt(value )
-          resetUserPwd(row.userId, values).then(response => {
-            debugger
+          resetUserPwd(row.userId, value).then(response => {
             this.$modal.msgSuccess("密码修改成功!");
           });
         }