From 671a75dbe43d626a58f61f8bf0760a350e3a73ca Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 23 May 2024 21:06:35 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B45=E6=9C=8823=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/site/common/header.vue              |  2 +-
 src/views/site/index.vue                      |  4 +-
 .../zy/zyInfoStudent/ZyInfoStudent.data.ts    |  6 +-
 .../zy/zyInfoStudent/ZyInfoStudentList.vue    | 64 +++++++++++--------
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue
index de6039e..c0b5829 100644
--- a/src/views/site/common/header.vue
+++ b/src/views/site/common/header.vue
@@ -50,7 +50,7 @@
             </a-menu-item>
           </a-menu>
         </a-col>
-        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }" v-if="getUserSf()=='S'">
+        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }" v-if="getUserSf()=='S-'">
           <a-menu style="margin-top: 20px;" :selectable="false">
             <a-menu-item key="2" >
               <a class="abox" @click="toDom('stujrkbDom')">今日课表</a>
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 256b155..b112edb 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -59,9 +59,9 @@
 
         </a-layout-content>
           <!-- 学生部分今日课表 -->
-        <StudentJrkbPage v-if="getUserSf()=='S'"></StudentJrkbPage>
+        <StudentJrkbPage v-if="getUserSf()=='S-'"></StudentJrkbPage>
           <!-- 学生部分近六日课表 -->
-        <StudentJlrkbPage v-if="getUserSf()=='S'"></StudentJlrkbPage>
+        <StudentJlrkbPage v-if="getUserSf()=='S-'"></StudentJlrkbPage>
           <!-- 我的课程 -->
         <studentWdkc v-if="getUserSf()=='S'"></studentWdkc>
         <!-- 页尾 -->
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index 5ed6e91..e8159cf 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -43,7 +43,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'wwxsl'
   // },
   {
-    title: '外网检测是否通过',
+    title: '外网检测',
     align: "center",
     dataIndex: 'wwsftg',
     slots: { customRender: 'wwsftgaction' },
@@ -54,7 +54,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'nwxsl'
   // },
   {
-    title: '内网检测是否通过',
+    title: '内网检测',
     align: "center",
     dataIndex: 'nwsftg',
     slots: { customRender: 'nwsftgaction' },
@@ -65,7 +65,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'aigcxsl'
   // },
   {
-    title: 'aigc检测是否通过',
+    title: 'aigc检测',
     align: "center",
     dataIndex: 'aigcsftg',
     slots: { customRender: 'aigcsftgaction' },
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 5eac2c7..81372dd 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -24,10 +24,10 @@
     <BasicTable @register="registerTable" style="margin-top: 20px;">
       <!--插槽:table标题-->
       <template #tableTitle>
-    <div style="padding: 10px;">
-      <span style="background: green;color:#fff;padding: 5px 15px;margin-left:20px;">通过</span>
-      <span style="background: red;color:#fff;padding: 5px 15px;margin-left:20px;">未通过</span>
-    </div>
+        <!-- <div style="padding: 10px;">
+          <span style="background: green;color:#fff;padding: 5px 15px;margin-left:20px;">通过</span>
+          <span style="background: red;color:#fff;padding: 5px 15px;margin-left:20px;">未通过</span>
+        </div> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -38,12 +38,12 @@
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      
+
       <template #wwsftgaction="{text,record}">
         <span v-if="record.wwcc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.wwxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.wwxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.wwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.wwxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -53,8 +53,8 @@
       <template #nwsftgaction="{text,record}">
         <span v-if="record.nwcc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.nwxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.nwxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.nwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.nwxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -64,8 +64,8 @@
       <template #aigcsftgaction="{text,record}">
         <span v-if="record.aigccc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.aigcxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.aigcxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.aigcxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.aigcxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -87,7 +87,7 @@
     <!-- 表单区域 -->
     <ZyInfoStudentModal ref="registerModal" @success="handleSuccess"></ZyInfoStudentModal>
     <ZyInfoStudentScoreModal ref="registerScoreModal" @success="handleSuccess"></ZyInfoStudentScoreModal>
-    
+
   </div>
 </template>
 
@@ -100,17 +100,20 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue'
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue'
   import { useGlobSetting } from '/@/hooks/setting';
   import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   const globSetting = useGlobSetting();
-const baseApiUrl = globSetting.domainUrl;
+  const baseApiUrl = globSetting.domainUrl;
 
   const queryParam = ref<any>({});
   const mainId = ref<string>('');
-    
+
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const registerScoreModal = ref();
@@ -155,7 +158,7 @@ const baseApiUrl = globSetting.domainUrl;
     // let url = "https://view.officeapps.live.com/op/view.aspx?src="+encodeURIComponent(getFileAccessHttpUrl(text));
     // let url = "https://view.xdocin.com/view?src="+encodeURIComponent('https://view.xdocin.com/demo/view.docx');
     // window.open(url,"_blank")
-    
+
     var url2 = getFileAccessHttpUrl(record.pdfPath)
     console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
@@ -168,7 +171,7 @@ const baseApiUrl = globSetting.domainUrl;
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -187,11 +190,16 @@ const baseApiUrl = globSetting.domainUrl;
     })
   }
   function handleScoreFabu(record: Recordable){
+    //判断
+    if(!record.score){
+      createMessage.warn('请填写评分！');
+      return;
+    }
     defHttp.post({url:'/zyInfoStudent/zyInfoStudent/editFabu',params:{id:record.id,scoreFabu:'1'}}).then(res =>{
       handleSuccess()
     })
   }
-   
+
   /**
    * 详情
    */
@@ -199,21 +207,21 @@ const baseApiUrl = globSetting.domainUrl;
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
@@ -224,7 +232,7 @@ const baseApiUrl = globSetting.domainUrl;
   function handleDown(record){
     downloadFile(record.filePath);
   }
-   
+
   /**
    * 操作栏
    */
@@ -273,7 +281,7 @@ const baseApiUrl = globSetting.domainUrl;
         }];
         return list;
       }
-      
+
     }else{
       var list = [
       {
@@ -282,9 +290,9 @@ const baseApiUrl = globSetting.domainUrl;
       },];
       return list;
     }
-    
+
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -309,7 +317,7 @@ const baseApiUrl = globSetting.domainUrl;
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -320,13 +328,13 @@ const baseApiUrl = globSetting.domainUrl;
     //刷新数据
     reload();
   }
-  
+
   function init(record){
     queryParam.value.mainId = record.id;
     mainId.value = record.id;
       reload();
   }
-  
+
 
   defineExpose({
     init,