hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-03-06 19:29:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

Browse Source
This commit is contained in:
YunaiV 2024-05-07 22:20:32 +08:00
commit 8454d1d3e5
2 changed files with 14 additions and 14 deletions
src/views
mall/statistics/product/components
ProductSummary.vue
system/menu
MenuForm.vue

24
src/views/mall/statistics/product/components/ProductSummary.vue

@ -26,9 +26,9 @@
icon="ep:view" icon="ep:view"
icon-color="bg-blue-100" icon-color="bg-blue-100"
icon-bg-color="text-blue-500" icon-bg-color="text-blue-500"
prefix="￥" prefix=""
:decimals="2" :decimals="0"
:value="fenToYuan(trendSummary?.value?.browseCount || 0)" :value="trendSummary?.value?.browseCount || 0"
:percent=" :percent="
calculateRelativeRate( calculateRelativeRate(
trendSummary?.value?.browseCount, trendSummary?.value?.browseCount,
@ -44,9 +44,9 @@
icon="ep:user-filled" icon="ep:user-filled"
icon-color="bg-purple-100" icon-color="bg-purple-100"
icon-bg-color="text-purple-500" icon-bg-color="text-purple-500"
prefix="￥" prefix=""
:decimals="2" :decimals="0"
:value="fenToYuan(trendSummary?.value?.browseUserCount || 0)" :value="trendSummary?.value?.browseUserCount || 0"
:percent=" :percent="
calculateRelativeRate( calculateRelativeRate(
trendSummary?.value?.browseUserCount, trendSummary?.value?.browseUserCount,
@ -62,9 +62,9 @@
icon="fa-solid:money-check-alt" icon="fa-solid:money-check-alt"
icon-color="bg-yellow-100" icon-color="bg-yellow-100"
icon-bg-color="text-yellow-500" icon-bg-color="text-yellow-500"
prefix="￥" prefix=""
:decimals="2" :decimals="0"
:value="fenToYuan(trendSummary?.value?.orderPayCount || 0)" :value="trendSummary?.value?.orderPayCount || 0"
:percent=" :percent="
calculateRelativeRate( calculateRelativeRate(
trendSummary?.value?.orderPayCount, trendSummary?.value?.orderPayCount,
@ -98,9 +98,9 @@
icon="fa-solid:wallet" icon="fa-solid:wallet"
icon-color="bg-cyan-100" icon-color="bg-cyan-100"
icon-bg-color="text-cyan-500" icon-bg-color="text-cyan-500"
prefix="￥" prefix=""
:decimals="2" :decimals="0"
:value="fenToYuan(trendSummary?.value?.afterSaleCount || 0)" :value="trendSummary?.value?.afterSaleCount || 0"
:percent=" :percent="
calculateRelativeRate( calculateRelativeRate(
trendSummary?.value?.afterSaleCount, trendSummary?.value?.afterSaleCount,

4
src/views/system/menu/MenuForm.vue

@ -130,7 +130,7 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({ const formData = ref({
id: 0, id: undefined,
name: '', name: '',
permission: '', permission: '',
type: SystemMenuTypeEnum.DIR, type: SystemMenuTypeEnum.DIR,
@ -231,7 +231,7 @@ const getTree = async () => {
/** 重置表单 */ /** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: 0, id: undefined,
name: '', name: '',
permission: '', permission: '',
type: SystemMenuTypeEnum.DIR, type: SystemMenuTypeEnum.DIR,