飞书测试bug

阿宝
1 parent a37317f4
Showing 8 changed files with 105 additions and 52 deletions
src/assets/css/base.css
src/store/index.js
src/views/down/client.vue
src/views/examinationPaper/add.vue
src/views/examinationPaper/index.vue
src/views/setUp/account.vue
src/views/setUp/student.vue
src/views/setUp/teacher.vue
@@ -20,6 +20,15 @@ a {
   text-decoration: none;
 }
+input[type="number"] {
+  -moz-appearance: textfield;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
 /* element-style */
 .el-button--default {
   color: #667ffd;
@@ -31,7 +40,7 @@ a {
   border-color: #667ffd;
 }
-.el-radio__input.is-checked+.el-radio__label {
+.el-radio__input.is-checked + .el-radio__label {
   color: #667ffd;
 }
@@ -41,5 +50,5 @@ a {
 }
 .el-message-box .el-button--default {
-  color: #fff
+  color: #fff;
 }
@@ -4,6 +4,7 @@ import Cookies from &quot;js-cookie&quot;;
 import layoutStore from "./modules/layout/index";
 import { defaultRouter } from "@/router/index";
 import { encryptLoginPassword } from "@/utils";
+import { Message } from "element-ui";
 import request from "@/api/index";
 import router from "@/router/index";
@@ -69,25 +70,41 @@ const store = new Vuex.Store({
           let response = res;
           if (response.status == 0) {
             const userInfo = { ...response.data };
-            userInfo.showRoleName = response.data.permissions[0]?.roleName;
-            commit("setToken", "isLogin");
-            commit("setInfo", { ...userInfo });
-            commit("setRouters", [...userInfo.permissions[0]?.authorityRouter]);
-            state.addRouters.forEach((res) => {
-              router.addRoute(res);
-            });
-            router.addRoute({
-              path: "*",
-              redirect: "/404",
-              hidden: true,
-              children: [],
-            });
-            console.log(Cookies.get("ZT_YIJIAO_TOKEN"));
-            if (params.url) {
-              window.location.href = params.url;
+            if (userInfo.permissions && userInfo.permissions.length) {
+              userInfo.showRoleName = response.data.permissions[0]?.roleName;
+              commit("setToken", "isLogin");
+              commit("setInfo", { ...userInfo });
+              commit("setRouters", [
+                ...userInfo.permissions[0]?.authorityRouter,
+              ]);
+              state.addRouters.forEach((res) => {
+                router.addRoute(res);
+              });
+              router.addRoute({
+                path: "*",
+                redirect: "/404",
+                hidden: true,
+                children: [],
+              });
+              console.log(Cookies.get("ZT_YIJIAO_TOKEN"));
+              if (params.url) {
+                window.location.href = params.url;
+              } else {
+                router.push({ path: "/" });
+              }
             } else {
-              router.push({ path: "/" });
+              Message({
+                message: "该账号暂无权限，请联系管理员~",
+                type: "error",
+                duration: 3 * 1000,
+              });
             }
+          } else {
+            Message({
+              message: response.info,
+              type: "error",
+              duration: 3 * 1000,
+            });
           }
         })
         .catch(() => {});
@@ -98,7 +115,7 @@ const store = new Vuex.Store({
       let authorityRouterObj = userInfo.permissions.filter((item) => {
         return item.role == role;
       });
-      userInfo.showRoleName = authorityRouterObj[0]?.roleName
+      userInfo.showRoleName = authorityRouterObj[0]?.roleName;
       commit("setInfo", userInfo);
       commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
       state.addRouters.forEach((res) => {
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="form-box">
-        <el-form :model="formData" :rules="ruleForm" label-width="180px">
+        <el-form :model="formData" label-width="180px">
           <el-form-item label="主菜单设置：" prop="configName" v-if="type == 1">
             <el-col :span="12">
               <el-input
@@ -153,13 +153,14 @@
               <el-radio :label="2">老师选择</el-radio>
             </el-radio-group>
             <el-input-number
+             v-show="formData.viesAnswerSet != 2"
               size="small"
               class="count-down"
               v-model="formData.countdown"
               :step="1"
               :step-strictly="true"
             ></el-input-number
-            >秒
+            > <span v-show="formData.viesAnswerSet != 2">秒</span>
           </el-form-item>
           <el-form-item label="抽答设置：" prop="ballotAnswerSet">
             <el-radio-group v-model="formData.ballotAnswerSet">
@@ -179,11 +180,11 @@
             ></el-input-number
             >个
           </el-form-item>
-          <el-form-item label="多选题选项默认个数：" prop="countdown">
+          <el-form-item label="多选题选项默认个数：" prop="multipleChoiceNum">
             <el-input-number
               size="small"
               class="count-down count-down2"
-              v-model="formData.countdown"
+              v-model="formData.multipleChoiceNum"
               :min="2"
               :max="7"
               :step="1"
@@ -196,8 +197,8 @@
               size="small"
               class="count-down count-down2"
               v-model="formData.singleTypeNum"
-              :min="1"
-              :max="100"
+              :min="2"
+              :max="25"
               :step="1"
               :step-strictly="true"
             ></el-input-number
@@ -275,7 +276,7 @@ const defaultForm = {
   ballotAnswerSet: 0,
   singleChoiceNum: 4,
   multipleChoiceNum: 4,
-  singleTypeNum: 20,
+  singleTypeNum: 25,
   askCountdown: 30,
   examsDuration: 5400,
   displayModel: 0,
@@ -325,7 +326,7 @@ export default {
         ballotAnswerSet: 0,
         singleChoiceNum: 4,
         multipleChoiceNum: 4,
-        singleTypeNum: 20,
+        singleTypeNum: 25,
         askCountdown: 30,
         examsDuration: 90,
         displayModel: 0,
@@ -159,7 +159,7 @@
               <div class="qs-num">题号</div>
               <div class="qs-type">题型</div>
               <div class="qs-score">分数</div>
-              <div class="qs-partScore">部分分值</div>
+              <div class="qs-partScore">漏选得分</div>
               <div class="qs-options">选项设置</div>
               <div class="qs-set">操作</div>
             </li>
@@ -172,7 +172,7 @@
               <div class="qs-type">
                 <el-select
                   v-model="subQuestions.questionType"
-                  placeholder="选择答题卡类型"
+                  placeholder="选择题目类型"
                   @change="changeSubQuestions($event, subQuestions)"
                 >
                   <el-option label="单选题" :value="2"></el-option>
@@ -203,7 +203,7 @@
                   :max="subQuestions.score"
                   :step="0.5"
                   v-model="subQuestions.partScore"
-                  label="部分分值"
+                  label="漏选得分"
                 ></el-input-number>
               </div>
               <div class="qs-options">
@@ -260,7 +260,7 @@
               <div class="qs-type">
                 <el-select
                   v-model="addSubQuestionsType"
-                  placeholder="选择答题卡类型"
+                  placeholder="选择题目类型"
                   @change="changeAddSubQuestions($event, question)"
                 >
                   <el-option label="单选题" :value="2"></el-option>
@@ -365,6 +365,7 @@
                <div class="qs-num">题号</div>
               <div class="qs-type">题型</div>
               <div class="qs-score">分数</div>
+              <div class="qs-partScore">漏选得分</div>
               <div class="qs-options qs-options2">选项设置</div>
             </li>
             <li
@@ -387,6 +388,20 @@
                   label="单题分值"
                 ></el-input-number>
               </div>
+              <div class="qs-partScore">
+                <p v-if="subQuestions.questionType != 3">--</p>
+                <el-input-number
+                  class="number-ipt"
+                  v-else
+                  size="medium"
+                  :min="0"
+                  :precision="2"
+                  :max="subQuestions.score"
+                  :step="0.5"
+                  v-model="subQuestions.partScore"
+                  label="漏选得分"
+                ></el-input-number>
+              </div>
               <div class="qs-options qs-options2">
                 <p v-if="subQuestions.questionType == 5">--</p>
                 <p v-if="subQuestions.questionType == 4" class="answer-box">
@@ -509,7 +524,7 @@ export default {
         gradeName: "",
         subjectName: "",
         examsDuration: 90,
-        sharingType: 1,
+        sharingType: 0,
         questionList: [],
       },
       formRules: {
@@ -801,7 +816,8 @@ export default {
         tag: this.answerTypeName,
       });
       if (status == 0) {
-        this._TypeList();
+        await this._TypeList();
+        this.form.tagId = data || "";
         this.dialogVisible = false;
         this.answerTypeName = "";
         this.$message.success("添加成功");
@@ -853,7 +869,7 @@ export default {
             };
           }) || [];
         if (this.type != 2) {
-          this.form.tagId = this.answerTypeList[0].id || "";
+          this.form.tagId = this.answerTypeList[0]?.id || "";
         }
       } else {
         this.$message.error(info);
@@ -5,15 +5,9 @@
         <span>备题组卷</span>
       </template>
       <template slot="btns">
-        <el-tooltip effect="dark" content="创建答题卡" placement="left">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            plain
-            circle
-            @click="toAdd({})"
-          ></el-button>
-        </el-tooltip>
+        <el-button type="primary" size="mini" icon="el-icon-plus" plain @click="toAdd({})">
+          添加答题卡</el-button
+        >
       </template>
     </back-box>
@@ -255,9 +249,9 @@ export default {
           break;
       }
     },
-    changePage(page){
-      this.page = page
-      this._QueryData(this.query.title)
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
     },
     async saveShare() {
       //修改分享范围
@@ -270,6 +264,7 @@ export default {
         this.shareForm.sharingType = 1;
         this.dialogVisible = false;
         this.$message.success(info);
+        this._QueryData(this.query.title == "");
       } else {
         this.$message.error(info);
       }
@@ -84,7 +84,7 @@
         </el-table-column>
         <el-table-column prop="available" label="状态" align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.available == 0 ? "可用" : "不可用"}`
+            `${scoped.row.available == 0 ? "正常" : "禁用"}`
           }}</template></el-table-column
         >
         <el-table-column
@@ -143,7 +143,7 @@
         :image-size="100"
       ></el-empty>
     </div>
-    <el-dialog title="修改年级信息" :visible.sync="diaCount" width="400">
+    <el-dialog title="修改账号信息" :visible.sync="diaCount" width="400">
       <el-form
         class="form-box"
         :model="formCount"
@@ -126,12 +126,12 @@
         </el-form-item>
         <el-form-item label="长学号：" prop="studentCode">
           <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formStu.studentCode" />
+            <el-input maxlength="12" v-model.trim="formStu.studentCode" />
           </el-col>
         </el-form-item>
         <el-form-item label="短学号：">
           <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formStu.shortNumber" />
+            <el-input maxlength="12" v-model.trim="formStu.shortNumber" />
           </el-col>
         </el-form-item>
         <el-form-item label="性别：">
@@ -142,7 +142,7 @@
         </el-form-item>
         <el-form-item label="答题器编码：">
           <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formStu.clickerSn" />
+            <el-input maxlength="8" v-model.trim="formStu.clickerSn" />
           </el-col>
         </el-form-item>
       </el-form>
@@ -296,6 +296,7 @@ export default {
       if (status === 0) {
         this.$message.success("删除成功");
         this.studentList.splice(index, 1);
+        this._QueryClass()
       } else {
         this.$message.error(info);
       }
@@ -322,6 +323,7 @@ export default {
       if (status === 0) {
         this.$message.success(info);
         this.diaStu = false;
+        this._QueryClass()
         this._QueryData();
       } else {
         this.$message.error(info);
@@ -340,6 +342,8 @@ export default {
       } else if (type == 3) {
         this.query.studentName = "";
         this.query.studentCode = "";
+      }else{
+        query = this.query
       }
       this.loading = true;
       const { data, status, info } = await this.$request.studentList({
@@ -48,6 +48,7 @@
           placeholder="请输入老师姓名"
           v-model="query.teacherName"
           class="input-with-select"
+          maxlength="30"
           @keyup.enter.native="_QueryData(2)"
         >
           <el-button
@@ -60,6 +61,7 @@
           type="number"
           placeholder="请输入老师手机号"
           v-model="query.phone"
+          maxlength="11"
           class="input-with-select"
           @keyup.enter.native="_QueryData(3)"
         >
@@ -578,13 +580,22 @@ export default {
         this.query.teacherName = "";
         this.query.phone = "";
       } else if (type == 2) {
+         if(this.query.teacherName == ""){
+          this.$message.warning('请输入老师姓名')
+          return
+        }
         query.teacherName = this.query.teacherName;
         this.query.gradeName = "";
         this.query.phone = "";
       } else if (type == 3) {
+        if(this.query.phone == ""){
+          this.$message.warning('请输入老师手机')
+          return
+        }
         query.phone = this.query.phone;
         this.query.teacherName = "";
         this.query.gradeName = "";
+        
       } else if (type == 10) {
         query = { ...this.query };
       }