From c51d447277b76eb36c9ffa431b979c4c32683f8d Mon Sep 17 00:00:00 2001
From: leave <>
Date: Tue, 27 Oct 2020 10:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=BB=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=8D=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev.env.js                             |  2 +-
 src/utils/elementConfig.js                    |  6 ++-
 src/views/kpi/set/index.vue                   | 45 +++++++++++++++----
 .../workbench/initiateAssessment/index.vue    | 31 +++++++++----
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index e96e9ab..7323355 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  PROXY:false
+  PROXY: false,
 })
diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js
index 619f564..41aee44 100644
--- a/src/utils/elementConfig.js
+++ b/src/utils/elementConfig.js
@@ -26,7 +26,9 @@ import {
   Tag,
   Tooltip,
   Popover,
-  Pagination
+  Pagination,
+  Menu,
+  MenuItem
 
 } from 'element-ui'
 
@@ -59,3 +61,5 @@ Vue.use(Radio)
 Vue.use(Dropdown)
 Vue.use(DropdownMenu)
 Vue.use(DropdownItem)
+Vue.use(Menu)
+Vue.use(MenuItem)
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index 2deeb4a..32d701b 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -1,27 +1,54 @@
 <!--  -->
 <template>
-    <div>
-        设置
+  <div class="set-mian commonFont">
+    <el-menu
+      :default-active="activeIndex"
+      mode="horizontal"
+      @select="handleSelect"
+      text-color="#52575b"
+      active-text-color="#3ba1ff"
+    >
+      <el-menu-item index="0">考评组设置</el-menu-item>
+      <el-menu-item index="1">默认值设置</el-menu-item>
+    </el-menu>
+    <ground-table v-if="activeIndex==='0'"></ground-table>
+    <div v-else-if="activeIndex==='1'">
+      <span>默认值设置</span>
     </div>
+  </div>
 </template>
 
 <script>
+import groundTable from '../workbench/assessmentGroup/groundTable'
+
 export default {
   data () {
     return {
-
+      activeIndex: '0'
+    }
+  },
+  components: {
+    groundTable
+  },
+  beforeMount () { },
+  mounted () { },
+  methods: {
+    handleSelect (key, keyPath) {
+      this.activeIndex = key
+      console.log(key, keyPath)
+      console.log(this.activeIndex)
     }
   },
-  computed: {},
-  beforeMount () {},
-  mounted () {},
-  methods: {},
   watch: {}
 
 }
 
 </script>
 
-<style lang='' scoped>
-
+<style lang='less' scoped>
+.set-mian {
+    background-color: white;
+    min-height: 600px;
+    padding: 25px;
+}
 </style>
diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue
index d26d9f9..2e185aa 100644
--- a/src/views/kpi/workbench/initiateAssessment/index.vue
+++ b/src/views/kpi/workbench/initiateAssessment/index.vue
@@ -100,7 +100,7 @@
     <div>
       <popup-right
         v-if="showChooseList"
-        @cancel='showChooseList = false'
+        @cancel="hundlePopupHide"
         @submit="handleSubmitPopup"
         :title="popupRightTitle"
         class="popup"
@@ -118,13 +118,16 @@
           <div class="popup-table">
             <el-table
               v-if="popupData.tableList.length"
+              ref="popupMultipleTable"
               :data="popupData.tableList"
               @selection-change="handleSelectionChange"
               tooltip-effect="dark"
+              :row-key="getRowKeys"
             >
               <el-table-column
                 type="selection"
                 width="40"
+                :reserve-selection="true"
               ></el-table-column>
               <el-table-column
                 label="全选"
@@ -228,7 +231,6 @@ export default {
   },
   watch: {
     'formData.cycleTimeType': function (newVal, oldVal) {
-      // console.log(this.formData.cycleTimeType)
       this.formData.rangDate = ''
     }
   },
@@ -244,9 +246,23 @@ export default {
       }
       this.formData.mergeType.name = nameStr
     },
-    handleChooseGroup () {
+    hundlePopupHide () {
       this.popupData.selectedList = []
+      this.$refs.popupMultipleTable.clearSelection()
+      this.showChooseList = false
+    },
+    handleChooseGroup () {
       this.showChooseList = !this.showChooseList
+      this.$nextTick(res => {
+        if (this.formData.assessmentList.length > 0) {
+          this.formData.assessmentList.forEach((row) => {
+            this.$refs.popupMultipleTable.toggleRowSelection(row, true)
+          })
+        }
+      })
+    },
+    getRowKeys (row) {
+      return row.id
     },
     handleGroupDelete (index, rows) {
       console.log('删除----', rows)
@@ -256,7 +272,6 @@ export default {
       console.log('提交')
       this.$refs['formData'].validate((val) => {
         this.dialogSendVisible = val
-        console.log('1111111111111111')
       })
     },
     handleDialogSend () {
@@ -266,8 +281,7 @@ export default {
       })
       let para = {
         cycleType: this.formData.cycleTimeType,
-        groupIds: '24',
-        // groupIds: groupIdList.join(),
+        groupIds: groupIdList.join(),
         name: this.formData.mergeType.name
       }
       if (this.formData.cycleTimeType === 0) {
@@ -291,8 +305,9 @@ export default {
       this.handleGainAssessmentGroupList()
     },
     handleSelectionChange (val) {
-      //  全选
+      //  选择发生变化
       this.popupData.selectedList = val
+      console.log('选择发生变化  ', val)
     },
     handlePopupCreat () {
       this.showChooseList = false
@@ -300,9 +315,9 @@ export default {
       this.$router.push({ name: 'workbench-edit-group' })
     },
     handleSubmitPopup () {
-      this.showChooseList = false
       const list = this.popupData.selectedList
       this.formData.assessmentList = this.popupData.selectedList
+      this.showChooseList = false
     },
     handleCurrentChange (val) {
       this.handleGainAssessmentGroupList(val)