diff --git a/package.json b/package.json index dc4f66b..7cca83b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "cropperjs": "1.5.13", "crypto-js": "4.1.1", "echarts": "5.4.1", - "element-plus": "2.2.32", + "element-plus": "^2.8.2", "nprogress": "0.2.0", "qrcodejs2": "0.0.2", "sortablejs": "1.15.0", diff --git a/src/locales/index.js b/src/locales/index.js index fbcad54..57f5db2 100644 --- a/src/locales/index.js +++ b/src/locales/index.js @@ -1,8 +1,8 @@ import sysConfig from "@/config" import tool from '@/utils/tool' import { createI18n } from 'vue-i18n' -import el_zh_cn from 'element-plus/lib/locale/lang/zh-cn' -import el_en from 'element-plus/lib/locale/lang/en' +import el_zh_cn from 'element-plus/dist/locale/zh-cn.mjs' +import el_en from 'element-plus/dist/locale/en.mjs' import zh_cn from './lang/zh-cn.js' import en from './lang/en.js' diff --git a/src/style/fix.scss b/src/style/fix.scss index b984edc..caf105c 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -57,6 +57,12 @@ .el-pagination{ --el-pagination-button-width-small:28px; --el-pagination-button-height-small:28px; + .el-select--small{ + height: 28px; + .el-select__wrapper{ + height: 100%; + } + } } .el-tabs.role_tabs{ --el-tabs-header-height:42px; @@ -108,7 +114,8 @@ .el-main.nopadding .searchMainNoTop{margin-top: 0;} .el-main.nopadding .searchMain .searchItem{display: flex;flex-direction: column;align-items: flex-start;margin-right: 20px;margin-bottom: 10px;} .el-main.nopadding .searchMain .searchItem .name{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #303133;padding-bottom: 5px;text-align: right;} -.el-main.nopadding .searchMain .searchItem .input{width: 230px;} +.el-main.nopadding .searchMain .searchItem .input{width: 230px;height: 28px;} +.el-main.nopadding .searchMain .searchItem .el-select--small .el-select__wrapper{height: 100%;} .el-main.nopadding .searchMain .searchItem.searchBtn{display: flex;flex-direction: row;} .el-drawer__body {overflow: auto;padding:0;} @@ -161,8 +168,10 @@ .el-tag {transition: all 0s !important;} /** 弹款的头部配置 */ -.el-dialog .el-dialog__header{margin-right: 0;padding-bottom: 20px;box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.06);} -.el-dialog .el-dialog__footer{padding-top: 20px;box-shadow: 0 -1px 1px 0 rgba(0, 0, 0, 0.06);} +.el-dialog{padding: 0;} +.el-dialog .el-dialog__header{margin-right: 0;padding: 20px;box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.06);} +.el-dialog .el-dialog__body{padding: 30px 20px;} +.el-dialog .el-dialog__footer{padding: 20px;box-shadow: 0 -1px 1px 0 rgba(0, 0, 0, 0.06);} /* 覆盖tinymce样式 */ .sceditor .tox-tinymce {border: 1px solid #DCDFE6;border-radius: 0;} diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue index 478c4ff..02ab34b 100644 --- a/src/views/cost/shipmentStatistics/index.vue +++ b/src/views/cost/shipmentStatistics/index.vue @@ -12,7 +12,10 @@
- + +
@@ -23,7 +26,7 @@
-
+
@@ -47,6 +50,7 @@ export default { data() { return { size:'small', + loading:false, dialog: { save: false, show: false, @@ -131,7 +135,9 @@ export default { }, async getData() { + this.loading = true; const res = await this.$API.finance.cost.summary.post(this.reqParams); + this.loading = false; if(res.code == 200){ res.data.tableList.data = this.setTableList(res.data.tableList.data); this.feesData = res.data; @@ -143,11 +149,16 @@ export default { }, formatter: function (params) { const filteredParams = params.filter(param => param.value !== 0); + let totalData = 0; + filteredParams.map(em=> { + totalData += em.value + }) const formattedParams = filteredParams.map(param => { + const percentage = (param.value/totalData*100).toFixed(2); const seriesColor = param.color; - return ` ${param.seriesName} ${param.value}`; + return `${param.seriesName}
¥ ${param.value}${percentage}%
`; }).join(''); - return params[0].name + '
' + formattedParams; + return params[0].name + '
总金额：¥ '+ totalData.toFixed(2) + '
' + formattedParams; } }, toolbox:{ @@ -171,7 +182,14 @@ export default { }, yAxis: [{ type: 'value', + show:true, + axisLabel:{ + margin:this.feesData.dateRange.length<13? 56:20 + }, name: '', + axisTick:{ + show:false + }, splitLine: { show: false } diff --git a/yarn.lock b/yarn.lock index c92aaaf..2234034 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1012,7 +1012,12 @@ "resolved" "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz" "version" "0.5.7" -"@element-plus/icons-vue@^2.0.6", "@element-plus/icons-vue@2.0.10": +"@element-plus/icons-vue@^2.3.1": + "integrity" "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==" + "resolved" "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz" + "version" "2.3.1" + +"@element-plus/icons-vue@2.0.10": "integrity" "sha512-ygEZ1mwPjcPo/OulhzLE7mtDrQBWI8vZzEWSNB2W/RNCRjoQGwbaK4N8lV4rid7Ts4qvySU3njMN7YCiSlSaTQ==" "resolved" "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.10.tgz" "version" "2.0.10" @@ -3150,13 +3155,13 @@ "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz" "version" "1.4.528" -"element-plus@2.2.32": - "integrity" "sha512-DTJMhYOy6MApbmh6z/95hPTK5WrBiNHGzV4IN+uEkup1WoimQ+Qyt8RxKdTe/X1LWEJ8YgWv/Cl8P4ocrt5z5g==" - "resolved" "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.32.tgz" - "version" "2.2.32" +"element-plus@^2.8.2": + "integrity" "sha512-pqoQlaUmzUFCjjTHyxGO7Cd0CizsQpIaad1ozV9PCaYjh2T4MIMnjfifqiYs2lWoZ/8GVwrRG1WTCfnZEjwfcg==" + "resolved" "https://registry.npmmirror.com/element-plus/-/element-plus-2.8.2.tgz" + "version" "2.8.2" dependencies: "@ctrl/tinycolor" "^3.4.1" - "@element-plus/icons-vue" "^2.0.6" + "@element-plus/icons-vue" "^2.3.1" "@floating-ui/dom" "^1.0.1" "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7" "@types/lodash" "^4.14.182"