diff --git a/public/favicon.ico b/public/favicon.ico index e263760..93695d1 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/assets/agri.js b/src/api/assets/agri.js new file mode 100644 index 0000000..ddfecad --- /dev/null +++ b/src/api/assets/agri.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询大棚管理列表 +export function listAgri(query) { + return request({ + url: '/assets/agri/list', + method: 'get', + params: query + }) +} + +// 查询大棚管理详细 +export function getAgri(id) { + return request({ + url: '/assets/agri/' + id, + method: 'get' + }) +} + +// 新增大棚管理 +export function addAgri(data) { + return request({ + url: '/assets/agri', + method: 'post', + data: data + }) +} + +// 修改大棚管理 +export function updateAgri(data) { + return request({ + url: '/assets/agri', + method: 'put', + data: data + }) +} + +// 删除大棚管理 +export function delAgri(id) { + return request({ + url: '/assets/agri/' + id, + method: 'delete' + }) +} diff --git a/src/api/assets/alarm.js b/src/api/assets/alarm.js new file mode 100644 index 0000000..eb17bec --- /dev/null +++ b/src/api/assets/alarm.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询告警方式设置列表 +export function listAlarm(query) { + return request({ + url: '/assets/alarm/list', + method: 'get', + params: query + }) +} + +// 查询告警方式设置详细 +export function getAlarm(id) { + return request({ + url: '/assets/alarm/' + id, + method: 'get' + }) +} + +// 新增告警方式设置 +export function addAlarm(data) { + return request({ + url: '/assets/alarm', + method: 'post', + data: data + }) +} + +// 修改告警方式设置 +export function updateAlarm(data) { + return request({ + url: '/assets/alarm', + method: 'put', + data: data + }) +} + +// 删除告警方式设置 +export function delAlarm(id) { + return request({ + url: '/assets/alarm/' + id, + method: 'delete' + }) +} diff --git a/src/api/assets/limit.js b/src/api/assets/limit.js new file mode 100644 index 0000000..98b978b --- /dev/null +++ b/src/api/assets/limit.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询执行时间限位管理列表 +export function listLimit(query) { + return request({ + url: '/assets/limit/list', + method: 'get', + params: query + }) +} + +// 查询执行时间限位管理详细 +export function getLimit(id) { + return request({ + url: '/assets/limit/' + id, + method: 'get' + }) +} + +// 新增执行时间限位管理 +export function addLimit(data) { + return request({ + url: '/assets/limit', + method: 'post', + data: data + }) +} + +// 修改执行时间限位管理 +export function updateLimit(data) { + return request({ + url: '/assets/limit', + method: 'put', + data: data + }) +} + +// 删除执行时间限位管理 +export function delLimit(id) { + return request({ + url: '/assets/limit/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/student.js b/src/api/system/student.js new file mode 100644 index 0000000..949855c --- /dev/null +++ b/src/api/system/student.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询学生信息列表 +export function listStudent(query) { + return request({ + url: '/system/student/list', + method: 'get', + params: query + }) +} + +// 查询学生信息详细 +export function getStudent(studentId) { + return request({ + url: '/system/student/' + studentId, + method: 'get' + }) +} + +// 新增学生信息 +export function addStudent(data) { + return request({ + url: '/system/student', + method: 'post', + data: data + }) +} + +// 修改学生信息 +export function updateStudent(data) { + return request({ + url: '/system/student', + method: 'put', + data: data + }) +} + +// 删除学生信息 +export function delStudent(studentId) { + return request({ + url: '/system/student/' + studentId, + method: 'delete' + }) +} + +// 导出学生信息 +export function exportStudent(query) { + return request({ + url: '/system/student/export', + method: 'get', + params: query + }) +} diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e263760..89a231a 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/permission.js b/src/permission.js index b66190b..36256f4 100644 --- a/src/permission.js +++ b/src/permission.js @@ -18,6 +18,7 @@ const isWhiteList = (path) => { router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { + debugger; to.meta.title && store.dispatch('settings/setTitle', to.meta.title) /* has token*/ if (to.path === '/login') { diff --git a/src/router/index.js b/src/router/index.js index bbfd237..0a3d235 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,7 +62,7 @@ export const constantRoutes = [ hidden: true }, { - path: '', + path: '/', component: Layout, redirect: 'index', children: [ diff --git a/src/views/assets/agri/index.vue b/src/views/assets/agri/index.vue new file mode 100644 index 0000000..80b55e3 --- /dev/null +++ b/src/views/assets/agri/index.vue @@ -0,0 +1,417 @@ + + + diff --git a/src/views/assets/alarm/index.vue b/src/views/assets/alarm/index.vue new file mode 100644 index 0000000..c7acf0a --- /dev/null +++ b/src/views/assets/alarm/index.vue @@ -0,0 +1,330 @@ + + + diff --git a/src/views/assets/limit/index.vue b/src/views/assets/limit/index.vue new file mode 100644 index 0000000..c96ea1a --- /dev/null +++ b/src/views/assets/limit/index.vue @@ -0,0 +1,428 @@ + + + diff --git a/src/views/system/student/index.vue b/src/views/system/student/index.vue new file mode 100644 index 0000000..eb972b1 --- /dev/null +++ b/src/views/system/student/index.vue @@ -0,0 +1,338 @@ + + + diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index 512f66e..24f8231 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -5,7 +5,7 @@ - + @@ -81,6 +81,7 @@