From 3a11109642961896bd5ae64ead123cf1a31e5216 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/danger/record.vue | 105 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 60 deletions(-)
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index c4a4062..9ccf39c 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -6,50 +6,36 @@
<el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎻愭姤浜虹粍缁�" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable
+ @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璐ｄ换閮ㄩ棬" prop="dutyCompanyName">
- <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable
+ @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="闅愭偅鍖哄煙" prop="areaId">
- <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable @change="search">
- <el-option
- v-for="item in areaList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable @change="search">
+ <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="闅愭偅绫诲瀷" prop="cateId">
<el-select v-model="searchForm.cateId" placeholder="璇烽�夋嫨闅愭偅绫诲瀷" clearable @change="search">
- <el-option
- v-for="item in cateList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+ <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
<el-option label="寰呭鐞�" value="0"></el-option>
<el-option label="宸插鐞�" value="1"></el-option>
<el-option label="宸查��鍥�" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎻愭姤鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -65,30 +51,29 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:hiddendanger:create', 'business:hiddendanger:exportExcel']">
- <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']" @click="handleEdit">鏂板缓</el-button></li>
- <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']" @click="handleEx">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']"
+ @click="handleEdit">鏂板缓</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']"
+ @click="handleEx">瀵煎嚭</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="dutyCompanyName" label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
- <el-table-column prop="areaName" label="闅愭偅鍖哄煙" min-width="150px"></el-table-column>
+ <el-table-column prop="dutyCompanyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
+ <el-table-column prop="areaName" label="闅愭偅鍖哄煙" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="categoryName" label="闅愭偅绫诲瀷" min-width="150px"></el-table-column>
<el-table-column prop="content" label="闂鎻忚堪" min-width="150px"></el-table-column>
<el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
<el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="澶勭悊缁撴灉" min-width="100px">
<template slot-scope="{row}">
- <span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
- <span class="status-green" v-if="row.status === 1">宸插鐞�</span>
- <span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
+ <span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
+ <span class="status-green" v-if="row.status === 1">宸插鐞�</span>
+ <span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
</template>
</el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="180" fixed="right">
<el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="150px"></el-table-column>
<!--
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
@@ -99,21 +84,19 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�',row)" >鏌ョ湅璇︽儏</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-edit"
+ @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
- <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
+ <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange" />
<!-- 鏂板缓 -->
- <HiddenDangerParam @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="HiddenDangerParamRef" />
+ <HiddenDangerParam @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="HiddenDangerParamRef" />
</TableLayout>
</template>
@@ -128,8 +111,8 @@
export default {
name: 'Empower',
extends: BaseTable,
- components: { TableLayout, Pagination ,OperaHiddenDangerWindow, HiddenDangerParam},
- data () {
+ components: { TableLayout, Pagination, OperaHiddenDangerWindow, HiddenDangerParam },
+ data() {
return {
isShowEdit: false,
// 鎼滅储
@@ -148,7 +131,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '闅愭偅闅忔墜鎷嶇鐞�',
api: '/business/hiddenDanger',
@@ -160,7 +143,7 @@
this.loadParams()
},
methods: {
- handleEx () {
+ handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -177,13 +160,13 @@
})
})
},
- handleEdit () {
+ handleEdit() {
this.isShowEdit = true
this.$nextTick(() => {
this.$refs.HiddenDangerParamRef.isShowModal = true
})
},
- changeRadio (e) {
+ changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
@@ -200,7 +183,7 @@
}
this.search()
},
- loadParams () {
+ loadParams() {
allList({
})
.then(res => {
@@ -221,17 +204,19 @@
.finally(() => {
})
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.queryStartTime = e[0]
this.searchForm.queryEndTime = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = '0'
- this.changeRadio('0')
- // this.search()
+ this.searchForm = {}
+ this.time = []
+ // this.searchForm.radio = '0'
+ // this.changeRadio('0')
+ this.search()
}
}
}
--
Gitblit v1.9.3