diff --git a/src/components/card/Card.vue b/src/components/card/Card.vue deleted file mode 100644 index 27ddec9..0000000 --- a/src/components/card/Card.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - {{ product.isSetup ? '已启用' : '已停用' }} - - - {{ product.name }} - {{ product.description }} - - - {{ typeMap[product.type - 1] }} - - - - - - - - - - - - - - - - diff --git a/src/components/card/index.vue b/src/components/card/index.vue deleted file mode 100644 index bb0d579..0000000 --- a/src/components/card/index.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - - {{ title }} - {{ describe }} - {{ subtitle }} - - - - - - - - - - - - - diff --git a/src/components/product-card/index.vue b/src/components/product-card/index.vue new file mode 100644 index 0000000..39cd303 --- /dev/null +++ b/src/components/product-card/index.vue @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + {{ + product.isSetup ? '已启用' : '已停用' + }} + + + {{ product.name }} + {{ product.description }} + + + + {{ typeMap[product.type - 1] }} + + + + + + + + + + + + + + + + + + diff --git a/src/layouts/components/Header.vue b/src/layouts/components/Header.vue index 7584b55..14878ac 100644 --- a/src/layouts/components/Header.vue +++ b/src/layouts/components/Header.vue @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ import { useRouter } from 'vue-router'; import { useSettingStore } from '@/store'; import { getActive } from '@/router'; import { prefix } from '@/config/global'; -import tLogoFull from '@/assets/assets-logo-full.svg?component'; +import LogoFull from '@/assets/assets-logo-full.svg?component'; import { MenuRoute } from '@/interface'; import Notice from './Notice.vue'; @@ -161,24 +161,6 @@ const navToHelper = () => { height: 64px; } - &-menu-fixed { - position: fixed; - top: 0; - z-index: 10; - - &-side { - left: 232px; - right: 0; - z-index: 10; - width: auto; - transition: all 0.3s; - - &-compact { - left: 64px; - } - } - } - &-logo-container { cursor: pointer; display: inline-flex; diff --git a/src/pages/dashboard/base/components/middle-chart.vue b/src/pages/dashboard/base/components/middle-chart.vue new file mode 100644 index 0000000..b3e4a72 --- /dev/null +++ b/src/pages/dashboard/base/components/middle-chart.vue @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/dashboard/base/components/overview.vue b/src/pages/dashboard/base/components/overview.vue new file mode 100644 index 0000000..6cbf67e --- /dev/null +++ b/src/pages/dashboard/base/components/overview.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + 导出数据 + + + + + + 1726 + + + + + + + + 226 + + + + + + + + + + + + + + + + diff --git a/src/pages/dashboard/base/components/rank-list.vue b/src/pages/dashboard/base/components/rank-list.vue new file mode 100644 index 0000000..0c1588c --- /dev/null +++ b/src/pages/dashboard/base/components/rank-list.vue @@ -0,0 +1,100 @@ + + + + + + + 本周 + 近三个月 + + + + + + {{ rowIndex + 1 }} + + + + + + + + + 详情 + + + + + + + + + 本周 + 近三个月 + + + + + + {{ rowIndex + 1 }} + + + + + + + 详情 + + + + + + + + + + diff --git a/src/pages/dashboard/base/components/top-panel.vue b/src/pages/dashboard/base/components/top-panel.vue new file mode 100644 index 0000000..d11eb40 --- /dev/null +++ b/src/pages/dashboard/base/components/top-panel.vue @@ -0,0 +1,260 @@ + + + + + + {{ item.number }} + + + + + + + + + + + + + + + 自从上周以来 + + + + + + + + + + + + + + + diff --git a/src/pages/dashboard/base/constants.ts b/src/pages/dashboard/base/constants.ts index 153e170..9075524 100644 --- a/src/pages/dashboard/base/constants.ts +++ b/src/pages/dashboard/base/constants.ts @@ -133,7 +133,7 @@ export const SALE_COLUMNS: TdBaseTableProps['columns'] = [ ellipsis: true, colKey: 'productName', title: '客户名称', - minWidth: 200, + width: 150, }, { align: 'center', @@ -174,8 +174,8 @@ export const BUY_COLUMNS: TdBaseTableProps['columns'] = [ align: 'left', ellipsis: true, colKey: 'productName', + width: 150, title: '供应商名称', - minWidth: 200, }, { align: 'center', diff --git a/src/pages/dashboard/base/index.less b/src/pages/dashboard/base/index.less deleted file mode 100644 index bcee2f5..0000000 --- a/src/pages/dashboard/base/index.less +++ /dev/null @@ -1,95 +0,0 @@ -@import '@/style/variables.less'; - -.dashboard-item { - display: flex; - flex-direction: column; - justify-content: space-between; - flex: 1; - - .dashboard-item-top { - display: flex; - flex-direction: row; - align-items: flex-start; - - > span { - display: inline-block; - color: @text-color-primary; - font-size: 36px; - line-height: 44px; - } - } - - &:hover { - cursor: pointer; - } -} - -.dashboard-item-bottom { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - - > .t-icon { - cursor: pointer; - } -} - -.dashboard-item-block { - display: flex; - align-items: center; - justify-content: center; - line-height: 22px; - color: @text-color-placeholder; -} - -.dashboard-item-trend { - margin-left: 8px; -} - -.dashboard-item-left { - position: absolute; - top: 32px; - right: 32px; - - > span { - display: inline-flex; - align-items: center; - justify-content: center; - width: 56px; - height: 56px; - background: @brand-color-1; - border-radius: 50%; - - .t-icon { - font-size: 24px; - color: @brand-color; - } - } -} - -.dashboard-rank { - display: inline-flex; - width: 24px; - height: 24px; - border-radius: 50%; - color: white; - font-size: 14px; - background-color: @gray-color-5; - align-items: center; - justify-content: center; - font-weight: 700; - - &__top { - background: @brand-color; - } -} - -.overview-panel { - background-color: @bg-color-container; - border-radius: 3px; -} - -.row-container { - margin-top: 16px; -} diff --git a/src/pages/dashboard/base/index.vue b/src/pages/dashboard/base/index.vue index 59a8848..3d6222e 100644 --- a/src/pages/dashboard/base/index.vue +++ b/src/pages/dashboard/base/index.vue @@ -1,205 +1,13 @@ - - - - - - {{ item.number }} - - - - - - - - - - - - - - - - - - - 自从上周以来 - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + - - - - - - 本周 - 近三个月 - - - - - - {{ rowIndex + 1 }} - - - - - - - - - 详情 - - - - - - - - - 本周 - 近三个月 - - - - - - {{ rowIndex + 1 }} - - - - - - - 详情 - - - - - - + - - - - - - - - - - - - - - 导出数据 - - - - - - - 1726 - - - - 自从上周以来 - - - - - - - - - - - - 226 - - - - 自从上周以来 - - - - - - - - - - - + @@ -210,214 +18,14 @@ export default { - - - diff --git a/src/pages/dashboard/detail/index.less b/src/pages/dashboard/detail/index.less deleted file mode 100644 index 54c9f77..0000000 --- a/src/pages/dashboard/detail/index.less +++ /dev/null @@ -1,73 +0,0 @@ -@import '@/style/variables.less'; - -.card-container-margin { - margin-top: 16px; -} - -.card-date-button { - margin-left: 8px; -} - -.dark { - .dashboard-detail-container-item { - &:hover { - background: @gray-color-14; - cursor: pointer; - } - } -} - -.light { - .dashboard-detail-container-item { - &:hover { - background: @gray-color-1; - cursor: pointer; - } - } -} - -.dashboard-detail-container-item { - display: flex; - flex-direction: column; - justify-content: space-between; - flex: 1; - height: 170px; - - .title { - color: @text-color-secondary; - } - - .number { - font-size: 36px; - line-height: 44px; - color: @text-color-primary; - } - - .dashboard-detail-container-item-text { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - font-size: 14px; - color: @text-color-placeholder; - text-align: left; - line-height: 18px; - - &-left { - display: flex; - - .icon { - margin: 0 8px; - } - } - } -} - -.dashboard-chart-title-left { - display: flex; - width: 100%; - color: @text-color-placeholder; - justify-content: left; - font-size: 15px; - padding-left: 8px; -} diff --git a/src/pages/dashboard/detail/index.vue b/src/pages/dashboard/detail/index.vue index 7d7e1db..1822a56 100644 --- a/src/pages/dashboard/detail/index.vue +++ b/src/pages/dashboard/detail/index.vue @@ -1,60 +1,62 @@ - + - - {{ item.number }} - - + + {{ item.number }} + + 环比 - + - - + + - - + + - - + + - - + + 导出数据 - + @@ -71,7 +73,7 @@ import * as echarts from 'echarts/core'; import { GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'; import { LineChart, ScatterChart } from 'echarts/charts'; import { CanvasRenderer } from 'echarts/renderers'; -import ProductCard from '@/components/card/Card.vue'; +import ProductCard from '@/components/product-card/index.vue'; import { getFolderLineDataSet, getScatterDataSet } from './index'; import { PANE_LIST_DATA, PRODUCT_LIST } from './constants'; @@ -80,7 +82,6 @@ import { useSettingStore } from '@/store'; import { changeChartsTheme } from '@/utils/color'; import Trend from '@/components/trend/index.vue'; -import Card from '@/components/card/index.vue'; echarts.use([GridComponent, LegendComponent, TooltipComponent, LineChart, ScatterChart, CanvasRenderer]); @@ -159,5 +160,82 @@ const onMaterialChange = (value: string[]) => { diff --git a/src/pages/detail/advanced/index.less b/src/pages/detail/advanced/index.less index 6416b86..fb17f41 100644 --- a/src/pages/detail/advanced/index.less +++ b/src/pages/detail/advanced/index.less @@ -1,5 +1,23 @@ @import '../base/index.less'; +.detail-advanced { + :deep(.t-card) { + padding: 8px; + } + :deep(.t-card__title) { + font-size: 20px; + font-weight: 500; + } + + .advanced-card { + margin-top: 0 !important; + + .card-title-default { + margin-bottom: 12px; + } + } +} + .product-block-container { .t-col-xl-4 + .t-col-xl-4 { @media (max-width: @screen-lg-max) { diff --git a/src/pages/detail/advanced/index.vue b/src/pages/detail/advanced/index.vue index ec69747..6b41596 100644 --- a/src/pages/detail/advanced/index.vue +++ b/src/pages/detail/advanced/index.vue @@ -1,6 +1,6 @@ - - + + {{ item.name }} @@ -15,10 +15,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + 季度 @@ -50,10 +50,10 @@ - + - + - + @@ -123,7 +123,6 @@ import { BASE_INFO_DATA, TABLE_COLUMNS_DATA as columns, PRODUCT_LIST } from './c import request from '@/utils/request'; import { ResDataType } from '@/interface'; -import Card from '@/components/card/index.vue'; import Product from './components/Product.vue'; const data = ref([]); diff --git a/src/pages/detail/base/index.less b/src/pages/detail/base/index.less index abfdaed..22002ad 100644 --- a/src/pages/detail/base/index.less +++ b/src/pages/detail/base/index.less @@ -1,7 +1,18 @@ @import '@/style/variables.less'; -.detail-base-info-steps { - padding-top: 12px; +.detail-base { + :deep(.t-card) { + padding: 8px; + } + + :deep(.t-card__title) { + font-size: 20px; + font-weight: 500; + } + + &-info-steps { + padding-top: 12px; + } } .info-block { @@ -59,7 +70,6 @@ } .dialog-info-block { - .info-item { padding: 12px 0; display: flex; diff --git a/src/pages/detail/base/index.vue b/src/pages/detail/base/index.vue index 7a1d8ee..a49c3bb 100644 --- a/src/pages/detail/base/index.vue +++ b/src/pages/detail/base/index.vue @@ -1,6 +1,6 @@ - - + + {{ item.name }} @@ -15,15 +15,15 @@ - + - + - + @@ -34,8 +34,6 @@ export default { diff --git a/src/pages/form/step/index.less b/src/pages/form/step/index.less index 2487001..5875b98 100644 --- a/src/pages/form/step/index.less +++ b/src/pages/form/step/index.less @@ -2,6 +2,10 @@ .form-step-container { background-color: @bg-color-container; + + .t-card { + padding: 8px; + } } .rule-tips { @@ -15,3 +19,19 @@ .step-form { padding: 24px; } + +.step-form-4 { + padding: 66px 0 90px 0; + text-align: center; + > .t-icon { + margin-bottom: 16px; + } + > .text { + font-size: 20px; + font-weight: 500; + margin-bottom: 8px; + } + > .button-group { + margin-top: 32px; + } +} diff --git a/src/pages/form/step/index.vue b/src/pages/form/step/index.vue index 2ac7608..44e4a02 100644 --- a/src/pages/form/step/index.vue +++ b/src/pages/form/step/index.vue @@ -2,14 +2,14 @@ - + - + @@ -150,7 +150,6 @@ export default { import { ref, computed } from 'vue'; import { useRouter } from 'vue-router'; import { ValidateResultContext } from 'tdesign-vue-next'; -import Card from '@/components/card/index.vue'; import { FORM_RULES, diff --git a/src/pages/list/base/index.vue b/src/pages/list/base/index.vue index 4c8e6b8..4047ffa 100644 --- a/src/pages/list/base/index.vue +++ b/src/pages/list/base/index.vue @@ -1,6 +1,6 @@ - + 新建合同 @@ -15,7 +15,7 @@ - + 删除 - + { deleteIdx.value = row.rowIndex; confirmVisible.value = true; }; + +const getContainer = () => { + return document.querySelector('.tdesign-starter-layout'); +};
{{ product.name }}
{{ product.description }}