Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue

@@ -224,100 +224,24 @@ export default {
         type: [],
         resource: "",
       },
-      config: {
-        data: [
-          {
-            name: "部门1",
-            value: 95,
-          },
-          {
-            name: "部门2",
-            value: 90,
-          },
-          {
-            name: "部门3",
-            value: 98,
-          },
-          {
-            name: "部门4",
-            value: 91,
-          },
-          {
-            name: "部门5",
-            value: 80,
-          },
-          {
-            name: "部门6",
-            value: 92,
-          },
-          {
-            name: "部门7",
-            value: 93,
-          },
-          {
-            name: "部门8",
-            value: 94,
-          },
-          {
-            name: "部门9",
-            value: 90,
-          },
-          {
-            name: "部门10",
-            value: 100,
-          },
-        ],
-      },
-      personConfig: {
-        data: [
-          {
-            name: "个人1",
-            value: 95,
-          },
-          {
-            name: "个人2",
-            value: 90,
-          },
-          {
-            name: "个人3",
-            value: 98,
-          },
-          {
-            name: "个人4",
-            value: 91,
-          },
-          {
-            name: "个人5",
-            value: 80,
-          },
-          {
-            name: "个人6",
-            value: 92,
-          },
-          {
-            name: "个人7",
-            value: 93,
-          },
-          {
-            name: "个人8",
-            value: 94,
-          },
-          {
-            name: "个人9",
-            value: 90,
-          },
-          {
-            name: "个人10",
-            value: 100,
-          },
-        ],
-      },
+      config: {},//部门绩效总分top10
+      personConfig: {},//个人绩效总分top10
       cricleData: [
         { value: 756, name: "考勤绩效" },
         { value: 690, name: "评价绩效" },
         { value: 559, name: "办件绩效" },
         { value: 1278, name: "效能绩效" },
       ],
+      // 个人绩效总分排名
+      staffQuery:{
+        page:1,
+        size:10,
+      },
+      // 部门
+      depQuery:{
+        page:1,
+        size:10,
+      },
     };
   },
 
@@ -326,9 +250,48 @@ export default {
     this.drawRulePie();
     this.drawCorePie();
     this.drawRecordPie();
+
+    this.staffStatList()
+    this.depStatList()
   },
 
   methods: {
+    // 个人绩效总分排名
+    staffStatList(){
+      this.$post("/staff/perform/stat/list", this.staffQuery).then((res) => {
+        const {code,data} = res
+        if(code == 1){
+          const row = data.data || []
+          const depArr = []
+          row.forEach(element => {
+            depArr.push({
+              name:element.staffName,
+              value:element.totalScore
+            })
+          });
+          this.personConfig = {data:depArr}
+          console.log(row,"个人")
+        }
+      });
+    },
+    // 部门绩效总分排名
+    depStatList(){
+      this.$post("/dept/perform/stat/list", this.depQuery).then((res) => {
+        const {code,data} = res
+        if(code == 1){
+          const row = data.data || []
+          const depArr = []
+          row.forEach(element => {
+            depArr.push({
+              name:element.deptName,
+              value:element.totalScore
+            })
+          });
+          this.config = {data:depArr}
+          // console.log(row,depArr,"部门")
+        }
+      });
+    },
     drawLeiDa() {
       // 基于dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("leida"));

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

@@ -12,7 +12,7 @@
               + {{ type == 1 ? "新增考核部门" : "新增考核个人" }}</el-button
             >
           </div>
-          <div class="mid_content">
+          <div class="mid_content" style="height: auto;">
             <div class="goal_box" v-for="(val, i) in dataList" :key="i">
               <div class="goal_title">
                 <img src="../../../../assets/images/u17641.svg" alt="" />
@@ -321,7 +321,7 @@ export default {
         box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
         -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
         -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
-        margin: 0 20px 20px 0;
+        margin: 10px 20px 10px 20px;
         padding: 20px;
         .goal_title {
           width: 100%;

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

@@ -224,7 +224,7 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element.totalScore)
           });
           this.depStatObj.totalScore.x = x
@@ -241,13 +241,30 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element.attendScoreAdd)
           });
           this.depStatObj.attendScoreAdd.x = x
           this.depStatObj.attendScoreAdd.y = y
         }
       });
+      // 减分
+      const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
+      this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+        const {code,data,dict} = res
+        if(code == 1){
+          const row = data.data || []
+          // this.statArr = row
+          const x = []
+          const y = []
+          row.forEach(element => {
+            x.push(element.staffName)
+            y.push(element.totalSubScore)
+          });
+          this.depStatObj.totalSubScore.x = x
+          this.depStatObj.totalSubScore.y = y
+        }
+      });
     },
     // 部门绩效分数统计
     statList(){
@@ -274,7 +291,7 @@ export default {
       });
       // 加分top10
       const top10 = {...this.boardQuery,size:10,orderColList:[{colName:'totalAddScore',sortKind:'desc'}]}
-      this.$post("/staff/perform/stat/list", top10).then((res) => {
+      this.$post("/dept/perform/stat/list", top10).then((res) => {
         const {code,data,dict} = res
         if(code == 1){
           const row = data.data || []
@@ -292,7 +309,7 @@ export default {
       });
       // 减分
       const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
-      this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+      this.$post("/dept/perform/stat/list", top10Sub).then((res) => {
         const {code,data,dict} = res
         if(code == 1){
           const row = data.data || []
@@ -334,7 +351,7 @@ export default {
           const x = []
           const y = []
           row.forEach(element => {
-            x.push(element.deptName)
+            x.push(element.staffName)
             y.push(element[this.value])
           });
           this.depStatObj.alignment.x = x