From 1c20c9b235e316a99f592e10cfc9350e6ac653d5 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Wed, 16 Aug 2023 19:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E5=AE=8C=E6=88=90=E7=89=88?=
=?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 4 +-
pages/newamine/component/yearCharts.vue | 2 +-
pages/newamine/index.vue | 1565 +++++--------------
pages/revenue/expenditureDetail.vue | 8 +-
pages/revenue/incomeDetail.vue | 10 +-
pages/revenue/index.vue | 34 +-
static/images/newExamine/OK.svg | 13 -
static/images/newExamine/error.svg | 13 -
static/images/newExamine/fixedIcon.svg | 13 -
static/images/newExamine/rightIcon.svg | 15 -
static/images/newExamine/sort.svg | 15 -
static/images/newExamine/tabIcon.svg | 17 -
static/images/newExamine/timeIcon.svg | 13 -
static/images/newExamine/userIcon.svg | 13 -
static/images/revenueBox/allInCome.png | Bin 33056 -> 0 bytes
static/images/revenueBox/buySum.svg | 46 -
static/images/revenueBox/expenditure.png | Bin 31637 -> 0 bytes
static/images/revenueBox/fistBg.svg | 9 -
static/images/revenueBox/monthSum.png | Bin 65058 -> 0 bytes
static/images/revenueBox/moreIcon.svg | 13 -
static/images/revenueBox/operateManager.svg | 46 -
static/images/revenueBox/operateSum.svg | 44 -
static/images/revenueBox/otherBg.svg | 9 -
static/images/revenueBox/otherBuy.svg | 49 -
static/images/revenueBox/otherSum.svg | 49 -
static/images/revenueBox/secondBg.svg | 9 -
static/images/revenueBox/selfOperat.svg | 42 -
static/images/revenueBox/thirdBg.svg | 9 -
static/images/revenueBox/yearRevenue.png | Bin 69938 -> 0 bytes
static/images/revenueBox/yearSum.png | Bin 73556 -> 0 bytes
static/public/dataAll/FcbUFKvFxAXe.woff | Bin 0 -> 2272 bytes
static/public/dataAll/stylesheet.css | 8 +
32 files changed, 400 insertions(+), 1668 deletions(-)
delete mode 100644 static/images/newExamine/OK.svg
delete mode 100644 static/images/newExamine/error.svg
delete mode 100644 static/images/newExamine/fixedIcon.svg
delete mode 100644 static/images/newExamine/rightIcon.svg
delete mode 100644 static/images/newExamine/sort.svg
delete mode 100644 static/images/newExamine/tabIcon.svg
delete mode 100644 static/images/newExamine/timeIcon.svg
delete mode 100644 static/images/newExamine/userIcon.svg
delete mode 100644 static/images/revenueBox/allInCome.png
delete mode 100644 static/images/revenueBox/buySum.svg
delete mode 100644 static/images/revenueBox/expenditure.png
delete mode 100644 static/images/revenueBox/fistBg.svg
delete mode 100644 static/images/revenueBox/monthSum.png
delete mode 100644 static/images/revenueBox/moreIcon.svg
delete mode 100644 static/images/revenueBox/operateManager.svg
delete mode 100644 static/images/revenueBox/operateSum.svg
delete mode 100644 static/images/revenueBox/otherBg.svg
delete mode 100644 static/images/revenueBox/otherBuy.svg
delete mode 100644 static/images/revenueBox/otherSum.svg
delete mode 100644 static/images/revenueBox/secondBg.svg
delete mode 100644 static/images/revenueBox/selfOperat.svg
delete mode 100644 static/images/revenueBox/thirdBg.svg
delete mode 100644 static/images/revenueBox/yearRevenue.png
delete mode 100644 static/images/revenueBox/yearSum.png
create mode 100644 static/public/dataAll/FcbUFKvFxAXe.woff
create mode 100644 static/public/dataAll/stylesheet.css
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 26425f5..995f0f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -452,7 +452,7 @@
{{dailyExamineObj.RectifyCount||'0'}}
- 整改中/个
+ 已整改/个
@@ -1500,7 +1500,7 @@ export default {
},
// 跳转到考核
handleGoExamine(type){
- this.$util.toNextRoute('navigateTo', `/pages/examine/index?come=index&type=${type}&time=${this.single}`)
+ this.$util.toNextRoute('navigateTo', `/pages/newamine/index?come=index&type=${type}&time=${this.single}`)
},
async initYesterdayData(type){
// type 判断如果是滑动的 就是true 日期就传空 别的地方调用 默认传入时间
diff --git a/pages/newamine/component/yearCharts.vue b/pages/newamine/component/yearCharts.vue
index 5ad089a..cc1d4f3 100644
--- a/pages/newamine/component/yearCharts.vue
+++ b/pages/newamine/component/yearCharts.vue
@@ -45,7 +45,7 @@ export default {
width: 28,
height: 28,
series: data.series,
- animation: true,
+ animation: false,
rotate: false,
rotateLock: false,
background: "#FFFFFF",
diff --git a/pages/newamine/index.vue b/pages/newamine/index.vue
index 7072cdb..20af86d 100644
--- a/pages/newamine/index.vue
+++ b/pages/newamine/index.vue
@@ -9,7 +9,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
@@ -79,16 +79,17 @@
{{dailyExamineObj.RectifyCount||'0'}}
- 整改中/个
+ 已整改/个
{{dailyExamineObj.UnRectifyCount||'0' }}
未整改/个
-
+
+
{{dailyExamineObj.CompleteRate?dailyExamineObj.CompleteRate + '%' :'-' }}
达标率/全省
@@ -107,7 +108,7 @@
服务区排名
排序
-
+
@@ -120,10 +121,10 @@
- {{index + 1}}
+ {{index + 1}}
{{item.SERVERPART_NAME}}
- {{item.EXAMINE_MQUARTER!=='0'?item.EXAMINE_MQUARTER==='1'?'一'+'季度':item.EXAMINE_MQUARTER==='2'?'二'+'季度':item.EXAMINE_MQUARTER==='3'?'三'+'季度':'四' + '季度':'月度'}}
+ {{item.EXAMINE_MQUARTER}}
@@ -132,9 +133,9 @@
{{ subItem.REGION_NAME }}
- {{subItem.SERVERPARTList[0].EXAMINE_SCORE}}分
+ {{subItem.EXAMINE_SCORE}}分
-
+
@@ -149,7 +150,7 @@
服务区排名
排序
-
+
@@ -159,23 +160,24 @@
-
+
- {{index+1}}
- 黄山服务区
+ {{index+1}}
+ {{item.SERVERPART_NAME}}
- 1
- /6
+ {{item.first}}
+ /
+ {{item.second}}
- 广场、洗漱台、绿化带、宣传栏、标识标牌、垃圾桶、玻璃门窗、镜面保洁
+ {{item.EXAMINE_DESC}}
@@ -186,123 +188,105 @@
-
-
-
-
-
-
-
-
- 整改前
-
- 整改后
-
- 暂未整改完成
-
+