周末-飞书bug

梁保满
1 parent 277915e3
Showing 20 changed files with 247 additions and 136 deletions
src/api/apis/apis.js
src/api/axios.js
src/api/urls/apis.js
src/components/charts/scatterChart.vue
src/components/setAnswer.vue
src/router/index.js
src/views/ask/analysis.vue
src/views/ask/index.vue
src/views/device/index.vue
src/views/examinationPaper/add.vue
src/views/examinationPaper/index.vue
src/views/layout/layout.vue
src/views/login/index.vue
src/views/setUp/account.vue
src/views/setUp/school.vue
src/views/setUp/student.vue
src/views/setUp/teacher.vue
src/views/test/analysis.vue
src/views/test/editAnswer.vue
src/views/test/index.vue
@@ -282,6 +282,24 @@ export default {
       responseType: 'arraybuffer',
     });
   },
+  //任课老师-导出阶段测练报表
+  exportPhaseExamReport(data) {
+    return service({
+      url: setUpUrls.exportPhaseExamReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+  //任课老师-导出单卷测练报表
+  exportExamReport(data) {
+    return service({
+      url: setUpUrls.exportExamReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
  
  
   // 查询角色列表
@@ -39,7 +39,7 @@ service.interceptors.response.use(
       store.commit("delTokenSources", response.config.cancelToken);
     }
     if (response.status == 200) {
-      // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
+      // Cookies.set("access_token", response.data.info, { expires: 1 / 12 })
       // console.log(response.status)
       if (res.status == 999) {
         if (!location.href.includes("localhost")) {
@@ -57,7 +57,7 @@ service.interceptors.response.use(
           }
         }
       } else {
-        // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
+        // Cookies.set("access_token", response.data.info, { expires: 1 / 12 })
       }
     }
     return Promise.resolve(res);
@@ -69,6 +69,10 @@ export default {
   exportPhaseInteractiveReport: "/api_html/teaching/exportPhaseInteractiveReport",
   //任课老师-导出单课时报表
   exportPeriodReport: "/api_html/teaching/exportPeriodReport",
+  //任课老师-导出阶段测练报表
+  exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",
+  //任课老师-导出单卷测练报表
+  exportExamReport: "/api_html/teaching/exportExamReport",
  
  
  
@@ -42,9 +42,10 @@ export default {
             type: "cross",
           },
           formatter: function (params) {
+            let value = params.data.value.toFixed(2)
             return (
               params.marker +
-              ` 占比：${params.data.value}% <br>数量：${params.data.count}`
+              ` 占比：${value}% <br>数量：${params.data.count}`
             );
           },
         },
@@ -82,6 +82,7 @@
     <el-dialog
       title="批量设置答案"
       :visible.sync="diaSetAns"
+      :close-on-click-modal="false"
       width="400"
       :modal-append-to-body="false"
     >
@@ -34,13 +34,14 @@ const SetUpTeacher = () =&gt; import(&quot;@/views/setUp/teacher&quot;)
  * 重写路由的push方法
  */
 const routerPush = Router.prototype.push
-Router.prototype.push = function push (location) {
+Router.prototype.push = function push(location) {
   return routerPush.call(this, location).catch(error => error)
 }
 Vue.use(Router)
 let routeName = en.routeName
 let defaultRouter = [
-  { path: "/",
+  {
+    path: "/",
     redirect: "/index",
     hidden: true,
     children: []
@@ -97,7 +98,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "添加答题卡",
         component: ExaminationPaperAdd,
-        parent:"examinationPaper",
+        parent: "examinationPaper",
         children: []
       },
       {
@@ -105,7 +106,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "修改答题卡",
         component: ExaminationPaperEdit,
-        parent:"examinationPaper",
+        parent: "examinationPaper",
         children: []
       },
       {
@@ -113,7 +114,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "已归档答题卡",
         component: ExaminationPaperRecycle,
-        parent:"examinationPaper",
+        parent: "examinationPaper",
         children: []
       },
     ]
@@ -130,6 +131,9 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-bar-chart", // 图标样式class
         name: "",
         component: Ask,
+        meta: {
+          keepAlive: true,
+        },
         children: []
  
       },
@@ -138,7 +142,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "随堂问报表分析",
         component: AskAnalysis,
-        parent:"ask",
+        parent: "ask",
         children: []
       }
     ]
@@ -155,6 +159,9 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-pie-chart", // 图标样式class
         name: "",
         component: Test,
+        meta: {
+          keepAlive: true,
+        },
         children: []
       },
       {
@@ -162,7 +169,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "即时测报表分析",
         component: TestAnalysis,
-        parent:"test",
+        parent: "test",
         children: []
       }
  
@@ -184,7 +191,7 @@ let addrouters = [  //测试用，后续后端获取
   //     }
   //   ]
   // },
-  
+
   {
     path: "/setUpConglomerate",
     iconCls: "fa fa-building", // 图标样式class
@@ -274,6 +281,9 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-dashboard", // 图标样式class
         name: "",
         component: Device,
+        meta: {
+          keepAlive: true,
+        },
         children: []
       },
       {
@@ -281,7 +291,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-list-alt", // 图标样式class
         name: "",
         component: DeviceLog,
-        parent:"device",
+        parent: "device",
         children: []
       }
     ]
@@ -321,7 +331,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "授课端软件",
         component: DownClient,
-        parent:"down",
+        parent: "down",
         children: []
       }
     ]
@@ -347,4 +357,4 @@ let addrouters = [  //测试用，后续后端获取
 export default new Router({
   routes: defaultRouter
 })
-export {defaultRouter,addrouters}
+export { defaultRouter, addrouters }
@@ -468,7 +468,7 @@ export default {
         });
         downloadFile("随堂问-单课时报表.xlsx", blob);
       } else {
-        this.$message.error(info);
+        this.$message.error("下载失败");
       }
     },
   },
@@ -439,7 +439,7 @@
           >
           </el-pagination>
         </div>
-        <p class="down" v-if="tabIndex == 3 || tabIndex == 2">
+        <p class="down" v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length">
           <el-button
             @click="exportData"
             type="primary"
@@ -447,7 +447,7 @@
               clearable
               v-model="form.classIds"
               :options="gradeList"
-              :props="{ expandTrigger: 'hover', checkStrictly: true }"
+              :props="{ expandTrigger: 'hover'}"
               :show-all-levels="false"
             ></el-cascader>
           </el-col>
@@ -467,7 +467,7 @@
         </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="addAnswerEqu">确 定</el-button>
+        <el-button type="primary" @click="setAnswerEqu">确 定</el-button>
         <el-button @click="diaAnswerEqu = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -541,7 +541,7 @@ export default {
         sn: "",
         frequency: "",
         pairingCode: "",
-        classIds: [],
+        classIds: "",
         roomName: "",
       },
       formRules: {
@@ -615,9 +615,7 @@ export default {
     edit(obj) {
       for (let key in this.form) {
         if (key == "classIds") {
-          this.form[key] = obj.classList?.map((item) => {
-            return [item.classId];
-          });
+          this.form[key] = obj.classList[0]?.classId
         } else {
           this.form[key] = obj[key];
         }
@@ -713,7 +711,7 @@ export default {
         this.selectionTabIds = [];
         this.$message.success("开启自动更新成功");
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
     async stopUpdate(id) {
@@ -733,7 +731,7 @@ export default {
         this._QueryData(false);
         this.$message.success("关闭自动更新成功");
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
     async downExcel() {
@@ -750,16 +748,18 @@ export default {
       }
     },
  
-    // 添加设备
-    addAnswerEqu() {
+    // 修改基站
+    setAnswerEqu() {
       this.$refs.forms.validate(async (valid) => {
         if (valid) {
           if (this.loadingAnswerEqu) return;
           this.loadingAnswerEqu = true;
           let query = { ...this.form };
-          query.classIds = query.classIds.map((item) => {
-            return item[1];
-          });
+
+          // query.classIds = query.classIds.map((item) => {
+          //   return item[1];
+          // });
+          query.classIds = [query.classIds]
           const { data, status, info } = await this.$request.updateDevice({
             ...query,
           });
@@ -186,7 +186,7 @@
                   class="number-ipt"
                   size="medium"
                   :min="1"
-                  :max="100"
+                  :max="200"
                   :precision="2"
                   :step="1"
                   v-model="subQuestions.score"
@@ -308,7 +308,7 @@
         >
           <div class="dia-content">
             <el-form
-              ref="form"
+              ref="form"  
               :model="questionForm"
               :rules="questionFormRules"
               label-width="100px"
@@ -364,7 +364,7 @@
                 <el-input-number
                   v-model="questionForm.score"
                   :min="1"
-                  :max="100"
+                  :max="200"
                   :precision="2"
                   :step="1"
                   label="label"
@@ -439,7 +439,7 @@
                     class="number-ipt"
                     size="medium"
                     :min="1"
-                    :max="100"
+                    :max="200"
                     :precision="2"
                     v-model="subQuestions.score"
                     label="单题分值"
@@ -508,6 +508,7 @@
           <el-dialog
             title="批量设置答案"
             :visible.sync="diaSetAns"
+            :close-on-click-modal="false"
             width="400"
             :modal-append-to-body="false"
           >
@@ -108,6 +108,9 @@
               }}
               <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
             ></span>
+            <el-tooltip effect="dark" content="同步" placement="right">
+              <i class="icon-refresh el-icon-refresh" @click="refreshStic"></i>
+            </el-tooltip>
           </p>
           <p class="person">
             {{ item.realName }}<em class="s-line">|</em
@@ -221,6 +224,11 @@ export default {
     this._QueryTypeList();
   },
   methods: {
+    refreshStic(){
+      setTimeout(function(){
+        window.location.reload()
+      },500)
+    },
     toAdd(query) {
       let routerItem = {
         path: "/examinationPaperAdd",
@@ -499,6 +507,13 @@ export default {
         margin-right: 12px;
       }
     }
+    .icon-refresh{
+      margin-left:20px;
+      cursor: pointer;
+      &:hover{
+        color:#2e9afe
+      }
+    }
   }
 }
 .answer-header {
@@ -5,10 +5,13 @@
       <el-container>
         <layoutHeader></layoutHeader>
         <el-main id="elmain">
-          <transition name="main" mode="out-in">
-            <keep-alive>
-              <router-view></router-view>
+          <!-- <transition name="main" mode="out-in">
+            <keep-alive key="keepAlive">
+              <router-view v-if="$route.meta.keepAlive" ></router-view>
             </keep-alive>
+          </transition> -->
+          <transition name="main" mode="out-in">
+            <router-view key="not-keepAlive"></router-view>
           </transition>
         </el-main>
         <el-footer height="28px">
@@ -41,6 +44,7 @@ export default {
   },
   created() {
     // this.initRouter();
+    console.log(this.$route.meta.keepAlive)
   },
   methods: {
     initRouter() {
@@ -95,14 +95,14 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        username: "18314340313",
-        password: "Pw340313#",
+        // username: "18314340313",
+        // password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
         // password: "712576",
-        // username: "13247726488",
-        // password: "726488",
+        username: "13247726488",
+        password: "726488",
       },
       loginRules: {
         username: [
@@ -440,7 +440,7 @@ export default {
         });
         downloadFile(`账号信息.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
     openAddDia() {
@@ -412,7 +412,7 @@ export default {
         });
         downloadFile(`设备信息.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
   },
@@ -425,7 +425,7 @@ export default {
         });
         downloadFile(`设备信息.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
   },
@@ -761,9 +761,9 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",
         });
-        downloadFile(`设备信息.xlsx`, blob);
+        downloadFile(`教师名单.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
   },
@@ -131,12 +131,12 @@
             :label="item.title"
             :prop="'count' + index"
             align="center"
-            ><template slot-scope="scope"><p class="present">{{
+            ><template slot-scope="scope"><p class="persent">{{
               scope.row.questionType == "5"
                 ? ""
                 : scope.row["option" + index]
                 ? `${scope.row["option" + index]}(${
-                    scope.row["present" + index]
+                    scope.row["persent" + index]
                   })`
                 : ""
             }}</p></template>
@@ -522,7 +522,7 @@ export default {
         });
         downloadFile(`主观题模版.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
     async _QueryData() {
@@ -625,8 +625,8 @@ export default {
             if (index != 4) {
               params["count" + index] =
                 defaultArr[index]?.option != "未答" ? defaultArr[index]?.count : "";
-              params["present" + index] =
-                defaultArr[index]?.option != "未答" ? defaultArr[index]?.present : "";
+              params["persent" + index] =
+                defaultArr[index]?.option != "未答" ? defaultArr[index]?.persent : "";
               params["option" + index] =
                 defaultArr[index]?.option != "未答"
                   ? defaultArr[index]?.option == 1
@@ -639,7 +639,7 @@ export default {
             } else {
               items["title"] = "未答";
               params["count" + index] = lastOPtion.count;
-              params["present" + index] = lastOPtion.present;
+              params["persent" + index] = lastOPtion.persent;
               params["option" + index] = "?";
             }
           });
@@ -660,15 +660,23 @@ export default {
     },
     //导出
     async exportData() {
-      // if (this.exportLoading == true) return;
-      // this.exportLoading = true;
-      // const { data, status, info } = await this.$request.exportPeriodReport();
-      // this.exportLoading = false;
-      // if (data) {
-      //   downloadFile(this.title + "报表", data);
-      // } else {
-      //   this.$message.error(info);
-      // }
+      if (this.exportLoading == true) return;
+      this.exportLoading = true;
+      const data = await this.$request.exportExamReport({
+        examId:this.id
+      });
+      this.exportLoading = false;
+      if (data) {
+         let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(
+          "即时测-单卷测练报表.xlsx",
+          blob
+        );
+      } else {
+        this.$message.error("下载失败");
+      }
     },
   },
 };
@@ -706,7 +714,7 @@ div::-webkit-scrollbar-thumb {
     z-index: 10;
   }
 }
-.present{
+.persent{
   white-space: nowrap;
 }
 .error {
@@ -208,6 +208,7 @@
     </div>
     <el-dialog
       title="批量设置答案"
+      :close-on-click-modal="false"
       :visible.sync="diaSetAns"
       width="400"
       :modal-append-to-body="false"
@@ -322,99 +322,103 @@
         </div>
       </div>
       <div v-show="tabIndex == 2" v-loading="loading">
-        <el-table
-          :max-height="tableMaxHeight"
-          v-if="role == 'ROLE_JIAOSHI'"
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in answerList"
-            :key="index"
-            :label="item.title"
+        <el-empty :image-size="100" v-if="!tableData.length&&loading==false" description="没有更多数据"></el-empty>
+        <template v-if="tableData.length&&loading==false">
+          <el-table
+            :max-height="tableMaxHeight"
+            v-if="role == 'ROLE_JIAOSHI'"
+            :data="tableData"
+            border
+            style="width: 100%"
           >
             <el-table-column
-              :prop="'score' + index"
-              :label="index == 0 ? '总分' : '成绩'"
+              prop="studentCode"
+              label="学号"
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
+              fixed
             ></el-table-column>
             <el-table-column
-              :prop="'classRank' + index"
-              label="班名"
+              prop="studentName"
+              label="姓名"
+              fixed
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-else
-          :data="tableData"
-          :max-height="tableMaxHeight"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in answerList"
-            :key="index"
-            :label="item"
-          >
             <el-table-column
-              :prop="'examCount' + item"
-              label="测练数"
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
-            ></el-table-column>
+              v-for="(item, index) in answerList"
+              :key="index"
+              :label="item.title"
+            >
+              <el-table-column
+                :prop="'score' + index"
+                :label="index == 0 ? '总分' : '成绩'"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'classRank' + index"
+                label="班名"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+            </el-table-column>
+          </el-table>
+          <el-table
+            v-else
+            :data="tableData"
+            :max-height="tableMaxHeight"
+            border
+            style="width: 100%"
+          >
             <el-table-column
-              :prop="'participationCount' + item"
-              label="参与数"
+              prop="studentCode"
+              label="学号"
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
+              fixed
             ></el-table-column>
             <el-table-column
-              :prop="'score' + item"
-              label="总分"
+              prop="studentName"
+              label="姓名"
+              fixed
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
             <el-table-column
-              :prop="'classRank' + item"
-              label="班名"
               align="center"
-              :class-name="index % 2 == 0 ? 'bg' : ''"
-            ></el-table-column>
-          </el-table-column>
-        </el-table>
+              v-for="(item, index) in answerList"
+              :key="index"
+              :label="item"
+            >
+              <el-table-column
+                :prop="'examCount' + item"
+                label="测练数"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'participationCount' + item"
+                label="参与数"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'score' + item"
+                label="总分"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'classRank' + item"
+                label="班名"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+            </el-table-column>
+          </el-table>
+        </template>
       </div>
-      <p class="down" v-if="tabIndex == 2">
+      <p class="down" v-if="tabIndex == 2 && tableData.length">
         <el-button type="primary" plain round icon="fa fa-cloud-download"
+        @click="downExl"
           >导出报表</el-button
         >
       </p>
@@ -458,6 +462,7 @@ export default {
   components: { editAnswer },
   data() {
     return {
+      exportLoading:false,
       tableMaxHeight: 300,
       role: "",
       loading: false,
@@ -643,7 +648,7 @@ export default {
         });
         downloadFile(`主观题模版.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
     async changClazz() {
@@ -837,6 +842,49 @@ export default {
         this.$message.error(info);
       }
     },
+    async downExl(){
+       if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      this.exportLoading = true;
+      const data = await this.$request.exportPhaseExamReport({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(
+          "即时测-阶段测练报表.xlsx",
+          blob
+        );
+      } else {
+        this.$message.error("下载失败");
+      }
+    }
   },
 };
 </script>