From 9e09fcb49c4316a1859df58764e5d1cafae97eed Mon Sep 17 00:00:00 2001
From: libao <15050590816@163.com>
Date: Mon, 13 May 2024 14:30:53 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.13=20=E5=90=8E=E5=8F=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/.env.development                    |  2 +-
 ruoyi-ui/.env.production                     |  2 +-
 ruoyi-ui/.env.staging                        |  2 +-
 ruoyi-ui/package.json                        |  2 +-
 ruoyi-ui/src/layout/components/Navbar.vue    | 22 ++++++++++----------
 ruoyi-ui/src/views/login.vue                 |  2 +-
 ruoyi-ui/src/views/register.vue              |  2 +-
 ruoyi-ui/src/views/system/category/index.vue |  4 +++-
 ruoyi-ui/vue.config.js                       |  2 +-
 9 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 302ecd1..05e3694 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 革命纪念馆管理系统
 
 # 开发环境配置
 ENV = 'development'
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b4893b0..9e21adc 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 革命纪念馆管理系统
 
 # 生产环境配置
 ENV = 'production'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index 361859f..edc12cc 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 革命纪念馆管理系统
 
 NODE_ENV = production
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 8754448..093277c 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -2,7 +2,7 @@
   "name": "ruoyi",
   "version": "3.8.7",
   "description": "革命纪念馆管理系统",
-  "author": "若依",
+  "author": "新元素",
   "license": "MIT",
   "scripts": {
     "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 466cd98..9b4aa94 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,21 +7,21 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+<!--        <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-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>
+<!--        <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" />
+<!--        <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>
+<!--        <el-tooltip content="布局大小" effect="dark" placement="bottom">-->
+<!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
       </template>
 
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 06c09d2..f236f8a 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">革命纪念馆后台管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 7bf6f43..94ac84d 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">革命纪念馆后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/ruoyi-ui/src/views/system/category/index.vue b/ruoyi-ui/src/views/system/category/index.vue
index d57d1d1..7aeba68 100644
--- a/ruoyi-ui/src/views/system/category/index.vue
+++ b/ruoyi-ui/src/views/system/category/index.vue
@@ -134,6 +134,8 @@
       border
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column label="分类名称" prop="categoryName" />
+      <el-table-column label="排序" prop="sort" />
+      <el-table-column label="标签" prop="tagName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -283,7 +285,7 @@ export default {
           }
         }
         this.categoryList = newArr
-      
+
       });
     },
     getColumList(){
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 4632938..fa7b38b 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '革命纪念馆管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口