diff --git a/.vscode/settings.json b/.vscode/settings.json index a0e5e3a..578d2ea 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,9 +5,13 @@ "editor.formatOnPaste": true, "editor.formatOnType": true, // 配置eslint适用于vue代码 - "eslint.validate": ["javascript", "typescript", "vue"], + "eslint.validate": [ + "javascript", + "typescript", + "vue" + ], "[vue]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "Vue.volar" }, "[scss]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -47,13 +51,30 @@ } }, "i18n-ally.displayLanguage": "zh-cn", - "i18n-ally.enabledParsers": ["json", "js"], - "i18n-ally.localesPaths": ["src/i18n/lang", "src/i18n/pages/login", "src/i18n/pages/menu"], + "i18n-ally.enabledParsers": [ + "json", + "js" + ], + "i18n-ally.localesPaths": [ + "src/i18n/lang", + "src/i18n/pages/login", + "src/i18n/pages/menu" + ], "i18n-ally.extract.parsers.html": { - "attributes": ["text", "title", "alt", "placeholder", "label", "aria-label"], - "ignoredTags": ["script", "style"], + "attributes": [ + "text", + "title", + "alt", + "placeholder", + "label", + "aria-label" + ], + "ignoredTags": [ + "script", + "style" + ], "vBind": true, "inlineText": true }, "i18n-ally.keystyle": "nested" -} +} \ No newline at end of file diff --git a/src/api/basicDataManagement/categoryManagement/index.js b/src/api/basicDataManagement/categoryManagement/index.js index a98521a..a7226c3 100644 --- a/src/api/basicDataManagement/categoryManagement/index.js +++ b/src/api/basicDataManagement/categoryManagement/index.js @@ -1,9 +1,36 @@ import request from '@/utils/request' // 查询缓存详细 -export function getCache() { +export function getCache(data) { return request({ - url: '/monitor/cache', - method: 'get' + url: 'mes/MaterialTypeDict/list', + method: 'get', + params: data }) } +//新增 +export function addCache(data) { + return request({ + url: 'mes/MaterialTypeDict', + method: 'post', + data: data + }) +} + +//修改 +export function updateCache(data) { + return request({ + url: 'mes/MaterialTypeDict', + method: 'put', + data: data + }) +} + +//删除 +export function delCache(id) { + return request({ + url: 'mes/MaterialTypeDict/delete/' + id, + method: 'post', + + }) +} \ No newline at end of file diff --git a/src/api/basicDataManagement/qualitySettingManagement/index.js b/src/api/basicDataManagement/qualitySettingManagement/index.js index bb76946..731c75b 100644 --- a/src/api/basicDataManagement/qualitySettingManagement/index.js +++ b/src/api/basicDataManagement/qualitySettingManagement/index.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function listQualityDefectReason(query) { return request({ - url: 'business/QualityDefectReason/list', + url: 'mes/QualityDefectReason/list', method: 'get', params: query, }) @@ -18,7 +18,7 @@ export function listQualityDefectReason(query) { */ export function addQualityDefectReason(data) { return request({ - url: 'business/QualityDefectReason', + url: 'mes/QualityDefectReason', method: 'post', data: data, }) @@ -29,7 +29,7 @@ export function addQualityDefectReason(data) { */ export function updateQualityDefectReason(data) { return request({ - url: 'business/QualityDefectReason', + url: 'mes/QualityDefectReason', method: 'PUT', data: data, }) @@ -40,7 +40,7 @@ export function updateQualityDefectReason(data) { */ export function getQualityDefectReason(id) { return request({ - url: 'business/QualityDefectReason/' + id, + url: 'mes/QualityDefectReason/' + id, method: 'get' }) } @@ -51,7 +51,7 @@ export function getQualityDefectReason(id) { */ export function delQualityDefectReason(pid) { return request({ - url: 'business/QualityDefectReason/delete/' + pid, + url: 'mes/QualityDefectReason/delete/' + pid, method: 'POST' }) } diff --git a/src/api/processRouteManagement/processInformationManagement/index.js b/src/api/processRouteManagement/processInformationManagement/index.js index 87104f9..d786a3a 100644 --- a/src/api/processRouteManagement/processInformationManagement/index.js +++ b/src/api/processRouteManagement/processInformationManagement/index.js @@ -2,14 +2,14 @@ import request from '@/utils/request' //左侧树形结构 export function getProcessInfoTree() { return request({ - url: 'business/ProcessInfo/tree', + url: 'mes/ProcessInfo/tree', method: 'get' }) } //详情 export function getProcessInfoById(data) { return request({ - url: `business/OperationInfo/getOperationInfoByProcessCode`, + url: `mes/OperationInfo/getOperationInfoByProcessCode`, method: 'post', data: data }) @@ -17,7 +17,7 @@ export function getProcessInfoById(data) { // 查询 export function getProcessInfoList(data) { return request({ - url: 'business/ProcessInfo/GetProcessInfoCondition', + url: 'mes/ProcessInfo/GetProcessInfoCondition', method: 'post', data }) @@ -26,14 +26,14 @@ export function getProcessInfoList(data) { //编辑查看详情 export function getProcessInfo(id) { return request({ - url: `business/ProcessInfo/` + id, + url: `mes/ProcessInfo/` + id, method: 'get', }) } // 添加 export function addProcessInfo(data) { return request({ - url: 'business/ProcessInfo', + url: 'mes/ProcessInfo', method: 'post', data: data }) @@ -42,7 +42,7 @@ export function addProcessInfo(data) { // 修改 export function updateProcessInfo(data) { return request({ - url: 'business/ProcessInfo', + url: 'mes/ProcessInfo', method: 'put', data: data }) @@ -51,7 +51,7 @@ export function updateProcessInfo(data) { // 删除 export function delProcessInfo(data) { return request({ - url: `business/ProcessInfo/deleteByProcessCode`, + url: `mes/ProcessInfo/deleteByProcessCode`, method: 'post', data: data }) diff --git a/src/views/basicDataManagement/categoryManagement/index.vue b/src/views/basicDataManagement/categoryManagement/index.vue index b5575f4..0e40d07 100644 --- a/src/views/basicDataManagement/categoryManagement/index.vue +++ b/src/views/basicDataManagement/categoryManagement/index.vue @@ -1,3 +1,299 @@ \ No newline at end of file +
+
+ + + + + + + {{ $t('btn.search') + }} + {{ $t('btn.reset') }} + + + + + {{ $t('btn.add') }} + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/src/views/processRouteManagement/productionLineManagement/index.vue b/src/views/processRouteManagement/productionLineManagement/index.vue new file mode 100644 index 0000000..fb37368 --- /dev/null +++ b/src/views/processRouteManagement/productionLineManagement/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file