From d806bf1af77108e0a4931549af8d35236aa93961 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 03 八月 2023 09:09:33 +0800
Subject: [PATCH] 样式调整
---
src/views/Admin/Report.vue | 3
src/views/Admin/components/msgEditMod.vue | 2
src/views/Admin/reactionManage.vue | 1
src/views/Admin/addressBook.vue | 7 +-
src/views/Admin/callRecord.vue | 2
src/views/Admin/list.vue | 4
src/views/Admin/massSend.vue | 92 +++++++++++++++---------------
src/views/Admin/release.vue | 6 -
src/views/Admin/sameLevel.vue | 5 +
src/views/Admin/userManage.vue | 3
src/views/Admin/history.vue | 7 +-
11 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/src/views/Admin/Report.vue b/src/views/Admin/Report.vue
index cba48ec..2da5dca 100644
--- a/src/views/Admin/Report.vue
+++ b/src/views/Admin/Report.vue
@@ -29,7 +29,7 @@
style="width: 100%"
/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="searchData()">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -160,6 +160,7 @@
{
title: '操作',
dataIndex: 'operation',
+ width: '18%',
scopedSlots: {
customRender: 'operation'
},
diff --git a/src/views/Admin/addressBook.vue b/src/views/Admin/addressBook.vue
index 7618f47..6cb435d 100644
--- a/src/views/Admin/addressBook.vue
+++ b/src/views/Admin/addressBook.vue
@@ -1,12 +1,12 @@
<template>
<div class="inner">
<a-row type="flex" justify="space-between" style="margin-bottom: 20px">
- <a-col :span="8">
+ <a-col :span="6">
<a-button v-if="unittype && unittype !== null" type="primary" @click="editData('add',{})">新增</a-button>
<a-button v-if="unittype && unittype !== null" type="primary" @click="visible = true" style="margin: 0 12px">导入通讯录表</a-button>
<a-button v-if="unittype && unittype !== null" type="primary" @click="openGroup()">分组管理</a-button>
</a-col>
- <a-col :span="16">
+ <a-col :span="18">
<a-row type="flex" justify="end" :gutter="14">
<a-col :span="6">
<a-input v-model="search.searchParams.company" placeholder="单位名称" style="width: 100%"/>
@@ -16,7 +16,7 @@
<a-select-option v-for="item in groupData" :value="item.id" :key="item.id">{{item.name}}</a-select-option>
</a-select>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="searchData()">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -97,6 +97,7 @@
{
title: '操作',
key: 'action',
+ width: '15%',
scopedSlots: { customRender: 'action' }
},
],
diff --git a/src/views/Admin/callRecord.vue b/src/views/Admin/callRecord.vue
index 0d4d364..72ea456 100644
--- a/src/views/Admin/callRecord.vue
+++ b/src/views/Admin/callRecord.vue
@@ -26,7 +26,7 @@
style="width: 100%"
/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="searchData">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
diff --git a/src/views/Admin/components/msgEditMod.vue b/src/views/Admin/components/msgEditMod.vue
index 0058154..de8ffe4 100644
--- a/src/views/Admin/components/msgEditMod.vue
+++ b/src/views/Admin/components/msgEditMod.vue
@@ -3,7 +3,7 @@
:title="title"
:visible="visible"
centered
- width="50%"
+ width="75%"
@cancel="handleCancel"
:afterClose="clearMod"
:footer="null"
diff --git a/src/views/Admin/history.vue b/src/views/Admin/history.vue
index 24ac765..8927646 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="6">
+ <a-col :span="4">
<a-radio-group v-model="search.searchParams.emergType" @change="getData">
<a-radio-button :value="null">
全部
@@ -14,7 +14,7 @@
</a-radio-button>
</a-radio-group>
</a-col>
- <a-col :span="18">
+ <a-col :span="20">
<a-row type="flex" justify="end" :gutter="18">
<a-col :span="8">
<a-range-picker
@@ -29,7 +29,7 @@
<a-col :span="6">
<a-input v-model="search.searchParams.publishingUnit" placeholder="单位名称" style="width: 100%"/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="searchData">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -140,6 +140,7 @@
{
title: '操作',
dataIndex: 'operation',
+ width: '15%',
scopedSlots: {
customRender: 'operation'
},
diff --git a/src/views/Admin/list.vue b/src/views/Admin/list.vue
index 10d681b..0946f30 100644
--- a/src/views/Admin/list.vue
+++ b/src/views/Admin/list.vue
@@ -29,7 +29,7 @@
style="width: 100%"
/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="searchData">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -176,7 +176,7 @@
{
title: '操作',
dataIndex: 'operation',
- width: '15%',
+ width: '18%',
scopedSlots: {
customRender: 'operation'
},
diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index fcab6df..5587c1d 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -101,51 +101,51 @@
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span="12">
- <div style="display:flex;justify-content: space-between;align-items: center;">
- <b>选择接收单位：</b>
- <a-checkbox :checked="checkAll" @change="checkChange">
- 全选
- </a-checkbox>
- </div>
- <a-form-model-item prop="receiver">
- <a-tree-select
- show-search
- tree-checkable
- treeCheckStrictly
- style="width: 100%"
- v-model="form.receiver"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- placeholder="选择工作通知接收单位"
- allow-clear
- multiple
- :maxTagCount="3"
- @change="onChanges"
- @search="onSearch"
- @select="onSelect"
- :tree-data="areaUsers"
- :replaceFields="replaceFields"
- >
- </a-tree-select>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <div style="display:flex;justify-content: space-between;align-items: center;">
- <b>平级接收人选择：</b>
- <a-checkbox :checked="checkSlAll" @change="checkSlChange">
- 全选
- </a-checkbox>
- </div>
- <a-form-model-item>
- <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle">
- <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id" :maxTagCount="3">
- {{ item.recipientName }}({{item.company}} {{item.phone}})
- </a-select-option>
- </a-select>
- </a-form-model-item>
- </a-col>
- </a-row>
+<!-- <a-row :gutter="24">-->
+<!-- <a-col :span="12">-->
+<!-- <div style="display:flex;justify-content: space-between;align-items: center;">-->
+<!-- <b>选择接收单位：</b>-->
+<!-- <a-checkbox :checked="checkAll" @change="checkChange">-->
+<!-- 全选-->
+<!-- </a-checkbox>-->
+<!-- </div>-->
+<!-- <a-form-model-item prop="receiver">-->
+<!-- <a-tree-select-->
+<!-- show-search-->
+<!-- tree-checkable-->
+<!-- treeCheckStrictly-->
+<!-- style="width: 100%"-->
+<!-- v-model="form.receiver"-->
+<!-- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"-->
+<!-- placeholder="选择工作通知接收单位"-->
+<!-- allow-clear-->
+<!-- multiple-->
+<!-- :maxTagCount="3"-->
+<!-- @change="onChanges"-->
+<!-- @search="onSearch"-->
+<!-- @select="onSelect"-->
+<!-- :tree-data="areaUsers"-->
+<!-- :replaceFields="replaceFields"-->
+<!-- >-->
+<!-- </a-tree-select>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- <a-col :span="12">-->
+<!-- <div style="display:flex;justify-content: space-between;align-items: center;">-->
+<!-- <b>平级接收人选择：</b>-->
+<!-- <a-checkbox :checked="checkSlAll" @change="checkSlChange">-->
+<!-- 全选-->
+<!-- </a-checkbox>-->
+<!-- </div>-->
+<!-- <a-form-model-item>-->
+<!-- <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle">-->
+<!-- <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id" :maxTagCount="3">-->
+<!-- {{ item.recipientName }}({{item.company}} {{item.phone}})-->
+<!-- </a-select-option>-->
+<!-- </a-select>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- </a-row>-->
<!-- <div>-->
<!-- <b>选择审批领导：</b> -->
<!-- <a-select show-search placeholder="请选择审批领导"-->
@@ -244,7 +244,7 @@
disasterType: [{ required: true, message: '请选择灾种', trigger: 'change'}],
warningLevel: [{ required: true, message: '请选择预警级别', trigger: 'change'}],
content: [{ required: true, message: '请输入信息内容', trigger: 'blur'}],
- receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
+ // receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
// verticalRecipient: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// horizontalRecipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
diff --git a/src/views/Admin/reactionManage.vue b/src/views/Admin/reactionManage.vue
index fa473d6..20c776e 100644
--- a/src/views/Admin/reactionManage.vue
+++ b/src/views/Admin/reactionManage.vue
@@ -61,6 +61,7 @@
},
{
title: '操作',
+ width: '12%',
key: 'action',
scopedSlots: { customRender: 'action' }
},
diff --git a/src/views/Admin/release.vue b/src/views/Admin/release.vue
index 5ee9721..e01b309 100644
--- a/src/views/Admin/release.vue
+++ b/src/views/Admin/release.vue
@@ -26,7 +26,7 @@
style="width: 100%"
/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="getData">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -107,7 +107,6 @@
{
title: '灾种',
dataIndex: 'disasterType',
- width: '8%',
scopedSlots: {
customRender: 'disasterType'
}
@@ -123,7 +122,6 @@
{
title: '信息标题',
dataIndex: 'title',
- width: '16%',
},
{
title: '附件',
@@ -136,7 +134,6 @@
{
title: '叫应情况',
dataIndex: 'responsesRate',
- width: '10%',
scopedSlots: {
customRender: 'responsesRate'
}, //设置定制化表格数据
@@ -144,6 +141,7 @@
{
title: '操作',
dataIndex: 'operation',
+ width: '14%',
scopedSlots: {
customRender: 'operation'
},
diff --git a/src/views/Admin/sameLevel.vue b/src/views/Admin/sameLevel.vue
index 8c72a54..aa1738d 100644
--- a/src/views/Admin/sameLevel.vue
+++ b/src/views/Admin/sameLevel.vue
@@ -9,10 +9,10 @@
<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-col :span="6" 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-col :span="6">
<a-button type="primary" @click="getUserList">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -100,6 +100,7 @@
},
{
title: '操作',
+ width: '12%',
key: 'action',
scopedSlots: { customRender: 'action' }
},
diff --git a/src/views/Admin/userManage.vue b/src/views/Admin/userManage.vue
index 340998f..87f8b2b 100644
--- a/src/views/Admin/userManage.vue
+++ b/src/views/Admin/userManage.vue
@@ -28,7 +28,7 @@
<a-col :span="4">
<a-input v-model="search.searchParams.realName" placeholder="姓名" style="width: 100%"/>
</a-col>
- <a-col :span="4">
+ <a-col :span="6">
<a-button type="primary" @click="getUserList">查询</a-button>
<a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
</a-col>
@@ -148,6 +148,7 @@
{
title: '操作',
key: 'action',
+ width: '18%',
scopedSlots: { customRender: 'action' },
},
],
--
Gitblit v1.9.2