diff --git a/src/api/casm/device/index.js b/src/api/casm/device.js similarity index 100% rename from src/api/casm/device/index.js rename to src/api/casm/device.js diff --git a/src/api/casm/produce.js b/src/api/casm/produce.js new file mode 100644 index 0000000..a3400d8 --- /dev/null +++ b/src/api/casm/produce.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询生产管理列表 +export function listOutput(query) { + return request({ + url: '/casm/output/list', + method: 'get', + params: query + }) +} + +// 查询生产管理详细 +export function getOutput(id) { + return request({ + url: '/casm/output/' + id, + method: 'get' + }) +} + +// 新增生产管理 +export function addOutput(data) { + return request({ + url: '/casm/output', + method: 'post', + data: data + }) +} + +// 修改生产管理 +export function updateOutput(data) { + return request({ + url: '/casm/output', + method: 'put', + data: data + }) +} + +// 删除生产管理 +export function delOutput(id) { + return request({ + url: '/casm/output/' + id, + method: 'delete' + }) +} diff --git a/src/lang/i18n-en-US.js b/src/lang/i18n-en-US.js index 2bfdfd4..1adb436 100644 --- a/src/lang/i18n-en-US.js +++ b/src/lang/i18n-en-US.js @@ -1,26 +1,29 @@ export default { "menus":{ - "home": "Home", - "dashboard": "Dashboard", - "Device": "Device", - "Product": "Product", - "System": "System", - "User": "User", - "Role": "Role", - "Menu": "Menu", - "Dept": "Dept", - "Job": "Job", - "Dict": "Dict", - "Config": "Config", - "Notice": "Notice", - "Log": "Log", - "LoginLog": "LoginLog", - "Task": "Task", - "Druid": "Druid", - "Tools": "Tools", - "DruidWallBoard": "DruidWallBoard", - "DruidSql": "DruidSql", - "DruidStat": "DruidStat", + "首页": "Home", + "仪表盘": "Dashboard", + "设备管理": "Device", + "产品管理": "Product", + "系统管理": "System", + "用户管理": "User", + "角色管理": "Role", + "菜单管理": "Menu", + "部门管理": "Dept", + "岗位管理": "Job", + "字典管理": "Dict", + "参数管理": "Config", + "通知公告": "Notice", + "操作日志": "Log", + "登录日志": "LoginLog", + "定时任务": "Task", + "系统监控": "Druid", + "系统工具": "Tools", + "大盘监控": "DruidWallBoard", + "SQL监控": "DruidSql", + "统计监控": "DruidStat", + "添加": "Add", + "修改": "Edit", + "删除": "Delete", }, "common": { "add": "Add", diff --git a/src/lang/i18n-zh-CN.js b/src/lang/i18n-zh-CN.js index c10c193..14224e2 100644 --- a/src/lang/i18n-zh-CN.js +++ b/src/lang/i18n-zh-CN.js @@ -1,27 +1,30 @@ export default { //菜单 "menus":{ - "home": "首页", - "dashboard": "仪表盘", - "Device": "设备管理", - "Product": "产品管理", - "System": "系统管理", - "User": "用户管理", - "Role": "角色管理", - "Menu": "菜单管理", - "Dept": "部门管理", - "Job": "岗位管理", - "Dict": "字典管理", - "Config": "参数管理", - "Notice": "通知公告", - "Log": "操作日志", - "LoginLog": "登录日志", - "Task": "定时任务", - "Druid": "系统监控", - "Tools": "系统工具", - "DruidWallBoard": "大盘监控", - "DruidSql": "SQL监控", - "DruidStat": "统计监控", + "首页": "首页", + "仪表盘": "仪表盘", + "设备管理": "设备管理", + "产品管理": "产品管理", + "系统管理": "系统管理", + "用户管理": "用户管理", + "角色管理": "角色管理", + "菜单管理": "菜单管理", + "部门管理": "部门管理", + "岗位管理": "岗位管理", + "字典管理": "字典管理", + "参数管理": "参数管理", + "通知公告": "通知公告", + "操作日志": "操作日志", + "登录日志": "登录日志", + "定时任务": "定时任务", + "系统监控": "系统监控", + "系统工具": "系统工具", + "大盘监控": "大盘监控", + "SQL监控": "SQL监控", + "统计监控": "统计监控", + "添加": "添加", + "修改": "修改", + "删除": "删除", }, "common":{ "add": "新增", diff --git a/src/router/index.js b/src/router/index.js index 466593e..c4a9d64 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,7 +66,7 @@ export const constantRoutes = [ path: '/index', component: () => import('@/views/index'), name: 'Index', - meta: { title: 'home', icon: 'dashboard', affix: true } + meta: { title: '首页', icon: 'dashboard', affix: true } } ] }, diff --git a/src/views/device/device/index.vue b/src/views/device/device/index.vue index 9a2e908..eb56060 100644 --- a/src/views/device/device/index.vue +++ b/src/views/device/device/index.vue @@ -34,9 +34,9 @@ - + @@ -80,7 +80,7 @@ - + @@ -141,9 +141,9 @@ - + @@ -167,7 +167,7 @@ + + diff --git a/src/views/produce/index.vue b/src/views/produce/index.vue new file mode 100644 index 0000000..fff01ac --- /dev/null +++ b/src/views/produce/index.vue @@ -0,0 +1,271 @@ + + + + + \ No newline at end of file diff --git a/src/views/produce/info.vue b/src/views/produce/info.vue new file mode 100644 index 0000000..b3621a9 --- /dev/null +++ b/src/views/produce/info.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/views/product/product/add_edit.vue b/src/views/product/product/add_edit.vue index 00b9c9e..c1a8f1c 100644 --- a/src/views/product/product/add_edit.vue +++ b/src/views/product/product/add_edit.vue @@ -85,34 +85,38 @@ - + + + 缝纫 + 最小值 - + 最大值 - + - - + + 标签 + 最小值 - + 最大值 - + diff --git a/src/views/product/product/index.vue b/src/views/product/product/index.vue index daaa609..3b0f6e2 100644 --- a/src/views/product/product/index.vue +++ b/src/views/product/product/index.vue @@ -58,12 +58,14 @@ + + +