From cec9008c7bdbb373c400d53330642be3891a84d5 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 24 二月 2023 16:56:57 +0800
Subject: [PATCH] 2023/2/24 肖辉 屏蔽门前三包统计 修改重置按钮
---
src/views/intelligentPatrol/statistics/unlawful/time/index.vue | 14 +++++--
src/components/seachHeader/index.vue | 5 ++
src/views/intelligentPatrol/statistics/unlawful/type/index.vue | 19 ++++++---
src/App.vue | 4 ++
src/views/layout/components/Menu/index.vue | 2
src/views/intelligentPatrol/statistics/unlawful/area/index.vue | 15 +++++--
src/views/intelligentPatrol/statistics/unlawful/point/index.vue | 15 +++++--
7 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ba2c5d2..32de82a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -141,6 +141,10 @@
.list{
height: 100%;
overflow: auto;
+ header{
+ background-color: transparent;
+ border: none
+ }
}
// 璁剧疆寮瑰嚭妗嗘牱寮�
.el-dialog__title {
diff --git a/src/components/seachHeader/index.vue b/src/components/seachHeader/index.vue
index 2ec306f..d8836b9 100644
--- a/src/components/seachHeader/index.vue
+++ b/src/components/seachHeader/index.vue
@@ -70,6 +70,7 @@
@click="dialogCreate()"
>娣诲姞</el-button
>
+ <el-button type="primary" @click="resetAll">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- <div>-->
@@ -138,6 +139,10 @@
this.getCommunityOptions()
},
methods: {
+ resetAll(){
+ this.seachData = {}
+ this.$emit('getUserList', { seachData: this.seachData });
+ },
handleChange(value) {
console.log(value);
},
diff --git a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
index 35ba7f2..0048a17 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
@@ -13,6 +13,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</div>
@@ -144,6 +145,7 @@
this.$axios({
method: "post",
url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+ // url: `sccg/intelligentPatrol/statistics/export/unlawful/street`,
responseType: "arraybuffer",
}).then((res) => {
let time = new Date();
@@ -166,8 +168,13 @@
this.$message.success("鎿嶄綔鎴愬姛");
});
},
- setTableDataHandle(e) {},
- resetTableData(e) {},
+ setTableDataHandle(e) {
+ this.setTableData()
+ },
+ resetTableData(e) {
+ this.value2= ''
+ this.setTableData()
+ },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -183,8 +190,8 @@
this.searchByArea({
currentPage,
pageSize,
- beginTime: "2022-05-01 00:00:00",
- endTime: "2022-09-01 00:00:00",
+ beginTime: this.value2[0],
+ endTime:this.value2[1],
}).then((res) => {
this.list = res.records;
this.totalNum = res.total;
diff --git a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
index 9b1cbc2..adc12db 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
@@ -13,6 +13,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</div>
@@ -154,6 +155,7 @@
this.$axios({
method: "post",
url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+ // url: `sccg/intelligentPatrol/statistics/export/unlawful/site`,
responseType: "arraybuffer",
}).then((res) => {
let time = new Date();
@@ -176,8 +178,13 @@
this.$message.success("鎿嶄綔鎴愬姛");
});
},
- setTableDataHandle(e) {},
- resetTableData(e) {},
+ setTableDataHandle(e) {
+ this.setTableData()
+ },
+ resetTableData(e) {
+ this.value2= ''
+ this.setTableData()
+ },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -193,8 +200,8 @@
this.searchByPoint({
currentPage,
pageSize,
- beginTime: "2022-05-01 00:00:00",
- endTime: "2022-09-01 00:00:00",
+ beginTime: this.value2[0],
+ endTime:this.value2[1],
}).then((res) => {
this.list = res.records;
this.totalNum = res.total;
diff --git a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
index 28960f5..4c4ba61 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
@@ -13,6 +13,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</div>
@@ -167,8 +168,13 @@
this.$message.success('鎿嶄綔鎴愬姛');
})
},
- setTableDataHandle(e) {},
- resetTableData(e) {},
+ setTableDataHandle(e) {
+ this.setTableData()
+ },
+ resetTableData(e) {
+ this.value2= ''
+ this.setTableData()
+ },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -184,8 +190,8 @@
this.searchByTime({
currentPage,
pageSize,
- beginTime:'2022-05-01 00:00:00',
- endTime:'2022-09-01 00:00:00'
+ beginTime: this.value2[0],
+ endTime:this.value2[1],
}).then((res) => {
this.list = res.records;
this.totalNum = res.total;
diff --git a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
index 95276b4..ce894c3 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
@@ -13,6 +13,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</div>
@@ -151,7 +152,8 @@
handleExport(e) {
this.$axios({
method: 'post',
- url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+ // url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+ url: `sccg/intelligentPatrol/statistics/export/unlawful/type`,
responseType: 'arraybuffer'
})
.then(res => {
@@ -160,7 +162,7 @@
const blob = new Blob([res.data], {
type: "application/vnd.ms-excel;charset=utf-8",
});
-
+
if (window.navigator.msSaveBlob) {
window.navigator.msSaveBlob(blob, deathdate+"鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx");
} else {
@@ -176,8 +178,13 @@
this.$message.success('鎿嶄綔鎴愬姛');
})
},
- setTableDataHandle(e) {},
- resetTableData(e) {},
+ setTableDataHandle(e) {
+ this.setTableData()
+ },
+ resetTableData(e) {
+ this.value2= ''
+ this.setTableData()
+ },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -193,8 +200,8 @@
this.searchByType({
currentPage,
pageSize,
- beginTime:'2022-05-01 00:00:00',
- endTime:'2022-09-01 00:00:00'
+ beginTime: this.value2[0],
+ endTime:this.value2[1],
}).then((res) => {
this.list = res.records;
this.totalNum = res.total;
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index 90d3997..b92563b 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -38,7 +38,7 @@
:key="thirdMenu.id"
:index="`${thirdMenu.id}`"
:route="{ name: thirdMenu.url }"
- v-if="thirdMenu.id!='63'&&thirdMenu.id!='65'"
+ v-if="thirdMenu.id!='65'"
>
<template>
{{thirdMenu.title }}
--
Gitblit v1.8.0