Merge remote-tracking branch 'origin/master'

src/modules/basic/view/campus.vue

@@ -228,7 +228,7 @@
           <el-table-column width="150" label="中心代码">
             <span slot-scope="scope">{{ scope.row.code }}</span>
           </el-table-column>
-          <el-table-column width="150" label="中心名称">
+          <el-table-column label="中心名称">
             <span slot-scope="scope">{{ scope.row.name }}</span>
           </el-table-column>
           <el-table-column width="100" label="负责人">
@@ -240,8 +240,29 @@
           <el-table-column width="170" label="更新时间">
             <span slot-scope="scope">{{ scope.row.updateTime }}</span>
           </el-table-column>
-          <el-table-column width="70" label="状态">
-            <span slot-scope="scope"> {{ getStatus(scope.row.enable) }} </span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column :context="_self" label="操作" width="200">
             <div slot-scope="scope">
@@ -367,14 +388,6 @@ export default {
     toExamSite(row) {
       this.$router.push({ path: "/basic/examSite/" + row.id });
     },
-    getStatus(status) {
-      if (status == true) {
-        return "启用";
-      } else if (status == false) {
-        return "禁用";
-      }
-      return status;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/course.vue

@@ -375,8 +375,29 @@
           <el-table-column label="层次">
             <span slot-scope="scope">{{ getLevel(scope.row.level) }}</span>
           </el-table-column>
-          <el-table-column label="状态" width="70">
-            <span slot-scope="scope">{{ getEnable(scope.row.enable) }}</span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column prop="updateTime" label="更新时间" width="170" />
           <el-table-column label="操作" width="260">
@@ -702,14 +723,6 @@ export default {
         this.specialtyTotal = response.data.totalElements;
       });
     },
-    getEnable(enable) {
-      if (enable == true) {
-        return "启用";
-      } else if (enable == false) {
-        return "禁用";
-      }
-      return enable;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/school.vue

@@ -249,11 +249,28 @@
         </el-table-column>
         <el-table-column prop="domainName" width="190" label="学校域名" />
         <el-table-column prop="updateTime" width="170" label="更新时间" />
-        <el-table-column width="70" label="状态">
+        <el-table-column width="50" label="状态">
           <span slot-scope="scope">
-            <!-- <el-tag :type="getTag(scope.row.enable)"> -->
-            {{ getStatus(scope.row.enable) }}
-            <!-- </el-tag> -->
+            <span v-if="scope.row.enable">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="启用"
+                placement="left"
+              >
+                <i class="el-icon-success" style="color:green;"></i>
+              </el-tooltip>
+            </span>
+            <span v-else>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="禁用"
+                placement="left"
+              >
+                <i class="el-icon-error" style="color:red;"></i>
+              </el-tooltip>
+            </span>
           </span>
         </el-table-column>
         <el-table-column :context="_self" width="200" prop="" label="操作">
@@ -384,14 +401,6 @@ export default {
       this.currentPage = 1;
       this.searchForm();
     },
-    getStatus(status) {
-      if (status == true) {
-        return "启用";
-      } else if (status == false) {
-        return "禁用";
-      }
-      return status;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/basic/view/specially.vue

@@ -128,14 +128,13 @@
       </el-dialog>
 
       <!-- 关联课程弹出框 -->
-      <el-dialog :title="courseDialogTitle" :visible.sync="courseDialog">
+      <el-dialog
+        :title="courseDialogTitle"
+        width="720px"
+        :visible.sync="courseDialog"
+      >
         <!-- 表单 -->
-        <el-form
-          :inline="true"
-          :model="courseSearchForm"
-          label-position="right"
-          label-width="100px"
-        >
+        <el-form :inline="true" :model="courseSearchForm">
           <el-row>
             <el-form-item label="课程名称" class="pull-left">
               <el-input
@@ -174,11 +173,11 @@
 
         <!-- 课程列表 -->
         <el-table :data="courseTableData" border resizable stripe>
-          <el-table-column prop="id" label="ID" width="150" />
-          <el-table-column prop="name" label="课程名称" width="250" />
+          <el-table-column prop="id" label="ID" width="60" />
+          <el-table-column prop="name" label="课程名称" width="220" />
           <el-table-column prop="code" label="课程代码" />
           <el-table-column prop="updateTime" label="更新时间" width="170" />
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="120">
             <span slot-scope="scope">
               <el-button
                 size="mini"
@@ -202,13 +201,15 @@
       </el-dialog>
 
       <!-- 添加关联 -->
-      <el-dialog title="添加关联课程" :visible.sync="addRelationDialog">
+      <el-dialog
+        title="添加关联课程"
+        width="500px"
+        :visible.sync="addRelationDialog"
+      >
         <el-form
           :inline="true"
           :model="addRelationForm"
           ref="addRelationForm"
-          label-position="right"
-          label-width="100px"
           :rules="addRelationRules"
         >
           <el-row>
@@ -231,13 +232,12 @@
                 />
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row class="pull_center">
             <el-button type="primary" @click="submitAddRelationForm">
               保 存
             </el-button>
             <el-button @click="addRelationDialog = false">取 消</el-button>
           </el-row>
+          <el-row class="pull_center"> </el-row>
         </el-form>
       </el-dialog>
 
@@ -402,8 +402,8 @@ export default {
       courseDialogTitle: null,
       courseSearchForm: {
         specialtyId: null,
-        code: null,
-        name: null
+        code: "",
+        name: ""
       },
       courseTableData: [],
       currentCoursePage: 1,
@@ -543,7 +543,7 @@ export default {
       this.addRelationForm.courseId = null;
       this.addRelationForm.specialtyId = this.courseSearchForm.specialtyId;
       this.addRelationDialog = true;
-      this.$refs.addRelationForm.resetFields();
+      // this.$refs.addRelationForm.resetFields();
     },
     searchCoursePage() {
       var param = new URLSearchParams(this.courseSearchForm);
@@ -797,12 +797,12 @@ export default {
       this.courseDialogTitle =
         "关联课程列表 【专业名称：" +
         row.name +
-        "】【       专业代码：" +
+        "】【专业代码：" +
         row.code +
         "】";
       this.courseSearchForm.specialtyId = row.id;
-      this.courseSearchForm.name = null;
-      this.courseSearchForm.code = null;
+      this.courseSearchForm.code = "";
+      this.courseSearchForm.name = "";
 
       this.searchCoursePage();
       this.courseDialog = true;

src/modules/basic/view/user.vue

@@ -352,8 +352,29 @@
             </span>
           </el-table-column>
           <el-table-column prop="updateTime" width="160" label="更新时间" />
-          <el-table-column width="70" label="状态">
-            <span slot-scope="scope"> {{ getEnable(scope.row.enable) }} </span>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
           <el-table-column width="170" label="操作">
             <div slot-scope="scope">
@@ -668,14 +689,6 @@ export default {
           this.orgLoading4InsertOrUpdate = false;
         });
     },
-    getEnable(enable) {
-      if (enable == true) {
-        return "启用";
-      } else if (enable == false) {
-        return "禁用";
-      }
-      return enable;
-    },
     getTag(status) {
       if (status == true) {
         return "success";

src/modules/marking/views/ViewPaper.vue

@@ -7,7 +7,7 @@
         size="small"
         @click="back"
         style="padding-bottom:8px;"
-        icon="el-icon-caret-left"
+        icon="el-icon-arrow-left"
         >返回</el-button
       >
     </div>

src/modules/questions/styles/Common.css

@@ -3,6 +3,10 @@
   width: 150px;
 }
 
+.form_width {
+  width: 200px;
+}
+
 /* 查询按钮与检索框对齐 */
 .search_down {
   margin-top: 3.3px;
@@ -76,3 +80,8 @@
   margin-right: 4px;
   box-sizing: border-box;
 }
+
+.form_font_size {
+  margin-left: 15px;
+  padding-top: 7px;
+}

src/modules/questions/views/BluePaperStructure.vue

@@ -9,7 +9,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -54,15 +54,19 @@
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
-          <el-form-item class="pull-left">
+          <el-form-item>
+            <span>批量操作：</span>
             <el-button size="small" type="danger" @click="deleteStructs">
-              <i class="el-icon-delete"></i> 批量删除
+              <i class="el-icon-delete"></i> 删除
             </el-button>
           </el-form-item>
         </el-row>
       </el-form>
-
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <!-- 页面列表 -->
       <el-table
         :data="tableData"

src/modules/questions/views/CourseProperty.vue

@@ -9,11 +9,11 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="属性名称" class="pull-left">
+            <el-form-item label="属性名称">
               <el-input
                 class="search_width"
                 placeholder="请输入属性名称"
@@ -55,18 +55,22 @@
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
           <el-form-item class="pull-left">
+            <span>批量操作：</span>
             <el-button size="small" type="primary" @click="openCoursePropertys"
-              ><i class="el-icon-circle-check"></i> 批量启用</el-button
+              ><i class="el-icon-circle-check"></i> 启用</el-button
             >
             <el-button size="small" type="danger" @click="closeCoursePropertys"
-              ><i class="el-icon-circle-close"></i> 批量禁用</el-button
+              ><i class="el-icon-circle-close"></i> 禁用</el-button
             >
           </el-form-item>
         </el-row>
       </el-form>
-
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <!-- 页面列表 -->
       <el-table
         :data="tableData"
@@ -174,9 +178,11 @@
           <el-button type="primary" @click="submit('coursePropertyForm')"
             >保 存</el-button
           >
-          <el-button @click="resetForm('coursePropertyForm')">重 置</el-button>
-          <el-button @click="back('coursePropertyForm')" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm('coursePropertyForm')"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="back('coursePropertyForm')" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>

src/modules/questions/views/EditOtherQuestion.vue

@@ -83,7 +83,7 @@
                   style="margin-right:5px;"
                   :key="content.id"
                   closable
-                  type="success"
+                  type="primary"
                   @close="handleClose(content)"
                 >
                   {{ content.coursePropertyName }}

src/modules/questions/views/EditPaper.vue

@@ -51,8 +51,8 @@
           >
             上传音频文件
           </el-button>
-          <el-button @click="back" size="small" type="success"
-            ><i class="el-icon-caret-left"></i> 退回</el-button
+          <el-button @click="back" size="small" type="primary"
+            ><i class="el-icon-arrow-left"></i> 退回</el-button
           >
         </div>
       </div>
@@ -418,7 +418,7 @@
                       style="margin-right:5px;"
                       :key="content.id"
                       :closable="!updatePorperty"
-                      type="success"
+                      type="primary"
                       @close="handleClose(content)"
                     >
                       {{ content.coursePropertyName }}
@@ -428,8 +428,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :xs="6" :sm="6" :md="6" :lg="6">
+          <el-row>
+            <el-col :span="6">
               <el-form-item label="属性名">
                 <el-select
                   v-model="coursePropertyName"
@@ -449,7 +449,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="6" :sm="6" :md="6" :lg="6">
+            <el-col :span="6">
               <el-form-item label="一级">
                 <el-select
                   v-model="firstPropertyId"
@@ -469,7 +469,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="6" :sm="6" :md="6" :lg="6">
+            <el-col :span="6">
               <el-form-item label="二级">
                 <el-select
                   v-model="secondPropertyId"
@@ -488,14 +488,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="3" :sm="3" :md="3" :lg="3">
+            <el-col :span="6">
               <el-form-item>
                 <el-button
-                  type="info"
+                  type="primary"
                   @click="insertProperty"
                   style="margin-left:-30px;"
                   :disabled="updatePorperty"
-                  >新增属性
+                  ><i class="el-icon-plus"></i>新增属性
                 </el-button>
               </el-form-item>
             </el-col>

src/modules/questions/views/EditSelectQuestion.vue

@@ -86,7 +86,7 @@
                   style="margin-right:5px;"
                   :key="content.id"
                   closable
-                  type="success"
+                  type="primary"
                   @close="handleClose(content)"
                 >
                   {{ content.coursePropertyName }}

src/modules/questions/views/ExportStructure.vue

@@ -6,7 +6,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -76,7 +76,9 @@
               <el-button size="small" type="primary" @click="search"
                 ><i class="el-icon-search"></i> 查询</el-button
               >
-              <el-button size="small" @click="resetForm">重 置</el-button>
+              <el-button size="small" @click="resetForm"
+                ><i class="el-icon-refresh"></i> 重 置</el-button
+              >
               <el-button size="small" type="primary" @click="add"
                 ><i class="el-icon-plus"></i> 新增</el-button
               >
@@ -228,9 +230,11 @@
         </el-form-item>
         <el-row class="margin_top_10 margin_left_120">
           <el-button type="primary" @click="saveCopy">保 存</el-button>
-          <el-button @click="resetForm3">重 置</el-button>
-          <el-button @click="cancleCopy" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm3"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="cancleCopy" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>
@@ -334,9 +338,11 @@
         </div>
         <el-row class="margin_top_10 margin_left_120">
           <el-button type="primary" @click="save">保 存</el-button>
-          <el-button @click="resetForm2">重 置</el-button>
-          <el-button @click="cancel" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm2"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="cancel" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>

src/modules/questions/views/ExtractPaperRule.vue

@@ -9,7 +9,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -68,15 +68,19 @@
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
-          <el-form-item class="pull-left">
+          <el-form-item>
+            <span>批量操作：</span>
             <el-button size="small" type="primary" @click="openBatchExpDialog"
-              ><i class="el-icon-download"></i> 批量下载成卷
+              ><i class="el-icon-download"></i> 下载成卷
             </el-button>
           </el-form-item>
         </el-row>
       </el-form>
-
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <!-- 页面列表 -->
       <el-table :data="tableData" border style="width: 100%">
         <el-table-column label="考试名称" width="180">

src/modules/questions/views/GenPaper.vue

@@ -8,7 +8,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -67,27 +67,34 @@
               <el-button size="small" type="primary" @click="searchGenPaper"
                 ><i class="el-icon-search"></i> 查询</el-button
               >
-              <el-button size="small" @click="resetForm">重 置</el-button>
+              <el-button size="small" @click="resetForm"
+                ><i class="el-icon-refresh"></i> 重 置</el-button
+              >
               <el-button size="small" type="primary" @click="genPaperDetail"
                 ><i class="el-icon-plus"></i> 组卷</el-button
               >
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
-          <el-form-item class="pull-left">
+          <el-form-item>
+            <span>批量操作：</span>
             <el-button
               size="small"
               type="primary"
               @click="openBatchExportPaperDialog"
-              ><i class="el-icon-download"></i> 批量下载成卷</el-button
+              ><i class="el-icon-download"></i> 下载成卷</el-button
             >
             <el-button size="small" type="danger" @click="batchDeleteGenPaper">
-              <i class="el-icon-delete"></i> 批量删除成卷
+              <i class="el-icon-delete"></i> 删除成卷
             </el-button>
           </el-form-item>
         </el-row>
       </el-form>
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <el-table
         v-loading="loading"
         element-loading-text="拼命加载中"
@@ -96,7 +103,7 @@
         style="width: 100%"
         @selection-change="selectChange"
       >
-        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="selection" width="35"></el-table-column>
         <el-table-column label="课程名称" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.course.name }}</span>
@@ -298,9 +305,11 @@
           <el-button type="primary" @click="sendPrint('printFrom')"
             >保 存</el-button
           >
-          <el-button @click="resetForm2('printFrom')">重 置</el-button>
-          <el-button @click="cancel('printFrom')" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm2('printFrom')"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="cancel('printFrom')" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>

src/modules/questions/views/GenPaperDetail.vue

@@ -1140,7 +1140,9 @@ export default {
   },
   created() {
     this.genPaper.courseNo = this.$route.params.courseNo;
-    this.genPaper.courseName = JSON.parse(sessionStorage.getItem("gen_paper")).courseName;
+    this.genPaper.courseName = JSON.parse(
+      sessionStorage.getItem("gen_paper")
+    ).courseName;
     this.genPaper.level = this.$route.params.level;
     this.searchPaper();
     this.getCoursePropertyList();

src/modules/questions/views/ImportPaper.vue

@@ -9,7 +9,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -96,17 +96,22 @@
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
-          <el-form-item class="pull-left">
+          <el-form-item>
+            <span>批量操作：</span>
             <el-button size="small" type="primary" @click="useBasePaper"
-              ><i class="el-icon-star-on"></i> 批量使用原卷</el-button
+              ><i class="el-icon-star-on"></i> 使用原卷</el-button
             >
             <el-button size="small" type="danger" @click="batchDeletePaper"
-              ><i class="el-icon-delete"></i> 批量删除原卷</el-button
+              ><i class="el-icon-delete"></i> 删除原卷</el-button
             >
           </el-form-item>
         </el-row>
       </el-form>
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <el-table
         v-loading="loading"
         element-loading-text="拼命加载中"
@@ -115,7 +120,7 @@
         style="width: 100%"
         @selection-change="selectChange"
       >
-        <el-table-column type="selection" width="50"></el-table-column>
+        <el-table-column type="selection" width="35"></el-table-column>
         <el-table-column label="课程名称" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.course.name }}</span>
@@ -264,9 +269,11 @@
           <el-button type="primary" @click="submitCopy('copyPaperForm')"
             >保 存</el-button
           >
-          <el-button @click="resetForm2('copyPaperForm')">重 置</el-button>
-          <el-button @click="back2('copyPaperForm')" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm2('copyPaperForm')"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="back2('copyPaperForm')" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>
@@ -312,9 +319,11 @@
             v-loading.fullscreen.lock="quesLoading"
             >保 存</el-button
           >
-          <el-button @click="resetForm">重 置</el-button>
-          <el-button @click="closePropertyDialog" type="success"
-            ><i class="el-icon-caret-left"></i> 返 回</el-button
+          <el-button @click="resetForm"
+            ><i class="el-icon-refresh"></i> 重 置</el-button
+          >
+          <el-button @click="closePropertyDialog" type="primary"
+            ><i class="el-icon-arrow-left"></i> 返 回</el-button
           >
         </el-row>
       </el-form>

src/modules/questions/views/ImportPaperInfo.vue

@@ -35,8 +35,8 @@
             </el-select>
           </el-form-item>
           <el-form-item class="pull-right">
-            <el-button type="success" @click="back"
-              ><i class="el-icon-caret-left"></i> 返回</el-button
+            <el-button type="primary" @click="back"
+              ><i class="el-icon-arrow-left"></i> 返回</el-button
             >
           </el-form-item>
         </el-row>
@@ -92,7 +92,7 @@
               <el-button slot="trigger" type="primary">选择文件</el-button>
               <el-button
                 style="margin-left:10px;"
-                type="success"
+                type="primary"
                 @click="submitUpload"
                 >确认上传
               </el-button>

src/modules/questions/views/InsertBluePaperStructure.vue

@@ -52,8 +52,8 @@
                 <el-button size="small" type="primary" @click="insertDetail"
                   ><i class="el-icon-plus"></i> 添加大题</el-button
                 >
-                <el-button size="small" type="success" @click="back"
-                  ><i class="el-icon-caret-left"></i> 返 回</el-button
+                <el-button size="small" type="primary" @click="back"
+                  ><i class="el-icon-arrow-left"></i> 返 回</el-button
                 >
               </div>
             </el-col>
@@ -159,14 +159,14 @@
               </span>
               <span class="margin_left_10">
                 <el-button @click="resetForm('paperDetailStructForm')"
-                  >重 置</el-button
+                  ><i class="el-icon-refresh"></i> 重 置</el-button
                 >
               </span>
               <span class="margin_left_10">
                 <el-button
                   @click="closeDialog('paperDetailStructForm')"
-                  type="success"
-                  ><i class="el-icon-caret-left"></i> 返 回</el-button
+                  type="primary"
+                  ><i class="el-icon-arrow-left"></i> 返 回</el-button
                 >
               </span>
             </el-row>

src/modules/questions/views/InsertBluePaperStructureInfo.vue

@@ -87,8 +87,8 @@
                 <el-button size="small" type="primary" @click="saveForm"
                   >保 存</el-button
                 >
-                <el-button size="small" type="success" @click="back"
-                  ><i class="el-icon-caret-left"></i> 返 回</el-button
+                <el-button size="small" type="primary" @click="back"
+                  ><i class="el-icon-arrow-left"></i> 返 回</el-button
                 >
               </div>
             </el-col>

src/modules/questions/views/InsertPaperStructure.vue

@@ -73,8 +73,8 @@
                   @click="insert()"
                   ><i class="el-icon-plus"></i> 新增大题</el-button
                 >
-                <el-button size="small" type="success" @click="back"
-                  ><i class="el-icon-caret-left"></i> 返 回</el-button
+                <el-button size="small" type="primary" @click="back"
+                  ><i class="el-icon-arrow-left"></i> 返 回</el-button
                 >
               </div>
             </el-col>
@@ -139,14 +139,14 @@
               </span>
               <span class="margin_left_10">
                 <el-button @click="resetForm('paperDetailStructForm')"
-                  >重 置</el-button
+                  ><i class="el-icon-refresh"></i> 重 置</el-button
                 >
               </span>
               <span class="margin_left_10">
                 <el-button
                   @click="back2('paperDetailStructForm')"
-                  type="success"
-                  ><i class="el-icon-caret-left"></i> 返 回</el-button
+                  type="primary"
+                  ><i class="el-icon-arrow-left"></i> 返 回</el-button
                 >
               </span>
             </el-row>

src/modules/questions/views/InsertPaperStructureInfo.vue

@@ -31,7 +31,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="每题分值" class="pull-left" prop="score">
+            <el-form-item label="每题分值" prop="score">
               <el-input
                 class="search_width"
                 v-model.number="paperUnitForm.score"
@@ -51,7 +51,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="题型总分" class="pull-left" prop="totalScore">
+            <el-form-item label="题型总分" prop="totalScore">
               <el-input
                 class="search_width"
                 v-model="paperUnitForm.totalScore"
@@ -61,7 +61,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="来源大题" class="pull-left" prop="quesNames">
+            <el-form-item label="来源大题" prop="quesNames">
               <el-select
                 class="search_width"
                 multiple
@@ -87,12 +87,12 @@
                 >保 存</el-button
               >
               <el-button size="small" @click="resetForm('paperUnitForm')"
-                >重 置</el-button
+                ><i class="el-icon-refresh"></i> 重 置</el-button
               >
               <el-button
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 @click="back"
                 >返 回</el-button
               >
@@ -172,7 +172,7 @@
             <div class="operate_left">
               <el-button
                 size="mini"
-                type="info"
+                type="primary"
                 @click="openPaperDetailUnitStructDialog(scope.row.id)"
                 ><i class="el-icon-edit"></i>编辑</el-button
               >
@@ -195,10 +195,11 @@
             :rules="rules"
             ref="paperUnitForm2"
           >
-            <el-row :gutter="45">
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="题型结构" prop="questionType">
                   <el-select
+                    class="form_width"
                     @change="getQuesNameList"
                     v-model="paperUnitForm2.questionType"
                     placeholder="请选择"
@@ -213,8 +214,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="每题分值" class="pull-left" prop="score">
+                <el-form-item label="每题分值" prop="score">
                   <el-input
+                    class="form_width"
                     v-model.number="paperUnitForm2.score"
                     @change="muli2"
                     placeholder="请输入"
@@ -222,10 +224,11 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="45">
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="题型总分" prop="totalScore">
                   <el-input
+                    class="form_width"
                     v-model="paperUnitForm2.totalScore"
                     :disabled="true"
                   ></el-input>
@@ -234,6 +237,7 @@
               <el-col :span="12">
                 <el-form-item label="来源大题" prop="quesNames">
                   <el-select
+                    class="form_width"
                     multiple
                     v-model="paperUnitForm2.quesNames"
                     placeholder="请选择"
@@ -250,16 +254,24 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="6">
-                <div class="grid-content bg-purple">公开（简单）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">公开（简单）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">公开（中等）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">公开（中等）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">公开（困难）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">公开（困难）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">公开总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">公开总数</div>
+                </div>
               </el-col>
             </el-row>
             <!-- 第二列 -->
@@ -317,16 +329,24 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="6">
-                <div class="grid-content bg-purple">非公开（简单）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">非公开（简单）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">非公开（中等）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">非公开（中等）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">非公开（困难）</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">非公开（困难）</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">非公开总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">非公开总数</div>
+                </div>
               </el-col>
             </el-row>
             <!-- 第四列 -->
@@ -384,16 +404,24 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="6">
-                <div class="grid-content bg-purple">简单总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">简单总数</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">中等总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">中等总数</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">困难总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">困难总数</div>
+                </div>
               </el-col>
               <el-col :span="6">
-                <div class="grid-content bg-purple">总数</div>
+                <div class="grid-content bg-purple">
+                  <div class="form_font_size">总数</div>
+                </div>
               </el-col>
             </el-row>
             <!-- 第六列 -->
@@ -1127,4 +1155,9 @@ export default {
   padding: 10px 0;
   background-color: #f9fafc;
 }
+.el-form--inline .el-form-item__label {
+  float: none;
+  display: inline-block;
+  width: 78px;
+}
 </style>

src/modules/questions/views/InsertPaperTitle.vue

@@ -124,7 +124,7 @@
                 >保 存</el-button
               >
               <el-button type="danger" @click="resetPaperForm('paperForm')"
-                >重 置</el-button
+                ><i class="el-icon-refresh"></i> 重 置</el-button
               >
             </el-row>
           </el-form>

src/modules/questions/views/PaperStructure.vue

@@ -9,7 +9,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -59,22 +59,28 @@
               <el-button size="small" type="primary" @click="searchPaperStructs"
                 ><i class="el-icon-search"></i> 查询</el-button
               >
-              <el-button size="small" @click="resetForm">重 置</el-button>
+              <el-button size="small" @click="resetForm">
+                <i class="el-icon-refresh"></i> 重 置</el-button
+              >
               <el-button size="small" type="primary" @click="addPaperStruct"
                 ><i class="el-icon-plus"></i> 新增</el-button
               >
             </div>
           </el-col>
         </el-row>
+        <div
+          style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+        ></div>
         <el-row>
-          <el-form-item class="pull-left">
+          <el-form-item>
+            <span>批量操作：</span>
             <el-button size="small" type="danger" @click="deletePapers">
-              <i class="el-icon-delete"></i> 批量删除
+              <i class="el-icon-delete"></i> 删除
             </el-button>
           </el-form-item>
         </el-row>
       </el-form>
-
+      <div style="width: 100%;margin-bottom: 10px;"></div>
       <!-- 页面列表 -->
       <el-table
         :data="tableData"

src/modules/questions/views/PropertyInfo.vue

@@ -84,11 +84,11 @@
                 ><i class="el-icon-arrow-down"></i> 下移</el-button
               >
               <el-button
-                type="success"
+                type="primary"
                 icon="caret-left"
                 @click="back"
                 size="small"
-                ><i class="el-icon-caret-left"></i> 返 回</el-button
+                ><i class="el-icon-arrow-left"></i> 返 回</el-button
               >
             </el-form-item>
           </div>

src/modules/questions/views/Question.vue

@@ -6,7 +6,7 @@
         :inline="true"
         :model="formSearch"
         label-position="right"
-        label-width="90px"
+        label-width="70px"
       >
         <el-row>
           <el-col :span="6">
@@ -162,6 +162,9 @@
               <el-button size="small" type="primary" @click="searchQues"
                 ><i class="el-icon-search"></i> 查询</el-button
               >
+              <el-button size="small" @click="resetForm"
+                ><i class="el-icon-refresh"></i> 重 置</el-button
+              >
             </div>
           </el-col>
         </el-row>
@@ -369,6 +372,17 @@ export default {
     };
   },
   methods: {
+    resetForm() {
+      this.formSearch = {
+        questionType: "",
+        courseNo: "",
+        courseLevel: "",
+        publicity: "",
+        coursePropertyName: "",
+        firstPropertyId: "",
+        secondPropertyId: ""
+      };
+    },
     getLevel(level) {
       if (level == "ZSB") {
         return "专升本";

src/modules/questions/views/SelectQuestion.vue

@@ -71,8 +71,8 @@
               >
               <el-button
                 size="small"
-                type="success"
-                icon="el-icon-caret-left"
+                type="primary"
+                icon="el-icon-arrow-left"
                 :plain="true"
                 @click="back()"
                 >返回</el-button