优化
This commit is contained in:
parent
9a0173e110
commit
164b7c6833
@ -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()
|
||||||
}
|
}
|
||||||
|
|||||||
11
src/main.js
11
src/main.js
@ -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
|
||||||
|
|||||||
@ -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 : []
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user