diff --git a/.env.development b/.env.development index 36c372a..55b869e 100644 --- a/.env.development +++ b/.env.development @@ -1,18 +1,10 @@ # 页面标题 -<<<<<<< HEAD -VUE_APP_TITLE = 博诺思公共微服务平台 -======= VUE_APP_TITLE = 公共服务平台 ->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4 # 开发环境配置 ENV = 'development' -<<<<<<< HEAD -# 博诺思公共微服务平台/开发环境 -======= # 公共服务平台/开发环境 ->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/.env.production b/.env.production index 714bdd8..7eac2ad 100644 --- a/.env.production +++ b/.env.production @@ -1,16 +1,8 @@ # 页面标题 -<<<<<<< HEAD -VUE_APP_TITLE = 博诺思公共微服务平台 -======= VUE_APP_TITLE = 公共服务平台 ->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4 # 生产环境配置 ENV = 'production' -<<<<<<< HEAD -# 博诺思公共微服务平台/生产环境 -======= # 公共服务平台/生产环境 ->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4 VUE_APP_BASE_API = '/prod-api' diff --git a/public/favicon.ico b/public/favicon.ico index e263760..e3f7c27 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/dataManage/product-center.js b/src/api/dataManage/product-center.js index d852ccf..598bd69 100644 --- a/src/api/dataManage/product-center.js +++ b/src/api/dataManage/product-center.js @@ -1,9 +1,10 @@ import request from '@/utils/request' +import request_formdata from '@/utils/request_formdata' // 查询产品中心列表 export function getProductCenterListAPI(data) { return request({ - url: '/dataManage/product-center/list', + url: '/product/case/list', method: 'GET', params: data, }) @@ -11,27 +12,36 @@ export function getProductCenterListAPI(data) { // 新增产品中心 export function addProductCenterAPI(data) { - return request({ - url: '/dataManage/product-center/add', + return request_formdata({ + url: '/product/case/add', method: 'POST', - data: data, + data, }) } // 编辑产品中心 export function editProductCenterAPI(data) { - return request({ - url: '/dataManage/product-center/edit', + return request_formdata({ + url: '/product/case/update', method: 'POST', - data: data, + data, }) } // 删除产品中心 export function deleteProductCenterAPI(data) { return request({ - url: '/dataManage/product-center/delete', + url: '/product/case/delete', method: 'POST', - data: data, + data, + }) +} + +// 获取产品中心详情 +export function getProductCenterDetailAPI(data) { + return request({ + url: '/product/case/getDetails', + method: 'POST', + data, }) } diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e263760..e3f7c27 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index 8b4738b..fdc0d60 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -1,90 +1,104 @@ diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index 08ac487..4ec40c8 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -1,113 +1,112 @@ diff --git a/src/components/UploadImgFormData/index.vue b/src/components/UploadImgFormData/index.vue index 1f530cf..64bab59 100644 --- a/src/components/UploadImgFormData/index.vue +++ b/src/components/UploadImgFormData/index.vue @@ -103,6 +103,7 @@ export default { methods: { // 删除 async handleRemove(file, fileList) { + console.log(file, fileList, 'file,fileList') this.$emit('onUploadChange', fileList) // if (file.response && file.response.data.length > 0) { // this.$emit('deleteFile', { @@ -123,6 +124,10 @@ export default { // } // } this.$emit('update:fileList', fileList) + + if (file.id) { + this.$emit('onSelectDeleteFileId', file.id) + } }, // 预览 diff --git a/src/utils/request.js b/src/utils/request.js index 7150ecb..aea8700 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui' import store from '@/store' import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' -import { tansParams, blobValidate } from "@/utils/ruoyi" +import { tansParams, blobValidate } from '@/utils/ruoyi' import cache from '@/plugins/cache' import { saveAs } from 'file-saver' @@ -14,139 +14,186 @@ export let isRelogin = { show: false } axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ - // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: process.env.VUE_APP_BASE_API, - // 超时 - timeout: 10000 + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: process.env.VUE_APP_BASE_API, + // 超时 + timeout: 10000, }) // request拦截器 -service.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - const isRepeatSubmit = (config.headers || {}).repeatSubmit === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - } - // get请求映射params参数 - if (config.method === 'get' && config.params) { - let url = config.url + '?' + tansParams(config.params) - url = url.slice(0, -1) - config.params = {} - config.url = url - } - if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { - const requestObj = { - url: config.url, - data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, - time: new Date().getTime() - } - const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 - const limitSize = 5 * 1024 * 1024 // 限制存放数据5M - if (requestSize >= limitSize) { - console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。') - return config - } - const sessionObj = cache.session.getJSON('sessionObj') - if (sessionObj === undefined || sessionObj === null || sessionObj === '') { - cache.session.setJSON('sessionObj', requestObj) - } else { - const s_url = sessionObj.url // 请求地址 - const s_data = sessionObj.data // 请求数据 - const s_time = sessionObj.time // 请求时间 - const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交 - if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { - const message = '数据正在处理，请勿重复提交' - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) - } else { - cache.session.setJSON('sessionObj', requestObj) - } - } - } - return config -}, error => { - console.log(error) - Promise.reject(error) -}) +service.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + tansParams(config.params) + url = url.slice(0, -1) + config.params = {} + config.url = url + } + if ( + !isRepeatSubmit && + (config.method === 'post' || config.method === 'put') + ) { + const requestObj = { + url: config.url, + data: + typeof config.data === 'object' + ? JSON.stringify(config.data) + : config.data, + time: new Date().getTime(), + } + const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 + const limitSize = 5 * 1024 * 1024 // 限制存放数据5M + if (requestSize >= limitSize) { + console.warn( + `[${config.url}]: ` + + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。', + ) + return config + } + const sessionObj = cache.session.getJSON('sessionObj') + if ( + sessionObj === undefined || + sessionObj === null || + sessionObj === '' + ) { + cache.session.setJSON('sessionObj', requestObj) + } else { + const s_url = sessionObj.url // 请求地址 + const s_data = sessionObj.data // 请求数据 + const s_time = sessionObj.time // 请求时间 + const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交 + if ( + s_data === requestObj.data && + requestObj.time - s_time < interval && + s_url === requestObj.url + ) { + const message = '数据正在处理，请勿重复提交' + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } + } + } + return config + }, + (error) => { + console.log(error) + Promise.reject(error) + }, +) // 响应拦截器 -service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200 - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data - } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true - MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { - isRelogin.show = false - store.dispatch('LogOut').then(() => { - location.href = '/index' - }) - }).catch(() => { - isRelogin.show = false - }) - } - return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - } else if (code === 500) { - Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - Message({ message: msg, type: 'warning' }) - return Promise.reject('error') - } else if (code !== 200) { - Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data - } - }, - error => { - console.log('err' + error) - let { message } = error - if (message == "Network Error") { - message = "后端接口连接异常" - } else if (message.includes("timeout")) { - message = "系统接口请求超时" - } else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常" - } - Message({ message: message, type: 'error', duration: 5 * 1000 }) - return Promise.reject(error) - } +service.interceptors.response.use( + (res) => { + // 未设置状态码则默认成功状态 + const code = res.data.code || 200 + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if ( + res.request.responseType === 'blob' || + res.request.responseType === 'arraybuffer' + ) { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true + MessageBox.confirm( + '登录状态已过期，您可以继续留在该页面，或者重新登录', + '系统提示', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning', + }, + ) + .then(() => { + isRelogin.show = false + store.dispatch('LogOut').then(() => { + location.href = '/index' + }) + }) + .catch(() => { + isRelogin.show = false + }) + } + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } + }, + (error) => { + console.log('err' + error) + let { message } = error + if (message == 'Network Error') { + message = '后端接口连接异常' + } else if (message.includes('timeout')) { + message = '系统接口请求超时' + } else if (message.includes('Request failed with status code')) { + message = '系统接口' + message.substr(message.length - 3) + '异常' + } + Message({ message: message, type: 'error', duration: 5 * 1000 }) + return Promise.reject(error) + }, ) // 通用下载方法 export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) - return service.post(url, params, { - transformRequest: [(params) => { return tansParams(params) }], - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - responseType: 'blob', - ...config - }).then(async (data) => { - const isBlob = blobValidate(data) - if (isBlob) { - const blob = new Blob([data]) - saveAs(blob, filename) - } else { - const resText = await data.text() - const rspObj = JSON.parse(resText) - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg) - } - downloadLoadingInstance.close() - }).catch((r) => { - console.error(r) - Message.error('下载文件出现错误，请联系管理员！') - downloadLoadingInstance.close() - }) + downloadLoadingInstance = Loading.service({ + text: '正在下载数据，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)', + }) + return service + .post(url, params, { + transformRequest: [ + (params) => { + return tansParams(params) + }, + ], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + ...config, + }) + .then(async (data) => { + const isBlob = blobValidate(data) + if (isBlob) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text() + const rspObj = JSON.parse(resText) + const errMsg = + errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg) + } + downloadLoadingInstance.close() + }) + .catch((r) => { + console.error(r) + Message.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close() + }) } export default service diff --git a/src/utils/request_formdata.js b/src/utils/request_formdata.js new file mode 100644 index 0000000..5796356 --- /dev/null +++ b/src/utils/request_formdata.js @@ -0,0 +1,208 @@ +import axios from 'axios' +import { Notification, MessageBox, Message, Loading } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' +import { tansParams, blobValidate } from '@/utils/ruoyi' +import cache from '@/plugins/cache' +import { saveAs } from 'file-saver' + +let downloadLoadingInstance +// 是否显示重新登录 +export let isRelogin = { show: false } + +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +// 创建axios实例 +const service = axios.create({ + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: process.env.VUE_APP_BASE_API, + // 超时 + timeout: 10000, +}) + +// request拦截器 +service.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + tansParams(config.params) + url = url.slice(0, -1) + config.params = {} + config.url = url + } + if ( + !isRepeatSubmit && + (config.method === 'post' || config.method === 'put') + ) { + if (config.data instanceof FormData) { + // 对于FormData，我们创建一个对象来保存数据以便验证 + const formDataObj = new FormData() + config.data.forEach((value, key) => { + formDataObj.append(key, value) + }) + config.data = formDataObj + delete config.headers['Content-Type'] + } + const requestObj = { + url: config.url, + data: + typeof config.data === 'object' + ? JSON.stringify(config.data) + : config.data, + time: new Date().getTime(), + } + const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 + const limitSize = 5 * 1024 * 1024 // 限制存放数据5M + if (requestSize >= limitSize) { + console.warn( + `[${config.url}]: ` + + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。', + ) + return config + } + const sessionObj = cache.session.getJSON('sessionObj') + if ( + sessionObj === undefined || + sessionObj === null || + sessionObj === '' + ) { + cache.session.setJSON('sessionObj', requestObj) + } else { + const s_url = sessionObj.url // 请求地址 + const s_data = sessionObj.data // 请求数据 + const s_time = sessionObj.time // 请求时间 + const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交 + if ( + s_data === requestObj.data && + requestObj.time - s_time < interval && + s_url === requestObj.url + ) { + const message = '数据正在处理，请勿重复提交' + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } + } + } + return config + }, + (error) => { + console.log(error) + Promise.reject(error) + }, +) + +// 响应拦截器 +service.interceptors.response.use( + (res) => { + // 未设置状态码则默认成功状态 + const code = res.data.code || 200 + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if ( + res.request.responseType === 'blob' || + res.request.responseType === 'arraybuffer' + ) { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true + MessageBox.confirm( + '登录状态已过期，您可以继续留在该页面，或者重新登录', + '系统提示', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning', + }, + ) + .then(() => { + isRelogin.show = false + store.dispatch('LogOut').then(() => { + location.href = '/index' + }) + }) + .catch(() => { + isRelogin.show = false + }) + } + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } + }, + (error) => { + console.log('err' + error) + let { message } = error + if (message == 'Network Error') { + message = '后端接口连接异常' + } else if (message.includes('timeout')) { + message = '系统接口请求超时' + } else if (message.includes('Request failed with status code')) { + message = '系统接口' + message.substr(message.length - 3) + '异常' + } + Message({ message: message, type: 'error', duration: 5 * 1000 }) + return Promise.reject(error) + }, +) + +// 通用下载方法 +export function download(url, params, filename, config) { + downloadLoadingInstance = Loading.service({ + text: '正在下载数据，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)', + }) + return service + .post(url, params, { + transformRequest: [ + (params) => { + return tansParams(params) + }, + ], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + ...config, + }) + .then(async (data) => { + const isBlob = blobValidate(data) + if (isBlob) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text() + const rspObj = JSON.parse(resText) + const errMsg = + errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg) + } + downloadLoadingInstance.close() + }) + .catch((r) => { + console.error(r) + Message.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close() + }) +} + +export default service diff --git a/src/views/dataManage/product-center/components/addAndEditForm.vue b/src/views/dataManage/product-center/components/addAndEditForm.vue index 390f86e..9952981 100644 --- a/src/views/dataManage/product-center/components/addAndEditForm.vue +++ b/src/views/dataManage/product-center/components/addAndEditForm.vue @@ -11,19 +11,45 @@ - + - - + + + + - - + + @@ -33,6 +59,7 @@ :file-size="10" :file-type="['jpg', 'png', 'jpeg']" :file-list.sync="addAndEditForm.cover" + @onSelectDeleteFileId="handleSelectDeleteFileId" :is-uploaded="addAndEditForm.cover.length >= 1" /> @@ -40,12 +67,10 @@ - - - 是 - 否 + + + 是 + 否 @@ -53,12 +78,15 @@ - + @@ -99,56 +127,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -163,45 +208,62 @@