From 478947a847fb71c054ddb4cf1e2cf3ee83aeee77 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 30 Aug 2021 11:51:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/home/index.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 0ce51eb..599b38d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -26,7 +26,7 @@
</div>
<div class="leftEchartTitle leftEchartTitle3">
<div class="block1"></div>
- <span>保安服务公司</span>
+ <span>本市保安公司</span>
<span>{{ leftData.fw }}</span>
<span>个</span>
</div>
@@ -38,7 +38,7 @@
</div> -->
<div class="leftEchartTitle leftEchartTitle4">
<div class="block1"></div>
- <span>跨区域保安公司</span>
+ <span>分公司</span>
<span>{{ leftData.kqy }}</span>
<span>个</span>
</div>
@@ -767,17 +767,17 @@
return "警告";
} else if (row.punishtype === "1") {
return "罚款";
- }else if (row.punishtype === "2") {
+ } else if (row.punishtype === "2") {
return "没收违法所得";
- }else if (row.punishtype === "3") {
+ } else if (row.punishtype === "3") {
return "没收非法财物";
- }else if (row.punishtype === "4") {
+ } else if (row.punishtype === "4") {
return "责令停止施工";
- }else if (row.punishtype === "5") {
+ } else if (row.punishtype === "5") {
return "责令停止使用";
- }else if (row.punishtype === "6") {
+ } else if (row.punishtype === "6") {
return "责令停止违法行为";
- }else if (row.punishtype === "7") {
+ } else if (row.punishtype === "7") {
return "责令停业";
}
},
@@ -1126,7 +1126,7 @@
let params = {
current: this.gridData.current,
size: 10,
- jurisdiction: this.value1
+ jurisdiction: this.value2
};
punishList(params).then(res => {
if (res.data.code === 200) {
@@ -1178,13 +1178,26 @@
},
// 公司受处罚数量
getPunishNum() {
- selectCf({ jurisdiction: this.value2 }).then(res => {
+ // selectCf({ jurisdiction: this.value2 }).then(res => {
+ // if (res.data.code === 200) {
+ // this.rightData.punishNum = res.data.data.count;
+ // } else {
+ // this.$message.error(res.msg);
+ // }
+ // this.right2loading = false;
+ // });
+ let params = {
+ current: this.gridData.current,
+ size: 10,
+ jurisdiction: this.value2
+ };
+ punishList(params).then(res => {
if (res.data.code === 200) {
- this.rightData.punishNum = res.data.data.count;
- } else {
- this.$message.error(res.msg);
+ this.gridData.data = res.data.data.records;
+ this.gridData.total = res.data.data.total;
+ this.rightData.punishNum = res.data.data.total;
}
- this.right2loading = false;
+ this.dialogloading = false;
});
},
// 经营不善
--
Gitblit v1.9.3