Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -77,16 +77,58 @@ export default {
       };
       console.log(data);
       this.config.columns.forEach((v) => {
-        v.label == "考勤绩效分数"
-          ? (v.label = `考勤绩效分数（${data.dict.weightPdu.attendWeight}）`)
-          : v.label == "评价绩效分数"
-          ? (v.label = `评价绩效分数（${data.dict.weightPdu.reviewWeight}）`)
-          : v.label == "办件绩效分数"
-          ? (v.label = `办件绩效分数（${data.dict.weightPdu.goworkWeight}）`)
-          : v.label == "效能绩效分数"
-          ? (v.label = `效能绩效分数（${data.dict.weightPdu.effectWeight}）`)
-          : v.label == "自评绩效分数"
-          ? (v.label = `自评绩效分数（${data.dict.weightPdu.selfWeight}）`)
+        v.label == "服务规范"
+          ? (v.label = (
+              <p>
+                <span>服务规范</span>
+                <p>
+                  {"（考勤绩效 *" + data.dict.weightPdu.attendWeight + "%）"}
+                </p>
+              </p>
+            ))
+          : v.label == "群众评议"
+          ? (v.label = (
+              <p>
+                <span>群众评议</span>
+                <p>
+                  {"（评价绩效 *" + data.dict.weightPdu.attendWeight + "%）"}
+                </p>
+              </p>
+            ))
+          : v.label == "工作效能"
+          ? (v.label = (
+              <p>
+                <span>工作效能</span>
+                <p>
+                  {"（办件绩效 *" + data.dict.weightPdu.attendWeight + "%）"}
+                </p>
+              </p>
+            ))
+          : v.label == "工作纪律"
+          ? (v.label = (
+              <p>
+                <span>工作纪律</span>
+                <p>
+                  {"（效能绩效 *" + data.dict.weightPdu.attendWeight + "%）"}
+                </p>
+              </p>
+            ))
+          : v.label == "综合管理"
+          ? (v.label = (
+              <p>
+                <span>综合管理</span>
+                <p>
+                  {"（自评绩效 *" + data.dict.weightPdu.attendWeight + "%）"}
+                </p>
+              </p>
+            ))
+          : v.label == "加分"
+          ? (v.label = (
+              <p>
+                <span>加分</span>
+                <p>{"（其他绩效）"}</p>
+              </p>
+            ))
           : "";
         // if(||v.label='评价绩效分数'||v.label='办件绩效分数'||v.label='效能绩效分数'||v.label='自评绩效分数'){
 
@@ -174,7 +216,7 @@ export default {
           },
 
           {
-            label: "考勤绩效分数",
+            label: "服务规范",
             prop: "attendScore",
             width: 150,
             formatter: (row) => {
@@ -213,7 +255,7 @@ export default {
           },
 
           {
-            label: "评价绩效分数",
+            label: "群众评议",
             prop: "reviewScore",
             width: 150,
             formatter: (row) => {
@@ -262,7 +304,7 @@ export default {
           // },
 
           {
-            label: "办件绩效分数",
+            label: "工作效能",
             prop: "goworkScore",
             width: 150,
             formatter: (row) => {
@@ -301,7 +343,7 @@ export default {
           },
 
           {
-            label: "效能绩效分数",
+            label: "工作纪律",
             prop: "effectScore",
             width: 150,
             formatter: (row) => {
@@ -340,7 +382,7 @@ export default {
           },
 
           {
-            label: `自评绩效分数`,
+            label: `综合管理`,
             prop: "otherScore",
             width: 150,
             formatter: (row) => {