diff --git a/src/utils/request.js b/src/utils/request.js index c5ba030..20dabae 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,7 +3,12 @@ import router, { resetRouter } from '@/router/index'; import axios from 'axios'; import { Message, MessageBox } from 'element-ui'; import { Session } from '@/utils/storage'; - +const errorCode = { + '401': '登录状态已过期,即将返回首页重新登录。', + '403': '当前操作没有权限', + '404': '访问资源不存在', + 'default': '系统未知错误，请反馈给管理员' +} // 创建 axios 实例 const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, @@ -28,25 +33,36 @@ service.interceptors.request.use( // 添加响应拦截器 service.interceptors.response.use( - (response) => { + (res) => { // 对响应数据做点什么 - const res = response.data; - if (res.code && res.code !== 0) { - // `token` 过期或者账号已在别处登录 - if (res.code === 401 || res.code === 4001) { - // 清除浏览器全部临时缓存 - Session.clear(); - router.push('/login'); - store.commit('setMenuData', {}); - resetRouter(); // 重置路由 - MessageBox.alert('你已被登出，请重新登录', '提示', {}) - .then(() => {}) - .catch(() => {}); + const response = res.data; + const code = res.data.code || 200; + const message = errorCode[code] || res.data.msg || errorCode['default'] + if (code === 401) { + if (res.code === 401 || res.code === 4001) { + // 清除浏览器全部临时缓存 + Session.clear(); + router.push('/login'); + store.commit('setMenuData', {}); + resetRouter(); // 重置路由 + MessageBox.alert('你已被登出，请重新登录', '提示', {}) + .then(() => {}) + .catch(() => {}); + } + } else if (code === 500) { + // Message({ message: msg, type: 'error' }) + Message.error(message); + return Promise.reject(new Error(msg)) + } else if (code === 601) { + // Message({ message: msg, type: 'warning' }) + Message.error(message); + return Promise.reject('error') + } else if (code != 200) { + Message.error(message); + return Promise.reject('error') + } else { + return response } - return Promise.reject(service.interceptors.response.error); - } else { - return response.data; - } }, (error) => { // 对响应错误做点什么 diff --git a/src/views/recipe/api.js b/src/views/recipe/api.js index 6195210..d6e7408 100644 --- a/src/views/recipe/api.js +++ b/src/views/recipe/api.js @@ -1,32 +1,65 @@ import request from '@/utils/request'; -// 获取设备数据列表 -export const rqGetDeviceList = (current,size) => request({ - url: `/attendance/equipment/device?current=${current}&size=${size}`, - method: 'get', -}) +// 查询学校学期食谱标题列表 +export function getSemester (data) { + return request({ + url: '/semester/recipe/list', + method: 'get', + }) +} +// 通过学期食谱标题id获取这学期的每周食谱 +export function getWeek (rId) { + return request({ + url: '/week/recipe/list', + method: 'get', + params: { + rId + } + }) +} +// 通过每周id获取食谱列表 +export function getRecipe (wId) { + return request({ + url: '/recipe/menu/list', + method: 'get', + params: { + wId + } + }) +} +// 新增食谱大标题 +export function postSemester (data) { + return request({ + url: '/semester/recipe', + method: 'post', + data + }) +} +// 通过学期食谱标题id添加这学期的每周食谱 +export function postWeek (data) { + return request({ + url: '/week/recipe', + method: 'post', + data + }) +} +// 添加这周每日食谱 +export function postMeal (data) { + return request({ + url: '/recipe/menu', + method: 'post', + data + }) +} -// 添加或者修改 -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 function putMeal (data) { + return request({ + url: '/recipe/menu', + method: 'put', + 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/components/CommonHead.vue b/src/views/recipe/components/CommonHead.vue new file mode 100644 index 0000000..f22b586 --- /dev/null +++ b/src/views/recipe/components/CommonHead.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/recipe/index.vue b/src/views/recipe/index.vue index b0e347a..45ef806 100644 --- a/src/views/recipe/index.vue +++ b/src/views/recipe/index.vue @@ -6,56 +6,87 @@ @search-data="searchForm" @reset-data="reset" @newly-data="add" + @newly-two-data="addWeek" + @update-data="updateClick" + @update-two-data="updateTwoClick" > - - - - - - - - - + + + + + + + + + + + +
+

{{ item.tName }}

+ + + + + + + + + + + + + + + + + + + + +
+ - - - - - - - - - - - + + + + + + + + + + + + 立即创建 + 取消 + + + + + + + +
+ {{cellInfo.sName}} + {{ '第' + cellInfo.weekTimeName}}周 + {{ weekEnum[cellInfo.weekName] }} + {{cellInfo.mealName}} +
+ +
+
+ + + + + + +
+ +
+
+ +
+
+ 新增食物 +
+ + + 提交 + 取消 + + + + + +
+
+
{{ item.sName }}
+ + {{ item.isEdit ? '修改' : '保存' }} + 删除 +
+ + + 提交 + 取消 + + + + - \ No newline at end of file + \ No newline at end of file