From 89453b9d9ad8b3d9cc1d702d05d8ea0ed7be5315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Mon, 9 Nov 2020 16:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/components/table.vue          | 27 +++++++++++++++----
 .../kpi/assessment/performance/index.vue      | 14 +++++-----
 src/views/kpi/set/index.vue                   |  2 +-
 src/views/kpi/workbench/todo/tableItem.vue    |  4 +--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index 2e0d237..1741f65 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -15,7 +15,8 @@
                     暂无数据
                 </div>
           </div> -->
-          <div  v-for="(item,index) in obj.recortModelDtos" :key="index" class="table-content">
+
+          <div  v-for="(item,index) in ((tableInfo.score || auth.showScore)?obj.recortModelDtos:obj.recortModelDtos.slice(0,obj.recortModelDtos.length-1))" :key="index" class="table-content">
             <div class="table-content-left table-left">
               <!-- {{item.name}} -->
                <div v-for="(i,indexs) in item.name" :key="indexs">
@@ -56,19 +57,23 @@
                     <el-input v-if="tableInfo.score" style="width:200px;" size="mini"  type="textarea" placeholder="请输入内容" v-model="child.scoreComment" clearable></el-input>
                     <span v-else>{{child.scoreComment || '--'}}</span>
                 </div>
+
               </div>
               <div v-if="item.detailDtos.length===0" class="table-content-right-item">
                  <div class="name">
                 </div>
                  <div>
                 </div>
-                <div v-if="tableInfo.result">
+                <div v-if="tableInfo.result || auth.showResult">
                 </div>
                 <div class="quanzhomng"  style="flex:none;">
                 </div>
                 <div v-if="tableInfo.score">
                 </div>
-                <div style="padding:10px;" v-if="tableInfo.score">
+                <div  style="width:140px;" v-if="tableInfo.score || auth.showScore">
+                  {{handleGetScorc()}}
+                </div>
+                <div style="padding:10px;" v-if="tableInfo.score || auth.showScore">
                 </div>
               </div>
             </div>
@@ -135,10 +140,23 @@ export default {
     }
   },
   mounted () {
-    console.log('list', this.obj)
     this.handleGrt375()
   },
   methods: {
+    handleGetScorc (obj = this.obj) {
+      const result = obj.recortModelDtos.reduce((result, i) => {
+        i.detailDtos.map(j => {
+          const str = j.calculate.replace(/{\w+}/g, (i) => {
+            i = i.replace(/{|}/g, '')
+            return j[i]
+          })
+          let a = eval(str)
+          result += a
+        })
+        return result
+      }, 0)
+      return result.toFixed(3)
+    },
     handleScore (item) {
       console.log('this.scoreList: ', this.scoreList)
       return this.scoreList.filter(i => i.score === item).length > 0 ? this.scoreList.filter(i => i.score === item)[0].name : 0
@@ -172,7 +190,6 @@ export default {
       let res = await apiGet375()
       if (res.code !== 200) return
       this.scoreList = res.data
-      console.log('resssss: ', res)
     },
     async handleSaveDetail (params = this.obj) {
       this.loadingZan = true
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index ba21bab..7883e37 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -90,10 +90,7 @@
           </div>
           <div class="performance-content-jilu-item-content">
             <div class="performance-content-jilu-item-content-img">
-              <img
-                 :src="i.avatar|| ''"
-                alt=""
-              >
+              <InfoHeader :isShow='false' :obj='{src:i.avatar}' />
             </div>
             <div>
               <span>{{i.staffName}}</span><span class="mubiao">#{{i.optDesc}}#</span>
@@ -187,6 +184,7 @@ export default {
       let res = await apiResultGetDetail({ id })
       this.$loadingEnd()
       if (res.code !== 200) return this.$message.error(res.msg)
+      res.data.recortModelDtos = res.data.recortModelDtos.concat([{name: '总分', detailDtos: []}])
       this.obj = res.data
     },
     handleRight (item) {
@@ -340,14 +338,14 @@ export default {
             margin: 0 4px;
           }
           &-img {
-            width: 30px;
-            height: 30px;
+            // width: 30px;
+            // height: 30px;
             border-radius: 50%;
             overflow: hidden;
             margin-right: 10px;
             img {
-              width: 100%;
-              height: 100%;
+              // width: 100%;
+              // height: 100%;
             }
           }
         }
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index d7b6b12..656b05b 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -9,7 +9,7 @@
       active-text-color="#3ba1ff"
     >
       <el-menu-item index="0">考评组设置</el-menu-item>
-      <el-menu-item index="1">默认值设置</el-menu-item>
+      <el-menu-item index="1">权限设置</el-menu-item>
     </el-menu>
     <ground-table class="kaoping" v-if="activeIndex==='0'"></ground-table>
     <div v-else-if="activeIndex==='1'">
diff --git a/src/views/kpi/workbench/todo/tableItem.vue b/src/views/kpi/workbench/todo/tableItem.vue
index 351f81f..2ceb49f 100644
--- a/src/views/kpi/workbench/todo/tableItem.vue
+++ b/src/views/kpi/workbench/todo/tableItem.vue
@@ -8,7 +8,7 @@
             style="border-top: 1px solid #ebebeb;"
             max-height="500"
           >
-            <el-table-column width="100">
+            <el-table-column width="80">
               <template slot-scope="scope">
                 <InfoHeader :isShow='false' :obj='{src:scope.row.avatar}' />
               </template>
@@ -19,7 +19,7 @@
               align="right"
             >
               <template slot-scope="scope">
-                {{scope.row.time}}<i class="el-icon-arrow-right"></i>
+                {{scope.row.time}}
               </template>
             </el-table-column>
           </el-table>