diff --git a/public/static/videos/01.webm b/public/static/videos/01.webm new file mode 100644 index 00000000..92b557bc Binary files /dev/null and b/public/static/videos/01.webm differ diff --git a/src/assets/icons/svg/dataBoard1.svg b/src/assets/icons/svg/dataBoard1.svg new file mode 100644 index 00000000..7661c4fb --- /dev/null +++ b/src/assets/icons/svg/dataBoard1.svg @@ -0,0 +1,20 @@ + + + 编组备份 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/dataBoard2.svg b/src/assets/icons/svg/dataBoard2.svg new file mode 100644 index 00000000..fc2ea9e2 --- /dev/null +++ b/src/assets/icons/svg/dataBoard2.svg @@ -0,0 +1,18 @@ + + + 切片 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/dataBoard3.svg b/src/assets/icons/svg/dataBoard3.svg new file mode 100644 index 00000000..14eb3460 --- /dev/null +++ b/src/assets/icons/svg/dataBoard3.svg @@ -0,0 +1,18 @@ + + + 产线备份 3 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/dataBoard4.svg b/src/assets/icons/svg/dataBoard4.svg new file mode 100644 index 00000000..676e1c64 --- /dev/null +++ b/src/assets/icons/svg/dataBoard4.svg @@ -0,0 +1,18 @@ + + + 切片 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/fullScreenView.svg b/src/assets/icons/svg/fullScreenView.svg new file mode 100644 index 00000000..ad581da8 --- /dev/null +++ b/src/assets/icons/svg/fullScreenView.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/unFullScreenView.svg b/src/assets/icons/svg/unFullScreenView.svg new file mode 100644 index 00000000..cfac41e6 --- /dev/null +++ b/src/assets/icons/svg/unFullScreenView.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/dataBoard/arrDown.png b/src/assets/images/dataBoard/arrDown.png new file mode 100644 index 00000000..c6c5cc1b Binary files /dev/null and b/src/assets/images/dataBoard/arrDown.png differ diff --git a/src/assets/images/dataBoard/arrUp.png b/src/assets/images/dataBoard/arrUp.png new file mode 100644 index 00000000..9e34aa5d Binary files /dev/null and b/src/assets/images/dataBoard/arrUp.png differ diff --git a/src/assets/images/dataBoard/background.png b/src/assets/images/dataBoard/background.png new file mode 100644 index 00000000..34a7a68a Binary files /dev/null and b/src/assets/images/dataBoard/background.png differ diff --git a/src/assets/images/dataBoard/center-bottom.png b/src/assets/images/dataBoard/center-bottom.png new file mode 100644 index 00000000..041a73ba Binary files /dev/null and b/src/assets/images/dataBoard/center-bottom.png differ diff --git a/src/assets/images/dataBoard/center-top.png b/src/assets/images/dataBoard/center-top.png new file mode 100644 index 00000000..ce261024 Binary files /dev/null and b/src/assets/images/dataBoard/center-top.png differ diff --git a/src/assets/images/dataBoard/centerNumB.png b/src/assets/images/dataBoard/centerNumB.png new file mode 100644 index 00000000..d7f6185b Binary files /dev/null and b/src/assets/images/dataBoard/centerNumB.png differ diff --git a/src/assets/images/dataBoard/centerNumY.png b/src/assets/images/dataBoard/centerNumY.png new file mode 100644 index 00000000..95ebe71e Binary files /dev/null and b/src/assets/images/dataBoard/centerNumY.png differ diff --git a/src/assets/images/dataBoard/data-board-title.png b/src/assets/images/dataBoard/data-board-title.png new file mode 100644 index 00000000..cb309fb8 Binary files /dev/null and b/src/assets/images/dataBoard/data-board-title.png differ diff --git a/src/assets/images/dataBoard/defectNum.png b/src/assets/images/dataBoard/defectNum.png new file mode 100644 index 00000000..2107a37f Binary files /dev/null and b/src/assets/images/dataBoard/defectNum.png differ diff --git a/src/assets/images/dataBoard/dotG.png b/src/assets/images/dataBoard/dotG.png new file mode 100644 index 00000000..ac222416 Binary files /dev/null and b/src/assets/images/dataBoard/dotG.png differ diff --git a/src/assets/images/dataBoard/dotR.png b/src/assets/images/dataBoard/dotR.png new file mode 100644 index 00000000..b1132db9 Binary files /dev/null and b/src/assets/images/dataBoard/dotR.png differ diff --git a/src/assets/images/dataBoard/dotY.png b/src/assets/images/dataBoard/dotY.png new file mode 100644 index 00000000..94521193 Binary files /dev/null and b/src/assets/images/dataBoard/dotY.png differ diff --git a/src/assets/images/dataBoard/eq-tip.png b/src/assets/images/dataBoard/eq-tip.png new file mode 100644 index 00000000..c02a1bad Binary files /dev/null and b/src/assets/images/dataBoard/eq-tip.png differ diff --git a/src/assets/images/dataBoard/head.png b/src/assets/images/dataBoard/head.png new file mode 100644 index 00000000..6cb10ccf Binary files /dev/null and b/src/assets/images/dataBoard/head.png differ diff --git a/src/assets/images/dataBoard/left-bottom.png b/src/assets/images/dataBoard/left-bottom.png new file mode 100644 index 00000000..77e8adee Binary files /dev/null and b/src/assets/images/dataBoard/left-bottom.png differ diff --git a/src/assets/images/dataBoard/left-top.png b/src/assets/images/dataBoard/left-top.png new file mode 100644 index 00000000..d5ef32b1 Binary files /dev/null and b/src/assets/images/dataBoard/left-top.png differ diff --git a/src/assets/images/dataBoard/leftTopDataBox.png b/src/assets/images/dataBoard/leftTopDataBox.png new file mode 100644 index 00000000..b2f7dc87 Binary files /dev/null and b/src/assets/images/dataBoard/leftTopDataBox.png differ diff --git a/src/assets/images/dataBoard/leftTopIcon1.png b/src/assets/images/dataBoard/leftTopIcon1.png new file mode 100644 index 00000000..473ecca1 Binary files /dev/null and b/src/assets/images/dataBoard/leftTopIcon1.png differ diff --git a/src/assets/images/dataBoard/leftTopIcon2.png b/src/assets/images/dataBoard/leftTopIcon2.png new file mode 100644 index 00000000..ab888da7 Binary files /dev/null and b/src/assets/images/dataBoard/leftTopIcon2.png differ diff --git a/src/assets/images/dataBoard/leftbar.png b/src/assets/images/dataBoard/leftbar.png new file mode 100644 index 00000000..8f3f5839 Binary files /dev/null and b/src/assets/images/dataBoard/leftbar.png differ diff --git a/src/assets/images/dataBoard/numberBox.png b/src/assets/images/dataBoard/numberBox.png new file mode 100644 index 00000000..a22dec01 Binary files /dev/null and b/src/assets/images/dataBoard/numberBox.png differ diff --git a/src/assets/images/dataBoard/ranking1.png b/src/assets/images/dataBoard/ranking1.png new file mode 100644 index 00000000..bdd06888 Binary files /dev/null and b/src/assets/images/dataBoard/ranking1.png differ diff --git a/src/assets/images/dataBoard/ranking2.png b/src/assets/images/dataBoard/ranking2.png new file mode 100644 index 00000000..015ffa15 Binary files /dev/null and b/src/assets/images/dataBoard/ranking2.png differ diff --git a/src/assets/images/dataBoard/ranking3.png b/src/assets/images/dataBoard/ranking3.png new file mode 100644 index 00000000..630490cd Binary files /dev/null and b/src/assets/images/dataBoard/ranking3.png differ diff --git a/src/assets/images/dataBoard/rankingBg1.png b/src/assets/images/dataBoard/rankingBg1.png new file mode 100644 index 00000000..d5460d73 Binary files /dev/null and b/src/assets/images/dataBoard/rankingBg1.png differ diff --git a/src/assets/images/dataBoard/rankingBg2.png b/src/assets/images/dataBoard/rankingBg2.png new file mode 100644 index 00000000..00f16eb1 Binary files /dev/null and b/src/assets/images/dataBoard/rankingBg2.png differ diff --git a/src/assets/images/dataBoard/right-bottom.png b/src/assets/images/dataBoard/right-bottom.png new file mode 100644 index 00000000..fc7bb39f Binary files /dev/null and b/src/assets/images/dataBoard/right-bottom.png differ diff --git a/src/assets/images/dataBoard/rightbar.png b/src/assets/images/dataBoard/rightbar.png new file mode 100644 index 00000000..1fccdd26 Binary files /dev/null and b/src/assets/images/dataBoard/rightbar.png differ diff --git a/src/assets/images/dataBoard/time-choose.png b/src/assets/images/dataBoard/time-choose.png new file mode 100644 index 00000000..db92b3a3 Binary files /dev/null and b/src/assets/images/dataBoard/time-choose.png differ diff --git a/src/filter/code-filter.js b/src/filter/code-filter.js index 003d2792..1488f5e5 100644 --- a/src/filter/code-filter.js +++ b/src/filter/code-filter.js @@ -91,4 +91,4 @@ export default function (dictTable) { return function (val) { return table?.[dictTable]?.[val] } -} +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index eb160008..752a78f2 100644 --- a/src/main.js +++ b/src/main.js @@ -21,6 +21,7 @@ import { handleTree, addBeginAndEndTime, divide, + formatThousands } from '@/utils/ruoyi'; import Pagination from '@/components/Pagination'; // 自定义表格工具扩展 @@ -45,6 +46,7 @@ Vue.prototype.resetForm = resetForm; Vue.prototype.getDictDatas = getDictDatas; Vue.prototype.getDictDatas2 = getDictDatas2; Vue.prototype.getDictDataLabel = getDictDataLabel; +Vue.prototype.formatThousands = formatThousands; Vue.prototype.DICT_TYPE = DICT_TYPE; Vue.prototype.handleTree = handleTree; Vue.prototype.addBeginAndEndTime = addBeginAndEndTime; diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 7df60e4b..8e45a986 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -295,3 +295,15 @@ export function getPath(path) { } return Math.floor(divisor/dividend*100)/100; } + +// 通用千分位格式化函数 +export function formatThousands(value) { + if (value === null || value === undefined) return '0' + + // 清理已有逗号并转为数字 + const numValue = Number(String(value).replace(/,/g, '')) + if (isNaN(numValue)) return '0' + + // 支持小数处理 + return numValue.toLocaleString('en-US') +} \ No newline at end of file diff --git a/src/views/base/dataBoard/components/CenterBottomL.vue b/src/views/base/dataBoard/components/CenterBottomL.vue new file mode 100644 index 00000000..9b026dbd --- /dev/null +++ b/src/views/base/dataBoard/components/CenterBottomL.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/CenterBottomR.vue b/src/views/base/dataBoard/components/CenterBottomR.vue new file mode 100644 index 00000000..80a51260 --- /dev/null +++ b/src/views/base/dataBoard/components/CenterBottomR.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/CenterTop.vue b/src/views/base/dataBoard/components/CenterTop.vue new file mode 100644 index 00000000..bacb00ab --- /dev/null +++ b/src/views/base/dataBoard/components/CenterTop.vue @@ -0,0 +1,352 @@ + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/Header.vue b/src/views/base/dataBoard/components/Header.vue new file mode 100644 index 00000000..662fb266 --- /dev/null +++ b/src/views/base/dataBoard/components/Header.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/base/dataBoard/components/LeftBottom.vue b/src/views/base/dataBoard/components/LeftBottom.vue new file mode 100644 index 00000000..e87564f3 --- /dev/null +++ b/src/views/base/dataBoard/components/LeftBottom.vue @@ -0,0 +1,284 @@ + + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/LeftTop.vue b/src/views/base/dataBoard/components/LeftTop.vue new file mode 100644 index 00000000..29c179ab --- /dev/null +++ b/src/views/base/dataBoard/components/LeftTop.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/RightBottom.vue b/src/views/base/dataBoard/components/RightBottom.vue new file mode 100644 index 00000000..c0c5dec7 --- /dev/null +++ b/src/views/base/dataBoard/components/RightBottom.vue @@ -0,0 +1,198 @@ + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/components/RightTop.vue b/src/views/base/dataBoard/components/RightTop.vue new file mode 100644 index 00000000..6d7ba2ec --- /dev/null +++ b/src/views/base/dataBoard/components/RightTop.vue @@ -0,0 +1,352 @@ + + + \ No newline at end of file diff --git a/src/views/base/dataBoard/index.vue b/src/views/base/dataBoard/index.vue index 1a014132..14699998 100644 --- a/src/views/base/dataBoard/index.vue +++ b/src/views/base/dataBoard/index.vue @@ -1,100 +1,234 @@ - -