@@ -129,6 +129,16 @@ const tingKeZuJiAddModal = ref();
const queryParam = ref
({});
let listData = ref([]);
+function isDeisabled(item){
+ var skrq = item.skrq;
+ console.log("🚀 ~ isDeisabled ~ skrq:", skrq)
+ const nowDate = new Date();
+ const format = 'yyyy-MM-dd';
+ const nowStr = dateFormat(nowDate, format)
+ console.log("🚀 ~ isDeisabled ~ nowStr:", nowStr)
+ return skrq > nowStr
+
+}
//进入就加载
onMounted(() => {
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index fff1187..eebe8bd 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -55,7 +55,8 @@
>{{ getCctype(item, '4') }}报告
- Aigc查重：{{ getCctype(item, '3') }}
+ Aigc查重：
+ {{ getCctype(item, '3') }}
报告
@@ -242,17 +243,20 @@ function handleHuping(record) {
}
function getCctype(record, type) {
+ console.log("🚀 ~ getCctype ~ record, type:", record, type)
var text = '-';
if (type == '1') {
if (record.wwcc == 'true') {
if (record.wwxsl) {
text = record.wwxsl + '%';
- } else if (record.wwsftg && record.wwsftg.indexOf('失败') != -1) {
- text = '失败';
- } else if (record.stuFilePath) {
+ } else if (record.wwsftg) {
+ text = record.wwsftg;
+ } else if (record.stuFilePath && !record.wwsftg) {
text = '检测中';
- } else {
+ } else if (!record.stuFilePath ) {
text = '待提交';
+ } else {
+ text = '查重失败请联系教务处，联系电话:85099971';
}
} else {
text = '不查重';
@@ -261,12 +265,14 @@ function getCctype(record, type) {
if (record.nwcc == 'true') {
if (record.nwxsl) {
text = record.nwxsl + '%';
- } else if (record.nwsftg && record.nwsftg.indexOf('失败') != -1) {
- text = '失败';
- } else if (record.stuFilePath) {
+ } else if (record.nwsftg) {
+ text = record.nwsftg;
+ } else if (record.stuFilePath && !record.nwsftg) {
text = '检测中';
- } else {
+ } else if (!record.stuFilePath ) {
text = '待提交';
+ } else {
+ text = '查重失败请联系教务处，联系电话:85099971';
}
} else {
text = '不查重';
@@ -275,12 +281,14 @@ function getCctype(record, type) {
if (record.aigccc == 'true') {
if (record.aigcxsl) {
text = record.aigcxsl + '%';
- } else if (record.aigcsftg && record.aigcsftg.indexOf('失败') != -1) {
- text = '失败';
- } else if (record.stuFilePath) {
+ } else if (record.aigcsftg) {
+ text = record.aigcsftg;
+ } else if (record.stuFilePath && !record.aigcsftg) {
text = '检测中';
- } else {
+ } else if (!record.stuFilePath ) {
text = '待提交';
+ } else {
+ text = '查重失败请联系教务处，联系电话:85099971';
}
} else {
text = '不查重';
@@ -289,12 +297,14 @@ function getCctype(record, type) {
if (record.xncc == 'true') {
if (record.xnxsl) {
text = record.xnxsl + '%';
- } else if (record.xnsftg && record.xnsftg.indexOf('失败') != -1) {
- text = '失败';
- } else if (record.stuFilePath) {
+ } else if (record.xnsftg) {
+ text = record.xnsftg;
+ } else if (record.stuFilePath && !record.xnsftg) {
text = '检测中';
- } else {
+ } else if (!record.stuFilePath ) {
text = '待提交';
+ } else {
+ text = '查重失败请联系教务处，联系电话:85099971';
}
} else {
text = '不查重';
@@ -383,13 +393,13 @@ function handlePreview(record) {
const parts = record.stuFilePath.split('.');
const filetype = parts[parts.length - 1];
if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' || filetype=='doc' || filetype=='docx' || filetype=='pdf'){
- var file = baseApiUrl + "/"+record.stuFilePath;
- console.log('🤬', file);
- window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ // var file = baseApiUrl + "/"+record.stuFilePath;
+ // console.log('🤬', file);
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
// }else if(filetype=='doc' || filetype=='docx' || filetype=='pdf'){
- // var url2 = getFileAccessHttpUrl(record.stuPdfPath);
- // let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
- // window.open(url, '_blank');
+ var url2 = getFileAccessHttpUrl(record.stuPdfPath);
+ let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+ window.open(url, '_blank');
}else{
createMessage.error('暂不支持该文件预览！');
}
diff --git a/src/views/zy/zyInfo/ZyInfoQimoV2List.vue b/src/views/zy/zyInfo/ZyInfoQimoV2List.vue
index e6b441d..8dc2552 100644
--- a/src/views/zy/zyInfo/ZyInfoQimoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoQimoV2List.vue
@@ -619,7 +619,7 @@ import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
import dayjs, { Dayjs } from 'dayjs';
import { useListPage } from '/@/hooks/system/useListPage';
import { newcolumns } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';
-import { newlist, getExportUrl, batchFabu, batchFabu2, batchKhcl } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.api';
+import { getList2, getExportUrl, batchFabu, batchFabu2, batchKhcl } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { useGlobSetting } from '/@/hooks/setting';
@@ -689,10 +689,11 @@ const pdfUrl = ref('/downPath/ylhpsf.pdf');
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
- api: newlist,
+ api: getList2,
columns: newcolumns,
canResize: false,
useSearchForm: false,
+ immediate: false,
pagination: {
current: 1,
pageSize: 10,
@@ -1634,7 +1635,7 @@ function handleZyxx(record, type) {
selectedRowKeys.value = [];
console.log('🧟♀️', rowSelection);
queryParam.value = {};
- queryParam.value.mainId = record.id;
+ queryParam.value.ywid = record.id;
queryParam.value.queryType = type;
reload();
}
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index dc336b5..b981b4b 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -676,6 +676,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
columns: newcolumns,
canResize: false,
useSearchForm: false,
+ immediate: false,
pagination: {
current: 1,
pageSize: 10,
diff --git a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
index 5aac7da..f66d202 100644
--- a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
@@ -720,6 +720,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
columns: newcolumns,
canResize: false,
useSearchForm: false,
+ immediate: false,
pagination: {
current: 1,
pageSize: 10,