diff --git a/src/router/index.js b/src/router/index.js
index 3f11df4..9303689 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -68,22 +68,22 @@ let defaultRouter = [
       }
     ]
   },
-  {
-    path: "/setUpConglomerate",
-    iconCls: "fa fa-building", // 图标样式class
-    name: "学校管理",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/setUpConglomerate",
-        iconCls: "fa fa-building",
-        name: '集团管理',
-        component: SetUpConglomerate,
-        children: []
-      },
-    ]
-  },
+  // {
+  //   path: "/setUpConglomerate",
+  //   iconCls: "fa fa-building", // 图标样式class
+  //   name: "学校管理",
+  //   component: Layout,
+  //   alone: true,
+  //   children: [
+  //     {
+  //       path: "/setUpConglomerate",
+  //       iconCls: "fa fa-building",
+  //       name: '集团管理',
+  //       component: SetUpConglomerate,
+  //       children: []
+  //     },
+  //   ]
+  // },
   {
     path: "/404",
     component: NotFound,
@@ -113,6 +113,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "添加答题卡",
         component: ExaminationPaperAdd,
+        parent:"examinationPaper",
         children: []
       },
       {
@@ -120,6 +121,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "修改答题卡",
         component: ExaminationPaperEdit,
+        parent:"examinationPaper",
         children: []
       },
       {
@@ -127,6 +129,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "已归档答题卡",
         component: ExaminationPaperRecycle,
+        parent:"examinationPaper",
         children: []
       },
     ]
@@ -151,6 +154,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "随堂问报表分析",
         component: AskAnalysis,
+        parent:"ask",
         children: []
       }
     ]
@@ -174,6 +178,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "即时测报表分析",
         component: TestAnalysis,
+        parent:"test",
         children: []
       }
 
@@ -292,6 +297,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-list-alt", // 图标样式class
         name: "",
         component: DeviceLog,
+        parent:"device",
         children: []
       }
     ]
@@ -331,6 +337,7 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "", // 图标样式class
         name: "授课端软件",
         component: DownClient,
+        parent:"down",
         children: []
       }
     ]
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index fe01dcb..23acb2d 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -48,15 +48,17 @@
         </li>
       </ul>
     </div>
-    <div class="edit-dia" v-show="dialogVis" height="100%">
+    <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%">
       <div class="back">
         <div class="back-l" @click="dialogVis = false">
           <i class="fa fa-mail-reply-all"></i>
-          <p>参数设置</p>
+          <p>
+            {{ `${type == 1 ? "参数设置" : formData.configName + "-修改入口"}` }}
+          </p>
         </div>
       </div>
       <div class="form-box">
-        <el-form :model="formData" label-width="180px">
+        <el-form :model="formData" :rules="ruleForm" label-width="180px">
           <el-form-item label="主菜单设置：" prop="configName" v-if="type == 1">
             <el-col :span="12">
               <el-input
@@ -153,14 +155,14 @@
               <el-radio :label="2">老师选择</el-radio>
             </el-radio-group>
             <el-input-number
-             v-show="formData.viesAnswerSet != 2"
+              v-show="formData.viesAnswerSet != 2"
               size="small"
               class="count-down"
               v-model="formData.countdown"
               :step="1"
               :step-strictly="true"
-            ></el-input-number
-            > <span v-show="formData.viesAnswerSet != 2">秒</span>
+            ></el-input-number>
+            <span v-show="formData.viesAnswerSet != 2">秒</span>
           </el-form-item>
           <el-form-item label="抽答设置：" prop="ballotAnswerSet">
             <el-radio-group v-model="formData.ballotAnswerSet">
@@ -337,56 +339,56 @@ export default {
         configName: [
           { required: true, message: "请填写配置名称", trigger: "blur" },
         ],
-        mainMenu: [
-          { required: true, message: "请选择主菜单", trigger: "blur" },
-        ],
-        popupMenu: [
-          { required: true, message: "请选择弹出菜单", trigger: "blur" },
-        ],
-        viesAnswerSet: [
-          { required: true, message: "请选择抢答类型", trigger: "blur" },
-        ],
-        countdown: [
-          { required: true, message: "请输入抢答倒计时", trigger: "blur" },
-        ],
-        ballotAnswerSet: [
-          { required: true, message: "请选择抽答类型", trigger: "blur" },
-        ],
-        singleChoiceNum: [
-          {
-            required: true,
-            message: "请输入单选题选项默认个数",
-            trigger: "blur",
-          },
-        ],
-        multipleChoiceNum: [
-          {
-            required: true,
-            message: "请输入多选题选项默认个数",
-            trigger: "blur",
-          },
-        ],
-        singleTypeNum: [
-          {
-            required: true,
-            message: "请输入测—单题型默认题数",
-            trigger: "blur",
-          },
-        ],
-        displayModel: [
-          {
-            required: true,
-            message: "请选择答题结构",
-            trigger: "blur",
-          },
-        ],
-        languageSet: [
-          {
-            required: true,
-            message: "请选择语言",
-            trigger: "blur",
-          },
-        ],
+        // mainMenu: [
+        //   { required: true, message: "请选择主菜单", trigger: "blur" },
+        // ],
+        // popupMenu: [
+        //   { required: true, message: "请选择弹出菜单", trigger: "blur" },
+        // ],
+        // viesAnswerSet: [
+        //   { required: true, message: "请选择抢答类型", trigger: "blur" },
+        // ],
+        // countdown: [
+        //   { required: true, message: "请输入抢答倒计时", trigger: "blur" },
+        // ],
+        // ballotAnswerSet: [
+        //   { required: true, message: "请选择抽答类型", trigger: "blur" },
+        // ],
+        // singleChoiceNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入单选题选项默认个数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // multipleChoiceNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入多选题选项默认个数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // singleTypeNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入测—单题型默认题数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // displayModel: [
+        //   {
+        //     required: true,
+        //     message: "请选择答题结构",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // languageSet: [
+        //   {
+        //     required: true,
+        //     message: "请选择语言",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       menuList: ["问", "测", "析"],
     };
@@ -399,6 +401,7 @@ export default {
     setConfigForm(obj) {
       let content = JSON.parse(obj.content);
       console.log(content);
+       this.formData.configName = obj.configName
       for (let key in this.formData) {
         content[key] ? (this.formData[key] = content[key]) : "";
       }
@@ -407,6 +410,9 @@ export default {
       );
       this.type = 2;
       (this.configId = obj.id), (this.dialogVis = true);
+      this.$nextTick(function () {
+        this.$refs.editDia.scrollTop = 0;
+      });
     },
     setDefaultForm() {
       for (let key in this.formData) {
@@ -518,6 +524,7 @@ export default {
 
 <style lang="scss" scoped>
 .page-container {
+  width: 100%;
   position: relative;
 }
 .page-content {
diff --git a/src/views/down/index.vue b/src/views/down/index.vue
index 5802ab5..af98c14 100644
--- a/src/views/down/index.vue
+++ b/src/views/down/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="content-box">
     <back-box>
       <template slot="title">
         <span>软件下载</span>
@@ -24,21 +24,24 @@
 
 <script>
 export default {
-  methods:{
-    links(){
+  methods: {
+    links() {
       this.$router.push({
-        path:'/downClient'
-      })
-    }
-  }
+        path: "/downClient",
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
+.content-box {
+  width: 100%;
+}
 .page-content {
-  padding: 50px;
   display: flex;
-  justify-content: center;
+  padding-top: 50px;
+  margin-left: 240px;
   .down-item {
     width: 200px;
     padding: 50px 20px;
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 42e7d3d..619ea64 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div ref="content" class="content-box">
     <back-box>
       <template slot="title">
         <span>{{ "创建答题卡" }}</span>
@@ -24,17 +24,15 @@
           label-width="140px"
         >
           <el-form-item label="答题卡名称：" prop="title">
-            <el-col :span="10"
-              ><el-input
-                type="text"
-                placeholder="请输入答题卡名称"
-                v-model.trim="form.title"
-                maxlength="30"
-                size="45"
-                show-word-limit
-              >
-              </el-input
-            ></el-col>
+            <el-input
+              type="text"
+              placeholder="请输入答题卡名称"
+              v-model.trim="form.title"
+              maxlength="30"
+              size="45"
+              show-word-limit
+            >
+            </el-input>
           </el-form-item>
           <el-form-item label="测验类型：">
             <el-select v-model="form.tagId" placeholder="选择测验类型">
@@ -312,7 +310,7 @@
               label-width="100px"
             >
               <el-form-item label="标题：" prop="questionTitle">
-                <el-col :span="12">
+                <el-col :span="20">
                   <el-input
                     v-model.trim="questionForm.questionTitle"
                     maxlength="30"
@@ -362,7 +360,7 @@
           </p>
           <ul class="questions-ul">
             <li class="sub-questions">
-               <div class="qs-num">题号</div>
+              <div class="qs-num">题号</div>
               <div class="qs-type">题型</div>
               <div class="qs-score">分数</div>
               <div class="qs-partScore">漏选得分</div>
@@ -487,6 +485,13 @@ export default {
       return Number(score).toFixed(2);
     },
   },
+  watch:{
+    step:function(){
+      this.$nextTick(function(){
+        this.$refs.content.scrollTop = 0
+      })
+    }
+  },
   data() {
     return {
       type: 1, //1-创建，2-复制答题卡
@@ -662,7 +667,7 @@ export default {
         return;
       } else {
         this.$message.error(
-          `大题名称不能为空，请检查第${valid.slice(0,-1)}大题！`
+          `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
         );
       }
     },
@@ -801,13 +806,13 @@ export default {
         this.$message.error("请填写测验名称！");
         return;
       }
-      let isRepeat = false
-      this.answerTypeList.map(item=>{
-        if(item.typeName == this.answerTypeName){
-          isRepeat = true
+      let isRepeat = false;
+      this.answerTypeList.map((item) => {
+        if (item.typeName == this.answerTypeName) {
+          isRepeat = true;
         }
-      })
-      if(isRepeat){
+      });
+      if (isRepeat) {
         this.$message.error("类型已存在请重新填写！");
         return;
       }
@@ -916,7 +921,7 @@ export default {
       });
       if (status == 0) {
         this.form.title = data.title + "_副本";
-        this.form.tagId = data.tagId===0?"":data.tagId;
+        this.form.tagId = data.tagId === 0 ? "" : data.tagId;
         this.form.subjectName = data.subjectName;
         this.form.gradeName = data.gradeName;
         this.form.examsDuration = data.examsDuration;
@@ -950,6 +955,11 @@ export default {
 .red {
   color: #f30;
 }
+.content-box{
+  width:100%;
+  height:100%;
+  overflow-y: auto;
+}
 .content {
   width: 100%;
   box-sizing: border-box;
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 12df424..899ff84 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -32,6 +32,7 @@
             <div class="qs-num">题号</div>
             <div class="qs-type">题型</div>
             <div class="qs-score">分数</div>
+             <div class="qs-partScore">漏选得分</div>
             <div class="qs-options qs-options2">选项设置</div>
           </li>
           <li
@@ -54,6 +55,20 @@
                 label="单题分值"
               ></el-input-number>
             </div>
+            <div class="qs-partScore">
+                <p v-if="subQuestions.questionType != 3">--</p>
+                <el-input-number
+                  class="number-ipt"
+                  v-else
+                  size="medium"
+                  :min="0"
+                  :precision="2"
+                  :max="subQuestions.score"
+                  :step="0.5"
+                  v-model="subQuestions.partScore"
+                  label="漏选得分"
+                ></el-input-number>
+              </div>
             <div class="qs-options qs-options2">
               <p v-if="subQuestions.questionType == 5">--</p>
               <p v-if="subQuestions.questionType == 4" class="answer-box">
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 2058357..bcccf87 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -5,7 +5,13 @@
         <span>备题组卷</span>
       </template>
       <template slot="btns">
-        <el-button type="primary" size="mini" icon="el-icon-plus" plain @click="toAdd({})">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-plus"
+          plain
+          @click="toAdd({})"
+        >
           添加答题卡</el-button
         >
       </template>
@@ -94,6 +100,7 @@
               class="clazz"
               v-for="(clazzChild, indexs) in item.classList"
               :key="clazzChild.classId"
+              :class="clazzChild.keepStatus == 1?'active':''"
               >{{
                 `${clazzChild.className}${
                   indexs != item.classList.length - 1 ? "、" : ""
@@ -358,9 +365,10 @@ export default {
       } else {
         query = { title: this.query.title };
         this.query.tagId = "";
-        this.query.subjectName = "";
+        // this.query.subjectName = "";
       }
       query.classId = this.query.classId;
+      query.subjectName = this.query.subjectName;
       for (let key in query) {
         if (!query[key]) {
           query[key] = null;
@@ -467,12 +475,10 @@ export default {
     }
     .clazz {
       font-size: 14px;
-      color: #667ffd;
       font-weight: 500;
       position: relative;
       position: relative;
-      &.active:after {
-        content: "\e79c";
+      &.active {
         color: #667ffd;
       }
       .el-icon-success {
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index bdb3f63..eff53b9 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -45,7 +45,7 @@
         <div class="nav-item item1 item-child2" @click="links('/card')">
           <img class="icon" src="../../assets/nav/card.png" alt="" />
           <p class="p1">发卡补卡</p>
-          <p class="p2">为学生办理发卡、补卡业务。</p>
+          <p class="p2">查看发卡、换卡记录信息。</p>
         </div>
         <div class="nav-item item1 item-child2" @click="links('/down')">
           <img class="icon" src="../../assets/nav/down.png" alt="" />
diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index 361df4d..e515d65 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -39,7 +39,7 @@
 
               <menu-tree :menuData="item.children"></menu-tree>
             </el-submenu>
-            <el-menu-item :index="item.path" v-else :key="item.path">
+            <el-menu-item :index="item.path" v-else :key="item.path" :class="path.includes(item.path)?'is-active':''">
               <i :class="item.iconCls ? item.iconCls : [fa, fa - file]" />
               <span slot="title">{{ item.name }}</span>
             </el-menu-item>
@@ -62,8 +62,17 @@ export default {
     // 监听浏览器直接输入路由，将此路由添加到tabnavBox
     "$route.path": function (val) {
       // this.selectmenu(val);
+      this.path = val
     },
   },
+  data(){
+    return {
+      path:""
+    }
+  },
+  created(){
+    this.path = this.$route.path
+  },
   methods: {
     selectmenu(key, indexpath) {
       // 如果不使用 elemenUI 菜单的 vue-router 的模式将用以下方式进行页面跳转 el-menu的router设置为false
@@ -183,4 +192,7 @@ $right: right;
     }
   }
 }
+:deep(.is-active){
+  color:#fff
+}
 </style>
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index e96f3f2..2e039d6 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -99,19 +99,30 @@
         label-width="160px"
       >
         <el-form-item label="科目：" prop="subjectNames">
-          <el-checkbox-group v-model="formGrade.subjectNames">
-            <el-checkbox
-              v-for="item in subjectList"
-              :label="item"
-              :key="item"
-              >{{ item }}</el-checkbox
+          <div class="subject-box" :class="showAll?'active':''">
+            <span class="showAll" @click="showAll = true" v-if="!showAll">更多...</span>
+            <el-checkbox-group v-model="formGrade.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-checkbox-group>
-         <el-col :span="8">
-            <el-input placeholder="添加科目" v-model.trim="subjectName" maxlength="30">
-            <i slot="suffix" class="el-input__icon el-icon-plus" @click="addSubjectName"></i>
-          </el-input>
-         </el-col>
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-plus"
+                @click="addSubjectName"
+              ></i>
+            </el-input>
+          </el-col>
         </el-form-item>
         <el-form-item label="班级：">
           <span v-for="(item, index) in formGrade.classList" :key="item.id">{{
@@ -163,8 +174,9 @@
         <el-form-item label="手机号码：" prop="contactPhone"
           ><el-col :span="10"
             ><el-input
-              maxlength="11"
+              type="number"
               v-model="formSchool.contactPhone"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
               placeholder="请输入联系人手机号码"
             ></el-input></el-col
         ></el-form-item>
@@ -219,6 +231,7 @@ export default {
       diaUp: false,
       diaSchool: false,
       diaGrade: false,
+      showAll:false,//修改年级科目显示
       school: {
         schoolName: "",
         managePwd: "",
@@ -250,7 +263,7 @@ export default {
           { required: true, message: "请选择科目", trigger: "blur" },
         ],
       },
-      subjectName:"",
+      subjectName: "",
       sectionsList: [
         { id: "1", name: "小学" },
         { id: "2", name: "初中" },
@@ -273,14 +286,14 @@ export default {
       this.formGrade.gradeName = obj.gradeName;
       this.diaGrade = true;
     },
-    addSubjectName(){
-      if(!this.subjectName){
-        this.$message.warning("请填写科目名称")
-        return
+    addSubjectName() {
+      if (!this.subjectName) {
+        this.$message.warning("请填写科目名称");
+        return;
       }
-      this.subjectList.push(this.subjectName)
-      this.formGrade.subjectNames.push(this.subjectName)
-      this.subjectName = ""
+      this.subjectList.push(this.subjectName);
+      this.formGrade.subjectNames.push(this.subjectName);
+      this.subjectName = "";
     },
     async editSchool() {
       if (!this.formSchool.sections.length) {
@@ -429,7 +442,7 @@ export default {
       flex-wrap: wrap;
       padding: 20px;
       .grade-item {
-        width: 300px;
+        width: calc((100% - 100px) / 3);
         margin-right: 50px;
         margin-bottom: 40px;
         box-sizing: border-box;
@@ -442,6 +455,9 @@ export default {
           transform: translate(-2px, -5px);
           box-shadow: 5px 5px 10px #888;
         }
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
       }
       .grade-name {
         font-size: 16px;
@@ -468,11 +484,32 @@ export default {
 }
 .form-box {
   margin: 0 20px;
+  .subject-box{
+    height:90px;
+    overflow:hidden;
+    position:relative;
+    &.active{
+      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{
+.el-icon-plus {
   cursor: pointer;
-  &:hover{
-    color:#667ffd
+  &:hover {
+    color: #667ffd;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index f14ca84..8b989cf 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -236,7 +236,7 @@
           prop="loginName"
         >
           <el-col :span="10">
-            <el-input maxlength="11" v-model.trim="formTeacher.loginName" />
+            <el-input type="number" moninput="if(value.length > 11) value = value.slice(0,11)"  v-model.trim="formTeacher.loginName" />
           </el-col>
         </el-form-item>
         <el-form-item v-show="isAdd || (!isAdd && setTercherType == 1)" label="教师姓名：" prop="teacherName">
@@ -736,6 +736,7 @@ export default {
       }
       &.active {
         color: #667ffd;
+        background: #eee;
       }
     }
   }