From c12a6cdcbbef8ebcb07db87bbb702b7c4e792815 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 17 Sep 2021 23:43:37 +0800
Subject: [PATCH] 改接口
---
src/views/home/index.vue | 6 ++++++
src/api/index/index.js | 12 +++++++++---
src/views/securityUnitOperation/economicAnalysis.vue | 2 +-
src/views/statisticalQueryManagement/businessStatisticsPq.vue | 2 +-
src/views/securityUnitOperation/operationAnalysis.vue | 12 ++++++++++--
5 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/api/index/index.js b/src/api/index/index.js
index 162ebb1..ac53e9d 100644
--- a/src/api/index/index.js
+++ b/src/api/index/index.js
@@ -47,10 +47,16 @@
params: params
});
};
+// export const selectFj = () => {
+// return request({
+// url: "/api/information/selectFj",
+// method: "post"
+// });
+// };
export const selectFj = () => {
return request({
- url: "/api/information/selectFj",
- method: "post"
+ url: "/api/information/selectSubstationWarnInfo",
+ method: "get"
});
};
export const selectBx = params => {
@@ -217,4 +223,4 @@
method: "get",
params: params
});
-};
\ No newline at end of file
+};
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 65c8b45..ee88dd9 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -601,6 +601,12 @@
label="预警信息内容"
:show-overflow-tooltip="true"
></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="znum"
+ label="数量（条）"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
</template>
<template v-if="gridData.type === 'ywdx_gs'">
<el-table-column :key="gridData.type" type="index"> </el-table-column>
diff --git a/src/views/securityUnitOperation/economicAnalysis.vue b/src/views/securityUnitOperation/economicAnalysis.vue
index 63e769c..cc68ba9 100644
--- a/src/views/securityUnitOperation/economicAnalysis.vue
+++ b/src/views/securityUnitOperation/economicAnalysis.vue
@@ -413,7 +413,7 @@
this.showcurTable(type);
},
showcurTable(type) {
- this.dialogloading = true;
+ // this.dialogloading = true;
this.dialogTableVisible = true;
if (type === "sb") {
this.gridData.title = "社保缴纳预警保安公司";
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index d5a2aad..b7360e7 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -198,7 +198,6 @@
:key="gridData.type"
prop="enterprisename"
label="保安公司名称"
- width="180"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
@@ -223,6 +222,7 @@
:key="gridData.type"
prop="pnum"
label="派遣比例"
+ :formatter="kslFormatter"
:show-overflow-tooltip="true"
></el-table-column>
<!-- <el-table-column
@@ -263,6 +263,7 @@
:key="gridData.type"
prop="pnum"
label="持证比例"
+ :formatter="kslFormatter"
:show-overflow-tooltip="true"
></el-table-column>
<!-- <el-table-column
@@ -394,6 +395,13 @@
};
},
methods: {
+ kslFormatter(row) {
+ if (row.pnum && row.pnum !== "0") {
+ return row.pnum + "%";
+ } else {
+ return row.pnum;
+ }
+ },
changePage() {
this.showcurTable(this.gridData.type);
},
@@ -404,8 +412,8 @@
this.showcurTable(type);
},
showcurTable(type) {
- this.dialogloading = true;
this.dialogTableVisible = true;
+ // this.dialogloading = true;
if (type === "fw") {
this.gridData.title = "服务对象预警保安公司";
this.getSecurityUnitServerLessPage();
diff --git a/src/views/statisticalQueryManagement/businessStatisticsPq.vue b/src/views/statisticalQueryManagement/businessStatisticsPq.vue
index 03d2435..ddba4e3 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsPq.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsPq.vue
@@ -132,7 +132,7 @@
},
{
label: "保安员姓名",
- prop: "realName",
+ prop: "securityName",
display: false
},
{
--
Gitblit v1.9.3