#

src/components/pages/components/lookWork.vue

@@ -31,6 +31,7 @@
           <el-menu
             default-active="2"
             :default-openeds="['0']"
+            active-text-color="#409EFF"
             class="el-menu-vertical-demo"
           >
             <el-submenu
@@ -50,7 +51,7 @@
                 <el-menu-item
                   v-for="(k, kin) in i.taskList"
                   :key="k.id"
-                  :index="k.id"
+                  :index="i.id+'-'+k.id"
                   style="display: flex; align-items: center"
                 >
                   <div @click.stop="positT(k.id)" class="TitBti">
@@ -835,7 +836,7 @@ export default {
         .get(this.$store.state.api + "getCourseWorks6", params) //getCourseWorks4
         .then(res => {
           this.tableData = res.data[0];
-          console.log("this.tableData", this.tableData);
+          // console.log("this.tableData", this.tableData);
 
           this.exportPdfSet();
         })
@@ -877,6 +878,8 @@ export default {
             var wordInfo = res.data[12]; //文档作业
             this.workEvaList = res.data[13];
 
+            console.log('res.data[0][0]',res.data[0][0]);
+            
             this.courseName = res.data[0][0].course;
             this.CState = res.data[0][0].state;
 
@@ -1057,6 +1060,8 @@ export default {
     },
     // 点击任务滑动跳转
     positT(val) {
+      console.log('666666');
+      
       let a = document.getElementById(val);
       if (a) {
         a.scrollIntoView({
@@ -1130,12 +1135,11 @@ export default {
   box-sizing: border-box;
 }
 .rightBar {
-  min-width: 300px;
   margin-right: 20px;
   border-radius: 10px;
   height: 100%;
-  min-width: 200px;
-  overflow-y: auto;
+  width: 270px;
+  overflow: hidden;
   background-color: #ffffff;
 }
 .workCon {

src/components/pages/components/studentWorksDetail.vue

@@ -1470,7 +1470,7 @@
     </el-dialog>
 
     <div class="report_box" v-if="reportVisible">
-      <el-dialog
+      <!-- <el-dialog
         v-if="exportData.state == 5"
         :visible.sync="reportVisible"
         width="100%"
@@ -1481,7 +1481,7 @@
       <div slot="title" class="header-title">
         <div style="color: #fff">查看作业</div>
       </div>
-    </el-dialog>
+    </el-dialog>  -->
 
     <el-dialog
       v-if="exportData.state == 5"

src/components/pages/components/worksDetail2.vue

@@ -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
       
             
       

src/components/pages/works.vue

@@ -326,21 +326,7 @@
     ></WorkDate>
     
     
-    <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"></Report>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer"> </span>
-    </el-dialog>
+