diff --git a/dist.tar b/dist.tar new file mode 100644 index 0000000..f865528 Binary files /dev/null and b/dist.tar differ diff --git a/package.json b/package.json index d9e12de..997be84 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,13 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@antv/g2": "^5.2.3", + "echarts-stat": "^1.2.0", "@element-plus/icons-vue": "2.0.10", "@vueup/vue-quill": "1.1.0", "@vueuse/core": "9.5.0", "axios": "0.27.2", "echarts": "5.4.0", - "echarts-stat": "^1.2.0", "element-plus": "2.2.27", "file-saver": "2.0.5", "fuse.js": "6.6.2", diff --git a/src/assets/images/taskImport.png b/src/assets/images/taskImport.png new file mode 100644 index 0000000..96f14f5 Binary files /dev/null and b/src/assets/images/taskImport.png differ diff --git a/src/assets/images/弹框@2x.png b/src/assets/images/弹框@2x.png new file mode 100644 index 0000000..102f6a6 Binary files /dev/null and b/src/assets/images/弹框@2x.png differ diff --git a/src/utils/index.js b/src/utils/index.js index 2abba81..a6e766d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,15 +1,49 @@ import { parseTime } from "./ruoyi"; +/** + * 通用分页函数 + * @param {Array} data - 需要分页的数据源 + * @param {Number} page - 当前页码 + * @param {Number} pageSize - 每页显示的条目数 + * @returns {Object} 分页结果，包含当前页的数据，页码信息，及总页数 + */ +export function paginate(data, page = 1, pageSize = 10) { + // 计算总页数 + const totalItems = data.length; + const totalPages = Math.ceil(totalItems / pageSize); + // 确保页码在有效范围内 + const currentPage = Math.min(Math.max(page, 1), totalPages); + // 计算当前页的数据起始索引和结束索引 + const startIndex = (currentPage - 1) * pageSize; + const endIndex = Math.min(startIndex + pageSize, totalItems); + + // 获取当前页的数据片段 + const pageData = data.slice(startIndex, endIndex); + return { + currentPage, + pageSize, + totalItems, + totalPages, + data: pageData, + }; +} export function getAssetsFile(url) { return new URL(`../assets/images/${url}`, import.meta.url).href; } /** * 表格时间格式化 */ +function isTimestamp(value) { + // 判断是否为数字类型且是否为整数 + if (typeof value === "number" && Number.isInteger(value)) { + // 判断时间戳是否为13位 + return value.toString().length === 13; + } + return false; +} export function formatDate(cellValue) { // 判断是不是时间戳不是就返回 let time; - if (typeof cellValue === new Date()) { - + if (isTimestamp(cellValue)) { var date = new Date(cellValue); var year = date.getFullYear(); var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1; diff --git a/src/utils/request.js b/src/utils/request.js index 41fd6da..303c811 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 // baseURL: import.meta.env.VITE_APP_BASE_API, - // baseURL:'http://118.31.7.2:9868/', - baseURL:'http://192.168.2.28:9868/', + baseURL:'http://118.31.7.2:9868/', + // baseURL:'http://192.168.2.28:9868/', // 超时 timeout: 100000 }) diff --git a/src/views/components/mainContent.vue b/src/views/components/mainContent.vue index a5e9506..864f9c7 100644 --- a/src/views/components/mainContent.vue +++ b/src/views/components/mainContent.vue @@ -1,6 +1,6 @@ diff --git a/src/views/portraitModel/components/viscosityAnalysis.vue b/src/views/portraitModel/components/viscosityAnalysis.vue index 6d0163a..0e411fa 100644 --- a/src/views/portraitModel/components/viscosityAnalysis.vue +++ b/src/views/portraitModel/components/viscosityAnalysis.vue @@ -1,10 +1,10 @@