From 9a782c8e99d1c968d11d205eae9f162ff65b8909 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Tue, 27 Oct 2020 20:11:24 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/initiateAssessment.js                 |   1 +
 src/api/toDo.js                               |  10 ++
 src/style/common.less                         |   4 +
 src/views/kpi/set/index.vue                   |   7 +-
 .../workbench/initiateAssessment/index.vue    |   6 +-
 src/views/kpi/workbench/todo/index.vue        | 119 ++++++++++++++++--
 6 files changed, 129 insertions(+), 18 deletions(-)
 create mode 100644 src/api/toDo.js

diff --git a/src/api/initiateAssessment.js b/src/api/initiateAssessment.js
index 8e74e5e..e574775 100644
--- a/src/api/initiateAssessment.js
+++ b/src/api/initiateAssessment.js
@@ -1,5 +1,6 @@
 
 import request from '@/utils/request'
+
 //  发起考核
 export function apiInitiateAssessmentInfo (query) {
   return request({
diff --git a/src/api/toDo.js b/src/api/toDo.js
new file mode 100644
index 0000000..3dae5d5
--- /dev/null
+++ b/src/api/toDo.js
@@ -0,0 +1,10 @@
+import requestFuc from '@/utils/request'
+
+// 获取考核组列表
+export function apiGetWaitList (query) {
+  return requestFuc({
+    url: '/lz_management/performance/task/list',
+    method: 'POST',
+    data: query
+  })
+}
diff --git a/src/style/common.less b/src/style/common.less
index dfbeccb..1678dc7 100644
--- a/src/style/common.less
+++ b/src/style/common.less
@@ -10,6 +10,10 @@
   font-size: 16px;
   color: #52575b;
 }
+.common-main {
+  background-color: white;
+  padding: 40px 20px;
+}
 .noSelect {
   -webkit-touch-callout: none;
   -webkit-user-select: none;
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index 32d701b..a8660c9 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="set-mian commonFont">
+  <div class="set-mian commonFont common-main">
     <el-menu
       :default-active="activeIndex"
       mode="horizontal"
@@ -47,8 +47,7 @@ export default {
 
 <style lang='less' scoped>
 .set-mian {
-    background-color: white;
-    min-height: 600px;
-    padding: 25px;
+  padding-top: 0px;
+  min-height: 600px;
 }
 </style>
diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue
index db35f06..f08fc20 100644
--- a/src/views/kpi/workbench/initiateAssessment/index.vue
+++ b/src/views/kpi/workbench/initiateAssessment/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="initiate-assessment commonFont">
+  <div class="initiate-assessment commonFont common-main">
     <el-form
       :model="formData"
       :rules="formRules"
@@ -340,14 +340,12 @@ export default {
 </script>
 <style lang="less" scoped>
 .initiate-assessment {
-    padding: 25px;
-    background-color: white;
     min-height: 600px;
     .title {
         margin-bottom: 25px;
     }
     .choose-group {
-        margin-top: 150px;
+        margin-top: 200px;
     }
     .line-space {
         margin-top: 20px;
diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
index 65b8dcb..92fc692 100644
--- a/src/views/kpi/workbench/todo/index.vue
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -1,28 +1,116 @@
 <!--  -->
 <template>
-    <div class="todo">
-      <small-nav />
-      <div class="todo-content boderAndRadius">
-        待办事项
+  <div class="todo commonFont">
+    <small-nav />
+    <div class="todo-content boderAndRadius">
+      <div class="todo-content-left">
+        <el-menu
+          @select="handleMenuSeledt"
+          :default-active="activeIndex"
+          style=" width: 200px; height: 100%;"
+        >
+          <el-menu-item index="0">待处理{{waitCount>0?'（' +waitCount + '）':''}}</el-menu-item>
+          <el-menu-item index="1">已处理</el-menu-item>
+        </el-menu>
       </div>
+      <div class="todo-content-right">
+        <!-- <div v-if=""></div> -->
+        <el-table
+          :data="waitTableList"
+          :show-header="false"
+          style="border-top: 1px solid #ebebeb;"
+          max-height="500"
+        >
+          <el-table-column
+            prop="imgStr"
+            width="100"
+          ></el-table-column>
+          <el-table-column prop="name"></el-table-column>
+          <el-table-column
+            width="200"
+            align="right"
+          >
+            <template slot-scope="scope">
+              {{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+            :hide-on-single-page="true"
+            :current-page.sync="rqParameter.currPage"
+            :page-size="rqParameter.pageSize"
+            :total="rqParameter.totalCount"
+            :page-count="rqParameter.totalPage"
+            @current-change="handleCurrentChange"
+            layout="total, prev, pager, next, jumper"
+          ></el-pagination>      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import SmallNav from '@/components/kpi-layout/SmallNav'
+import { apiGetWaitList } from '@/api/toDo'
 export default {
   data () {
     return {
-
+      activeIndex: '0',
+      waitCount: 0,
+      rqParameter: {
+        currPage: 1,
+        pageSize: 20,
+        status: 0,
+        totalCount: 1,
+        totalPage: 1
+      },
+      waitTableList: [{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }]
     }
   },
   components: {
     SmallNav
   },
   computed: {},
-  beforeMount () {},
-  mounted () {},
+  beforeMount () { },
+  mounted () {
+    this.activeIndex = '0'
+    this.rqParameter = {
+      currPage: 1,
+      pageSize: 20,
+      status: this.activeIndex,
+      totalCount: 1,
+      totalPage: 1
+    }
+    this.handleGetList()
+  },
   methods: {
+    handleGetList () {
+      apiGetWaitList(this.rqParameter).then(res => {
+        this.rqParameter.currPage = res.data.currPage
+        this.rqParameter.totalCount = res.data.totalCount
+        this.rqParameter.totalPage = res.data.totalPage
+        if (this.activeIndex === 0) {
+          // 待处理事项
+          this.waitCount = res.data.totalCount
+        }
+        this.waitTableList = res.data.list
+        console.log('待处理', res)
+      })
+    },
+    handleMenuSeledt () {
+      this.rqParameter = {
+        currPage: 1,
+        pageSize: 20,
+        status: this.activeIndex,
+        totalCount: 1,
+        totalPage: 1
+      }
+      this.waitTableList = []
+      this.handleGetList()
+    },
+    handleCurrentChange (val) {
+      this.rqParameter.currPage = val
+      this.handleGetList()
+    }
   },
   watch: {}
 
@@ -31,11 +119,22 @@ export default {
 </script>
 
 <style lang='less' scoped>
-.todo{
-  &-content{
+.todo {
+  &-content {
     width: 1252px;
-    min-height: 537px;
+    // min-height: 537px;
     padding: 28px;
+    display: flex;
+    &-left {
+      width: 200px;
+      float: left;
+    }
+    &-right {
+      // border-left: 2px solid @borderColor;
+      // padding-left: 20px;
+      padding: 20px;
+      flex: 1;
+    }
   }
 }
 </style>

From 626ea37c4da46351de7cb2e1573eb21106cd8b02 Mon Sep 17 00:00:00 2001
From: sean yu <yuyumin@ldxingyong.com>
Date: Wed, 28 Oct 2020 09:58:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kpi/report/index.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/kpi/report/index.vue b/src/views/kpi/report/index.vue
index 9001924..f880e85 100644
--- a/src/views/kpi/report/index.vue
+++ b/src/views/kpi/report/index.vue
@@ -46,9 +46,9 @@
           <ul>
             <li v-for="(assessItem, index) in assessNum" :key="assessItem.desc">
               <div class="rep_list">
-                <div :class="handleliColor(index)">{{ index }}
+                <div :style="handleliColor(index)">{{index}}
                 </div>
-                <div>{{ assessItem.title }} {{ assessItem.num }}人</div>
+                <div>{{assessItem.desc}} {{ assessItem.num }}人</div>
                 </div>
             </li>
           </ul>
@@ -60,8 +60,8 @@
           <el-table :data="tableData"
                     :header-cell-style="{ background:'#F5F7FA'}"
                     border
-                    style="flex:1">
-            <el-table-column prop="desc" label="绩效等级" width="200">
+                    >
+            <el-table-column prop="desc" label="绩效等级">
             </el-table-column>
             <el-table-column prop="num" label="实际分布" width="200">
             </el-table-column>
@@ -249,6 +249,9 @@ export default {
       return {
         width: '20px',
         height: '20px',
+        'text-align': 'center',
+        'line-height': '20px',
+        color: 'white',
         background: color
       }
     },
@@ -284,7 +287,7 @@ export default {
       }
       try {
         const result = await getChartData(params)
-        result.forEach((val, index) => {
+        result.data.forEach((val, index) => {
           console.log(val)
           if (val.type === 0) {
             // 头部数据
@@ -300,6 +303,7 @@ export default {
             this.assessNum = val.statisticals
             this.option.series[0].data = Array.from(this.assessNum).map(item => (item.num))
             this.option.xAxis[0].data = Array.from(this.assessNum).map(item => (item.desc))
+            console.log(this.option.xAxis[0].data)
             this.handleNumChart()
           }
         })
@@ -316,8 +320,7 @@ export default {
       }
       try {
         let res = await getStartsData(params)
-        res = res.data
-        handleNode(res)
+        handleNode(res.data)
       } catch (error) {
         console.log(error)
       }
@@ -387,6 +390,7 @@ export default {
   font-size: 14px;
   width: fit-content;
   padding-left: 50%;
+  margin-bottom: 20px;
   position: relative;
 }
 .level_title{
@@ -407,6 +411,11 @@ export default {
 .rep_list{
   display: flex;
 }
+.rep_list>:nth-child(2){
+    width: 200px;
+    margin-left: 10px;
+    flex:1
+}
 #num_chart {
   display: inline-block;
   width: 600px;

From 8c84a99625c08e86bf23805a73a22dd55776f375 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Wed, 28 Oct 2020 10:44:24 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/style/common.less                         |  20 ++-
 .../workbench/initiateAssessment/index.vue    |  54 +++---
 src/views/kpi/workbench/todo/index.vue        | 168 ++++++++++++------
 3 files changed, 156 insertions(+), 86 deletions(-)

diff --git a/src/style/common.less b/src/style/common.less
index 1678dc7..007167b 100644
--- a/src/style/common.less
+++ b/src/style/common.less
@@ -1,19 +1,28 @@
 @borderColor: #ebebeb;
 @fontBlue: #3ba1ff;
-@headerHeight:60px;
-.boderAndRadius{
+@headerHeight: 60px;
+
+.boderAndRadius {
   border: 1px solid @borderColor;
-  border-radius:6px ;
+  border-radius: 6px;
   background: #fff;
 }
+
 .commonFont {
   font-size: 16px;
   color: #52575b;
 }
+
+.comonPromptFont {
+  font-size: 14px;
+  color: #b1b1b1;
+}
+
 .common-main {
   background-color: white;
   padding: 40px 20px;
 }
+
 .noSelect {
   -webkit-touch-callout: none;
   -webkit-user-select: none;
@@ -22,7 +31,8 @@
   -ms-user-select: none;
   user-select: none;
 }
-.center(){
+
+.center() {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -34,4 +44,4 @@
 // }
 // ::-webkit-scrollbar {
 //   width: 0 !important;height: 0;
-// }
\ No newline at end of file
+// }
diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue
index f08fc20..6b16def 100644
--- a/src/views/kpi/workbench/initiateAssessment/index.vue
+++ b/src/views/kpi/workbench/initiateAssessment/index.vue
@@ -140,7 +140,7 @@
             </el-table>
             <div
               v-else
-              class="popup-empty"
+              class="popup-empty comonPromptFont"
             >
               <img
                 src=""
@@ -292,7 +292,7 @@ export default {
       apiInitiateAssessmentInfo(para).then(res => {
         this.dialogSendVisible = false
         console.log('发起考核成功', res)
-        this.$router.push({name: 'assessment-stepList', query: {id: res.data.id, name: 'assessment-homeList'}})
+        this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: 'assessment-homeList' } })
         this.$message({
           message: res.msg,
           type: 'success'
@@ -340,34 +340,34 @@ export default {
 </script>
 <style lang="less" scoped>
 .initiate-assessment {
-    min-height: 600px;
-    .title {
-        margin-bottom: 25px;
+  min-height: 600px;
+  .title {
+    margin-bottom: 25px;
+  }
+  .choose-group {
+    margin-top: 200px;
+  }
+  .line-space {
+    margin-top: 20px;
+  }
+  .popup {
+    &-search {
+      margin-bottom: 20px;
     }
-    .choose-group {
-        margin-top: 200px;
+    &-empty {
+      padding-top: 100px;
+      height: 500px;
+      width: 410px;
+      font-size: 14px;
+      text-align: center;
+      display: block;
+      align-content: center;
+      justify-content: center;
     }
-    .line-space {
-        margin-top: 20px;
-    }
-    .popup {
-        &-search {
-            margin-bottom: 20px;
-        }
-        &-empty {
-            padding-top: 100px;
-            height: 500px;
-            width: 410px;
-            font-size: 14px;
-            text-align: center;
-            display: block;
-            align-content: center;
-            justify-content: center;
-        }
 
-        &-footer-left {
-            color: @fontBlue;
-        }
+    &-footer-left {
+      color: @fontBlue;
     }
+  }
 }
 </style>
diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
index 92fc692..4b45ccc 100644
--- a/src/views/kpi/workbench/todo/index.vue
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -14,36 +14,46 @@
         </el-menu>
       </div>
       <div class="todo-content-right">
-        <!-- <div v-if=""></div> -->
-        <el-table
-          :data="waitTableList"
-          :show-header="false"
-          style="border-top: 1px solid #ebebeb;"
-          max-height="500"
-        >
-          <el-table-column
-            prop="imgStr"
-            width="100"
-          ></el-table-column>
-          <el-table-column prop="name"></el-table-column>
-          <el-table-column
-            width="200"
-            align="right"
+        <div v-if="selectedTableList.length > 0">
+          <el-table
+            :data="waitTableList"
+            @row-click="handleRowClick"
+            :show-header="false"
+            style="border-top: 1px solid #ebebeb;"
+            max-height="500"
           >
-            <template slot-scope="scope">
-              {{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-            :hide-on-single-page="true"
-            :current-page.sync="rqParameter.currPage"
-            :page-size="rqParameter.pageSize"
-            :total="rqParameter.totalCount"
-            :page-count="rqParameter.totalPage"
+            <el-table-column
+              prop="imgStr"
+              width="100"
+            ></el-table-column>
+            <el-table-column prop="name"></el-table-column>
+            <el-table-column
+              width="200"
+              align="right"
+            >
+              <template slot-scope="scope">
+                {{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            :hide-on-single-page="false"
+            :current-page.sync="pageSelectedInfo.currPage"
+            :page-size="pageSelectedInfo.pageSize"
+            :total="pageSelectedInfo.totalCount"
+            :page-count="pageSelectedInfo.totalPage"
             @current-change="handleCurrentChange"
             layout="total, prev, pager, next, jumper"
-          ></el-pagination>      </div>
+          ></el-pagination>
+        </div>
+        <div
+          v-else
+          class="todo-content-right-empty comonPromptFont"
+        >
+          <img src="ssss" />
+          <div>暂无代办</div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -56,14 +66,32 @@ export default {
     return {
       activeIndex: '0',
       waitCount: 0,
-      rqParameter: {
+      // 选中项
+      selectedTableList: [],
+      pageSelectedInfo: {
         currPage: 1,
         pageSize: 20,
         status: 0,
         totalCount: 1,
         totalPage: 1
       },
-      waitTableList: [{ imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }, { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }]
+      // 待处理
+      waitTableList: [
+        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
+        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
+        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }
+      ],
+      // 已处理
+      pageWaitInfo: {},
+      processedTableList: [],
+      pageProcessedInfo: {
+        currPage: 1,
+        pageSize: 20,
+        status: 0,
+        totalCount: 1,
+        totalPage: 1
+      }
+
     }
   },
   components: {
@@ -72,44 +100,55 @@ export default {
   computed: {},
   beforeMount () { },
   mounted () {
-    this.activeIndex = '0'
-    this.rqParameter = {
-      currPage: 1,
-      pageSize: 20,
-      status: this.activeIndex,
-      totalCount: 1,
-      totalPage: 1
-    }
     this.handleGetList()
   },
   methods: {
     handleGetList () {
-      apiGetWaitList(this.rqParameter).then(res => {
-        this.rqParameter.currPage = res.data.currPage
-        this.rqParameter.totalCount = res.data.totalCount
-        this.rqParameter.totalPage = res.data.totalPage
+      apiGetWaitList(this.pageSelectedInfo).then(res => {
+        this.pageSelectedInfo.currPage = res.data.currPage
+        this.pageSelectedInfo.totalCount = res.data.totalCount
+        this.pageSelectedInfo.totalPage = res.data.totalPage
         if (this.activeIndex === 0) {
           // 待处理事项
           this.waitCount = res.data.totalCount
         }
-        this.waitTableList = res.data.list
+        this.selectedTableList = res.data.list
         console.log('待处理', res)
       })
     },
-    handleMenuSeledt () {
-      this.rqParameter = {
-        currPage: 1,
-        pageSize: 20,
-        status: this.activeIndex,
-        totalCount: 1,
-        totalPage: 1
+    handleMenuSeledt (val) {
+      console.log('index ======', this.activeIndex)
+      console.log(val)
+      if (this.activeIndex !== val) {
+        console.log('menu 切换')
+        // 待处理 已处理 数据切换
+        if (val === '0') {
+          console.log('menu 0')
+          this.processedTableList = this.selectedTableList
+          this.pageProcessedInfo = this.pageSelectedInfo
+          this.selectedTableList = this.waitTableList
+          this.pageSelectedInfo = this.pageWaitInfo
+        } else {
+          console.log('menu 1')
+          this.waitTableList = this.selectedTableList
+          this.pageWaitInfo = this.pageSelectedInfo
+          this.selectedTableList = this.processedTableList
+          this.pageSelectedInfo = this.pageProcessedInfo
+        }
+        // 如果是第一页 刷新
+        console.log(this.pageSelectedInfo)
+        if (this.pageSelectedInfo.currPage === 1) {
+          this.handleGetList()
+        }
       }
-      this.waitTableList = []
-      this.handleGetList()
+      this.activeIndex = val
     },
     handleCurrentChange (val) {
-      this.rqParameter.currPage = val
-      this.handleGetList()
+      // 页面变更
+      this.pageSelectedInfo.currPage = val
+    },
+    handleRowClick (row) {
+      this.$router.push({ name: 'assessment-stepList', query: { id: row.id } })
     }
   },
   watch: {}
@@ -122,18 +161,39 @@ export default {
 .todo {
   &-content {
     width: 1252px;
-    // min-height: 537px;
+    min-height: 278px;
     padding: 28px;
     display: flex;
     &-left {
       width: 200px;
       float: left;
+      .el-menu-item.is-active {
+        background-color: #ecf4ff !important;
+        border-left: 3px solid #409eff;
+        color: #999;
+        span {
+          color: #999 !important;
+        }
+      }
     }
     &-right {
       // border-left: 2px solid @borderColor;
       // padding-left: 20px;
       padding: 20px;
       flex: 1;
+      .el-pagination {
+        text-align: right;
+        margin-top: 20px;
+      }
+      &-empty {
+        padding-top: 20px;
+        img {
+          width: 100px;
+          height: 100px;
+        }
+        height: 100%;
+        text-align: center;
+      }
     }
   }
 }

From 66630c747c49e54df825e3492d35cc20f13f3e94 Mon Sep 17 00:00:00 2001
From: yoe <yoe0405@163.com>
Date: Wed, 28 Oct 2020 11:05:53 +0800
Subject: [PATCH 4/9] =?UTF-8?q?update=20=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      |  1 +
 src/api/login.js                  | 10 ++++++
 src/router/config_route.js        | 11 ++++++
 src/router/index.js               |  7 ++--
 src/views/login/dingTalkLogin.vue | 56 +++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 src/api/login.js
 create mode 100644 src/router/config_route.js
 create mode 100644 src/views/login/dingTalkLogin.vue

diff --git a/package.json b/package.json
index 0d71846..2e26f7d 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "axios": "^0.20.0",
+    "dingtalk-jsapi": "^2.13.7",
     "echarts": "^4.9.0",
     "element-ui": "^2.13.2",
     "less": "^3.8.1",
diff --git a/src/api/login.js b/src/api/login.js
new file mode 100644
index 0000000..a099445
--- /dev/null
+++ b/src/api/login.js
@@ -0,0 +1,10 @@
+import requestFuc from '@/utils/request'
+
+// 钉钉免登录
+export function apiDingtalkLogin (query) {
+  return requestFuc({
+    url: '/lz_management/dtlg/login',
+    method: 'post',
+    params: query
+  })
+}
diff --git a/src/router/config_route.js b/src/router/config_route.js
new file mode 100644
index 0000000..8a16081
--- /dev/null
+++ b/src/router/config_route.js
@@ -0,0 +1,11 @@
+export default [
+  {
+    path: '/dingTalkLogin',
+    name: 'dingTalkLogin',
+    component: (resolve) => require(['@/views/login/dingTalkLogin.vue'], resolve),
+    meta: {
+      title: '登录',
+      isNav: true
+    }
+  }
+]
diff --git a/src/router/index.js b/src/router/index.js
index 0303ac8..b033fcf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,17 +1,18 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import configRouter from './config_route.js'
 import kpiRouter from './kpi_route.js'
 Vue.use(Router)
 
-const routes = [
+const router = [
   {
     path: '/',
     redirect: kpiRouter.length > 0 ? kpiRouter[0].redirect : '/'
   }
-].concat(kpiRouter)
+]
 
 export default new Router({
   base: '/digitization/',
   mode: 'history',
-  routes
+  routes: [...configRouter, ...kpiRouter, ...router]
 })
diff --git a/src/views/login/dingTalkLogin.vue b/src/views/login/dingTalkLogin.vue
new file mode 100644
index 0000000..7e88886
--- /dev/null
+++ b/src/views/login/dingTalkLogin.vue
@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <h2 class="brand-info__text">{{dataForm.verify}}</h2>
+  </div>
+</template>
+
+<script>
+import * as dd from 'dingtalk-jsapi'
+import { apiDingtalkLogin } from '@/api/login'
+
+export default {
+  data () {
+    return {
+      dataForm: {
+        verify: '身份验证中...'
+      },
+      dingCode: '' // 获取钉钉授权码
+    }
+  },
+  created () {
+    this.handleGetDingtalkCode()
+  },
+  mounted () {},
+  methods: {
+    // 获取钉钉鉴权码
+    handleGetDingtalkCode () {
+      dd.runtime.permission.requestAuthCode({
+        corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
+        onSuccess (res) {
+          console.log('result===', res)
+          this.dingCode = res
+          this.handleDingtalkLogin(res)
+        },
+        onFail (err) {
+          console.log('err===', err)
+          this.dingCode = err
+        }
+      })
+    },
+    // 钉钉免登录
+    handleDingtalkLogin (res) {
+      apiDingtalkLogin(res).then(res => {
+        if (res && res.code === 0) {
+          this.$cookie.set('token', res.token)
+          this.dataForm.verify = '登录成功，跳转中...'
+          window.open(window.location.protocol + '//' + window.location.host + '/kpi/workbench/home&code=' + this.dingCode.code, '_blank')
+        } else {
+          this.dataForm.verify = '身份验证失败' + res.msg
+          this.$message.error(this.dataForm.verify)
+          this.$router.replace({ name: 'dingTalkLogin' })
+        }
+      })
+    }
+  }
+}
+</script>

From 05465c28cbee4b450d5af4b9b2bf1f6ed1cdd342 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Wed, 28 Oct 2020 11:26:51 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kpi/workbench/todo/index.vue | 36 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
index 4b45ccc..e0529a6 100644
--- a/src/views/kpi/workbench/todo/index.vue
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -16,23 +16,27 @@
       <div class="todo-content-right">
         <div v-if="selectedTableList.length > 0">
           <el-table
-            :data="waitTableList"
+            :data="selectedTableList"
             @row-click="handleRowClick"
             :show-header="false"
             style="border-top: 1px solid #ebebeb;"
             max-height="500"
           >
-            <el-table-column
-              prop="imgStr"
-              width="100"
-            ></el-table-column>
-            <el-table-column prop="name"></el-table-column>
+            <el-table-column width="100">
+              <template slot-scope="scope">
+                <img
+                  :src="scope.row.avatar"
+                  class="todo-content-right-avatar"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="title"></el-table-column>
             <el-table-column
               width="200"
               align="right"
             >
               <template slot-scope="scope">
-                {{scope.row.dateTime}}<i class="el-icon-arrow-right"></i>
+                {{scope.row.time}}<i class="el-icon-arrow-right"></i>
               </template>
             </el-table-column>
           </el-table>
@@ -76,18 +80,14 @@ export default {
         totalPage: 1
       },
       // 待处理
-      waitTableList: [
-        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
-        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' },
-        { imgStr: '', name: '咔咔咔咔咔咔扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩', dateTime: '2020-22-22 02:22:22' }
-      ],
+      waitTableList: [],
       // 已处理
       pageWaitInfo: {},
       processedTableList: [],
       pageProcessedInfo: {
         currPage: 1,
         pageSize: 20,
-        status: 0,
+        status: 1,
         totalCount: 1,
         totalPage: 1
       }
@@ -108,7 +108,7 @@ export default {
         this.pageSelectedInfo.currPage = res.data.currPage
         this.pageSelectedInfo.totalCount = res.data.totalCount
         this.pageSelectedInfo.totalPage = res.data.totalPage
-        if (this.activeIndex === 0) {
+        if (this.activeIndex === '0') {
           // 待处理事项
           this.waitCount = res.data.totalCount
         }
@@ -146,9 +146,10 @@ export default {
     handleCurrentChange (val) {
       // 页面变更
       this.pageSelectedInfo.currPage = val
+      this.handleGetList()
     },
     handleRowClick (row) {
-      this.$router.push({ name: 'assessment-stepList', query: { id: row.id } })
+      this.$router.push({ name: 'assessment-stepList', query: { id: row.recordId } })
     }
   },
   watch: {}
@@ -181,6 +182,11 @@ export default {
       // padding-left: 20px;
       padding: 20px;
       flex: 1;
+      &-avatar {
+        width: 34px;
+        height: 34px;
+        border-radius: 17px;
+      }
       .el-pagination {
         text-align: right;
         margin-top: 20px;

From bda049b37084d95679dc66ff627d6e5329612f73 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Wed, 28 Oct 2020 11:32:43 +0800
Subject: [PATCH 6/9] no message

---
 src/views/kpi/workbench/todo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
index e0529a6..4d2ab4b 100644
--- a/src/views/kpi/workbench/todo/index.vue
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -41,7 +41,7 @@
             </el-table-column>
           </el-table>
           <el-pagination
-            :hide-on-single-page="false"
+            :hide-on-single-page="true"
             :current-page.sync="pageSelectedInfo.currPage"
             :page-size="pageSelectedInfo.pageSize"
             :total="pageSelectedInfo.totalCount"

From a60081173e756e5b63c437565100846531d810df Mon Sep 17 00:00:00 2001
From: leave <>
Date: Wed, 28 Oct 2020 11:46:49 +0800
Subject: [PATCH 7/9] no message

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2e26f7d..a2b4df8 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "babel-register": "^6.22.0",
     "chalk": "^2.0.1",
     "chromedriver": "^2.27.2",
+    "cli": "^1.0.1",
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn": "^5.0.1",
     "css-loader": "^0.28.0",
@@ -85,7 +86,7 @@
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
-    "webpack": "^3.6.0",
+    "webpack": "^3.12.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0"

From a95499117e534b93ca0dca06fb3a021bfdf295db Mon Sep 17 00:00:00 2001
From: yoe <yoe0405@163.com>
Date: Wed, 28 Oct 2020 16:01:43 +0800
Subject: [PATCH 8/9] =?UTF-8?q?update=20=E5=BC=B9=E7=AA=97=E9=80=8F?=
 =?UTF-8?q?=E6=98=8E=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 19514ca..b1ae2e5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -25,9 +25,9 @@ const service = axios.create({
 const options = {
   fullscreen: true,
   target: document.querySelector('.appamin'),
-  background: 'rgba(255, 255, 255, 0.1)',
+  background: 'rgba(255, 255, 255, 0.8)',
   spinner: 'el-icon-loading',
-  text: '请求加载中。。。'}
+  text: '数据加载中'}
 
 // request拦截器
 service.interceptors.request.use(config => {

From f6f9d8b97ddef88297ad6aece223d51c5b4a5bcb Mon Sep 17 00:00:00 2001
From: sean yu <yuyumin@ldxingyong.com>
Date: Wed, 28 Oct 2020 20:15:46 +0800
Subject: [PATCH 9/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report.js               |  17 ++++
 src/router/kpi_route.js         |   7 ++
 src/views/kpi/report/detail.vue | 119 +++++++++++++++++++----
 src/views/kpi/report/index.vue  | 163 ++++++++++++++++++--------------
 4 files changed, 214 insertions(+), 92 deletions(-)

diff --git a/src/api/report.js b/src/api/report.js
index 1434fb1..b08b85b 100644
--- a/src/api/report.js
+++ b/src/api/report.js
@@ -17,3 +17,20 @@ export function getStartsData (query) {
     data: query
   })
 }
+// 获取绩效排名详情
+export function getChartDetail (query) {
+  return requestFuc({
+    url: '/lz_management/performance/chart/detail',
+    method: 'POST',
+    data: query
+  })
+}
+
+// 获取部门信息
+export function getDepList (query) {
+  return requestFuc({
+    url: '/lz_management/staff/structure/deplist',
+    method: 'GET',
+    params: query
+  })
+}
diff --git a/src/router/kpi_route.js b/src/router/kpi_route.js
index 6370552..1cbbc19 100644
--- a/src/router/kpi_route.js
+++ b/src/router/kpi_route.js
@@ -147,6 +147,13 @@ export default [
         title: '智能测试带弹窗',
         pop: true
       }
+    }, {
+      path: 'report-detial',
+      name: 'reportDetial',
+      component: (resolve) => require(['@/views/kpi/report/detail.vue'], resolve),
+      meta: {
+        title: '绩效详情'
+      }
     }
     ]
   }
diff --git a/src/views/kpi/report/detail.vue b/src/views/kpi/report/detail.vue
index 2fea95c..3d1eff7 100644
--- a/src/views/kpi/report/detail.vue
+++ b/src/views/kpi/report/detail.vue
@@ -1,40 +1,121 @@
 <!--  -->
 <template>
-   <div>
-     <div>返回</div>
-     <span></span>
-     <div>等级分布详情<div>
-   </div>
-   <div>
-    <el-cascader></el-cascader>
-    <el-table :data="tableData"
+  <div>
+    <div class="title_bar">
+      <div @click="handleBack">返回</div>
+      <span></span>
+      <div>等级分布详情</div>
+    </div>
+    <div class="detail_content">
+        <el-cascader :options="depList" @change="handleChange" style="margin-bottom:20px" ></el-cascader>
+      <el-table :data="tableData"
               border
-              :header-cell-style="{ background:'#F5F7FA'}">
-      <el-table-column></el-table-column>
-      <el-table-column></el-table-column>
-      <el-table-column></el-table-column>
-      <el-table-column><el-table-column>
+              :header-cell-style="{ background:'#F5F7FA'}"
+              style="margin-top:20px">
+        <el-table-column prop="staffName" label="姓名"></el-table-column>
+        <el-table-column prop="staffNo" label="工号"></el-table-column>
+        <el-table-column prop="departmentName" label="部门"></el-table-column>
+        <el-table-column prop="allScore" label="考评结果"></el-table-column>
+        <el-table-column prop="scoreLevel" label="实际分布"></el-table-column>
     </el-table>
+    </div>
    </div>
 </template>
 
 <script>
+import {getChartDetail, getDepList} from '@/api/report'
 export default {
   data () {
     return {
-
+      // 表格数据
+      tableData: [],
+      // 部门数据列表
+      depList: []
     }
   },
   computed: {},
   beforeMount () {},
-  mounted () {},
-  methods: {},
-  watch: {}
+  mounted () {
+    this.handleDepListReq()
+    this.handleDetailReq()
+  },
+  methods: {
+    // 返回上一页
+    handleBack () {
+      this.$router.go(-1)
+    },
+    // 多选框转中处理
+    handleChange (val) {
+      this.handleDetailReq(val[1])
+    },
+    // 请求详情页面信息
+    async handleDetailReq (depId) {
+      let params = {
+        currPage: 1,
+        departmentId: depId,
+        flowProcess: this.$route.query.flowProcess,
+        startId: this.$route.query.startId,
+        pageSize: 20
+      }
+      let result = await getChartDetail(params)
+      this.tableData = result.data.list
+    },
+    // 请求部门信息
+    async handleDepListReq (handleNode) {
+      let params = {
+        type: 0
+      }
+      let result = await getDepList(params)
+      console.log(result)
+      this.depList = this.handleDepResult(result.data)
+    },
+    // 递归生成可用数组
+    handleDepResult (list) {
+      return Array.from(list).map(item => {
+        let resItem = {
+          value: item.departmentId,
+          label: item.departmentName
+        }
+        // 如果有下一级部门则递归调用
+        if (item.list && item.list.length > 0) {
+          let children = this.handleDepResult(item.list)
+          resItem['children'] = children
+        }
+        return resItem
+      })
+    }
+  },
+  watch: {
+
+  }
 
 }
-
 </script>
 
 <style lang='' scoped>
-
+.title_bar{
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+}
+.title_bar>:nth-child(1){
+  font-size: 16px;
+  color: #b4b4b4;
+  margin-right: 10px;
+}
+.title_bar>:nth-child(2){
+  height: 15px ;
+  width: 1px;
+  background: #333;
+}
+.title_bar>:nth-child(3){
+  font-size: 16px;
+  color: #333;
+  margin-left: 10px;
+}
+.detail_content{
+  background: white;
+  padding: 40px 20px;
+  border:solid 1px #b4b4b4;
+}
 </style>
diff --git a/src/views/kpi/report/index.vue b/src/views/kpi/report/index.vue
index f880e85..d5aa51f 100644
--- a/src/views/kpi/report/index.vue
+++ b/src/views/kpi/report/index.vue
@@ -27,61 +27,65 @@
           <div>{{statisticals[4].desc}}</div>
         </div>
         <div>
-          <div>{{statisticals[4].num}}</div>
-          <div>{{statisticals[4].desc}}</div>
+          <div>{{statisticals[5].num}}</div>
+          <div>{{statisticals[5].desc}}</div>
         </div>
         <div>
-          <div>{{statisticals[4].num}}</div>
-          <div>{{statisticals[4].desc}}</div>
+          <div>{{statisticals[6].num}}</div>
+          <div>{{statisticals[6].desc}}</div>
         </div>
       </div>
       <div>
-        <div class="num_title">考核人数分析</div>
-        <div class="num_tips">
+      <div class="num_title">考核人数分析</div>
+      <div class="chart_content">
+        <div class="num_chart">
           <div>考核人数分析</div>
-          <div>参与考核部门人数</div>
+          <div id="num_chart"></div>
         </div>
         <div class="num_report">
-          <div id="num_chart"></div>
-          <ul>
+          <div>参与考核部门人数</div>
+          <ul class="num_report_list">
             <li v-for="(assessItem, index) in assessNum" :key="assessItem.desc">
               <div class="rep_list">
-                <div :style="handleliColor(index)">{{index}}
-                </div>
-                <div>{{assessItem.desc}} {{ assessItem.num }}人</div>
+                <div style="display:flex">
+                  <div :style="handleliColor(index)">{{index}}</div>
+                  <div style="margin-left:10px">{{assessItem.desc}} </div>
                 </div>
+                <div>{{ assessItem.num }}人</div>
+              </div>
             </li>
           </ul>
         </div>
-        <div class="level_title">结果分析</div>
-        <div class="level_tips">等级分布</div>
-        <div class="reslut_display">
+      </div>
+      <div class="level_title">结果分析</div>
+    <div class="level_content">
+        <div class="level_chart">
+          <div class="level_tips">等级分布</div>
           <div id="level_chart"></div>
-          <el-table :data="tableData"
-                    :header-cell-style="{ background:'#F5F7FA'}"
-                    border
-                    >
-            <el-table-column prop="desc" label="绩效等级">
-            </el-table-column>
-            <el-table-column prop="num" label="实际分布" width="200">
-            </el-table-column>
-            <el-table-column label="操作" width="150">
-              <template slot-scope="scope">
-                <el-button
-                  @click.native.prevent="
-                    handleDetailClick(scope.$index, tableData)
-                  "
+        </div>
+        <el-table :data="tableData"
+                  :header-cell-style="{ background:'#F5F7FA'}"
+                  border
+                  style="flex-grow:2;margin-top:20px">
+          <el-table-column prop="desc" label="绩效等级">
+          </el-table-column>
+          <el-table-column prop="num" label="实际分布">
+          </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button
+                @click.native.prevent="handleDetailClick(scope.$index, scope.row)"
                   type="text"
                   size="small"
                 >
-                  查看详情
+                查看详情
                 </el-button>
               </template>
             </el-table-column>
-          </el-table>
-        </div>
+        </el-table>
       </div>
     </div>
+    </div>
   </div>
 </template>
 
@@ -102,6 +106,8 @@ export default {
       // 当前选择的月份
       pickerTime: '',
       //
+      startId: '',
+      //
       statisticals: [
         {num: '0', desc: '参与人数'},
         {num: '0', desc: '目标制定'},
@@ -255,9 +261,13 @@ export default {
         background: color
       }
     },
-    //
+    // 页面跳转
     handleDetailClick (index, rows) {
-
+      this.$router.push({
+        path: ('report-detial'),
+        query: {startId: this.startId, flowProcess: rows.desc}
+      })
+      console.log(this.$router)
     },
     // Y轴坐标计算，取靠近最大值的3的倍数作为上限，然后划分成4个刻度(0为初始刻度)
     handleChartYMul (val) {
@@ -277,7 +287,7 @@ export default {
     },
     //
     handleChange (val) {
-      console.log(val)
+      this.startId = val[1]
       this.handleChartDataReq(val[1])
     },
     // 获取报表内容
@@ -332,10 +342,8 @@ export default {
 
 <style lang='' scoped>
 .report_content {
-  width: fit-content;
-  height: fit-content;
   background: white;
-  border-style: #fcfcfc solid 3px;
+  border: #fcfcfc solid 1px;
   margin-top:20px;
   padding-top:40px;
   padding-left: 20px;
@@ -343,17 +351,13 @@ export default {
 }
 .header {
   background: #fcfcfc;
-  width: fit-content;
+  display: flex;
+  align-items: center;
 }
 .header > div {
-  display: inline-block;
-  width: fit-content;
-  height: fit-content;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  padding-left: 30px;
-  padding-right: 30px;
+  flex-grow: 1;
   text-align: center;
+  padding:20px
 }
 .header > div > div:nth-child(1) {
   color: black;
@@ -369,29 +373,48 @@ export default {
   background: #333333;
   height: 30px;
   width: 1px;
-  margin-top: 20px;
 }
 .num_title{
   margin-top:20px;
   margin-bottom: 25px;
   color: #333333;
 }
-.num_tips > div:nth-child(1) {
-  display: inline-block;
-  color: #3a3a3a;
-  font-size: 14px;
-  width: fit-content;
-  padding-left: 20px;
-  position: relative;
+.chart_content{
+  display: flex;
 }
-.num_tips > div:nth-child(2) {
-  display: inline-block;
+.num_tips{
+  display: flex;
+}
+.num_chart {
+  flex-grow: 1;
+}
+.num_chart>:nth-child(1){
   color: #3a3a3a;
   font-size: 14px;
-  width: fit-content;
-  padding-left: 50%;
-  margin-bottom: 20px;
-  position: relative;
+  padding-left: 20px;
+}
+.num_report {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+}
+.num_report>:nth-child(1){
+  color: #3a3a3a;
+  font-size: 14px;
+}
+.num_report_list{
+  margin-top: 20px;
+  height: 360px;
+  overflow:auto
+}
+.rep_list{
+  width: 200px;
+  display: flex;
+  margin-bottom: 10px;
+  justify-content: space-between;
+}
+.rep_list>:nth-child(2){
+  text-align: start;
 }
 .level_title{
   margin-top:20px;
@@ -408,25 +431,19 @@ export default {
 .num_report{
   display: flex
 }
-.rep_list{
-  display: flex;
-}
-.rep_list>:nth-child(2){
-    width: 200px;
-    margin-left: 10px;
-    flex:1
-}
 #num_chart {
-  display: inline-block;
-  width: 600px;
+  widows: 500px;
   height: 360px;
 }
-.reslut_display {
+.level_content{
   display: flex;
 }
+.level_chart {
+  display: flex;
+  flex-grow: 1;
+}
 #level_chart {
-  width: 600px;
+  width: 500px;
   height: 360px;
-  flex: 1;
 }
 </style>