diff --git a/components/BarEcharts.vue b/components/BarEcharts.vue new file mode 100644 index 0000000..ea31046 --- /dev/null +++ b/components/BarEcharts.vue @@ -0,0 +1,130 @@ + + diff --git a/components/RingEcharts.vue b/components/RingEcharts.vue new file mode 100644 index 0000000..781c268 --- /dev/null +++ b/components/RingEcharts.vue @@ -0,0 +1,148 @@ + + + + + + diff --git a/nuxt.config.ts b/nuxt.config.ts index b7b03f4..0f62890 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -27,6 +27,9 @@ export default defineNuxtConfig({ href:"https://cdn.bootcdn.net/ajax/libs/tailwindcss/2.2.19/tailwind.min.css", }, ], - script: [{ src: 'https://cdn.bootcdn.net/ajax/libs/dayjs/1.10.7/dayjs.min.js' }], + script: [ + { src: 'https://cdn.bootcdn.net/ajax/libs/dayjs/1.10.7/dayjs.min.js' }, + {src:'https://cdn.bootcdn.net/ajax/libs/echarts/5.2.2/echarts.common.js'} + ], }, }); diff --git a/pages/Initiate-application.vue b/pages/Initiate-application.vue index 66b35bf..54944e6 100644 --- a/pages/Initiate-application.vue +++ b/pages/Initiate-application.vue @@ -273,49 +273,10 @@ const billList = ref([ const reviewerList = ref(['冯教授','周亮','李洪明','夏红','麦琪其','薇薇安','卫老师']); //审核人数组 const selected = ref(['冯教授']); //默认的审核人 const showHistory = ref(true); // 根据数据判断是否有历史记录 -const applyData = ref([ - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 1 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 2 - }, - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 3 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 3 - }, - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 1 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 2 - } -]); // 申请的记录 const isSuccess = ref(false) // 上传票据是否成功 const name = ref('') // 提交人的姓名 const applyMoney = ref(5000) // 手动输入时输入的申请的金额 const titleHidden = ref(true) // 上传提示语隐藏 -const currentPage = ref(0) //当前显示页数 const personalType = ref('个人申请') const personalCategory = ref('用款') diff --git a/pages/applicant.vue b/pages/applicant.vue index 15d6a23..16cf19a 100644 --- a/pages/applicant.vue +++ b/pages/applicant.vue @@ -9,16 +9,6 @@ -
@@ -26,8 +16,6 @@
- -
奖金领取记录
diff --git a/pages/index.vue b/pages/index.vue index 4357815..de2eda2 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,6 +1,5 @@