diff --git a/package.json b/package.json index 0f0f9ac..4c26bf1 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@babel/plugin-transform-runtime": "^7.25.9", "@babel/runtime": "^7.26.0", "@vue-office/docx": "^1.6.2", - "@vue-office/excel": "^1.7.11", + "@vue-office/excel": "^1.7.14", "@vue/composition-api": "^1.7.2", "axios": "0.17.1", "babel-plugin-component": "0.10.1", @@ -35,7 +35,6 @@ "lodash": "4.17.5", "mammoth": "^1.9.0", "moment": "^2.30.1", - "node-sass": "4.13.1", "npm": "^6.14.6", "pubsub-js": "^1.9.3", "qrcode": "^1.5.3", @@ -90,6 +89,7 @@ "less-loader": "^7.3.0", "nightwatch": "0.9.12", "node-notifier": "5.1.2", + "node-sass": "^4.14.1", "optimize-css-assets-webpack-plugin": "3.2.0", "ora": "1.2.0", "portfinder": "1.0.13", diff --git a/src/api/repairSkill/maintenanceSkillCard.js b/src/api/repairSkill/maintenanceSkillCard.js new file mode 100644 index 0000000..3058399 --- /dev/null +++ b/src/api/repairSkill/maintenanceSkillCard.js @@ -0,0 +1,17 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 技能卡 CRUD +export const searchCardList = data => createAPI('/repairSkill/card/search', 'POST', data) +export const createCard = data => createAPI('/repairSkill/card/save', 'POST', data) +export const deleteCard = data => createAPI('/repairSkill/card/delete', 'POST', data) + +// 卡片技能明细(技能类型) +export const getCardDetails = data => createAPI('/repairSkill/card/detail/search', 'POST', data) +export const addCardDetails = data => createAPI('/repairSkill/card/detail/save', 'POST', data) +export const removeCardDetail = data => createAPI('/repairSkill/card/detail/remove', 'POST', data) + +// 打分 / 更新掌握情况(批量:传入明细数组,后端同一事务处理,逐行保存传单元素数组) +export const scoreCardDetail = data => createAPI('/repairSkill/card/score', 'POST', data) + +// 人员选择(本模块自建接口,直查 sys_user;一次返回 rows=人员 + roles=角色下拉) +export const searchMachineAdmin = data => createAPI('/repairSkill/card/adminSearch', 'POST', data) diff --git a/src/api/repairSkill/repairSkillContent.js b/src/api/repairSkill/repairSkillContent.js new file mode 100644 index 0000000..2da37c5 --- /dev/null +++ b/src/api/repairSkill/repairSkillContent.js @@ -0,0 +1,11 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 技能内容(技能类型库)CRUD +export const searchContentList = data => createAPI('/repairSkill/content/search', 'POST', data) +export const createContent = data => createAPI('/repairSkill/content/save', 'POST', data) +export const updateContent = data => createAPI('/repairSkill/content/edit', 'POST', data) +export const deleteContent = data => createAPI('/repairSkill/content/delete', 'POST', data) + +// 分数标准(一个技能多条) +export const getCriteriaList = data => createAPI('/repairSkill/content/criteria/search', 'POST', data) +export const saveCriteriaList = data => createAPI('/repairSkill/content/criteria/save', 'POST', data) diff --git a/src/api/repairSkill/repairSkillTemplate.js b/src/api/repairSkill/repairSkillTemplate.js new file mode 100644 index 0000000..5f6948d --- /dev/null +++ b/src/api/repairSkill/repairSkillTemplate.js @@ -0,0 +1,10 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 维修技能模板 CRUD +export const searchTemplateList = data => createAPI('/repairSkill/template/search', 'POST', data) +export const createTemplate = data => createAPI('/repairSkill/template/save', 'POST', data) +export const updateTemplate = data => createAPI('/repairSkill/template/edit', 'POST', data) +export const deleteTemplate = data => createAPI('/repairSkill/template/delete', 'POST', data) + +// 模板明细(模板关联的维修明细项) +export const getTemplateDetails = data => createAPI('/repairSkill/template/detail/search', 'POST', data) diff --git a/src/views/modules/repairSkill/maintenanceSkillCard.vue b/src/views/modules/repairSkill/maintenanceSkillCard.vue new file mode 100644 index 0000000..c5a6e0d --- /dev/null +++ b/src/views/modules/repairSkill/maintenanceSkillCard.vue @@ -0,0 +1,587 @@ + + + + + + 维修技能卡 + 机修人员技能掌握与打分管理 + + + + + + + {{ totalPage }} + 技能卡总数 + + + + + + {{ avgScore }} + 平均总分 + + + + + + + + + + + + + 筛选条件 + 新增技能卡 + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + {{ item.adminName }} + + + {{ (item.skillCount || 0) === 0 ? '暂无技能' : ((item.unmasteredCount || 0) > 0 ? ('待掌握 ' + item.unmasteredCount) : '已全部掌握') }} + 总分 {{ formatScore(item.totalScore) }} + + + + + 人员编号 + {{ item.adminId }} + + + 技能项数 + {{ (item.detailList && item.detailList.length) || item.skillCount || 0 }} + + + + + 掌握进度 + {{ item.masteredCount || 0 }} / {{ item.skillCount || 0 }} + + + + + + + + + + 暂无技能卡 + 点击“新增技能卡”按钮,为人员创建技能卡 + 暂无技能卡数据 + + + + + + + + + + + + + {{ currentCard.adminName }} + + {{ formatScore(currentCard.totalScore) }} + + + + + 选择维修模板 + + + + + + + + + + + + + {{ masteryText(scope.row.masteryStatus) }} + + + + + + {{ scope.row.score == null ? '-' : scope.row.score }} + + + + + + {{ formatDate(scope.row.masterDate) }} + + + + + 删除 + + + + + + + 打分标准 - {{ selectedSkillName }} + (点击上方明细行查看对应标准) + + + + + + + + + + 保存 + 关闭 + + + + + + + + + + + + + + + + 查询 + + + + + + + + 提示:点击行选择人员并创建技能卡(一人一卡) + + + + + + + + + + 查询 + + + + + + + 提示:点击模板行,将该模板下的所有维修明细加入当前技能卡 + + + + + + + diff --git a/src/views/modules/repairSkill/repairSkillContent.vue b/src/views/modules/repairSkill/repairSkillContent.vue new file mode 100644 index 0000000..fe9ca7b --- /dev/null +++ b/src/views/modules/repairSkill/repairSkillContent.vue @@ -0,0 +1,261 @@ + + + + + + + + + + + + 查询 + 新增 + + + + + + + + 编辑 | + 删除 + + + + + + + + + + {{ scope.row.status === 'Y' ? '启用' : '停用' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 分数标准(评分参考) + 新增标准 + + + + + + + + + + + + + + + 删除 + + + + + + 保存 + 取消 + + + + + + + + diff --git a/src/views/modules/repairSkill/repairSkillTemplate.vue b/src/views/modules/repairSkill/repairSkillTemplate.vue new file mode 100644 index 0000000..1a52506 --- /dev/null +++ b/src/views/modules/repairSkill/repairSkillTemplate.vue @@ -0,0 +1,304 @@ + + + + + + + + + + + + 查询 + 新增 + + + + + + + + 编辑 | + 删除 + + + + + + + + + {{ scope.row.status === 'Y' ? '启用' : '停用' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 维修明细(模板包含的明细项) + 添加明细 + + + + + + + + + 移除 + + + + + + 保存 + 取消 + + + + + + + + + + + 查询 + + + + + + + + + + 确定添加 + 取消 + + + + + + + +
机修人员技能掌握与打分管理
暂无技能卡
点击“新增技能卡”按钮,为人员创建技能卡
暂无技能卡数据