This commit is contained in:
熊成强 2020-11-10 15:43:21 +08:00
parent 9a0173e110
commit 164b7c6833
3 changed files with 15 additions and 17 deletions

View File

@ -8,6 +8,9 @@
import { mapState, mapActions, mapMutations } from 'vuex' import { mapState, mapActions, mapMutations } from 'vuex'
import * as dd from 'dingtalk-jsapi' import * as dd from 'dingtalk-jsapi'
import { apiDingtalkLogin, apiUserInfo } from '@/api/login' import { apiDingtalkLogin, apiUserInfo } from '@/api/login'
import VConsole from 'vconsole'
export default { export default {
name: 'App', name: 'App',
data () { data () {
@ -27,6 +30,10 @@ export default {
}, },
async created () { async created () {
if (!dd.other) { if (!dd.other) {
var vConsole = new VConsole({
vConsole_switch_x: 0,
vConsole_switch_y: 0
})
await this.handleGetDingtalkCode() await this.handleGetDingtalkCode()
await this.handleDingtalkLogin() await this.handleDingtalkLogin()
} }

View File

@ -9,20 +9,11 @@ import './utils/elementConfig'
import './utils/permission' import './utils/permission'
import './style/index.less' import './style/index.less'
import '@/icons' import '@/icons'
import VConsole from 'vconsole'
import VueCookie from 'vue-cookies' import VueCookie from 'vue-cookies'
import { debounce, departGetForm, personlGetForm, handleInput, messageSuccess, loading, loadingClose } from '@/utils/common' import { debounce, departGetForm, personlGetForm, handleInput, messageSuccess, loading, loadingClose } from '@/utils/common'
import { format } from '@/utils/dateFormat' import { format } from '@/utils/dateFormat'
Vue.mixin(Mixin) 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.use(VueCookie)
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.$loadingStart = loading Vue.prototype.$loadingStart = loading

View File

@ -323,16 +323,16 @@
<div> <div>
<el-radio <el-radio
v-model="popupFromSub.groupRadio" v-model="popupFromSub.groupRadio"
label="0" :label="0"
>全部考评组</el-radio> >全部考评组</el-radio>
</div> </div>
<div> <div>
<el-radio <el-radio
v-model="popupFromSub.groupRadio" v-model="popupFromSub.groupRadio"
label="1" :label="1"
>特定考评组</el-radio> >特定考评组</el-radio>
</div> </div>
<div v-if="popupFromSub.groupRadio ==='1'"> <div v-if="popupFromSub.groupRadio === 1">
<div class="line-space"> <div class="line-space">
<el-tag <el-tag
v-for="item in popupFromSub.assessmentList" v-for="item in popupFromSub.assessmentList"
@ -418,7 +418,7 @@ export default {
menuCheckAllState: true, // menuCheckAllState: true, //
menuCheckData: [], // menuCheckData: [], //
menuMngCheck: [], // menuMngCheck: [], //
groupRadio: '0', // 0 1 groupRadio: 0, // 0 1
assessmentList: [] // assessmentList: [] //
}, },
rqInfoParameter: { rqInfoParameter: {
@ -452,7 +452,7 @@ export default {
menuCheckAllState: true, // menuCheckAllState: true, //
menuCheckData: [], // menuCheckData: [], //
menuMngCheck: [], // menuMngCheck: [], //
groupRadio: '0', // 0 1 groupRadio: 0, // 0 1
assessmentList: [] // assessmentList: [] //
} }
} }
@ -583,8 +583,8 @@ export default {
this.popupFromSub.subPersonData = { title: row.name, value: row.staffId } this.popupFromSub.subPersonData = { title: row.name, value: row.staffId }
this.popupFromSub.radioScope = data.departmentId // this.popupFromSub.radioScope = data.departmentId //
this.popupFromSub.shwoDepartData.list = data.departmentInfos // this.popupFromSub.shwoDepartData.list = data.departmentInfos //
this.popupFromSub.evaluationGroupId = data.evaluationGroupId // this.popupFromSub.groupRadio = data.evaluationGroupId //
this.popupFromSub.assessmentList = data.departmentInfos this.popupFromSub.assessmentList = data.evaluationGroupInfos
this.popupFromSub.menuCheckAllState = false // this.popupFromSub.menuCheckAllState = false //
console.log('selectStaffMenuInfos====', data.selectStaffMenuInfos) console.log('selectStaffMenuInfos====', data.selectStaffMenuInfos)
let selectStaffMenuInfos = data.selectStaffMenuInfos ? data.selectStaffMenuInfos : [] let selectStaffMenuInfos = data.selectStaffMenuInfos ? data.selectStaffMenuInfos : []