v1.3测试问题

梁保满
1 parent b31444fa
Showing 14 changed files with 251 additions and 117 deletions
src/utils/index.js
src/views/examinationPaper/add.vue
src/views/examinationPaper/index.vue
src/views/personal/ask/index.vue
src/views/personal/test/index.vue
src/views/standard/ask/index.vue
src/views/standard/card/index.vue
src/views/standard/device/index.vue
src/views/standard/setUp/account.vue
src/views/standard/setUp/school.vue
src/views/standard/setUp/student.vue
src/views/standard/setUp/teacher.vue
src/views/standard/test/analysis.vue
src/views/standard/test/index.vue
@@ -759,8 +759,9 @@ export function tablePrint(id, title) {
     .el-table{width:100%}
     .el-table,.el-table__body-wrapper{max-height:auto}
     .el-table .el-table__cell{padding:12px 0}
-    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #ccc;background:#ccc}
+    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #ccc}
     .el-table thead tr:first-child th.el-table__cell:first-child{border-left: 1px solid #ccc;}
+    .el-table thead tr th.el-table__cell{background:#ccc}
     .el-table tbody tr td.el-table__cell:first-child{border-left: 1px solid #ccc;}
     .el-table td.el-table__cell{border-bottom: 1px solid #ccc;}
     .el-table--border .el-table__cell{border-right: 1px solid #ccc;}
@@ -794,6 +795,6 @@ export function tablePrint(id, title) {
     awin.document.body.append(pTit)
   }
   awin.document.body.append(aDom);
-  // awin.print();
-  // awin.close()
+  awin.print();
+  awin.close()
 }
 \ No newline at end of file
@@ -1873,20 +1873,27 @@ export default {
       if (status == 0) {
         this.form.title = data.title + "_副本";
         this.form.tagId = data.tagId === 0 ? "" : data.tagId;
-
-        this.form.subjectName = this.subjectList.length
-          ? this.subjectList.filter((item) => {
-              return item.label == data.subjectName;
-            })?.value
-          : "";
+        if (this.subjectList.length) {
+          this.subjectList.map((item) => {
+            if (item.label == data.subjectName) {
+              this.form.subjectName = item.value;
+            }
+          });
+        } else {
+          this.form.subjectName = "";
+        }
         this.form.examsDuration = data.examsDuration;
         if (this.role != "ROLE_PERSONAL") {
           this.form.sharingType = data.sharingType;
-          this.form.gradeName = this.gradeList.length
-            ? this.gradeList.filter((item) => {
-                return item == data.gradeName;
-              })
-            : "";
+          if (this.gradeList.length) {
+            this.gradeList.map((item) => {
+              if (item == data.gradeName) {
+                this.form.gradeName = data.gradeName;
+              }
+            });
+          } else {
+            this.form.gradeName = "";
+          }
         }
         this.form.questionList = data.questionList?.map((item) => {
           let subQuestions =
@@ -6,7 +6,7 @@
       </template>
       <template slot="btns">
         <el-tooltip
-          v-if="!code"
+          v-if="!code && gdClass"
           effect="dark"
           content="已归档试卷"
           placement="bottom"
@@ -215,6 +215,7 @@ export default {
   data() {
     return {
       code: "",
+      gdClass: 0, //已归档班级数量
       loading: false,
       userName: "",
       dialogVisible: false,
@@ -249,6 +250,7 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.userName = this.$store.getters.info.name || "";
+    this._QueryClassList2()
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -379,6 +381,21 @@ export default {
       }
     },
     // 查找班级
+    async _QueryClassList2() {
+      this.loading = true;
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
     async _QueryClassList() {
       this.loading = true;
       let fetchClassList =
@@ -6,7 +6,7 @@
       </template>
       <template slot="btns">
         <el-tooltip
-          v-if="!code"
+          v-if="!code && gdClass"
           effect="dark"
           content="已归档试卷"
           placement="bottom"
@@ -354,6 +354,7 @@ import BusEvent from &quot;@/utils/busEvent&quot;;
 export default {
   data() {
     return {
+      gdClass: 0,
       tableMaxHeight: 300,
       loading: false,
       form: { questionList: [] },
@@ -384,6 +385,7 @@ export default {
     };
   },
   async created() {
+    this._QueryClassList2();
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -399,17 +401,18 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that._QueryClassList2();
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
     });
   },
   methods: {
@@ -552,6 +555,16 @@ export default {
       // await this.setDate(1);
       this._QueryData();
     },
+    async _QueryClassList2() {
+      const { data, status, info } = await this.$request.pClassList({
+        status: 1,
+      });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryClassList() {
       const { data, status, info } = await this.$request.pClassList();
       if (status === 0) {
@@ -4,6 +4,23 @@
       <template slot="title">
         <span>即时测-数据报表</span>
       </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code && gdClass"
+          effect="dark"
+          content="已归档试卷"
+          placement="bottom"
+        >
+          <el-button
+            type="primary"
+            icon="fa fa-archive"
+            size="mini"
+            plain
+            circle
+            @click="toPortrait"
+          ></el-button>
+        </el-tooltip>
+      </template>
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
@@ -424,6 +441,7 @@ import BusEvent from &quot;@/utils/busEvent&quot;;
 export default {
   data() {
     return {
+      gdClass: 0, //已归档班级数量
       exportLoading: false,
       tableMaxHeight: 300,
       loading: false,
@@ -452,6 +470,7 @@ export default {
     };
   },
   async created() {
+    this._QueryClassList2()
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -467,20 +486,26 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that._QueryClassList2()
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
     });
   },
   methods: {
+    toArchiving() {
+      this.$router.push({
+        path: "/testArchiving",
+      });
+    },
     print() {
       tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
     },
@@ -662,6 +687,14 @@ export default {
       await this._QuerySubjectList();
       await this._QueryData();
     },
+    async _QueryClassList2() {
+      const { data, status, info } = await this.$request.pClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryClassList() {
       const { data, status, info } = await this.$request.pClassList();
       if (status === 0) {
@@ -6,7 +6,7 @@
       </template>
       <template slot="btns">
         <el-tooltip
-          v-if="!code"
+          v-if="!code && gdClass"
           effect="dark"
           content="已归档试卷"
           placement="bottom"
@@ -499,6 +499,7 @@ import BusEvent from &quot;@/utils/busEvent&quot;;
 export default {
   data() {
     return {
+      gdClass: 0, //已归档班级数量
       tableMaxHeight: 300,
       code: "",
       role: "",
@@ -535,6 +536,7 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
+    this._QueryClassList2();
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -551,6 +553,7 @@ export default {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
       that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      that._QueryClassList2();
       await that._QueryClassList();
       if (!that.query.classId) {
         return;
@@ -704,6 +707,18 @@ export default {
       // await this.setDate(1);
       this._QueryData();
     },
+    async _QueryClassList2() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryClassList() {
       const fetchClassList =
         this.role == "ROLE_BANZHUREN"
@@ -42,6 +42,7 @@
             class="sel sel3"
             v-model="query.operationType"
             placeholder="选择类型"
+            @change="(page = 1), _QueryData(1)"
           >
             <el-option label="全部" value=""></el-option>
             <el-option label="发卡" :value="0"></el-option>
@@ -184,6 +185,14 @@
  
 <script>
 import { downloadFile, formatDate } from "utils";
+const defauleQuery = {
+  classId: "",
+  studentName: "",
+  studentCode: "",
+  operationType: "",
+  startDay: "",
+  endDay: "",
+};
 export default {
   data() {
     return {
@@ -291,36 +300,26 @@ export default {
       let query = {};
       if (this.role == "ROLE_XUEXIAO") {
         delete query.schoolId;
-        query.gradeName = this.query.gradeName;
         if (type == 1) {
-          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
           this.query.studentCode = "";
           this.query.studentName = "";
+          query = {...this.query}
+          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         } else if (type == 2) {
-          query.studentName = this.query.studentName;
-          this.query.classId = "";
-          this.query.studentCode = "";
+          this.query = {...defauleQuery,studentName:this.query.studentName}
+          query = { ...this.query }
         } else if (type == 3) {
-          query.studentCode = this.query.studentCode;
-          this.query.classId = "";
-          this.query.studentName = "";
+          this.query = {...defauleQuery,studentCode:this.query.studentCode}
+          query = { ...this.query }
         } else {
           query = { ...this.query };
           query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         }
       } else if (this.role == "ROLE_JITUAN") {
-        query = this.query.schoolId
-          ? {
-              schoolId: this.query.schoolId,
-            }
-          : {};
-        if (type != 1) {
-          this.query.operationType
-            ? (query["operationType"] = this.query.operationType)
-            : "";
-          this.query.startDay ? (query["startDay"] = this.query.startDay) : "";
-          this.query.endDay ? (query["endDay"] = this.query.endDay) : "";
-        }
+        query.schoolId = this.query.schoolId;
+        query.operationType = this.query.operationType;
+        query.startDay = this.query.startDay;
+        query.endDay = this.query.endDay;
       }
       return query;
     },
@@ -342,12 +341,15 @@ export default {
       }
     },
     async downExl() {
-      let query = {};
-      this.query.operationType
-        ? (query["operationType"] = this.query.operationType)
-        : "";
-      this.query.startDay ? (query["startDay"] = this.query.startDay) : "";
-      this.query.endDay ? (query["endDay"] = this.query.endDay) : "";
+      let query = { ...this.query };
+      if (this.role == "ROLE_XUEXIAO") {
+        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+        delete query.schoolId;
+      } else if (this.role == "ROLE_JITUAN") {
+        delete query.classId;
+        delete query.studentName;
+        delete query.studentCode;
+      }
       //报表导出
       if (this.exportLoading == true) return;
       this.exportLoading = true;
@@ -4,27 +4,39 @@
       <template slot="title">
         <span>设备管理</span>
       </template>
-      <template slot="btns" v-if="role == 'ROLE_XUEXIAO' && type == 1">
-        <el-tooltip effect="dark" content="设备导入" placement="bottom">
+      <template slot="btns">
+        <el-tooltip effect="dark" content="导出报表" placement="bottom">
           <el-button
+            v-if="tableData.length"
             type="primary"
-            icon="el-icon-upload2"
             size="mini"
             plain
             circle
-            @click="diaUp = true"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="添加基站" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-receiving"
-            size="mini"
-            plain
-            circle
-            @click="addDev"
+            icon="fa fa-cloud-download"
+            @click="downExl"
           ></el-button>
         </el-tooltip>
+        <template v-if="role == 'ROLE_XUEXIAO' && type == 1">
+          <el-tooltip effect="dark" content="设备导入" placement="bottom">
+            <el-button
+              type="primary"
+              icon="el-icon-upload2"
+              size="mini"
+              plain
+              circle
+              @click="diaUp = true"
+            ></el-button>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="添加基站" placement="bottom">
+            <el-button
+              type="primary"
+              icon="el-icon-receiving"
+              size="mini"
+              plain
+              circle
+              @click="addDev"
+            ></el-button> </el-tooltip
+        ></template>
       </template>
     </back-box>
     <div>
@@ -96,7 +108,10 @@
                 >
               </div>
             </div>
-            <el-table :data="tableData" border style="width: 100%">
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
+            <el-table v-else :data="tableData" border style="width: 100%">
               <el-table-column
                 prop="sn"
                 label="设备编码"
@@ -272,7 +287,10 @@
                 >
               </div>
             </div>
-            <el-table :data="tableData" border style="width: 100%">
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
+            <el-table v-else :data="tableData" border style="width: 100%">
               <el-table-column
                 prop="sn"
                 label="设备编码"
@@ -376,7 +394,11 @@
                 >
               </div>
             </div>
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
             <el-table
+              v-else
               ref="multipleTable"
               :data="tableData"
               border
@@ -389,7 +411,11 @@
                 label="设备编码"
                 align="center"
               ></el-table-column>
-              <el-table-column prop="class" label="关联班级" align="center" width="100"
+              <el-table-column
+                prop="class"
+                label="关联班级"
+                align="center"
+                width="100"
                 ><template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
@@ -435,7 +461,7 @@
                 align="center"
                 width="80"
               ></el-table-column>
-              <el-table-column label="状态" align="center"  width="80"
+              <el-table-column label="状态" align="center" width="80"
                 ><template slot-scope="scope">
                   {{
                     scope.row.onlineStatus == 1
@@ -445,8 +471,8 @@
                       : "离线"
                   }}
                 </template></el-table-column
-               >
-              <el-table-column label="自动更新" align="center"  width="100"
+              >
+              <el-table-column label="自动更新" align="center" width="100"
                 ><template slot-scope="scoped">
                   <el-switch
                     v-model="scoped.row.upgradeFlag"
@@ -469,16 +495,6 @@
           >
           </el-pagination>
         </div>
-        <p class="down" v-if="tableData.length">
-          <el-button
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            @click="downExl"
-            >导出报表</el-button
-          >
-        </p>
       </div>
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
@@ -718,6 +734,10 @@ export default {
       that.query.onlineStatus = "";
       that.query.sn = "";
       that.query.type = "";
+      if (this.role == "ROLE_XUEXIAO") {
+        this._QueryDataSchool();
+      }
+      this._QueryGradeList();
       that.stationReport();
       that._QueryData();
     }
@@ -1149,7 +1169,6 @@ export default {
     },
     // 设备列表信息
     async _QueryData(isRef) {
-      this.loading = true;
       let query = this.setQuery();
       if (isRef) {
         this.page = 1;
@@ -1248,6 +1267,12 @@ export default {
   }
   .table-box {
     padding: 20px 20px 0;
+    .loading {
+      text-align: center;
+      line-height: 36px;
+      font-size: 16px;
+      color: #666;
+    }
     .answer-header {
       padding: 0;
       margin-bottom: 12px;
@@ -310,6 +310,7 @@
           </el-col>
         </el-form-item>
         <el-form-item
+          v-if="formAddCount.roleId != 2"
           label="选择管辖范围："
           :prop="
             permissionLevel(formAddCount.roleId) == 5 ? 'regionId' : 'schoolId'
@@ -717,6 +718,8 @@ export default {
         } else {
           query = { ...this.query };
         }
+        delete query.roleId;
+      }else{
         delete query.schoolId;
       }
       return query;
@@ -115,7 +115,7 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="修改年级信息" :visible.sync="diaGrade" width="400">
+    <el-dialog title="修改年级信息" :visible.sync="diaGrade" width="800px">
       <el-form
         class="form-box"
         :model="formGrade"
@@ -124,7 +124,7 @@
       >
         <el-form-item label="科目：" prop="subjectNames">
           <div class="subject-box" :class="showAll ? 'active' : ''">
-            <span class="showAll" @click="showAll = !showAll">{{
+            <span v-show="subjectList.length > 12" class="showAll" @click="showAll = !showAll">{{
               showAll ? "收起" : "更多..."
             }}</span>
             <el-checkbox-group v-model="formGrade.subjectNames">
@@ -527,9 +527,10 @@ export default {
       if (status === 0) {
         this.$message.success("归档成功");
         this.classList.splice(index, 1);
-        this.setClass(this.classList[index]);
+        this.classDetail(this.classList[index]);
         this._QueryArchivedNum();
-        this.diaClass = false;
+
+        this._QueryData(3);
       } else {
         this.$message.error(info);
       }
@@ -604,7 +604,8 @@ export default {
           classId: [
             this.classList.find(
               (items) =>
-                items.value == item.classId || items.label == item.className
+                items.value == item.classId ||
+                items.label.includes(item.className)
             ).grade,
             item.classId,
           ],
@@ -617,7 +618,8 @@ export default {
           classId: [
             this.classList.find(
               (items) =>
-                items.value == item.classId || items.label == item.className
+                items.value == item.classId ||
+                items.label.includes(item.className)
             ).value,
             item.subjectName,
           ],
@@ -760,7 +762,7 @@ export default {
           data.list.map((item) => {
             return {
               value: item.id,
-              label: item.className,
+              label: `${item.className}（${item.gradeName}）`,
               grade: item.grade,
               gradeName: item.gradeName,
               children: gradeSubList[item.gradeName],
@@ -5,7 +5,7 @@
         <span>单卷分析</span>
       </template>
     </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime && status">
+    <div class="tips" v-if="paperModifyLog.modifiedTime && !status ">
       <p class="tips-p">
         <i class="fa fa-bell-o"></i>
         {{
@@ -6,7 +6,7 @@
       </template>
       <template slot="btns">
         <el-tooltip
-          v-if="!code"
+          v-if="!code && gdClass"
           effect="dark"
           content="已归档试卷"
           placement="bottom"
@@ -505,6 +505,7 @@ export default {
   data() {
     return {
       code: "",
+      gdClass: 0, //已归档班级数量
       exportLoading: false,
       tableMaxHeight: 300,
       role: "",
@@ -543,6 +544,7 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
+    this._QueryClassList2();
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -559,18 +561,19 @@ export default {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
       // if (that.$route.path == "/test") {
-        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      that._QueryClassList2();
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
       // }
     });
   },
@@ -752,6 +755,18 @@ export default {
       await this._QuerySubjectList();
       await this._QueryData();
     },
+    async _QueryClassList2() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryClassList() {
       const fetchClassList =
         this.role == "ROLE_BANZHUREN"