diff --git a/src/router/routes/modules/site/site.ts b/src/router/routes/modules/site/site.ts
index 38cc59a..712122e 100644
--- a/src/router/routes/modules/site/site.ts
+++ b/src/router/routes/modules/site/site.ts
@@ -204,14 +204,14 @@ const site: AppRouteModule = {
// title: '直播rtsp',
// }
// },
- // {
- // path: 'liveFlvView',
- // name: 'LiveFlvBroadcastRoom',
- // component: () => import('/@/views/site/common/video/flvjs/index.vue'),
- // meta: {
- // title: '直播flv.js',
- // }
- // },
+ {
+ path: 'liveFlvView',
+ name: 'LiveFlvBroadcastRoom',
+ component: () => import('/@/views/site/common/video/flvjs/index.vue'),
+ meta: {
+ title: '直播flv.js',
+ }
+ },
{
path: 'livem3u8View',
name: 'Live3u8BroadcastRoom',
diff --git a/src/views/kc/detection/KcDetectionMain.data.ts b/src/views/kc/detection/KcDetectionMain.data.ts
index 6b73f1a..9b3c4bd 100644
--- a/src/views/kc/detection/KcDetectionMain.data.ts
+++ b/src/views/kc/detection/KcDetectionMain.data.ts
@@ -12,6 +12,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'xnxq'
},
+ {
+ title: '开课单位',
+ align: "center",
+ dataIndex: ['ketangbiaoInfo', 'kkdw']
+ },
{
title: '课程名称',
align: "center",
diff --git a/src/views/kc/detection/KcDetectionMainList.vue b/src/views/kc/detection/KcDetectionMainList.vue
index b449b02..e8a335e 100644
--- a/src/views/kc/detection/KcDetectionMainList.vue
+++ b/src/views/kc/detection/KcDetectionMainList.vue
@@ -29,7 +29,7 @@
查询
重置
-
+ 导出
@@ -92,8 +92,9 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
},
},
exportConfig: {
- name: "教室人数检测-主表",
+ name: "教室人数检测",
url: getExportUrl,
+ params: queryParam.value,
},
importConfig: {
url: getImportUrl,
diff --git a/src/views/site/kxstkkt/rkb.vue b/src/views/site/kxstkkt/rkb.vue
index d868ded..bc39603 100644
--- a/src/views/site/kxstkkt/rkb.vue
+++ b/src/views/site/kxstkkt/rkb.vue
@@ -28,6 +28,11 @@
逸夫教学楼
净月综合教学楼
惟真楼
+ 文学院
+ 地理科学学院
+ 生命科学学院
+ 体育学院
+ 历史文化学院
diff --git a/src/views/site/kxstkkt/xyjk.vue b/src/views/site/kxstkkt/xyjk.vue
index d702e9b..c7b4204 100644
--- a/src/views/site/kxstkkt/xyjk.vue
+++ b/src/views/site/kxstkkt/xyjk.vue
@@ -13,6 +13,11 @@
逸夫教学楼
净月综合教学楼
惟真楼
+ 文学院
+ 地理科学学院
+ 生命科学学院
+ 体育学院
+ 历史文化学院
diff --git a/src/views/site/kxstkkt/zzsk.vue b/src/views/site/kxstkkt/zzsk.vue
index ce962ea..2190136 100644
--- a/src/views/site/kxstkkt/zzsk.vue
+++ b/src/views/site/kxstkkt/zzsk.vue
@@ -15,6 +15,11 @@
逸夫教学楼
净月综合教学楼
惟真楼
+ 文学院
+ 地理科学学院
+ 生命科学学院
+ 体育学院
+ 历史文化学院
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index e386d18..59b2c40 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -280,30 +280,30 @@ async function handleDelete(record) {
}
function openPdf(record) {
- var file = baseApiUrl + "/"+record.filePath;
- console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ // var file = baseApiUrl + "/"+record.filePath;
+ // console.log('🤬', file);
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
- // if (record.pdfPath) {
- // var url2 = getFileAccessHttpUrl(record.pdfPath);
- // let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
- // window.open(url, '_blank');
- // } else {
- // createMessage.warning('暂无文件或文件上传中');
- // }
+ if (record.pdfPath) {
+ var url2 = getFileAccessHttpUrl(record.pdfPath);
+ let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+ window.open(url, '_blank');
+ } else {
+ createMessage.warning('暂无文件或文件上传中');
+ }
}
function openJxrlPdf(record) {
- var file = baseApiUrl + "/"+record.filePath;
- console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
- // if (record.jxrlPdfPath) {
- // var url2 = getFileAccessHttpUrl(record.jxrlPdfPath);
- // let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
- // window.open(url, '_blank');
- // } else {
- // createMessage.warning('暂无文件或文件上传中');
- // }
+ // var file = baseApiUrl + "/"+record.filePath;
+ // console.log('🤬', file);
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ if (record.jxrlPdfPath) {
+ var url2 = getFileAccessHttpUrl(record.jxrlPdfPath);
+ let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+ window.open(url, '_blank');
+ } else {
+ createMessage.warning('暂无文件或文件上传中');
+ }
}
//常见问题回调刷新
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/index.vue b/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
index 39fab47..9fb7b9e 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
@@ -819,14 +819,14 @@ async function viewThreePage(three) {
// console.log('🤬', file);
// let url = getFileAccessHttpUrl(encodeURIComponent(file));
// var t2 = encryptByBase64(url);
- // window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(t2));
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(t2));
// var file = 'https://kczxcs.nenu.edu.cn/jeecg-boot/temp/ylhpsf.pdf';
var file = baseApiUrl + "/"+three.filePath;
console.log('🤬', file);
// let url = getFileAccessHttpUrl(encodeURIComponent(file));
// var t2 = encryptByBase64(url);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
} else if (three.type == 'richText') {
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 4f83fc0..7554c4f 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -368,7 +368,7 @@ function handlePreview(record) {
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://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(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);
diff --git a/src/views/zy/zyInfo/StudentZyInfoQmksList.vue b/src/views/zy/zyInfo/StudentZyInfoQmksList.vue
index 5e42093..9b2e686 100644
--- a/src/views/zy/zyInfo/StudentZyInfoQmksList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoQmksList.vue
@@ -355,7 +355,7 @@ function handlePreview(record) {
if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
var file = baseApiUrl + "/"+record.stuFilePath;
console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(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);
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 089242e..cea5190 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -331,6 +331,7 @@
@click="onExportXls" style="margin-left: 8px">导出
发布成绩
+
温馨提示:作业完成后,请及时发布评分
@@ -712,6 +713,17 @@ const xzxstjzyOptions = ref([
{ label: '关闭', value: 'N' },
{ label: '开启', value: 'Y' },
])
+
+//一键下载
+function handleZip(){
+ defHttp.get({url:'/zyInfoStudent/zyInfoStudent/downStudentZip',params:{mainId:zyInfo.value.id}}).then(res=>{
+ console.log(res);
+ if(res.status=="1"){
+ downloadFile(res.downPath);
+ }
+ })
+}
+
//引用作业
function handleYyzy() {
var params = { xqxn, rwbh };
@@ -941,7 +953,7 @@ function yulanFile(record) {
ylimgurl.value = url2;
// var file = baseApiUrl + "/"+record.filePath;
// console.log('🤬', file);
- // window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
// var url2 = getFileAccessHttpUrl(record.filePath);
// let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
diff --git a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
index 1f379a4..5aac7da 100644
--- a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue
@@ -392,6 +392,7 @@
查询
重置
导出
+
@@ -753,6 +754,16 @@ const disabledDate = (current: Dayjs) => {
};
const useForm = Form.useForm;
+//一键下载
+function handleZip(){
+ defHttp.get({url:'/zyInfoStudent/zyInfoStudent/downStudentZip',params:{mainId:zyInfo.value.id}}).then(res=>{
+ console.log(res);
+ if(res.status=="1"){
+ downloadFile(res.downPath);
+ }
+ })
+}
+
//引用作业
function handleYyzy() {
var params = { xqxn, rwbh };
@@ -981,7 +992,7 @@ function yulanFile(record) {
ylimgurl.value = url2;
// var file = baseApiUrl + "/"+record.filePath;
// console.log('🤬', file);
- // window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+ // window.open('https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
// var url2 = getFileAccessHttpUrl(record.filePath);
// let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
index a3b8833..bca6ae5 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
@@ -203,7 +203,7 @@ function rotateImage2() {
// // var file2 = getFileAccessHttpUrl(record.pdfPath);
// // let url2 = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(file2);
// var file3 = baseApiUrl + "/"+record.filePath;
- // let url3 = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file3));
+ // let url3 = 'https://zjdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file3));
// ylurl.value = url3;
diff --git a/src/views/zy/zyZyxx/ZyZyxxList.vue b/src/views/zy/zyZyxx/ZyZyxxList.vue
index 37eac68..e5d052b 100644
--- a/src/views/zy/zyZyxx/ZyZyxxList.vue
+++ b/src/views/zy/zyZyxx/ZyZyxxList.vue
@@ -238,7 +238,7 @@ function handlePreview(record) {
if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
var file = baseApiUrl + "/"+record;
console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(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);
let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
diff --git a/src/views/zy/zyZyxx/ZyZyxxListhis.vue b/src/views/zy/zyZyxx/ZyZyxxListhis.vue
index 811e95e..2eec6c8 100644
--- a/src/views/zy/zyZyxx/ZyZyxxListhis.vue
+++ b/src/views/zy/zyZyxx/ZyZyxxListhis.vue
@@ -238,7 +238,7 @@ function handlePreview(record) {
if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
var file = baseApiUrl + "/"+record;
console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(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);
let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
diff --git a/src/views/zy/zyZyxx/ZyZyxxStudentList.vue b/src/views/zy/zyZyxx/ZyZyxxStudentList.vue
index 7350c8d..fc1e509 100644
--- a/src/views/zy/zyZyxx/ZyZyxxStudentList.vue
+++ b/src/views/zy/zyZyxx/ZyZyxxStudentList.vue
@@ -229,7 +229,7 @@ function handlePreview(record) {
if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
var file = baseApiUrl + "/"+record;
console.log('🤬', file);
- window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(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);
let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);