From 75b1c6e7b73125b00cee0081a0a06105bab2b745 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Tue, 6 Sep 2022 17:23:59 +0800
Subject: [PATCH] 2022.9.6

---
 .env.development                               |  4 ++--
 src/api/dashboard/notice.js                    |  8 ++++++++
 src/views/statisticalReport/budgetProgress.vue | 18 +++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 56074d9..f14882a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-VUE_APP_DOMIAN=http://192.168.60.99:9003/
-#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+#VUE_APP_DOMIAN=http://192.168.60.99:9003/
+VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
 VUE_APP_BASE_API = ''
 
 
diff --git a/src/api/dashboard/notice.js b/src/api/dashboard/notice.js
index d1a0038..d1300cb 100644
--- a/src/api/dashboard/notice.js
+++ b/src/api/dashboard/notice.js
@@ -15,3 +15,11 @@ export function readNotice(params){
     params
   })
 }
+
+export function statistic(data){
+  return request({
+    method:'get',
+    url:'/api/admin/notice/statistic',
+    data
+  })
+}
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 3ecd1c1..5950367 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -10,9 +10,9 @@
 
         <span style="padding: 0 6px;word-break: keep-all;">预算类型</span>
         <span>
-          <Select clearable v-model="select.type" placeholder="请选择预算类型" type="date" style="width: 160px">
-            <Option v-for="item in type" :value="item.id" :key="item.id">{{item.value}}</Option>
-          </Select>
+          <el-select size="small" clearable v-model="select.type" placeholder="请选择预算类型" type="date" style="width: 160px">
+            <el-option v-for="item in type" :value="item.id" :key="item.id" :label="item.value"></el-option>
+          </el-select>
         </span>
 
         <span style="padding: 0 6px;">
@@ -177,10 +177,14 @@ export default {
       console.log(res)
     }
   },
-  mounted() {
-    this.getType()
-    this.getDepartment()
-    this.getPlanProgress()
+ async mounted() {
+    await this.getType()
+    await this.getDepartment()
+
+    this.select.department = Number(this.$route.query.departmentId) || ''
+    this.select.type = Number(this.$route.query.typeId) || ''
+
+    await this.getPlanProgress()
   }
 }
 </script>