Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/pages/check/index.jsx

@@ -69,13 +69,25 @@ export default (props) => {
       title: "实地测评得分",
       dataIndex: "locScore",
       hideInSearch: true,
-      render: (_, row) => (row.locScore || 0) * (row.locScorePercent || 0),
+      render: (_, row) => {
+        const origin = row.locScore || 0;
+        const percent = row.locScorePercent || 0;
+        const score = Number(origin * percent).toFixed(2);
+
+        return `${origin} * ${percent * 100}% = ${score}`;
+      },
     },
     {
       title: "调查问卷得分",
       dataIndex: "surveyScore",
       hideInSearch: true,
-      render: (_, row) => (row.surveyScore || 0) * (row.surveyScorePercent || 0),
+      render: (_, row) => {        
+        const origin = row.surveyScore || 0;
+        const percent = row.surveyScorePercent || 0;
+        const score = Number(origin * percent).toFixed(2);
+
+        return `${origin} * ${percent * 100}% = ${score}`;
+      },
     },
     {
       title: "状态",

src/pages/checkAnswer/loc/index.jsx

@@ -51,6 +51,11 @@ export default (props) => {
       request: getLocType,
       dataIndex: "typeId",
     },
+    {
+      title: "详细地址",
+      dataIndex: "addr",
+      hideInSearch: true,
+    },
     {
       title: "答题人",
       dataIndex: "userName",