|
|
@@ -18,18 +18,23 @@
|
|
|
>一键导出</el-button
|
|
|
>
|
|
|
<el-button @click="exportData"
|
|
|
- v-if="cutTabNum == 0 && multipleSelection.length > 1"
|
|
|
+ v-if="DState == 5 && cutTabNum == 0 && multipleSelection.length > 1"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
>批量导出</el-button
|
|
|
>
|
|
|
<el-button @click="exportData"
|
|
|
- v-if="cutTabNum == 0 && multipleSelection.length < 2"
|
|
|
+ v-if="DState == 5 && cutTabNum == 0 && multipleSelection.length < 2"
|
|
|
type="info"
|
|
|
disabled
|
|
|
size="small"
|
|
|
>批量导出</el-button
|
|
|
>
|
|
|
+ <el-button @click="customizeExport"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ >{{ DState == 5 ? '按任务导出' : '自定义导出' }}</el-button
|
|
|
+ >
|
|
|
<el-button style="margin-left: 20px;" @click="retPage" type="primary" size="small">返回</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -159,10 +164,12 @@
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column
|
|
|
- v-show="cutTabNum == 0"
|
|
|
+ v-if="cutTabNum == 0 && DState == 5"
|
|
|
+ key="1"
|
|
|
type="selection"
|
|
|
width="55">
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="sName"
|
|
|
label="姓名"
|
|
|
@@ -1569,19 +1576,36 @@
|
|
|
class="worksDialogCSSExp"
|
|
|
:append-to-body="true"
|
|
|
:fullscreen="true"
|
|
|
-
|
|
|
>
|
|
|
<div slot="title" class="header-title">
|
|
|
<div style="color: #fff">导出作业集</div>
|
|
|
</div>
|
|
|
<exportWorksDialog :key="exportW" :multipleSelection="multipleSelection" :digNum="digNum" :oid="oid" :worksDialog.sync="worksDialog" :worksDialogCon="worksDialogCon" :uid="exportPdfSetUid" :cid="id"></exportWorksDialog>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+<!-- 自定义导出作业筛选弹框 -->
|
|
|
+ <el-dialog
|
|
|
+ title="自定义导出作业"
|
|
|
+ :visible.sync="dialogVisibleBao"
|
|
|
+ :append-to-body="true"
|
|
|
+ width="550px"
|
|
|
+ :before-close="handleClose"
|
|
|
+ class="dialog_diy r_diy"
|
|
|
+ >
|
|
|
+ <div>
|
|
|
+ <div>
|
|
|
+ <Report :cid="dataJson.courseId" :dataJson="dataJson"></Report>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer"> </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import StudentData from "./studentData";
|
|
|
import exportWorksDialog from "./exportWorksDialog";
|
|
|
+import Report from "./report";
|
|
|
|
|
|
import pdf from "./vpdf";
|
|
|
import htmlDocx from "html-docx-js/dist/html-docx";
|
|
|
@@ -1595,6 +1619,7 @@ export default {
|
|
|
LookWork,
|
|
|
pdf,
|
|
|
exportWorksDialog,
|
|
|
+ Report
|
|
|
},
|
|
|
props: ["cid", "uid", "ooid","DState","dataJson"],
|
|
|
data() {
|
|
|
@@ -1834,7 +1859,8 @@ export default {
|
|
|
exportPdfSetUid:'',
|
|
|
exportW:0,
|
|
|
digNum:0,
|
|
|
- multipleSelection:[]
|
|
|
+ multipleSelection:[],
|
|
|
+ dialogVisibleBao:false
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -1931,6 +1957,11 @@ export default {
|
|
|
return;
|
|
|
});
|
|
|
},
|
|
|
+ // 自定义导出
|
|
|
+ customizeExport(){
|
|
|
+ this.dialogVisibleBao = true
|
|
|
+ },
|
|
|
+
|
|
|
// 批量导出
|
|
|
exportData(){
|
|
|
// this.$emit("update:dialogVisibleBao", true);
|
|
|
@@ -2168,7 +2199,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
handleClose(done) {
|
|
|
- this.studentId =""
|
|
|
+ // this.studentId =""
|
|
|
done();
|
|
|
},
|
|
|
tableRowClassName({ row, rowIndex }) {
|
|
|
@@ -2192,17 +2223,17 @@ export default {
|
|
|
// this.getWorks();
|
|
|
},
|
|
|
lookWork(id, uid, type, index,con) {
|
|
|
- console.log('con',con);
|
|
|
+ // console.log('con',con);
|
|
|
|
|
|
this.scopeId1 = id;
|
|
|
this.studentId = uid;
|
|
|
|
|
|
- if (this.DState == 5) {
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.dialogVisible3 = true
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (this.DState == 5) {
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.dialogVisible3 = true
|
|
|
+ })
|
|
|
+ // }
|
|
|
+ return
|
|
|
|
|
|
|
|
|
|
11wqe1