修改bug

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts

@@ -7,6 +7,7 @@ enum Api {
   list = '/wjxDjxx/djjglist',
   
   exportXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportXls',
+  exportDjXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportDjXls',
 }
 
 /**
@@ -16,4 +17,5 @@ enum Api {
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
 
-export const getExportUrl = Api.exportXls;
+export const getExportUrl = Api.exportXls;
+export const getExportDjUrl = Api.exportDjXls;

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue

@@ -43,7 +43,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useListPage } from '/@/hooks/system/useListPage';
   import {dccolumns} from './WjxWjxxTmlbDjjgs.data';
-  import { list,getExportUrl } from './WjxWjxxTmlbDjjgs.api';
+  import { list,getExportDjUrl } from './WjxWjxxTmlbDjjgs.api';
   import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
 
   const queryParam = ref<any>({});
@@ -69,7 +69,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
     },
     exportConfig: {
       name: "学生问卷信息",
-      url: getExportUrl,
+      url: getExportDjUrl,
       params: () => {
         return Object.assign({},queryParam.value);
       }

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue

@@ -68,13 +68,13 @@ import {ref, reactive, defineExpose, unref} from 'vue';
         return Object.assign(params, queryParam.value);
       },
     },
-    // exportConfig: {
+    exportConfig: {
-    //   name: "学生测验信息",
+      name: "学生测验信息",
-    //   url: getExportUrl,
+      url: getExportUrl,
-    //   params: () => {
+      params: () => {
-    //     return Object.assign({},queryParam.value);
+        return Object.assign({},queryParam.value);
-    //   }
+      }
-    // },
+    },
   });
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({

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 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
-        <a-card  style="height: 240px;border: 1px solid rgb(28, 132, 198);">
+        <a-card  style="height: 270px;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">
@@ -46,9 +46,12 @@
               <div style="float:right;">网络查重:{{item.wwxsl?item.wwxsl+'%':'-'}}</div>
             </a-col>
             <a-col :span="24" class="zyCon">
-              <div style="float:left" >课程内查重:{{item.nwxsl?item.nwxsl+'%':'-'}}</div>
+              <div style="float:left" >作业查重:{{item.nwxsl?item.nwxsl+'%':'-'}}</div>
               <div style="float:right;">Aigc查重:{{item.aigcxsl?item.aigcxsl+'%':'-'}}</div>
             </a-col>
+            <a-col :span="24" class="zyCon">
+              <div style="float:left" >校内查重:{{item.xnxsl?item.xnxsl+'%':'-'}}</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>
               <a-button type="primary" @click="handleShangchuan(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="!item.stuFilePath">上传</a-button>

src/views/zy/zyInfo/components/ZyInfoForm.vue

@@ -158,6 +158,8 @@
     nwtgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},],
     aigccc: [{ required: true, message: '请输入aigc查重!'},],
     aigctgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},],
+    xncc: [{ required: true, message: '请输入aigc查重!'},],
+    xntgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},],
   };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const disabledDate = (current: Dayjs) => {

src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts

@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     width: '100px'
   },
   {
-    title: '内网检测',
+    title: '作业检测',
     align: "center",
     dataIndex: 'nwsftg',
     slots: { customRender: 'nwsftgaction' },
@@ -48,6 +48,14 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'aigcsftgaction' },
     width: '100px'
   },
+  {
+    title: '校内检测',
+    align: "center",
+    dataIndex: 'xnsftg',
+    slots: { customRender: 'xnsftgaction' },
+    width: '100px'
+  },
+  
   {
     title: '存档类型',
     align: "center",

src/views/zy/zyInfoStudent/ZyInfoStudentList.vue

@@ -74,6 +74,17 @@
           </span>
         </span>
       </template>
+      <template #xnsftgaction="{text,record}">
+        <span v-if="record.aigccc=='0'">-</span>
+        <span v-else>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.xnxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.xnxsl}}%</span>
+          <span v-else>
+            <span v-if="record.filePath">检测中</span>
+            <span v-else>未提交</span>
+          </span>
+        </span>
+      </template>
       <!--<template #pcaSlot="{text}">
         {{ getAreaTextByCode(text) }}
       </template>-->