v1.3.1。细节调整

梁保满
1 parent 24f4b248
Showing 9 changed files with 192 additions and 72 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/utils/index.js
src/views/examinationPaper/add.vue
src/views/layout/layout.vue
src/views/standard/device/index.vue
src/views/standard/setUp/school.vue
src/views/standard/setUp/student.vue
src/views/standard/setUp/teacher.vue
@@ -410,6 +410,14 @@ export default {
       data,
     });
   },
+  //  删除科目
+  delSubject(data) {
+    return service({
+      url: setUpUrls.delSubject,
+      method: "POST",
+      data,
+    });
+  },
   //  修改年级信息
   updateGrade(data) {
     return service({
@@ -600,6 +608,14 @@ export default {
       data,
     });
   },
+  //  设备自动升级状态(全部)
+  modifyUpgradeFlagBySchool(data) {
+    return service({
+      url: setUpUrls.modifyUpgradeFlagBySchool,
+      method: "POST",
+      data,
+    });
+  },
   //  修改基站信息
   updateDevice(data) {
     return service({
@@ -99,6 +99,8 @@ export default {
   gradeList: "/api_html/school/manager/gradeList",
   // 查询学校所有科目
   subjectList: "/api_html/school/manager/subjectList",
+  // 删除科目
+  delSubject: "/api_html/school/manager/delSubject",
   //  修改年级信息
   updateGrade: "/api_html/school/manager/updateGrade",
   //  查询学校班级列表
@@ -148,6 +150,8 @@ export default {
   deviceLogList: "/api_html/school/manager/deviceLogList",
   //   修改设备自动升级状态
   modifyUpgradeFlag: "/api_html/school/manager/modifyUpgradeFlag",
+  //   设备自动升级状态(全部)
+  modifyUpgradeFlagBySchool: "/api_html/school/manager/modifyUpgradeFlagBySchool",
   //   修改基站信息
   updateDevice: "/api_html/school/manager/updateDevice",
   //   新增基站
@@ -412,7 +412,7 @@ export function getURLParams(variable) {
  * @param {*} questionCount 题目数目
  */
 function filtterChar(s, b, optionCount) {
-  const ms = "ABCDEFG";
+  const ms = "ABCDEFGHIJ";
   let rs = "";
   for (let i = 0; i < s.length; i++) {
     let c = s[i];
@@ -430,7 +430,7 @@ function filtterChar(s, b, optionCount) {
 }
  
 function removeDup(s) {
-  const ms = "ABCDEFG";
+  const ms = "ABCDEFGHIJ";
   let rs = "";
   for (let i = 0; i < ms.length; i++) {
     if (s.indexOf(ms[i]) >= 0) {
@@ -334,7 +334,7 @@
                       subQuestions.questionType == 3 ||
                       subQuestions.questionType == 2
                     "
-                    class="answer-box"
+                    class="answer-box answer-box2"
                   >
                     <el-button
                       size="mini"
@@ -504,7 +504,7 @@
                 <el-input-number
                   v-model="questionForm.selectNum"
                   :min="3"
-                  :max="7"
+                  :max="10"
                   :step-strictly="true"
                   :step="1"
                   label="label"
@@ -1048,7 +1048,7 @@ export default {
         { label: "判断题", value: 4 },
         { label: "主观题", value: 5 },
       ],
-      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
+      rightOptions: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"],
       addSubQuestionsType: "",
     };
   },
@@ -1345,8 +1345,8 @@ export default {
       this.diaSetAns = false;
     },
     keydownAnswer(event, type, isAddBig) {
-      let answerA = "ABCDEFG";
-      let answer_a = "abcdefg";
+      let answerA = "ABCDEFGHIJ";
+      let answer_a = "abcdefghij";
       if (isAddBig) {
         answerA = answerA.substring(0, this.questionForm.selectNum);
         answer_a = answer_a.substring(0, this.questionForm.selectNum);
@@ -1646,7 +1646,7 @@ export default {
     //添加选项
     addOptions(subQuestions) {
       let length = subQuestions.answerOptions.split(",").length;
-      if (length > 6) return;
+      if (length > 9) return;
       subQuestions.selectNum = length + 1;
       subQuestions.answerOptions = this.rightOptions
         .slice(0, subQuestions.selectNum)
@@ -1940,11 +1940,15 @@ export default {
     .answer-s {
       cursor: pointer;
       user-select: none;
+      margin-bottom: 10px;
       &:first-of-type {
         margin-left: 0;
       }
     }
   }
+  .answer-box2 {
+    margin-bottom: 10px;
+  }
   .delButton {
     text-indent: -9999999px;
     border-color: #ff6868;
@@ -2169,10 +2173,7 @@ export default {
     flex: 1;
   }
   .qs-set {
-    width: 190px;
-    .delete {
-      margin-left: 9px;
-    }
+    width: 60px;
   }
   .qs-options2 {
     text-align: left;
@@ -13,9 +13,6 @@
           <transition name="main" mode="out-in">
             <router-view v-if="!$route.meta.keepAlive" key="not-keepAlive"></router-view>
           </transition>
-          <!-- <transition name="main" mode="out-in">
-            <router-view key="not-keepAlive"></router-view>
-          </transition> -->
         </el-main>
         <el-footer height="28px">
           <Bottom></Bottom>
@@ -396,6 +396,11 @@
                   >停止自动更新</el-button
                 >
               </div>
+              <p class="upgrade-all" v-if="this.role == 'ROLE_XUEXIAO'">
+                <span>全校更新：</span>
+                <el-switch v-model="upgradeFlag" @change="changeUpdateBySchool">
+                </el-switch>
+              </p>
             </div>
             <p class="loading" v-if="!tableData.length && loading">
               加载中<i class="el-icon-loading"></i>
@@ -682,6 +687,7 @@ export default {
       page: 1,
       size: 20,
       isBack: false, //是否是日志页面回来
+      upgradeFlag: false,
     };
   },
   created() {
@@ -816,6 +822,9 @@ export default {
         return item.id;
       });
     },
+    changeUpdateBySchool: _.debounce(function (event) {
+      this._ModifyUpgradeFlagBySchool();
+    }, 800),
     changeUpdate: _.debounce(function (event, obj) {
       console.log(this);
       if (event) {
@@ -839,6 +848,18 @@ export default {
       this.isAdd = true;
       this.diaAnswerEqu = true;
     },
+    _ModifyUpgradeFlagBySchool() {
+      let data = this.$request.modifyUpgradeFlagBySchool({
+        upgradeFlag: this.upgradeFlag ? 1 : 0,
+      });
+      if (data && !data.code) {
+        this._QueryData(false);
+        this.selectionTabIds = [];
+        this.$message.success("开启自动更新成功");
+      } else {
+        this.$message.error(data.info);
+      }
+    },
     async showSchool() {
       const { data, status, info } = await this.$request.schoolList();
       if (status === 0) {
@@ -1287,6 +1308,10 @@ export default {
     .answer-header {
       padding: 0;
       margin-bottom: 12px;
+      .upgrade-all{
+        display: flex;
+        align-items: center;
+      }
     }
   }
 }
@@ -121,7 +121,7 @@
         label-width="160px"
       >
         <el-form-item label="科目：" prop="subjectNames">
-          <div class="subject-box" :class="showAll ? 'active' : ''">
+          <div class="subject-box" v-loading="subjectLoading" :class="showAll ? 'active' : ''">
             <span
               v-show="subjectList.length > 12"
               class="showAll"
@@ -129,12 +129,10 @@
               >{{ showAll ? "收起" : "更多..." }}</span
             >
             <el-checkbox-group v-model="formGrade.subjectNames">
-              <el-checkbox
-                v-for="item in subjectList"
-                :label="item"
-                :key="item"
-                >{{ item }}</el-checkbox
-              >
+              <p class="p1" v-for="(item, index) in subjectList" :key="item">
+                <el-checkbox :label="item">{{ item }}</el-checkbox>
+                <i class="el-icon-delete" @click="_DelSubject(item, index)"></i>
+              </p>
             </el-checkbox-group>
           </div>
           <el-col :span="8">
@@ -301,6 +299,7 @@ export default {
       },
       subjectName: "",
       sectionsList: [],
+      subjectLoading:false,
       subjectList: [],
       diaUpgradeGrade: false, //班级升级
       defaultSections: [],
@@ -399,6 +398,20 @@ export default {
         }
       });
     },
+    async _DelSubject(subject, index) {
+      if(this.subjectLoading)return
+      this.subjectLoading = true
+      const { status, info } = await this.$request.delSubject({
+        subjectName: subject,
+      });
+      this.subjectLoading = false
+      if (status === 0) {
+        this.$message.success(info);
+        this.subjectList.splice(index, 1);
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _UpgradeGrade() {
       this.loading = true;
       const { data, status, info } = await this.$request.upgradeGrade();
@@ -640,9 +653,6 @@ export default {
         color: #667ffd;
       }
     }
-    .el-checkbox:last-of-type {
-      margin-right: 30px;
-    }
   }
 }
 .el-icon-plus {
@@ -651,4 +661,29 @@ export default {
     color: #667ffd;
   }
 }
+:deep(.el-checkbox-group) {
+  display: flex;
+  flex-wrap: wrap;
+  .p1 {
+    padding-right: 30px;
+    position: relative;
+    &:hover {
+      .el-icon-delete {
+        display: block;
+      }
+      .is-checked + .el-icon-delete {
+        display: none;
+      }
+    }
+  }
+  .el-icon-delete {
+    font-size: 14px;
+    color: #999;
+    position: absolute;
+    right: 10px;
+    top: 13px;
+    cursor: pointer;
+    display: none;
+  }
+}
 </style>
 \ No newline at end of file
@@ -32,7 +32,34 @@
         </el-tooltip>
       </template>
     </back-box>
-
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-input
+          placeholder="请输入学生姓名"
+          v-model="query.studentName"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(1)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(1)"
+          ></el-button>
+        </el-input>
+        <el-input
+          placeholder="请输入学生学号"
+          v-model="query.studentCode"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(2)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
     <div class="page-content">
       <!-- <template v-if="!code && role !== 'ROLE_PERSONAL'">
         <p class="tips" v-show="archivedTotal">
@@ -93,34 +120,7 @@
             <p>配对码：{{ clazzDetail.pairingCode }}</p>
             <p>频点：{{ clazzDetail.frequency }}</p>
           </div>
-          <div class="answer-header">
-            <div class="sel-box">
-              <el-input
-                placeholder="请输入学生姓名"
-                v-model="query.studentName"
-                class="input-with-select"
-                @keyup.enter.native="_QueryData(1)"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="_QueryData(1)"
-                ></el-button>
-              </el-input>
-              <el-input
-                placeholder="请输入学生学号"
-                v-model="query.studentCode"
-                class="input-with-select"
-                @keyup.enter.native="_QueryData(2)"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="_QueryData(2)"
-                ></el-button>
-              </el-input>
-            </div>
-          </div>
+
           <ul class="s-ul" v-loading="loading">
             <li
               class="s-li"
@@ -134,8 +134,17 @@
               >
                 <i class="el-icon-delete" slot="reference"></i>
               </el-popconfirm>
-              <i class="el-icon-user-solid" v-if="!code" @click="openChangeClazz(item)"></i>
-              <p class="name">{{ item.studentName }}</p>
+              <i
+                class="el-icon-user-solid"
+                v-if="!code"
+                @click="openChangeClazz(item)"
+              ></i>
+              <p class="name">
+                {{ item.studentName }}
+              </p>
+              <p class="p2" v-if="!query.classId">
+                {{ getGradeName(item.grade) }}﹒{{ item.className }}
+              </p>
               <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
               <p class="p1">长学号：{{ item.studentCode }}</p>
               <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
@@ -296,7 +305,9 @@
       </div>
     </el-dialog>
     <el-dialog title="班级归档" :visible.sync="diaArchiving" width="400">
-      <p>注意班级归档后，学生解除班级关系且相关老师任课信息将不存在，确认要将班级归档吗？</p>
+      <p>
+        注意班级归档后，学生解除班级关系且相关老师任课信息将不存在，确认要将班级归档吗？
+      </p>
       <div class="dialog-footer" slot="footer">
         <el-button type="danger" @click="archivingClass">确认归档</el-button>
         <el-button type="primary" @click="diaArchiving = false"
@@ -309,6 +320,7 @@
  
 <script>
 import _ from "lodash";
+import { setGradeName } from "@/utils";
 export default {
   data() {
     return {
@@ -398,10 +410,13 @@ export default {
     this._QueryData(3);
   },
   methods: {
+    getGradeName(type) {
+      return setGradeName(type);
+    },
     openAddDia() {
-      if(!this.query.classId){
-        this.$message.warning('暂无班级信息，请导入班级！')
-        return 
+      if (!this.query.classId) {
+        this.$message.warning("暂无班级信息，请选择或导入班级！");
+        return;
       }
       this.formStu.studentName = "";
       this.formStu.studentCode = "";
@@ -503,8 +518,8 @@ export default {
       this.formStuCla.studentId = obj.id;
       this.formStuCla.studentName = obj.studentName;
       this.formStuCla.studentCode = obj.studentCode;
-      this.formStuCla.classId = this.query.classId;
-      this.formStuCla.oldClassId = this.query.classId;
+      this.formStuCla.classId = obj.classId;
+      this.formStuCla.oldClassId = obj.classId;
       this.diaChangeClass = true;
     },
     //学生调班
@@ -522,7 +537,7 @@ export default {
             if (status == 0) {
               this.diaChangeClass = false;
               this.$message.success(info);
-              this._QueryClass()
+              this._QueryClass();
               this._QueryData();
             } else {
               this.$message.error(info);
@@ -588,17 +603,19 @@ export default {
     },
     async _QueryData(type) {
       let query = {};
-      query.gradeName = this.query.gradeName;
-      query.classId = this.query.classId;
       if (type == 1) {
+        this.query.classId = "";
         query.studentName = this.query.studentName;
         this.query.studentCode = "";
       } else if (type == 2) {
+        this.query.classId = "";
         query.studentCode = this.query.studentCode;
         this.query.studentName = "";
       } else if (type == 3) {
         this.query.studentName = "";
         this.query.studentCode = "";
+        query.gradeName = this.query.gradeName;
+        query.classId = this.query.classId;
       } else {
         query = this.query;
       }
@@ -667,7 +684,7 @@ export default {
  
 <style lang="scss" scoped>
 .page-content {
-  padding: 20px;
+  padding: 0 20px;
 }
 .tips {
   display: flex;
@@ -755,7 +772,7 @@ export default {
       padding-left: 20px;
       .s-li {
         width: 180px;
-        height: 120px;
+        min-height: 120px;
         box-shadow: 2px 2px 5px #7f7f7f;
         border-radius: 10px;
         margin: 0 20px 20px 0;
@@ -805,12 +822,17 @@ export default {
           line-height: 20px;
           padding-bottom: 5px;
         }
+        .p2 {
+          color: #333;
+          line-height: 20px;
+          padding-bottom: 5px;
+        }
       }
     }
   }
   .clazz-detail {
     display: flex;
-    padding: 12px 12px 0 20px;
+    padding: 12px 12px 12px 20px;
     p {
       margin-right: 16px;
       color: #666;
@@ -53,6 +53,7 @@
             :value="item.value"
           >
           </el-option>
+          <el-option label="未分配教师" value="未分配教师"> </el-option>
         </el-select>
         <el-input
           placeholder="请输入老师姓名"
@@ -146,7 +147,9 @@
                   <i class="el-icon-delete" slot="reference"></i>
                 </el-popconfirm>
                 <div class="grade-item">
-                  <p class="grade-name">{{ item.className }}</p>
+                  <p class="grade-name">
+                    {{ gradeName(item.grade) }}-{{ item.className }}
+                  </p>
                   <div class="grade-class">
                     <p>
                       <i class="fa fa-address-book-o"></i>学生：{{
@@ -181,7 +184,9 @@
                 </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
-                    {{ item.className }}（{{ item.subjectName }}）
+                    {{ gradeName(item.grade) }}-{{ item.className }}（{{
+                      item.subjectName
+                    }}）
                   </p>
                   <div class="grade-class">
                     <p>
@@ -217,7 +222,9 @@
                 </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
-                    {{ item.gradeName }}（{{ item.subjectName }}）
+                    {{ gradeName(item.grade) }}-{{ item.gradeName }}（{{
+                      item.subjectName
+                    }}）
                   </p>
                 </div>
               </li>
@@ -364,7 +371,12 @@
 </template>
  
 <script>
-import { downloadFile, formatGradeClass, randomWord, getBlob } from "@/utils";
+import {
+  downloadFile,
+  formatGradeClass,
+  randomWord,
+  setGradeName,
+} from "@/utils";
 export default {
   data() {
     return {
@@ -440,6 +452,9 @@ export default {
     await this._QueryClass();
   },
   methods: {
+    gradeName(type) {
+      return setGradeName(type);
+    },
     upSuccess(res) {
       //导入成功
       this.$message.closeAll();
@@ -703,6 +718,11 @@ export default {
       } else if (type == 10) {
         query = { ...this.query };
       }
+      if (query.gradeName == "未分配教师") {
+        query.type = 1;
+      } else {
+        query.type = 0;
+      }
       this.loading = true;
       this.teacherList = [];
       const { data, status, info } = await this.$request.teacherList({