From 164b7c6833e61e6e14529f1a7c1cbaf577ec8244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Tue, 10 Nov 2020 15:43:21 +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

---
 src/App.vue                           |  7 +++++++
 src/main.js                           | 11 +----------
 src/views/kpi/set/authority/index.vue | 14 +++++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b6686c2..9da29e0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,9 @@
 import { mapState, mapActions, mapMutations } from 'vuex'
 import * as dd from 'dingtalk-jsapi'
 import { apiDingtalkLogin, apiUserInfo } from '@/api/login'
+
+import VConsole from 'vconsole'
+
 export default {
   name: 'App',
   data () {
@@ -27,6 +30,10 @@ export default {
   },
   async created () {
     if (!dd.other) {
+      var vConsole = new VConsole({
+        vConsole_switch_x: 0,
+        vConsole_switch_y: 0
+      })
       await this.handleGetDingtalkCode()
       await this.handleDingtalkLogin()
     }
diff --git a/src/main.js b/src/main.js
index 2111bb2..38fc3ec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,20 +9,11 @@ import './utils/elementConfig'
 import './utils/permission'
 import './style/index.less'
 import '@/icons'
-import VConsole from 'vconsole'
+
 import VueCookie from 'vue-cookies'
 import { debounce, departGetForm, personlGetForm, handleInput, messageSuccess, loading, loadingClose } from '@/utils/common'
 import { format } from '@/utils/dateFormat'
 Vue.mixin(Mixin)
-// }
-
-// let hostList = ['lzmanagement.ldxinyong.com']
-// if (!hostList.includes(window.location.host)) {
-var vConsole = new VConsole({
-  vConsole_switch_x: 0,
-  vConsole_switch_y: 0
-})
-
 Vue.use(VueCookie)
 Vue.config.productionTip = false
 Vue.prototype.$loadingStart = loading
diff --git a/src/views/kpi/set/authority/index.vue b/src/views/kpi/set/authority/index.vue
index 35a852a..2af1d91 100644
--- a/src/views/kpi/set/authority/index.vue
+++ b/src/views/kpi/set/authority/index.vue
@@ -323,16 +323,16 @@
               <div>
                 <el-radio
                   v-model="popupFromSub.groupRadio"
-                  label="0"
+                  :label="0"
                 >全部考评组</el-radio>
               </div>
               <div>
                 <el-radio
                   v-model="popupFromSub.groupRadio"
-                  label="1"
+                  :label="1"
                 >特定考评组</el-radio>
               </div>
-              <div v-if="popupFromSub.groupRadio ==='1'">
+              <div v-if="popupFromSub.groupRadio === 1">
                 <div class="line-space">
                   <el-tag
                     v-for="item in popupFromSub.assessmentList"
@@ -418,7 +418,7 @@ export default {
         menuCheckAllState: true, // 菜单权限是否全选
         menuCheckData: [], // 菜单选中
         menuMngCheck: [], // 考核管理
-        groupRadio: '0', // 考评组选择  0 全部考评组 1 特定考评组
+        groupRadio: 0, // 考评组选择  0 全部考评组 1 特定考评组
         assessmentList: [] // 选中的考评组
       },
       rqInfoParameter: {
@@ -452,7 +452,7 @@ export default {
           menuCheckAllState: true, // 菜单权限是否全选
           menuCheckData: [], // 菜单选中
           menuMngCheck: [], // 考核管理
-          groupRadio: '0', // 考评组选择  0 全部考评组 1 特定考评组
+          groupRadio: 0, // 考评组选择  0 全部考评组 1 特定考评组
           assessmentList: [] // 选中的考评组
         }
       }
@@ -583,8 +583,8 @@ export default {
         this.popupFromSub.subPersonData = { title: row.name, value: row.staffId }
         this.popupFromSub.radioScope = data.departmentId // 管理范围
         this.popupFromSub.shwoDepartData.list = data.departmentInfos // 指定部门
-        this.popupFromSub.evaluationGroupId = data.evaluationGroupId // 考评组
-        this.popupFromSub.assessmentList = data.departmentInfos
+        this.popupFromSub.groupRadio = data.evaluationGroupId // 考评组
+        this.popupFromSub.assessmentList = data.evaluationGroupInfos
         this.popupFromSub.menuCheckAllState = false //  全选中状态
         console.log('selectStaffMenuInfos====', data.selectStaffMenuInfos)
         let selectStaffMenuInfos = data.selectStaffMenuInfos ? data.selectStaffMenuInfos : []