From b42d0ebb3c4b9b1859bddc154c4c2015e7fccf48 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 6 Mar 2025 10:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcWechatSendLog/KcWechatSendLogList.vue   |  2 +-
 .../components/KcWechatSendLogForm.vue        | 11 ++-
 src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts        | 78 +++++++++----------
 src/views/kc/xxhbtkxx/XxhbtkxxList.vue        | 18 ++---
 src/views/site/tongZhiGongGao/index.vue       |  2 +-
 src/views/zy/zyInfo/ZyInfoV2List.vue          | 32 ++++++--
 .../zy/zyInfo/components/ZyInfoDetailForm.vue |  6 +-
 .../components/ZyInfoStudentForm.vue          |  6 +-
 .../components/ZyInfoStudentPiyueForm.vue     | 18 +++--
 9 files changed, 103 insertions(+), 70 deletions(-)

diff --git a/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue b/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue
index 9e946b8..29c4911 100644
--- a/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue
+++ b/src/views/kc/kcWechatSendLog/KcWechatSendLogList.vue
@@ -103,7 +103,7 @@
         fixed: 'right',
       },
       beforeFetch: (params) => {
-        params.column = '',params.order = '';//新生成的默认不带排序
+        params.column = 'createTime',params.order = 'desc';//新生成的默认不带排序
         return Object.assign(params, queryParam.value);
       },
     },
diff --git a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
index 34c1df5..034d45c 100644
--- a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
+++ b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
@@ -3,6 +3,12 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
+          <a-form-item label="姓名" v-bind="validateInfos.openid">
+            <JSelectMultiple v-model:value="formData.openid" placeholder="请选择下拉多选" :dictCode="`xxhbuser,xm,gh,zzzt=11`"></JSelectMultiple>
+          </a-form-item>
+        </a-col>
+        
+        <!-- <a-col :span="24">
           <a-form-item label="工号" v-bind="validateInfos.openid">
             <a-input v-model:value="formData.openid" placeholder="请输入工号" :disabled="disabled" @change="handleTeacherNameChange"></a-input>
           </a-form-item>
@@ -11,7 +17,7 @@
           <a-form-item label="姓名" v-bind="validateInfos.teacherName">
             <a-input v-model:value="formData.teacherName" placeholder="请输入姓名" :disabled="disabled"></a-input>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!-- <a-col :span="24">
           <a-form-item label="学期学年" v-bind="validateInfos.xqxn">
             <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="formData.xqxn" :disabled="disabled" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
@@ -19,7 +25,7 @@
         </a-col> -->
         <a-col :span="24">
           <a-form-item label="推送内容" v-bind="validateInfos.ytkcs">
-            <a-textarea v-model:value="formData.ytkcs" placeholder="请输入推送内容，最大20个字" :disabled="disabled"></a-textarea>
+            <a-textarea v-model:value="formData.ytkcs" placeholder="请输入推送内容" :disabled="disabled"></a-textarea>
           </a-form-item>
         </a-col>
         <!-- <a-col :span="24">
@@ -45,6 +51,7 @@
   import { saveOrUpdate } from '../KcWechatSendLog.api';
   import { Form } from 'ant-design-vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
   
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
diff --git a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
index 751e9eb..52ac028 100644
--- a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
+++ b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
@@ -5,26 +5,26 @@ import { render } from '/@/utils/common/renderUtils';
 import { log } from 'console';
 //列表数据
 export const columns: BasicColumn[] = [
-  {
-    title: '学年学期',
-    align: "center",
-    dataIndex: 'xqxn'
-  },
+  // {
+  //   title: '学年学期',
+  //   align: "center",
+  //   dataIndex: 'xqxn'
+  // },
   {
     title: '姓名',
     align: "center",
     dataIndex: 'xm'
   },
   {
-    title: '创建人',
+    title: '工号',
     align: "center",
     dataIndex: 'cjr'
   },
-  {
-    title: '手机号',
-    align: "center",
-    dataIndex: 'sjh'
-  },
+  // {
+  //   title: '手机号',
+  //   align: "center",
+  //   dataIndex: 'sjh'
+  // },
   {
     title: '调课事由',
     align: "center",
@@ -40,11 +40,11 @@ export const columns: BasicColumn[] = [
   //   align: "center",
   //   dataIndex: 'yjxq'
   // },
-  {
-    title: '申请人单位',
-    align: "center",
-    dataIndex: 'sqrdw'
-  },
+  // {
+  //   title: '申请人单位',
+  //   align: "center",
+  //   dataIndex: 'sqrdw'
+  // },
   // {
   //   title: 'bizbh',
   //   align: "center",
@@ -75,11 +75,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'bkjh'
   },
-  {
-    title: '时间戳',
-    align: "center",
-    dataIndex: 'timestamps'
-  },
+  // {
+  //   title: '时间戳',
+  //   align: "center",
+  //   dataIndex: 'timestamps'
+  // },
   {
     title: '课程名称',
     align: "center",
@@ -91,7 +91,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'pbh'
   // },
   {
-    title: '教材',
+    title: '节次',
     align: "center",
     dataIndex: 'jc'
   },
@@ -100,21 +100,21 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'skrq'
   },
-  {
-    title: '课程信息编号',
-    align: "center",
-    dataIndex: 'kcxxbh'
-  },
-  {
-    title: '校区',
-    align: "center",
-    dataIndex: 'xq'
-  },
-  {
-    title: '教师工号',
-    align: "center",
-    dataIndex: 'jsgh'
-  },
+  // {
+  //   title: '课程信息编号',
+  //   align: "center",
+  //   dataIndex: 'kcxxbh'
+  // },
+  // {
+  //   title: '校区',
+  //   align: "center",
+  //   dataIndex: 'xq'
+  // },
+  // {
+  //   title: '教师工号',
+  //   align: "center",
+  //   dataIndex: 'jsgh'
+  // },
   {
     title: '编号',
     align: "center",
@@ -131,7 +131,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'lcbh'
   // },
   {
-    title: '调整事由',
+    title: '调整类型',
     align: "center",
     dataIndex: 'tklx',
     customRender: ({ text }) => {
@@ -144,7 +144,7 @@ export const columns: BasicColumn[] = [
       }else if(text == '4'){
         return '其他';
       }else{
-        return '';
+        return text;
       }
     }
   },
diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
index f409dce..a253354 100644
--- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
+++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
@@ -4,11 +4,11 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <!-- <a-col :lg="8">
             <a-form-item label="学年学期">
               <j-dict-select-tag placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :lg="8">
             <a-form-item label="姓名">
               <j-input placeholder="请输入姓名" v-model:value="queryParam.xm"></j-input>
@@ -41,12 +41,11 @@
                 <j-input placeholder="请输入yjxq" v-model:value="queryParam.yjxq"></j-input>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="申请人单位">
-                <!-- <j-input placeholder="请输入申请人单位" v-model:value="queryParam.sqrdw"></j-input> -->
                 <j-dict-select-tag placeholder="请选择申请人单位" v-model:value="queryParam.sqrdw" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <!-- <a-col :lg="8">
               <a-form-item label="bizbh">
                 <j-input placeholder="请输入bizbh" v-model:value="queryParam.bizbh"></j-input>
@@ -77,11 +76,11 @@
                 <j-input placeholder="请输入补课计划" v-model:value="queryParam.bkjh"></j-input>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="时间戳">
                 <j-input placeholder="请输入时间戳" v-model:value="queryParam.timestamps"></j-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="8">
               <a-form-item label="课程名称">
                 <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></j-input>
@@ -132,15 +131,14 @@
                 <j-input placeholder="请输入lcbh" v-model:value="queryParam.lcbh"></j-input>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="调整事由">
-                <!-- <j-input placeholder="请输入1-调整时间，2-调整地点，3-更换教师，4-其他" v-model:value="queryParam.tklx"></j-input> -->
                 <j-dict-select-tag
                   placeholder="请选择调整事由" v-model:value="queryParam.tklx"
                   :options="[{ value: 1, label: '调整时间'},{ value: 2, label: '调整地点'},{ value: 3, label: '更换教师'},{ value: 4, label: '其他'}]"
                 />
               </a-form-item>
-            </a-col>
+            </a-col> -->
           <!--</template>-->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
diff --git a/src/views/site/tongZhiGongGao/index.vue b/src/views/site/tongZhiGongGao/index.vue
index f28e929..fb1baf0 100644
--- a/src/views/site/tongZhiGongGao/index.vue
+++ b/src/views/site/tongZhiGongGao/index.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card class="rowGutter">
     <a-row :gutter="[16,16]">
-      <a-col :lg="12" v-for="(item,index) in list" :key="index">
+      <a-col :lg="24" v-for="(item,index) in list" :key="index">
         <a :href="item.nlink" target="_blank" class="itemLink">
           <span class="">
             <WifiOutlined :rotate="45" class="greenTxt"/>
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index b747b73..48c4a25 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -924,14 +924,32 @@ function handleDown(text) {
 //预览
 function yulanFile(record) {
   console.log('🙇‍♀️', record);
-  const parts = record.filePath.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.filePath;
-  console.log('🤬', file);
-  window.open('https://jxdd.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.error('当前作业不支持预览，请下载后查阅！');
+    const parts = record.filePath.split('.');
+    const filetype = parts[parts.length - 1];
+    if (filetype == 'jpg' || filetype == 'png' || filetype == 'jpeg' || filetype == 'xls' || filetype == 'xlsx' || filetype == 'text') {
+      imgvisible.value = true;
+      var url2 = getFileAccessHttpUrl(record.filePath);
+      console.log('👀', url2);
+      ylimgurl.value = url2;
+      // var file = baseApiUrl + "/"+record.filePath;
+      // console.log('🤬', file);
+      // window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
+
+      // var url2 = getFileAccessHttpUrl(record.filePath);
+      // let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+      // window.open(url, '_blank');
+    } else if (filetype == 'doc' || filetype == 'docx' || filetype == 'pdf') {
+      var url2 = getFileAccessHttpUrl(record.pdfPath);
+      let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+      window.open(url, '_blank');
+    } else {
+      createMessage.error('当前作业不支持预览，请下载后查阅！');
+    }
   }
 }
 //驳回
diff --git a/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue
index 96c099b..7e4cc40 100644
--- a/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue
+++ b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue
@@ -34,8 +34,10 @@
                 </a-col>
                 <a-col :span="24" v-if="formData.filePath">
                   <a-form-item label="参考资料">
-                    <span>{{ lastString(formData.filePath) }}</span>
-                    <a-button type="primary" style="margin-left: 10px" @click="downLoad(formData.filePath)">下载</a-button>
+                  <div v-for="(fjItem,fjindex) in formData.filePath.split(',')" :key="fjindex" style="line-height:50px;">
+                    <span>{{ lastString(fjItem) }}</span>
+                    <a-button type="primary" style="margin-left: 10px" @click="downLoad(fjItem)">下载</a-button>
+                  </div>
                   </a-form-item>
                 </a-col>
 
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
index bac8ea9..531eca2 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
@@ -34,8 +34,10 @@
               </a-col>
               <a-col :span="24" v-if="zyInfo.filePath">
                 <a-form-item label="参考资料" >
-                  <span>{{ lastString(zyInfo.filePath) }}</span>
-                  <a-button type="primary" style="margin-left: 10px" @click="downLoad(zyInfo.filePath)">下载</a-button>
+                  <div v-for="(fjItem,fjindex) in zyInfo.filePath.split(',')" :key="fjindex" style="line-height:50px;">
+                    <span>{{ lastString(fjItem) }}</span>
+                    <a-button type="primary" style="margin-left: 10px" @click="downLoad(fjItem)">下载</a-button>
+                  </div>
                 </a-form-item>
               </a-col>
 
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
index 71df1fc..a3b8833 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue
@@ -199,13 +199,19 @@ function rotateImage2() {
       if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
         showType.value = '2';
       }else if(filetype=='doc' || filetype=='docx' || filetype=='pdf'){
-        showType.value = '1';
-        // 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)); 
+        // showType.value = '1';
+        // // 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)); 
+
+        // ylurl.value = url3;
+
+        showType.value = '1';
+        var file2 = getFileAccessHttpUrl(record.pdfPath);
+        let url2 = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(file2);
+        ylurl.value = url2;
 
-        ylurl.value = url3;
       }else if(filetype=='mp4'|| filetype=='avi'|| filetype=='mp3'|| filetype=='wav'){
         showType.value = '3';