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.scss | 6 +
src/views/statisticalQueryManagement/businessStatistics.vue | 38 ++++++++-
src/views/home/index.vue | 41 ++++++---
src/views/statisticalQueryManagement/companyDetails.vue | 35 +++++---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 49 +++++------
src/views/home/indexEchart.js | 4
src/views/statisticalQueryManagement/securityGuardStatistics.vue | 49 +++++++++++-
src/api/statisticalQueryManagement/statisticalQueryManagement.js | 8 ++
src/views/securityUnitOperation/economicTable.vue | 1
src/views/securityUnitOperation/operationTable.vue | 1
10 files changed, 165 insertions(+), 67 deletions(-)
diff --git a/src/api/statisticalQueryManagement/statisticalQueryManagement.js b/src/api/statisticalQueryManagement/statisticalQueryManagement.js
index 97dc11d..f21e114 100644
--- a/src/api/statisticalQueryManagement/statisticalQueryManagement.js
+++ b/src/api/statisticalQueryManagement/statisticalQueryManagement.js
@@ -53,3 +53,11 @@
});
};
+// 单位类型
+export const dictionaryList = () => {
+ return request({
+ url: "/api/blade-system/dict-biz/dictionary?code=stats",
+ method: "get",
+ });
+};
+
diff --git a/src/views/home/index.scss b/src/views/home/index.scss
index 54ce94a..ee94929 100644
--- a/src/views/home/index.scss
+++ b/src/views/home/index.scss
@@ -598,9 +598,12 @@
}
.leftEchartTitle4 {
margin-top: 37px;
- right: 22px;
+ right: 36px;
.block1 {
background: #ffb980;
+ }
+ span:nth-child(2) {
+ width: 77px;
}
span:nth-child(3) {
color: #ffb980;
@@ -706,4 +709,3 @@
height: 77%;
}
}
-
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;
});
},
// 经营不善
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index a8e5459..a57fda2 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -112,7 +112,7 @@
data: data2
},
{
- name: "保安服务公司",
+ name: "本市保安公司",
type: "bar",
stack: "total",
emphasis: {
@@ -130,7 +130,7 @@
data: data4
},
{
- name: "跨区域保安公司",
+ name: "分公司",
type: "bar",
stack: "total",
emphasis: {
diff --git a/src/views/securityUnitOperation/economicTable.vue b/src/views/securityUnitOperation/economicTable.vue
index 14d8bda..7d0292b 100644
--- a/src/views/securityUnitOperation/economicTable.vue
+++ b/src/views/securityUnitOperation/economicTable.vue
@@ -137,6 +137,7 @@
prop: "enterpriseName",
search: true,
searchSpan: 4,
+ width:300,
display: false
},
{
diff --git a/src/views/securityUnitOperation/operationTable.vue b/src/views/securityUnitOperation/operationTable.vue
index 2f33644..c196896 100644
--- a/src/views/securityUnitOperation/operationTable.vue
+++ b/src/views/securityUnitOperation/operationTable.vue
@@ -153,6 +153,7 @@
prop: "enterpriseName",
search: true,
searchSpan: 4,
+ width:300,
display: false
},
{
diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index 1cdfe32..0731965 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -26,7 +26,10 @@
import FileSaver from "file-saver";
import XLSX from "xlsx";
import { mapGetters } from "vuex";
-import { selectYw } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
+import {
+ selectYw,
+ dictionaryList
+} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
export default {
name: "业务情况统计",
@@ -85,7 +88,19 @@
searchSpan: 4,
display: false
},
-
+ {
+ label: "单位类型",
+ prop: "stats",
+ search: true,
+ searchSpan: 4,
+ display: false,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dicData: []
+ },
{
label: "所属辖区",
prop: "jurname",
@@ -145,6 +160,17 @@
}
});
},
+ getDictionaryList() {
+ dictionaryList().then(res => {
+ if (res.data.code === 200) {
+ this.tableOption.column.forEach(item => {
+ if (item.label == "单位类型") {
+ item.dicData = res.data.data;
+ }
+ });
+ }
+ });
+ },
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
@@ -170,10 +196,9 @@
onLoad(page, params = {}) {
this.loading = true;
let param = {};
- param["jurisdiction"] = params["jurname"] ? params["jurname"] : "";
- param["deptid"] = params["enterpriseName"]
- ? params["enterpriseName"]
- : "";
+ param["jurisdiction"] = params["jurname"] || "";
+ param["deptid"] = params["enterpriseName"] || "";
+ param["stats"] = params["stats"] || "";
param["current"] = page.currentPage;
param["size"] = page.pageSize;
selectYw(param).then(res => {
@@ -205,6 +230,7 @@
},
mounted() {
this.getSubOfficeData();
+ this.getDictionaryList();
}
};
</script>
diff --git a/src/views/statisticalQueryManagement/companyDetails.vue b/src/views/statisticalQueryManagement/companyDetails.vue
index 36724c4..fb8c354 100644
--- a/src/views/statisticalQueryManagement/companyDetails.vue
+++ b/src/views/statisticalQueryManagement/companyDetails.vue
@@ -81,43 +81,52 @@
// dateBtn: true,
align: "center",
height: "auto",
- calcHeight: 90,
+ calcHeight: 30,
tip: false,
searchShowBtn: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 3,
index: true,
viewBtn: true,
dialogClickModal: false,
column: [
{
label: "保安姓名",
- searchLabelWidth: 110,
+ // searchLabelWidth: 90,
prop: "real_name",
search: true,
- searchSpan: 4,
+ searchSpan: 3,
+ display: false
+ },
+ {
+ label: "所属保安公司",
+ prop: "enterpriseName",
+ width: 300,
display: false
},
{
label: "保安证编号",
prop: "securitynumber",
+ width: 180,
display: false
},
{
label: "身份证号",
prop: "cardid",
+ width: 180,
display: false
},
{
label: "联系方式",
prop: "phone",
+ width: 180,
display: false
},
{
label: "是否持证",
prop: "hold",
- searchSpan: 4,
+ searchSpan: 3,
type: "select",
props: {
label: "label",
@@ -151,7 +160,7 @@
{
label: "是否缴纳社保",
// labelWidth: 120,
- searchLabelWidth: 110,
+ searchLabelWidth: 100,
prop: "soil",
searchSpan: 4,
type: "select",
@@ -210,7 +219,7 @@
},
{
label: "资格审查情况",
- searchLabelWidth: 110,
+ searchLabelWidth: 100,
prop: "examination_type",
searchSpan: 4,
type: "select",
@@ -269,7 +278,7 @@
{
label: "是否派遣",
prop: "dispatch",
- searchSpan: 4,
+ searchSpan: 3,
type: "select",
props: {
label: "label",
@@ -298,7 +307,7 @@
},
companyName: "",
loading: true,
- deptid:''
+ deptid: ""
};
},
computed: {
@@ -369,7 +378,7 @@
this.loading = false;
});
},
-
+
getLocationParams() {
let url = window.location.href;
let urlArr = url.split("?")[1].split("&");
@@ -390,7 +399,7 @@
};
</script>
<style lang="scss" scoped>
-/deep/ .avue-crud__menu {
- height: 130px !important;
-}
+// /deep/ .avue-crud__menu {
+// height: 130px !important;
+// }
</style>
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index f9e009c..4f05081 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -95,8 +95,7 @@
prop: "realName",
search: true,
searchSpan: 4,
- display: false,
- width: 78
+ display: false
},
{
label: "性别",
@@ -116,13 +115,12 @@
}
],
slot: true,
- display: false,
- width: 48
+ display: false
},
{
label: "保安公司",
prop: "deptName",
- // width: 120,
+ width: 300,
// search: true,
// searchSpan: 4,
overHidden: true,
@@ -134,7 +132,8 @@
prop: "securitynumber",
display: false,
searchSpan: 5,
- searchLabelWidth: 110
+ searchLabelWidth: 110,
+ width: 180
// search: true,
},
{
@@ -142,37 +141,37 @@
prop: "cardid",
slot: true,
display: false,
- width: 145
+ width: 180
},
{
label: "联系方式",
prop: "phone",
slot: true,
display: false,
- width: 100
+ width: 180
},
- {
- label: "联系地址",
- prop: "address",
- slot: true,
- display: false,
- hide: true
- },
+ // {
+ // label: "联系地址",
+ // prop: "address",
+ // slot: true,
+ // display: false,
+ // hide: true
+ // },
{
label: "入职时间",
prop: "rtime",
slot: true,
display: false,
- width: 82
+ width: 180
},
- {
- label: "所属角色",
- prop: "roleName",
- slot: true,
- display: false,
- width: 78,
- hide: true
- },
+ // {
+ // label: "所属角色",
+ // prop: "roleName",
+ // slot: true,
+ // display: false,
+ // width: 78,
+ // hide: true
+ // },
// {
// label: "所属辖区",
@@ -213,7 +212,6 @@
],
slot: true,
display: false,
- width: 70
},
{
label: "是否持证",
@@ -237,7 +235,6 @@
],
slot: true,
display: false,
- width: 70
}
]
},
diff --git a/src/views/statisticalQueryManagement/securityGuardStatistics.vue b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
index 07c9f6a..7bb6353 100644
--- a/src/views/statisticalQueryManagement/securityGuardStatistics.vue
+++ b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
@@ -23,7 +23,10 @@
import FileSaver from "file-saver";
import XLSX from "xlsx";
import { mapGetters } from "vuex";
-import { selectLi } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
+import {
+ selectLi,
+ dictionaryList
+} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
export default {
name: "业务情况统计",
@@ -100,13 +103,27 @@
prop: "deptname",
search: true,
searchSpan: 4,
+ width: 300,
display: false
+ },
+ {
+ label: "单位类型",
+ prop: "stats",
+ search: true,
+ searchSpan: 4,
+ display: false,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dicData: []
},
{
label: "所属辖区",
prop: "jurname",
searchSpan: 4,
- type: "select",
+ type: "tree",
props: {
label: "title",
value: "value"
@@ -207,11 +224,33 @@
if (res.data.code === 200) {
this.tableOption.column.forEach(item => {
if (item.label == "所属辖区") {
+ // let data = res.data.data;
item.dicData = res.data.data;
}
});
} else {
this.$message.error(res.msg);
+ }
+ });
+ },
+ // searchChildren(data) {
+ // data.forEach(item => {
+ // if(item.hasChildren)(
+
+ // )
+ // else {
+ // this.searchChildren()
+ // }
+ // });
+ // },
+ getDictionaryList() {
+ dictionaryList().then(res => {
+ if (res.data.code === 200) {
+ this.tableOption.column.forEach(item => {
+ if (item.label == "单位类型") {
+ item.dicData = res.data.data;
+ }
+ });
}
});
},
@@ -228,11 +267,11 @@
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
- this.onLoad(this.page, this.query)
+ this.onLoad(this.page, this.query);
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
- this.onLoad(this.page, this.query)
+ this.onLoad(this.page, this.query);
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -242,6 +281,7 @@
let param = {};
param["jurisdiction"] = params["jurname"] || "";
param["deptid"] = params["deptname"] || "";
+ param["stats"] = params["stats"] || "";
param["current"] = page.currentPage;
param["size"] = page.pageSize;
selectLi(param).then(res => {
@@ -259,6 +299,7 @@
},
mounted() {
this.getSubOfficeData();
+ this.getDictionaryList();
}
};
</script>
--
Gitblit v1.9.3