From 2bba0ffa2c485bef0497ef05d2d7f26628d92767 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 22 May 2024 13:43:18 +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

---
 src/components/Tinymce/src/tinymce.ts         | 18 ++++++++++++-
 src/views/kc/wjxDcwj/WjxDcwjList.vue          |  2 +-
 .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 20 +++++++-------
 src/views/site/common/header.vue              | 12 ++++++++-
 .../checkKecheng/dqxqkcMenu.vue               |  6 ++---
 src/views/site/tongJi/index.vue               | 20 +++++++++-----
 src/views/zy/zyGonggao/ZyGonggaoList.vue      |  2 ++
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 13 ++++-----
 src/views/zy/zyInfo/ZyInfoList.vue            |  4 +--
 .../zy/zyInfoStudent/ZyInfoStudent.data.ts    |  3 ++-
 .../zy/zyInfoStudent/ZyInfoStudentList.vue    | 17 +++++++++---
 .../components/ZyInfoStudentScoreForm.vue     | 27 ++++++++++++-------
 12 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts
index 6a3d97a..fa3ccce 100644
--- a/src/components/Tinymce/src/tinymce.ts
+++ b/src/components/Tinymce/src/tinymce.ts
@@ -3,6 +3,22 @@
 // Custom builds see https://www.tinymce.com/download/custom-builds/
 // colorpicker/contextmenu/textcolor plugin is now built in to the core editor, please remove it from your editor configuration
 
+// export const plugins = [
+//   'advlist anchor autolink autosave code codesample  directionality  fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus  template  textpattern visualblocks visualchars wordcount image',
+// ];
+
+// export const toolbar =
+//   'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons   | insertfile image media pageembed  link anchor  codesample insertdatetime hr| a11ycheck ltr rtl';
+
+// export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen'];
+
+// export const simpleToolbar = [
+//   'undo redo  formatselect bold italic alignleft aligncenter alignright alignjustify bullist numlist outdent indent',
+//   'lists link unlink image media table removeformat fullscreen',
+// ];
+
+// export const menubar = 'file edit insert view format table';
+
 export const plugins = [
   'advlist anchor autolink autosave code codesample  directionality  fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus  template  textpattern visualblocks visualchars wordcount image',
 ];
@@ -17,4 +33,4 @@ export const simpleToolbar = [
   'lists link unlink image media table removeformat fullscreen',
 ];
 
-export const menubar = 'file edit insert view format table';
+export const menubar = '';
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index 1c1ecda..15ea013 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -13,7 +13,7 @@
             <a-form-item label="问卷类型">
               <a-select placeholder="请选择问卷类型" ref="select" v-model:value="queryParam.qpublish">
                 <a-select-option value="">全部</a-select-option>
-                <a-select-option value="0">未发布</a-select-option>
+                <a-select-option value="0">待发布</a-select-option>
                 <a-select-option value="1">已发布</a-select-option>
               </a-select>
             </a-form-item>
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
index 059a346..420591f 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
@@ -187,7 +187,6 @@ function handleRemTmxx(record,index,list){
   }
 }
 function getType(value,type){
-  // console.log(`🚀 ~ getType ~ value,type:`, value,type)
     if(type=='3'){
       return parseInt(value);
     }else if(type=='4'){
@@ -205,7 +204,6 @@ function edit(record,type){
     isShow.value = false;
   }
   defHttp.get({url:'/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId',params:{id:record.id}}).then(res =>{
-    // console.log(`🚀 ~ defHttp.get ~ res:`, res)
     var list = res;
     for(var i=0;i<list.length;i++){
       var par = list[i];
@@ -222,15 +220,12 @@ function edit(record,type){
 //提交数据
 async function submitForm(){
   const data = tiganData.value;
-  // console.log(`🚀 ~ submitForm ~ data:`, data)
   const values = Object.assign([], data);
   if(values.length>0){
     var sfjx = "1";
     for(let i=0;i<values.length;i++){
       let param = values[i];
-      console.log(`🚀 ~ submitForm ~ param:`, param)
       values[i].itemSelected = param.itemSelected+"";
-      console.log(`🚀 ~ submitForm ~ isShow:`, isShow)
       if(isShow.value){
         if(!param.wjScore){
           createMessage.error('请填写题目分数');
@@ -244,12 +239,15 @@ async function submitForm(){
         sfjx = "0";
         return;
       }
-      var itemlist = param.wjxWjxxTmxxList;
-      for(let j=0;j < itemlist.length; j++){
-        if(!itemlist[j].itemTitle){
-          createMessage.error('请填写选项信息');
-          sfjx = "0";
-          return;
+      var wjType = param.wjType;
+      if(wjType != 5){
+        var itemlist = param.wjxWjxxTmxxList;
+        for(let j=0;j < itemlist.length; j++){
+          if(!itemlist[j].itemTitle){
+            createMessage.error('请填写选项信息');
+            sfjx = "0";
+            return;
+          }
         }
       }
     }
diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue
index 8310336..d12e20c 100644
--- a/src/views/site/common/header.vue
+++ b/src/views/site/common/header.vue
@@ -96,7 +96,7 @@
         </span>
         <template #overlay>
           <a-menu>
-            <a-menu-item  v-if="getUserSf()=='T'">
+            <a-menu-item  v-if="sfxx=='1'">
               <RouterLink to="/dashboard/analysis" target="_blank">后台管理</RouterLink>
             </a-menu-item>
             <a-menu-item>
@@ -122,6 +122,7 @@
 
   const tkyqcs = ref<string>('未配置');
   const tkyqywc = ref<string>('0');
+  const sfxx = ref<string>('0');
   const props = defineProps({
     showRightButton: { type: Boolean, default: false }
   });
@@ -148,6 +149,15 @@ function toIndex(){
         tkyqywc.value = list.sjtksl||'0'
       }
     })
+
+    
+    let roleList = userStore?.getLoginInfo?.roleList
+    for(var i=0;i<roleList.length;i++){
+      var roleCode = roleList[i].roleCode
+      if(roleCode == 'admin' || roleCode == 'jwms'){
+        sfxx.value = "1";
+      }
+    }
   });
   function smoothScroll(topNum){
     setTimeout(() => {
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 9d6e37d..7aca988 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -25,11 +25,11 @@
                     <a-menu-item key="7" @click="getGzt('gongju')">到课率识别</a-menu-item>
                   </a-sub-menu>
                   <a-menu-item key="sub4">
-                    <span @click="getGzt('yiykzyk')">一师一库</span>
+                    <span @click="getGzt('yiykzyk')">教学资源库</span>
                   </a-menu-item>
-                  <a-menu-item key="sub5">
+                  <!-- <a-menu-item key="sub5">
                     <span @click="getGzt('jxzyk')">教学资源库</span>
-                  </a-menu-item>
+                  </a-menu-item> -->
                   <a-menu-item key="sub6">
                     <span @click="getGzt('tlq')">讨论区</span>
                   </a-menu-item>
diff --git a/src/views/site/tongJi/index.vue b/src/views/site/tongJi/index.vue
index 6ee859c..b90b152 100644
--- a/src/views/site/tongJi/index.vue
+++ b/src/views/site/tongJi/index.vue
@@ -81,7 +81,7 @@
     </a-col>
 
     <!-- -- yiKaiKeTang  jinRiTingKe -->
-    <a-col :xs="{ span: 15 }" :sm="{ span: 9 }" :lg="{ span: 5 }">
+    <a-col :xs="{ span: 15 }" :sm="{ span: `${sfxx =='1'?5:9}` }" :lg="{ span: `${sfxx =='1'?5:7}` }">
       <a-card class="cardDiv" title="今日听课">
         <!-- -<i class="fa-sharp fa-solid fa-user"></i>- -->
         <a-row class="" :gutter="gutter">
@@ -89,7 +89,6 @@
             <div class="numberBlob handleCss">
               <div class="numSpan blue" @click="showList('jrtkkts')">{{ tjData?.jinRiTingKe?.btkktnum??0 }}</div>
               <div class="numberName">
-                <!-- <StockOutlined class="blue"/> -->
                 <i class="fa fa-bolt blue"></i>
                 课堂数
               </div>
@@ -99,18 +98,15 @@
             <div class="numberBlob handleCss">
               <div class="numSpan orange" @click="showList('jrtktkrc')">{{ tjData?.jinRiTingKe?.tkrcnum??0 }}</div>
               <div class="numberName">
-                <!-- <RiseOutlined class="orange"/> -->
                 <i class="fa fa-level-up orange"></i>
                 听课人次
               </div>
             </div>
           </a-col>
         </a-row>
-        <!-- <a-divider /> -->
-        <!-- <div class="buttomDiv"></div> -->
       </a-card>
     </a-col>
-    <a-col :xs="{ span: 9 }" :sm="{ span: 1 }" :lg="{ span: 2 }">
+    <a-col :xs="{ span: 9 }" :sm="{ span: 1 }" :lg="{ span: 2 }" v-if="sfxx =='1'">
       <div style="margin: 0 auto;width: fit-content;font-size: 6rem;font-weight: 700;color: #cccccc8c;padding: 29px 0;">
         <!-- <RouterLink class="plusButton" to="/dashboard/analysis"><PlusOutlined/></RouterLink> -->
         <RouterLink class="plusButton" to="/dashboard/analysis" target="_blank" >+</RouterLink>
@@ -140,6 +136,7 @@ import ykkttkkt from './show/ykkttkkt.vue';
 import ykkttkrc from './show/ykkttkrc.vue';
 import jrtkkts from './show/jrtkkts.vue';
 import jrtktkrc from './show/jrtktkrc.vue';
+  import { useUserStore } from '/@/store/modules/user';
 // import { useMessage } from "/@/hooks/web/useMessage";
 
 // const { createConfirm } = useMessage();
@@ -147,6 +144,9 @@ enum Api {
   list = '/ktgl/kcKetangbiao/getCountList',
 }
 
+const userStore = useUserStore();
+const sfxx = ref<string>('0');
+
 // interface Data {
 //   num: Number,//【今日课堂数：总数】
 //   txktnum: Number,//【今日课堂数：腾讯】
@@ -192,6 +192,14 @@ onMounted(() => {
   list({ skrq }).then(res => {
     tjData.value = res;
   });
+
+  let roleList = userStore?.getLoginInfo?.roleList
+    for(var i=0;i<roleList.length;i++){
+      var roleCode = roleList[i].roleCode
+      if(roleCode == 'admin' || roleCode == 'jwms'){
+        sfxx.value = "1";
+      }
+    }
 });
 
 function showList(type){
diff --git a/src/views/zy/zyGonggao/ZyGonggaoList.vue b/src/views/zy/zyGonggao/ZyGonggaoList.vue
index 3415603..4ed3b7f 100644
--- a/src/views/zy/zyGonggao/ZyGonggaoList.vue
+++ b/src/views/zy/zyGonggao/ZyGonggaoList.vue
@@ -235,6 +235,8 @@
   function searchReset() {
     queryParam.value = {};
     selectedRowKeys.value = [];
+    queryParam.value.rwbh = rwbh;
+    queryParam.value.xqxn = xqxn; 
     //刷新数据
     reload();
   }
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index e9aadd4..e1d5693 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -33,7 +33,7 @@
     <a-row>
       <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
-        <a-card  style="height: 210px;border: 1px solid rgb(28, 132, 198);">
+        <a-card  style="height: 240px;border: 1px solid rgb(28, 132, 198);">
           <div class="rotate" :style="classFun(item)">{{callText(item)}}</div>
           <a-row style="top: -48px;position: relative;">
             <a-col :span="24" style="margin-bottom: 10px;height:53px;overflow:hidden;" :title="item.title">
@@ -42,11 +42,12 @@
             </a-col>
             <a-col :span="24" class="zyCon">时间：{{item.startTime}} - {{item.endTime}}</a-col>
             <a-col :span="24" class="zyCon">
-              <div style="float:left" v-if="item.score">{{item.score}}分</div>
-              <div style="float:right;">
-                &nbsp;
-                <!-- <a>{{item.xkxs}}人选课</a> -->
-              </div>
+              <div style="float:left" >评分：{{item.score?item.score:'未评'}}分</div>
+              <div style="float:right;">网络查重:{{item.wwtgl?item.wwtgl:'-'}}</div>
+            </a-col>
+            <a-col :span="24" class="zyCon">
+              <div style="float:left" >课程内查重:{{item.nwtgl?item.nwtgl:'-'}}</div>
+              <div style="float:right;">Aigc查重:{{item.aigctgl?item.aigctgl:'-'}}</div>
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:20px;">
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;background:rgb(28, 132, 198);">详情</a-button>
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index a6a3961..63920ee 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -240,8 +240,8 @@
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     // queryParam.value.sflssj = '0';
-    queryParam.value.column="startTime";
-    queryParam.value.order="asc";
+    queryParam.value.column="endTime";
+    queryParam.value.order="desc";
     defHttp.get({ url: '/zyInfo/zyInfo/list', params: queryParam.value }).then(res => {
       console.log(`🚀 ~ defHttp.get ~ res:`, res)
       total.value = res.total;
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index cebdc99..5ed6e91 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -22,7 +22,8 @@ export const columns: BasicColumn[] = [
   {
     title: '评分',
     align: "center",
-    dataIndex: 'score'
+    dataIndex: 'score',
+    width: '80px'
   },
   // {
   //   title: '作业附件',
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index e10ae42..ed46a81 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -103,6 +103,7 @@
 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';
 
   const globSetting = useGlobSetting();
 const baseApiUrl = globSetting.domainUrl;
@@ -122,7 +123,7 @@ const baseApiUrl = globSetting.domainUrl;
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 220,
+        width: 320,
         // fixed: 'right',
       },
       beforeFetch: (params) => {
@@ -180,6 +181,12 @@ const baseApiUrl = globSetting.domainUrl;
     registerScoreModal.value.disableSubmit = false;
     registerScoreModal.value.edit(record);
   }
+
+  function handleScoreFabu(record: Recordable){
+    defHttp.post({url:'/zyInfoStudent/zyInfoStudent/editFabu',params:{id:record.id,scoreFabu:'1'}}).then(res =>{
+      handleSuccess()
+    })
+  }
    
   /**
    * 详情
@@ -211,7 +218,7 @@ const baseApiUrl = globSetting.domainUrl;
   }
 
   function handleDown(record){
-    downloadFile(text);
+    downloadFile(record.filePath);
   }
    
   /**
@@ -219,7 +226,7 @@ const baseApiUrl = globSetting.domainUrl;
    */
   function getTableAction(record) {
     if(record.filePath){
-      if(record.score){
+      if(record.scoreFabu=='1'){
         var list = [
         {
           label: '详情',
@@ -240,6 +247,10 @@ const baseApiUrl = globSetting.domainUrl;
           label: '评分',
           onClick: handleScore.bind(null, record),
         },
+        {
+          label: '发布评分',
+          onClick: handleScoreFabu.bind(null, record),
+        },
         {
           label: '详情',
           onClick: handleDetail.bind(null, record),
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
index 5797352..661fda8 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
@@ -98,18 +98,25 @@
         }
       }
     }
-    await saveOrUpdate(model, isUpdate.value)
-      .then((res) => {
-        if (res.success) {
-          createMessage.success(res.message);
-          emit('ok');
-        } else {
-          createMessage.warning(res.message);
-        }
-      })
+    
+    defHttp.post({url:'/zyInfoStudent/zyInfoStudent/editFabu',params:model}).then(res =>{
+      emit('ok');
+    })
       .finally(() => {
         confirmLoading.value = false;
       });
+    // await saveOrUpdate(model, isUpdate.value)
+    //   .then((res) => {
+    //     if (res.success) {
+    //       createMessage.success(res.message);
+    //       emit('ok');
+    //     } else {
+    //       createMessage.warning(res.message);
+    //     }
+    //   })
+    //   .finally(() => {
+    //     confirmLoading.value = false;
+    //   });
   }
 
 
@@ -122,7 +129,7 @@
 
 <style lang="less" scoped>
   .antd-modal-form {
-    min-height: 500px !important;
+    min-height: 300px !important;
     overflow-y: auto;
     padding: 24px 24px 24px 24px;
   }