From 2e882cbeda6a8a0f4dd193896386192f0f5ba0a7 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 06 七月 2023 15:52:24 +0800
Subject: [PATCH] 修改
---
src/views/Admin/components/userMod.vue | 2 +-
src/views/Admin/sameLevel.vue | 16 +++++++++++-----
src/views/Admin/history.vue | 26 ++++++++++++--------------
3 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/views/Admin/components/userMod.vue b/src/views/Admin/components/userMod.vue
index 7ea2a40..da6f1d4 100644
--- a/src/views/Admin/components/userMod.vue
+++ b/src/views/Admin/components/userMod.vue
@@ -257,7 +257,7 @@
// }
// t.form.province = t.findNodeByCode(t.areaData,code.substr(0,2)).name
// t.form.town = ''
- t.form.company = label[0] + '自然灾害综合预警监测中心'
+ t.form.company = label[0] + '自然灾害综合监测预警中心'
}
},
diff --git a/src/views/Admin/history.vue b/src/views/Admin/history.vue
index 69a308c..0556fae 100644
--- a/src/views/Admin/history.vue
+++ b/src/views/Admin/history.vue
@@ -1,7 +1,7 @@
<template>
<div class="inner">
<a-row type="flex" justify="space-between" style="margin-bottom: 20px">
- <a-col :span="8">
+ <a-col :span="6">
<a-radio-group v-model="search.searchParams.emergType" @change="getData">
<a-radio-button :value="null">
全部
@@ -14,8 +14,8 @@
</a-radio-button>
</a-radio-group>
</a-col>
- <a-col :span="16">
- <a-row type="flex" justify="end" :gutter="12">
+ <a-col :span="18">
+ <a-row type="flex" justify="end" :gutter="18">
<a-col :span="8">
<a-range-picker
v-model="timeRange"
@@ -25,6 +25,9 @@
@ok="timeOk"
style="width: 100%"
/>
+ </a-col>
+ <a-col :span="6">
+ <a-input v-model="search.searchParams.publishingUnit" placeholder="单位名称" style="width: 100%"/>
</a-col>
<a-col :span="4">
<a-button type="primary" @click="getData">查询</a-button>
@@ -86,15 +89,17 @@
const columns = [{
title: '序号',
dataIndex: 'index',
- width: '8%',
scopedSlots: {
customRender: 'index'
}
},
{
+ title: '信息标题',
+ dataIndex: 'title',
+ },
+ {
title: '发布时间',
dataIndex: 'publishingTime',
- width: '15%',
scopedSlots: {
customRender: 'publishingTime'
} //设置定制化表格数据
@@ -102,12 +107,10 @@
{
title: '发布单位',
dataIndex: 'publishingUnit',
- width: '12%',
},
{
title: '灾种',
dataIndex: 'disasterType',
- width: '8%',
scopedSlots: {
customRender: 'disasterType'
}
@@ -118,12 +121,6 @@
scopedSlots: {
customRender: 'warningLevel'
}, //设置定制化表格数据
- width: '8%',
- },
- {
- title: '信息标题',
- dataIndex: 'title',
- width: '16%',
},
{
title: '附件',
@@ -136,7 +133,6 @@
{
title: '叫应情况',
dataIndex: 'responseSituation',
- width: '10%',
scopedSlots: {
customRender: 'responseSituation'
}, //设置定制化表格数据
@@ -158,6 +154,7 @@
pageIndex: 1,
pageSize: 10,
searchParams:{
+ publishingUnit: '',
emergType: null,
startTime: '',
endTime: ''
@@ -269,6 +266,7 @@
pageIndex: 1,
pageSize: 10,
searchParams:{
+ publishingUnit: '',
emergType: null,
startTime: '',
endTime: ''
diff --git a/src/views/Admin/sameLevel.vue b/src/views/Admin/sameLevel.vue
index 9e82507..8c72a54 100644
--- a/src/views/Admin/sameLevel.vue
+++ b/src/views/Admin/sameLevel.vue
@@ -4,10 +4,13 @@
<a-col :span="4">
<a-button v-if="unittype && unittype !== null" type="primary" @click="editData('add',{})">新增用户</a-button>
</a-col>
- <a-col :span="20" v-if="unittype == null || !unittype">
- <a-row type="flex" justify="end" :gutter="12">
- <a-col :span="4">
- <a-cascader :options="areaData" v-model="areaVal" placeholder="行政规划" expandTrigger="hover" :fieldNames="fieldNames" changeOnSelect @change="onChange" style="width: 100%"/>
+ <a-col :span="20">
+ <a-row type="flex" justify="end" :gutter="14">
+ <a-col :span="6">
+ <a-input v-model="search.searchParams.company" placeholder="单位名称" style="width: 100%"/>
+ </a-col>
+ <a-col :span="4" v-if="unittype == null || !unittype">
+ <a-cascader :options="areaData" v-model="areaVal" placeholder="所属区域" expandTrigger="hover" :fieldNames="fieldNames" changeOnSelect @change="onChange" style="width: 100%"/>
</a-col>
<a-col :span="4">
<a-button type="primary" @click="getUserList">查询</a-button>
@@ -60,6 +63,7 @@
pageIndex: 1,
pageSize: 10,
searchParams:{
+ company: '',
province: '',
city: '',
area: '',
@@ -127,7 +131,7 @@
methods:{
async getUserList(){
const t = this
- if(t.search.searchParams.province == '' && t.search.searchParams.city == '' && t.search.searchParams.area == '' ){
+ if(t.search.searchParams.province == '' && t.search.searchParams.city == '' && t.search.searchParams.area == '' && t.search.searchParams.company == ''){
const {searchParams,...data} = t.search
const res = await getRecipient(data)
if(res.data.code == 100){
@@ -163,6 +167,7 @@
pageIndex: 1,
pageSize: 10,
searchParams:{
+ company: '',
province: '',
city: '',
area: '',
@@ -229,6 +234,7 @@
onChange(value) {
const t = this
t.search.searchParams = {
+ company: '',
province: '',
city: '',
area: '',
--
Gitblit v1.9.2