diff --git a/src/common/rateConfig.ts b/src/common/rateConfig.ts index 795c195..b894a2e 100644 --- a/src/common/rateConfig.ts +++ b/src/common/rateConfig.ts @@ -2,11 +2,11 @@ interface RateLevelConfig { [key: string]: { badge?: string; ranking?: string }; } const rateLevelConfig: RateLevelConfig = { - AAAR: { badge: "1", ranking: "5%" }, - AAR: { badge: "2", ranking: "10" }, - AR: { badge: "3", ranking: "20%" }, - BR: { ranking: "30%" }, - CR: { ranking: "40%" }, + // AAAR: { badge: "1", ranking: "5%" }, + // AAR: { badge: "2", ranking: "10" }, + // AR: { badge: "3", ranking: "20%" }, + // BR: { ranking: "30%" }, + // CR: { ranking: "40%" }, AAAʀ: { badge: "1", ranking: "5%" }, AAʀ: { badge: "2", ranking: "10" }, Aʀ: { badge: "3", ranking: "20%" }, diff --git a/src/components/EditTablePlus/TableColumnShowCell/TableColumnShowCell.vue b/src/components/EditTablePlus/TableColumnShowCell/TableColumnShowCell.vue index 0a5a81e..086267c 100644 --- a/src/components/EditTablePlus/TableColumnShowCell/TableColumnShowCell.vue +++ b/src/components/EditTablePlus/TableColumnShowCell/TableColumnShowCell.vue @@ -22,6 +22,8 @@ import setShow from "./components/setShow.vue"; // import stringShow from "./components/stringShow.vue"; import textShow from "./components/textShow.vue"; import m2mShow from "./components/m2mShow.vue"; +import datetimeShow from "./components/datetimeShow.vue"; +import dateShow from "./components/dateShow.vue"; import {computed, defineEmits, defineProps} from "vue"; import type {TableColumnConfig} from "../types"; @@ -45,6 +47,8 @@ const columnTableShowComponents = { // int: intShow, set: setShow, // string: stringShow, + date:dateShow, + datetime:datetimeShow, text: textShow, m2m: m2mShow }; diff --git a/src/components/EditTablePlus/TableColumnShowCell/components/dateShow.vue b/src/components/EditTablePlus/TableColumnShowCell/components/dateShow.vue new file mode 100644 index 0000000..01f32de --- /dev/null +++ b/src/components/EditTablePlus/TableColumnShowCell/components/dateShow.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/components/EditTablePlus/TableColumnShowCell/components/datetimeShow.vue b/src/components/EditTablePlus/TableColumnShowCell/components/datetimeShow.vue new file mode 100644 index 0000000..0bd7e40 --- /dev/null +++ b/src/components/EditTablePlus/TableColumnShowCell/components/datetimeShow.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/components/EditTablePlus/TableHeaderQueryCell/components/enumQuery.vue b/src/components/EditTablePlus/TableHeaderQueryCell/components/enumQuery.vue index 0baf3b2..46c3f1a 100644 --- a/src/components/EditTablePlus/TableHeaderQueryCell/components/enumQuery.vue +++ b/src/components/EditTablePlus/TableHeaderQueryCell/components/enumQuery.vue @@ -2,6 +2,7 @@ import("@/views/rate/companyUserManage.vue"), + meta: { + title: "企业用户管理", + // 通过设置showParent为true,显示父级 + showParent: true, + keepAlive: true, + icon: "edit", + meta: { + rank:1 + } + } + // children: [ + // { + // path: "/manage/company_data", + // name: "company_data", + // component: () => import("@/views/rate/companyDataManage.vue"), + // meta: { + // title: "企业数据管理", + // // 通过设置showParent为true,显示父级 + // showParent: true, + // keepAlive: true + // } + // }, + // { + // path: "/manage/rate", + // name: "rate", + // component: () => import("@/views/rate/rateManage.vue"), + // meta: { + // title: "信誉评级管理", + // // 通过设置showParent为true,显示父级 + // showParent: true, + // keepAlive: true + // } + // } + // ] +}; diff --git a/src/router/modules/rateManage.ts b/src/router/modules/rateManage.ts index 9872727..040ae75 100644 --- a/src/router/modules/rateManage.ts +++ b/src/router/modules/rateManage.ts @@ -9,11 +9,12 @@ export default { name: "rate", component: () => import("@/views/rate/rateManage.vue"), meta: { - title: "信誉评级管理", + title: "评级管理", // 通过设置showParent为true,显示父级 showParent: true, keepAlive: true, - icon: "dailypic" + icon: "dataAnalysis", + rank:20 } // children: [ // { diff --git a/src/views/rate/companyDataManage.vue b/src/views/rate/companyDataManage.vue index 65382ec..2d25d8d 100644 --- a/src/views/rate/companyDataManage.vue +++ b/src/views/rate/companyDataManage.vue @@ -29,6 +29,7 @@ clearable v-model="query.mgr_data_state" @change="getData" + @clear="()=>query.mgr_data_state=null" size="small" placeholder="数据准备" > @@ -51,7 +52,8 @@ @@ -402,6 +404,7 @@ import { BjDataConfig, RateData } from "@/types/bj"; import { ElMessage, ElMessageBox } from "element-plus"; import { ref, onMounted, computed } from "vue"; import { Search, Check, WarningFilled } from "@element-plus/icons-vue"; +import dayjs from "dayjs"; function objectRemoveNull(obj: Object) { if (!obj) { diff --git a/src/views/rate/companyUserManage.vue b/src/views/rate/companyUserManage.vue new file mode 100644 index 0000000..a2c1bc6 --- /dev/null +++ b/src/views/rate/companyUserManage.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/views/rate/rateManage.vue b/src/views/rate/rateManage.vue index b2f4068..49a4050 100644 --- a/src/views/rate/rateManage.vue +++ b/src/views/rate/rateManage.vue @@ -55,6 +55,7 @@ clearable v-model="query.rate_state" @change="getData" + @clear="()=>query.rate_state=null" size="small" placeholder="评级状态" > @@ -81,6 +82,7 @@ clearable v-model="query.rate_level" @change="getData" + @clear="()=>query.rate_level=null" size="small" placeholder="信誉级别" > @@ -98,6 +100,7 @@