调整eslint,优化oc判断

2023-01-14 10:52:15 +08:00
parent dfcb283899
commit 66666ed5fd
9 changed files with 103 additions and 139 deletions
@@ -19,8 +19,11 @@
          </p>
        </div>
      </div>
-      <div v-if="hello > 0 " :class="[(hello > 0 && !out)? 'slide-in-left' : '' , out ? 'slide-out-right' : '']"
-        class="form">
+      <div
+        v-if="hello > 0 "
+        :class="[(hello > 0 && !out)? 'slide-in-left' : '' , out ? 'slide-out-right' : '']"
+        class="form"
+      >
        <el-form ref="formRef" :model="form" label-width="100px">
          <el-form-item label="数据库类型">
            <el-select v-model="form.dbType" placeholder="请选择" @change="changeDB">
@@ -143,7 +146,7 @@ const changeDB = (val) => {
      })
  }
 }
-const onSubmit = async () => {
+const onSubmit = async() => {
  const loading = ElLoading.service({
    lock: true,
    text: '正在初始化数据库，请稍候',
@@ -241,72 +244,60 @@ const onSubmit = async () => {
 }
@-webkit-keyframes slide-in-fwd-top {
  0% {
-    -webkit-transform: translateZ(-1400px) translateY(-800px);
    transform: translateZ(-1400px) translateY(-800px);
    opacity: 0;
  }
  100% {
-    -webkit-transform: translateZ(0) translateY(0);
    transform: translateZ(0) translateY(0);
    opacity: 1;
  }
 }
@keyframes slide-in-fwd-top {
  0% {
-    -webkit-transform: translateZ(-1400px) translateY(-800px);
    transform: translateZ(-1400px) translateY(-800px);
    opacity: 0;
  }
  100% {
-    -webkit-transform: translateZ(0) translateY(0);
    transform: translateZ(0) translateY(0);
    opacity: 1;
  }
 }
@-webkit-keyframes slide-out-right {
  0% {
-    -webkit-transform: translateX(0);
    transform: translateX(0);
    opacity: 1;
  }
  100% {
-    -webkit-transform: translateX(1000px);
    transform: translateX(1000px);
    opacity: 0;
  }
 }
@keyframes slide-out-right {
  0% {
-    -webkit-transform: translateX(0);
    transform: translateX(0);
    opacity: 1;
  }
  100% {
-    -webkit-transform: translateX(1000px);
    transform: translateX(1000px);
    opacity: 0;
  }
 }
@-webkit-keyframes slide-in-left {
  0% {
-    -webkit-transform: translateX(-1000px);
    transform: translateX(-1000px);
    opacity: 0;
  }
  100% {
-    -webkit-transform: translateX(0);
    transform: translateX(0);
    opacity: 1;
  }
 }
@keyframes slide-in-left {
  0% {
-    -webkit-transform: translateX(-1000px);
    transform: translateX(-1000px);
    opacity: 0;
  }
  100% {
-    -webkit-transform: translateX(0);
    transform: translateX(0);
    opacity: 1;
  }
@@ -104,16 +104,15 @@ const toService = () => {
  animation:turn 0.5s linear infinite;
 }
@keyframes turn {
-  0%{-webkit-transform:rotate(0deg);}
-  25%{-webkit-transform:rotate(90deg);}
-  50%{-webkit-transform:rotate(180deg);}
-  75%{-webkit-transform:rotate(270deg);}
-  100%{-webkit-transform:rotate(360deg);}
+  0%{transform:rotate(0deg);}
+  25%{transform:rotate(90deg);}
+  50%{transform:rotate(180deg);}
+  75%{transform:rotate(270deg);}
+  100%{transform:rotate(360deg);}
 }

-
 .service {
-  font-family: "gvaIcon" !important;
+  font-family: "gvaIcon",serif !important;
    font-size: 16px;
    font-style: normal;
    font-weight: 800;
@@ -21,35 +21,18 @@
            <el-input
              v-model="loginFormData.username"
              placeholder="请输入用户名"
-            >
-              <template #suffix>
-                <span class="input-icon">
-                  <el-icon>
-                    <user />
-                  </el-icon>
-                </span>
-              </template>
-            </el-input>
+              suffix-icon="user"
+            />
          </el-form-item>
          <el-form-item prop="password">
            <el-input
              v-model="loginFormData.password"
-              :type="lock === 'lock' ? 'password' : 'text'"
+              show-password
+              type="password"
              placeholder="请输入密码"
-            >
-              <template #suffix>
-                <span class="input-icon">
-                  <el-icon>
-                    <component
-                      :is="lock"
-                      @click="changeLock"
-                    />
-                  </el-icon>
-                </span>
-              </template>
-            </el-input>
+            />
          </el-form-item>
-          <el-form-item prop="captcha" v-if="loginFormData.openCaptcha">
+          <el-form-item v-if="loginFormData.openCaptcha" prop="captcha">
            <div class="vPicBox">
              <el-input
                v-model="loginFormData.captcha"
@@ -86,19 +69,19 @@
      <div class="login_panel_foot">
        <div class="links">
          <a href="http://doc.henrongyi.top/" target="_blank">
-            <img src="@/assets/docs.png" class="link-icon">
+            <img src="@/assets/docs.png" class="link-icon" alt="文档">
          </a>
          <a href="https://support.qq.com/product/371961" target="_blank">
-            <img src="@/assets/kefu.png" class="link-icon">
+            <img src="@/assets/kefu.png" class="link-icon" alt="客服">
          </a>
          <a
            href="https://github.com/flipped-aurora/gin-vue-admin"
            target="_blank"
          >
-            <img src="@/assets/github.png" class="link-icon">
+            <img src="@/assets/github.png" class="link-icon" alt="github">
          </a>
          <a href="https://space.bilibili.com/322210472" target="_blank">
-            <img src="@/assets/video.png" class="link-icon">
+            <img src="@/assets/video.png" class="link-icon" alt="视频站">
          </a>
        </div>
        <div class="copyright">
@@ -157,11 +140,6 @@ const loginVerify = () => {
 loginVerify()

 // 登录相关操作
-const lock = ref('lock')
-const changeLock = () => {
-  lock.value = lock.value === 'lock' ? 'unlock' : 'lock'
-}
-
 const loginForm = ref(null)
 const picPath = ref('')
 const loginFormData = reactive({
@@ -120,7 +120,7 @@
          </el-form-item>
          <el-form-item label="头像" label-width="80px">
            <div style="display:inline-block" @click="openHeaderChange">
-              <img v-if="userInfo.headerImg" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
+              <img v-if="userInfo.headerImg" alt="头像" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
              <div v-else class="header-img-box">从媒体库选择</div>
            </div>
          </el-form-item>
@@ -252,10 +252,9 @@ const resetPasswordFunc = (row) => {
 }
 const setAuthorityIds = () => {
  tableData.value && tableData.value.forEach((user) => {
-    const authorityIds = user.authorities && user.authorities.map(i => {
+    user.authorityIds = user.authorities && user.authorities.map(i => {
      return i.authorityId
    })
-    user.authorityIds = authorityIds
  })
 }

@@ -303,10 +302,10 @@ const rules = ref({
    { required: true, message: '请输入用户昵称', trigger: 'blur' }
  ],
  phone: [
-    { pattern: /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/, message: "请输入合法手机号", trigger: "blur" },
+    { pattern: /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/, message: '请输入合法手机号', trigger: 'blur' },
  ],
  email: [
-    { pattern: /^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g, message: "请输入正确的邮箱", trigger: "blur" },
+    { pattern: /^([0-9A-Za-z\-_.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g, message: '请输入正确的邮箱', trigger: 'blur' },
  ],
  authorityId: [
    { required: true, message: '请选择用户角色', trigger: 'blur' }