diff --git a/admin_2/src/pages/404/404.vue b/admin_2/src/pages/404/404.vue new file mode 100644 index 0000000000000000000000000000000000000000..a656003a403bff872177df5848f8735e7b76ab49 --- /dev/null +++ b/admin_2/src/pages/404/404.vue @@ -0,0 +1,9 @@ +<template> + <div></div> +</template> + +<script> +export default {}; +</script> + +<style lang="less" scoped></style> diff --git a/admin_2/src/pages/engineSearch/EvaluateData.vue b/admin_2/src/pages/engineSearch/EvaluateData.vue index df17a4ea88a70cee1f172e41aecc476ec92d441e..bccc5b1049cd411743ba120ec0401c1357715269 100644 --- a/admin_2/src/pages/engineSearch/EvaluateData.vue +++ b/admin_2/src/pages/engineSearch/EvaluateData.vue @@ -1,6 +1,6 @@ <template> <div class="flex h-full w-full flex-col"> - <Search @search="handleSearch"></Search> + <Search @search="handleSearch" :dict="dict"></Search> <div class="main flex w-full flex-1 items-center justify-center rounded-[4px] bg-white p-[20px]" > @@ -140,10 +140,11 @@ export default { month: "", day: "", }, + dict: {}, }; }, created() { - // this.getEvaStatList(); + this.getEvaStatList(); }, methods: { getData() {}, @@ -156,26 +157,30 @@ export default { ...form, }); if (res.data.code == 1) { - let { data, total } = res.data.data; + let { data, total, dict } = res.data.data; return { data, total, + dict, }; } else { return { data: [], total: 0, + dict: {}, }; } }, async getEvaStatList() { this.loading = true; - let { data, total } = await this.evaStatList(); + let { data, total, dict } = await this.evaStatList(); data.forEach((v) => { v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : ""; }); this.total = total; this.tableData = data; + this.dict = dict; + console.log(dict); this.loading = false; }, diff --git a/admin_2/src/pages/engineSearch/QueueUpData.vue b/admin_2/src/pages/engineSearch/QueueUpData.vue index 7bf10f04383471772936f0920fca1d6164ebf5b4..785902b5373f3a6999a7f70f954761802fdb3800 100644 --- a/admin_2/src/pages/engineSearch/QueueUpData.vue +++ b/admin_2/src/pages/engineSearch/QueueUpData.vue @@ -171,6 +171,7 @@ export default { return { data: [], total: 0, + dict: {}, }; } }, diff --git a/admin_2/src/pages/engineSearch/components/Search.vue b/admin_2/src/pages/engineSearch/components/Search.vue index 5bd8c11ffd53236d8bcf2d12c0e0e9b3f892ad8e..54d924bb79720232ecb03f04c62f7e7c06657e3f 100644 --- a/admin_2/src/pages/engineSearch/components/Search.vue +++ b/admin_2/src/pages/engineSearch/components/Search.vue @@ -239,7 +239,6 @@ <script> import { findBottomSubarrays } from "@/utils"; -let pjOption = ["闈炲父婊℃剰", "婊℃剰", "鍩烘湰婊℃剰", "涓嶆弧鎰�", "闈炲父涓嶆弧鎰�"]; export default { components: {}, props: { @@ -250,7 +249,7 @@ export default { }, data() { return { - pjOption, + pjOption: [], calcBusiness: [], calcDept: [], calcWindow: [], @@ -345,10 +344,17 @@ export default { // 鑾峰彇鎼滅储閰嶇疆 changeOptions(dict) { if (JSON.stringify(dict) == "{}") return; - let { businessList, sectionNameList, windowFromnumList } = dict; - this.calcBusiness = this.businessList = this.getTopKeyList(businessList); - this.calcDept = this.sectionList = this.getTopKeyList(sectionNameList); - this.calcWindow = this.windowList = this.getTopKeyList(windowFromnumList); + let { businessList, sectionNameList, windowFromnumList, pjOption } = dict; + this.pjOption = pjOption ? pjOption : []; + this.calcBusiness = this.businessList = businessList + ? this.getTopKeyList(businessList) + : []; + this.calcDept = this.sectionList = sectionNameList + ? this.getTopKeyList(sectionNameList) + : []; + this.calcWindow = this.windowList = windowFromnumList + ? this.getTopKeyList(windowFromnumList) + : []; }, changeTab(key) { this.form.year = ""; diff --git a/admin_2/src/pages/market/QueueUpReport.vue b/admin_2/src/pages/market/QueueUpReport.vue index 1303ac75509ad0c94c394796971c40cfa3be6833..a1ff61083a7454ea0a396a80aa888e5fb907fcc5 100644 --- a/admin_2/src/pages/market/QueueUpReport.vue +++ b/admin_2/src/pages/market/QueueUpReport.vue @@ -222,7 +222,7 @@ export default { prop: "business", }, { - label: "棰勭害缂栧彿", + label: "棰勭害缂栫爜", align: "center", width: "150", prop: "ordernumber",