Browse Source

fix: change multiple select

DESKTOP-USV654P\pc 4 months ago
parent
commit
2b329de91b

+ 8 - 8
src/views/evaluate/result/components/data.config.ts

@@ -43,7 +43,7 @@ export const tableColumns: BasicColumn[] = [
     dataIndex: 'action',
     slots: { customRender: 'action' },
     align: 'center',
-    width: 180,
+    width: 210,
   },
 ];
 //评价结果里面的搜索字段
@@ -365,7 +365,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     dataIndex: 'index',
     width: 60,
     customCell: (record) => {
-      return { rowSpan: record.rowSpanTopic };
+      return { rowSpan: record.rowSpanObject };
     },
   },
   {
@@ -374,7 +374,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 120,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanTopic };
+      return { rowSpan: record.rowSpanObject };
     },
   },
   {
@@ -383,7 +383,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 100,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanTopic };
+      return { rowSpan: record.rowSpanObject };
     },
   },
   {
@@ -392,7 +392,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 110,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanTopic };
+      return { rowSpan: record.rowSpanObject };
     },
   },
   {
@@ -412,7 +412,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 200,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanProblem };
+      return { rowSpan: record.rowSpanTopic };
     },
   },
   {
@@ -421,7 +421,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 80,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanProblem };
+      return { rowSpan: record.rowSpanTopic };
     },
   },
   {
@@ -430,7 +430,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
     width: 80,
     align: 'left',
     customCell: (record) => {
-      return { rowSpan: record.rowSpanTopic };
+      return { rowSpan: record.rowSpanObject };
     },
   },
 ];

+ 18 - 1
src/views/evaluate/result/components/resultView.vue

@@ -35,12 +35,29 @@
     bordered: true,
     immediate: false,
     canResize: true,
+    pagination: {
+      pageSize: 1000,
+    },
     afterFetch: (t) => {
-      const dataList = sortBy(t, ['topic', 'problem'], ['asc', 'asc']);
+      const dataList = sortBy(t, ['objectIdCN', 'topic', 'problem'], ['asc', 'asc', 'asc']);
       let topic = '';
       let problem = '';
+      let objectIdCN = '';
+      let objectIndex = 1;
       let topicIndex = 1;
       dataList.forEach((item) => {
+        if (item.objectIdCN !== objectIdCN) {
+          objectIdCN = item.objectIdCN;
+          topic = '';
+          problem = '';
+          const filterItme = dataList.filter((row) => row.objectIdCN === objectIdCN);
+          item.rowSpanObject = filterItme.length;
+          item.objectIndex = objectIndex++;
+        } else {
+          item.rowSpanObject = 0;
+          item.objectIndex = objectIndex;
+        }
+
         if (item.topic !== topic) {
           topic = item.topic;
           problem = '';

+ 15 - 1
src/views/evaluate/result/index.vue

@@ -7,7 +7,8 @@
   import detailView from './components/detailView.vue';
   import resultView from './components/resultView.vue';
   import { getEvaluateResultIndexPage } from '/@/services/apis/EvaluateResultController';
-  const [tableRegister] = useTable({
+  import { postEvaluateManageChangeStatus } from '/@/services/apis/EvaluateManageController';
+  const [tableRegister, { reload }] = useTable({
     api: getEvaluateResultIndexPage,
     columns: tableColumns,
     title: '评价结果',
@@ -30,6 +31,14 @@
   const handleResult = (record: any) => {
     openResultModal(true, { ...record });
   };
+
+  const handlePush = async (record: any) => {
+    await postEvaluateManageChangeStatus({
+      id: record.evaluateManageId,
+      status: record.status === 0,
+    });
+    reload();
+  };
 </script>
 
 <template>
@@ -46,6 +55,11 @@
               label: '结果查看',
               onClick: handleResult.bind(null, record),
             },
+            {
+              label: '暂停',
+              disabled: record.status !== 1,
+              onClick: handlePush.bind(null, record),
+            },
           ]"
         />
       </template>