weiwenhai 6 жил өмнө
parent
commit
4ceb045c2d

+ 1 - 0
src/modules/questions/views/BluePaperStructure.vue

@@ -119,6 +119,7 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="editStruct(scope.row)"
                 @click="editStruct(scope.row)"
+                plain
                 ><i class="el-icon-edit"></i>编辑</el-button
                 ><i class="el-icon-edit"></i>编辑</el-button
               >
               >
               <el-button
               <el-button

+ 30 - 12
src/modules/questions/views/CourseProperty.vue

@@ -62,10 +62,10 @@
           <el-form-item class="pull-left">
           <el-form-item class="pull-left">
             <span>批量操作:</span>
             <span>批量操作:</span>
             <el-button size="small" type="primary" @click="openCoursePropertys"
             <el-button size="small" type="primary" @click="openCoursePropertys"
-              ><i class="el-icon-circle-check"></i> 启用</el-button
+              ><i class="el-icon-check"></i> 启用</el-button
             >
             >
             <el-button size="small" type="danger" @click="closeCoursePropertys"
             <el-button size="small" type="danger" @click="closeCoursePropertys"
-              ><i class="el-icon-circle-close"></i> 禁用</el-button
+              ><i class="el-icon-close"></i> 禁用</el-button
             >
             >
           </el-form-item>
           </el-form-item>
         </el-row>
         </el-row>
@@ -93,7 +93,26 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="状态">
         <el-table-column label="状态">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <span>{{ getEnable(scope.row.enable) }}</span>
+            <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>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" width="260">
         <el-table-column label="操作" width="260">
@@ -103,19 +122,25 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="editCourseProperty(scope.row)"
                 @click="editCourseProperty(scope.row)"
+                plain
                 ><i class="el-icon-zoom-in"></i> 详情
                 ><i class="el-icon-zoom-in"></i> 详情
               </el-button>
               </el-button>
               <el-button
               <el-button
+                v-if="!scope.row.enable"
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
+                plain
                 @click="openCourseProperty(scope.row)"
                 @click="openCourseProperty(scope.row)"
-                ><i class="el-icon-circle-check"></i> 启用
+              >
+                <i class="fa fa-check" aria-hidden="true"></i>启用
               </el-button>
               </el-button>
               <el-button
               <el-button
+                v-if="scope.row.enable"
                 size="mini"
                 size="mini"
                 type="danger"
                 type="danger"
                 @click="closeCourseProperty(scope.row)"
                 @click="closeCourseProperty(scope.row)"
-                ><i class="el-icon-circle-close"></i> 禁用
+              >
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
               </el-button>
               </el-button>
             </div>
             </div>
           </template>
           </template>
@@ -428,13 +453,6 @@ export default {
         }
         }
       });
       });
     },
     },
-    getEnable(value) {
-      if (value === true) {
-        return "开启";
-      } else {
-        return "禁用";
-      }
-    },
     //查询所有课程
     //查询所有课程
     getCourses(query) {
     getCourses(query) {
       query = query.trim();
       query = query.trim();

+ 5 - 1
src/modules/questions/views/ExportStructure.vue

@@ -118,7 +118,11 @@
         <el-table-column label="操作" width="175">
         <el-table-column label="操作" width="175">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div class="operate_left">
             <div class="operate_left">
-              <el-button size="mini" type="primary" @click="copy(scope.row)"
+              <el-button
+                size="mini"
+                type="primary"
+                @click="copy(scope.row)"
+                plain
                 ><i class="el-icon-edit"></i>复用</el-button
                 ><i class="el-icon-edit"></i>复用</el-button
               >
               >
               <el-button size="mini" type="danger" @click="del(scope.row)"
               <el-button size="mini" type="danger" @click="del(scope.row)"

+ 2 - 0
src/modules/questions/views/ExtractPaperRule.vue

@@ -134,6 +134,7 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="updateRules(scope.row)"
                 @click="updateRules(scope.row)"
+                plain
                 ><i class="el-icon-edit"></i>修改
                 ><i class="el-icon-edit"></i>修改
               </el-button>
               </el-button>
               <el-button
               <el-button
@@ -141,6 +142,7 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="openSingleExportPaperDialog(scope.row)"
                 @click="openSingleExportPaperDialog(scope.row)"
+                plain
                 ><i class="el-icon-download"></i> 下载
                 ><i class="el-icon-download"></i> 下载
               </el-button>
               </el-button>
             </div>
             </div>

+ 4 - 0
src/modules/questions/views/GenPaper.vue

@@ -156,6 +156,7 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="editGenPaper(scope.row)"
                 @click="editGenPaper(scope.row)"
+                plain
                 ><i class="el-icon-edit"></i>编辑</el-button
                 ><i class="el-icon-edit"></i>编辑</el-button
               >
               >
               <el-dropdown class="button_left">
               <el-dropdown class="button_left">
@@ -168,6 +169,7 @@
                       size="mini"
                       size="mini"
                       type="primary"
                       type="primary"
                       @click="openExportDialog(scope.row)"
                       @click="openExportDialog(scope.row)"
+                      plain
                       ><i class="el-icon-download"></i> 下载</el-button
                       ><i class="el-icon-download"></i> 下载</el-button
                     >
                     >
                   </el-dropdown-item>
                   </el-dropdown-item>
@@ -176,6 +178,7 @@
                       size="mini"
                       size="mini"
                       type="primary"
                       type="primary"
                       @click="previewPDF2(scope.row)"
                       @click="previewPDF2(scope.row)"
+                      plain
                       ><i class="el-icon-zoom-in"></i> 预览</el-button
                       ><i class="el-icon-zoom-in"></i> 预览</el-button
                     >
                     >
                   </el-dropdown-item>
                   </el-dropdown-item>
@@ -184,6 +187,7 @@
                       size="mini"
                       size="mini"
                       type="primary"
                       type="primary"
                       @click="openPrint(scope.row)"
                       @click="openPrint(scope.row)"
+                      plain
                       ><i class="el-icon-share"></i> 发送</el-button
                       ><i class="el-icon-share"></i> 发送</el-button
                     >
                     >
                   </el-dropdown-item>
                   </el-dropdown-item>

+ 4 - 1
src/modules/questions/views/ImportPaper.vue

@@ -69,7 +69,7 @@
                 ><i class="el-icon-search"></i> 查询</el-button
                 ><i class="el-icon-search"></i> 查询</el-button
               >
               >
               <el-button size="small" type="primary" @click="impPaper"
               <el-button size="small" type="primary" @click="impPaper"
-                ><i class="el-icon-upload"></i> 导入</el-button
+                ><i class="el-icon-upload2"></i> 导入</el-button
               >
               >
               <el-dropdown class="button_left">
               <el-dropdown class="button_left">
                 <el-button type="primary" size="small">
                 <el-button type="primary" size="small">
@@ -173,6 +173,7 @@
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
                 @click="editImportPaper(scope.row)"
                 @click="editImportPaper(scope.row)"
+                plain
                 ><i class="el-icon-edit"></i>编辑</el-button
                 ><i class="el-icon-edit"></i>编辑</el-button
               >
               >
               <el-dropdown class="button_left">
               <el-dropdown class="button_left">
@@ -185,6 +186,7 @@
                       size="mini"
                       size="mini"
                       type="primary"
                       type="primary"
                       @click="copyImportPaper(scope.row)"
                       @click="copyImportPaper(scope.row)"
+                      plain
                       ><i class="el-icon-tickets"></i> 复制</el-button
                       ><i class="el-icon-tickets"></i> 复制</el-button
                     >
                     >
                   </el-dropdown-item>
                   </el-dropdown-item>
@@ -193,6 +195,7 @@
                       size="mini"
                       size="mini"
                       type="primary"
                       type="primary"
                       @click="exportOriginalPaper(scope.row)"
                       @click="exportOriginalPaper(scope.row)"
+                      plain
                       ><i class="el-icon-download"></i> 下载</el-button
                       ><i class="el-icon-download"></i> 下载</el-button
                     >
                     >
                   </el-dropdown-item>
                   </el-dropdown-item>

+ 1 - 1
src/modules/questions/views/ImportPaperInfo.vue

@@ -268,7 +268,7 @@ export default {
           this.$http
           this.$http
             .get(CORE_API + "/course/query?name=" + query + "&enable=true")
             .get(CORE_API + "/course/query?name=" + query + "&enable=true")
             .then(response => {
             .then(response => {
-              this.courseList = response.body;
+              this.courseList = response.data;
               this.courseLoading = false;
               this.courseLoading = false;
             });
             });
         }
         }

+ 1 - 0
src/modules/questions/views/PaperStructure.vue

@@ -137,6 +137,7 @@
               <el-button
               <el-button
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
+                plain
                 @click="editPaperStruct(scope.row)"
                 @click="editPaperStruct(scope.row)"
                 ><i class="el-icon-edit"></i>编辑</el-button
                 ><i class="el-icon-edit"></i>编辑</el-button
               >
               >

+ 1 - 0
src/modules/questions/views/Question.vue

@@ -204,6 +204,7 @@
                 v-if="scope.row.questionType !== 'NESTED_ANSWER_QUESTION'"
                 v-if="scope.row.questionType !== 'NESTED_ANSWER_QUESTION'"
                 size="mini"
                 size="mini"
                 type="primary"
                 type="primary"
+                plain
                 @click="updateRow(scope.row)"
                 @click="updateRow(scope.row)"
               >
               >
                 <i class="el-icon-edit"></i>编辑
                 <i class="el-icon-edit"></i>编辑