Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/basic/view/campus.vue

@@ -7,7 +7,7 @@
         element-loading-text="机构上传中,请稍后..."
       >
         <!-- 表单 -->
-        <ecs-form-search :model="formSearch">
+        <el-form inline :model="formSearch">
           <el-form-item label="顶级机构">
             <el-select
               v-model="formSearch.parentId"
@@ -62,7 +62,9 @@
               新增
             </el-button>
           </el-form-item>
-        </ecs-form-search>
+        </el-form>
+
+        <div class="block-seperator"></div>
 
         <span>操作：</span>
         <el-button
@@ -92,7 +94,7 @@
           导入
         </el-button>
 
-        <div style="width: 100%;margin-bottom: 10px;"></div>
+        <div style="width: 100%; margin-bottom: 10px;"></div>
 
         <!-- 添加或修改学习中心弹出框 -->
         <el-dialog

src/modules/basic/view/course.vue

@@ -1112,6 +1112,10 @@ export default {
 </script>
 
 <style scoped>
+.page {
+  margin-top: 10px;
+}
+
 .input_width_lg {
   width: 180px;
 }

src/modules/basic/view/specially.vue

@@ -893,6 +893,10 @@ export default {
 </script>
 
 <style scoped>
+.page {
+  margin-top: 10px;
+}
+
 .pull_center {
   margin-left: 120px;
 }

src/modules/basic/view/user.vue

@@ -986,6 +986,10 @@ export default {
 </script>
 
 <style scoped>
+.page {
+  margin-top: 10px;
+}
+
 .input_width_lg {
   width: 180px;
 }

src/modules/portal/views/home/Home.vue

@@ -295,9 +295,3 @@ body > .el-container {
   margin-left: -20px;
 }
 </style>
-
-<style>
-.submenu-style .el-menu {
-  min-width: 100px !important;
-}
-</style>

src/modules/portal/views/home/HomeSide.vue

@@ -56,7 +56,7 @@
         >
           <router-link
             :to="{ path: menu2.ext5 }"
-            style="color: white; text-decoration: none;"
+            style="color: white; text-decoration: none; margin-left: 9px;"
             active-class="router-link-active"
           >
             {{ menu2.name }}

src/modules/questions/styles/EditPaper.css

@@ -149,4 +149,5 @@ textarea {
   padding: 2px 10px;
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   outline: none;
+  width: 210px;
 }

src/modules/questions/views/EditOtherQuestion.vue

@@ -4,10 +4,10 @@
     <section class="content" v-loading="fullscreenLoading">
       <h3 class="box-title">
         <span v-if="!quesModel.id"
-          ><LinkTitlesCustom :currentPaths="['试题新增']"
+          ><LinkTitlesCustom :currentPaths="['试题管理', '试题新增']"
         /></span>
         <span v-if="quesModel.id"
-          ><LinkTitlesCustom :currentPaths="['试题修改']"
+          ><LinkTitlesCustom :currentPaths="['试题管理', '试题修改']"
         /></span>
       </h3>
       <div class="box-body">

src/modules/questions/views/EditPaper.vue

@@ -18,11 +18,14 @@
         </div>
         <div class="paper-top-div">
           <span class="paper-top-title">试卷名称:</span>
+          <el-tooltip class="item" effect="dark" placement="top-start">
+            <div slot="content">{{ paper.name }}</div>
           <input
             class="paperName-input"
             placeholder="试卷名称"
             v-model="paper.name"
           />
+          </el-tooltip>
         </div>
         <div class="paper-top-div">
           <span class="paper-top-title">试卷难度:</span>

src/modules/questions/views/EditSelectQuestion.vue

@@ -4,10 +4,10 @@
       <!-- 头信息 -->
       <h3 class="box-title">
         <span v-if="!quesModel.id"
-          ><LinkTitlesCustom :currentPaths="['试题新增']"
+          ><LinkTitlesCustom :currentPaths="['试题管理', '试题新增']"
         /></span>
         <span v-if="quesModel.id"
-          ><LinkTitlesCustom :currentPaths="['试题修改']"
+          ><LinkTitlesCustom :currentPaths="['试题管理', '试题修改']"
         /></span>
       </h3>
       <!-- 正文信息 -->

src/modules/questions/views/GenPaperDetail.vue

@@ -612,7 +612,7 @@
           >确定</el-button
         >
         <el-button type="primary" icon="caret-left" @click="back"
-          >返回</el-button
+          ><i class="el-icon-arrow-left"></i> 返 回</el-button
         >
       </div>
     </div>
@@ -843,7 +843,6 @@ export default {
     },
     confirmGenPaper() {
       if (!this.checkGenPaper()) {
-        console.log("false");
         return false;
       } else {
         var url = "";
@@ -854,11 +853,11 @@ export default {
         } else {
           url = QUESTION_API + "/genPaper/blue";
         }
-        console.log("this.setSimpleParams():", this.setSimpleParams());
         if (!this.setSimpleParams()) {
           return;
         }
         this.fullscreenLoading = true;
+        this.genPaper.paperIds = this.selectedIds;
         this.$http.post(url, this.genPaper).then(
           response => {
             this.$notify({
@@ -1116,7 +1115,6 @@ export default {
     selectedPapers() {
       var selectedPapers = [];
       for (let paper of this.tempPapers) {
-        console.log("paper123:", paper);
         selectedPapers.push({
           id: paper.id,
           name: paper.name,
@@ -1126,16 +1124,13 @@ export default {
         });
       }
       return selectedPapers;
-    }
-  },
-  watch: {
+    },
     selectedIds() {
-      var templateIds = [];
+      var selectedIds = [];
       for (let paper of this.selectedPapers) {
-        templateIds.push(paper.id);
+          selectedIds.push(paper.id);
       }
-      this.genPaper.paperIds = templateIds;
-      return templateIds;
+      return selectedIds;
     }
   },
   created() {

src/modules/questions/views/ImportPaperInfo.vue

@@ -107,7 +107,7 @@
           </el-form-item>
         </el-row>
       </el-form>
-      <el-dialog title="错误提示" v-model="errDialog">
+      <el-dialog title="错误提示" :visible.sync="errDialog">
         <span style="font-size: large">{{ errMessage }} !</span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="errDialog = false">确定</el-button>
@@ -171,7 +171,6 @@ export default {
       });
     },
     uploadError(err) {
-      console.log(err);
       var result = err.message.match(/\{.+}/);
       var errMessage = JSON.parse(result[0]).desc;
       this.errDialog = true;

src/modules/questions/views/PropertyInfo.vue

@@ -353,7 +353,7 @@ export default {
     },
     //删除
     deleteProperty() {
-      this.$confirm("确认删除试卷吗?", "提示", {
+      this.$confirm("确认删除属性吗?", "提示", {
         type: "warning"
       }).then(() => {
         this.loading = true;