From 1df2f72ad0321815d5874b4083aac2999bd2da18 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 05 七月 2023 17:11:46 +0800
Subject: [PATCH] 修改
---
src/components/Home/IndexEcharts.vue | 36 ++++++------
src/views/Admin/components/msgEditMod.vue | 32 +++++++++-
src/views/Admin/list.vue | 2
src/views/Admin/massSend.vue | 31 +++++++++-
src/views/Admin/release.vue | 4
src/views/Admin/notice.vue | 37 ++++++++++--
6 files changed, 105 insertions(+), 37 deletions(-)
diff --git a/src/components/Home/IndexEcharts.vue b/src/components/Home/IndexEcharts.vue
index 6a1114a..4146c3c 100644
--- a/src/components/Home/IndexEcharts.vue
+++ b/src/components/Home/IndexEcharts.vue
@@ -49,32 +49,32 @@
{
value: [10, 40, 20, 60, 10, 60],
name: "红",
- lineStyle:{
- color:'red'
- },
- itemStyle: {
- color:'red'
- }
+ lineStyle:{
+ color:'red'
+ },
+ itemStyle: {
+ color:'red'
+ }
},
{
value: [50, 14, 28, 26, 42, 21],
name: "橙",
- lineStyle:{
- color:'#f66d05'
- },
- itemStyle: {
- color:'#f66d05'
- }
+ lineStyle:{
+ color:'#f66d05'
+ },
+ itemStyle: {
+ color:'#f66d05'
+ }
},
{
value: [60, 20, 43, 73, 12, 80],
name: "黄",
- lineStyle:{
- color:'#f7ad00'
- },
- itemStyle: {
- color:'#f7ad00'
- }
+ lineStyle:{
+ color:'#f7ad00'
+ },
+ itemStyle: {
+ color:'#f7ad00'
+ }
},
],
},
diff --git a/src/views/Admin/components/msgEditMod.vue b/src/views/Admin/components/msgEditMod.vue
index 2a447b3..ab7eba6 100644
--- a/src/views/Admin/components/msgEditMod.vue
+++ b/src/views/Admin/components/msgEditMod.vue
@@ -120,7 +120,12 @@
</a-checkbox>
</a-col>
<a-col :span="12">
- <b style="margin-bottom: 6px">平级接收人选择：</b>
+ <div style="display:flex;justify-content: space-between;align-items: center;">
+ <b>平级接收人选择：</b>
+ <a-checkbox :checked="checkSlAll" @change="checkSlChange" :disabled="disable">
+ 全选
+ </a-checkbox>
+ </div>
<a-form-model-item>
<a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :disabled="disable">
<a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">
@@ -212,6 +217,7 @@
},
sendLeaders: [],
checkAll: false,
+ checkSlAll: false,
withLeaders: false,
areaUsers: [],
replaceFields: {
@@ -409,6 +415,26 @@
t.form.receiver = t.traverseTree(t.areaUsers)
}else{
t.form.receiver = []
+ }
+ },
+
+ //选择平级部门部分
+ handle(selectedItems) {
+ const t = this
+ if(t.form.recipient.length == t.filteredOptions.length){
+ t.checkSlAll = true
+ }else{
+ t.checkSlAll = false
+ }
+ },
+
+ checkSlChange(e) {
+ const t = this
+ t.checkSlAll = !t.checkSlAll
+ if(t.checkSlAll == true){
+ t.form.recipient = t.filteredOptions.map(i=>i.id)
+ }else{
+ t.form.recipient = []
}
},
@@ -651,10 +677,6 @@
},
onSelect() {
console.log(...arguments);
- },
- //选择平级部门部分
- handle(selectedItems) {
- this.selectedItems = selectedItems;
},
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
diff --git a/src/views/Admin/list.vue b/src/views/Admin/list.vue
index f88ec4a..008c24f 100644
--- a/src/views/Admin/list.vue
+++ b/src/views/Admin/list.vue
@@ -82,7 +82,7 @@
</template>
</a-table>
</div>
- <msg-edit-mod ref="msgEdit" @refresh="getData"></msg-edit-mod>
+ <msg-edit-mod ref="msgEdit" @refresh="getData()"></msg-edit-mod>
<msg-detail-mod ref="msgDetail"></msg-detail-mod>
<!-- 对话框 -->
<!-- <a-modal title="回执" -->
diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index be69ad5..63287c7 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -101,8 +101,11 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <div>
+ <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">
@@ -174,6 +177,7 @@
horizontalRecipient: []
},
checkAll: false,
+ checkSlAll: false,
areaUsers: [],
replaceFields: {
children:'children',
@@ -272,6 +276,26 @@
}
},
+ //选择平级部门部分
+ handle(selectedItems) {
+ const t = this
+ if(t.form.recipient.length == t.filteredOptions.length){
+ t.checkSlAll = true
+ }else{
+ t.checkSlAll = false
+ }
+ },
+
+ checkSlChange(e) {
+ const t = this
+ t.checkSlAll = !t.checkSlAll
+ if(t.checkSlAll == true){
+ t.form.recipient = t.filteredOptions.map(i=>i.id)
+ }else{
+ t.form.recipient = []
+ }
+ },
+
confirmSend(){
this.$refs.ruleForm.validate(valid => {
if (valid) {
@@ -304,6 +328,8 @@
this.$message.success('信息群发成功')
this.$refs.ruleForm.clearValidate()
this.$refs.ruleForm.resetFields()
+ this.form.recipient = []
+
}else{
this.$message.error(res.data.msg)
this.$refs.ruleForm.clearValidate()
@@ -330,9 +356,6 @@
handleLevel(selectedItems) {
// this.selectedItems = selectedItems;
},
- handle(selectedItems) {
- // this.selectedItems = selectedItems;
- },
onChange(){
console.log(this.value)
},
diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue
index 189249c..f1e84a9 100644
--- a/src/views/Admin/notice.vue
+++ b/src/views/Admin/notice.vue
@@ -65,7 +65,7 @@
:file-list="fileList"
@change="fileChange"
:headers="header"
- accept=".doc, .docx, .word, .pdf, .zip, .xlsx, .rar"
+ accept=".doc, .docx, .word, .pdf, .zip, .xlsx, .rar, .jpg, .jpeg, .png"
:data="{module: 'naturalDisasterPath'}"
:remove="(file)=>{removeFile(file)}"
>
@@ -114,7 +114,12 @@
</a-checkbox>
</a-col>
<a-col :span="12">
- <b style="margin-bottom: 6px">平级接收人选择：</b>
+ <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 prop="recipient">
<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">
@@ -186,6 +191,7 @@
sendLeaders: [],
leaders: [],
checkAll: false,
+ checkSlAll: false,
withLeaders: false,
areaUsers: [],
replaceFields: {
@@ -217,7 +223,7 @@
timeout: [{ required: true, message: '请输入超时时间', trigger: 'blur'}],
receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
reviewId: [{ required: true, message: '请选择审批人', trigger: 'change'}],
- recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
+ // recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
// acceptingUnitIds: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// peerRecipientIds: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
},
@@ -309,6 +315,26 @@
t.form.receiver = t.traverseTree(t.areaUsers)
}else{
t.form.receiver = []
+ }
+ },
+
+ //选择平级部门部分
+ handle(selectedItems) {
+ const t = this
+ if(t.form.recipient.length == t.filteredOptions.length){
+ t.checkSlAll = true
+ }else{
+ t.checkSlAll = false
+ }
+ },
+
+ checkSlChange(e) {
+ const t = this
+ t.checkSlAll = !t.checkSlAll
+ if(t.checkSlAll == true){
+ t.form.recipient = t.filteredOptions.map(i=>i.id)
+ }else{
+ t.form.recipient = []
}
},
@@ -482,10 +508,7 @@
onSelect() {
console.log(...arguments);
},
- //选择平级部门部分
- handle(selectedItems) {
- this.selectedItems = selectedItems;
- },
+
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
},
diff --git a/src/views/Admin/release.vue b/src/views/Admin/release.vue
index 3a7589a..6adf908 100644
--- a/src/views/Admin/release.vue
+++ b/src/views/Admin/release.vue
@@ -61,8 +61,8 @@
</div>
</template >
<template #responseSituation="text">
- <a-tag :color="text === 3 ? 'red' :text === 2? 'green':text === 1?'orange':'blue'">
- {{text == 1 ? '待叫应' : text == 2 ?'已叫应':text == 3 ?'超时未叫应' : ''}}
+ <a-tag :color="text === 3 ? 'green' :text === 2? 'blue':text === 1?'orange':'red'">
+ {{text == 1 ? '均未叫应' : text == 2 ?'部分叫应':text == 3 ?'全部叫应' : ''}}
</a-tag>
</template>
<template #operation="text, record, index">
--
Gitblit v1.9.2