diff --git a/mock/tools.ts b/mock/tools.ts index f23311b..6e2e59b 100644 --- a/mock/tools.ts +++ b/mock/tools.ts @@ -229,7 +229,7 @@ function getTools() { { id: 1, title: '柱状图', - logo: '/src/assets/logo/bar.png', + logo: '/images/logo/bar.png', desc: '在线制作柱状图,像做表格一样制作可视化图表,支持导出静态或动态图表', url: '/bar', cateId: 8, @@ -473,7 +473,7 @@ function getToolsCate() { { id: 1, title: '柱状图', - logo: '/src/assets/logo/bar.png', + logo: '/images/logo/bar.png', desc: '在线制作柱状图,像做表格一样制作可视化图表,支持导出静态或动态图表', url: '/bar', cateId: 8, diff --git a/public/images/logo/bar.png b/public/images/logo/bar.png new file mode 100644 index 0000000..71e85ce Binary files /dev/null and b/public/images/logo/bar.png differ diff --git a/src/components/Chart/Bar/Bar.vue b/src/components/Chart/Bar/Bar.vue index 479399d..2564e7f 100644 --- a/src/components/Chart/Bar/Bar.vue +++ b/src/components/Chart/Bar/Bar.vue @@ -272,10 +272,12 @@ const updateDataFile = async (params) => { if(sheetArray.length == 0){ continue; } + for(let item in sheetArray){ if (sheetArray[item] != undefined) { - tmpColumnData.push(sheetArray[item][0]) - tmpValueData.push(sheetArray[item][1]) + let tmp1 = sheetArray as [] + tmpColumnData.push(tmp1[item][0]) + tmpValueData.push(tmp1[item][1]) } } useCount++ diff --git a/src/components/Layout/DetailHeader/DetailHeader.vue b/src/components/Layout/DetailHeader/DetailHeader.vue index 13b2b4c..8f20c84 100644 --- a/src/components/Layout/DetailHeader/DetailHeader.vue +++ b/src/components/Layout/DetailHeader/DetailHeader.vue @@ -5,6 +5,7 @@ import { useRoute } from 'vue-router' import { useToolsStore } from '@/store/modules/tools' import { useUserStore } from '@/store/modules/user' import { ElMessage } from 'element-plus' +import {rtrim} from '@/utils/string' const props = defineProps({ title: String, id: Number @@ -22,7 +23,8 @@ const userStore = useUserStore() //根据路由查询tool id const getToolInfo = async () => { - searchParam.route = route.path + let routeStr = route.path + searchParam.route = rtrim(routeStr, '/') await toolsStore.getToolInfo(searchParam) } diff --git a/src/utils/string.ts b/src/utils/string.ts index a9f17cc..312f886 100644 --- a/src/utils/string.ts +++ b/src/utils/string.ts @@ -113,11 +113,17 @@ export function numberToChinese(num: number): string { return chinese; } +//rtrim: 删除右侧指定字符, 默认删除空格 +export function rtrim(str, char = ' ') { + return str.replace(new RegExp('\\'+char+'+$', 'g'), ''); +} + const StringUtils = { transferred, copy, genRandomStrByChars, - numberToChinese + numberToChinese, + rtrim, } export default StringUtils \ No newline at end of file