Merge branch 'NanMing1' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/jgxxgl/index.vue

@@ -515,6 +515,9 @@ export default {
       const id = row.id || this.ids
       getJcxx(id).then(response => {
         this.form = response.data;
+        Object.keys(this.form).forEach(key => {
+          this.form[key] === null ? this.form[key] = '' : false
+        })
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/login.vue

@@ -224,7 +224,7 @@ export default {
   }
   ::v-deep .el-form-item__content {
     display: flex;
-    justify-content: start;
+    justify-content: flex-start;
 
     .el-form-item__error{
       left: 110px;
@@ -235,7 +235,7 @@ export default {
     }
     .label {
       display: flex;
-      justify-content: start;
+      justify-content: flex-start;
       font-size: 20px;
       // font-weight: 600;
       color: #004b92;

ruoyi-ui/src/views/loginO.vue

@@ -1,279 +0,0 @@
-<template>
-  <div style="display: flex;flex-direction: column;height: 100%;width: 100%;">
-    <!-- <div class="logo-box">
-      <img src="../assets/images/login-logo.png"> <span>养老服务信息系统</span>
-    </div> -->
-
-    <div class="login">
-      <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <div class="logo-box">
-          <img class="logo" src="../assets/images/login-logo.png"> <img class="title-font"
-            src="../assets/images/ylz.png">
-        </div>
-        <!-- <h3 class="title">养老服务信息系统</h3> -->
-        <el-form-item prop="username" class="item">
-          <p class="label"><span>用户名</span>：</p>
-          <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" />
-          </el-input>
-        </el-form-item>
-        <el-form-item prop="password" class="item">
-          <p class="label"><span>密码</span>：</p>
-          <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
-            @keyup.enter.native="handleLogin">
-            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-          </el-input>
-        </el-form-item>
-        <el-form-item prop="code" v-if="captchaEnabled" class="item">
-          <p class="label"><span>验证码</span>：</p>
-          <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-            @keyup.enter.native="handleLogin">
-            <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" />
-          </div>
-        </el-form-item>
-        <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> -->
-        <el-form-item style="width:100%;">
-          <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
-            @click.native.prevent="handleLogin">
-            <span v-if="!loading">登 录</span>
-            <span v-else>登 录 中...</span>
-          </el-button>
-          <div style="float: right;" v-if="register">
-            <router-link class="link-type" :to="'/register'">立即注册</router-link>
-          </div>
-        </el-form-item>
-      </el-form>
-      <!--  底部  -->
-
-    </div>
-    <!-- <div class="el-login-footer">
-      <span>Copyight@ 2012-2022 XXXXX科技有限公司 All Rights Reserved </span>
-    </div> -->
-  </div>
-
-</template>
-
-<script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import request from '@/utils/request'
-import { decrypt, encrypt } from '@/utils/jsencrypt'
-
-export default {
-  name: "Login",
-  data() {
-    return {
-      codeUrl: "",
-      loginForm: {
-        username: "",
-        password: "",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaEnabled: true,
-      // 注册开关
-      register: false,
-      redirect: undefined,
-      data: [
-
-      ]
-    };
-  },
-  watch: {
-    $route: {
-      handler: function (route) {
-        console.log(route, 'route');
-        console.log(Cookies.get('Admin-Token'));
-        this.redirect = route.query && route.query.redirect;
-        if (route.query.redirect.indexOf('?') != -1) {
-
-        }
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  mounted() {
-    window.testquery = function (o) {
-      return request(o);
-    }
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-        if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
-        }
-      });
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      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)
-      };
-    },
-    handleLogin() {
-      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 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(() => { });
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.login {
-  display: flex;
-  /*justify-content: center;*/
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.png");
-  background-size: cover;
-  /*background-size: 100% 100%;*/
-}
-
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
-}
-
-.login-form {
-  border-radius: 6px;
-  position: absolute;
-  left: 25%;
-  width: 500px;
-
-
-  .logo-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 30px;
-
-    img {
-      width: 80%;
-    }
-
-    .logo {
-      margin-right: 20px;
-    }
-  }
-
-  .el-form-item__content {
-    display: flex;
-    justify-content: start;
-
-    .label {
-      display: flex;
-      justify-content: start;
-      font-size: 20px;
-      font-weight: 600;
-      color: #004b92;
-      width: 140px;
-      margin: 0;
-
-      span {
-        width: 80px;
-        display: inline-block;
-        text-align: justify;
-        text-align-last: justify;
-      }
-    }
-
-    .el-input__inner {
-      font-size: 16px;
-      color: #acacac;
-    }
-
-  }
-
-
-  .el-input {
-    height: 40px;
-
-  }
-
-  .input-icon {
-    height: 39px;
-    width: 16px;
-    margin-left: 2px;
-  }
-}
-
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-
-.login-code {
-  height: 38px;
-  margin-left: 10%;
-
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-}
-
-.el-login-footer {
-  height: 100px;
-  line-height: 100px;
-  /*position: fixed;*/
-  /*bottom: 2%;*/
-  width: 100%;
-  text-align: center;
-  color: #1B1B1B;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-
-.login-code-img {
-  height: 38px;
-}
-</style>