课程考核材料调整

jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts

@@ -53,53 +53,178 @@ export const columns: BasicColumn[] = [
   {
     title: '平时成绩1',
     align: "center",
-    dataIndex: 'cj1'
+    dataIndex: 'cj1',
+    children: [
+      {
+        title: '成绩类型',
+        dataIndex: 'cj1mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : "");
+          return text;
+        },
+      },
+      {
+        title: '分数',
+        dataIndex: 'cj1',
+        width: 100,
+      },
+      {
+        title: '占比',
+        dataIndex: 'cj1mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : "");
+          return text;
+        }
+      },
+    ],
   },
   {
     title: '平时成绩2',
     align: "center",
-    dataIndex: 'cj2'
+    dataIndex: 'cj2',
+    children: [
+      {
+        title: '成绩类型',
+        dataIndex: 'cj2mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : "");
+          return text;
+        },
+      },
+      {
+        title: '分数',
+        dataIndex: 'cj2',
+        width: 100,
+      },
+      {
+        title: '占比',
+        dataIndex: 'cj2mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : "");
+          return text;
+        }
+      },
+    ],
   },
   {
     title: '平时成绩3',
     align: "center",
-    dataIndex: 'cj3'
+    dataIndex: 'cj3',
+    children: [
+      {
+        title: '成绩类型',
+        dataIndex: 'cj3mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : "");
+          return text;
+        },
+      },
+      {
+        title: '分数',
+        dataIndex: 'cj3',
+        width: 100,
+      },
+      {
+        title: '占比',
+        dataIndex: 'cj3mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : "");
+          return text;
+        }
+      },
+    ],
   },
   {
     title: '期中成绩',
     align: "center",
-    dataIndex: 'cj4'
+    dataIndex: 'cj4',
+    children: [
+      {
+        title: '成绩类型',
+        dataIndex: 'cj5mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : "");
+          return text;
+        },
+      },
+      {
+        title: '分数',
+        dataIndex: 'cj4',
+        width: 100,
+      },
+      {
+        title: '占比',
+        dataIndex: 'cj4mc',
+        width: 100,
+        customRender:({text}) =>{
+          text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : "");
+          return text;
+        }
+      },
+    ],
   },
   {
     title: '期末成绩',
     align: "center",
-    dataIndex: 'cj5'
+    dataIndex: 'cj5',
-  },
+    children: [
-  {
+      {
-    title: '平时成绩1',
+        title: '成绩类型',
-    align: "center",
+        dataIndex: 'cj5mc',
-    dataIndex: 'cj1mc'
+        width: 100,
-  },
+        customRender:({text}) =>{
-  {
+          text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : "");
-    title: '平时成绩2',
+          return text;
-    align: "center",
+        },
-    dataIndex: 'cj2mc'
+      },
-  },
+      {
-  {
+        title: '分数',
-    title: '平时成绩3',
+        dataIndex: 'cj5',
-    align: "center",
+        width: 100,
-    dataIndex: 'cj3mc'
+      },
-  },
+      {
-  {
+        title: '占比',
-    title: '期中成绩',
+        dataIndex: 'cj4mc',
-    align: "center",
+        width: 100,
-    dataIndex: 'cj4mc'
+        customRender:({text}) =>{
-  },
+          text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : "");
-  {
+          return text;
-    title: '期末成绩',
+        }
-    align: "center",
+      },
-    dataIndex: 'cj5mc'
+    ],
   },
+  // {
+  //   title: '平时成绩1',
+  //   align: "center",
+  //   dataIndex: 'cj1mc'
+  // },
+  // {
+  //   title: '平时成绩2',
+  //   align: "center",
+  //   dataIndex: 'cj2mc'
+  // },
+  // {
+  //   title: '平时成绩3',
+  //   align: "center",
+  //   dataIndex: 'cj3mc'
+  // },
+  // {
+  //   title: '期中成绩',
+  //   align: "center",
+  //   dataIndex: 'cj4mc'
+  // },
+  // {
+  //   title: '期末成绩',
+  //   align: "center",
+  //   dataIndex: 'cj5mc'
+  // },
   {
     title: '总成绩',
     align: "center",

jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue

@@ -18,31 +18,30 @@
             <div v-if="jxrwInfo.value">
               <div>概要信息</div>
               <a-row>
-                <a-col :span="6">
+                <a-col :span="5">
                   <span style="margin-left: 15px;">开课单位</span> ：<span>{{jxrwInfo?.value.kkyxmc}}</span>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="5">
                   <span style="margin-left: 15px;">课程类别</span> ：<span>{{jxrwInfo?.value.kclb}}</span>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="5">
                   <span style="margin-left: 15px;">课程名称</span> ：<span>{{jxrwInfo?.value.kcmc}}</span>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="5">
                   <span style="margin-left: 15px;">课程负责人</span> ：<span>{{jxrwInfo?.value.teaxm}}</span>
                 </a-col>
-                
+                <a-col :span="4">
-                <a-col :span="6">
-                  <span style="margin-left: 15px;">成绩方式</span> ：<span></span>
-                </a-col>
-                <a-col :span="6">
-                  <span style="margin-left: 15px;">修读方式</span> ：<span></span>
-                </a-col>
-                <a-col :span="6">
                   <span style="margin-left: 15px;">考试性质</span> ：<span>{{jxrwInfo?.value.khfsmc}}</span>
                 </a-col>
-                <a-col :span="6">
+<!--                <a-col :span="6">-->
-                  <span style="margin-left: 15px;">任课教师职称</span> ：<span>{{jxrwInfo?.value.teaxm.substring(jxrwInfo?.value.teaxm.indexOf("[")+1,jxrwInfo?.value.teaxm.indexOf("]"))}}</span>
+<!--                  <span style="margin-left: 15px;">成绩方式</span> ：<span></span>-->
-                </a-col>
+<!--                </a-col>-->
+<!--                <a-col :span="6">-->
+<!--                  <span style="margin-left: 15px;">修读方式</span> ：<span></span>-->
+<!--                </a-col>-->
+<!--                <a-col :span="6">-->
+<!--                  <span style="margin-left: 15px;">任课教师职称</span> ：<span>{{jxrwInfo?.value.teaxm.substring(jxrwInfo?.value.teaxm.indexOf("[")+1,jxrwInfo?.value.teaxm.indexOf("]"))}}</span>-->
+<!--                </a-col>-->
               </a-row>
             </div>
           </div>
@@ -81,7 +80,7 @@
   const registerModal = ref();
   const userStore = useUserStore();
   const spinning = ref<boolean>(false);
-  
+
   const jxrwInfo = reactive<any>({});
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -122,17 +121,17 @@
   });
 
 function textDown(){
-  var a = document.createElement("a"); //创建一个<a></a>标签 
+  var a = document.createElement("a"); //创建一个<a></a>标签
-   a.href = "/download/a.docx"; 
+   a.href = "/download/a.docx";
-    //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点. 
+    //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
     a.download ="a.docx";
     //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
-    a.style.display = "none"; // 障眼法藏起来a标签 
+    a.style.display = "none"; // 障眼法藏起来a标签
     document.body.appendChild(a);
-    // 将a标签追加到文档对象中 
+    // 将a标签追加到文档对象中
     a.click(); //模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
      a.remove();
-    // 一次性的，用完就删除a标签 
+    // 一次性的，用完就删除a标签
 }
 
   /**
@@ -142,15 +141,15 @@ function textDown(){
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -175,7 +174,7 @@ function textDown(){
       },];
     }
   }
-   
+
 
   /**
    * 查询
@@ -183,7 +182,7 @@ function textDown(){
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -193,7 +192,7 @@ function textDown(){
     //刷新数据
     reload();
   }
-  
+
 function init(record) {
   console.log('🧞', record);
   queryParam.kcrwdm = record.kcrwdm;