刘洋 1 éve
szülő
commit
fc332d3c40

+ 2 - 2
server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      target: 'http://192.168.10.41:8200',
+      // target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      // target: 'http://192.168.10.136:80',
+      target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

+ 24 - 3
src/modules/analysis/marker-statistics/index.vue

@@ -441,9 +441,30 @@ const columns: any = computed(() => {
       minWidth: 110,
     },
     { label: '给分', prop: 'markerScore', minWidth: 70, sortable: true },
-    { label: '客观分', prop: 'objectiveScore', minWidth: 80, sortable: true },
-    { label: '客主比', prop: 'markerRatio', minWidth: 80, sortable: true },
-    { label: '成绩客主比', prop: 'ratio', minWidth: 110, sortable: true },
+    {
+      label: '客观分',
+      prop: 'objectiveScore',
+      minWidth: 80,
+      sortable: true,
+    },
+    {
+      label: '客主比',
+      prop: 'markerRatio',
+      minWidth: 80,
+      sortable: true,
+      sortMethod: function (a: any, b: any) {
+        return Number(a.markerRatio) - Number(b.markerRatio)
+      },
+    },
+    {
+      label: '成绩客主比',
+      prop: 'ratio',
+      minWidth: 110,
+      sortable: true,
+      sortMethod: function (a: any, b: any) {
+        return Number(a.ratio) - Number(b.ratio)
+      },
+    },
     { label: '成绩', prop: 'markScore', minWidth: 70, sortable: true },
     { label: '评卷时间', prop: 'markTime', minWidth: 140, sortable: true },
   ]

+ 5 - 2
src/modules/quality/ending-check/components/EndCheck.vue

@@ -382,7 +382,10 @@ const columns1 = computed(() => {
       cellRenderer: (rowObj: any) => {
         const { rowData } = rowObj
         return (
-          <span>
+          <div
+            style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis"
+            title={`${rowData.loginName}-${rowData.markerName}`}
+          >
             <span
               style={{
                 backgroundColor: rowData.online ? '#00B42A' : '#ddd',
@@ -394,7 +397,7 @@ const columns1 = computed(() => {
               }}
             ></span>
             <span>{`${rowData.loginName}-${rowData.markerName}`}</span>
-          </span>
+          </div>
         )
       },
       // formatter(row: any) {