From c6b75277a31069e1dd0eb6ca41a5e9513a8e76dd Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Thu, 26 Aug 2021 21:45:00 +0800
Subject: [PATCH] 表完善
---
src/views/securityUnitOperation/securityEchart.js | 12 +++---
src/views/statisticalQueryManagement/businessStatistics.vue | 8 +--
src/views/statisticalQueryManagement/companyDetails.vue | 9 ++--
src/views/statisticalQueryManagement/securityGuardDetail.vue | 28 +++++++-------
src/views/statisticalQueryManagement/businessStatisticsDetail.vue | 3 +
src/api/statisticalQueryManagement/statisticalQueryManagement.js | 20 +++++++++
src/views/securityUnitOperation/economicTable.vue | 12 ++++-
src/views/securityUnitOperation/operationAnalysis.vue | 4 +-
8 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/src/api/statisticalQueryManagement/statisticalQueryManagement.js b/src/api/statisticalQueryManagement/statisticalQueryManagement.js
index f7cef62..97dc11d 100644
--- a/src/api/statisticalQueryManagement/statisticalQueryManagement.js
+++ b/src/api/statisticalQueryManagement/statisticalQueryManagement.js
@@ -34,4 +34,22 @@
method: "post",
params: params
});
-};
\ No newline at end of file
+};
+// 查保安员明细
+export const pageSecurity = (params) => {
+ return request({
+ url: "/api/blade-user/page-security",
+ method: "get",
+ params: params
+ });
+};
+
+// 服务对象明细
+export const fwList = (params) => {
+ return request({
+ url: "/api/dispatcherUnit/list",
+ method: "get",
+ params: params
+ });
+};
+
diff --git a/src/views/securityUnitOperation/economicTable.vue b/src/views/securityUnitOperation/economicTable.vue
index f548efd..14d8bda 100644
--- a/src/views/securityUnitOperation/economicTable.vue
+++ b/src/views/securityUnitOperation/economicTable.vue
@@ -179,7 +179,10 @@
{
label: "社保缴纳总额（万）",
prop: "sbcount",
- display: false
+ display: false,
+ formatter: function(row, value) {
+ return (value = value / 10000);
+ }
},
{
label: "公司派遣人数",
@@ -187,9 +190,12 @@
display: false
},
{
- label: "社保缴纳人数占比（%）",
+ label: "社保缴纳人数占比",
prop: "zb",
- display: false
+ display: false,
+ formatter: function(row, value) {
+ return (value = value * 100 + "%");
+ }
},
{
label: "备注",
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index 0f7250b..b6985de 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -60,11 +60,11 @@
<span>{{ card.czBaoan }}</span>
<span>较上月增加{{ card.addczBaoan }}人</span>
</div>
- <div class="box-card">
+ <!-- <div class="box-card">
<span>过考保安员</span>
<span>{{ card.gkBaoan }}</span>
<span>较上月增加{{ card.addgkBaoan }}人</span>
- </div>
+ </div> -->
<div class="box-card">
<span>服务客户</span>
<span>{{ card.kh }}</span>
diff --git a/src/views/securityUnitOperation/securityEchart.js b/src/views/securityUnitOperation/securityEchart.js
index bc5d30b..9184b69 100644
--- a/src/views/securityUnitOperation/securityEchart.js
+++ b/src/views/securityUnitOperation/securityEchart.js
@@ -323,12 +323,12 @@
barWidth: 9,
data: chiz
},
- {
- name: "过考保安数",
- type: "bar",
- barWidth: 9,
- data: []
- },
+ // {
+ // name: "过考保安数",
+ // type: "bar",
+ // barWidth: 9,
+ // data: []
+ // },
{
name: "缴纳社保保安数",
type: "bar",
diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index f947ead..1cdfe32 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -188,15 +188,13 @@
this.$router.push({
path:
"/statisticalQueryManagement/businessStatisticsDetail?&departmentid=" +
- row.departmentid +
- "&jurisdiction=" +
- row.jurisdiction
+ row.departmentid
});
} else if (column.label == "保安员人数") {
this.$router.push({
path:
- "/statisticalQueryManagement/securityGuardDetail?enterpriseName=" +
- row.enterpriseName
+ "/statisticalQueryManagement/securityGuardDetail?departmentid=" +
+ row.departmentid
});
}
},
diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index d6e0739..802ecc6 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
@@ -22,7 +22,8 @@
import { mapGetters } from "vuex";
import {
selectDis,
- selectFw
+ selectFw,
+ fwList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
export default {
diff --git a/src/views/statisticalQueryManagement/companyDetails.vue b/src/views/statisticalQueryManagement/companyDetails.vue
index 478d1cf..36724c4 100644
--- a/src/views/statisticalQueryManagement/companyDetails.vue
+++ b/src/views/statisticalQueryManagement/companyDetails.vue
@@ -297,7 +297,8 @@
]
},
companyName: "",
- loading: true
+ loading: true,
+ deptid:''
};
},
computed: {
@@ -340,7 +341,7 @@
// params = { current: page.currentPage, size: page.pageSize };
// }
let param = {};
- param["deptid"] = params["deptid"] || "";
+ param["deptid"] = this.deptid;
param["name"] = params["real_name"] || "";
param["hold"] =
params["hold"] || params["hold"] == "0" ? Number(params["hold"]) : "";
@@ -377,8 +378,8 @@
let mm = urlArr[i].split("=");
object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
}
- let deptid = object["deptid"] || "";
- this.query = { deptid: deptid };
+ this.deptid = object["deptid"] || "";
+ this.query = { deptid: this.deptid };
this.onLoad(this.page, this.query);
}
},
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 478ab5f..f9e009c 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -21,7 +21,7 @@
</template>
<script>
import { mapGetters } from "vuex";
-import { getListSecurity } from "@/api/system/user";
+import { pageSecurity } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
export default {
name: "保安员明细",
data() {
@@ -123,8 +123,8 @@
label: "保安公司",
prop: "deptName",
// width: 120,
- search: true,
- searchSpan: 4,
+ // search: true,
+ // searchSpan: 4,
overHidden: true,
slot: true,
display: false
@@ -282,15 +282,15 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- debugger
this.loading = true;
- params["deptName"] = params["enterpriseName"];
- params["jurisdiction"] = this.jurisdiction;
- getListSecurity(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then(res => {
+ let param = {};
+ param["realName"] = params["realName"] || "";
+ param["status"] = params["status"] || "";
+ param["deptId"] = this.deptid;
+ param["hold"] = params["hold"] || "";
+ param["current"] = page.currentPage;
+ param["size"] = page.pageSize;
+ pageSecurity(param).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -305,9 +305,9 @@
let mm = urlArr[i].split("=");
object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
}
- let enterpriseName = object["enterpriseName"] || "";
- this.query = { enterpriseName: enterpriseName };
- this.onLoad(this.page, this.query);
+ this.deptid = object["departmentid"] || "";
+ this.query = { deptid: this.deptid };
+ this.onLoad(this.page, this.query);
// this.onLoad(this.page, this.query);
}
},
--
Gitblit v1.9.3