diff --git a/.env.dev b/.env.dev index ab28217..a9aeede 100644 --- a/.env.dev +++ b/.env.dev @@ -4,8 +4,8 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' -#VITE_BASE_URL='http://118.253.178.8:48080' +#VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://118.253.178.8:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/.env.local b/.env.local index f4adcda..56d0103 100644 --- a/.env.local +++ b/.env.local @@ -4,8 +4,8 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -#VITE_BASE_URL='http://118.253.178.8:48080' -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://118.253.178.8:48080' +#VITE_BASE_URL='http://localhost:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index cd6e5db..e5982ed 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -14,6 +14,7 @@ export interface TenantVO { accountCount: number websites: string[] createTime: Date + tenantPrompt?: string } export interface TenantPageReqVO extends PageParam { diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts index 3a402de..8ff2e80 100644 --- a/src/plugins/echarts/index.ts +++ b/src/plugins/echarts/index.ts @@ -4,6 +4,7 @@ import { BarChart, FunnelChart, GaugeChart, + HeatmapChart, LineChart, MapChart, PictorialBarChart, @@ -13,6 +14,7 @@ import { import { AriaComponent, + CalendarComponent, DataZoomComponent, GridComponent, LegendComponent, @@ -37,6 +39,7 @@ echarts.use([ AriaComponent, ParallelComponent, VisualMapComponent, + CalendarComponent, BarChart, LineChart, PieChart, @@ -45,7 +48,8 @@ echarts.use([ PictorialBarChart, RadarChart, GaugeChart, - FunnelChart + FunnelChart, + HeatmapChart ]) export default echarts diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 63596a3..97d28c8 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -792,7 +792,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ name: 'SupplierPerformance', meta: { title: '供应商详情', - noCache: true, hidden: true, canTo: true }, diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue index e37ab71..ab6e9a2 100644 --- a/src/views/system/tenant/TenantForm.vue +++ b/src/views/system/tenant/TenantForm.vue @@ -61,6 +61,9 @@ class="w-full" /> + + + { expireTime: undefined, websites: [], status: CommonStatusEnum.ENABLE, + tenantPrompt: '', username: undefined, password: undefined } diff --git a/src/views/ydoyun/report/lijun/reportpage6/components/SupplierPerformancePage.vue b/src/views/ydoyun/report/lijun/reportpage6/components/SupplierPerformancePage.vue index b3075be..72b4a9b 100644 --- a/src/views/ydoyun/report/lijun/reportpage6/components/SupplierPerformancePage.vue +++ b/src/views/ydoyun/report/lijun/reportpage6/components/SupplierPerformancePage.vue @@ -1,5 +1,5 @@ @@ -1208,44 +1198,9 @@ onMounted(async () => { } } -.table-core { - display: flex; - flex-direction: column; - gap: 4px; - - .core-name { - font-size: 12px; - color: var(--el-text-color-secondary); - } - - .core-value { - font-weight: 700; - color: var(--el-text-color-primary); - } -} - -.metric-cell { - display: flex; - flex-direction: column; - gap: 10px; - padding: 2px 0; -} - -.metric-cell-row { - display: grid; - grid-template-columns: 160px 1fr 120px; - gap: 12px; - align-items: start; -} - -.metric-cell-name { +.table-metric-actual, +.table-metric-ref { font-size: 12px; - color: var(--el-text-color-regular); -} - -.metric-cell-actual { - font-size: 12px; - color: var(--el-text-color-primary); line-height: 1.4; display: flex; flex-wrap: wrap; @@ -1272,21 +1227,18 @@ onMounted(async () => { font-weight: 700; display: inline-block; - &.badge-danger, &.label-trend-up { background: #fee2e2; color: #ef4444; border: 1px solid #fecaca; } - &.badge-warn, &.label-trend-flat { background: #fef3c7; color: #d97706; border: 1px solid #fde68a; } - &.badge-success, &.label-trend-down { background: #dcfce7; color: #22c55e; @@ -1295,12 +1247,22 @@ onMounted(async () => { } } -.metric-cell-ref { - font-size: 12px; +.table-metric-actual { + &.label-trend-up { + color: #ef4444; + } + + &.label-trend-down { + color: #22c55e; + } + + &.label-trend-flat { + color: #d97706; + } +} + +.table-metric-ref { color: var(--el-text-color-secondary); - text-align: right; - line-height: 1.4; - white-space: pre-line; } .empty { diff --git a/src/views/ydoyun/report/lijun/reportpage6/index.vue b/src/views/ydoyun/report/lijun/reportpage6/index.vue index d3d49c9..8d8c6ac 100644 --- a/src/views/ydoyun/report/lijun/reportpage6/index.vue +++ b/src/views/ydoyun/report/lijun/reportpage6/index.vue @@ -553,7 +553,7 @@ row-class-name="product-list-row-clickable" @row-click="handleProductRowClick" > - + - - + + - + + + + + + + + + + + + + + + +