页面修改

2020-08-20 09:50:51 +08:00
parent 1bf3ff94d7
commit 18fd453789
16 changed files with 42 additions and 93 deletions
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@ -1,7 +1,7 @@
 # 开发环境配置
 ENV = 'development'

-# 若依管理系统/开发环境
+# 闵行群体教师管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'

 # 路由懒加载
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@ -1,5 +1,5 @@
 # 生产环境配置
 ENV = 'production'

-# 若依管理系统/生产环境
+# 闵行群体教师管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@ -3,5 +3,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'

-# 若依管理系统/测试环境
+# 闵行群体教师管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -1,8 +1,8 @@
 {
  "name": "ruoyi",
  "version": "3.1.0",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "闵行群体教师管理系统",
+  "author": "播智教育",
  "license": "MIT",
  "scripts": {
    "dev": "vue-cli-service serve",
--- a/ruoyi-ui/public/favicon.ico
+++ b/ruoyi-ui/public/favicon.ico
--- a/ruoyi-ui/src/assets/image/profile.jpg
+++ b/ruoyi-ui/src/assets/image/profile.jpg
--- a/ruoyi-ui/src/assets/logo/logo.png
+++ b/ruoyi-ui/src/assets/logo/logo.png
--- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue
+++ b/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>
--- a/ruoyi-ui/src/components/RuoYi/Git/index.vue
+++ b/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>
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@ -7,14 +7,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" />

@ -52,8 +44,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 +51,7 @@ export default {
    Hamburger,
    Screenfull,
    SizeSelect,
-    Search,
-    RuoYiGit,
-    RuoYiDoc
+    Search
  },
  computed: {
    ...mapGetters([
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@ -26,7 +26,7 @@ export default {
  },
  data() {
    return {
-      title: '若依管理系统',
+      title: '闵行群体教师管理系统',
      logo: logoImg
    }
  }
--- a/ruoyi-ui/src/settings.js
+++ b/ruoyi-ui/src/settings.js
@ -1,5 +1,5 @@
 module.exports = {
-  title: '若依管理系统',
+  title: '闵行群体教师管理系统',

  /**
   * 是否系统布局配置
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@ -1,8 +1,6 @@
 <template>
  <div class="dashboard-editor-container">

-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
      <line-chart :chart-data="lineChartData" />
    </el-row>
@ -70,9 +68,7 @@ export default {
    }
  },
  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    }
+
  }
 }
 </script>
--- 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" type="text" auto-complete="off" placeholder="账号">
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@ -29,7 +29,7 @@
          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
        </el-input>
        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
        </div>
      </el-form-item>
      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@ -48,7 +48,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright © 2018-2019 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2019-2020 jypj.org All Rights Reserved.</span>
    </div>
  </div>
 </template>
@ -56,7 +56,7 @@
 <script>
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from "@/utils/jsencrypt";

 export default {
  name: "Login",
@ -69,28 +69,30 @@ export default {
        password: "admin123",
        rememberMe: false,
        code: "",
-        uuid: ""
+        uuid: "",
      },
      loginRules: {
        username: [
-          { required: true, trigger: "blur", message: "用户名不能为空" }
+          { required: true, trigger: "blur", message: "用户名不能为空" },
        ],
        password: [
-          { required: true, trigger: "blur", message: "密码不能为空" }
+          { required: true, trigger: "blur", message: "密码不能为空" },
+        ],
+        code: [
+          { required: true, trigger: "change", message: "验证码不能为空" },
        ],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
      },
      loading: false,
-      redirect: undefined
+      redirect: undefined,
    };
  },
  watch: {
    $route: {
-      handler: function(route) {
+      handler: function (route) {
        this.redirect = route.query && route.query.redirect;
      },
-      immediate: true
-    }
+      immediate: true,
+    },
  },
  created() {
    this.getCode();
@ -98,7 +100,7 @@ export default {
  },
  methods: {
    getCode() {
-      getCodeImg().then(res => {
+      getCodeImg().then((res) => {
        this.codeUrl = "data:image/gif;base64," + res.img;
        this.loginForm.uuid = res.uuid;
      });
@ -106,25 +108,30 @@ export default {
    getCookie() {
      const username = Cookies.get("username");
      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const rememberMe = Cookies.get("rememberMe");
      this.loginForm = {
        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
      };
    },
    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          this.loading = true;
          if (this.loginForm.rememberMe) {
            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
          } else {
            Cookies.remove("username");
            Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove("rememberMe");
          }
          this.$store
            .dispatch("Login", this.loginForm)
@ -137,8 +144,8 @@ export default {
            });
        }
      });
-    }
-  }
+    },
+  },
 };
 </script>

@ -148,7 +155,7 @@ export default {
  justify-content: center;
  align-items: center;
  height: 100%;
-  background-image: url("../assets/image/login-background.jpg");
+  background: linear-gradient(-45deg, #46a6ff, #edf7fb);
  background-size: cover;
 }
 .title {
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@ -11,8 +11,8 @@
    </el-form-item>
    <el-form-item label="性别">
      <el-radio-group v-model="user.sex">
-        <el-radio label="0">男</el-radio>
-        <el-radio label="1">女</el-radio>
+        <el-radio label="1">男</el-radio>
+        <el-radio label="2">女</el-radio>
      </el-radio-group>
    </el-form-item>
    <el-form-item>
--- a/ruoyi-ui/vue.config.js
+++ b/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 // 端口