diff --git a/src/api/data.js b/src/api/data.js index 023ca98..8f2673a 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -1,18 +1,20 @@ import request from '@/utils/request' -const baseUrl = process.env.APP_BASE_API -export function getCaseCollectorListPage (query) { +import URL from '@/api/config' +const baseUrl = process.env.PROXY ? URL.baseUrl : '/lz_management' + +// 获取管理员 +export function getGround (query) { return request({ - url: baseUrl + '/caseCollector/caseCollectorListPage', + url: baseUrl + '/lz_management/user/lzstaffrole/listByGroupId', method: 'get', params: query }) } -export function apiCaseCenterExport (query) { +// 获取维度类型 +export function getDimensions (quer = {}) { return request({ - url: '/market-api/marketCaseExport/exportMarketCaseDataList', - method: 'get', - params: query, - responseType: 'blob' + url: baseUrl + '/lz_management/resultDimension/getDimensions', + method: 'get' }) } diff --git a/src/utils/request.js b/src/utils/request.js index 9dbad2e..489cfbe 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,5 +1,6 @@ import axios from 'axios' -import { Notification, MessageBox, Message } from 'element-ui' +// import { Notification, MessageBox, Message } from 'element-ui' +import { Message } from 'element-ui' // import store from '@/store' // import { getToken } from '@/utils/auth' // import errorCode from '@/utils/errorCode' @@ -43,7 +44,7 @@ service.interceptors.response.use(res => { error => { console.log('err' + error) let { message } = error - if (message == 'Network Error') { + if (message === 'Network Error') { message = '后端接口连接异常' } else if (message.includes('timeout')) { message = '系统接口请求超时' diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index fea13b9..46cfba9 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -111,6 +111,7 @@ import getDepart from './getDepart' import getPersonnel from './getPersonnel' import PopupRight from '@/components/PopupRight' +import {getGround} from '@/api/data' export default { props: { basisForm: { @@ -175,10 +176,19 @@ export default { }, beforeMount () {}, - mounted () { + async mounted () { this.form = this.basisForm + this.handleGetGround() }, methods: { + async handleGetGround () { + try { + const res = await getGround({groupId: 1}) + console.log('res: ', res) + } catch (error) { + this.$message.error(error.msg) + } + }, handleCancel () { this.showRight = false }, diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue index a4bfa82..b46422c 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue @@ -21,7 +21,7 @@ @@ -65,7 +65,7 @@
- {{i.leixing}} + {{handleWeiDu(i)}}
所含指标数量 {{i.center.number1String}} @@ -127,9 +127,12 @@ - - - + + @@ -193,12 +196,16 @@ import PopupRight from '@/components/PopupRight' import draggable from 'vuedraggable' import Sortable from 'sortablejs' +import {getDimensions} from '@/api/data' // console.log('Sortable: ', Sortable) export default { data () { return { + dimensionsList: [], // 维度类型列表 show: false, // 控制维度管理显示与隐藏 form: { + gradeStatus: 1, + gradeGroupId: 1, center: {}, tableData: [] }, // 控制维度管理的表单 @@ -238,8 +245,23 @@ export default { beforeMount () {}, mounted () { // this.rowDrop() + this.handleGetDimensions() }, methods: { + // 更具维度id获取维度名称 + handleWeiDu (item) { + return this.dimensionsList.filter(i => i.id === item.modelId)[0].name + }, + // 获取维度类型 + async handleGetDimensions () { + try { + const res = await getDimensions() + this.dimensionsList = res + console.log('res: ', res) + } catch (error) { + this.$message.error(error.msg) + } + }, // 行拖拽 rowDrop () { const tbody = document.querySelector('.el-table__body-wrapper tbody') diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index 17ef6f4..323b4d2 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -29,6 +29,7 @@ export default { active: 1, // 基础 basisForm: { + id: 8, counts: '', // 参与考核人数 depIds: '', // 参与部门id,逗号隔开 managerIds: '395', // 绩效管理员ID,system_user,id,逗号隔开 diff --git a/src/views/kpi/workbench/assessmentGroup/groundTable.vue b/src/views/kpi/workbench/assessmentGroup/groundTable.vue index 5cd679f..c4dd4a4 100644 --- a/src/views/kpi/workbench/assessmentGroup/groundTable.vue +++ b/src/views/kpi/workbench/assessmentGroup/groundTable.vue @@ -61,6 +61,7 @@