diff --git a/src/assets/imgs/icon1.png b/src/assets/imgs/icon1.png new file mode 100644 index 000000000..8fb718a35 Binary files /dev/null and b/src/assets/imgs/icon1.png differ diff --git a/src/assets/imgs/icon2.png b/src/assets/imgs/icon2.png new file mode 100644 index 000000000..9f8ed6192 Binary files /dev/null and b/src/assets/imgs/icon2.png differ diff --git a/src/assets/imgs/icon3.png b/src/assets/imgs/icon3.png new file mode 100644 index 000000000..2c3e20197 Binary files /dev/null and b/src/assets/imgs/icon3.png differ diff --git a/src/assets/imgs/icon4.png b/src/assets/imgs/icon4.png new file mode 100644 index 000000000..64062f68a Binary files /dev/null and b/src/assets/imgs/icon4.png differ diff --git a/src/assets/imgs/icon5.png b/src/assets/imgs/icon5.png new file mode 100644 index 000000000..935e2967d Binary files /dev/null and b/src/assets/imgs/icon5.png differ diff --git a/src/assets/imgs/icon6.png b/src/assets/imgs/icon6.png new file mode 100644 index 000000000..976d00b74 Binary files /dev/null and b/src/assets/imgs/icon6.png differ diff --git a/src/views/Home/Index copy.vue b/src/views/Home/Index copy.vue new file mode 100644 index 000000000..121ec6a8b --- /dev/null +++ b/src/views/Home/Index copy.vue @@ -0,0 +1,381 @@ + + + + + + + + + + + {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }} + + + {{ t('workplace.toady') }},20℃ - 32℃! + + + + + + + + {{ t('workplace.project') }} + + + + + {{ t('workplace.toDo') }} + + + + + {{ t('workplace.access') }} + + + + + + + + + + + + + + + {{ t('workplace.project') }} + {{ t('action.more') }} + + + + + + + + + {{ item.name }} + + {{ t(item.message) }} + + {{ item.personal }} + {{ formatTime(item.time, 'yyyy-MM-dd') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('workplace.shortcutOperation') }} + + + + + + + + + {{ item.name }} + + + + + + + + + + {{ t('workplace.notice') }} + {{ t('action.more') }} + + + + + + + + + + {{ item.type }} : {{ item.title }} + + + + {{ formatTime(item.date, 'yyyy-MM-dd') }} + + + + + + + + + + + diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 121ec6a8b..2006758a8 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,381 +1,14 @@ - - - - - - - - - {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }} - - - {{ t('workplace.toady') }},20℃ - 32℃! - - - - - - - - {{ t('workplace.project') }} - - - - - {{ t('workplace.toDo') }} - - - - - {{ t('workplace.access') }} - - - - - - - + + + + - - - - - - - {{ t('workplace.project') }} - {{ t('action.more') }} - - - - - - - - - {{ item.name }} - - {{ t(item.message) }} - - {{ item.personal }} - {{ formatTime(item.time, 'yyyy-MM-dd') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ t('workplace.shortcutOperation') }} - - - - - - - - - {{ item.name }} - - - - - - - - - - {{ t('workplace.notice') }} - {{ t('action.more') }} - - - - - - - - - - {{ item.type }} : {{ item.title }} - - - - {{ formatTime(item.date, 'yyyy-MM-dd') }} - - - - - - - - - diff --git a/src/views/Home/components/productWarehouseKeeper.vue b/src/views/Home/components/productWarehouseKeeper.vue new file mode 100644 index 000000000..2b6938d2c --- /dev/null +++ b/src/views/Home/components/productWarehouseKeeper.vue @@ -0,0 +1,172 @@ + + + + + + 今日到货计划(已发货) + 22单 + + + + + + + + 呆滞库存预警 + + + + + + + + 超期库存预警 + + + + + + + + + + 高低储预警 + + + + + + + + 待处理任务 + + + + + + + + + + + diff --git a/src/views/Home/components/productionManager.vue b/src/views/Home/components/productionManager.vue new file mode 100644 index 000000000..13900e6a5 --- /dev/null +++ b/src/views/Home/components/productionManager.vue @@ -0,0 +1,162 @@ + + + + + 今日生产计划 + + + + + + + + 线边安全库存 + + + + + + + + + + 待上架成品库存 + + + + + + + + 待处理任务 + + + + + + + + + + + diff --git a/src/views/Home/components/supplierIndex.vue b/src/views/Home/components/supplierIndex.vue new file mode 100644 index 000000000..42687dc19 --- /dev/null +++ b/src/views/Home/components/supplierIndex.vue @@ -0,0 +1,322 @@ + + + + + 订单数 + + + + 22单 + 开发订单数 + + + + + + 2456单 + 全部订单数 + + + + + + + 要货计划数 + + + + 255单 + 开放计划数 + + + + + + 2555单 + 全部计划数 + + + + + + + 发货单数 + + + + 255单 + 未收货订单数 + + + + + + 2555单 + 已收货订单数 + + + + + + + + + 本月发货单趋势 + + + + 本月发货零件TOP10 + + + + + + 最新消息 + + + + + + + + 最新扣分明细 + + + + + + + + + + 本月退货明细 + + + + + + + + 本月索赔明细 + + + + + + + + + + + diff --git a/src/views/Home/components/warehouseKeeper.vue b/src/views/Home/components/warehouseKeeper.vue new file mode 100644 index 000000000..86671617d --- /dev/null +++ b/src/views/Home/components/warehouseKeeper.vue @@ -0,0 +1,192 @@ + + + + + + 今日到货计划(已发货) + 22单 + + + + + + 今日备料计划(已发料) + 2456单 + + + + + + 今日叫料请求(已发料) + 255单 + + + + + + 空闲库位数/总库位数 + 2555个/65555个 + + + + + + + 呆滞库存预警 + + + + + + + + 超期库存预警 + + + + + + + + + + 高低储预警 + + + + + + + + 待处理任务 + + + + + + + + + + + diff --git a/src/views/Home/echarts-data.ts b/src/views/Home/echarts-data.ts index 56093f4b6..9e6474d65 100644 --- a/src/views/Home/echarts-data.ts +++ b/src/views/Home/echarts-data.ts @@ -3,24 +3,9 @@ import { EChartsOption } from 'echarts' const { t } = useI18n() export const lineOptions: EChartsOption = { - title: { - text: t('analysis.monthlySales'), - left: 'center' - }, + xAxis: { - data: [ - t('analysis.january'), - t('analysis.february'), - t('analysis.march'), - t('analysis.april'), - t('analysis.may'), - t('analysis.june'), - t('analysis.july'), - t('analysis.august'), - t('analysis.september'), - t('analysis.october'), - t('analysis.november'), - t('analysis.december') + data: [ 1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 ], boundaryGap: false, axisTick: { @@ -31,7 +16,7 @@ export const lineOptions: EChartsOption = { left: 20, right: 20, bottom: 20, - top: 80, + top: 50, containLabel: true }, tooltip: { @@ -47,12 +32,12 @@ export const lineOptions: EChartsOption = { } }, legend: { - data: [t('analysis.estimate'), t('analysis.actual')], - top: 50 + data: ['销售','哈哈'], + top: 20 }, series: [ { - name: t('analysis.estimate'), + name: '销售', smooth: true, type: 'line', data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123], @@ -60,7 +45,7 @@ export const lineOptions: EChartsOption = { animationEasing: 'cubicInOut' }, { - name: t('analysis.actual'), + name: '哈哈', smooth: true, type: 'line', itemStyle: {}, @@ -72,10 +57,10 @@ export const lineOptions: EChartsOption = { } export const pieOptions: EChartsOption = { - title: { - text: t('analysis.userAccessSource'), - left: 'center' - }, + // title: { + // text: t('analysis.userAccessSource'), + // left: 'center' + // }, tooltip: { trigger: 'item', formatter: '{a} {b} : {c} ({d}%)' @@ -83,6 +68,7 @@ export const pieOptions: EChartsOption = { legend: { orient: 'vertical', left: 'left', + top:20, data: [ t('analysis.directAccess'), t('analysis.mailMarketing'),