Yansen 2 years ago
parent
commit
484b881df2
2 changed files with 19 additions and 2 deletions
  1. 14
    2
      src/pages/check/index.jsx
  2. 5
    0
      src/pages/checkAnswer/loc/index.jsx

+ 14
- 2
src/pages/check/index.jsx View File

69
       title: "实地测评得分",
69
       title: "实地测评得分",
70
       dataIndex: "locScore",
70
       dataIndex: "locScore",
71
       hideInSearch: true,
71
       hideInSearch: true,
72
-      render: (_, row) => (row.locScore || 0) * (row.locScorePercent || 0),
72
+      render: (_, row) => {
73
+        const origin = row.locScore || 0;
74
+        const percent = row.locScorePercent || 0;
75
+        const score = Number(origin * percent).toFixed(2);
76
+
77
+        return `${origin} * ${percent * 100}% = ${score}`;
78
+      },
73
     },
79
     },
74
     {
80
     {
75
       title: "调查问卷得分",
81
       title: "调查问卷得分",
76
       dataIndex: "surveyScore",
82
       dataIndex: "surveyScore",
77
       hideInSearch: true,
83
       hideInSearch: true,
78
-      render: (_, row) => (row.surveyScore || 0) * (row.surveyScorePercent || 0),
84
+      render: (_, row) => {        
85
+        const origin = row.surveyScore || 0;
86
+        const percent = row.surveyScorePercent || 0;
87
+        const score = Number(origin * percent).toFixed(2);
88
+
89
+        return `${origin} * ${percent * 100}% = ${score}`;
90
+      },
79
     },
91
     },
80
     {
92
     {
81
       title: "状态",
93
       title: "状态",

+ 5
- 0
src/pages/checkAnswer/loc/index.jsx View File

51
       request: getLocType,
51
       request: getLocType,
52
       dataIndex: "typeId",
52
       dataIndex: "typeId",
53
     },
53
     },
54
+    {
55
+      title: "详细地址",
56
+      dataIndex: "addr",
57
+      hideInSearch: true,
58
+    },
54
     {
59
     {
55
       title: "答题人",
60
       title: "答题人",
56
       dataIndex: "userName",
61
       dataIndex: "userName",