From 5d4d61befe45a709f9d2f4c4ea5b6246323627af Mon Sep 17 00:00:00 2001
From: fupeijie <1161353057@qq.com>
Date: Tue, 19 Nov 2024 14:46:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=BE=AE=E9=87=8F=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/Navbar.vue          |  8 ----
 .../components/nodeMonitorDashboard.vue       | 37 ++++++++++---------
 .../rdsservice/edit/servicePasswordEdit.vue   | 10 +++--
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/rds-console/console-ui/src/layout/components/Navbar.vue b/rds-console/console-ui/src/layout/components/Navbar.vue
index 39b3dad..e501a0b 100644
--- a/rds-console/console-ui/src/layout/components/Navbar.vue
+++ b/rds-console/console-ui/src/layout/components/Navbar.vue
@@ -8,14 +8,6 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/rds-console/console-ui/src/views/console/rdsmonitor/components/nodeMonitorDashboard.vue b/rds-console/console-ui/src/views/console/rdsmonitor/components/nodeMonitorDashboard.vue
index 772e719..77f396f 100644
--- a/rds-console/console-ui/src/views/console/rdsmonitor/components/nodeMonitorDashboard.vue
+++ b/rds-console/console-ui/src/views/console/rdsmonitor/components/nodeMonitorDashboard.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="uhry-wrapper">
     <div class="uhry-chart-wrapper">
-      <div class="uhry-chart" :id="echart.elementId" :style="{width: chartStyle,height:'200px'}"></div>
+      <div
+        class="uhry-chart"
+        :id="echart.elementId"
+        :style="{ width: chartStyle, height: '200px' }"
+      ></div>
     </div>
   </div>
 </template>
@@ -9,8 +13,8 @@
 <script>
 import * as echarts from 'echarts';
 export default {
-  components:{},
-  props:{
+  components: {},
+  props: {
     echart: Object,
     chartWidth: Number
   },
@@ -24,13 +28,13 @@ export default {
       this.eventRefreshEcharts()
     }
   },
-  data(){
+  data() {
     return {
       chart: undefined,
       chartStyle: ''
     }
   },
-  methods:{
+  methods: {
     //刷新图表
     eventRefreshEcharts: function () {
       if (this.chart === undefined) {
@@ -38,7 +42,7 @@ export default {
         this.chart = echarts.init(dom)
       }
       let option = {
-        
+
         color: ['#409EFF'],
         grid: {
           right: 10,
@@ -47,8 +51,8 @@ export default {
           containLabel: true
         },
         tooltip: {
-    trigger: 'axis'
-  },
+          trigger: 'axis'
+        },
         title: {
           text: this.echart.title,
           textStyle: {
@@ -95,16 +99,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .uhry-wrapper {
+.uhry-wrapper {
+  .uhry-chart-wrapper {
+    padding: 10px;
+    border: solid 1px rgb(102, 177, 255);
+    border-radius: 5px;
 
-    .uhry-chart-wrapper {
-      padding: 10px;
-      border: solid 1px rgb(102, 177, 255);
-      border-radius: 5px;
-
-      .uhry-chart {
-        height: 350px;
-      }
+    .uhry-chart {
+      height: 350px;
     }
   }
+}
 </style>
diff --git a/rds-console/console-ui/src/views/console/rdsservice/edit/servicePasswordEdit.vue b/rds-console/console-ui/src/views/console/rdsservice/edit/servicePasswordEdit.vue
index 553e891..1540a22 100644
--- a/rds-console/console-ui/src/views/console/rdsservice/edit/servicePasswordEdit.vue
+++ b/rds-console/console-ui/src/views/console/rdsservice/edit/servicePasswordEdit.vue
@@ -142,10 +142,12 @@ export default {
 
           this.loading = true;
           updateServicePassword(postData).then(response => {
-            this.$modal.msgSuccess("密码修改成功");
-            this.open = false;
-            this.$emit('transfer', this.form);
-            this.loading = false;
+            if (response.code == 200) {
+              this.$modal.msgSuccess("密码修改成功");
+              this.open = false;
+              this.$emit('transfer', this.form);
+              this.loading = false;
+            }
           });
 
         }
-- 
Gitee


From 492ae286de6f94fc805320f530de4b5c48dcefbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=9F=B9=E6=9D=B0?= <1161353057@qq.com>
Date: Tue, 19 Nov 2024 07:36:50 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20rds-?=
 =?UTF-8?q?console/console-ui/src/layout/components/Navbar.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/Navbar.vue          | 192 ------------------
 1 file changed, 192 deletions(-)
 delete mode 100644 rds-console/console-ui/src/layout/components/Navbar.vue

diff --git a/rds-console/console-ui/src/layout/components/Navbar.vue b/rds-console/console-ui/src/layout/components/Navbar.vue
deleted file mode 100644
index e501a0b..0000000
--- a/rds-console/console-ui/src/layout/components/Navbar.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
-
-    <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-      </template>
-
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
-
-export default {
-  components: {
-    Breadcrumb,
-    TopNav,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    RuoYiGit,
-    RuoYiDoc
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
-    setting: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      }
-    }
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
-      }).catch(() => {});
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.navbar {
-  height: 50px;
-  overflow: hidden;
-  position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .topmenu-container {
-    position: absolute;
-    left: 50px;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
-
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
-      }
-    }
-
-    .avatar-container {
-      margin-right: 30px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
-
-        .user-avatar {
-          cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
-        }
-
-        .el-icon-caret-bottom {
-          cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-}
-</style>
-- 
Gitee