1

src/views/site/common/video/flvjs/index copy.vue

@@ -0,0 +1,78 @@
+<template>
+  <!-- <div @click="onPlay">点击开始播放(连接)直播</div>
+  <div @click="onPlay2">点击开始播放(连接)直播2</div> -->
+  <!-- <div>{{ route.query.url }}</div> -->
+  <!-- <bVideo ref="bVideoRef"/> -->
+  <!-- <video id="video" muted playsinline controls style=""></video> -->
+  <!-- <video id="myVideo" class="video-js vjs-default-skin vjs-big-play-centered" controls  autoplay  data-setup='{}' style='width: 100%;height: auto'>
+    <source id="source" src="http://127.0.0.1/01.m3u8" type="application/x-mpegURL"/>
+  </video> -->
+  <div>--不好用，屏蔽掉</div>
+</template>
+<script lang="ts" setup>
+// import { ref, onMounted, onBeforeUnmount} from 'vue';
+// import { useRoute } from 'vue-router'
+// import flvjs from 'flv.js'
+// // import bVideo from '/@/views/site/common/webRTC/video.vue';
+
+
+// // const bVideoRef = ref();
+
+// const route = useRoute();
+
+// // //页面销毁时销毁webRtc
+// // onBeforeUnmount(() => {
+// //   bVideoRef.value.closeWebRtcStreamerFn();
+// // })
+
+// onMounted(() => {
+//   if(route.query.url){
+//     if (flvjs.isSupported()) {
+//     var videoDom = <HTMLVideoElement> document.getElementById('video')
+//     // 创建一个播放器实例
+//     let option = <flvjs.MediaDataSource>({
+//       type: 'flv', // 媒体类型，默认是 flv
+//       cors: true, //跨域
+//       isLive: true, // 是否是直播流
+//       hasAudio: true, // 是否有音频
+//       hanVideo: true, // 是否有视频
+//       // url: 'ws://127.0.0.1:1935/live/soures', // 流地址
+//       // url: 'ws://127.0.0.1/live_hls/soures', // 流地址
+//       url: 'http://127.0.0.1/live_hls/soures.m3u8', // 流地址
+//     })
+//     let config = <any>({
+//       // 其他的配置项可以根据项目实际情况参考 api 去配置
+//       autoCleanupMinBackwardDuration: true, // 清除缓存 对 SourceBuffer 进行自动清理
+//     })
+//     var player = flvjs.createPlayer(option, config);
+//     player.attachMediaElement(videoDom)
+//     player.load()
+//     player.play()
+
+//     //this.player = player
+//   }
+
+//     // bVideoRef.value.connectFn(route.query.url);
+//   }
+// })
+
+// onMounted(() => {
+  // var myVideo = videojs('myVideo', {
+  //       bigPlayButton: true,
+  //       textTrackDisplay: false,
+  //       posterImage: false,
+  //       errorDisplay: false,
+  //   })
+  //   myVideo.play()
+// })
+
+</script>
+<style lang="less" scoped>
+video {
+  //margin: auto;
+  //left: 0;
+  //right: 0;
+  //position: relative;
+  background: grey;
+}
+</style>

src/views/site/yuYueKeCheng/index.vue

@@ -44,7 +44,7 @@
               </a-col>
               <a-col :span="24">
                 <div style="margin-top:20px;text-align:center;">
-                  <a-button type="primary" class="itemYyButton" @click="txpjFun(item)">评价</a-button>
+                  <a-button type="primary" class="itemYyButton" @click="txpjFun(item)"  :disabled="isDeisabled(item)">评价</a-button>
                   <a-button type="primary" class="itemBaoCuoButton" @click="funQxyy(item)">取消预约</a-button>
                 </div>
               </a-col>
@@ -70,6 +70,7 @@ import { defHttp } from '/@/utils/http/axios';
 import { Modal } from 'ant-design-vue';
 import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
 import { CloseOutlined } from '@ant-design/icons-vue';
+import { dateFormat } from '/@/utils/common/compUtils';
 import dayjs from 'dayjs';
 
 const { createMessage } = useMessage();
@@ -152,6 +153,18 @@ function funQxyy(record){
   // });
 }
 
+
+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
+
+}
+
 function newFunction() {
   let pageSize = 4;
   var width = window.screen.width * window.devicePixelRatio;

src/views/site/yuYueKeCheng/more.vue

@@ -80,7 +80,7 @@
                   </a-col>
                   <a-col :span="24">
                     <div style="margin-top:20px;" v-if="item.isdeleted=='0'">
-                      <a-button type="primary" class="itemYyButton" @click="tingKeZuJiAddModal.view({ ketangbiaoid: item.id })">评价</a-button>
+                      <a-button type="primary" class="itemYyButton" :disabled="isDeisabled(item)" @click="tingKeZuJiAddModal.view({ ketangbiaoid: item.id })">评价</a-button>
                       <a-button type="primary" class="itemBaoCuoButton" @click="funQxyy(item)">取消预约</a-button>
                     </div>
                     <div style="margin-top:20px;" v-if="item.isdeleted=='1'">
@@ -129,6 +129,16 @@ const tingKeZuJiAddModal = ref();
 const queryParam = ref<any>({});
 let listData = ref<any>([]);
 
+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(() => {

src/views/zy/zyInfo/StudentZyInfoList.vue

@@ -55,7 +55,8 @@
                       >{{ getCctype(item, '4') }}<span  @click="handleOpenCcjg(item, '3')" style="color:#1ab394;cursor: pointer;" v-if="item.xnxsl">报告</span>
                     </a-col>
                     <a-col :span="12">
-                      <span class="zyCon-word">Aigc查重：</span>{{ getCctype(item, '3') }}
+                      <span class="zyCon-word">Aigc查重：</span>
+                      {{ getCctype(item, '3') }}
                       <span  @click="handleOpenCcjg(item, '2')" style="color:#1ab394;cursor: pointer;" v-if="item.aigcxsl">报告</span>
                     </a-col>
                   </a-row>
@@ -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) {
+      } else if (record.wwsftg) {
-        text = '失败';
+        text = record.wwsftg;
-      } else if (record.stuFilePath) {
+      } 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) {
+      } else if (record.nwsftg) {
-        text = '失败';
+        text = record.nwsftg;
-      } else if (record.stuFilePath) {
+      } 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) {
+      } else if (record.aigcsftg) {
-        text = '失败';
+        text = record.aigcsftg;
-      } else if (record.stuFilePath) {
+      } 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) {
+      } else if (record.xnsftg) {
-        text = '失败';
+        text = record.xnsftg;
-      } else if (record.stuFilePath) {
+      } 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;
+  //   var file = baseApiUrl + "/"+record.stuFilePath;
-    console.log('🤬', file);
+  //   console.log('🤬', file);
-    window.open('https://zjdd.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);
+    var url2 = getFileAccessHttpUrl(record.stuPdfPath);
-  //   let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+    let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
-  //   window.open(url, '_blank');
+    window.open(url, '_blank');
   }else{
     createMessage.error('暂不支持该文件预览！');
   }

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();
 }

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,

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,