Merge remote-tracking branch 'origin/master'

ruoyi-ui/.env.development

@@ -1,7 +1,7 @@
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 项目汇报管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 项目汇报管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

ruoyi-ui/.env.staging

@@ -3,5 +3,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 项目汇报管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.4.0",
-  "description": "若依管理系统",
+  "description": "项目汇报管理系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/components/RuoYi/Doc/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="question" @click="goto"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'RuoYiDoc',
-  data() {
-    return {
-      url: 'http://doc.ruoyi.vip/ruoyi-vue'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>

ruoyi-ui/src/components/RuoYi/Git/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="github" @click="goto"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'RuoYiGit',
-  data() {
-    return {
-      url: 'https://gitee.com/y_project/RuoYi-Vue'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>

ruoyi-ui/src/layout/components/Navbar.vue

@@ -8,13 +8,6 @@
       <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" />
 
@@ -52,8 +45,6 @@ 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: {
@@ -61,9 +52,7 @@ export default {
     Hamburger,
     Screenfull,
     SizeSelect,
-    Search,
+    Search
-    RuoYiGit,
-    RuoYiDoc
   },
   computed: {
     ...mapGetters([

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo-bak.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '项目汇报管理系统',
       logo: logoImg
     }
   }

ruoyi-ui/src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '若依管理系统',
+  title: '项目汇报管理系统',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/store/modules/user.js

@@ -51,7 +51,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = user.avatar == "" ? require("@/assets/images/profile-bak.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

ruoyi-ui/src/views/flowable/task/process/index.vue

@@ -35,17 +35,17 @@
           v-hasPermi="['system:deployment:add']"
         >新增流程</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="danger"
+<!--          type="danger"-->
-          plain
+<!--          plain-->
-          icon="el-icon-delete"
+<!--          icon="el-icon-delete"-->
-          size="mini"
+<!--          size="mini"-->
-          :disabled="multiple"
+<!--          :disabled="multiple"-->
-          @click="handleDelete"
+<!--          @click="handleDelete"-->
-          v-hasPermi="['system:deployment:remove']"
+<!--          v-hasPermi="['system:deployment:remove']"-->
-        >删除</el-button>
+<!--        >删除</el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -94,12 +94,12 @@
               <el-dropdown-item icon="el-icon-tickets" @click.native="handleFlowRecord(scope.row)">
                 详情
               </el-dropdown-item>
-              <el-dropdown-item icon="el-icon-circle-close" @click.native="handleStop(scope.row)">
+<!--              <el-dropdown-item icon="el-icon-circle-close" @click.native="handleStop(scope.row)">-->
-                取消申请
+<!--                取消申请-->
-              </el-dropdown-item>
+<!--              </el-dropdown-item>-->
-              <el-dropdown-item icon="el-icon-delete" @click.native="handleDelete(scope.row)" v-hasPermi="['system:deployment:remove']">
+<!--              <el-dropdown-item icon="el-icon-delete" @click.native="handleDelete(scope.row)" v-hasPermi="['system:deployment:remove']">-->
-                删除
+<!--                删除-->
-              </el-dropdown-item>
+<!--              </el-dropdown-item>-->
             </el-dropdown-menu>
           </el-dropdown>
         </template>

ruoyi-ui/src/views/tool/build/index.vue

@@ -156,7 +156,7 @@ import {
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefalut from '@/utils/generator/drawingDefalut'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logo-bak.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'
 import {

ruoyi-ui/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '若依管理系统' // 标题
+const name = defaultSettings.title || '项目汇报管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口