From 9439798eec8ae3fe8a0e9d26f0943595c4233e84 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Sun, 14 Nov 2021 17:52:12 +0800
Subject: [PATCH] 表格加序号，首页加弹窗表格
---
src/views/statisticalQueryManagement/businessStatistics.vue | 48 ++++---
src/views/statisticalQueryManagement/businessStatisticsFwdq.vue | 1
src/views/statisticalQueryManagement/securityGuardDetail.vue | 1
src/views/statisticalQueryManagement/securityGuardStatistics.vue | 49 ++++----
src/views/securityUnitOperation/economicAnalysis.vue | 18 +-
src/views/home/index.vue | 170 ++++++++++++++++++----------
src/api/index/index.js | 8 +
src/views/statisticalQueryManagement/companyDetails.vue | 1
src/views/home/indexEchart.js | 2
src/views/statisticalQueryManagement/businessStatisticsDetail.vue | 1
src/views/statisticalQueryManagement/businessStatisticsPq.vue | 5
src/views/securityUnitOperation/economicTable.vue | 1
src/views/securityUnitOperation/operationAnalysis.vue | 4
src/views/securityUnitOperation/operationTable.vue | 1
14 files changed, 190 insertions(+), 120 deletions(-)
diff --git a/src/api/index/index.js b/src/api/index/index.js
index e8b9c13..7bae3f0 100644
--- a/src/api/index/index.js
+++ b/src/api/index/index.js
@@ -150,3 +150,11 @@
method: "get"
});
};
+// 各辖区单位统计情况模块表格接口
+export const getSecurityUnitInfoPage = params => {
+ return request({
+ url: "/api/information/getSecurityUnitInfoPage",
+ method: "get",
+ params: params
+ });
+};
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4a07c9b..f6e0e4e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -239,7 +239,7 @@
<avue-input-tree
default-expand-all
v-model="value1"
- placeholder="请选择内容"
+ placeholder="南昌市公安局"
type="tree"
:dic="options1"
:props="props"
@@ -391,7 +391,13 @@
>
<el-table :data="gridData.data">
<template v-if="gridData.type === 'zg'">
- <el-table-column :key="gridData.type" type="index"> </el-table-column>
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
<el-table-column
:key="gridData.type"
prop="realName"
@@ -463,7 +469,13 @@
></el-table-column>
</template>
<template v-if="gridData.type === 'wg'">
- <el-table-column :key="gridData.type" type="index"> </el-table-column>
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
<el-table-column
:key="gridData.type"
prop="enterpriseName"
@@ -491,7 +503,6 @@
:show-overflow-tooltip="true"
width="150"
>
-
</el-table-column>
<el-table-column
:key="gridData.type"
@@ -509,7 +520,13 @@
></el-table-column>
</template>
<template v-if="gridData.type === 'jy'">
- <el-table-column :key="gridData.type" type="index"> </el-table-column>
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
<el-table-column
:key="gridData.type"
prop="enterpriseName"
@@ -560,7 +577,13 @@
></el-table-column>
</template>
<template v-if="gridData.type === 'ym'">
- <el-table-column :key="gridData.type" type="index"> </el-table-column>
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
<el-table-column
:key="gridData.type"
prop="enterpriseName"
@@ -595,7 +618,13 @@
>gridData
</template>
<template v-if="gridData.type === 'jg'">
- <el-table-column :key="gridData.type" type="index"> </el-table-column>
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
<el-table-column
:key="gridData.type"
prop="enterpriseName"
@@ -630,6 +659,34 @@
label="处罚时间"
:show-overflow-tooltip="true"
width="100"
+ ></el-table-column>
+ </template>
+ <template v-if="gridData.type === 'ywdx_gs'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterprisename"
+ label="保安公司名称"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="stats"
+ label="保安公司类型"
+ :formatter="companyFormatter"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="jurisdictionName"
+ label="所属辖区"
+ :show-overflow-tooltip="true"
></el-table-column>
</template>
</el-table>
@@ -685,7 +742,8 @@
selectJy,
selectWg,
punishList,
- lazyTrees
+ lazyTrees,
+ getSecurityUnitInfoPage
} from "../../api/index/index";
import car from "@/assets/img/car.png";
@@ -769,7 +827,8 @@
// value: "departmentid"
// },
node1: {}, //选中的记录
- node2: {}
+ node2: {},
+ params: null
};
},
computed: {
@@ -825,7 +884,39 @@
return "责令停业";
}
},
-
+ shoeDialog1(type) {
+ this.gridData.data = [];
+ this.gridData.total = 0;
+ this.gridData.current = 1;
+ this.gridData.type = type;
+ this.showDialogTable(type);
+ },
+ showDialogTable(type) {
+ let param = this.params;
+ this.dialogTableVisible = true;
+ this.dialogloading = true;
+ if (type === "ywdx_gs") {
+ this.gridData.title = param.name + "保安公司统计";
+ if (param.name) {
+ let arr = this.options1[0].children.filter(
+ a => a.title === param.name
+ );
+ if (arr[0] && arr[0].id) {
+ getSecurityUnitInfoPage({
+ jurisdiction: arr[0].id,
+ current: this.gridData.current,
+ size: 10
+ }).then(res => {
+ if (res.data.code === 200) {
+ this.gridData.data = res.data.data.records;
+ this.gridData.total = res.data.data.total;
+ }
+ this.dialogloading = false;
+ });
+ }
+ }
+ }
+ },
// 左侧表的接口返回数据
initEchart() {
securityTotal().then(res => {
@@ -837,6 +928,10 @@
);
}
this.echarts.left1Echart.setOption(optionJs.left1Data(securityData));
+ this.echarts.left1Echart.on("click", params => {
+ this.params = params;
+ this.shoeDialog1("ywdx_gs");
+ });
} else {
this.$message.error(res.msg);
}
@@ -1033,56 +1128,6 @@
});
},
- initMap() {
- this.map = new Map({
- target: "map",
- layers: [
- // new Tile({
- // source: new OSM()
- // })
- new Tile({
- zIndex: 4,
- title: "影像",
- source: new XYZ({
- url:
- "http://t3.tianditu.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0" // 行政区划
- })
- }),
- new Tile({
- zIndex: 5,
- title: "道路+中文注记",
- source: new XYZ({
- url:
- "http://t3.tianditu.com/DataServer?T=cta_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0" // 注记
- })
- })
- ],
- view: new View({
- projection: "EPSG:4326",
- center: [115.892151, 28.676493],
- zoom: 10
- })
- });
- this.carVectorLayer = new VectorLayer({
- zIndex: 99,
- source: new VectorSource()
- });
-
- this.peoVectorLayer = new VectorLayer({
- zIndex: 99,
- source: new VectorSource()
- });
-
- this.gunVectorLayer = new VectorLayer({
- zIndex: 99,
- source: new VectorSource()
- });
- this.map.addLayer(this.carVectorLayer);
- this.map.addLayer(this.peoVectorLayer);
- this.map.addLayer(this.gunVectorLayer);
-
- this.getTableData(0);
- },
// 获取辖区列表
getOfficeData() {
lazyTrees().then(res => {
@@ -1113,7 +1158,8 @@
this.gridData.title = "资格异常人员清单";
this.getQualificationPages(1);
} else if (type === "wg") {
- this.gridData.title = "违规经营公司清单（持证人数低于50%、缴纳社保人数低于50%）";
+ this.gridData.title =
+ "违规经营公司清单（持证人数低于50%、缴纳社保人数低于50%）";
this.getWgTable();
} else if (type === "jy") {
this.gridData.title = "经营不善公司清单（服务对象数量为0）";
@@ -1203,6 +1249,8 @@
);
} else if (this.gridData.type === "jg") {
this.getPunishList(page);
+ } else if (this.gridData.type === "ywdx_gs") {
+ this.showDialogTable(this.gridData.type);
}
},
getQualificationPages(page) {
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 85434ae..b0c6a9f 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -103,7 +103,7 @@
data: data1
},
{
- name: "保安培训公司",
+ name: "保安培训学校",
type: "bar",
stack: "total",
emphasis: {
diff --git a/src/views/securityUnitOperation/economicAnalysis.vue b/src/views/securityUnitOperation/economicAnalysis.vue
index 6dbc91e..37d6d57 100644
--- a/src/views/securityUnitOperation/economicAnalysis.vue
+++ b/src/views/securityUnitOperation/economicAnalysis.vue
@@ -78,14 +78,18 @@
<div class="box-card">
<template v-if="socialSecurity.money / 10000 > 1">
<span>社保缴纳总额(万元)</span>
- <span>{{ (socialSecurity.money / 10000).toFixed(2) }}</span>
+ <span>{{ (socialSecurity.money / 10000).toFixed(0) }}</span>
</template>
<template v-else>
<span>社保缴纳总额(元)</span>
- <span>{{ socialSecurity.money }}</span>
+ <span>{{ Number(socialSecurity.money).toFixed(0) }}</span>
</template>
- <span>较上月增加{{ socialSecurity.addMoney }}元</span>
+ <span
+ >较上月增加{{
+ Number(socialSecurity.addMoney).toFixed(0)
+ }}元</span
+ >
</div>
<div class="box-card">
<span>公司派遣人数</span>
@@ -269,8 +273,8 @@
let data = res.data.data[0];
this.socialSecurity.num = data.znum;
this.socialSecurity.addNum = data.thismouth;
- this.socialSecurity.money = data.tamountnum.toFixed(2);
- this.socialSecurity.addMoney = data.thisamount.toFixed(2);
+ this.socialSecurity.money = data.tamountnum.toFixed(0);
+ this.socialSecurity.addMoney = data.thisamount.toFixed(0);
this.socialSecurity.paiQ = data.userpcnum;
this.socialSecurity.addPaiQ = data.userpcthismouth;
this.socialSecurity.sheBPerson =
@@ -464,7 +468,7 @@
}
.select1 {
position: absolute;
- right: 302px;
+ right: 360px;
}
.select2 {
position: absolute;
@@ -475,7 +479,7 @@
right: 0px;
}
/deep/ .el-input__inner {
- width: 120px;
+ width: 180px;
}
}
.col-content {
diff --git a/src/views/securityUnitOperation/economicTable.vue b/src/views/securityUnitOperation/economicTable.vue
index 9fdd024..89a10c9 100644
--- a/src/views/securityUnitOperation/economicTable.vue
+++ b/src/views/securityUnitOperation/economicTable.vue
@@ -84,6 +84,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index f8c101b..dc37ab6 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -741,7 +741,7 @@
}
.select1 {
position: absolute;
- right: 302px;
+ right: 360px;
}
.select2 {
position: absolute;
@@ -752,7 +752,7 @@
right: 0px;
}
/deep/ .el-input__inner {
- width: 120px;
+ width: 180px;
}
}
.col-content {
diff --git a/src/views/securityUnitOperation/operationTable.vue b/src/views/securityUnitOperation/operationTable.vue
index 0f45c52..94e4468 100644
--- a/src/views/securityUnitOperation/operationTable.vue
+++ b/src/views/securityUnitOperation/operationTable.vue
@@ -89,6 +89,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index 550e88d..ea02f46 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -125,32 +125,11 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
- {
- label: "单位注册时间",
- prop: "releaseTimeRange",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchRange: true,
- searchSpan: 6,
- searchLabelWidth: 120,
- labelWidth:160,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [
- {
- required: true,
- message: "请选择单位注册时间",
- trigger: "blur",
- },
- ],
- },
+
{
label: "公司名称",
prop: "enterpriseName",
@@ -216,6 +195,29 @@
prop: "dqnum",
display: false,
},
+ {
+ label: "单位注册时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 120,
+ labelWidth:160,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择单位注册时间",
+ trigger: "blur",
+ },
+ ],
+ },
],
},
loading: true,
diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index 7fd9579..d04f3b6 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
@@ -94,6 +94,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue b/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
index 1f45bc6..025de21 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
@@ -64,6 +64,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/statisticalQueryManagement/businessStatisticsPq.vue b/src/views/statisticalQueryManagement/businessStatisticsPq.vue
index ddba4e3..0b940dd 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsPq.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsPq.vue
@@ -64,6 +64,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
@@ -99,13 +100,13 @@
{
label: "保安公司名称",
- prop: "dispatcherCompany",
+ prop: "deptName",
width: 300,
display: false
},
{
label: "服务单位名称",
- prop: "deptName",
+ prop: "dispatcherCompany",
width: 300,
props: {
label: "name",
diff --git a/src/views/statisticalQueryManagement/companyDetails.vue b/src/views/statisticalQueryManagement/companyDetails.vue
index 0a427ec..44c422e 100644
--- a/src/views/statisticalQueryManagement/companyDetails.vue
+++ b/src/views/statisticalQueryManagement/companyDetails.vue
@@ -89,6 +89,7 @@
searchShow: true,
searchMenuSpan: 10,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 4643d96..490f22a 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -89,6 +89,7 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
viewBtn: true,
dialogClickModal: false,
column: [
diff --git a/src/views/statisticalQueryManagement/securityGuardStatistics.vue b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
index 5ae1907..b6c3499 100644
--- a/src/views/statisticalQueryManagement/securityGuardStatistics.vue
+++ b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
@@ -121,31 +121,9 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
dialogClickModal: false,
column: [
- {
- label: "单位注册时间",
- prop: "releaseTimeRange",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchRange: true,
- searchSpan: 6,
- searchLabelWidth: 120,
- labelWidth:160,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [
- {
- required: true,
- message: "请选择单位注册时间",
- trigger: "blur",
- },
- ],
- },
{
label: "公司名称",
prop: "deptname",
@@ -208,6 +186,29 @@
trigger: "blur"
}
]
+ },
+ {
+ label: "单位注册时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 120,
+ labelWidth:160,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择单位注册时间",
+ trigger: "blur",
+ },
+ ],
},
{
label: "保安员总数",
@@ -368,7 +369,7 @@
handleRowClick(row, column, cell, event) {
if (column.label == "保安员总数") {
this.dialogTitle = "保安员明细";
- this.fwdeptId = row.dept_id;
+ this.fwdeptId = row.departmentid;
this.dialogShow = true;
} else {
this.dialogShow = false;
--
Gitblit v1.9.3