From 76eb1bf66ec67186d81dc54e575bbe04cd86b938 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Mon, 6 Mar 2023 15:57:13 +0800
Subject: [PATCH] 授课端版本管理，学生画像接口联调

---
 src/api/apis/answerSheet.js             |   4 +---
 src/api/apis/apis.js                    |  89 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
 src/api/apis/ask.js                     |  22 ----------------------
 src/api/apis/role.js                    |  11 -----------
 src/api/urls/apis.js                    |   9 +++++----
 src/api/urls/ask.js                     |   7 -------
 src/api/urls/role.js                    |   6 ------
 src/components/setAnswer.vue            |   2 +-
 src/views/admin/clientVersion/index.vue |  84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
 src/views/layout/header/header.vue      |   1 +
 src/views/personal/setUp/student.vue    |  17 ++++++++---------
 src/views/portrait/detail.vue           | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 src/views/standard/ask/index.vue        |   2 +-
 src/views/standard/test/index.vue       |   4 ++--
 14 files changed, 199 insertions(+), 159 deletions(-)
 delete mode 100644 src/api/apis/ask.js
 delete mode 100644 src/api/apis/role.js
 delete mode 100644 src/api/urls/ask.js
 delete mode 100644 src/api/urls/role.js

diff --git a/src/api/apis/answerSheet.js b/src/api/apis/answerSheet.js
index fca1ed0..2785dfa 100644
--- a/src/api/apis/answerSheet.js
+++ b/src/api/apis/answerSheet.js
@@ -1,4 +1,3 @@
-
 import service from "../axios"
 import answerSheet from "../urls/answerSheet"
 
@@ -99,5 +98,4 @@ export default {
       data
     })
   },
-}
-
+}
\ No newline at end of file
diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 7cd5ae0..cdec95f 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -337,7 +337,22 @@ export default {
       responseType: 'arraybuffer',
     });
   },
-
+  //  任课老师-查询学生列表
+  tStudentList(data) {
+    return service({
+      url: setUpUrls.tStudentList,
+      method: "POST",
+      data
+    });
+  },
+   //任课老师-学生测练统计
+   tStudentExamReport(data) {
+    return service({
+      url: setUpUrls.tStudentExamReport,
+      method: "POST",
+      data,
+    });
+  },
 
   // 查询角色列表
   roleList(data) {
@@ -1180,105 +1195,105 @@ export default {
     });
   },
 
-   /** 平台管理 */
-   //账户管理
-   tenantPage(data) {
+  /** 平台管理 */
+  //账户管理
+  tenantPage(data) {
     return service({
       url: setUpUrls.tenantPage,
       method: "POST",
       data
     });
   },
-   //修改账号
-   updateTenant(data) {
+  //修改账号
+  updateTenant(data) {
     return service({
       url: setUpUrls.updateTenant,
       method: "POST",
       data
     });
   },
-   //新增租户账号
-   addTenant(data) {
+  //新增租户账号
+  addTenant(data) {
     return service({
       url: setUpUrls.addTenant,
       method: "POST",
       data
     });
   },
-   //授课端版本管理
-   versionPage(data) {
+  //授课端版本管理
+  versionPage(data) {
     return service({
       url: setUpUrls.versionPage,
       method: "POST",
       data
     });
   },
-   //新增授课端版本
-   addVersion(data) {
+  //新增授课端版本
+  addVersion(data) {
     return service({
       url: setUpUrls.addVersion,
       method: "POST",
       data
     });
   },
-   //删除授课端版本
-   delVersion(data) {
+  //删除授课端版本
+  delVersion(data) {
     return service({
       url: setUpUrls.delVersion,
       method: "POST",
       data
     });
   },
-   //基站统计数据
-   pStationReport(data) {
+  //基站统计数据
+  pStationReport(data) {
     return service({
       url: setUpUrls.pStationReport,
       method: "POST",
       data
     });
   },
-   //答题器统计数据
-   pKeyboardReport(data) {
+  //答题器统计数据
+  pKeyboardReport(data) {
     return service({
       url: setUpUrls.pKeyboardReport,
       method: "POST",
       data
     });
   },
-   //查询设备列表
-   pDeviceList(data) {
+  //查询设备列表
+  pDeviceList(data) {
     return service({
       url: setUpUrls.pDeviceList,
       method: "POST",
       data
     });
   },
-   //查询设备详情
-   pDeviceDetail(data) {
+  //查询设备详情
+  pDeviceDetail(data) {
     return service({
       url: setUpUrls.pDeviceDetail,
       method: "POST",
       data
     });
   },
-   //查询设备日志列表
-   pDeviceLogList(data) {
+  //查询设备日志列表
+  pDeviceLogList(data) {
     return service({
       url: setUpUrls.pDeviceLogList,
       method: "POST",
       data
     });
   },
-   //班级名册导入
-   studentTemplateUrl(data) {
+  //班级名册导入
+  studentTemplateUrl(data) {
     return service({
       url: setUpUrls.studentTemplateUrl,
       method: "POST",
       data
     });
   },
-   //班级名册导出
-   exportStudent(data) {
+  //班级名册导出
+  exportStudent(data) {
     return service({
       url: setUpUrls.exportStudent,
       method: "POST",
@@ -1286,32 +1301,32 @@ export default {
       responseType: 'arraybuffer',
     });
   },
-   //上传图片
-   puploadImg(data) {
+  //上传图片
+  puploadImg(data) {
     return service({
       url: setUpUrls.uploadImg,
       method: "POST",
       data,
     });
   },
-   //学生测练统计
-   studentExamReport(data) {
+  //学生测练统计
+  pStudentExamReport(data) {
     return service({
-      url: setUpUrls.studentExamReport,
+      url: setUpUrls.pStudentExamReport,
       method: "POST",
       data,
     });
   },
-   //查询最新的授课端应用版本
-   pLatestVersion(data) {
+  //查询最新的授课端应用版本
+  pLatestVersion(data) {
     return service({
       url: setUpUrls.pLatestVersion,
       method: "POST",
       data,
     });
   },
-   //载指定版本授课端
-   pGetAppDownloadUrl(data) {
+  //载指定版本授课端
+  pGetAppDownloadUrl(data) {
     return service({
       url: setUpUrls.pGetAppDownloadUrl,
       method: "POST",
diff --git a/src/api/apis/ask.js b/src/api/apis/ask.js
deleted file mode 100644
index 345d578..0000000
--- a/src/api/apis/ask.js
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import service from "../axios"
-import askUrls from "../urls/login"
-
-export default {
-  // 随堂问列表
-  fetchQuizList(data) {
-    return service({
-      url: askUrls.quizList,
-      method: 'POST',
-      data
-    })
-  },
-  // 随堂问详情
-  quizDetail(data) {
-    return service({
-      url: askUrls.quizDetail,
-      method: 'POST',
-      data
-    })
-  },
-}
diff --git a/src/api/apis/role.js b/src/api/apis/role.js
deleted file mode 100644
index c7422b3..0000000
--- a/src/api/apis/role.js
+++ /dev/null
@@ -1,11 +0,0 @@
-
-import service from "../axios"
-import roleUrls from "../urls/role"
-
-export default {
-  // 获取权限列表
-  fetchGetRoleList () {
-    return service.post(roleUrls.getRoleList)
-  },
-}
-
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 598ea81..31affdc 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -79,9 +79,10 @@ export default {
   exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",
   //任课老师-导出单卷测练报表
   exportExamReport: "/api_html/teaching/exportExamReport",
-
-
-
+  //任课老师-查询学生列表
+  tStudentList: "/api_html/teaching/studentList",
+  //任课老师-学生测练统计
+  tStudentExamReport: "/api_html/teaching/studentExamReport",
 
 
   // 查询角色列表
@@ -334,7 +335,7 @@ export default {
   // 班级名册导出
   exportStudent: "/api_html/personal/exportStudent",
   // 学生测练统计
-  studentExamReport: "/api_html/personal/studentExamReport",
+  pStudentExamReport: "/api_html/personal/studentExamReport",
   //   查询最新的授课端应用版本
   pLatestVersion: "/api_html/personal/latestVersion",
   //   载指定版本授课端
diff --git a/src/api/urls/ask.js b/src/api/urls/ask.js
deleted file mode 100644
index 50ce0d2..0000000
--- a/src/api/urls/ask.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-export default {
-  // 随堂问列表
-  quizList: "/web/quizList",
-  // 随堂问详情
-  quizDetail: "/web/quizDetail",
-}
diff --git a/src/api/urls/role.js b/src/api/urls/role.js
deleted file mode 100644
index a9aeaba..0000000
--- a/src/api/urls/role.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export default {
-  // 获取角色列表
-  getRoleList: "/permissions/getRoleList",
-}
-
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index e6dd83a..36171ff 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -137,7 +137,7 @@
               >,</span
             >
           </template>
-          <template v-if="formAns.qusType == 2" class="answer-box">
+          <template v-if="formAns.qusType == 2">
             <span
               class="answer-s active"
               v-for="option in formAns.answerOptions.split(',')"
diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue
index 6c1f3a5..b37b1bb 100644
--- a/src/views/admin/clientVersion/index.vue
+++ b/src/views/admin/clientVersion/index.vue
@@ -35,6 +35,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
+          width="80"
           prop="versionNumber"
           label="版本号"
           align="center"
@@ -49,19 +50,19 @@
           prop="fileSize"
           label="文件大小"
           align="center"
-        ></el-table-column>
+        ><template slot-scope="scoped">{{setSize(scoped.row.fileSize)}}</template></el-table-column>
         <el-table-column
           prop="description"
           label="更新描述"
           align="center"
         ></el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <!-- <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scoped">
             <el-popconfirm title="确定删除吗？" @confirm="remove(scoped.row)">
               <span class="del" slot="reference">删除</span>
             </el-popconfirm>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <div class="pagination-box">
         <el-pagination
@@ -88,6 +89,16 @@
         ref="formAdd"
         label-width="160px"
       >
+        <el-form-item label="应用名称：" prop="versionName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入应用名称"
+              v-model.trim="formAdd.appName"
+              maxlength="30"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
         <el-form-item label="版本名称：" prop="versionName">
           <el-col :span="12">
             <el-input
@@ -158,23 +169,31 @@ export default {
       diaAdd: false,
       tableData: [],
       formAdd: {
+        appName: "",
         versionName: "",
         versionNumber: "",
         appImage: "",
+        md5: "",
+        fileSize: "",
         filePath: "",
+        incrementMd5: "",
+        incrementFileSize: "",
         incrementFilePath: "",
         description: "",
       },
       ruleAdd: {
+        appName: [
+          { required: true, message: "请输入应用名称", trigger: "blur" },
+        ],
         versionName: [
           { required: true, message: "请输入版本名称", trigger: "blur" },
         ],
         filePath: [
           { required: true, message: "请上传全量文件包", trigger: "blur" },
         ],
-        incrementFilePath: [
-          { required: true, message: "请上传增量文件包", trigger: "blur" },
-        ],
+        // incrementFilePath: [
+        //   { required: true, message: "请上传增量文件包", trigger: "blur" },
+        // ],
       },
       page: 1,
       size: 20,
@@ -185,13 +204,14 @@ export default {
     this._QueryData();
   },
   methods: {
+    setSize(size){
+      let fileSize = (size/1024/1224).toFixed(2)
+      return `${fileSize}MB`
+    },
     openAddDia() {
-      this.formAdd.versionName = "";
-      this.formAdd.versionNumber = "";
-      this.formAdd.appImage = "";
-      this.formAdd.filePath = "";
-      this.formAdd.incrementFilePath = "";
-      this.formAdd.description = "";
+      for (let key in this.formAdd) {
+        this.formAdd[key] = "";
+      }
       this.diaAdd = true;
     },
     changePage(page) {
@@ -213,26 +233,36 @@ export default {
       this.formAdd.appImage = res.data.resId;
     },
     appfilesSuccess(res) {
-      this.formAdd.filePath = res.data;
+      this.formAdd.md5 = res.data.md5;
+      this.formAdd.fileSize = res.data.size;
+      this.formAdd.filePath = res.data.resId;
     },
     addfilesSuccess(res) {
-      this.formAdd.incrementFilePath = res.data;
+      this.formAdd.incrementMd5 = res.data.md5;
+      this.formAdd.incrementFileSize = res.data.size;
+      this.formAdd.incrementFilePath = res.data.resId;
     },
     async save() {
-      if (this.addLoading) return;
-      this.addLoading = true;
-      const { data, status, info } = await this.$request.addVersion({
-        ...this.formAdd,
-      });
+      this.$refs.formAdd.validate(async (valid) => {
+        if (valid) {
+          if (this.addLoading) return;
+          this.addLoading = true;
+          const { data, status, info } = await this.$request.addVersion({
+            ...this.formAdd,
+          });
 
-      this.addLoading = false;
-      if (status === 0) {
-        this.diaAdd = false;
-        this.$message.success("添加成功～");
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
+          this.addLoading = false;
+          if (status === 0) {
+            this.diaAdd = false;
+            this.$message.success("添加成功～");
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("必填项不能为空，请检查。");
+        }
+      });
     },
     async _QueryData() {
       this.loading = true;
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index 68fa70c..61838fe 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -180,6 +180,7 @@ export default {
         if (data) {
           window.location.href = data;
         } else {
+          localStorage.setItem("token","")
           this.$store.commit("setToken", "");
           this.$store.commit("setInfo", {});
           this.$store.commit("setRouters", []);
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
index 942d7a1..6ccdc85 100644
--- a/src/views/personal/setUp/student.vue
+++ b/src/views/personal/setUp/student.vue
@@ -166,7 +166,7 @@
               <el-checkbox
                 v-for="item in subjectList"
                 :label="item"
-                :key="item.id"
+                :key="item"
                 >{{ item }}</el-checkbox
               >
             </el-checkbox-group>
@@ -195,11 +195,7 @@
       </div>
     </el-dialog>
     <el-dialog title="学生导入" :visible.sync="diaUp" width="600">
-      <up-load
-        :url="url"
-        @upSuccess="upSuccess"
-        fileName="学生模板"
-      >
+      <up-load :url="url" @upSuccess="upSuccess" fileName="学生模板">
         <p class="down-txt" slot="down">
           通过Excel名单导入学生模板，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -364,7 +360,10 @@ export default {
     async _QuerySubject() {
       const { data, status, info } = await this.$request.pSubjectList();
       if (status === 0) {
-        this.subjectList = [...data.subjectNames] || [];
+        this.subjectList =
+          data?.subjectNames.map((item) => {
+            return item.subjectName;
+          }) || [];
       } else {
         this.$message.error(info);
       }
@@ -435,7 +434,7 @@ export default {
 
     async _QueryClass() {
       const { data, status, info } = await this.$request.pClassList({
-        needStudentCount:1
+        needStudentCount: 1,
       });
       if (status === 0) {
         this.classList = [...data.list] || [];
@@ -462,7 +461,7 @@ export default {
       let data = await this.$request.exportStudent();
       this.loadingDown = false;
       if (data) {
-         let blob = new Blob([data], {
+        let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",
         });
         downloadFile(`学生名单.xlsx`, blob);
diff --git a/src/views/portrait/detail.vue b/src/views/portrait/detail.vue
index e4def47..1a10a22 100644
--- a/src/views/portrait/detail.vue
+++ b/src/views/portrait/detail.vue
@@ -8,6 +8,20 @@
     <div class="answer-header">
       <div class="sel-box">
         <el-select
+          v-if="role == 'ROLE_JIAOSHI'"
+          class="sel"
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
           class="sel"
           multiple
           v-model="query.subjectNames"
@@ -145,6 +159,7 @@ export default {
   components: { radarChart, lineChart },
   data() {
     return {
+      role: "",
       id: "",
       studentName: "",
       studentCode: "",
@@ -184,11 +199,18 @@ export default {
     };
   },
   async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     this.id = this.$route.query.id;
     this.classId = this.$route.query.classId;
     this.studentCode = this.$route.query.studentCode;
     this.studentName = this.$route.query.studentName;
-    this.subjectNames = this.$route.query.subjectNames?.split(",") || [];
+    if (this.role != "ROLE_JIAOSHI") {
+      this.subjectNames = this.$route.query.subjectNames?.split() || [];
+    } else {
+      this.subjectNames = this.$route.query.subjectNames;
+    }
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -285,7 +307,11 @@ export default {
       }
     },
     async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.pSubjectList({
+      let subjectList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.tSubjectList;
+      const { data, status, info } = await subjectList({
         classId: this.classId,
       });
       if (status === 0) {
@@ -296,22 +322,30 @@ export default {
               label: item,
             };
           }) || [];
-        this.subjectList.unshift({
-          value: "全部",
-          label: "全部",
-        });
-        if (this.subjectNames.length == 0) {
-          this.query.subjectNames.push(this.subjectList[0]?.value);
+        if (this.role != "ROLE_JIAOSHI") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          if (this.subjectNames.length == 0) {
+            this.query.subjectNames.push(this.subjectList[0]?.value);
+          } else {
+            this.query.subjectNames = [...this.subjectNames];
+          }
+          this.type =
+            this.query.subjectNames.length > 1
+              ? 1
+              : this.query.subjectNames[0] == "全部" &&
+                this.subjectList.length != 2
+              ? 1
+              : 2;
         } else {
-          this.query.subjectNames = [...this.subjectNames];
+          if (!this.subjectNames) {
+            this.query.subjectNames = this.subjectList[0]?.value;
+          } else {
+            this.query.subjectNames = this.subjectNames;
+          }
         }
-        this.type =
-          this.query.subjectNames.length > 1
-            ? 1
-            : this.query.subjectNames[0] == "全部" &&
-              this.subjectList.length != 2
-            ? 1
-            : 2;
       } else {
         this.$message.error(info);
       }
@@ -326,21 +360,29 @@ export default {
       }
       delete query.subjectNames;
       let subjectNames;
-      if (
-        this.query.subjectNames.length == 1 &&
-        this.query.subjectNames[0] == "全部"
-      ) {
-        subjectNames = this.subjectList
-          .filter((item) => {
-            return item.value != "全部";
-          })
-          .map((item) => {
-            return item.value;
-          });
+      if (this.role != "ROLE_JIAOSHI") {
+        if (
+          this.query.subjectNames.length == 1 &&
+          this.query.subjectNames[0] == "全部"
+        ) {
+          subjectNames = this.subjectList
+            .filter((item) => {
+              return item.value != "全部";
+            })
+            .map((item) => {
+              return item.value;
+            });
+        } else {
+          subjectNames = [...this.query.subjectNames];
+        }
       } else {
-        subjectNames = [...this.query.subjectNames];
+        subjectNames = [this.query.subjectNames];
       }
-      const { data, status, info } = await this.$request.studentExamReport({
+      let studentExamReport =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pStudentExamReport
+          : this.$request.tStudentExamReport;
+      const { data, status, info } = await studentExamReport({
         studentId: this.id,
         subjectNames: subjectNames,
         ...query,
diff --git a/src/views/standard/ask/index.vue b/src/views/standard/ask/index.vue
index 31bb92d..80fd0ec 100644
--- a/src/views/standard/ask/index.vue
+++ b/src/views/standard/ask/index.vue
@@ -769,7 +769,7 @@ export default {
       this.loading = false;
       if (status === 0) {
         this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data.count;
+        this.total = data?.count || 0;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index d40d18e..c2a9617 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="main" class="page-container" :class="dialogVisible ? 'active' : ''">
+  <div ref="main" class="page-container">
     <back-box>
       <template slot="title">
         <span>即时测-数据报表</span>
@@ -788,7 +788,7 @@ export default {
       this.loading = false;
       if (status === 0) {
         this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data.count;
+        this.total = data?.count || 0;
       } else {
         this.$message.error(info);
       }
--
libgit2 0.21.4