zc

src/views/creditViolation/credit/violation/index.vue

@@ -35,7 +35,7 @@
           </el-form-item>
           <el-form-item style="float: right;">
             <el-col :span="1.5">
-              <p class="page-add-common-style-button"
+              <p class="page-submit-common-style-button"
                  @click="handleAdd()"
                  style="width:120px;"
                  v-hasPermi="['laboratory:violation:add']"

src/views/safetyEducationExam/safeLearning/el_course/index.vue

@@ -19,7 +19,7 @@
         </div>
         <div class="center-max-box" v-hasPermi="['exam:el_category:list']"></div>
         <div class="right-max-box">
-          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form style="height:60px;" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
             <el-form-item label="" prop="title" label-width="90px">
               <el-input
                 v-model="queryParams.title"
@@ -33,7 +33,7 @@
                 <p class="page-submit-common-style-button"
                    @click="goPageEdit(1)"
                    v-hasPermiRouter="['exam:elCourse:add']"
-                ><i class="el-icon-plus"></i>新增</p>
+                >新增</p>
               </el-col>
             </el-form-item>
             <el-form-item >
@@ -598,7 +598,6 @@ export default {
             flex: 1;
             overflow: hidden!important;
             display: flex;
-            margin-bottom:15px;
             .button-box{
               width:300px;
               display: flex;

src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -19,7 +19,9 @@
         </div>
         <div class="center-max-box" v-hasPermiRouter="['exam:el_category:list']"></div>
         <div class="right-max-box">
-          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+          <el-form :model="queryParams" ref="queryForm" :inline="true"
+                   style="height:60px;"
+                   v-show="showSearch" label-width="80px">
             <el-form-item label="" prop="title">
               <el-input
                 v-model="queryParams.title"
@@ -43,15 +45,16 @@
               <el-col :span="1.5">
                 <p class="page-submit-common-style-button"
                    @click="handleAdd"
+                   style="width:120px;"
                    v-hasPermiRouter="['exam:elResources:add']"
-                ><i class="el-icon-plus"></i>新增文件课件</p>
+                >新增文件课件</p>
               </el-col>
               <el-col :span="1.5">
                 <p class="page-add-common-style-button"
                    style="width:140px;margin-left:10px;"
                    @click="richTextAddClick(1)"
                    v-hasPermiRouter="['exam:elResources:add']"
-                ><i class="el-icon-plus"></i>新增富文本课件</p>
+                >新增富文本课件</p>
               </el-col>
             </el-form-item>
             <el-form-item>
@@ -1115,7 +1118,6 @@ export default {
             flex: 1;
             overflow: hidden!important;
             display: flex;
-            margin-bottom:15px;
             .button-box{
               width:190px;
               display: flex;

src/views/safetyEducationExam/safeLearning/recordListPage/index.vue

@@ -21,7 +21,8 @@
 
         </div>
         <div class="right-max-box">
-          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form :model="queryParams" ref="queryForm" :inline="true"
+                   style="height:60px;" v-show="showSearch">
             <div >
               <el-form-item label="" prop="courseTitle" label-width="80px">
                 <el-input
@@ -256,7 +257,6 @@
             flex: 1;
             overflow: hidden!important;
             display: flex;
-            margin-bottom:15px;
             .button-box{
               width:300px;
               display: flex;

src/views/safetyEducationExam/safeLearning/safeLearning/index.vue

@@ -23,7 +23,8 @@
 
         </div>
         <div class="right-max-box">
-          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form :model="queryParams" ref="queryForm" :inline="true"
+                   style="height:60px;" v-show="showSearch">
             <el-form-item label="" prop="title" label-width="80px">
               <el-input
                 v-model="queryParams.title"
@@ -284,7 +285,6 @@
             flex: 1;
             overflow: hidden!important;
             display: flex;
-            margin-bottom:15px;
             .button-box{
               width:300px;
               display: flex;

src/views/safetyEducationExam/safeLearning/safe_book/index.vue

@@ -1,94 +1,98 @@
 <!--实验室安全制度-->
 <template>
   <div class="app-container safe-book" id="safe-book">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-
-      <el-form-item label="" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择制度分类" clearable size="small">
-          <el-option
-            v-for="item in safeType"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="dateRange">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="创建时间"
-          end-placeholder="创建时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入制度标题"
-          clearable
-          maxLength="30"
-          size="small"
+    <div class="page-container ">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+          <el-form-item label="" prop="type">
+            <el-select v-model="queryParams.type" placeholder="请选择制度分类" clearable size="small">
+              <el-option
+                v-for="item in safeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="dateRange">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="创建时间"
+              end-placeholder="创建时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入制度标题"
+              clearable
+              maxLength="30"
+              size="small"
+            />
+          </el-form-item>
+          <p class="page-submit-common-style-button"
+             style="float: right;"
+             @click="handleAdd"
+             v-hasPermiRouter="['exam:safeBook:add']"
+          >新增</p>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="safe_bookList" @selection-change="handleSelectionChange">
+          <el-table-column label="序号" type="index" align="center" width="50"/>
+          <el-table-column label="标题" align="left" prop="name" />
+          <el-table-column label="分类" align="left" prop="type" width="180">
+            <template slot-scope="scope">
+              <p v-for="item in safeType" v-if="item.value == scope.row.type">{{item.label}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="left" prop="createTime"  width="280"/>
+          <el-table-column label="查看次数" align="left" prop="scanCount" width="100"/>
+          <el-table-column label="二维码" align="left" width="100">
+            <template slot-scope="scope">
+              <div @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
+                <vue-qr style="height:23px;width:23px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160" v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="handleUpdate(scope.row)"
+                   v-hasPermiRouter="['exam:safeBook:add','exam:safeBook:edit']"
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermiRouter="['exam:safeBook:del']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
         />
-      </el-form-item>
-      <p class="page-submit-common-style-button"
-         style="float: right;"
-         @click="handleAdd"
-         v-hasPermiRouter="['exam:safeBook:add']"
-      >新增</p>
-      <el-form-item>
-      <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-      <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-    </el-form>
-
-    <el-table class="table-box" v-loading="loading" border :data="safe_bookList" @selection-change="handleSelectionChange">
-      <el-table-column label="序号" type="index" align="center" width="50"/>
-      <el-table-column label="标题" align="left" prop="name" />
-      <el-table-column label="分类" align="left" prop="type" width="180">
-        <template slot-scope="scope">
-          <p v-for="item in safeType" v-if="item.value == scope.row.type">{{item.label}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="left" prop="createTime"  width="280"/>
-      <el-table-column label="查看次数" align="left" prop="scanCount" width="100"/>
-      <el-table-column label="二维码" align="left" width="100">
-        <template slot-scope="scope">
-          <div @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
-            <vue-qr style="height:23px;width:23px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="160" v-if="tableButtonType">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="handleUpdate(scope.row)"
-               v-hasPermiRouter="['exam:safeBook:add','exam:safeBook:edit']"
-            >编辑</p>
-            <p class="table-button-p"
-               @click="handleDelete(scope.row)"
-               v-hasPermiRouter="['exam:safeBook:del']"
-            >删除</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
+      </div>
+    </div>
 
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改实验室安全制度对话框 -->
     <el-dialog :title="title" class="safe-book-el-dialog" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
@@ -424,10 +428,6 @@ export default {
 
 <style scoped lang="scss">
   #safe-book {
-    display: flex !important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
     .button-box{
       margin:0 auto;
       width:190px;

src/views/safetyEducationExam/securityExam/certificate/index.vue

@@ -1,60 +1,60 @@
 <!--证书管理-->
 <template>
   <div class="app-container certificate">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" class="form-box">
+    <div class="page-container">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" class="form-box">
 
-      <el-form-item label="" prop="certTitle">
-        <el-input
-          v-model="queryParams.certTitle"
-          placeholder="请输入证书名称"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5" style="margin-right:20px;">
+          <el-form-item label="" prop="certTitle">
+            <el-input
+              v-model="queryParams.certTitle"
+              placeholder="请输入证书名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
           <p class="page-submit-common-style-button"
+             style="float:right"
              @click="handleAdd"
              v-hasPermi="['exam:certificate:add']"
-          ><i class="el-icon-plus"></i>新增证书</p>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" border class="table-box" :data="certificateList" @selection-change="handleSelectionChange">
-      <el-table-column label="证书名称" align="left" prop="certTitle"/>
-      <el-table-column label="证书有效期(月)" align="left" prop="certValidity" />
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="handleUpdate(scope.row)"
-               v-hasPermiAnd="['laboratory:safe_book:edit','exam:certificate:edit']"
-            >编辑</p>
-            <p class="table-button-p"
-               @click="handleDelete(scope.row)"
-               v-hasPermi="['exam:certificate:remove']"
-            >删除</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
+          >新增证书</p>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table v-loading="loading" border class="table-box" :data="certificateList" @selection-change="handleSelectionChange">
+          <el-table-column label="证书名称" align="left" prop="certTitle"/>
+          <el-table-column label="证书有效期(月)" align="left" prop="certValidity" />
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="handleUpdate(scope.row)"
+                   v-hasPermiAnd="['laboratory:safe_book:edit','exam:certificate:edit']"
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermi="['exam:certificate:remove']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
     <!-- 添加或修改证书管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="cartifcate-dialog" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -299,10 +299,6 @@ export default {
 
 <style scoped lang="scss">
   .certificate {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
     .button-box{
       width:190px;
       display: flex;

src/views/safetyEducationExam/securityExam/el_classify/index.vue

@@ -1,61 +1,64 @@
 <!--题目分类-->
 <template>
   <div class="app-container el-classify">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入分类名称"
-          clearable
-          size="small"
+    <div class="page-container">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="" prop="title">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入分类名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item style="float: right;">
+            <el-col :span="1.5">
+              <p class="page-submit-common-style-button"
+                 style="margin-right:20px;"
+                 @click="handleAdd"
+                 v-hasPermiRouter="['exam:elClassify:add']"
+              >新增</p>
+            </el-col>
+          </el-form-item>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="el_classifyList" @selection-change="handleSelectionChange">
+          <el-table-column label="分类名称" align="left" prop="title" />
+          <el-table-column label="分类类型" align="left" prop="type">
+            <template slot-scope="scope">{{scope.row.type == 1?'专业类型':'通用类型'}}</template>
+          </el-table-column>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="handleUpdate(scope.row)"
+                   v-hasPermiRouter="['exam:elClassify:add','exam:elClassify:edit']"
+                >修改</p>
+                <p class="table-button-p"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermiRouter="['exam:elClassify:del']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
         />
-      </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5">
-          <p class="page-submit-common-style-button"
-             style="margin-right:20px;"
-             @click="handleAdd"
-             v-hasPermiRouter="['exam:elClassify:add']"
-          >新增</p>
-        </el-col>
-      </el-form-item>
-      <el-form-item>
-        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-    </el-form>
-    <el-table class="table-box" v-loading="loading" border :data="el_classifyList" @selection-change="handleSelectionChange">
-      <el-table-column label="分类名称" align="left" prop="title" />
-      <el-table-column label="分类类型" align="left" prop="type">
-        <template slot-scope="scope">{{scope.row.type == 1?'专业类型':'通用类型'}}</template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="handleUpdate(scope.row)"
-               v-hasPermiRouter="['exam:elClassify:add','exam:elClassify:edit']"
-            >修改</p>
-            <p class="table-button-p"
-               @click="handleDelete(scope.row)"
-               v-hasPermiRouter="['exam:elClassify:del']"
-            >删除</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
+      </div>
+    </div>
     <!-- 添加或修改题目类型对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -240,10 +243,6 @@ export default {
 
 <style lang="scss" scoped>
   .el-classify{
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
     .button-box{
       margin:0 auto;
       width:190px;

src/views/safetyEducationExam/securityExam/exam/examInfo.vue

@@ -1,67 +1,73 @@
 <!--考试详情-->
 <template>
   <div class="examInfo">
-    <el-form ref="queryForm" :model="queryParams" label-width="80px" class="form-box">
-      <el-form-item label="姓名" prop="nickName" label-width="50px">
-        <el-input
-          v-model="queryParams.nickName"
-          placeholder="请输入考试名称"
-          clearable
-          size="small"
+    <div class="page-container">
+      <div class="page-form-title-box">
+        <el-form ref="queryForm" :model="queryParams" label-width="80px" class="form-box">
+          <el-form-item label="姓名" prop="nickName" label-width="50px">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入考试名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="通过状态" prop="passed">
+            <el-select v-model="queryParams.passed" placeholder="请选择通过状态" clearable size="small">
+              <el-option
+                v-for="item in passeds"
+                :key="item.type"
+                :label="item.value"
+                :value="item.type"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="button-box">
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+          <p class="full-p"></p>
+          <el-form-item class="button-box">
+            <p class="right-button page-out-common-style-button" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table :data="examList" border class="table-box" @selection-change="handleSelectionChange">
+          <el-table-column label="姓名" align="left" prop="joinUserName" />
+          <el-table-column label="最高分" align="left" prop="maxScore" />
+          <el-table-column label="通过状态" align="left" prop="passed" >
+            <template slot-scope="scope">
+              <span v-for="(item,index) in passeds" :key="index" v-if="scope.row.passed==item.type">{{item.value}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="最后考试时间" align="left" prop="updateTime">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="openButton(scope.row)"
+                >考试明细</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
         />
-      </el-form-item>
-      <el-form-item label="通过状态" prop="passed">
-        <el-select v-model="queryParams.passed" placeholder="请选择通过状态" clearable size="small">
-          <el-option
-            v-for="item in passeds"
-            :key="item.type"
-            :label="item.value"
-            :value="item.type"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item class="button-box">
-        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-      <p class="full-p"></p>
-      <el-form-item class="button-box">
-        <p class="right-button page-out-common-style-button" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-      </el-form-item>
-    </el-form>
-    <el-table :data="examList" border class="table-box" @selection-change="handleSelectionChange">
-      <el-table-column label="姓名" align="left" prop="joinUserName" />
-      <el-table-column label="最高分" align="left" prop="maxScore" />
-      <el-table-column label="通过状态" align="left" prop="passed" >
-        <template slot-scope="scope">
-          <span v-for="(item,index) in passeds" :key="index" v-if="scope.row.passed==item.type">{{item.value}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="最后考试时间" align="left" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="openButton(scope.row)"
-            >考试明细</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-    />
+      </div>
+    </div>
     <!-- 添加或修改考试对话框 -->
     <el-dialog title="考试明细" :visible.sync="open" width="790px" class="scrollbar-box" append-to-body :close-on-click-modal="false">
       <div v-for="(item,index) in infoData" :key="index" style="display: flex;" >

src/views/safetyEducationExam/securityExam/exam/index.vue

@@ -1,99 +1,101 @@
 <!--考试管理-->
 <template>
-  <div class="app-container exam scrollbar-box">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch&&pageType==0" label-width="68px" class="form-box">
+  <div class="app-container exam">
+    <div class="page-container" v-if="pageType == 0">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch&&pageType==0" label-width="68px" class="form-box">
 
-      <el-form-item label="" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入考试名称"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="scopeType">
-        <el-select v-model="queryParams.scopeType" placeholder="请选择适用范围" clearable size="small">
-          <el-option
-            v-for="item in scopeTypes"
-            :key="item.type"
-            :label="item.value"
-            :value="item.type"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="">
-        <el-date-picker
-          :clearable="false"
-          v-model="createTimeDate"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="创建时间"
-          end-placeholder="创建时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item style="float: right;">
-        <el-col :span="1.5" style="margin-right:20px;">
+          <el-form-item label="" prop="title">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入考试名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="scopeType">
+            <el-select v-model="queryParams.scopeType" placeholder="请选择适用范围" clearable size="small">
+              <el-option
+                v-for="item in scopeTypes"
+                :key="item.type"
+                :label="item.value"
+                :value="item.type"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              :clearable="false"
+              v-model="createTimeDate"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="创建时间"
+              end-placeholder="创建时间"
+            ></el-date-picker>
+          </el-form-item>
           <p class="page-submit-common-style-button"
-             style="width:100px;"
+             style="width:100px;float: right"
              @click="addExam"
              v-hasPermiRouter="['exam:exam:add']"
-          ><i class="el-icon-plus"></i>新增考试</p>
-        </el-col>
-      </el-form-item>
-      <el-form-item >
-        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" border class="table-box" :data="examList" @selection-change="handleSelectionChange" v-show="pageType==0">
-      <el-table-column label="考试名称" align="left" prop="title" show-overflow-tooltip/>
-      <el-table-column label="适用范围" align="left" prop="scopeType">
-        <template slot-scope="scope">
-          <span v-for="(item,index) in scopeTypes" :key="index" v-if="scope.row.scopeType==item.type">{{item.value}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="组题方式" align="left" prop="joinType">
-        <template slot-scope="scope">
-          <span>{{scope.row.joinType == 1 ?'自动组题':'手动组题'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="left" prop="createTime"/>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="350" v-if="tableButtonType">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="trainingButton(scope.row)"
-            >关联学习资源</p>
-            <p class="table-button-p"
-               @click="examInfo(scope.row)"
-               v-hasPermiRouter="['exam:exam:query']"
-            >详情</p>
-            <p class="table-button-p"
-               @click="addExam(scope.row)"
-               v-hasPermiRouter="['exam:exam:add','exam:exam:edit']"
-            >编辑</p>
-            <p class="table-button-p"
-               @click="handleDelete(scope.row)"
-               v-hasPermiRouter="['exam:exam:del']"
-            >删除</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0&&pageType==0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+          >新增考试</p>
+          <el-form-item >
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table v-loading="loading" border class="table-box" :data="examList" @selection-change="handleSelectionChange" v-show="pageType==0">
+          <el-table-column label="考试名称" align="left" prop="title" show-overflow-tooltip/>
+          <el-table-column label="适用范围" align="left" prop="scopeType">
+            <template slot-scope="scope">
+              <span v-for="(item,index) in scopeTypes" :key="index" v-if="scope.row.scopeType==item.type">{{item.value}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="组题方式" align="left" prop="joinType">
+            <template slot-scope="scope">
+              <span>{{scope.row.joinType == 1 ?'自动组题':'手动组题'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="left" prop="createTime"/>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="350" v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="trainingButton(scope.row)"
+                >关联学习资源</p>
+                <p class="table-button-p"
+                   @click="examInfo(scope.row)"
+                   v-hasPermiRouter="['exam:exam:query']"
+                >详情</p>
+                <p class="table-button-p"
+                   @click="addExam(scope.row)"
+                   v-hasPermiRouter="['exam:exam:add','exam:exam:edit']"
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermiRouter="['exam:exam:del']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0&&pageType==0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
     <add-exam-page v-if="pageType==1" :repoId="repoId"></add-exam-page>
     <exam-info v-if="pageType==2" :rowData="rowData"></exam-info>
     <!-- 添加或修改考试对话框 -->
@@ -517,10 +519,6 @@ export default {
 
 <style scoped lang="scss">
   .exam{
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
     .button-box{
       width:530px;
       display: flex;

src/views/safetyEducationExam/securityExam/myCertificate/index.vue

@@ -1,46 +1,51 @@
 <!--个人证书管理-->
 <template>
     <div class="app-container myCertificate">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px" class="form-box" style="margin-bottom:20px;">
-        <el-form-item label="" prop="certTitle">
-          <el-input
-            v-model="queryParams.certTitle"
-            placeholder="请输入证书名称"
-            clearable
-            size="small"
+      <div class="page-container">
+        <div class="page-form-title-box">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px" class="form-box" style="margin-bottom:20px;">
+            <el-form-item label="" prop="certTitle">
+              <el-input
+                v-model="queryParams.certTitle"
+                placeholder="请输入证书名称"
+                clearable
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item>
+              <p class="page-inquire-common-style-button" style="margin-right:10px;" @click="handleQuery">查询</p>
+              <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content-box">
+          <el-table v-loading="loading" border class="table-box" :data="recordList">
+            <el-table-column label="证书名称" align="left" prop="certTitle" />
+            <el-table-column label="获得日期" align="left" prop="createTime" />
+            <el-table-column label="截止日期" align="left" prop="expirationTime" />
+            <el-table-column label="证书编号" align="left" prop="code" />
+            <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="130">
+              <template slot-scope="scope">
+                <div class="table-button-box">
+                  <p class="table-button-null"></p>
+                  <p class="table-button-p"
+                     @click="lockClick(scope.row)"
+                  >查看</p>
+                  <p class="table-button-null"></p>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      v-show="total>0"
+                      :total="total"
+                      layout="total, prev, pager, next, sizes, jumper"
+                      :page.sync="queryParams.pageNum"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
           />
-        </el-form-item>
-        <el-form-item>
-          <p class="page-inquire-common-style-button" style="margin-right:10px;" @click="handleQuery">查询</p>
-          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border class="table-box" :data="recordList">
-        <el-table-column label="证书名称" align="left" prop="certTitle" />
-        <el-table-column label="获得日期" align="left" prop="createTime" />
-        <el-table-column label="截止日期" align="left" prop="expirationTime" />
-        <el-table-column label="证书编号" align="left" prop="code" />
-        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="130">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p"
-                 @click="lockClick(scope.row)"
-              >查看</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
+        </div>
+      </div>
       <!-- 查看证书 -->
       <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
         <div class="scrollbar-box" style="width:960px;max-height:700px;overflow-y: scroll;">
@@ -116,11 +121,6 @@
 
 <style scoped lang="scss">
   .myCertificate {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
-    flex:1;
     .button-box{
       width:90px;
       margin:0 auto;

src/views/safetyEducationExam/securityExam/myResultInquiry/index.vue

@@ -1,40 +1,44 @@
 <!--个人成绩查询-->
 <template>
   <div class="app-container myResultInquiry">
-    <div class="myResultInquiry-page " v-if="pageType == 1">
-      <div class="button-max-box">
-        <p class="button-p" :class="item.value==infoParams.scopeType?'button-color-a':'button-color-b'" v-for="(item,index) in buttonList" :key="index" @click="buttonClick(item)">{{item.name}}</p>
+    <div class="page-container myResultInquiry-page " v-if="pageType == 1">
+      <div class="page-form-title-box">
+        <div class="button-max-box">
+          <p class="button-p" :class="item.value==infoParams.scopeType?'button-color-a':'button-color-b'" v-for="(item,index) in buttonList" :key="index" @click="buttonClick(item)">{{item.name}}</p>
+        </div>
+      </div>
+      <div class="page-content-box">
+        <el-table v-loading="loading" border class="table-box" :data="myListExam">
+          <el-table-column label="考试名称" align="left" prop="title" />
+          <el-table-column label="题目类型" align="left" prop="classifyNames" />
+          <el-table-column label="考试时间" align="left" prop="createTime" />
+          <el-table-column label="考试得分" align="left" prop="userScore" />
+          <el-table-column label="是否合格" align="left" prop="passed" >
+            <template slot-scope="scope">
+              <span>{{scope.row.userScore >= scope.row.qualifyScore ?'是':'否'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="getExamPaper(scope.row)"
+                >详情</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="infoParams.page"
+                    :limit.sync="infoParams.pageSize"
+                    @pagination="getMyListExam"
+        />
       </div>
-      <el-table v-loading="loading" border class="table-box" :data="myListExam">
-        <el-table-column label="考试名称" align="left" prop="title" />
-        <el-table-column label="题目类型" align="left" prop="classifyNames" />
-        <el-table-column label="考试时间" align="left" prop="createTime" />
-        <el-table-column label="考试得分" align="left" prop="userScore" />
-        <el-table-column label="是否合格" align="left" prop="passed" >
-          <template slot-scope="scope">
-            <span>{{scope.row.userScore >= scope.row.qualifyScore ?'是':'否'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p"
-                 @click="getExamPaper(scope.row)"
-              >详情</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="infoParams.page"
-        :limit.sync="infoParams.pageSize"
-        @pagination="getMyListExam"
-      />
     </div>
     <info-list v-if="pageType==2" :transferData="transferData"></info-list>
   </div>
@@ -115,15 +119,7 @@
 
 <style scoped lang="scss">
   .myResultInquiry{
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px 20px!important;
     .myResultInquiry-page{
-      flex: 1;
-      display: flex!important;
-      flex-direction: column;
-
       .button-max-box{
         display: flex;
         margin-bottom: 10px;

src/views/safetyEducationExam/securityExam/qu/index.vue

@@ -1,138 +1,144 @@
 <!--题目管理-->
 <template>
-  <div class="app-container qu scrollbar-box">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch && pageType == 0"
-      label-width="68px"
-    >
-      <el-form-item label="" prop="content" style="margin-left: 10px">
-        <el-input
-          v-model="queryParams.content"
-          placeholder="请输入题目名称"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="quType" style="margin-left: 10px">
-        <el-select
-          v-model="queryParams.quType"
-          placeholder="请选择题目类型"
-          clearable
-          size="small">
-          <el-option
-            v-for="dict in quTypes"
-            :key="dict.type"
-            :label="dict.value"
-            :value="dict.type">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="classifyIds" style="margin-left: 10px">
-        <el-select
-          v-model="queryParams.classifyIds"
-          placeholder="请选择题目分类"
-          clearable
-          size="small">
-          <el-option
-            v-for="dict in optionList"
-            :key="dict.id"
-            :label="dict.title"
-            :value="dict.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="level" style="margin-left: 10px">
-        <el-select
-          v-model="queryParams.level"
-          placeholder="请选择难度级别"
-          clearable
-          size="small"
+  <div class="app-container qu">
+    <div class="page-container">
+      <div class="page-form-title-box">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch && pageType == 0"
+          label-width="68px"
         >
-          <el-option
-          v-for="dict in levels"
-          :key="dict.type"
-          :label="dict.value"
-          :value="dict.type"
-        ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item style="float: right;" v-hasPermiRouter="['exam:qu:add']">
-        <el-row :gutter="10" class="mb8" v-show="pageType == 0">
-          <el-dropdown @command="addTopic">
-            <p class="page-submit-common-style-button" style="width:100px;"><i class="el-icon-plus"></i>新增题目</p>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-                style="border-bottom: 1px solid #e0e0e0; margin: 0 10px"
-                command="1"
-              >单选题</el-dropdown-item
-              >
-              <el-dropdown-item
-                style="border-bottom: 1px solid #e0e0e0; margin: 0 10px"
-                command="2"
-              >多选题</el-dropdown-item
-              >
-              <el-dropdown-item style="margin: 0 10px" command="3"
-              >判断题</el-dropdown-item
-              >
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-row>
-      </el-form-item>
-      <el-form-item>
-        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-      </el-form-item>
-    </el-form>
-    <el-table border class="table-box" v-loading="loading" :data="quList" @selection-change="handleSelectionChange" v-show="pageType == 0">
-      <el-table-column label="题目名称" align="left" prop="content" show-overflow-tooltip/>
-      <el-table-column label="题目类型"  align="left" prop="quType" width="120">
-        <template slot-scope="scope">
+          <el-form-item label="" prop="content" style="margin-left: 10px">
+            <el-input
+              v-model="queryParams.content"
+              placeholder="请输入题目名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="quType" style="margin-left: 10px">
+            <el-select
+              v-model="queryParams.quType"
+              placeholder="请选择题目类型"
+              clearable
+              size="small">
+              <el-option
+                v-for="dict in quTypes"
+                :key="dict.type"
+                :label="dict.value"
+                :value="dict.type">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="classifyIds" style="margin-left: 10px">
+            <el-select
+              v-model="queryParams.classifyIds"
+              placeholder="请选择题目分类"
+              clearable
+              size="small">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.id"
+                :label="dict.title"
+                :value="dict.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="level" style="margin-left: 10px">
+            <el-select
+              v-model="queryParams.level"
+              placeholder="请选择难度级别"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="dict in levels"
+                :key="dict.type"
+                :label="dict.value"
+                :value="dict.type"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item style="float: right;" v-hasPermiRouter="['exam:qu:add']">
+            <el-row :gutter="10" class="mb8" v-show="pageType == 0">
+              <el-dropdown @command="addTopic">
+                <p class="page-submit-common-style-button" style="width:100px;">新增题目</p>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    style="border-bottom: 1px solid #e0e0e0; margin: 0 10px"
+                    command="1"
+                  >单选题</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    style="border-bottom: 1px solid #e0e0e0; margin: 0 10px"
+                    command="2"
+                  >多选题</el-dropdown-item
+                  >
+                  <el-dropdown-item style="margin: 0 10px" command="3"
+                  >判断题</el-dropdown-item
+                  >
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-row>
+          </el-form-item>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table border class="table-box" v-loading="loading" :data="quList" @selection-change="handleSelectionChange" v-show="pageType == 0">
+          <el-table-column label="题目名称" align="left" prop="content" show-overflow-tooltip/>
+          <el-table-column label="题目类型"  align="left" prop="quType" width="120">
+            <template slot-scope="scope">
           <span
             v-for="(item, index) in quTypes"
             :key="index"
             v-if="scope.row.quType == item.type"
           >{{ item.value }}</span
           >
-        </template>
-      </el-table-column>
-      <el-table-column label="题目分类"  align="left" prop="classifyNames" width="160"></el-table-column>
-      <el-table-column label="难度级别"  align="left" prop="level" width="120">
-        <template slot-scope="scope">
+            </template>
+          </el-table-column>
+          <el-table-column label="题目分类"  align="left" prop="classifyNames" width="160"></el-table-column>
+          <el-table-column label="难度级别"  align="left" prop="level" width="120">
+            <template slot-scope="scope">
           <span
             v-for="(item, index) in levels"
             :key="index"
             v-if="scope.row.level == item.type"
           >{{ item.value }}</span
           >
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间"  align="left" prop="createTime"  width="180"/>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-              @click="editTopic(scope.row)"
-              v-hasPermiRouter="['exam:qu:add','exam:qu:edit']">编辑</p>
-            <p class="table-button-p"
-              @click="handleDelete(scope.row)"
-              v-hasPermiRouter="['exam:qu:del']">删除</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total > 0 && pageType == 0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间"  align="left" prop="createTime"  width="180"/>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="editTopic(scope.row)"
+                   v-hasPermiRouter="['exam:qu:add','exam:qu:edit']">编辑</p>
+                <p class="table-button-p"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermiRouter="['exam:qu:del']">删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total > 0 && pageType == 0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
     <div v-if="pageType != 0">
       <add-topic :pageType="pageType" :quId="quId"></add-topic>
     </div>
@@ -429,10 +435,6 @@ export default {
 
 <style scoped lang="scss">
 .qu {
-  display: flex !important;
-  flex-direction: column;
-  box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-  padding: 20px !important;
   .el-row {
     margin-bottom: 20px;
   }

src/views/safetyEducationExam/trainingCourse/index.vue

@@ -1,76 +1,75 @@
 <template>
   <div class="app-container trainingCourse">
-    <div class="title-box">
-      <el-form class="form-box" :model="queryParams" ref="examineForm" :inline="true" label-width="65px">
-        <el-form-item label="" prop="name">
-          <div class="query-type-box">
-            <p @click="queryTypeClick(null)" :class="queryParams.isStart == null?'check-p':''">全部</p>
-            <p @click="queryTypeClick(0)" :class="queryParams.isStart == 0?'check-p':''">待开课</p>
-            <p @click="queryTypeClick(1)" :class="queryParams.isStart == 1?'check-p':''">已开课</p>
-          </div>
-        </el-form-item>
-        <el-form-item label="" prop="deptId" label-width="50px">
-          <el-select style="width:200px;" v-model="queryParams.deptId" placeholder="请选择学院" clearable>
-            <el-option
-              v-for="dict in deptList"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="name">
-          <el-input
-            maxlength="10"
-            v-model="queryParams.searchValue"
-            placeholder="课程名称/主讲老师"
-            clearable
-            size="small"/>
-        </el-form-item>
-        <el-form-item>
-          <p class="page-inquire-common-style-button" @click="onSearch">查询</p>
-          <p class="page-reset-common-style-button" @click="resetForm">重置</p>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <p class="page-add-common-style-button" style="width:100px;" @click="controlsButton(1)"
-             v-hasPermiRouter="['exam:security:add']">+  新增课程</p>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="page-content-box">
-      <el-table class="table-box" border :data="tableData" ref="multipleTable">
-        <el-table-column label="序号"  width="50" align="center"  type="index"/>
-        <el-table-column label="课程名称" prop="courseName" show-overflow-tooltip/>
-        <el-table-column label="学院" prop="place" width="180" show-overflow-tooltip/>
-        <el-table-column label="上课地点" prop="position" width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{(scope.row.subId && scope.row.subId !=-1)?scope.row.subName+'-'+scope.row.subRoom:scope.row.position}}
-          </template>
-        </el-table-column>
-        <el-table-column label="主讲老师" prop="lecturerName" width="100" show-overflow-tooltip/>
-        <el-table-column label="辅导老师" prop="tutorName" width="100" show-overflow-tooltip>
+    <div class="page-container">
+      <div class="page-form-title-box">
+        <el-form class="form-box" :model="queryParams" ref="examineForm" :inline="true" label-width="65px">
+          <el-form-item label="" prop="name">
+            <div class="query-type-box">
+              <p @click="queryTypeClick(null)" :class="queryParams.isStart == null?'check-p':''">全部</p>
+              <p @click="queryTypeClick(0)" :class="queryParams.isStart == 0?'check-p':''">待开课</p>
+              <p @click="queryTypeClick(1)" :class="queryParams.isStart == 1?'check-p':''">已开课</p>
+            </div>
+          </el-form-item>
+          <el-form-item label="" prop="deptId" label-width="50px">
+            <el-select style="width:200px;" v-model="queryParams.deptId" placeholder="请选择学院" clearable>
+              <el-option
+                v-for="dict in deptList"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              maxlength="10"
+              v-model="queryParams.searchValue"
+              placeholder="课程名称/主讲老师"
+              clearable
+              size="small"/>
+          </el-form-item>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" @click="onSearch">查询</p>
+            <p class="page-reset-common-style-button" @click="resetForm">重置</p>
+          </el-form-item>
+          <p class="page-submit-common-style-button" style="float: right;" @click="controlsButton(1)"
+             v-hasPermiRouter="['exam:security:add']">新增课程</p>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" border :data="tableData" ref="multipleTable">
+          <el-table-column label="序号"  width="50" align="center"  type="index"/>
+          <el-table-column label="课程名称" prop="courseName" show-overflow-tooltip/>
+          <el-table-column label="学院" prop="place" width="180" show-overflow-tooltip/>
+          <el-table-column label="上课地点" prop="position" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{(scope.row.subId && scope.row.subId !=-1)?scope.row.subName+'-'+scope.row.subRoom:scope.row.position}}
+            </template>
+          </el-table-column>
+          <el-table-column label="主讲老师" prop="lecturerName" width="100" show-overflow-tooltip/>
+          <el-table-column label="辅导老师" prop="tutorName" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{scope.row.tutorName | tutorNameFilters}}</span>
             </template>
-        </el-table-column>
-        <el-table-column label="人数" prop="peopleCount" width="80" show-overflow-tooltip/>
-        <el-table-column label="上课时间" prop="coStartDate" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{scope.row.coStartTime}} - {{scope.row.coEndTime}}
-          </template>
-        </el-table-column>
-        <el-table-column label="上课日期" prop="coStartDate" width="200" show-overflow-tooltip/>
-        <el-table-column label="状态" prop="mainPoint" width="112" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{scope.row.isStart == 1?'已开课':'待开课'}}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="left" width="200" show-overflow-tooltip v-if="tableButtonType">
+          </el-table-column>
+          <el-table-column label="人数" prop="peopleCount" width="80" show-overflow-tooltip/>
+          <el-table-column label="上课时间" prop="coStartDate" width="150" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.coStartTime}} - {{scope.row.coEndTime}}
+            </template>
+          </el-table-column>
+          <el-table-column label="上课日期" prop="coStartDate" width="200" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="mainPoint" width="112" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.isStart == 1?'已开课':'待开课'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="left" width="200" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
-                    @click="controlsButton(3,scope.row)"
+                   @click="controlsButton(3,scope.row)"
                    v-hasPermiRouter="['exam:security:query']"
                 >详情</p>
                 <p class="table-button-p"
@@ -85,11 +84,12 @@
               </div>
             </template>
           </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]" v-show="total>0" :total="total"
-                  layout="total, prev, pager, next, sizes, jumper"
-                  :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                  @pagination="getList"/>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]" v-show="total>0" :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
+      </div>
     </div>
     <!--添加/编辑弹窗-->
     <add-dialog v-if="addDialogType" :addDialogData="addDialogData"></add-dialog>
@@ -250,43 +250,32 @@
 
 <style scoped lang="scss">
   .trainingCourse{
-    display: flex!important;
-    flex-direction: column;
-    overflow: hidden;
-    font-weight: 500;
-    .title-box{
-      padding-top:20px;
-      .form-box{
+    .query-type-box{
+      display: flex;
+      p{
+        line-height:40px;
+        font-size:14px;
+        color:#333;
+        width:80px;
+        text-align: center;
+        cursor: pointer;
+      }
+      p:nth-child(1){
+        border:1px solid #E0E0E0;
+        border-radius: 4px 0 0 4px
+      }
+      p:nth-child(2){
+        border-top:1px solid #E0E0E0;
         border-bottom:1px solid #E0E0E0;
-        .query-type-box{
-          margin-left:20px;
-          display: flex;
-          p{
-            line-height:40px;
-            font-size:14px;
-            color:#333;
-            width:80px;
-            text-align: center;
-            cursor: pointer;
-          }
-          p:nth-child(1){
-            border:1px solid #E0E0E0;
-            border-radius: 4px 0 0 4px
-          }
-          p:nth-child(2){
-            border-top:1px solid #E0E0E0;
-            border-bottom:1px solid #E0E0E0;
-          }
-          p:nth-child(3){
-            border:1px solid #E0E0E0;
-            border-radius: 0 4px 4px 0
-          }
-          .check-p{
-            color:#fff;
-            background: #0045AF;
-            border-color:#0045AF!important;
-          }
-        }
+      }
+      p:nth-child(3){
+        border:1px solid #E0E0E0;
+        border-radius: 0 4px 4px 0
+      }
+      .check-p{
+        color:#fff;
+        background: #0045AF;
+        border-color:#0045AF!important;
       }
     }
   }