首页，个人信息，班级名单，部分备题组卷接口联调

梁保满
1 parent c2460294
Showing 9 changed files with 472 additions and 256 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/views/index/mainIndex.vue
src/views/personal/examinationPaper/add.vue
src/views/personal/examinationPaper/edit.vue
src/views/personal/examinationPaper/index.vue
src/views/personal/examinationPaper/recycle.vue
src/views/personal/setUp/student.vue
src/views/personal/userInfo/index.vue
@@ -795,6 +795,13 @@ export default {
   /** 个人版  */
   //  修改个人信息
+  getInfo(data) {
+    return service({
+      url: setUpUrls.getInfo,
+      method: "POST",
+      data
+    });
+  },
   modifyInfo(data) {
     return service({
       url: setUpUrls.modifyInfo,
@@ -834,6 +841,14 @@ export default {
       data
     });
   },
+  //  删除班级
+  pDelClass(data) {
+    return service({
+      url: setUpUrls.pDelClass,
+      method: "POST",
+      data
+    });
+  },
   //  增加学生
   pAddStudent(data) {
     return service({
@@ -1202,4 +1217,29 @@ export default {
       data
     });
   },
+   //班级名册导入
+   studentTemplateUrl(data) {
+    return service({
+      url: setUpUrls.studentTemplateUrl,
+      method: "POST",
+      data
+    });
+  },
+   //班级名册导出
+   exportStudent(data) {
+    return service({
+      url: setUpUrls.exportStudent,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+   //班级名册导出
+   puploadImg(data) {
+    return service({
+      url: setUpUrls.uploadImg,
+      method: "POST",
+      data,
+    });
+  },
 };
@@ -203,6 +203,8 @@ export default {
    // 个人版首页统计数据
    personalIndex:"/api_html/personal/index",
+   // 个人信息
+   getInfo:"/api_html/personal/personalInfo",
    // 修改个人信息
    modifyInfo:"/api_html/personal/modifyInfo",
    //  查询班级列表
@@ -213,6 +215,8 @@ export default {
    pStudentList:"/api_html/personal/studentList",
    //  新增或修改班级
    pSaveClass:"/api_html/personal/saveClass",
+   //  删除班级
+   pDelClass:"/api_html/personal/delClass",
    //  增加学生
    pAddStudent:"/api_html/personal/addStudent",
    //  删除学生
@@ -308,6 +312,10 @@ export default {
    pDeviceLogList:"/api_html/system/deviceLogList",
    // 文件上传
    uploadApp:"/file/uploadApp",
-   // 文件上传
+   // 图片上传
    uploadImg:"/file/uploadImg",
+   // 班级名册导入
+   studentTemplateUrl:"/api_html/personal/studentTemplateUrl",
+   // 班级名册导出
+   exportStudent:"/api_html/personal/exportStudent",
 }
@@ -163,11 +163,8 @@
           <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
           <div class="text">
             <p class="p1">备题组卷</p>
-            <p class="p2">
-              管理
-              <template v-if="dataInfo.paperCount">
-                {{ dataInfo.paperCount }}套答题卡，
-              </template>
+            <p class="p2" v-if="dataInfo.paperCount">
+              管理 {{ dataInfo.paperCount }}套答题卡，
             </p>
           </div>
         </li>
@@ -175,11 +172,8 @@
           <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
           <div class="text">
             <p class="p1">班级名单</p>
-            <p class="p2">
-              管理
-              <template v-if="dataInfo.classCount">
-                {{ dataInfo.classCount }}个班级的学生名单，
-              </template>
+            <p class="p2" v-if="dataInfo.classCount">
+              管理{{ dataInfo.classCount }}个班级的学生名单，
             </p>
           </div>
         </li>
@@ -187,11 +181,8 @@
           <img class="icon" src="../../assets/nav/device.png" alt="" />
           <div class="text">
             <p class="p1">学生画像</p>
-            <p class="p2">
-              共分析
-              <template v-if="dataInfo.stationCount"
-                >{{ dataInfo.stationCount }}名学生成绩</template
-              >
+            <p class="p2" v-if="dataInfo.stationCount">
+              共分析{{ dataInfo.stationCount }}名学生成绩
             </p>
           </div>
         </li>
@@ -199,20 +190,15 @@
           <div class="nav-item item1 item-child2" @click="links('/ask')">
             <img class="icon" src="../../assets/nav/card.png" alt="" />
             <p class="p1">随堂问报表</p>
-            <p class="p2">
-              对
-              <template v-if="dataInfo.classPeriodCount"
-                >{{ dataInfo.classPeriodCount }}套随堂问答题记录分析</template
-              >
+            <p class="p2" v-if="dataInfo.classPeriodCount">
+              对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析
             </p>
           </div>
           <div class="nav-item item1 item-child2" @click="links('/test')">
             <img class="icon" src="../../assets/nav/analysis.png" alt="" />
             <p class="p1">即时测报表</p>
-            <p class="p2">
-              对<template v-if="dataInfo.examCount"
-                >{{ dataInfo.examCount }}套即时测答题记录分析</template
-              >
+            <p class="p2" v-if="dataInfo.examCount">
+              对{{ dataInfo.examCount }}套即时测答题记录分析
             </p>
           </div>
           <div class="nav-item item1 item-child1" @click="links('/down')">
@@ -330,7 +330,7 @@
                       circle
                       size="mini"
                       icon="el-icon-tickets"
-                      @click="openStem(subQuestions, 1)"
+                      @click="openStem(subQuestions, 1, index, indexs)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="题目打标" placement="top">
@@ -339,7 +339,7 @@
                       circle
                       size="mini"
                       icon="el-icon-price-tag"
-                      @click="openTag(subQuestions)"
+                      @click="openTag(subQuestions, 3, index, indexs)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip
@@ -352,7 +352,7 @@
                       circle
                       size="mini"
                       icon="el-icon-upload"
-                      @click="openStem(subQuestions, 2)"
+                      @click="openStem(subQuestions, 2, index, indexs)"
                     ></el-button>
                   </el-tooltip>
                   <el-popconfirm
@@ -835,10 +835,10 @@
         width="500"
       >
         <div>
-          <img class="stem-pic" :src="stem.src" alt="" />
+          <img class="stem-pic" :src="stem.screenshot" alt="" />
           <el-upload
             class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
+            action="http://121.40.127.171/file/uploadImg"
             :limit="1"
             :with-credentials="true"
             :on-success="upSuccess"
@@ -858,25 +858,32 @@
         <div>
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="题目难度：">
-              <el-select v-model="stem.type" placeholder="选择题目难度">
-                <el-option label="简单" :value="0"></el-option>
-                <el-option label="正常" :value="1"></el-option>
-                <el-option label="困难" :value="2"></el-option>
+              <el-select
+                v-model="stem.difficultyFactor"
+                placeholder="选择题目难度"
+              >
+                <el-option label="简单" value="简单"></el-option>
+                <el-option label="正常" value="正常"></el-option>
+                <el-option label="困难" value="困难"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="知识点：">
-              <el-select v-model="stem.tag" multiple placeholder="选择知识点">
-                <el-option label="生字积累" :value="0"></el-option>
-                <el-option label="字词运用" :value="1"></el-option>
-                <el-option label="阅读理解" :value="2"></el-option>
-                <el-option label="作文" :value="2"></el-option>
+              <el-select
+                v-model="stem.knowledge"
+                multiple
+                placeholder="选择知识点"
+              >
+                <el-option label="生字积累" value="生字积累"></el-option>
+                <el-option label="字词运用" value="字词运用"></el-option>
+                <el-option label="阅读理解" value="阅读理解"></el-option>
+                <el-option label="写作方法" value="写作方法"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer">
           <el-button @click="dialogTag = false">取 消</el-button>
-          <el-button type="primary" @click="dialogTag = false">确 定</el-button>
+          <el-button type="primary" @click="setKnowledge">确 定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -927,9 +934,14 @@ export default {
       dialogTag: false,
       upLoadType: 1,
       stem: {
-        src: "", //题干图片地址
-        type: 0, //题目难度
-        tag: [], //知识点
+        id: "",
+        type: 1,
+        index: 0,
+        indexs: 0,
+        screenshot: "", //题干图片地址
+        answerScreenshot: "", //题干解析图片地址
+        difficultyFactor: 0, //题目难度
+        knowledge: [], //知识点
       },
       type: 1, //1-创建，2-复制答题卡
       dialogVisible: false, //测验类型设置弹窗
@@ -954,7 +966,7 @@ export default {
       ],
       rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
       addSubQuestionsType: "",
-      step: 0, //步骤
+      step: 1, //步骤
       gradeList: [], //年级
       subjectList: [], //科目
       answerTypeList: [], //测验类型
@@ -1007,28 +1019,52 @@ export default {
     }
   },
   methods: {
-    openStem(obj, type) {
+    openStem(obj, type, index, indexs) {
+      //上传截图
       this.upLoadType = type;
-      this.stem = { ...this.stem, obj };
+      this.stem.id = obj.id;
+      this.stem.type = type;
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.screenshot = type == 1 ? obj.screenshot : obj.answerScreenshot;
       this.dialogStem = true;
     },
-    openTag(obj) {
+    openTag(obj, type, index, indexs) {
+      //难度，知识点
       this.stem = { ...this.stem, obj };
+      this.stem.id = obj.id;
+      this.stem.type = type;
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.knowledge = obj.knowledge?.split(",") || [];
+      this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
     upSuccess(res) {
+      //图片上传成功
       if (res && res.status == 0) {
+        this.dialogStem = false;
+        let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot";
+        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
+          keys
+        ] = this.stem[keys];
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
       }
     },
+    setKnowledge() {
+      //保存难度、知识点
+      this.form.questionList[this.stem.index].subQuestions[
+        this.stem.indexs
+      ].knowledge = this.stem.knowledge.join(",");
+      this.form.questionList[this.stem.index].subQuestions[
+        this.stem.indexs
+      ].difficultyFactor = this.stem.difficultyFactor;
+      this.dialogTag = false;
+    },
     upError(res) {
-      if (res && res.status == 0) {
-        this.$message.error("上传失败");
-      } else {
-        this.$message.error(res.message);
-      }
+      this.$message.error("上传失败");
     },
     linkBack() {
       this.$confirm(
@@ -1605,7 +1641,7 @@ export default {
     },
     async removeTypeName(obj) {
       //删除测验类型
-      const { data, status, info } = await this.$request.pDelPaper({
+      const { data, status, info } = await this.$request.pDelPaperType({
         tagId: obj.id,
       });
       if (status == 0) {
@@ -1694,8 +1730,8 @@ export default {
         this.subjectList =
           data.subjectNames?.map((item) => {
             return {
-              value: item,
-              label: item,
+              value: item.subjectName,
+              label: item.subjectName,
             };
           }) || [];
         console.log(this.subjectList);
@@ -1986,8 +2022,8 @@ export default {
   }
   .qs-set {
     width: 190px;
-    .delete{
-      margin-left:9px;
+    .delete {
+      margin-left: 9px;
     }
   }
   .qs-options2 {
@@ -2012,7 +2048,7 @@ export default {
     }
   }
 }
-.upload-demo{
+.upload-demo {
   text-align: center;
 }
 .stem-pic {
@@ -142,18 +142,18 @@
                     <el-button
                       type="primary"
                       circle
-                      size="small"
+                      size="mini"
                       icon="el-icon-tickets"
-                      @click="openStem(subQuestions, 1)"
+                      @click="openStem(subQuestions, 1, index, indexs)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="题目打标" placement="top">
                     <el-button
                       type="primary"
                       circle
-                      size="small"
+                      size="mini"
                       icon="el-icon-price-tag"
-                      @click="openTag(subQuestions)"
+                      @click="openTag(subQuestions, 3, index, indexs)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip
@@ -164,11 +164,24 @@
                     <el-button
                       type="primary"
                       circle
-                      size="small"
+                      size="mini"
                       icon="el-icon-upload"
-                      @click="openStem(subQuestions, 2)"
+                      @click="openStem(subQuestions, 2, index, indexs)"
                     ></el-button>
                   </el-tooltip>
+                  <el-popconfirm
+                    title="确定删除这道题吗？"
+                    @confirm="delTabData(indexs, index)"
+                  >
+                    <el-button
+                      slot="reference"
+                      class="delete"
+                      type="danger"
+                      size="mini"
+                      circle
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </el-popconfirm>
                 </div>
               </div>
             </li>
@@ -275,29 +288,42 @@
                 <el-button
                   type="primary"
                   circle
-                  size="small"
+                  size="mini"
                   icon="el-icon-tickets"
-                  @click="openStem(subQuestions, 1)"
+                  @click="openStem(subQuestions, 1, indexs)"
                 ></el-button>
               </el-tooltip>
               <el-tooltip effect="dark" content="题目打标" placement="top">
                 <el-button
                   type="primary"
                   circle
-                  size="small"
+                  size="mini"
                   icon="el-icon-price-tag"
-                  @click="openTag(subQuestions)"
+                  @click="openTag(subQuestions, 3, indexs)"
                 ></el-button>
               </el-tooltip>
               <el-tooltip effect="dark" content="上传题目解析" placement="top">
                 <el-button
                   type="primary"
                   circle
-                  size="small"
+                  size="mini"
                   icon="el-icon-upload"
-                  @click="openStem(subQuestions, 2)"
+                  @click="openStem(subQuestions, 2, indexs)"
                 ></el-button>
               </el-tooltip>
+              <el-popconfirm
+                title="确定删除这道题吗？"
+                @confirm="delTabData(indexs, index)"
+              >
+                <el-button
+                  slot="reference"
+                  class="delete"
+                  type="danger"
+                  size="mini"
+                  circle
+                  icon="el-icon-delete"
+                ></el-button>
+              </el-popconfirm>
             </div>
           </div>
         </li>
@@ -397,10 +423,10 @@
         width="500"
       >
         <div>
-          <img class="stem-pic" :src="stem.src" alt="" />
+          <img class="stem-pic" :src="stem.screenshot" alt="" />
           <el-upload
             class="upload-demo"
-            action="/file/uploadImg"
+            action="http://121.40.127.171/file/uploadImg"
             :limit="1"
             :with-credentials="true"
             :on-success="upSuccess"
@@ -420,18 +446,25 @@
         <div>
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="题目难度：">
-              <el-select v-model="stem.type" placeholder="选择题目难度">
-                <el-option label="简单" :value="0"></el-option>
-                <el-option label="正常" :value="1"></el-option>
-                <el-option label="困难" :value="2"></el-option>
+              <el-select
+                v-model="stem.difficultyFactor"
+                placeholder="选择题目难度"
+              >
+                <el-option label="简单" value="简单"></el-option>
+                <el-option label="正常" value="正常"></el-option>
+                <el-option label="困难" value="困难"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="知识点：">
-              <el-select v-model="stem.tag" multiple placeholder="选择知识点">
-                <el-option label="生字积累" :value="0"></el-option>
-                <el-option label="字词运用" :value="1"></el-option>
-                <el-option label="阅读理解" :value="2"></el-option>
-                <el-option label="作文" :value="2"></el-option>
+              <el-select
+                v-model="stem.knowledge"
+                multiple
+                placeholder="选择知识点"
+              >
+                <el-option label="生字积累" value="生字积累"></el-option>
+                <el-option label="字词运用" value="字词运用"></el-option>
+                <el-option label="阅读理解" value="阅读理解"></el-option>
+                <el-option label="写作方法" value="写作方法"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -454,9 +487,14 @@ export default {
       dialogTag: false,
       upLoadType: 1,
       stem: {
-        src: "", //题干图片地址
-        type: 0, //题目难度
-        tag: [], //知识点
+        id: "",
+        type: 1,
+        index: 0,
+        indexs: 0,
+        screenshot: "", //题干图片地址
+        answerScreenshot: "", //题干解析图片地址
+        difficultyFactor: 0, //题目难度
+        knowledge: [], //知识点
       },
       title: "",
       type: 1,
@@ -508,28 +546,64 @@ export default {
     this._QueryDetail();
   },
   methods: {
-    openStem(obj, type) {
+    openStem(obj, type, index, indexs) {
+      //上传截图
       this.upLoadType = type;
-      this.stem = { ...this.stem, obj };
+      this.stem.id = obj.id;
+      this.stem.type = type;
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.screenshot = type == 1 ? obj.screenshot : obj.answerScreenshot;
       this.dialogStem = true;
     },
-    openTag(obj) {
+    openTag(obj, type, index, indexs) {
+      //难度，知识点
       this.stem = { ...this.stem, obj };
+      this.stem.id = obj.id;
+      this.stem.type = type;
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.knowledge = obj.knowledge?.split(",") || [];
+      this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
     upSuccess(res) {
+      //图片上传成功
       if (res && res.status == 0) {
+        this.dialogStem = false;
+        let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot";
+        if (typeof this.stem.indexs != undefined) {
+          this.questionList[this.stem.index].subQuestions[this.stem.indexs][
+            keys
+          ] = this.stem[keys];
+        } else {
+          this.questionList[this.stem.index][keys] = this.stem[keys];
+        }
+
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
       }
     },
-    upError(res) {
-      if (res && res.status == 0) {
-        this.$message.error("上传失败");
+    setKnowledge() {
+      //保存难度、知识点
+      if (typeof this.stem.indexs != undefined) {
+        this.questionList[this.stem.index].subQuestions[
+          this.stem.indexs
+        ].knowledge = this.stem.knowledge.join(",");
+        this.questionList[this.stem.index].subQuestions[
+          this.stem.indexs
+        ].difficultyFactor = this.stem.difficultyFactor;
       } else {
-        this.$message.error(res.message);
+        this.questionList[this.stem.index].knowledge =
+          this.stem.knowledge.join(",");
+        this.questionList[this.stem.index].difficultyFactor =
+          this.stem.difficultyFactor;
       }
+      this.dialogTag = false;
+    },
+    upError(res) {
+      this.$message.error("上传失败");
     },
     linkBack() {
       this.$router.go(-1);
@@ -1046,7 +1120,9 @@ export default {
 .el-input-number {
   width: 140px;
 }
-
+.delete {
+  margin-left: 8px;
+}
 .questions-ul {
   border-left: 1px solid #e2e2e2;
   border-top: 1px solid #e2e2e2;
@@ -232,6 +232,7 @@ export default {
     //切换班级
     async changClazz() {
       await this._QuerySubjectList();
+      this._QueryTypeList()
       this._QueryData(false);
     },
     // 查找答题卡类型
@@ -250,7 +251,7 @@ export default {
           }) || [];
         this.typeList.unshift({
           value: "",
-          label: "请选择标签",
+          label: "全部",
         });
       } else {
         this.$message.error(info);
@@ -266,7 +267,7 @@ export default {
           this.classList =
             data.list?.map((item) => {
               return {
-                value: item.classId,
+                value: item.id,
                 label: item.className,
               };
             }) || [];
@@ -86,7 +86,8 @@
         </div>
         <div class="info">
           <p class="title">
-            {{ item.title }} <span class="label" v-if="item.tag">{{ item.tag }}</span>
+            {{ item.title }}
+            <span class="label" v-if="item.tag">{{ item.tag }}</span>
           </p>
           <p class="num">
             {{ item.gradeName }}
@@ -136,7 +137,11 @@
       >
       </el-pagination>
     </div>
-    <el-empty :image-size="100" v-if="!tableData.length&&loading==false" description="没有更多数据"></el-empty>
+    <el-empty
+      :image-size="100"
+      v-if="!tableData.length && loading == false"
+      description="没有更多数据"
+    ></el-empty>
   </div>
 </template>
@@ -144,7 +149,7 @@
 export default {
   data() {
     return {
-      loading:false,
+      loading: false,
       props: { multiple: true, checkStrictly: true },
       options: [
         {
@@ -187,8 +192,8 @@ export default {
       typeList: [],
       tableData: [],
       total: 0,
-      page:1,
-      size:20
+      page: 1,
+      size: 20,
     };
   },
   async created() {
@@ -228,13 +233,13 @@ export default {
       await this._QuerySubjectList();
       this._QueryData(false);
     },
-    changePage(page){
-      this.page = page
-      this._QueryData(this.query.title)
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
     },
     async _QueryData(type) {
       //获取答题卡列表
-      this.loading=true
+      this.loading = true;
       let query = {};
       if (!type) {
         this.query.title = "";
@@ -244,7 +249,7 @@ export default {
         this.query.type = "";
         this.query.subjectId = "";
       }
-       query.classId = this.query.classId;
+      query.classId = this.query.classId;
       for (let key in query) {
         if (!query[key]) {
           query[key] = null;
@@ -252,9 +257,9 @@ export default {
       }
       const { data, status, info } = await this.$request.pPaperList({
         ...query,
-        status:2,
-        page:this.page,
-        size:this.size
+        status: 2,
+        page: this.page,
+        size: this.size,
       });
       this.loading = false;
       if (status === 0) {
@@ -270,12 +275,13 @@ export default {
       console.log(status);
       if (status === 0) {
         if (!!data.list) {
-          this.classList = data.list?.map((item) => {
-            return {
-              value: item.classId,
-              label: item.className,
-            };
-          })||[];
+          this.classList =
+            data.list?.map((item) => {
+              return {
+                value: item.id,
+                label: item.className,
+              };
+            }) || [];
           this.query.classId = this.classList[0]?.value;
         }
       } else {
@@ -288,12 +294,13 @@ export default {
         classId: this.query.classId,
       });
       if (status === 0) {
-        this.subjectList = data.subjectNames?.map((item) => {
-          return {
-            value: item,
-            label: item,
-          };
-        })||[];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
         this.query.subjectName = this.subjectList[0]?.value;
       } else {
         this.$message.error(info);
@@ -303,7 +310,7 @@ export default {
     async _QueryTypeList() {
       const { data, status, info } = await this.$request.pPaperTagList({
         classId: this.query.classId,
-        tyle:0
+        tyle: 0,
       });
       if (status === 0) {
         this.typeList =
@@ -15,6 +15,16 @@
             @click="diaUp = true"
           ></el-button>
         </el-tooltip>
+        <el-tooltip effect="dark" content="学生导出" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            plain
+            circle
+            @click="exportStudentExl"
+          ></el-button>
+        </el-tooltip>
         <el-tooltip effect="dark" content="添加班级" placement="bottom">
           <el-button
             type="primary"
@@ -156,7 +166,7 @@
               <el-checkbox
                 v-for="item in subjectList"
                 :label="item"
-                :key="item"
+                :key="item.id"
                 >{{ item }}</el-checkbox
               >
             </el-checkbox-group>
@@ -186,7 +196,6 @@
     </el-dialog>
     <el-dialog title="学生导入" :visible.sync="diaUp" width="600">
       <up-load
-        id="downTeacher"
         :url="url"
         @upSuccess="upSuccess"
         fileName="学生模板"
@@ -209,15 +218,16 @@ export default {
   data() {
     return {
       loading: false,
-      diaUp: false,//导入弹窗
-      url: "/api_html/school/manager/importStudentClicker",
-      diaStu: false,//添加学生
-      diaClass: false,//添加-修改班级
+      diaUp: false, //导入弹窗
+      url: "/api_html/personal/importStudent",
+      diaStu: false, //添加学生
+      diaClass: false, //添加-修改班级
       showAll: false, //修改年级科目显示
       query: {
         classId: "",
       },
-      formStu: {//添加学生信息
+      formStu: {
+        //添加学生信息
         className: "",
         studentName: "",
         studentCode: "",
@@ -233,7 +243,8 @@ export default {
           { required: true, message: "请输入学生长学号", trigger: "blur" },
         ],
       },
-      formClass: {//添加班级信息
+      formClass: {
+        //添加班级信息
         classId: "",
         className: "",
         subjectNames: [],
@@ -242,17 +253,20 @@ export default {
         className: [
           { required: true, message: "请输入班级名称", trigger: "blur" },
         ],
+        subjectNames: [
+          { required: true, message: "请输入科目名称", trigger: "blur" },
+        ],
       },
-      classList: [],//班级列表
-      studentList: [],//学生列表
-      subjectList: [],//科目列表
-      subjectName: "",//添加科目名称
+      classList: [], //班级列表
+      studentList: [], //学生列表
+      subjectList: [], //科目列表
+      subjectName: "", //添加科目名称
     };
   },
   async created() {
-    // await this._QueryClass();
-    // this._QuerySubject();
-    // this._QueryData();
+    await this._QueryClass();
+    this._QuerySubject();
+    this._QueryData();
   },
   methods: {
     addClass() {
@@ -295,7 +309,7 @@ export default {
     saveClass() {
       this.$refs.formClass.validate(async (valid) => {
         if (valid) {
-          const { data, status, info } = await this.$request.updateClass({
+          const { data, status, info } = await this.$request.pSaveClass({
             classId: this.formClass.classId,
             className: this.formClass.className,
             subjectNames: this.formClass.subjectNames,
@@ -324,7 +338,7 @@ export default {
         this.$message.warning("有学生的班级不能删除！");
         return;
       }
-      const { data, status, info } = await this.$request.updateClass({
+      const { data, status, info } = await this.$request.pDelClass({
         classId: this.formClass.classId,
       });
       if (status === 0) {
@@ -355,21 +369,9 @@ export default {
         this.$message.error(info);
       }
     },
-    async downExcel() {
-      this.loadingDown = true;
-      let { data, info, status } =
-        await this.$request.studentClickerTemplateUrl();
-      this.loadingDown = false;
-      if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("学生模板", res);
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
+
     async removeStu(obj, index) {
-      const { data, status, info } = await this.$request.delStudent({
+      const { data, status, info } = await this.$request.pDelStudent({
         studentId: obj.id,
       });
       if (status === 0) {
@@ -398,7 +400,7 @@ export default {
             this.$message.warning("学生姓名已存在");
             return;
           }
-          const { data, status, info } = await this.$request.addStudent({
+          const { data, status, info } = await this.$request.pAddStudent({
             classId: this.query.classId,
             ...query,
           });
@@ -419,7 +421,7 @@ export default {
     },
     async _QueryData() {
       this.loading = true;
-      const { data, status, info } = await this.$request.studentList({
+      const { data, status, info } = await this.$request.pStudentList({
         ...this.query,
       });
       this.loading = false;
@@ -432,7 +434,9 @@ export default {
     },
     async _QueryClass() {
-      const { data, status, info } = await this.$request.schoolClassList();
+      const { data, status, info } = await this.$request.pClassList({
+        needStudentCount:1
+      });
       if (status === 0) {
         this.classList = [...data.list] || [];
         this.query.classId = this.classList[0]?.id;
@@ -441,6 +445,37 @@ export default {
         this.$message.error(info);
       }
     },
+    async downExcel() {
+      this.loadingDown = true;
+      let { data, info, status } = await this.$request.studentTemplateUrl();
+      this.loadingDown = false;
+      if (status == 0) {
+        // getBlob(data.downloadUrl).then((res) => {
+        //   downloadFile("学生模板", res);
+        // });
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        a.download = data.appName;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async exportStudentExl() {
+      this.loadingDown = true;
+      let data = await this.$request.exportStudent();
+      this.loadingDown = false;
+      if (data) {
+         let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`学生名单.xlsx`, blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
   },
 };
 </script>
@@ -565,7 +600,7 @@ export default {
 }
 .form-box {
   .subject-box {
-    padding-right:50px;
+    padding-right: 50px;
     max-height: 90px;
     overflow: hidden;
     position: relative;
@@ -8,30 +8,20 @@
     <div class="page-content">
       <div class="content-box">
         <i class="el-icon-edit" @click="diaSchool = true"></i>
+        <i class="el-icon-key" @click="diaPass = true"></i>
         <ul class="school-info">
           <li class="school-item">
             <span class="s1">学校名称：</span>
-            <span class="s2">{{ school.schoolName || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">授课端管理密码：</span>
-            <span class="s2">{{ school.managePwd || "--" }}</span>
+            <span class="s2">{{ Info.tenantName || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">教师姓名：</span>
-            <span class="s2">{{ school.contactPerson || "--" }}</span>
+            <span class="s2">{{ Info.contactPerson || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">手机号码：</span>
-            <span class="s2">{{ school.contactPhone || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">科目：</span>
-            <span class="s2">{{
-              school.sections | getSections(school.sections)
-            }}</span>
+            <span class="s2">{{ Info.contactPhone || "--" }}</span>
           </li>
-        
         </ul>
       </div>
     </div>
@@ -43,16 +33,14 @@
         :rules="rulesSchool"
         label-width="160px"
       >
-        <el-form-item label="授课端管理密码：" prop="managePwd">
-          <el-col :span="10">
-            <el-input
-              maxlength="20"
-              v-model="formSchool.managePwd"
-              show-password
-              placeholder="请输入授课端管理密码"
-            ></el-input>
-          </el-col>
-        </el-form-item>
+        <el-form-item label="学校名称：" prop="tenantName"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="formSchool.tenantName"
+              placeholder="请输入教师姓名"
+            ></el-input></el-col
+        ></el-form-item>
         <el-form-item label="教师姓名：" prop="contactPerson"
           ><el-col :span="10"
             ><el-input
@@ -75,92 +63,95 @@
         <el-button @click="editSchool">确 定</el-button>
         <el-button @click="diaSchool = false">取 消</el-button>
       </div>
-    </el-dialog>  
+    </el-dialog>
+    <el-dialog title="修改密码" :visible.sync="diaPass" width="400">
+      <el-form
+        ref="formPass"
+        class="form-box"
+        :model="password"
+        :rules="rulesPassword"
+        label-width="160px"
+      >
+        <el-form-item label="旧密码：" prop="oldPassword"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.oldPassword"
+              placeholder="请输入密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="新密码：" prop="password"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.password"
+              placeholder="请输入新密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="确认密码：" prop="resetPassword"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.resetPassword"
+              placeholder="请输入新密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="editPass">确 定</el-button>
+        <el-button @click="diaPass = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { downloadFile } from "@/utils";
+import { downloadFile, encryptLoginPassword } from "@/utils";
 export default {
-  filters: {
-    getSections(val) {
-      let arr = val.split(",");
-      let sections = arr.map((item) => {
-        let txt;
-        switch (item) {
-          case "0":
-            txt = "未知";
-            break;
-          case "1":
-            txt = "小学";
-            break;
-          case "2":
-            txt = "初中";
-            break;
-          case "3":
-            txt = "高中";
-            break;
-          case "4":
-            txt = "大学";
-            break;
-          case "7":
-            txt = "未知";
-            break;
-          default:
-            txt = "未知";
-        }
-        return txt;
-      });
-      return sections.join(",");
-    },
-  },
   data() {
     return {
       loading: false,
       diaSchool: false,
-      school: {
-        schoolName: "",
-        managePwd: "",
+      diaPass: false,
+      Info: {
+        tenantName: "",
         contactPerson: "",
         contactPhone: "",
         sections: "",
       },
+      password: {
+        oldPassword: "",
+        password: "",
+        resetPassword: "",
+      },
+      rulesPassword: {
+        oldPassword: [
+          { required: true, message: "请输入旧密码", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+        ],
+        resetPassword: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+        ],
+      },
       tableData: [],
       formSchool: {
-        sections: "",
-        managePwd: "",
+        tenantName: "",
         contactPerson: "",
         contactPhone: "",
       },
-      subjectName: "",
-      subjectList: [],
+      rulesSchool: {},
     };
   },
   created() {
-    // this._QueryDataSchool();
-    // this._QuerySubject();
+    this._QueryData();
   },
   methods: {
-    addSubjectName() {
-      if (!this.subjectName) {
-        this.$message.warning("请填写科目名称");
-        return;
-      }else if(this.subjectList.includes(this.subjectName)){
-        this.$message.warning("科目已存在，请重新填写～");
-        return;
-      }
-      this.subjectList.push(this.subjectName);
-      this.subjectName = "";
-    },
     editSchool() {
-      if (!this.formSchool.sections.length) {
-        this.$message.error("请选择科目！");
-        return;
-      }
-      if (!this.formSchool.managePwd) {
-        this.$message.error("请填写密码！");
-        return;
-      }
       if (this.loading) {
         return;
       }
@@ -168,15 +159,14 @@ export default {
         if (valid) {
           this.loading = true;
           let form = { ...this.formSchool };
-          form.sections = this.formSchool.sections.join(",");
-          const { data, status, info } = await this.$request.updateSchool({
+          const { data, status, info } = await this.$request.modifyInfo({
             ...form,
           });
           this.loading = false;
           if (status === 0) {
             this.$message.success("修改成功~");
             this.diaSchool = false;
-            this._QueryDataSchool();
+            this._QueryData();
           } else {
             this.$message.error(info);
           }
@@ -185,25 +175,51 @@ export default {
         }
       });
     },
-    async _QueryDataSchool() {
+    editPass() {
+      if (this.loading) {
+        return;
+      }
+      this.$refs.formPass.validate(async (valid) => {
+        if (valid) {
+          if (this.password.password != this.password.resetPassword) {
+            this.$message.warning("两次输入密码不一致请检查！");
+            return;
+          }
+          this.loading = true;
+          const { data, status, info } = await this.$request.modifyInfo({
+            oldPassword: encryptLoginPassword(this.password.oldPassword),
+            password: encryptLoginPassword(this.password.password),
+          });
+          this.loading = false;
+          if (status === 0) {
+            this.$message.success("密码修改成功~");
+            this.diaPass = false;
+            const res = await this.$request.logout();
+            this.$store.commit("setToken", "");
+            this.$store.commit("setInfo", {});
+            this.$store.commit("setRouters", []);
+            this.$store.commit("resetTabnavBox");
+            this.$router.push({
+              path: "/login",
+            });
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    async _QueryData() {
       this.loading = true;
-      const { data, status, info } = await this.$request.schoolDetail();
+      const { data, status, info } = await this.$request.getInfo();
       this.loading = false;
       console.log(status);
       if (status === 0) {
-        this.school = { ...data };
+        this.Info = { ...data };
         for (let key in this.formSchool) {
           this.formSchool[key] = data[key] || "";
         }
-        this.formSchool.sections = this.formSchool.sections.split(",");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubject() {
-      const { data, status, info } = await this.$request.subjectList();
-      if (status === 0) {
-        this.subjectList = [...data.subjectNames] || [];
       } else {
         this.$message.error(info);
       }
@@ -235,6 +251,17 @@ export default {
     .el-icon-edit {
       position: absolute;
       top: 12px;
+      right: 40px;
+      padding: 5px;
+      font-size: 18px;
+      cursor: pointer;
+      &:hover {
+        color: #36f;
+      }
+    }
+    .el-icon-key {
+      position: absolute;
+      top: 12px;
       right: 12px;
       padding: 5px;
       font-size: 18px;