平台管理员接口联调

梁保满
1 parent 21dfdeae
Showing 16 changed files with 323 additions and 295 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/router/permission.js
src/store/index.js
src/views/admin/account/index.vue
src/views/admin/clientVersion/index.vue
src/views/admin/device/index.vue
src/views/layout/header/header.vue
src/views/personal/examinationPaper/add.vue
src/views/personal/examinationPaper/edit.vue
src/views/personal/setUp/student.vue
src/views/standard/setUp/school.vue
src/views/standard/test/analysis.vue
src/views/standard/test/editAnswer.vue
src/views/standard/test/index.vue
vue.config.js
@@ -1162,4 +1162,44 @@ export default {
       data
     });
   },
+   //基站统计数据
+   pStationReport(data) {
+    return service({
+      url: setUpUrls.pStationReport,
+      method: "POST",
+      data
+    });
+  },
+   //答题器统计数据
+   pKeyboardReport(data) {
+    return service({
+      url: setUpUrls.pKeyboardReport,
+      method: "POST",
+      data
+    });
+  },
+   //查询设备列表
+   pDeviceList(data) {
+    return service({
+      url: setUpUrls.pDeviceList,
+      method: "POST",
+      data
+    });
+  },
+   //查询设备详情
+   pDeviceDetail(data) {
+    return service({
+      url: setUpUrls.pDeviceDetail,
+      method: "POST",
+      data
+    });
+  },
+   //查询设备日志列表
+   pDeviceLogList(data) {
+    return service({
+      url: setUpUrls.pDeviceLogList,
+      method: "POST",
+      data
+    });
+  },
 };
@@ -296,6 +296,18 @@ export default {
    versionPage:"/api_html/system/versionPage",
    // 新增授课端版本
    addVersion:"/api_html/system/addVersion",
+   // 基站统计数据
+   pStationReport:"/api_html/system/stationReport",
+   // 答题器统计数据
+   pKeyboardReport:"/api_html/system/keyboardReport",
+   // 查询设备列表
+   pDeviceList:"/api_html/system/deviceList",
+   // 查询设备详情
+   pDeviceDetail:"/api_html/system/deviceDetail",
+   // 查询设备日志列表
+   pDeviceLogList:"/api_html/system/deviceLogList",
    // 文件上传
    uploadApp:"/file/uploadApp",
+   // 文件上传
+   uploadImg:"/file/uploadImg",
 }
@@ -18,28 +18,7 @@ router.beforeEach((to, from, next) =&gt; {
           return item.roleName == userInfo.showRoleName;
         });
         console.log([...authorityRouterObj[0]?.authorityRouter])
-        // store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
-
-        //start 开发用，测试删除 
-        store.commit("setRouters", [
-          "setUpStudent",
-          "examinationPaper",
-          "examinationPaperAdd",
-          "examinationPaperEdit",
-          "examinationPaperRecycle",
-          "ask",
-          "askAnalysis",
-          "test",
-          "testAnalysis",
-          "portrait",
-          "dataSync",
-          "down",
-          "account",
-          "device",
-          "clientVersion"
-        ]);
-        //end
-
+        store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
         store.commit("setInfo", { ...userInfo });
         store.getters.addRouters.forEach((res) => {
           router.addRoute(res);
@@ -81,34 +81,11 @@ const store = new Vuex.Store({
             if (userInfo.permissions && userInfo.permissions.length) {
               userInfo.showRoleName = response.data.permissions[0]?.roleName;
               userInfo.showRole = response.data.permissions[0]?.role;
-              //  开发用，测试删除 
-              // userInfo.showRole = "ROLE_PERSONAL";
               commit("setToken", "isLogin");
               commit("setInfo", { ...userInfo });
               commit("setRouters", [
                 ...userInfo.permissions[0]?.authorityRouter,
               ]);
-               //start 开发用，测试删除 
-              //  commit("setRouters", [
-              //   "setUpStudent",
-              //   "examinationPaper",
-              //   "examinationPaperAdd",
-              //   "examinationPaperEdit",
-              //   "examinationPaperRecycle",
-              //   "ask",
-              //   "askAnalysis",
-              //   "test",
-              //   "testAnalysis",
-              //   "portrait",
-              //   "dataSync",
-              //   "down",
-
-              //   "account",
-              //   "device",
-              //   "clientVersion"
-              // ]);
-              //end
-
               state.addRouters.forEach((res) => {
                 router.addRoute(res);
               });
@@ -129,7 +129,7 @@
                 <el-dropdown-item :command="1">{{
                   `${scoped.row.available == 0 ? "禁用" : "启用"}`
                 }}</el-dropdown-item>
-                <el-dropdown-item :command="2">删除</el-dropdown-item>
+                <!-- <el-dropdown-item :command="2">删除</el-dropdown-item> -->
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -165,7 +165,7 @@
             </el-input>
           </el-col>
         </el-form-item>
-        <el-form-item label="密码：" prop="password">
+        <!-- <el-form-item label="密码：" prop="password">
           <el-col :span="12">
             <el-input
               placeholder="请输入密码"
@@ -174,7 +174,7 @@
             >
             </el-input>
           </el-col>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="联系人姓名：" prop="contactPerson">
           <el-col :span="12">
             <el-input
@@ -295,7 +295,7 @@ export default {
       diaCount: false,
       props: { multiple: true, checkStrictly: true },
       query: {
-        type: "",
+        versionType: "",
         available: "",
         loginName: "",
       },
@@ -304,15 +304,15 @@ export default {
       page: 1,
       size: 20,
       formCount: {
+        userId: "",
         loginName: "",
-        type: "",
         tenantName: "",
         contactPerson: "",
         contactPhone: "",
       },
       ruleCount: {
         loginName: [{ required: true, message: "请输入账号", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+        // password: [{ required: true, message: "请输入密码", trigger: "blur" }],
         contactPhone: [
           { required: true, message: "请输入联系电话", trigger: "blur" },
         ],
@@ -342,7 +342,7 @@ export default {
     };
   },
   created() {
-    // _QueryData();
+    this._QueryData();
   },
   methods: {
     openAddDia() {
@@ -359,7 +359,7 @@ export default {
       this.$refs.formAddCount.validate(async (valid) => {
         if (valid) {
           let params = { ...this.formAddCount };
-          const { data, status, info } = await this.$request.addUser({
+          const { data, status, info } = await this.$request.addTenant({
             ...params,
           });
           if (status === 0) {
@@ -377,7 +377,11 @@ export default {
     },
     setCount(obj) {
       //修改账号
-      this.formCount = { ...obj };
+      this.formCount.userId = obj.id;
+      this.formCount.loginName = obj.loginName;
+      this.formCount.tenantName = obj.tenantName;
+      this.formCount.contactPerson = obj.realName;
+      this.formCount.contactPhone = obj.phone;
       this.diaCount = true;
     },
     handleDropdownClick(value, item) {
@@ -405,8 +409,8 @@ export default {
       this.$refs.formCount.validate(async (valid) => {
         if (valid) {
           let params = { ...this.formCount };
-          params.password = encryptLoginPassword(params.password);
-          const { data, status, info } = await this.$request.tenantUpdateUser({
+          // params.password = encryptLoginPassword(params.password);
+          const { data, status, info } = await this.$request.updateTenant({
             type: 3,
             ...params,
           });
@@ -429,7 +433,7 @@ export default {
       if (type == 1) {
         query.available = obj.available == 0 ? 1 : 0;
       }
-      const { data, status, info } = await this.$request.tenantUpdateUser({
+      const { data, status, info } = await this.$request.updateTenant({
         userId: obj.id,
         type: type,
         ...query,
@@ -444,7 +448,7 @@ export default {
     async _QueryData() {
       let query = { ...this.query };
       if (query.loginName) {
-        delete query.type;
+        delete query.versionType;
         delete query.available;
       }
       this.loading = true;
@@ -150,11 +150,7 @@ export default {
       url: "/file/uploadApp",
       loading: false,
       diaAdd: false,
-      tableData: [
-        {
-          schoolName: "111",
-        },
-      ],
+      tableData: [],
       formAdd: {
         versionName: "",
         versionNumber: "",
@@ -186,7 +182,7 @@ export default {
     };
   },
   created() {
-    // this._QueryData();
+    this._QueryData();
   },
   methods: {
     openAddDia() {
@@ -20,29 +20,24 @@
               <p class="p2">基站数量</p>
             </div>
             <div class="chart">
-              <pie-chart
-                id="pieChart"
-                :params="chartData"
-              ></pie-chart>
+              <pie-chart id="pieChart" :params="chartData"></pie-chart>
             </div>
           </div>
           <div class="table-box">
             <div class="answer-header">
               <div class="sel-box">
-                <el-select
-                  class="sel"
-                  v-model="query.school"
-                  placeholder="选择学校"
-                  @change="_QueryData(true)"
+                <el-input
+                  placeholder="请输入租户"
+                  v-model="query.schoolName"
+                  class="input-with-select"
+                  @keyup.enter.native="_QueryData(true)"
                 >
-                  <el-option
-                    v-for="item in schoolList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="_QueryData(true)"
+                  ></el-button>
+                </el-input>
                 <el-input
                   placeholder="请输入租户"
                   v-model="query.sn"
@@ -140,7 +135,7 @@
           <div class="table-box">
             <div class="answer-header">
               <div class="sel-box">
-               <el-select
+                <el-select
                   class="sel"
                   v-model="query.school"
                   placeholder="选择学校"
@@ -243,8 +238,6 @@
         </div>
       </div>
     </div>
-   
-   
   </div>
 </template>
@@ -262,10 +255,9 @@ export default {
       this.page = 1;
       this.total = 0;
       this.count = 0;
-      this.query.classId = [];
       this.query.onlineStatus = "";
-      this.query.sn = "";
-      this.query.type = "";
+      this.query.schoolName = "";
+      this.query.loginName = "";
       if (val == 1) {
         this.stationReport();
       } else if (val == 2) {
@@ -281,8 +273,9 @@ export default {
       schoolList: [],
       type: 1,
       query: {
-        school: [],
-        zuhu: "",
+        schoolName: "",
+        loginName: "",
+        onlineStatus: "",
       },
       tableData: [],
       total: 0,
@@ -295,8 +288,8 @@ export default {
   },
   created() {
     this.code = localStorage.getItem("csCode") || "";
-    // this.stationReport();
-    // this._QueryData();
+    this.stationReport();
+    this._QueryData();
   },
   activated() {
     const that = this;
@@ -305,10 +298,10 @@ export default {
       that.page = 1;
       that.total = 0;
       that.count = 0;
-      that.query.school = "";
-      that.query.zuhu = "";
-      // that.stationReport();
-      // that._QueryData();
+      that.query.schoolName = "";
+      that.query.loginName = "";
+      that.stationReport();
+      that._QueryData();
     });
   },
   methods: {
@@ -327,7 +320,7 @@ export default {
     },
     // 基站统计数据
     async stationReport() {
-      const { data, status, info } = await this.$request.stationReport();
+      const { data, status, info } = await this.$request.pStationReport();
       if (status === 0) {
         this.chartData =
           data.list?.map((item) => {
@@ -349,7 +342,7 @@ export default {
     },
     // 答题器统计数据
     async keyboardReport() {
-      const { data, status, info } = await this.$request.keyboardReport();
+      const { data, status, info } = await this.$request.pKeyboardReport();
       if (status === 0) {
         this.chartData2 =
           data.list?.map((item) => {
@@ -375,71 +368,21 @@ export default {
         this.$message.error(info);
       }
     },
-    setQuery() {
-      //整理传参
-      let query = {};
-      if (this.query.sn) {
-        query.sn = this.query.sn;
-      } else {
-        if (this.type == 1) {
-          this.query.onlineStatus !== ""
-            ? (query.onlineStatus = this.query.onlineStatus)
-            : "";
-        } else if (this.type == 2) {
-          this.query.type !== "" ? (query.type = this.query.type) : "";
-        }
-        query.regionIds = [];
-        query.schoolIds = [];
-        query.gradeNames = [];
-        query.classIds = [];
-        this.query.classId?.map((item) => {
-          if (item.length == 1) {
-            if (!query.regionIds.includes(item[0])) {
-              query.regionIds.push(item[0]);
-            }
-          } else if (item.length == 2) {
-            if (!query.schoolIds.includes(item[1])) {
-              query.schoolIds.push(item[1]);
-            }
-            query.regionIds.includes(item[0])
-              ? query.regionIds.remove(item[0])
-              : "";
-          } else if (item.length == 3) {
-            if (!query.schoolIds.includes(item[1])) {
-              query.schoolIds.push(item[1]);
-            }
-            if (!query.gradeNames.includes(item[2])) {
-              query.gradeNames.push(item[2]);
-            }
-            query.regionIds.includes(item[0])
-              ? query.regionIds.remove(item[0])
-              : "";
-          } else if (item.length == 4) {
-            if (!query.classIds.includes(item[3])) {
-              query.classIds.push(item[3]);
-            }
-            query.regionIds.includes(item[0])
-              ? query.regionIds.remove(item[0])
-              : "";
-            query.schoolIds.includes(item[1])
-              ? query.schoolIds.remove(item[1])
-              : "";
-            query.gradeNames.includes(item[2])
-              ? query.gradeNames.remove(item[2])
-              : "";
-          }
-        });
-
-        delete query.classId;
-      }
-      return query;
-    },
     // 设备列表信息
     async _QueryData(isRef) {
       this.loading = true;
-      let query = {...this.query};
-      if(query.zuhu){
-        delete query.school
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key]) {
+          query[key] = this.query[key];
+        }
+      }
+      if (query.loginName) {
+        delete query.schoolName;
+        delete query.onlineStatus;
+      } else if (query.schoolName) {
+        delete query.loginName;
+        delete query.onlineStatus;
       }
       if (isRef) {
         this.page = 1;
@@ -465,12 +408,6 @@ export default {
         this.total = data.count;
         this.$nextTick(function () {
           this.$refs.main.scrollTop = 0;
-          if (this.query.classId.length) {
-            this.selectionTabIds = this.tableData.map((item) => {
-              this.$refs.multipleTable.toggleRowSelection(item);
-              return item.id;
-            });
-          }
         });
       } else {
         this.$message.error(info);
@@ -39,7 +39,6 @@
             <img :src="avatar" />
             <div class="txt">
               <p>{{ `${this.$store.getters.info.name}` }}</p>
-              <p>管理员</p>
             </div>
           </div>
         </li>
@@ -130,6 +129,11 @@ export default {
       2000,
       { leading: true, trailing: false }
     ),
+    linkToUserInfo() {
+      this.$router.push({
+        path:'/userInfo'
+      })
+    },
     collapse() {
       this.isCollapse = !this.isCollapse;
       this.$store.dispatch("collapse");
@@ -865,7 +865,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="知识点：">
-              <el-select v-model="stem.tag" placeholder="选择知识点">
+              <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>
@@ -929,7 +929,7 @@ export default {
       stem: {
         src: "", //题干图片地址
         type: 0, //题目难度
-        tag: 0, //知识点
+        tag: [], //知识点
       },
       type: 1, //1-创建，2-复制答题卡
       dialogVisible: false, //测验类型设置弹窗
@@ -144,7 +144,7 @@
                       circle
                       size="small"
                       icon="el-icon-tickets"
-                      @click="openStem(subQuestions,1)"
+                      @click="openStem(subQuestions, 1)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="题目打标" placement="top">
@@ -153,7 +153,7 @@
                       circle
                       size="small"
                       icon="el-icon-price-tag"
-                       @click="openTag(subQuestions)"
+                      @click="openTag(subQuestions)"
                     ></el-button>
                   </el-tooltip>
                   <el-tooltip
@@ -166,7 +166,7 @@
                       circle
                       size="small"
                       icon="el-icon-upload"
-                      @click="openStem(subQuestions,2)"
+                      @click="openStem(subQuestions, 2)"
                     ></el-button>
                   </el-tooltip>
                 </div>
@@ -270,6 +270,35 @@
                 </template>
               </p>
             </div>
+            <div class="qs-set">
+              <el-tooltip effect="dark" content="上传提干" placement="top">
+                <el-button
+                  type="primary"
+                  circle
+                  size="small"
+                  icon="el-icon-tickets"
+                  @click="openStem(subQuestions, 1)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip effect="dark" content="题目打标" placement="top">
+                <el-button
+                  type="primary"
+                  circle
+                  size="small"
+                  icon="el-icon-price-tag"
+                  @click="openTag(subQuestions)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip effect="dark" content="上传题目解析" placement="top">
+                <el-button
+                  type="primary"
+                  circle
+                  size="small"
+                  icon="el-icon-upload"
+                  @click="openStem(subQuestions, 2)"
+                ></el-button>
+              </el-tooltip>
+            </div>
           </div>
         </li>
       </ul>
@@ -336,7 +365,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(',')"
@@ -362,19 +391,25 @@
           <el-button @click="diaSetAns = false">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :title="upLoadType==1?'上传题干':'上传题目解析'" :visible.sync="dialogStem" width="500">
+      <el-dialog
+        :title="upLoadType == 1 ? '上传题干' : '上传题目解析'"
+        :visible.sync="dialogStem"
+        width="500"
+      >
         <div>
           <img class="stem-pic" :src="stem.src" alt="" />
           <el-upload
             class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
+            action="/file/uploadImg"
             :limit="1"
             :with-credentials="true"
             :on-success="upSuccess"
             :on-error="upError"
             accept="image/*"
           >
-            <el-button size="small" type="primary">{{stem.src?"重新上传":"选择照片"}}</el-button>
+            <el-button size="small" type="primary">{{
+              stem.src ? "重新上传" : "选择照片"
+            }}</el-button>
           </el-upload>
         </div>
         <div slot="footer">
@@ -383,29 +418,27 @@
       </el-dialog>
       <el-dialog title="题目打标" :visible.sync="dialogTag" width="500">
         <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>
-          </el-form-item>
-          <el-form-item label="知识点：">
-            <el-select v-model="stem.tag" 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>
-          </el-form-item>
+          <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>
+            </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>
+            </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="dialogTag = false">确 定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -419,11 +452,11 @@ export default {
     return {
       dialogStem: false,
       dialogTag: false,
-      upLoadType:1,
+      upLoadType: 1,
       stem: {
         src: "", //题干图片地址
         type: 0, //题目难度
-        tag: 0, //知识点
+        tag: [], //知识点
       },
       title: "",
       type: 1,
@@ -475,8 +508,8 @@ export default {
     this._QueryDetail();
   },
   methods: {
-    openStem(obj,type) {
-      this.upLoadType = type
+    openStem(obj, type) {
+      this.upLoadType = type;
       this.stem = { ...this.stem, obj };
       this.dialogStem = true;
     },
@@ -1081,7 +1114,7 @@ export default {
     }
   }
 }
-.upload-demo{
+.upload-demo {
   text-align: center;
 }
 .stem-pic {
@@ -83,7 +83,6 @@
     <el-dialog title="添加学生" :visible.sync="diaStu" width="400">
       <el-form
         ref="formBox"
-        class="form-box"
         :model="formStu"
         :rules="rulesStu"
         label-width="160px"
@@ -148,15 +147,32 @@
             <el-input maxlength="30" v-model.trim="formClass.className" />
           </el-col>
         </el-form-item>
-        <el-form-item label="入学年份：" prop="intoSchoolYear">
-          <el-col :span="10">
-            <el-date-picker
-              v-model="formClass.intoSchoolYear"
-              type="year"
-              value-format="yyyy"
-              placeholder="选择年"
+        <el-form-item label="科目：" prop="subjectNames">
+          <div class="subject-box" :class="showAll ? 'active' : ''">
+            <span class="showAll" @click="showAll = !showAll">{{
+              showAll ? "收起" : "更多..."
+            }}</span>
+            <el-checkbox-group v-model="formClass.subjectNames">
+              <el-checkbox
+                v-for="item in subjectList"
+                :label="item"
+                :key="item"
+                >{{ item }}</el-checkbox
+              >
+            </el-checkbox-group>
+          </div>
+          <el-col :span="8">
+            <el-input
+              placeholder="添加科目"
+              v-model.trim="subjectName"
+              maxlength="30"
             >
-            </el-date-picker>
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-plus"
+                @click="addSubjectName"
+              ></i>
+            </el-input>
           </el-col>
         </el-form-item>
       </el-form>
@@ -192,15 +208,16 @@ import { downloadFile, getBlob } from &quot;@/utils&quot;;
 export default {
   data() {
     return {
-      diaUp: false,
-      url: "/api_html/school/manager/importStudentClicker",
-      diaStu: false,
-      diaClass: false,
       loading: false,
+      diaUp: false,//导入弹窗
+      url: "/api_html/school/manager/importStudentClicker",
+      diaStu: false,//添加学生
+      diaClass: false,//添加-修改班级
+      showAll: false, //修改年级科目显示
       query: {
         classId: "",
       },
-      formStu: {
+      formStu: {//添加学生信息
         className: "",
         studentName: "",
         studentCode: "",
@@ -216,29 +233,32 @@ export default {
           { required: true, message: "请输入学生长学号", trigger: "blur" },
         ],
       },
-      formClass: {
+      formClass: {//添加班级信息
         classId: "",
         className: "",
-        intoSchoolYear: "",
+        subjectNames: [],
       },
       rulesClass: {
         className: [
           { required: true, message: "请输入班级名称", trigger: "blur" },
         ],
       },
-      classList: [],
-      studentList: [],
+      classList: [],//班级列表
+      studentList: [],//学生列表
+      subjectList: [],//科目列表
+      subjectName: "",//添加科目名称
     };
   },
   async created() {
     // await this._QueryClass();
+    // this._QuerySubject();
     // this._QueryData();
   },
   methods: {
     addClass() {
       this.formClass.classId = "";
       this.formClass.className = "";
-      this.formClass.intoSchoolYear = "";
+      this.formClass.subjectNames = [];
       this.diaClass = true;
     },
     openAddDia() {
@@ -257,16 +277,28 @@ export default {
     setClass(obj) {
       this.formClass.classId = obj.id;
       this.formClass.className = obj.className;
-      this.formClass.intoSchoolYear = obj.intoSchoolYear + "";
+      this.formClass.subjectNames = obj.subjectNames;
       this.diaClass = true;
     },
+    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.formClass.subjectNames.push(this.subjectName);
+      this.subjectName = "";
+    },
     saveClass() {
       this.$refs.formClass.validate(async (valid) => {
         if (valid) {
           const { data, status, info } = await this.$request.updateClass({
             classId: this.formClass.classId,
             className: this.formClass.className,
-            intoSchoolYear: this.formClass.intoSchoolYear,
+            subjectNames: this.formClass.subjectNames,
           });
           if (status === 0) {
             this.$message.success("修改成功");
@@ -315,6 +347,14 @@ export default {
       this.diaUp = false;
       this._QueryData();
     },
+    async _QuerySubject() {
+      const { data, status, info } = await this.$request.pSubjectList();
+      if (status === 0) {
+        this.subjectList = [...data.subjectNames] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downExcel() {
       this.loadingDown = true;
       let { data, info, status } =
@@ -523,4 +563,34 @@ export default {
     }
   }
 }
+.form-box {
+  .subject-box {
+    padding-right:50px;
+    max-height: 90px;
+    overflow: hidden;
+    position: relative;
+    &.active {
+      max-height: auto;
+      overflow: auto;
+    }
+    .showAll {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
+      font-size: 12px;
+      color: #7f7f7f;
+      cursor: pointer;
+      padding: 2px;
+      &:hover {
+        color: #667ffd;
+      }
+    }
+  }
+  .el-icon-plus {
+    cursor: pointer;
+    &:hover {
+      color: #667ffd;
+    }
+  }
+}
 </style>
 \ No newline at end of file
@@ -230,7 +230,7 @@ export default {
   },
   data() {
     return {
-      code: "",
+      code: "",//长水跳转标志
       loading: false,
       url: "xxx",
       diaUp: false,
@@ -246,7 +246,7 @@ export default {
         tenantName: "",
       },
       tableData: [],
-      formSchool: {
+      formSchool: {//修改学校
         sections: "",
         managePwd: "",
         contactPerson: "",
@@ -264,7 +264,7 @@ export default {
           },
         ],
       },
-      formGrade: {
+      formGrade: {//修改年级
         gradeName: "",
         subjectNames: [],
         classList: [],
@@ -297,14 +297,14 @@ export default {
       this._QueryDataSchool();
       this._QueryDataGrade();
     },
-    setGrade(obj) {
+    setGrade(obj) {//打开年级设置
       this.formGrade.subjectNames = obj.subjectNames;
       this.formGrade.classList = obj.classList;
       this.formGrade.gradeName = obj.gradeName;
       this.showAll = false;
       this.diaGrade = true;
     },
-    addSubjectName() {
+    addSubjectName() {//添加科目
       if (!this.subjectName) {
         this.$message.warning("请填写科目名称");
         return;
@@ -316,7 +316,7 @@ export default {
       this.formGrade.subjectNames.push(this.subjectName);
       this.subjectName = "";
     },
-    editSchool() {
+    editSchool() {//保存修改学校信息
       if (!this.formSchool.sections.length) {
         this.$message.error("请选择学段！");
         return;
@@ -349,7 +349,7 @@ export default {
         }
       });
     },
-    async editGrade() {
+    async editGrade() {//保存修改年级信息
       if (!this.formGrade.subjectNames.length) {
         this.$message.error("请选择科目！");
         return;
@@ -371,7 +371,7 @@ export default {
         this.$message.error(info);
       }
     },
-    async _QueryDataSchool() {
+    async _QueryDataSchool() {//学校详情
       this.loading = true;
       const { data, status, info } = await this.$request.schoolDetail();
       this.loading = false;
@@ -513,19 +513,6 @@ export default {
       this.page = page;
       this.examQuestionReport();
     },
-    async downExcel() {
-      let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.id,
-      });
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`主观题模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
     async _QueryData() {
       this.examDetail();
       this.examStudentReport();
@@ -679,6 +666,19 @@ export default {
         this.$message.error("下载失败");
       }
     },
+    async downExcel() {
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.id,
+      });
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
   },
 };
 </script>
@@ -285,7 +285,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(',')"
@@ -373,7 +373,7 @@ export default {
       }
       return tit;
     },
-    setBigNum(num) {
+    setBigNum(num) {//转题号格式
       let txt = "";
       let bigNum = [
         "一",
@@ -401,28 +401,6 @@ export default {
       return txt;
     },
-    // keydownAnswer(event) {
-    //   //快速答案设置禁止输入
-    //   if (
-    //     event.key == "Meta" ||
-    //     event.key == "CapsLock" ||
-    //     event.key == "Shift" ||
-    //     event.key == "Enter" ||
-    //     event.key == "Alt" ||
-    //     event.key == "Backspace" ||
-    //     event.key == "Delete" ||
-    //     event.key == "ArrowUp" ||
-    //     event.key == "ArrowDown" ||
-    //     event.key == "ArrowLeft" ||
-    //     event.key == "v" ||
-    //     event.key == "V" ||
-    //     event.key == "ArrowRight"
-    //   ) {
-    //     return;
-    //   } else {
-    //     event.returnValue = "";
-    //   }
-    // },
     keydownAnswer(event, type) {
       let answerA = "ABCDEFG";
       let answer_a = "abcdefg";
@@ -450,7 +428,7 @@ export default {
         event.returnValue = "";
       }
     },
-    setAllAnswer(event, type) {
+    setAllAnswer(event, type) {//批量设置答案输入格式化答案
       let str = this.formAns.answerList;
       let str2 = checkAnswer(
         str,
@@ -460,7 +438,7 @@ export default {
       );
       this.formAns.answerList = str2;
     },
-    setAnswer(type, ans) {
+    setAnswer(type, ans) {//答案显示格式
       let txt = "";
       if (type == 2) {
         txt = ans;
@@ -471,7 +449,7 @@ export default {
       }
       return txt;
     },
-    insertTxtAndSetcursor(answerList, str) {
+    insertTxtAndSetcursor(answerList, str) {//调整重新设置答案后的光标位置
       let element = this.$refs.formAnsIpt.$el.children[0]; // 获取到指定标签
       let startPos = element.selectionStart; // 获取光标开始的位置
       if (startPos === undefined) {
@@ -487,8 +465,7 @@ export default {
         };
       }
     },
-    setMultiple(obj, answer) {
-      //多选答案设置
+    setMultiple(obj, answer) { //多选答案设置
       let resault = this.insertTxtAndSetcursor(obj.answerList || "", answer);
       obj.answerList = resault.text;
       let str = obj.answerList;
@@ -502,8 +479,7 @@ export default {
       this.$refs.formAnsIpt.$el.children[0].focus();
       this.$refs.formAnsIpt.$el.children[0].selectionStart = resault.startPos;
     },
-    changAnswer(sub, option) {
-      //设置多选答案
+    changAnswer(sub, option) {//设置多选答案
       let str = new RegExp(option, "g");
       if (sub.correctAnswer?.includes(option)) {
         sub.correctAnswer = sub.correctAnswer.replace(str, "");
@@ -513,12 +489,11 @@ export default {
         sub.correctAnswer = arrs.sort().join("");
       }
     },
-    setFormAns(indexs, index) {
-      //初始化要修改的答案
+    setFormAns(indexs, index) {//初始化要修改的答案
       if (this.questionList[0].subQuestions) {
         this.formAns = { ...this.questionList[index].subQuestions[indexs] };
         this.formAns.listIndex = index;
-         let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
+         let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置答案开始位置
         let answerList = "";
         this.questionList[index].subQuestions.map((item, subIdx) => {
           if (subIdx >= startIndex) {
@@ -530,7 +530,7 @@ export default {
     });
   },
   methods: {
-    changeSub(val) {
+    changeSub(val) {//科目改变触发事件
       let sub;
       if (val && val.length) {
         let leng = val.length - 1;
@@ -552,14 +552,14 @@ export default {
         },
       });
     },
-    uploadSJ(obj) {
+    uploadSJ(obj) {//导入开关
       this.examId = obj.id;
       this.diaUp = true;
     },
     cancel() {
       this.dialogVisible = false;
     },
-    saveSuccess() {
+    saveSuccess() {//修改答案回调
       this.dialogVisible = false;
       this._QueryData();
     },
@@ -657,21 +657,6 @@ export default {
       this.page = 1;
       this._QueryData();
     },
-    async downExcel() {
-      this.loadingDown = true;
-      let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.examId,
-      });
-      this.loadingDown = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`主观题模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
     async changClazz() {
       this.page = 1;
       await this._QuerySubjectList();
@@ -863,7 +848,7 @@ export default {
         this.$message.error(info);
       }
     },
-    async downExl() {
+    async downExl() {//报表到处
       if (this.exportLoading == true) return;
       let query = {};
       for (let key in this.query) {
@@ -907,6 +892,21 @@ export default {
         this.$message.error("下载失败");
       }
     },
+    async downExcel() {//模板下载
+      this.loadingDown = true;
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.examId,
+      });
+      this.loadingDown = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
   },
 };
 </script>
@@ -22,7 +22,8 @@ module.exports = {
     },
     proxy: {
       "/": {
-        target:"http://47.104.214.8",
+        // target:"http://47.104.214.8",
+        target:"http://121.40.127.171",
         changeOrigin: true,
         ws:true,
       },