feat: 文件导入路径接口参数变更

src/components/shared/Message.vue

@@ -5,6 +5,7 @@
   </div>
   <el-popover
     placement="bottom-start"
+    :width="useVW(400)"
     :show-arrow="false"
     :virtual-ref="messageIcon"
     trigger="click"
@@ -15,7 +16,17 @@
         <span class="unread-count">{{ unReadMessages?.newCount || 0 }}</span>
         <span>条消息</span>
       </div>
-      <div class="message-list"></div>
+      <div class="message-list">
+        <div class="flex message-row">
+          <div class="message-send-user">
+            <div class="user-name">陈晓明</div>
+            <div class="message-time">20:88:33</div>
+          </div>
+          <div class="flex-1 message-content">
+            啥可适当就卡省的就卡省的就看撒好的就卡省的就看撒好的金卡和健康大使金卡是框架啥可适当就卡省的就卡省的就看撒好的就卡省的就看撒好的金卡和健康大使金卡是框架
+          </div>
+        </div>
+      </div>
       <confirm-button
         ok-text="收消息"
         cancel-text="发消息"
@@ -29,9 +40,10 @@
 <script setup lang="ts" name="Message">
 import { reactive, ref } from 'vue'
 import { ElPopover } from 'element-plus'
+import useVW from '@/hooks/useVW'
+import ConfirmButton from '@/components/common/ConfirmButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import useMessageLoop from '@/hooks/useMessageLoop'
-import ConfirmButton from '../common/ConfirmButton.vue'
 
 const messageIcon = ref<HTMLDivElement>()
 
@@ -73,11 +85,29 @@ const onSendMessage = () => {
     }
   }
   .message-list {
+    border-bottom: $OnePixelLine;
     .message-row {
       padding: 10px 4px;
+      height: 52px;
+      font-weight: 500;
+      border-top: $OnePixelLine;
       .message-send-user {
+        width: 49px;
+        margin-right: 0.5em;
+        font-size: $SmallFont;
+        .user-name {
+          text-align: justify;
+          text-align-last: justify;
+        }
       }
       .message-content {
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        font-size: $SmallFont;
       }
     }
   }

src/modules/admin-data/paper/components/rf.vue

@@ -68,6 +68,17 @@ const model = reactive<ExtractApiParams<'importRfPaper'>>({
   separator: '',
 })
 
+watch([() => model.subjectCode, () => model.mainNumber], () => {
+  /** 获取导入文件路径 */
+  model.subjectCode &&
+    model.mainNumber &&
+    getImportFilePath({
+      filePathType: 'RF',
+      subjectCode: model.subjectCode,
+      mainNumber: model.mainNumber,
+    })
+})
+
 const { subjectList, mainQuestionList } = useOptions(['subject', 'question'])
 
 const { formRef, elFormRef, defineColumn, _ } = useForm()
@@ -157,9 +168,6 @@ async function onSubmit() {
     console.error(error)
   }
 }
-
-/** 获取导入文件路径 */
-getImportFilePath()
 </script>
 
 <style scoped lang="scss"></style>

src/modules/admin-data/paper/components/sample.vue

@@ -69,6 +69,18 @@ const model = reactive<ExtractApiParams<'importSamplePaper'>>({
   subjectCode: '',
 })
 
+watch([() => model.subjectCode, () => model.mainNumber, () => model.paperType], () => {
+  /** 获取导入文件路径 */
+  model.subjectCode &&
+    model.mainNumber &&
+    model.paperType &&
+    getImportFilePath({
+      filePathType: model.paperType,
+      subjectCode: model.subjectCode,
+      mainNumber: model.mainNumber,
+    })
+})
+
 const { subjectList, mainQuestionList } = useOptions(['subject', 'question'])
 
 const { formRef, elFormRef, defineColumn, _ } = useForm()
@@ -171,9 +183,6 @@ async function onSubmit() {
     console.error(error)
   }
 }
-
-/** 获取导入文件路径 */
-getImportFilePath()
 </script>
 
 <style scoped lang="scss"></style>

src/modules/admin-data/paper/components/standard.vue

@@ -60,6 +60,17 @@ const model = reactive<ExtractApiParams<'importMarkStandard'>>({
   mainNumber: void 0,
 })
 
+watch([() => model.subjectCode, () => model.mainNumber], () => {
+  /** 获取导入文件路径 */
+  model.subjectCode &&
+    model.mainNumber &&
+    getImportFilePath({
+      filePathType: 'MARK_STANDARD',
+      subjectCode: model.subjectCode,
+      mainNumber: model.mainNumber,
+    })
+})
+
 const { subjectList, mainQuestionList } = useOptions(['subject', 'question'])
 
 const { formRef, elFormRef, defineColumn, _ } = useForm()
@@ -135,9 +146,6 @@ async function onSubmit() {
     console.error(error)
   }
 }
-
-/** 获取导入文件路径 */
-getImportFilePath()
 </script>
 
 <style scoped lang="scss"></style>

src/modules/analysis/monitoring/index.vue

@@ -229,7 +229,6 @@ const getColumns = (
     {
       label: '老师ID',
       formatter(row) {
-        console.log(row)
         return row.markerId === 0 ? (
           '全体'
         ) : (

types/api.d.ts

@@ -278,7 +278,7 @@ declare module 'api-type' {
 
     /** 获取导入文件路径 */
     type GetImportFilePath = BaseDefine<
-      null,
+      { filePathType: 'SAMPLE_A' | 'SAMPLE_B' | 'RF' | 'MARK_STANDARD'; mainNumber?: number; subjectCode: string },
       { rfPath: string; sampleAPath: string; sampleBPath: string; markStandardPath: string }
     >
 
@@ -287,7 +287,7 @@ declare module 'api-type' {
       /** 大题号 */
       mainNumber?: number
       /** 试卷类型 */
-      paperType?: PaperType
+      paperType?: SamplePaperType
       /** 试卷密码前缀 */
       prefix: string
       /** 分隔符 */

types/app.d.ts

@@ -7,6 +7,9 @@ type STAGE = 'FORMAL' | 'SAMPLE_A' | 'SAMPLE_B' | 'FORCE'
 /** 评卷模式 */
 type MarkMode = 'MOUSE' | 'TRACK'
 
+/** 培训卷类型 */
+type SamplePaperType = 'SAMPLE_A' | 'SAMPLE_B'
+
 /** 试卷类型 */
 type PaperType = 'SAMPLE_A' | 'SAMPLE_B' | 'RF' | 'MARK_STANDARD' | 'STANDARD' | 'FORCE'