浏览代码

bug修改

zhangjie 4 年之前
父节点
当前提交
f6eb483440
共有 3 个文件被更改,包括 11 次插入3 次删除
  1. 9 2
      src/modules/login/LoginHome.vue
  2. 1 0
      src/modules/mark/MarkDetail.vue
  3. 1 1
      src/modules/mark/components/MarkStep.vue

+ 9 - 2
src/modules/login/LoginHome.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { username, password } from "@/plugins/formRules";
+import { password } from "@/plugins/formRules";
 import { login, subjectDetail } from "@/api";
 import ResetPwd from "./ResetPwd";
 
@@ -68,7 +68,14 @@ export default {
         password: ""
       },
       loginRules: {
-        loginName: username,
+        loginName: [
+          {
+            required: true,
+            pattern: /^[a-zA-Z0-9_-]{2,40}$/,
+            message: "用户名只能包含字母、数字、下划线以及短横线",
+            trigger: "change"
+          }
+        ],
         password
       },
       rightRoutes: {

+ 1 - 0
src/modules/mark/MarkDetail.vue

@@ -255,6 +255,7 @@ export default {
   methods: {
     async initData() {
       this.getWorkLevels();
+      this.getParamsSetInfo();
 
       await this.getAreaList();
       this.filter.questionId = this.areas[0].id;

+ 1 - 1
src/modules/mark/components/MarkStep.vue

@@ -34,7 +34,7 @@
         ]"
         @click="selectStep(step)"
       >
-        <p v-if="showTopNumber && showCount">{{ step.gcount }}</p>
+        <p v-if="showTopNumber">{{ showCount ? step.gcount : "" }}</p>
         <p class="step-name">{{ step.name }}</p>
         <p>{{ showCount ? step.count : "" }}</p>
       </div>