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

src/modules/basic/view/course.vue

@@ -125,7 +125,7 @@
         <!-- 添加或新增课程弹出框 -->
         <el-dialog
           title="课程"
-          width="450px"
+          width="420px"
           :visible.sync="courseDialog"
           @close="dialogBeforeClose"
         >
@@ -178,7 +178,7 @@
               <el-form-item label="课程状态" prop="enable">
                 <el-radio-group class="pull_length" v-model="courseForm.enable">
                   <el-radio label="true">开启</el-radio>
-                  <el-radio label="false">关闭</el-radio>
+                  <el-radio label="false">禁用</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-row>
@@ -190,7 +190,7 @@
         </el-dialog>
 
         <!-- 导入弹窗 -->
-        <el-dialog title="导入窗口" :visible.sync="impDialog">
+        <el-dialog title="导入窗口" width="420px" :visible.sync="impDialog">
           <el-form>
             <el-row>
               <el-form-item style="margin-left:20px">
@@ -317,9 +317,14 @@
         </el-dialog>
 
         <!-- 添加关联 -->
-        <el-dialog title="添加关联专业" v-model="addRelationDialog">
+        <el-dialog
+          title="添加关联专业"
+          :visible.sync="addRelationDialog"
+          width="420px"
+        >
           <el-form
             :inline="true"
+            inline-message
             :model="addRelationForm"
             ref="addRelationForm"
             label-width="100px"
@@ -346,7 +351,7 @@
                 </el-select>
               </el-form-item>
             </el-row>
-            <el-row class="pull_center">
+            <el-row class="d-flex justify-content-center">
               <el-button type="primary" @click="submitAddRelationForm">
                 保 存
               </el-button>
@@ -512,8 +517,8 @@ export default {
       specialtyDialogTitle: null,
       specialtySearchForm: {
         courseId: null,
-        code: null,
-        name: null
+        code: "",
+        name: ""
       },
       specialtyTableData: [],
       currentSpecialtyPage: 1,
@@ -803,8 +808,8 @@ export default {
         row.code +
         "】";
       this.specialtySearchForm.courseId = row.id;
-      this.specialtySearchForm.name = null;
-      this.specialtySearchForm.code = null;
+      this.specialtySearchForm.name = "";
+      this.specialtySearchForm.code = "";
 
       this.searchSpecialtyPage();
       this.specialtyDialog = true;
@@ -1108,11 +1113,10 @@ export default {
       }
     },
     uploadError(response) {
-      var jsonStr = response.message.substring(4);
-      var resp = eval("(" + jsonStr + ")");
+      var json = JSON.parse(response.message);
       if (response.status == 500) {
         this.$notify({
-          message: resp.desc,
+          message: json.desc,
           type: "error"
         });
       }

src/modules/basic/view/role_privilege_settings.vue

@@ -3,12 +3,7 @@
     <div class="box box-info">
       <div class="box-body">
         <!-- 选择 -->
-        <el-form
-          :inline="true"
-          :model="form"
-          label-position="right"
-          label-width="100px"
-        >
+        <el-form :inline="true" :model="form" label-position="right">
           <el-row>
             <el-form-item label="顶级机构" class="pull-left">
               <el-select
@@ -59,14 +54,14 @@
           </el-row>
         </el-form>
 
-        <div style="margin-bottom:10px;margin-left: 50px;">
+        <div style="margin-bottom:10px;">
           <el-button type="primary" :disabled="!treeChanged" @click="save">
             保 存
           </el-button>
         </div>
 
         <!-- 权限树 -->
-        <div style="width: 50%;margin-left: 50px;">
+        <div style="width: 50%;">
           <el-tree
             class="el-tree"
             :data="treeData"

src/modules/basic/view/specially.vue

@@ -298,7 +298,7 @@
       </div>
 
       <!-- 导入弹窗 -->
-      <el-dialog title="导入窗口" :visible.sync="impDialog">
+      <el-dialog title="导入窗口" width="420px" :visible.sync="impDialog">
         <el-form>
           <el-row>
             <el-form-item style="margin-left:20px">
@@ -320,6 +320,7 @@
                 <el-button size="small" slot="trigger" type="primary">
                   选择文件
                 </el-button>
+                &nbsp;
                 <el-button size="small" type="success" @click="submitUpload">
                   确认上传
                 </el-button>

src/modules/examwork/view/examInfo.vue

@@ -54,17 +54,23 @@
 
         <!-- 弹出窗口 -->
         <el-dialog
-          title="请选择考试类型："
-          size="small"
+          title="请选择考试类型"
+          width="600px"
           :visible.sync="examInfoDialog"
         >
-          <el-button type="primary" @click="toTradition">传统考试</el-button>
-          <el-button type="primary" @click="toOnline">网络考试</el-button>
-          <el-button type="primary" @click="toPractice">练习考试</el-button>
-          <el-button type="primary" @click="toOffline">离线考试</el-button>
-          <el-button type="primary" @click="toPrint"> 分布式印刷考试</el-button>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="examInfoDialog = false">取 消</el-button>
+          <el-button-group>
+            <el-button @click="toTradition">传统考试</el-button>
+            <el-button @click="toOnline">网络考试</el-button>
+            <el-button @click="toPractice">练习考试</el-button>
+            <el-button @click="toOffline">离线考试</el-button>
+            <el-button @click="toPrint">
+              分布式印刷考试</el-button
+            ></el-button-group
+          >
+          <div style="margin-top: 10px;text-align: center;">
+            <el-button type="primary" @click="examInfoDialog = false"
+              >取 消</el-button
+            >
           </div>
         </el-dialog>
 
@@ -112,12 +118,12 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>
           </el-table-column>
-          <el-table-column label="操作" width="160">
+          <el-table-column label="操作" width="190">
             <template slot-scope="scope">
               <div>
                 <el-button
@@ -125,6 +131,7 @@
                   size="mini"
                   plain
                   type="primary"
+                  icon="el-icon-edit"
                   @click="editExamInfoDialog(scope.row)"
                 >
                   编辑

src/modules/examwork/view/examStudent.vue

@@ -673,7 +673,7 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>

src/modules/examwork/view/student.vue

@@ -204,7 +204,7 @@
                   content="禁用"
                   placement="left"
                 >
-                  <i class="el-icon-success" style="color:red;"></i>
+                  <i class="el-icon-error" style="color:red;"></i>
                 </el-tooltip>
               </span>
             </span>