From 9f8f08082f538a8d116a90f0da4b1df0b7ed1bf4 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Mon, 21 Dec 2020 14:15:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/mixins/gload.js | 1 + src/utils/common.js | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index a834bdb..596d775 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,7 +6,6 @@ -
@@ -52,6 +51,7 @@ export default { this.dd = dd }, methods: { + // 在钉钉环境双击显示 vconsole handleShowVcnsole () { var vConsole = new VConsole({ vConsole_switch_x: 0, diff --git a/src/mixins/gload.js b/src/mixins/gload.js index d205c76..f761231 100644 --- a/src/mixins/gload.js +++ b/src/mixins/gload.js @@ -5,6 +5,7 @@ let mixin = { return {} }, computed: { + // auth全局权限 在登录成功后获取 ...mapGetters(['auth']) }, methods: { diff --git a/src/utils/common.js b/src/utils/common.js index 6ec083c..8d1d380 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -114,16 +114,17 @@ const opt = { background: 'rgba(255, 255, 255, 0.8)', spinner: 'el-icon-loading', text: '数据加载中'} +// loading开启 export function loading (options = opt) { this.$loading.service(options) } - +// loading 关闭 export function loadingClose () { setTimeout(() => { this.$loading.service(opt).close() }, 100) } - +// 通过 url 获取参数 export function getUrlParams () { var query = decodeURI(window.location.search.substring(1)) console.log('query: ', query) From e1e5a7faf5f3fb561edd59a5a1ffded53f44fcd5 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Mon, 21 Dec 2020 14:20:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 - src/store/modules/user.js | 3 - src/utils/permission.js | 11 - src/utils/request.js | 1 - src/views/kpi/assessment/goals/index.vue | 5 - .../components/UseButton/index.vue | 5 +- .../performance/components/process.vue | 2 - .../performance/components/table copy.vue | 532 ------------------ .../performance/components/table.vue | 1 - .../kpi/assessment/performance/index.vue | 1 - src/views/kpi/assessment/stepList/index.vue | 3 - src/views/kpi/report/detail/index.vue | 1 - src/views/kpi/report/home/index.vue | 1 - src/views/kpi/set/authority/index.vue | 1 - .../assessmentGroup/edit/components/Entry.vue | 1 - .../assessmentGroup/edit/components/basis.vue | 1 - .../edit/components/templateSet.vue | 5 - src/views/kpi/workbench/index.vue | 1 - 18 files changed, 1 insertion(+), 575 deletions(-) delete mode 100644 src/views/kpi/assessment/performance/components/table copy.vue diff --git a/src/App.vue b/src/App.vue index 596d775..4333a54 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,7 +15,6 @@ import { mapState, mapActions, mapMutations } from 'vuex' import * as dd from 'dingtalk-jsapi' import VConsole from 'vconsole' -console.log('ddApp: ', dd) export default { name: 'App', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b09c211..73acadc 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -12,12 +12,10 @@ const user = { SET_USER_INFO: (state, info) => { dd.other && localStorage.setItem('info', JSON.stringify(info)) state.info = info - console.log('state.info: ', state.info) }, SET_USER_AUTH: (state, auth) => { dd.other && localStorage.setItem('auth', JSON.stringify(auth)) state.auth = auth - console.log('state.auth: ', state.auth) }, SET_DEPLIST: (state, list = []) => { state.deplist = list @@ -27,7 +25,6 @@ const user = { actions: { GET_USERINFO: async ({ commit }) => { let res = await apiUserInfo() - console.log('GET_USERINFO: ', res) if (res.code === 200) { commit('SET_USER_INFO', res.user) commit('SET_USER_AUTH', res.data) diff --git a/src/utils/permission.js b/src/utils/permission.js index 6133d4f..3669eed 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -7,9 +7,7 @@ import VueCookie from 'vue-cookies' // 钉钉免登录 async function handleDingtalkLogin (val) { const res = await apiDingtalkLogin(val) - console.log('钉钉免登录res: ', res) if (res && res.code === 200) { - console.log('res.token: ', res.token) VueCookie.set('token', res.token) return 1 // window.open(window.location.protocol + '//' + window.location.host + '/digitization/kpi/workbench/home?code=' + this.dingCode.code) @@ -25,27 +23,20 @@ function handleGetDingtalkCode () { dd.runtime.permission.requestAuthCode({ corpId: 'ding267474e759bbca1c35c2f4657eb6378f', async onSuccess (res) { - console.log('result===', res) let result = await handleDingtalkLogin(res) - console.log('result: ', result) resolve(result) }, onFail (err) { - console.log('err: ', err) reject(err) } }) }) } router.beforeEach(async (to, from, next) => { - console.log('dd---: ', dd) if (!store.getters.userInfo.userNo && !dd.other) { let res = await handleGetDingtalkCode() - console.log('res: ', res) if (res === 1) { - console.log('res: ', res) let res1 = await store.dispatch('GET_USERINFO') - console.log('res1: ', res1) if (res1 === 1) next() } else { Message.error('网络错误') @@ -57,7 +48,5 @@ router.beforeEach(async (to, from, next) => { }) router.afterEach(async () => { - console.log('afterEach: ') - await store.dispatch('GET_DEPLIST') }) diff --git a/src/utils/request.js b/src/utils/request.js index e1dfdb4..a1d0e74 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -56,7 +56,6 @@ service.interceptors.response.use(res => { } if (res.data.code === 401) { const resaa = Object.assign({}, res.data, {msg: '登陆失效,请刷新重试'}) - console.log('resaa: ', resaa) return resaa } return res.data diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue index e34adbb..1fc7887 100644 --- a/src/views/kpi/assessment/goals/index.vue +++ b/src/views/kpi/assessment/goals/index.vue @@ -292,7 +292,6 @@ export default { computed: {}, beforeMount () { }, mounted () { - console.log('auth', this.auth) this.handleGetDimensions() this.handleGetTbale() }, @@ -344,7 +343,6 @@ export default { processRate: '0', isNew: true } - console.log(this.formTask) } }) }, @@ -379,7 +377,6 @@ export default { // } this.formItem = j this.showTask = true - console.log(this.formTask) }, handleNumber (item) { return item.detailDtos ? item.detailDtos.filter(i => !i.isDelete).length : 0 @@ -535,7 +532,6 @@ export default { this.showIndicators = false }, handleSubmitZhibiao () { - console.log(this.formIndicators) const arr = this.obj.recortModelDtos[this.formIndicators.dazhibiaoIndex].detailDtos this.$refs.formIndicators.validate((v) => { if (v) { @@ -557,7 +553,6 @@ export default { this.showIndicators = false } }) - console.log(' this.obj', this.obj) }, // 编辑 hanidleEdit (item, index, type) { diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue index 6204c41..b92fed7 100644 --- a/src/views/kpi/assessment/performance/components/UseButton/index.vue +++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue @@ -152,6 +152,7 @@ export default { data () { return { authList: [ + // 下面这个是按钮组 目前支持两个按钮挨着一起 { info: !this.info, ground: true, @@ -272,8 +273,6 @@ export default { computed: {}, beforeMount () { }, mounted () { - console.log(this.resultRecordId) - console.log('🚀 ~ file: index.vue ~ line 308 ~ handleGetNext ~ this.obj', this.obj) }, methods: { async handleResetData (resultRecordId) { @@ -284,7 +283,6 @@ export default { }, // 重置确定 handleAgreeChongZhi () { - console.log(this.form) this.$refs.formChongZhi.validate(async v => { if (v) { const params = Object.assign({}, this.form, { resultRecordId: this.resultRecordId || '' }, { status: 9, menuName: '重置了流程' }) @@ -304,7 +302,6 @@ export default { }, // 重置 async handleChongZhi () { - console.log(123) this.form = { resetFlag: 0, clearFlag: 1 diff --git a/src/views/kpi/assessment/performance/components/process.vue b/src/views/kpi/assessment/performance/components/process.vue index 5a55b81..dd92b3b 100644 --- a/src/views/kpi/assessment/performance/components/process.vue +++ b/src/views/kpi/assessment/performance/components/process.vue @@ -358,7 +358,6 @@ export default { this.taskInfo = Object.assign({}, this.taskObj) this.handleGetChangeTaskList() this.handleGetPingLunList() - console.log(this.taskInfo) }, methods: { handleAtSomeOne () { @@ -539,7 +538,6 @@ export default { this.form = {} } i.updateProcess = type - console.log(this.form) this.$forceUpdate() }, // 编辑/取消编辑进度 diff --git a/src/views/kpi/assessment/performance/components/table copy.vue b/src/views/kpi/assessment/performance/components/table copy.vue deleted file mode 100644 index 92b9a1a..0000000 --- a/src/views/kpi/assessment/performance/components/table copy.vue +++ /dev/null @@ -1,532 +0,0 @@ - - - diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index f960489..2099512 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -344,7 +344,6 @@ export default { result += Number(item.Score) return result }, 0) - console.log('this.scoreList: ', this.scoreList) return { score: result.toFixed(3), a: this.handleGetDengJi(result) diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue index 37a6b2d..9c84c65 100644 --- a/src/views/kpi/assessment/performance/index.vue +++ b/src/views/kpi/assessment/performance/index.vue @@ -282,7 +282,6 @@ export default { methods: { handleShow (item) { item.isShow = !item.isShow - console.log(item) this.$forceUpdate() }, async handleChange (item) { diff --git a/src/views/kpi/assessment/stepList/index.vue b/src/views/kpi/assessment/stepList/index.vue index 60467c7..07c5b9e 100644 --- a/src/views/kpi/assessment/stepList/index.vue +++ b/src/views/kpi/assessment/stepList/index.vue @@ -297,7 +297,6 @@ export default { }, beforeMount () { }, created () { - console.log(12345) }, beforeRouteEnter (to, from, next) { if (from.name === 'assessment-homeList') { @@ -353,7 +352,6 @@ export default { message: res.msg, type: 'success' }) - console.log('params: ', params) }).catch(() => { this.$message({ type: 'info', @@ -490,7 +488,6 @@ export default { })) if (res.code !== 200) return this.titleList = res.data - console.log('String(this.$route.query.step): ', String(this.$route.query.step)) if (String(this.$route.query.step) && String(this.$route.query.step) !== 'undefined') { this.titleList = this.titleList.map(i => { if (String(i.flowProcess) === String(this.$route.query.step)) { diff --git a/src/views/kpi/report/detail/index.vue b/src/views/kpi/report/detail/index.vue index f68bfda..b33fc02 100644 --- a/src/views/kpi/report/detail/index.vue +++ b/src/views/kpi/report/detail/index.vue @@ -97,7 +97,6 @@ export default { this.showDialogDepart = false }, handlePush (item) { - console.log('item: ', item.recordId) this.$router.push({ name: 'assessment-performance', query: { diff --git a/src/views/kpi/report/home/index.vue b/src/views/kpi/report/home/index.vue index bbdd2b4..94630d1 100644 --- a/src/views/kpi/report/home/index.vue +++ b/src/views/kpi/report/home/index.vue @@ -309,7 +309,6 @@ export default { // 头部数据 this.statisticals = val.statisticals if (!this.defaultId) this.defaultId = val.defaultId - console.log('this.defaultId : ', this.defaultId) } else if (val.type === 1) { // 等级分布数据 this.tableData = val.statisticals diff --git a/src/views/kpi/set/authority/index.vue b/src/views/kpi/set/authority/index.vue index 4ccd521..2f3702d 100644 --- a/src/views/kpi/set/authority/index.vue +++ b/src/views/kpi/set/authority/index.vue @@ -527,7 +527,6 @@ export default { let msg = '是否将智能绩效主管理员变更为' + val.title this.$confirm(msg, '提示') .then(_ => { - console.log('this.mainData: ', this) let dicPara = { id: this.mainData.masterFirst.id || '', departmentLevel: 'MASTER_PM', diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue index d23c480..dbdd50d 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Entry.vue @@ -63,7 +63,6 @@ export default { j.checked = this.form.chartDetails.recordSimpleDtos[0].roleIds ? this.form.chartDetails.recordSimpleDtos[0].roleIds.includes(String(j.roleId)) : false return j }))) - console.log(this.form.roleDtos) }, methods: { handleIsEmit (n) { diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 8130d15..466e7ff 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -178,7 +178,6 @@ export default { title: '', managerIds: '' } - console.log('this.GroundList1: ', this.GroundList1) params.list = this.GroundList1.filter(i => i.isSelect === 1) params.list.map((i, index) => { params.managerIds += i.staffId + ',' diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue index 25de829..ea33aa7 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue @@ -208,7 +208,6 @@ import PopupRight from '@/components/PopupRight' import draggable from 'vuedraggable' import {getDimensions} from '@/api/data' import { getByGroupId } from '@/api/workbench' -// console.log('Sortable: ', Sortable) // const info = export default { props: ['templateForm'], @@ -330,7 +329,6 @@ export default { async handleGetDimensions () { try { let res = await getDimensions() - console.log('res: ', res) if (res.code !== 200) { this.dimensionsList = [] return @@ -400,9 +398,7 @@ export default { if (type === -1) { this.weiduTitle = '编辑维度' this.form = Object.assign({}, item, {index, index2: type, isEdit: true}) - console.log(' this.form: ', this.form) this.form.weight = this.form.weight * 100 - console.log('this.form: ', this.form) this.show = true } else { this.zhibiaoTitle = '编辑指标' @@ -439,7 +435,6 @@ export default { }, handleSubmitZhibiao () { this.$refs.formIndicators.validate((v) => { - console.log('v: ', v) if (v) { this.formIndicators.weight = this.formIndicators.weight / 100 > 1 ? 1 : this.formIndicators.weight / 100 if (this.formIndicators.isEdit) { diff --git a/src/views/kpi/workbench/index.vue b/src/views/kpi/workbench/index.vue index e296f50..0313f58 100644 --- a/src/views/kpi/workbench/index.vue +++ b/src/views/kpi/workbench/index.vue @@ -50,7 +50,6 @@ export default { this.token = res.token this.$cookies.set('token', res.token, res.expire) let xcq = await this.$store.dispatch('GET_USERINFO') - console.log('xcq: ', xcq) // let ress = await apiUserInfo() // if (ress.code === 200) { // this.SET_USER_INFO(ress.user)