deason 6 жил өмнө
parent
commit
c562a1a738

+ 85 - 56
src/modules/print/view/CourseStatistic.vue

@@ -90,44 +90,46 @@
               @click="searchRecords(1)"
               >查询
             </el-button>
-
-            <el-button
-              size="small"
-              type="primary"
-              icon="el-icon-menu"
-              @click="openAllotAllDialog"
-              :disabled="!hasPermit"
-              >分配待指定试卷
-            </el-button>
-
-            <el-button
-              size="small"
-              type="primary"
-              icon="el-icon-download"
-              @click="openExportAllDialog"
-              >整体导出
-            </el-button>
-
-            <el-button
-              size="small"
-              type="primary"
-              icon="el-icon-download"
-              :disabled="selectElements.length == 0"
-              @click="openExportDialog"
-              >批量导出
-            </el-button>
-
-            <el-button
-              size="small"
-              type="primary"
-              icon="el-icon-refresh"
-              :disabled="selectElements.length == 0"
-              @click="refreshStatistic"
-              >刷新
-            </el-button>
           </el-form-item>
         </el-form>
 
+        <div style="margin-bottom: 5px;float: right;">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-menu"
+            @click="openAllotAllDialog"
+            :disabled="!hasPermit"
+            >分配待指定试卷
+          </el-button>
+
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-download"
+            @click="openExportAllDialog"
+            >整体导出
+          </el-button>
+
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-download"
+            :disabled="selectElements.length == 0"
+            @click="openExportDialog"
+            >批量导出
+          </el-button>
+
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-refresh"
+            :disabled="selectElements.length == 0"
+            @click="refreshStatistic"
+            >刷新
+          </el-button>
+        </div>
+
         <!-- 数据列表 -->
         <el-table
           v-loading="loading"
@@ -155,35 +157,52 @@
           <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">
+          <el-table-column width="180px" label="操作" :context="_self">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                icon="el-icon-view"
-                v-show="scope.row.paperStatus > 1"
-                @click="preview(scope.row)"
-                plain
-                >预览
-              </el-button>
-
               <el-button
                 size="mini"
                 icon="el-icon-download"
-                v-show="scope.row.paperStatus > 1"
+                :disabled="scope.row.paperStatus <= 1"
                 @click="openExportDialog(scope.row)"
                 plain
                 >下载
               </el-button>
 
-              <el-button
-                size="mini"
-                icon="el-icon-menu"
-                :disabled="!hasPermit"
-                v-show="scope.row.paperStatus > 1"
-                @click="openAllotDialog(scope.row)"
-                plain
-                >试卷指定
-              </el-button>
+              <el-dropdown style="margin-left: 10px;">
+                <el-button
+                  size="mini"
+                  :disabled="scope.row.paperStatus == 0"
+                  plain
+                >
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-view"
+                      :disabled="scope.row.paperStatus <= 1"
+                      @click="preview(scope.row)"
+                      plain
+                      >试卷预览
+                    </el-button>
+                  </el-dropdown-item>
+
+                  <el-dropdown-item>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-menu"
+                      :disabled="!hasPermit"
+                      @click="openAllotDialog(scope.row)"
+                      plain
+                      >试卷指定
+                    </el-button>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
@@ -719,7 +738,17 @@ export default {
         });
         return;
       }
-      window.open(url);
+      this.$confirm("确定预览?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          window.open(url);
+        })
+        .catch(() => {
+          /*ignore*/
+        });
     },
     openAllotDialog(row) {
       /* 试卷状态为"已有"时,打开试卷指定弹窗 */

+ 13 - 2
src/modules/print/view/ProjectTemplate.vue

@@ -350,8 +350,19 @@ export default {
         });
         return;
       }
-      let url = PRINT_API + "/common/download?filePath=" + filePath;
-      window.location.href = url;
+
+      this.$confirm("确定下载?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          let url = PRINT_API + "/common/download?filePath=" + filePath;
+          window.location.href = url;
+        })
+        .catch(() => {
+          /*ignore*/
+        });
     },
     checkEmptyStr: checkEmptyStr
   },