diff --git a/public/admin.js b/public/admin.js index e5ee640..aab49f4 100644 --- a/public/admin.js +++ b/public/admin.js @@ -599,5 +599,20 @@ export default { "icon": "el-icon-magic-stick" } }, + { + "path": "/recipe", + "name": "recipe", + "component": "recipe", + "meta": { + "title": "message.router.recipe", + "isLink": "", + "isHide": false, + "isKeepAlive": true, + "isAffix": true, + "isIframe": false, + "roles": ["admin", "common"], + "icon": "el-icon-s-opportunity" + } + } ] } diff --git a/public/test.json b/public/test.json index 44bc67d..f65e003 100644 --- a/public/test.json +++ b/public/test.json @@ -223,5 +223,7 @@ "icon": "iconfont icon-neiqianshujuchucun" } } + + ] } diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 3aeb702..7238e4a 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -53,7 +53,8 @@ export default { rolePermissions:"rolePermissions", setScoreRules:'setScoreRules', facultyInformation:'facultyInformation', - attendanceMachineEquipmentManagement:'attendanceMachineEquipmentManagement' + attendanceMachineEquipmentManagement:'attendanceMachineEquipmentManagement', + recipe: 'recipe' }, staticRoutes: { signIn: 'signIn', diff --git a/src/i18n/lang/zh-cn.js b/src/i18n/lang/zh-cn.js index 68a8da2..c6475f9 100644 --- a/src/i18n/lang/zh-cn.js +++ b/src/i18n/lang/zh-cn.js @@ -54,6 +54,7 @@ export default { schoolAlbumManagement:'学校画册管理', facultyInformation:'教职工信息', attendanceMachineEquipmentManagement:'考勤机设备管理', + recipe: '每周食谱' }, staticRoutes: { diff --git a/src/i18n/lang/zh-tw.js b/src/i18n/lang/zh-tw.js index d713205..c94ba11 100644 --- a/src/i18n/lang/zh-tw.js +++ b/src/i18n/lang/zh-tw.js @@ -54,6 +54,7 @@ export default { facultyInformation:'教職工信息', deviceManagement:'人脸设备管理', attendanceMachineEquipmentManagement:'考勤機設備管理', + recipe: '每周食谱', }, staticRoutes: { signIn: '登入', diff --git a/src/views/recipe/api.js b/src/views/recipe/api.js new file mode 100644 index 0000000..6195210 --- /dev/null +++ b/src/views/recipe/api.js @@ -0,0 +1,32 @@ +import request from '@/utils/request'; + +// 获取设备数据列表 +export const rqGetDeviceList = (current,size) => request({ + url: `/attendance/equipment/device?current=${current}&size=${size}`, + method: 'get', +}) + + +// 添加或者修改 +export const rqAddOrModifyDevice = (data) => { + if(data.deviceId){ + return request({ + url: '/attendance/equipment/device', + method: 'put', + data + }) + }else{ + return request({ + url: '/attendance/equipment/device', + method: 'post', + data + }) + } + +} + +// 删除 +export const rqDeleteDevice = (id) => request({ + url: `/attendance/equipment/device/${id}`, + method: 'delete', +}) \ No newline at end of file diff --git a/src/views/recipe/columns.js b/src/views/recipe/columns.js new file mode 100644 index 0000000..44ca9f0 --- /dev/null +++ b/src/views/recipe/columns.js @@ -0,0 +1,52 @@ +export default [ + { + label: "设备id", + prop: "deviceId", + type: "text", + }, + { + label: "账号名称", + prop: "username", + type: "text", + }, + + { + label: "设备名称", + prop: "deviceName", + type: "text", + }, + { + label: "用户名", + prop: "username", + type: "image", + }, + { + label: "密码", + prop: "password", + type: "text", + }, + + + { + label: "设备标签", + prop: "deviceLabel", + type: "text", + }, + { + label: "设备地址", + prop: "deviceUrl", + type: "text", + }, + { + label: "设备状态", + prop: "deviceStatus", + type: "text", + }, + + { + label: "设备物理地址", + prop: "macAddress", + type: "text", + }, + +] \ No newline at end of file diff --git a/src/views/recipe/components/CommonTablesImg.vue b/src/views/recipe/components/CommonTablesImg.vue new file mode 100644 index 0000000..c5d3705 --- /dev/null +++ b/src/views/recipe/components/CommonTablesImg.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/views/recipe/index.vue b/src/views/recipe/index.vue new file mode 100644 index 0000000..b0e347a --- /dev/null +++ b/src/views/recipe/index.vue @@ -0,0 +1,324 @@ + + + + + \ No newline at end of file