PDF预览&学生学号&阅卷配置

TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkSetting.vue

@@ -379,7 +379,6 @@ export default {
 
             // 通过验证，保存设置
             this.setting.code = this.$store.state.userInfo.schoolCode
-            console.log(this.setting)
             this.$api.mark.UpsertMarkSet(this.setting).then(
                 res => {
                     this.$Message.success('保存成功！')
@@ -394,7 +393,6 @@ export default {
             let subject = this.setting.subs.find(item => {
                 return this.subjects[this.curSubIndex].id == item.id
             })
-            console.log('点前学科', subject)
             if (subject) {
                 let ids = subject.markers.map(item => {
                     return item.id
@@ -418,7 +416,6 @@ export default {
 
                 })
             }
-            console.log(this.setting)
             this.cancel()
         },
         cancel() {
@@ -483,7 +480,6 @@ export default {
     watch: {
         'evInfo.id': {
             handler(n, o) {
-                console.log(this.evInfo)
                 if (this.evInfo.id) {
                     this.findSettingInfo()
                 } else {
@@ -495,7 +491,6 @@ export default {
         },
         isSetting: {
             handler(n, o) {
-                console.log('watch', n, o)
                 this.$emit('statusChange', this.isSetting)
             },
             immediate: true

TEAMModelOS/ClientApp/src/view/student-account/Index.vue

@@ -547,12 +547,6 @@ export default {
                     align: 'center',
                     sortable: true
                 },
-                {
-                    key: 'stuId',
-                    title: '学号',
-                    align: 'center',
-                    sortable: true
-                },
                 {
                     key: 'year',
                     title: '学级',

TEAMModelOS/ClientApp/src/view/task/index.vue

@@ -38,7 +38,7 @@
                             {{$t('task.markMode1')}}
                         </span>
                     </div>
-                    <vuescroll class="mark-info-content">
+                    <vuescroll class="mark-info-content" v-if="markList.length > 0">
                         <StuProg v-show="curBarIndex == 1" @getStuId="toByStuView" :stusData="markData ? markData.attr : []"  :total="markList[curTaskIndex] ? markList[curTaskIndex].count : 1"></StuProg>
                         <!-- 按题 批阅进度 -->
                         <div class="setting-block" v-show="curBarIndex == 0" style="margin-top:15px">
@@ -77,6 +77,7 @@
                             </div>
                         </div> -->
                     </vuescroll>
+                    <EmptyData textContent="暂无阅卷任务" :top="90" style="height:fit-content"></EmptyData>
                 </div>
             </Split>
         </div>

TEAMModelOS/ClientApp/src/view/task/mark/ProgPie.vue

@@ -100,7 +100,6 @@ export default {
         count: {
             handler(n, o) {
                 this.count.forEach((item, index) => {
-                    console.log(item, index)
                     this.option.series[0].data[index].value = item
                 })
                 if (!this.techScoreGau) {

TEAMModelOS/ClientApp/src/view/teachcontent/index.vue

@@ -84,7 +84,7 @@
                     <ResBelong class="pd-filter-wrap" v-show="routerScope == 'school'" @pd-change="(data)=>{filterPeriod = data}"></ResBelong>
                     <div class="content-filter-wrap">
                         <Input v-model="keyWord" search size="small" :placeholder="$t('teachContent.searchText')" class="key-word-search" @on-change="searchKeyWord" @on-search="searchKeyWord" />
-                        <CheckboxGroup v-model="extFilter"  @on-change="filterFileByExtension">
+                        <CheckboxGroup v-model="extFilter" @on-change="filterFileByExtension">
                             <Checkbox :label="item" v-for="(item ,index) in extensions" :key="index">
                                 <span>{{item}}</span>
                             </Checkbox>
@@ -186,7 +186,7 @@
                     {{$t('teachContent.notAudio')}}
                 </audio>
                 <img v-else-if="previewFile.type == 'image'" :src="previewFile.url" style="border-radius: 5px;max-height: 800px;max-width:870px;" />
-                <embed v-else-if="previewFile.extension == 'PDF'" :src="previewFile.url" width="870" height="720" />
+                <iframe v-else-if="previewFile.extension == 'PDF'" :src="'/web/viewer.html?file=' + escapeBlobUrl" width='870' height='700' frameborder='1'></iframe>
                 <iframe v-else :src="'https://view.officeapps.live.com/op/view.aspx?src=' + escapeBlobUrl" width='870' height='700' frameborder='1'></iframe>
             </div>
         </div>
@@ -837,16 +837,22 @@ export default {
                 xhr.send(formData);
             })
         },
+        /* 打开PDF文件进行预览 */
+        openPdf(url) {
+            window.open('/web/viewer.html?file=' + encodeURIComponent(url))
+        },
         openPreviewFile(index) {
             // if (this.fileListShow[index].extension == 'HTEX') {
             //     this.$Message.warning('暂未处理HTEX文件预览功能')
             //     return
             // }
             this.previewFile = this._.cloneDeep(this.fileListShow[index])
+            // PDF预览
             if (this.activeType == 'image' || this.activeType == 'video') {
                 this.previewFile.url = this.previewFile.url.replace('thum/', '')
             }
-            if (this.fileListShow[index].type == 'image' || this.fileListShow[index].type == 'video' || this.fileListShow[index].extension == 'pdf') {
+            if (this.fileListShow[index].extension == 'PDF') {
+                this.escapeBlobUrl = encodeURIComponent(this.previewFile.url)
             } else {
                 this.escapeBlobUrl = escape(this.previewFile.url)
             }