Merge remote-tracking branch 'origin/master'

src/modules/print/view/CourseStatistic.vue

@@ -135,13 +135,14 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
           @selection-change="handleSelection"
         >
-          <el-table-column type="selection" width="40"> </el-table-column>
+          <el-table-column type="selection" width="35px"> </el-table-column>
           <el-table-column label="课程名称" prop="courseName" />
-          <el-table-column width="150" label="课程代码" prop="courseCode" />
-          <el-table-column width="80" label="试卷类型" prop="paperType" />
-          <el-table-column width="80" label="试卷状态">
+          <el-table-column width="140px" label="课程代码" prop="courseCode" />
+          <el-table-column width="80px" label="试卷类型" prop="paperType" />
+          <el-table-column width="80px" label="试卷状态">
             <template slot-scope="scope">
               <span
                 @click="openAllotDialog(scope.row)"
@@ -150,9 +151,9 @@
               >
             </template>
           </el-table-column>
-          <el-table-column width="200" label="试卷名称" prop="paperName" />
-          <el-table-column width="80" label="试卷P数" prop="paperP" />
-          <el-table-column width="100" label="考生人数" prop="totalStudent" />
+          <el-table-column label="试卷名称" prop="paperName" />
+          <el-table-column width="80px" label="试卷P数" prop="paperP" />
+          <el-table-column width="90px" label="考生人数" prop="totalStudent" />
 
           <el-table-column width="285" label="操作" :context="_self">
             <template slot-scope="scope">
@@ -161,6 +162,7 @@
                 icon="el-icon-view"
                 v-show="scope.row.paperStatus > 1"
                 @click="preview(scope.row)"
+                plain
                 >预览
               </el-button>
 
@@ -169,6 +171,7 @@
                 icon="el-icon-download"
                 v-show="scope.row.paperStatus > 1"
                 @click="openExportDialog(scope.row)"
+                plain
                 >下载
               </el-button>
 
@@ -178,6 +181,7 @@
                 :disabled="!hasPermit"
                 v-show="scope.row.paperStatus > 1"
                 @click="openAllotDialog(scope.row)"
+                plain
                 >试卷指定
               </el-button>
             </template>

src/modules/print/view/ExamStructure.vue

@@ -69,6 +69,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column label="学校名称" prop="orgName" />
           <el-table-column label="考试名称" prop="examName" />
@@ -80,13 +81,14 @@
             </template>
           </el-table-column>
 
-          <el-table-column width="200" label="操作" :context="_self">
+          <el-table-column width="200px" label="操作" :context="_self">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 icon="el-icon-menu"
                 @click="openCloneStructureDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >复用
               </el-button>
 
@@ -96,6 +98,7 @@
                 icon="el-icon-delete"
                 @click="removeStructure(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >删除
               </el-button>
             </template>

src/modules/print/view/Project.vue

@@ -98,6 +98,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column width="220" label="学校名称" prop="orgName" />
           <el-table-column label="考试名称" prop="examName" />
@@ -110,6 +111,7 @@
                 size="mini"
                 icon="el-icon-view"
                 @click="gotoProjectStatistic(scope.row)"
+                plain
                 >查看
               </el-button>
             </template>
@@ -122,6 +124,7 @@
                 icon="el-icon-menu"
                 @click="openProjectSettingDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >项目设置
               </el-button>
             </template>

src/modules/print/view/ProjectStatistic.vue

@@ -88,6 +88,7 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
           <el-table-column width="60" label="类型" prop="type" />
           <el-table-column width="80" label="人科次" prop="totalStudent" />
@@ -101,7 +102,12 @@
           <el-table-column width="120" label="印刷供应商" prop="supplierName" />
           <el-table-column width="120" label="项目经理" prop="pmName" />
 
-          <el-table-column width="180" label="操作" :context="_self">
+          <el-table-column
+            width="180"
+            label="操作"
+            :context="_self"
+            fixed="right"
+          >
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -109,6 +115,7 @@
                 v-if="scope.row.btnType == 'BACKUP'"
                 @click="openBackupSettingDialog"
                 :disabled="!hasPermit"
+                plain
                 >备份设置
               </el-button>
 
@@ -118,6 +125,7 @@
                 v-if="scope.row.btnType == 'OTHER'"
                 @click="openOtherSettingDialog(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >修改
               </el-button>
 
@@ -128,6 +136,7 @@
                 v-if="scope.row.btnType == 'OTHER'"
                 @click="removeOtherSetting(scope.row)"
                 :disabled="!hasPermit"
+                plain
                 >删除
               </el-button>
             </template>
@@ -275,7 +284,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <div style="text-align: center">
+        <div style="text-align: center;margin-top: 10px">
           <el-button type="primary" @click="editOtherSetting">确 定 </el-button>
           <el-button @click="closeOtherSettingDialog">取 消</el-button>
         </div>

src/modules/print/view/ProjectTemplate.vue

@@ -58,8 +58,9 @@
           element-loading-text="数据加载中"
           style="width:100%;"
           border
+          stripe
         >
-          <el-table-column label="序号" type="index" width="50">
+          <el-table-column label="序号" type="index" width="50px">
           </el-table-column>
           <el-table-column label="类别" prop="typeName" />
           <el-table-column label="上传">
@@ -83,6 +84,7 @@
                   size="mini"
                   icon="el-icon-upload"
                   :disabled="!hasPermit"
+                  plain
                   >上传</el-button
                 >
                 <span
@@ -112,13 +114,14 @@
               </el-upload>
             </template>
           </el-table-column>
-          <el-table-column label="下载">
+          <el-table-column label="下载" width="100px">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 icon="el-icon-download"
                 :disabled="checkEmptyStr(scope.row.fileName)"
                 @click="download(scope.row)"
+                plain
                 >下载
               </el-button>
             </template>