diff --git a/src/api/xm/pro/xmProjectKpi.js b/src/api/xm/pro/xmKpi.js
similarity index 66%
rename from src/api/xm/pro/xmProjectKpi.js
rename to src/api/xm/pro/xmKpi.js
index 51b368cf..9f34c8a2 100644
--- a/src/api/xm/pro/xmProjectKpi.js
+++ b/src/api/xm/pro/xmKpi.js
@@ -13,25 +13,25 @@ let base = config.getXmCtx();
**/
//普通查询 条件之间and关系
-export const listXmProjectKpi = params => { return axios.get(`${base}/xm/core/xmProjectKpi/list`, { params: params }); };
+export const listXmKpi = params => { return axios.get(`${base}/xm/core/xmKpi/list`, { params: params }); };
//普通查询 条件之间and关系
-export const queryXmProjectKpiById = params => { return axios.get(`${base}/xm/core/xmProjectKpi/queryById`, { params: params }); };
+export const queryXmKpiById = params => { return axios.get(`${base}/xm/core/xmKpi/queryById`, { params: params }); };
//删除一条项目或任务关键指标考核 params={id:'主键 主键'}
-export const delXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/del`,params); };
+export const delXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/del`,params); };
//批量删除项目或任务关键指标考核 params=[{id:'主键 主键'}]
-export const batchAddXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/batchAdd`, params); };
+export const batchAddXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/batchAdd`, params); };
//批量删除项目或任务关键指标考核 params=[{id:'主键 主键'}]
-export const batchDelXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/batchDel`, params); };
+export const batchDelXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/batchDel`, params); };
//修改一条项目或任务关键指标考核记录
-export const editXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/edit`, params); };
+export const editXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/edit`, params); };
//新增一条项目或任务关键指标考核
-export const addXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/add`, params); };
+export const addXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/add`, params); };
//批量修改某些字段
-export const editSomeFieldsXmProjectKpi = params => { return axios.post(`${base}/xm/core/xmProjectKpi/editSomeFields`, params); };
\ No newline at end of file
+export const editSomeFieldsXmKpi = params => { return axios.post(`${base}/xm/core/xmKpi/editSomeFields`, params); };
\ No newline at end of file
diff --git a/src/api/xm/pro/xmProjectKpiHis.js b/src/api/xm/pro/xmKpiHis.js
similarity index 66%
rename from src/api/xm/pro/xmProjectKpiHis.js
rename to src/api/xm/pro/xmKpiHis.js
index ed9def7e..a03db72e 100644
--- a/src/api/xm/pro/xmProjectKpiHis.js
+++ b/src/api/xm/pro/xmKpiHis.js
@@ -13,25 +13,25 @@ let base = config.getXmCtx();
**/
//普通查询 条件之间and关系
-export const listXmProjectKpiHis = params => { return axios.get(`${base}/xm/core/xmProjectKpiHis/list`, { params: params }); };
+export const listXmKpiHis = params => { return axios.get(`${base}/xm/core/xmKpiHis/list`, { params: params }); };
//普通查询 条件之间and关系
-export const queryXmProjectKpiHisById = params => { return axios.get(`${base}/xm/core/xmProjectKpiHis/queryById`, { params: params }); };
+export const queryXmKpiHisById = params => { return axios.get(`${base}/xm/core/xmKpiHis/queryById`, { params: params }); };
//删除一条项目或任务关键指标考核 params={id:'主键 主键',scoreDate:'评分日期 主键'}
-export const delXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/del`,params); };
+export const delXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/del`,params); };
//批量删除项目或任务关键指标考核 params=[{id:'主键 主键',scoreDate:'评分日期 主键'}]
-export const batchAddXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/batchAdd`, params); };
+export const batchAddXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/batchAdd`, params); };
//批量删除项目或任务关键指标考核 params=[{id:'主键 主键',scoreDate:'评分日期 主键'}]
-export const batchDelXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/batchDel`, params); };
+export const batchDelXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/batchDel`, params); };
//修改一条项目或任务关键指标考核记录
-export const editXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/edit`, params); };
+export const editXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/edit`, params); };
//新增一条项目或任务关键指标考核
-export const addXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/add`, params); };
+export const addXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/add`, params); };
//批量修改某些字段
-export const editSomeFieldsXmProjectKpiHis = params => { return axios.post(`${base}/xm/core/xmProjectKpiHis/editSomeFields`, params); };
\ No newline at end of file
+export const editSomeFieldsXmKpiHis = params => { return axios.post(`${base}/xm/core/xmKpiHis/editSomeFields`, params); };
\ No newline at end of file
diff --git a/src/views/xm/pro/kpi/xmProjectKpi/Form.vue b/src/views/xm/pro/kpi/Form.vue
similarity index 97%
rename from src/views/xm/pro/kpi/xmProjectKpi/Form.vue
rename to src/views/xm/pro/kpi/Form.vue
index 6a7a5e21..ab979c91 100644
--- a/src/views/xm/pro/kpi/xmProjectKpi/Form.vue
+++ b/src/views/xm/pro/kpi/Form.vue
@@ -125,13 +125,13 @@
+
+
diff --git a/src/views/xm/pro/kpi/xmProjectKpiHis/Form.vue b/src/views/xm/pro/kpi/xmProjectKpiHis/Form.vue
deleted file mode 100644
index 581b01cf..00000000
--- a/src/views/xm/pro/kpi/xmProjectKpiHis/Form.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/pro/kpi/xmProjectKpiHis/Index.vue b/src/views/xm/pro/kpi/xmProjectKpiHis/Index.vue
deleted file mode 100644
index 8bc053d4..00000000
--- a/src/views/xm/pro/kpi/xmProjectKpiHis/Index.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
-
-
-
- 板
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ (scope.$index + 1) }} {{ scope.row.name }}
-
-
-
- 复制
- 编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- handleDel(d)"
- @plus="(cb)=>showAdd()"
- @edit="(d,cb)=>showEdit(d)"
- v-model="tableDatas"
- :columnConfigs="columnConfigs"
- :itemKey="pkNames[0]"
- :contentFun="(item)=>item[pkNames[0]]"
- />
-
-
-
-
-
-
-
\ No newline at end of file