From 24f9337e9bf1f163787fdc0617c8223619fac909 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 27 六月 2023 08:38:22 +0800
Subject: [PATCH] 新增页面和配置，对接口
---
src/layout/menuSider.vue | 11 ++
src/views/Admin/Report.vue | 27 ++++--
src/views/Admin/components/msgEditMod.vue | 108 +++++++++++++++++++-------
src/views/Admin/components/userMod.vue | 3
src/components/Home/Projecting.vue | 2
src/components/Home/QuickNavigation.vue | 7 +
src/views/Admin/massSend.vue | 17 ++--
src/views/Admin/sameLevel.vue | 2
src/views/Admin/history.vue | 2
src/views/Home.vue | 4
src/api/send.js | 9 ++
src/views/Admin/notice.vue | 39 +++++++--
12 files changed, 167 insertions(+), 64 deletions(-)
diff --git a/src/api/send.js b/src/api/send.js
index 621e9f7..616456b 100644
--- a/src/api/send.js
+++ b/src/api/send.js
@@ -10,6 +10,15 @@
})
}
+// 信息修改
+export function msgUpdate(data){
+ return request({
+ url: '/warning/info/updateById',
+ method: 'post',
+ data: data
+ })
+}
+
// 群发信息
export function massSend(data){
return request({
diff --git a/src/components/Home/Projecting.vue b/src/components/Home/Projecting.vue
index 6f4557b..6266c64 100644
--- a/src/components/Home/Projecting.vue
+++ b/src/components/Home/Projecting.vue
@@ -1,7 +1,7 @@
<template>
<a-card title="近期通知" class="projecting">
<a slot="extra" href="release" class="tapBtn">全部通知</a>
- <a-card-grid style="width:33.33%;text-align:center" v-for="(item, index) in lists" :key="'projecting' + index" @click="openDetails(item.id)">
+ <a-card-grid style="width:33.33%;text-align:center;cursor: pointer" v-for="(item, index) in lists" :key="'projecting' + index" @click="openDetails(item.id)">
<div class="title">
<img :src="img" :alt="item.title">
<span>{{ getRiskName(item.disasterType)}} {{getLevelName(item.warningLevel)}}</span>
diff --git a/src/components/Home/QuickNavigation.vue b/src/components/Home/QuickNavigation.vue
index ef920be..edaa6df 100644
--- a/src/components/Home/QuickNavigation.vue
+++ b/src/components/Home/QuickNavigation.vue
@@ -14,7 +14,12 @@
<a :class="toReview>0?'resColor':''" @click="toRev" v-if="userinfo.role.id == 2">待审核<span v-if="toReview > 0">（{{toReview}}）</span></a>
</a-tooltip>
<a href="massSend" v-if="userinfo.role.id == 3">发布通知</a>
- <a>查看统计</a>
+ <a-tooltip overlayClassName="tip">
+ <template #title>
+ 数据统计页面待呈现
+ </template>
+ <a>查看统计</a>
+ </a-tooltip>
<a href="user" v-if="userinfo.role.id == 3">用户管理</a>
<!-- <a-button><a-icon type="plus" />添加</a-button> -->
</a-card>
diff --git a/src/layout/menuSider.vue b/src/layout/menuSider.vue
index 656f81e..babe9e2 100644
--- a/src/layout/menuSider.vue
+++ b/src/layout/menuSider.vue
@@ -38,7 +38,16 @@
if(t.userInfo.role.id == 1){
t.navData = menu.adminMenu
}else if(t.userInfo.role.id == 3){
- t.navData = menu.workerMenu
+ if(t.userInfo.unittype == 1){
+ t.navData = menu.workerMenu
+ }else{
+ t.navData = menu.workerMenu.map((i)=>{
+ if(i.Children.find(item=>item.MenuTitle == '常规群发')){
+ i.Children = i.Children.filter(j=>j.MenuTitle !== '常规群发')
+ }
+ return i
+ })
+ }
}else{
t.navData = menu.leaderMenu
}
diff --git a/src/views/Admin/Report.vue b/src/views/Admin/Report.vue
index 0ef6c22..79369d2 100644
--- a/src/views/Admin/Report.vue
+++ b/src/views/Admin/Report.vue
@@ -62,6 +62,7 @@
<a-button type="primary" v-if="record.reviewStatus == 2" @click="confirmPost(record.id)">确认发布</a-button>
<a-button type="link" @click="openMod('view',record)">查看信息详情</a-button>
<a-button class="del" type="link" @click="delData(record.id)">删除</a-button>
+ <a-button v-if="record.reviewStatus == 1 || record.reviewStatus == 3" @click="openMod('edit',record)">修改</a-button>
</template>
</a-table>
</div>
@@ -71,7 +72,7 @@
<script>
-import {getReviewDetail, getReviewRecord} from "@/api/review";
+import {getReviewDetail, getReviewDetailByWorker, getReviewRecord} from "@/api/review";
import msgEditMod from '@/views/Admin/components/msgEditMod'
import {delRecipient} from "@/api/user";
import {deleteMsg, publishMsg} from "@/api/send";
@@ -281,13 +282,23 @@
openMod(type,data){
const t = this
- getReviewDetail(data.id).then(res=>{
- if(res.data.code == 100){
- t.$refs.msgEdit.openMod(type,res.data.data)
- }else{
- this.$message.error(res.data.msg)
- }
- })
+ if(type == 'edit'){
+ getReviewDetailByWorker(data.id).then(res=>{
+ if(res.data.code == 100){
+ t.$refs.msgEdit.openMod(type,res.data.data)
+ }else{
+ this.$message.error(res.data.msg)
+ }
+ })
+ }else{
+ getReviewDetail(data.id).then(res=>{
+ if(res.data.code == 100){
+ t.$refs.msgEdit.openMod(type,res.data.data)
+ }else{
+ this.$message.error(res.data.msg)
+ }
+ })
+ }
},
onPageChange(page, pageSize) {
diff --git a/src/views/Admin/components/msgEditMod.vue b/src/views/Admin/components/msgEditMod.vue
index fd3139a..3ec3f8e 100644
--- a/src/views/Admin/components/msgEditMod.vue
+++ b/src/views/Admin/components/msgEditMod.vue
@@ -121,7 +121,7 @@
<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">
- {{ item.recipientName }}
+ {{ item.recipientName }}({{item.company}} {{item.phone}})
</a-select-option>
</a-select>
</a-form-model-item>
@@ -137,8 +137,8 @@
</a-button>
</a-col>
</a-row>
- <a-row :gutter="24" style="display: flex;justify-content: right;align-items: center" v-if="title=='信息转发'">
- <a-col :span="12">
+ <a-row :gutter="24" style="display: flex;justify-content: right;align-items: center" v-if="title=='信息转发' || title=='信息修改'">
+ <a-col :span="12" v-if="title=='信息转发'">
<b style="margin-bottom: 6px">选择审批领导：</b>
<a-form-model-item prop="reviewId">
<a-select show-search v-model="form.reviewId" placeholder="请选择审批领导">
@@ -146,9 +146,14 @@
</a-select>
</a-form-model-item>
</a-col>
- <a-col :span="12" style="display: flex;justify-content: right">
+ <a-col :span="12" style="text-align: right" v-if="title=='信息转发'">
<a-button type="primary" style="min-width: 140px;margin-right: 12px" @click="confirmSend(4)">
确认转发
+ </a-button>
+ </a-col>
+ <a-col :span="12" style="text-align: right" v-if="title=='信息修改'">
+ <a-button type="primary" style="min-width: 140px;margin-right: 12px" @click="confirmSend(4)" :disabled="userInfo.role.id==1?true:false">
+ 确认并提交审核
</a-button>
</a-col>
</a-row>
@@ -170,7 +175,7 @@
import {getAreaWithUserIfo, getPeerRecipient, getLeaders, delRecipient} from '@/api/user'
import {getUserInfo} from "@/util/storage";
import Cookies from "js-cookie";
-import {massSend, msgSend} from "@/api/send";
+import {massSend, msgSend, msgUpdate} from "@/api/send";
import {postReview} from "@/api/review";
import axios from "axios";
import {deleteFile} from "@/api/list";
@@ -265,7 +270,7 @@
const t = this
t.form.acceptingUnitIds = []
t.form.peerRecipientIds = []
- if(type == 'review' || type == 'view') {
+ if(type == 'review' || type == 'view' || type == 'edit') {
for(let i in data){
if(t.isValidKey(i,t.form)){
t.form[i] = data[i]
@@ -292,6 +297,9 @@
t.form.recipient = data.peerRecipientIds.map(i=>i.recipienterId)
if(type == 'review'){
t.title = '信息审核'
+ t.disable = false
+ }else if(type == 'edit'){
+ t.title = '信息修改'
t.disable = false
}else{
t.title = '信息详情'
@@ -351,7 +359,7 @@
t.userTitTree(res.data.data)
// treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
t.areaUsers = t.findNodeById(res.data.data,t.userInfo.districtId).children
- t.unittype = this.findNodeById(this.areaUsers,t.userInfo.districtId)?.type
+ t.unittype = t.findNodeById(res.data.data,t.userInfo.districtId)?.type
}else{
console.log('暂无数据')
}
@@ -386,7 +394,7 @@
const t = this
this.checkAll = !this.checkAll
if(t.checkAll == true){
- t.form.receiver = t.traverseTree(t.areaUsers[0])
+ t.form.receiver = t.traverseTree(t.areaUsers)
}else{
t.form.receiver = []
}
@@ -476,29 +484,47 @@
}else{
this.$message.error(res.data.msg)
}
- this.visible = false
- this.$emit('refresh')
this.$refs.ruleForm.clearValidate()
this.$refs.ruleForm.resetFields()
this.delList = []
this.fileList = []
+ this.visible = false
+ this.$emit('refresh')
})
}else{
- const {receiver,recipient,id,...data} = this.form
- msgSend(data).then( res =>{
- if(res.data.code == 100){
- this.$message.success('信息已提交审核')
- this.deleteFile()
- }else{
- this.$message.error(res.data.msg)
- }
- this.visible = false
- this.$emit('refresh')
- this.$refs.ruleForm.clearValidate()
- this.$refs.ruleForm.resetFields()
- this.delList = []
- this.fileList = []
- })
+ if(this.title == '信息转发'){
+ const {receiver,recipient,id,...data} = this.form
+ msgSend(data).then( res =>{
+ if(res.data.code == 100){
+ this.$message.success('信息已提交审核')
+ this.deleteFile()
+ }else{
+ this.$message.error(res.data.msg)
+ }
+ this.$refs.ruleForm.clearValidate()
+ this.$refs.ruleForm.resetFields()
+ this.delList = []
+ this.fileList = []
+ this.visible = false
+ this.$emit('refresh')
+ })
+ }else{
+ const {receiver,recipient,reviewId,...data} = this.form
+ msgUpdate(data).then( res =>{
+ if(res.data.code == 100){
+ this.$message.success('信息已提交审核')
+ this.deleteFile()
+ }else{
+ this.$message.error(res.data.msg)
+ }
+ this.$refs.ruleForm.clearValidate()
+ this.$refs.ruleForm.resetFields()
+ this.delList = []
+ this.fileList = []
+ this.visible = false
+ this.$emit('refresh')
+ })
+ }
}
}else{
console.log('error submit!!');
@@ -554,11 +580,13 @@
// 将树状数据所有id和name放入对象数组
traverseTree(treeData) {
let result = [];
- function traverse(node) {
- result.push({ label: node.name, value: node.id });
- if (node.children && node.children.length > 0) {
- for (let child of node.children) {
- traverse(child);
+ function traverse(data) {
+ for(const node of data){
+ if(node.users && node.users.length>0) {
+ result.push({label: node.name, value: node.id});
+ if (node.children && node.children.length > 0) {
+ traverse(node.children);
+ }
}
}
}
@@ -667,4 +695,24 @@
}
}
}
+
+.ant-radio-button-wrapper-checked {
+ /* 自定义禁用样式 */
+ /* 例如，修改文本颜色和背景颜色 */
+ color: #fff;
+ background-color: #1890ff;
+}
+
+/deep/.ant-select-disabled{
+ color: @blackText;
+
+ .ant-select-selection{
+ background: #fff;
+
+ .ant-select-selection__choice{
+ color: @blackText;
+ background: #fafafa;
+ }
+ }
+}
</style>
diff --git a/src/views/Admin/components/userMod.vue b/src/views/Admin/components/userMod.vue
index 4428956..7ea2a40 100644
--- a/src/views/Admin/components/userMod.vue
+++ b/src/views/Admin/components/userMod.vue
@@ -279,6 +279,7 @@
if(res.data.code == 100){
this.$message.success('新增用户成功')
this.$emit('refresh')
+ this.visible = false
}else{
this.$message.error(res.data.msg)
}
@@ -289,12 +290,12 @@
if(res.data.code == 100){
this.$message.success('修改用户成功')
this.$emit('refresh')
+ this.visible = false
}else{
this.$message.error(res.data.msg)
}
})
}
- this.visible = false
} else {
console.log('error submit!!');
return false;
diff --git a/src/views/Admin/history.vue b/src/views/Admin/history.vue
index d16edc6..69a308c 100644
--- a/src/views/Admin/history.vue
+++ b/src/views/Admin/history.vue
@@ -36,7 +36,7 @@
<!-- 表格实体部分-->
<div class="table-cont">
- <a-table :columns="columns" :data-source="data" bordered :pagination="pagination">
+ <a-table :columns="columns" :data-source="data" bordered :pagination="pagination" :rowKey="record=>record.id">
<template #index="text,record,index">
{{ index + 1 }}
</template>
diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index 2bc3f52..be69ad5 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -107,7 +107,7 @@
<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">
- {{ item.recipientName }}
+ {{ item.recipientName }}({{item.company}} {{item.phone}})
</a-select-option>
</a-select>
</a-form-model-item>
@@ -140,7 +140,7 @@
<h2>短信预览</h2>
<div class="mobile">
<div class="mesg">
- <P>{{form.content}}发布单位：{{form.publishingUnit}}</P>
+ <P>【自然灾害风险预警提示】{{form.content}}发布单位：{{form.publishingUnit}}</P>
</div>
</div>
@@ -242,7 +242,6 @@
t.userTitTree(res.data.data)
treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
t.areaUsers = treeD
- console.log(t.areaUsers,t.unittype,'696969')
}else{
console.log('暂无数据')
}
@@ -285,7 +284,7 @@
}
const newAList = [].concat(...aList)
for(let i of newAList){
- const {realName,id,...data} = i
+ const {realName,id,roleId,...data} = i
const {company: recipientUnit,...rest} = data
const obj = {recipientUnit,recipientType:1,...rest}
this.form.verticalRecipient.push(obj)
@@ -372,10 +371,12 @@
traverseTree(treeData) {
let result = [];
function traverse(node) {
- result.push({ label: node.name, value: node.id });
- if (node.children && node.children.length > 0) {
- for (let child of node.children) {
- traverse(child);
+ if(node.users && node.users.length>0){
+ result.push({ label: node.name, value: node.id });
+ if (node.children && node.children.length > 0) {
+ for (let child of node.children) {
+ traverse(child);
+ }
}
}
}
diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue
index 1511dac..16d336c 100644
--- a/src/views/Admin/notice.vue
+++ b/src/views/Admin/notice.vue
@@ -90,7 +90,7 @@
全选
</a-checkbox>
</div>
- <a-form-model-item prop="receiver">
+ <a-form-model-item prop="receiver" style="margin-bottom: 12px">
<a-tree-select
show-search
tree-checkable
@@ -109,16 +109,24 @@
>
</a-tree-select>
</a-form-model-item>
+ <a-checkbox @change="isAddLeaders" style="margin-bottom: 24px">
+ 同时发信息给本级领导
+ </a-checkbox>
</a-col>
<a-col :span="12">
<b style="margin-bottom: 6px">平级接收人选择：</b>
<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">
- {{ item.recipientName }}
+ {{ 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">
+
</a-col>
</a-row>
<a-row :gutter="24" style="display: flex;align-items: center">
@@ -264,9 +272,9 @@
// const treeD = []
t.userTitTree(res.data.data)
// treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
- console.log(res.data.data)
t.areaUsers = t.findNodeById(res.data.data,t.userInfo.districtId).children
- t.unittype = this.findNodeById(this.areaUsers,t.userInfo.districtId)?.type
+ // t.leaders = t.findNodeById(res.data.data,t.userInfo.districtId).users.filter(i=>i.roleId == 2)
+ t.unittype = t.findNodeById(res.data.data,t.userInfo.districtId)?.type
}else{
console.log('暂无数据')
}
@@ -299,12 +307,17 @@
},
checkChange(e) {
const t = this
- this.checkAll = !this.checkAll
+ t.checkAll = !t.checkAll
if(t.checkAll == true){
- t.form.receiver = t.traverseTree(t.areaUsers[0])
+ t.form.receiver = t.traverseTree(t.areaUsers)
}else{
t.form.receiver = []
}
+ },
+
+ isAddLeaders(e) {
+ const t = this
+ console.log(`checked = ${e.target.checked}`);
},
fileChange(info) {
@@ -349,6 +362,7 @@
if (valid) {
this.form.acceptingUnitIds = []
this.form.peerRecipientIds = []
+
const aList = this.form.receiver.map(item=>this.findNodeById(this.areaUsers,item.value)?.users)
if(aList.includes(null)){
this.$message.error('选择接收单位时存在无用户的单位')
@@ -361,6 +375,7 @@
const obj = { recipienterId, recipienterName, recipienterPhone, receiveUnit,...rest}
this.form.acceptingUnitIds.push(obj)
}
+
if(this.form.recipient.length>0){
const bList = this.form.recipient.map(item => this.filteredOptions.find(i=>i.id == item))
for(let i of bList){
@@ -410,11 +425,13 @@
// 将树状数据所有id和name放入对象数组
traverseTree(treeData) {
let result = [];
- function traverse(node) {
- result.push({ label: node.name, value: node.id });
- if (node.children && node.children.length > 0) {
- for (let child of node.children) {
- traverse(child);
+ function traverse(data) {
+ for(const node of data){
+ if(node.users && node.users.length>0) {
+ result.push({label: node.name, value: node.id});
+ if (node.children && node.children.length > 0) {
+ traverse(node.children);
+ }
}
}
}
diff --git a/src/views/Admin/sameLevel.vue b/src/views/Admin/sameLevel.vue
index 23317e6..9e82507 100644
--- a/src/views/Admin/sameLevel.vue
+++ b/src/views/Admin/sameLevel.vue
@@ -17,7 +17,7 @@
</a-col>
</a-row>
<div class="table-cont">
- <a-table :columns="columns" :data-source="tableData" :pagination="pagination" :rowKey="record=>record.name" bordered>
+ <a-table :columns="columns" :data-source="tableData" :pagination="pagination" :rowKey="record=>record.id" bordered>
<template #unittype="unittype">
<a-tag
:color="unittype === 1 ? 'purple' : unittype === 2 ? 'blue' : unittype === 3 ? 'cyan' : 'green'"
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e62029e..9a57f99 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -31,7 +31,9 @@
margin: '15px 16px 24px 16px',
}">
<!-- Content -->
- <router-view ref="tabContent"></router-view>
+ <keep-alive include="notice">
+ <router-view ref="tabContent"></router-view>
+ </keep-alive>
<div style="height: 30px;text-align: center;line-height: 30px">
技术支持：中国科学院
</div>
--
Gitblit v1.9.2