From fde37d20d715a4300ba36ef1f57d6399a6401a59 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 14 三月 2023 10:27:46 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/intelligentPatrol/statistics/unlawful/type/index.vue | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
index 5c69bec..ce894c3 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template xmlns="http://www.w3.org/1999/html">
<div class="list">
<header>
<div class="header-content">
@@ -13,6 +13,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</div>
@@ -40,8 +41,11 @@
<div class="main-content">
<!-- 鏁版嵁灞曠ず -->
<el-table
+ border
+ stripe
ref="multipleTable"
:header-cell-style="{
+ 'background':'#F5F5F5',
'font-weight': '650',
'line-height': '45px',
}"
@@ -148,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 => {
@@ -157,7 +162,7 @@
const blob = new Blob([res.data], {
type: "application/vnd.ms-excel;charset=utf-8",
});
- debugger
+
if (window.navigator.msSaveBlob) {
window.navigator.msSaveBlob(blob, deathdate+"鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx");
} else {
@@ -173,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) {
@@ -190,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;
@@ -218,15 +228,15 @@
<style lang="scss" scoped>
.list {
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
color: #4b9bb7;
-
+ border: 1px solid #ccc;
header {
background-color: white;
- border: 1pox solid #fff;
+ border: 1px solid #fff;
.header-content {
- padding: 0 40px;
+ //padding: 0 40px;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -363,7 +373,7 @@
// font-size: 10px;
.operation {
display: flex;
-
+ color: var(--operation-color);
.line {
padding: 0 5px;
}
@@ -375,4 +385,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0