fix：切换第三方资源格式;

Merge pull request 'zouyf_dev' (#407 ) from zouyf_dev into main
Reviewed-on: #407
2024-11-18 17:16:43 +08:00 · 2024-11-13 15:45:01 +08:00 · 2024-11-13 15:43:09 +08:00 · 2024-11-13 14:08:28 +08:00 · 2024-11-13 11:08:51 +08:00 · 2024-11-13 11:07:50 +08:00
9 changed files with 159 additions and 98 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "aix-win",
-  "version": "2.1.28",
+  "version": "2.1.30",
  "description": "",
  "main": "./out/main/index.js",
  "author": "上海交大重庆人工智能研究院",
--- a/src/renderer/src/api/file/index.js
+++ b/src/renderer/src/api/file/index.js
@ -24,6 +24,13 @@ export const getPrepareById = (id) => {
  })
 }

+export const addFileToKj = (id) => {
+  return request({
+    url: '/smarttalk/file/addFileToKj/' + id,
+    method: 'get'
+  })
+}
+
 export function deleteSmarttalk(id) {
  return request({
    url: '/smarttalk/file/' + id,
@ -53,3 +60,14 @@ export const moveSmarttalk = (params) => {
    params
  })
 }
+
+export const addFileToPrepareThird = (data) => {
+  return request({
+    url: '/smarttalk/file/addFileToPrepareThird',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data
+  })
+}
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@ -55,6 +55,7 @@
                      <el-col :span="11">
                        <el-form-item label="知识点" label-width="70">
                          <el-cascader
+                            disabled
                            v-model="entpCourseWorkQueryParams.point"
                            clearable
                            style="width: 100%"
@ -90,7 +91,12 @@
                    </el-row>
                    <!-- 习题表格 -->
                    <div class="infinite-list-wrapper" >
-                      <!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
+                      <el-table 
+                        :data="workResource.entpCourseWorkList" 
+                        style="width: 100%; height: 100%;"
+                        v-loading="pageParams.loading"
+                        ref="tableRef"
+                      >
                        <el-table-column type="index" width="60" />
                        <el-table-column align="left" >
                          <template #header>
@ -114,22 +120,18 @@
                            <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
                          </template>
                        </el-table-column>
-                      </el-table> -->
-                      <ul 
+                      </el-table>
+                      
+                      <!-- <ul 
                        v-infinite-scroll="pageLoad" 
                        class="infinite-list" 
                        infinite-scroll-immediate="false" 
-                        infinite-scroll-distance='1'
+                        infinite-scroll-distance='100'
                        infinite-scroll-delay="1000"
                        :infinite-scroll-disabled="pageDisabled"
                      >
                        <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
                          <div align="left" style="width: 100%;" >
-                            <!-- <template #header>
-                              <div style="display: flex">
-                                <div style="align-items: center;">题目内容</div>
-                              </div>
-                            </template> -->
                            <div @click="showExamAnalyseDrawer(item)">
                              <div>
                                <span style="width: 20px;">{{ index +1 }}. </span>
@ -155,18 +157,18 @@
                          description="未找到相关试题"
                          style="width: 100%; height: 200px; margin-top: 20px;"
                        ></el-empty>
-                      </div>
+                      </div> -->
                    </div>
                    <!-- 分页 这里不用-->
-                    <!-- <div style="height: 55px;">
-                      <pagination
-                        v-show="entpCourseWorkTotal > 0"
+                    <div style="height: 55px;">
+                      <el-pagination
+                        v-show="pageParams.total > 0"
                        v-model:page="paginationParams.pageNum"
                        v-model:limit="paginationParams.pageSize"
-                        :total="entpCourseWorkTotal"
+                        :total="pageParams.total"
                        :style="{ position: 'relative', 'margin-top': '5px' }"
-                        @pagination="getPaginationList" />
-                    </div> -->
+                        @change="getPaginationList" />
+                    </div>
                  </div>
                  <!-- 非习题训练：常规作业、 -->
                  <div v-if="classWorkForm.worktype!='习题训练'">
@ -276,6 +278,7 @@ import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { useRouter } from 'vue-router'
+import { Search } from '@element-plus/icons-vue'

 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -284,6 +287,7 @@ import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";

+
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { processList } from '@/hooks/useProcessList'
 import { getCurrentTime } from '@/utils/date'
@ -409,15 +413,15 @@ const fileLoading = ref(false); // 常规作业loading

 // 下拉滚动参数

-const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
-const pageNoMore = computed( () => {
-  if (pageParams.value.total < 1) {
-    return false;
-  }
-  let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
-  return workResource.entpCourseWorkList.length >= count;
-});
-const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
+// const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
+// const pageNoMore = computed( () => {
+//   if (pageParams.value.total < 1) {
+//     return false;
+//   }
+//   let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
+//   return workResource.entpCourseWorkList.length >= count;
+// });
+// const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
 const pageParams = ref({
  loading: false,     // 是否正在加载中
  originCount: 0,     // 初始条目数量
@ -497,7 +501,7 @@ function Apis(key) {
      // 年份
      yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
      // 知识点
-      thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      thirdId: entpCourseWorkQueryParams.point && entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
      // 关键字
      keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',

@ -508,9 +512,7 @@ function Apis(key) {
   })
  }
 const handleQueryFromEntpCourseWork= async (queryType) => {
-  
  pageParams.value.loading = true;
-  

  // 初中政治特殊处理( warn: 需确认是否修改 )
  // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
@ -519,44 +521,43 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
  // }
  
  client(t('任务1', 1500)).then(res => {
-    console.log("请求返回",res);
-    if(paginationParams.pageNum == 1){
-      workResource.entpCourseWorkList = [];
-      workResource.entpCourseWorkTotal = 0;
+    //console.log("请求返回",res);
+    // if(paginationParams.pageNum == 1){
+    //   workResource.entpCourseWorkList = [];
+    //   workResource.entpCourseWorkTotal = 0;

-       // 初始化下拉滚动条参数
-      // pageParams.value.loading = false;
-      // pageParams.value.isFirst = true;
-      // pageParams.value.originCount = 0;
-    }
+    //    // 初始化下拉滚动条参数
+    //   // pageParams.value.loading = false;
+    //   // pageParams.value.isFirst = true;
+    //   // pageParams.value.originCount = 0;
+    // }
    const data = res.data || [];
    if(data && data.length>0){
    // workResource.entpCourseWorkList = entpcourseworkres.data;
    // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;

-    data.forEach(item=> {
-      if (item.worktype == '选择题') {
-        item.worktype = '单选题'
+      data.forEach(item=> {
+        if (item.worktype == '选择题') {
+          item.worktype = '单选题'
+        }
+      })
+
+      // 格式化试题信息
+      processList(data);
+      //workResource.entpCourseWorkList.push(...data);    
+      workResource.entpCourseWorkList = data;
+
+      // 初次加载时更新当前试题数量
+      if (pageParams.value.isFirst) {
+        pageParams.value.isFirst = false;
+        pageParams.value.originCount = workResource.entpCourseWorkList.length;
+        pageParams.value.total = parseInt(res.msg);
+        paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
+        //console.log('first->', pageParams.value, paginationParams);
      }
-    })
-
-    // 格式化试题信息
-    processList(data);
-    workResource.entpCourseWorkList.push(...data);    
-
-    // 初次加载时更新当前试题数量
-    if (pageParams.value.isFirst) {
-      pageParams.value.isFirst = false;
-      pageParams.value.originCount = workResource.entpCourseWorkList.length;
-      pageParams.value.total = parseInt(res.msg);
    }
-  }
-  pageParams.value.loading = false;
+    pageParams.value.loading = false;
  });
-
-  //const entpcourseworkres = await listEntpcourseworkNew(queryForm);
-
-  // const data = entpcourseworkres.data;
  
 }

@ -977,6 +978,15 @@ const showExamAnalyseDrawer = (row) => {
  })
 }

+const tableRef = ref();
+const getPaginationList = ( page, limit ) => {
+  paginationParams.pageNum = page;
+  paginationParams.pageSize = limit;
+  //console.log(page, limit)
+  handleQueryFromEntpCourseWork(0);
+  // 重置滚动条至顶部
+  tableRef.value.setScrollTop(0);
+}

 const pageLoad = async() => {
  console.log("加载中...")
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@ -57,8 +57,8 @@
            style="margin-bottom: 1px"
            @change="tableRadioChange"
          >
-            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
-            <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" />
+            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'"/>
+            <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'"/>
          </el-radio-group>
          <!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list  -->
          <el-table
@ -179,7 +179,7 @@ const classWorkAnalysis = reactive({
  entpcourseworklistarray: [], // 当前学习任务所包含的试题ID
 })
 const tableRadio = reactive({
-  value: '1', // 已交
+  value: 1, // 已交
  list: [], // 已交list
  num1: 0, // 已交人数
  num0: 0 // 未交人数
@ -219,7 +219,7 @@ const openDialog = (data, isInit=true) => {
    classWorkAnalysis.workclass = data.workclass
    // 重置学生列表
    tableRadio.list = []
-    tableRadio.value = '1'
+    tableRadio.value = 1
    tableRadio.num0 = 0
    tableRadio.num1 = 0

@ -401,7 +401,7 @@ const getClassWorkStudentList = (rowId) => {
      tableRadio.list =
        classWorkAnalysis.classworkdata &&
        classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
-      tableRadio.value = '1'
+      tableRadio.value = 1
      tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
      tableRadio.num1 = tableRadio.list.length
      // 自动批阅判断
@ -417,7 +417,7 @@ const getClassWorkStudentList = (rowId) => {
 */
 const teacherCriticism = ()=>{
  // 已交的list才自动批阅判断
-  if(tableRadio.value == '1'&& classWorkAnalysis.worktype == '习题训练'){
+  if(tableRadio.value == 1 && classWorkAnalysis.worktype == '习题训练'){
    // 只有习题训练才会自动批阅
    tableRadio.list = tableRadio.list.map((item) => {
      return {
@ -572,16 +572,16 @@ const tableRadioChange = (e) => {
  isopen_dtwk_table.value = false;
  console.log(e,'??????')
  console.log("学生列表：", classWorkAnalysis.classworkdata)
-  if(e=='1'){
+  if(e==1){
    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
-    tableRadio.value = '1';
+    tableRadio.value = 1;
    tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
    tableRadio.num1 = tableRadio.list.length;
    // 自动批阅判断
    teacherCriticism();
-  }else if(e=='0'){
+  }else if(e==0){
    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
-    tableRadio.value = '0';
+    tableRadio.value = 0;
    tableRadio.num0 = tableRadio.list.length;
    tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
  }
--- a/src/renderer/src/views/prepare/components/treeLog.vue
+++ b/src/renderer/src/views/prepare/components/treeLog.vue
@ -22,7 +22,7 @@
  import { ref, defineExpose,defineEmits } from 'vue'
  import ChooseTextbook from './chooseTextbook.vue'
  const emit = defineEmits(['onsuccess'])
-  
+
  const dialogVisible = ref(false)
  const getNodeInfo = ref({})

@ -48,7 +48,7 @@
  const nodeClick = (data) => {
    getNodeInfo.value = {
      textbookId:data.node.rootid,
-      bookList:getFullObj(data.node)
+      cataList:getFullObj(data.node)
    }
    console.log(getNodeInfo.value,'log')
  }
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@ -126,6 +126,12 @@
                    <span>下载</span>
                  </el-button>
                </div>
+                <div v-if="item.fileSuffix === 'ppt' || item.fileSuffix === 'pptx'" class="item-popover-item">
+                  <el-button text @click="adToKj(item)">
+                    <i class="iconfont icon-jiahao"></i>
+                    <span>加入课件</span>
+                  </el-button>
+                </div>
                <div class="item-popover-item">
                  <el-button text @click="moveSmarttalkFun(item)">
                    <el-icon>
@ -153,7 +159,7 @@ import FileImage from '@/components/file-image/index.vue'
 import { asyncLocalFile } from '@/utils/talkFile'
 import { toTimeText } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById, addFileToKj } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'

@ -183,6 +189,14 @@ export default {
    }
  },
  methods: {
+    adToKj(item) {
+      addFileToKj(item.id).then(res=>{
+        console.log(res)
+        item.fileFlag = "课件"
+      },error=>{
+        console.log(error)
+      })
+    },
    editTalk(item) {
      console.log(item,this.userInfo,'this.userInfo')
      ElMessageBox.prompt('请输入新的名称', '重命名', {
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -2,7 +2,6 @@
  <div v-loading="isLoading" class="page-resource flex">
    <ChooseTextbook @node-click="nodeClick" />
    <div class="page-center-wrap">
-      <el-button @click="openChapter" type="primary">打开章节</el-button>
      <el-tabs v-model="activeAptTab" style="height: 100%;">
        <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
          <div class="prepare-center-header">
@ -141,8 +140,6 @@
  <!-- 上课配置 -->
  <class-start ref="calssRef" @close="closeChange"/>
  <PptDialog @add-success="addAiPPT" :currentNode="currentNode" :uploadData="uploadData" v-model="pptDialog"/>
-  <!-- 章节弹窗 -->
-  <TreeLog ref="treelogRef"/>
  <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
@ -637,7 +634,7 @@ export default {
    },
    async nodeClick(data) {
      console.log(data,'data');
-      
+
      if (this.currentNode.id === data.node.id) return
      this.curBookImg = data.textBook.curBookImg
      this.curBookPath = data.textBook.curBookPath
@ -796,11 +793,6 @@ export default {
          '&reservId=' +
          id
      })
-    },
-    // 打开章节
-    openChapter(){
-      // 打开弹窗
-      this.$refs.treelogRef.openDialog()
    }
  }
 }
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@ -18,21 +18,17 @@
      </el-col>
    </el-row>

-<!--    第三方资源筛选-->
-    <!-- <el-row class="resoure-btns" v-if="isThird">
-      <el-col :span="24" class="query-row flex">
-        <div class="flex row-left">
-          <el-button v-for="item in coursewareTypeList" :key="item.id"
-                     :type="sourceStore.thirdQuery.type == item.value ? 'primary' : ''" round
-                     @click="sourceStore.thirdChangeType(item.value)">
-            {{item.label }}
-          </el-button>
-        </div>
-      </el-col>
-    </el-row> -->
    <el-row class="resoure-btns">
      <el-col :span="24" class="query-row flex">
-        <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
+        <div class="flex row-left">
+      <!--    第三方资源筛选-->
+          <el-select v-if="isThird" v-model="sourceStore.thirdQuery.type" @change="sourceStore.thirdChangeType"
+            style="width: 110px">
+            <el-option v-for="item in coursewareTypeList" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+
+         <el-select v-else v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
            style="width: 110px">
            <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
              :value="item.value" />
--- a/src/renderer/src/views/resource/container/third-list.vue
+++ b/src/renderer/src/views/resource/container/third-list.vue
@ -50,6 +50,10 @@
              </div>
            </div>
          </div>
+          <el-button v-loading="item.loading" size="small" plain round type="primary" @click.stop="openChapter(item)">
+            <i class="iconfont icon-jiahao"></i>
+            备课</el-button
+          >
        </li>
      </ul>
    </el-scrollbar>
@ -66,25 +70,27 @@
      />
    </div>
    <FilePreview ref="thirdPreview" v-model="isViewImg"></FilePreview>
+    <TreeLog ref="treelogRef" @onsuccess="addToPrepare"/>
  </div>
 </template>

 <script setup>
 import { ref } from 'vue'
-// import { ElMessage, ElMessageBox } from 'element-plus'
-import { Clock,View,Folder,Search } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import { Clock,View,Folder } from '@element-plus/icons-vue'
 import FileImage from '@/components/file-image/index.vue'
 import FilePreview from '@/components/thirdFile-preview/index.vue'
-import useUserStore from '@/store/modules/user'
 import useResoureStore from '../store'
+import { addFileToPrepareThird } from '@/api/file'
+import TreeLog from '@/views/prepare/components/treeLog.vue'

-const userstore = useUserStore()
 const sourceStore = useResoureStore()

-// const userInfo = userstore.user
 //判断是否预览图片
 const isViewImg = ref(false)
 const thirdPreview = ref()
+const treelogRef = ref()
+const currentItem = ref()

 // 分页change
 const handleSizeChange = (limit) => {
@ -114,6 +120,31 @@ const handleRow = (item) => {
  isViewImg.value = true
  thirdPreview.value.init(item.itemId)
 }
+const openChapter = (item)=>{
+  currentItem.value = item
+  // 打开弹窗
+  treelogRef.value.openDialog()
+}
+const addToPrepare = (data) => {
+  console.log(data)
+  let chapterArr = []
+  for (let i = 0; i < data.cataList.length; i++) {
+    chapterArr.push({id: data.cataList[i].id,name: data.cataList[i].title})
+  }
+  let postData = {
+      itemId: currentItem.value.itemId,
+      textBookId: data.textbookId,
+      chapter: JSON.stringify(chapterArr)
+  }
+  currentItem.value.loading = true
+  addFileToPrepareThird(postData).then((res) => {
+    currentItem.value.loading = false
+    console.log(res)
+    if (res.code === 200) {
+      ElMessage.success("加入备课成功")
+    }
+  })
+}
 </script>

 <style lang="scss">
Author	SHA1	Message	Date
小杨	09df401cf1	fix：切换第三方资源格式;	2024-11-18 17:16:43 +08:00
zouyf	6b5164048c	Merge pull request 'zouyf_dev' (#407 ) from zouyf_dev into main Reviewed-on: #407	2024-11-13 15:45:01 +08:00
“zouyf”	1f2eb722f1	1	2024-11-13 15:43:09 +08:00
“zouyf”	b973fd685c	优化滚动条	2024-11-13 14:08:28 +08:00
朱浩	f899729db0	Merge pull request '三方资源加入备课' (#406 ) from zhuhao_dev into main Reviewed-on: #406	2024-11-13 11:08:51 +08:00
朱浩	249e1c047c	三方资源加入备课	2024-11-13 11:07:50 +08:00
baigl	c9bfd41fc7	Merge pull request 'baigl' (#405 ) from baigl into main Reviewed-on: #405	2024-11-12 16:47:48 +08:00
白了个白	51a8df474a	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl	2024-11-12 16:46:51 +08:00
白了个白	fbbd84df93	作业批改页：已交未交选择背景颜色缺失修复	2024-11-12 16:45:56 +08:00
朱浩	5cc93bb093	Merge pull request 'zhuhao_dev' (#404 ) from zhuhao_dev into main Reviewed-on: #404	2024-11-12 15:53:26 +08:00
朱浩	eefa9aff63	三方资源加入备课	2024-11-12 15:50:38 +08:00
朱浩	3ef73885e1	三方资源加入备课	2024-11-12 15:47:24 +08:00
zouyf	bc63691645	Merge pull request 'zouyf_dev' (#403 ) from zouyf_dev into main Reviewed-on: #403	2024-11-12 15:45:31 +08:00
“zouyf”	fa54546f5e	1	2024-11-12 15:43:47 +08:00
朱浩	d50327bc17	去除测试	2024-11-12 15:34:14 +08:00
“zouyf”	f20ddc1c58	Merge branch 'main' into zouyf_dev	2024-11-12 15:29:13 +08:00
“zouyf”	7c1c4e9b7d	1	2024-11-12 15:26:46 +08:00
白了个白	78eb65d532	Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl	2024-11-12 15:01:18 +08:00
“zouyf”	f2dbf12f3c	[作业布置] - 更改为分页查询	2024-11-12 15:01:00 +08:00
朱浩	77921f7e61	Merge branch 'main' into zhuhao_dev	2024-11-12 14:49:26 +08:00
朱浩	ac1cad8fd0	添加回调	2024-11-12 14:49:16 +08:00
yangws	00b58644b1	Merge pull request 'fix：修改格式；' (#402 ) from yangws into main Reviewed-on: #402	2024-11-12 14:48:52 +08:00