Browse Source

logo、名称替换

dev01 1 year ago
parent
commit
d1a8bc58fb

+ 2 - 2
.env.development

@@ -1,10 +1,10 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 科研打卡管理系统
+VUE_APP_TITLE = 科德研发工时管理服务系统
 
 
 # 开发环境配置
 # 开发环境配置
 ENV = 'development'
 ENV = 'development'
 
 
-# 科研打卡管理系统/开发环境
+# 科德研发工时管理服务系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = '/dev-api'
 
 
 # 路由懒加载
 # 路由懒加载

+ 2 - 2
.env.production

@@ -1,8 +1,8 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 科研打卡管理系统
+VUE_APP_TITLE = 科德研发工时管理服务系统
 
 
 # 生产环境配置
 # 生产环境配置
 ENV = 'production'
 ENV = 'production'
 
 
-# 科研打卡管理系统/生产环境
+# 科德研发工时管理服务系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 VUE_APP_BASE_API = '/prod-api'

+ 2 - 2
.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 科研打卡管理系统
+VUE_APP_TITLE = 科德研发工时管理服务系统
 
 
 NODE_ENV = production
 NODE_ENV = production
 
 
 # 测试环境配置
 # 测试环境配置
 ENV = 'staging'
 ENV = 'staging'
 
 
-# 科研打卡管理系统/测试环境
+# 科德研发工时管理服务系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
 VUE_APP_BASE_API = '/stage-api'

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "ruoyi",
   "name": "ruoyi",
   "version": "3.8.6",
   "version": "3.8.6",
-  "description": "科研打卡管理系统",
+  "description": "科德研发工时管理服务系统",
   "author": "科德",
   "author": "科德",
   "license": "MIT",
   "license": "MIT",
   "scripts": {
   "scripts": {

BIN
public/favicon.ico


+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo.png">
     <title><%= webpackConfig.name %></title>
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
 	  <style>

BIN
public/logo.png


BIN
src/assets/images/pay.png


BIN
src/assets/logo/logo.png


+ 47 - 16
src/layout/components/Sidebar/Logo.vue

@@ -1,45 +1,75 @@
 <template>
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{
+      backgroundColor:
+        sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground,
+    }"
+  >
     <transition name="sidebarLogoFade">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1
+          v-else
+          class="sidebar-title"
+          :style="{
+            color:
+              sideTheme === 'theme-dark'
+                ? variables.logoTitleColor
+                : variables.logoLightTitleColor,
+          }"
+        >
+          {{ title }}
+        </h1>
       </router-link>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1
+          class="sidebar-title"
+          :style="{
+            color:
+              sideTheme === 'theme-dark'
+                ? variables.logoTitleColor
+                : variables.logoLightTitleColor,
+          }"
+        >
+          {{ title }}
+        </h1>
       </router-link>
       </router-link>
     </transition>
     </transition>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
+import logoImg from "@/assets/logo/logo.png";
+import variables from "@/assets/styles/variables.scss";
 
 
 export default {
 export default {
-  name: 'SidebarLogo',
+  name: "SidebarLogo",
   props: {
   props: {
     collapse: {
     collapse: {
       type: Boolean,
       type: Boolean,
-      required: true
-    }
+      required: true,
+    },
   },
   },
   computed: {
   computed: {
     variables() {
     variables() {
       return variables;
       return variables;
     },
     },
     sideTheme() {
     sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
+      return this.$store.state.settings.sideTheme;
+    },
   },
   },
   data() {
   data() {
     return {
     return {
       title: process.env.VUE_APP_TITLE,
       title: process.env.VUE_APP_TITLE,
-      logo: logoImg
-    }
-  }
-}
+      logo: logoImg,
+    };
+  },
+};
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
@@ -69,7 +99,7 @@ export default {
       width: 32px;
       width: 32px;
       height: 32px;
       height: 32px;
       vertical-align: middle;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 5px;
     }
     }
 
 
     & .sidebar-title {
     & .sidebar-title {
@@ -78,9 +108,10 @@ export default {
       color: #fff;
       color: #fff;
       font-weight: 600;
       font-weight: 600;
       line-height: 50px;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 12px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
       vertical-align: middle;
+      white-space: pre;
     }
     }
   }
   }
 
 

+ 1 - 1
src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container home">
   <div class="app-container home">
     <el-row :gutter="20">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>欢迎使用科研打卡服务系统</h2>
+        <h2>欢迎使用科德研发工时管理服务系统</h2>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
   </div>
   </div>

+ 2 - 2
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="login">
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
     <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-form-item prop="username">
         <el-input
         <el-input
           v-model="loginForm.username"
           v-model="loginForm.username"
@@ -56,7 +56,7 @@
     </el-form>
     </el-form>
     <!--  底部  -->
     <!--  底部  -->
     <div class="el-login-footer">
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 阿凡提 版权所有.</span>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

+ 2 - 2
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="register">
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
     <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-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
         <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" />
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -61,7 +61,7 @@
     </el-form>
     </el-form>
     <!--  底部  -->
     <!--  底部  -->
     <div class="el-register-footer">
     <div class="el-register-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 阿凡提 版权所有.</span>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

+ 1 - 1
src/views/system/dept/index.vue

@@ -99,7 +99,7 @@
     </el-table>
     </el-table>
 
 
     <!-- 添加或修改部门对话框 -->
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
           <el-col :span="24" v-if="form.parentId !== 0">

+ 20 - 9
src/views/system/user/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <el-row :gutter="20">
     <el-row :gutter="20">
       <!--部门数据-->
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="2" :xs="24">
         <div class="head-container">
         <div class="head-container">
           <el-input
           <el-input
             v-model="deptName"
             v-model="deptName"
@@ -28,7 +28,7 @@
         </div>
         </div>
       </el-col>
       </el-col>
       <!--用户数据-->
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="22" :xs="24">
         <el-form
         <el-form
           :model="queryParams"
           :model="queryParams"
           ref="queryForm"
           ref="queryForm"
@@ -37,10 +37,10 @@
           v-show="showSearch"
           v-show="showSearch"
           label-width="68px"
           label-width="68px"
         >
         >
-          <el-form-item label="用户称" prop="nickName">
+          <el-form-item label="用户称" prop="nickName">
             <el-input
             <el-input
               v-model="queryParams.nickName"
               v-model="queryParams.nickName"
-              placeholder="请输入用户称"
+              placeholder="请输入用户称"
               clearable
               clearable
               style="width: 240px"
               style="width: 240px"
               @keyup.enter.native="handleQuery"
               @keyup.enter.native="handleQuery"
@@ -265,7 +265,7 @@
             v-if="columns[1].visible"
             v-if="columns[1].visible"
           />
           />
           <el-table-column
           <el-table-column
-            label="用户名"
+            label="用户名"
             align="center"
             align="center"
             key="userName"
             key="userName"
             prop="userName"
             prop="userName"
@@ -500,6 +500,7 @@
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="上级" prop="superiorId">
             <el-form-item label="上级" prop="superiorId">
               <el-autocomplete
               <el-autocomplete
+                style="width: 240px"
                 v-model="form.superiorName"
                 v-model="form.superiorName"
                 value-key="nickName"
                 value-key="nickName"
                 :fetch-suggestions="getDatas"
                 :fetch-suggestions="getDatas"
@@ -530,7 +531,7 @@
         <el-row>
         <el-row>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="用户性别">
             <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
+              <el-select v-model="form.sex" placeholder="请选择性别" style="width: 240px">
                 <el-option
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
                   :key="dict.value"
@@ -556,7 +557,12 @@
         <el-row>
         <el-row>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="岗位" prop="postIds">
             <el-form-item label="岗位" prop="postIds">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select
+                v-model="form.postIds"
+                multiple
+                placeholder="请选择岗位"
+                style="width: 240px"
+              >
                 <el-option
                 <el-option
                   v-for="item in postOptions"
                   v-for="item in postOptions"
                   :key="item.postId"
                   :key="item.postId"
@@ -569,7 +575,12 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="角色" prop="roleIds">
             <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select
+                v-model="form.roleIds"
+                multiple
+                placeholder="请选择角色"
+                style="width: 240px"
+              >
                 <el-option
                 <el-option
                   v-for="item in roleOptions"
                   v-for="item in roleOptions"
                   :key="item.roleId"
                   :key="item.roleId"
@@ -585,7 +596,7 @@
         <el-row>
         <el-row>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="兼职/全职" prop="fullJob">
             <el-form-item label="兼职/全职" prop="fullJob">
-              <el-select v-model="form.fullJob" placeholder="请选择">
+              <el-select v-model="form.fullJob" placeholder="请选择" style="width: 240px">
                 <el-option
                 <el-option
                   v-for="dict in dict.type.sys_user_fulljob"
                   v-for="dict in dict.type.sys_user_fulljob"
                   :key="dict.value"
                   :key="dict.value"

+ 1 - 1
vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 
 const CompressionPlugin = require('compression-webpack-plugin')
 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 // 端口
 const port = process.env.port || process.env.npm_config_port || 80 // 端口