表述文字修改

鲁班七号

2023-07-19 f8a8427cd0fd9ccbed8c8e1452c2b658447845af

表述文字修改

 config/env.development.js

@@ -1,5 +1,5 @@
module.exports = {
    NODE_ENV: "development",
    baseUrl: 'http://192.168.0.38:8086',
    // baseUrl: 'http://121.239.169.30:13001',
    // baseUrl: 'http://192.168.0.38:8086',
    baseUrl: 'http://121.239.169.30:13001',
}

 src/views/Admin/components/sameLevelMod.vue

@@ -163,7 +163,7 @@
      t.form.districtId = value
      const code = t.findCodeById(t.areaData,value).code
      if(code.length == 2){
        t.form.company = '自治区自然灾害预警中心'
        t.form.company = '自治区自然灾害综合监测预警中心'
        // t.form.province = t.findNodeByCode(t.areaData,code).name
        // t.form.city = ''
        // t.form.area = ''

 src/views/Admin/notice.vue

@@ -1,13 +1,7 @@
<template>

    <div class="inner">

    <a-alert

        message="管理员身份无法进行信息编辑操作"

        banner

        closable

        v-if="userInfo.role.id === 1"

        type="error"

        style="margin-bottom: 12px"

    />

        <a-alert message="管理员身份无法进行信息编辑操作" banner closable v-if="userInfo.role.id === 1" type="error"

            style="margin-bottom: 12px" />

    <h2>预警信息发布</h2>

    <a-form-model ref="ruleForm" :model="form" :rules="rules" :wrapper-col="wrapperCol">

      <div class="left">

@@ -40,14 +34,16 @@
          </a-col>

          <a-col :span="12" style="display: flex;align-items: center;justify-content: right">

            <a-form-model-item prop="disasterType" style="margin-right: 20px">

              <a-select placeholder="请选择相关灾种" v-model="form.disasterType" style="width: 240px" allowClear @change="handleRisk">

                            <a-select placeholder="请选择相关灾种" v-model="form.disasterType" style="width: 240px" allowClear

                                @change="handleRisk">

                <a-select-option v-for="item in riskOptions" :key="item.value" :value="item.value">

                  {{ item.name }}

                </a-select-option>

              </a-select>

            </a-form-model-item>

            <a-form-model-item prop="warningLevel">

              <a-select placeholder="请选择预警级别" v-model="form.warningLevel" style="width: 240px" allowClear @change="handleLevel">

                            <a-select placeholder="请选择预警级别" v-model="form.warningLevel" style="width: 240px" allowClear

                                @change="handleLevel">

                <a-select-option v-for="item in levelOptions" :key="item.value" :value="item.value">

                  {{ item.name }}

                </a-select-option>

@@ -56,19 +52,14 @@
          </a-col>

        </a-row>

        <a-form-model-item prop="content">

          <a-textarea v-model="form.content" placeholder="请输入短信通知内容部分" :auto-size="{ minRows: 3, maxRows: 5 }" />

                    <a-textarea v-model="form.content" placeholder="请输入短信通知内容部分"

                        :auto-size="{ minRows: 3, maxRows: 5 }" />

        </a-form-model-item>

        <a-row>

          <a-col :span="12">

            <a-upload

                :action="uploadUrl"

                :file-list="fileList"

                @change="fileChange"

                :headers="header"

                        <a-upload :action="uploadUrl" :file-list="fileList" @change="fileChange" :headers="header"

                accept=".doc, .docx, .word, .pdf, .zip, .xlsx, .rar, .jpg, .jpeg, .png"

                :data="{module: 'naturalDisasterPath'}"

                :remove="(file)=>{removeFile(file)}"

            >

                            :data="{module: 'naturalDisasterPath'}" :remove="(file)=>{removeFile(file)}">

              <a-button> <a-icon type="upload" />上传附件</a-button>

            </a-upload>

          </a-col>

@@ -91,28 +82,17 @@
              </a-checkbox>

            </div>

            <a-form-model-item prop="receiver" style="margin-bottom: 6px">

              <a-tree-select

                  show-search

                  :maxTagCount="3"

                  tree-checkable

                  treeCheckStrictly

                  style="width: 100%"

                  v-model="form.receiver"

                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"

                  placeholder="选择工作通知接收单位"

                  allow-clear

                  multiple

                  @change="depChanges"

                  @search="onSearch"

                  @select="onSelect"

                  :tree-data="areaUsers"

                  :replaceFields="replaceFields"

              >

                            <a-tree-select show-search :maxTagCount="3" tree-checkable treeCheckStrictly

                                style="width: 100%" v-model="form.receiver"

                                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="选择工作通知接收单位"

                                allow-clear multiple @change="depChanges" @search="onSearch" @select="onSelect"

                                :tree-data="areaUsers" :replaceFields="replaceFields">

              </a-tree-select>

            </a-form-model-item>

            <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px">

                        <!-- 这个不要了，领导自动看到本单位发出去的信息，在app端体现。 -->

                        <!--            <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px">

              同时发信息给本级领导

            </a-checkbox>

            </a-checkbox> -->

          </a-col>

          <a-col :span="12">

            <div style="display:flex;justify-content: space-between;align-items: center;">

@@ -122,7 +102,8 @@
              </a-checkbox>

            </div>

            <a-form-model-item prop="recipient">

              <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :maxTagCount="3">

                            <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle"

                                :maxTagCount="3">

                <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">

                  {{ item.recipientName }}({{item.company}} {{item.phone}})

                </a-select-option>

@@ -135,12 +116,14 @@
            <b style="margin-bottom: 6px">选择审批领导：</b>

            <a-form-model-item prop="reviewId">

              <a-select show-search v-model="form.reviewId" placeholder="请选择审批领导" style="width: 300px">

                <a-select-option v-for="(item,index) in leaders" :value="item.id" :key="index">{{item.realName}}</a-select-option>

                                <a-select-option v-for="(item,index) in leaders" :value="item.id"

                                    :key="index">{{item.realName}}</a-select-option>

              </a-select>

            </a-form-model-item>

          </a-col>

          <a-col :span="12" style="text-align: right">

            <a-button type="primary" style="width: 250px;" @click="confirmSend()" :disabled="userInfo.role.id==1?true:false">

                        <a-button type="primary" style="width: 250px;" @click="confirmSend()"

                            :disabled="userInfo.role.id==1?true:false">

              确认并提交审核

            </a-button>

          </a-col>

@@ -159,18 +142,31 @@
</template>



<script>

  import {getAreaWithUserIfo, getPeerRecipient, getLeaders} from '@/api/user'

  import {getUserInfo} from "@/util/storage";

    import {

        getAreaWithUserIfo,

        getPeerRecipient,

        getLeaders

    } from '@/api/user'

    import {

        getUserInfo

    } from "@/util/storage";

  import Cookies from "js-cookie";

  import {massSend, msgSend} from "@/api/send";

  import {deleteFile} from "@/api/list";

    import {

        massSend,

        msgSend

    } from "@/api/send";

    import {

        deleteFile

    } from "@/api/list";

    export default {

        name: "notice",

        data() {

            return {

        userInfo: {},

        unittype: null,

        wrapperCol: { span: 24 },

                wrapperCol: {

                    span: 24

                },

        filteredOptions:[],

        form: {

          id: null,

@@ -201,29 +197,89 @@
          key:'id',

          value: 'id'

        },

        riskOptions: [

          {name: '地震',value: 1},

          {name: '洪涝',value: 2},

          {name: '气象',value: 3},

          {name: '泥石流',value: 4},

          {name: '水旱',value: 5},

          {name: '森林草原火灾',value: 6}

                riskOptions: [{

                        name: '地震',

                        value: 1

                    },

                    {

                        name: '洪涝',

                        value: 2

                    },

                    {

                        name: '气象',

                        value: 3

                    },

                    {

                        name: '泥石流',

                        value: 4

                    },

                    {

                        name: '水旱',

                        value: 5

                    },

                    {

                        name: '森林草原火灾',

                        value: 6

                    }

        ],

        levelOptions: [

          {name: '红色预警',value: 1},

          {name: '橙色预警',value: 2},

          {name: '黄色预警',value: 3},

          {name: '蓝色预警',value: 4}

                levelOptions: [{

                        name: '红色预警',

                        value: 1

                    },

                    {

                        name: '橙色预警',

                        value: 2

                    },

                    {

                        name: '黄色预警',

                        value: 3

                    },

                    {

                        name: '蓝色预警',

                        value: 4

                    }

        ],

        rules: {

          emergType: [{ required: true, message: '请选择紧急类型', trigger: 'change'}],

          disasterType: [{ required: true, message: '请选择灾种', trigger: 'change'}],

          warningLevel: [{ required: true, message: '请选择预警级别', trigger: 'change'}],

          title: [{ required: true, message: '请输入信息标题', trigger: 'blur'}],

          content: [{ required: true, message: '请输入信息内容', trigger: 'blur'}],

          timeout: [{ required: true, message: '请输入超时时间', trigger: 'blur'}],

          receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],

          reviewId: [{ required: true, message: '请选择审批人', trigger: 'change'}],

                    emergType: [{

                        required: true,

                        message: '请选择紧急类型',

                        trigger: 'change'

                    }],

                    disasterType: [{

                        required: true,

                        message: '请选择灾种',

                        trigger: 'change'

                    }],

                    warningLevel: [{

                        required: true,

                        message: '请选择预警级别',

                        trigger: 'change'

                    }],

                    title: [{

                        required: true,

                        message: '请输入信息标题',

                        trigger: 'blur'

                    }],

                    content: [{

                        required: true,

                        message: '请输入信息内容',

                        trigger: 'blur'

                    }],

                    timeout: [{

                        required: true,

                        message: '请输入超时时间',

                        trigger: 'blur'

                    }],

                    receiver: [{

                        required: true,

                        message: '请选择接收单位',

                        trigger: 'change'

                    }],

                    reviewId: [{

                        required: true,

                        message: '请选择审批人',

                        trigger: 'change'

                    }],

          // recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]

          // acceptingUnitIds: [{ required: true, message: '请选择接收单位', trigger: 'change'}],

          // peerRecipientIds: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]

@@ -240,7 +296,9 @@
        components: {},

    created() {

      const t = this

      const { baseUrl } = require('../../../config/env.' + process.env.NODE_ENV)

            const {

                baseUrl

            } = require('../../../config/env.' + process.env.NODE_ENV)

      t.uploadUrl= baseUrl + '/attachment/upload/detail'

      t.userInfo = getUserInfo()

      t.header.uid = t.userInfo.uid

@@ -345,9 +403,29 @@
        t.sendLeaders = []

        if(e.target.checked){

          for(let i of t.leaders){

            const {realName,...data} = i

            const { id: recipienterId, name: recipienterName, phone: recipienterPhone,...rest} = data

            const obj = { recipienterId, recipienterName, recipienterPhone, province: null,city: null,area: null,town: null,receiveUnit: t.userInfo.company,unittype: t.userInfo.unittype,roleId: 2,...rest}

                        const {

                            realName,

                            ...data

                        } = i

                        const {

                            id: recipienterId,

                            name: recipienterName,

                            phone: recipienterPhone,

                            ...rest

                        } = data

                        const obj = {

                            recipienterId,

                            recipienterName,

                            recipienterPhone,

                            province: null,

                            city: null,

                            area: null,

                            town: null,

                            receiveUnit: t.userInfo.company,

                            unittype: t.userInfo.unittype,

                            roleId: 2,

                            ...rest

                        }

            t.sendLeaders.push(obj)

          }

        }

@@ -397,7 +475,8 @@
            this.form.acceptingUnitIds = []

            this.form.peerRecipientIds = []



            const aList = this.form.receiver.map(item=>this.findNodeById(this.areaUsers,item.value)?.users)

                        const aList = this.form.receiver.map(item => this.findNodeById(this.areaUsers, item.value)

                            ?.users)

            if(aList.includes(null)){

              this.$message.error('选择接收单位时存在无用户的单位')

              return

@@ -405,21 +484,55 @@
            const newAList = [].concat(...aList)

            for(let i of newAList){

              // const {realName,...data} = i

              const {id:recipienterId,name: recipienterName,phone: recipienterPhone,company: receiveUnit,realName: recipienterRealName,...rest} = i

              const obj = { recipienterId, recipienterName,recipienterRealName, recipienterPhone, receiveUnit,...rest}

                            const {

                                id: recipienterId,

                                name: recipienterName,

                                phone: recipienterPhone,

                                company: receiveUnit,

                                realName: recipienterRealName,

                                ...rest

                            } = i

                            const obj = {

                                recipienterId,

                                recipienterName,

                                recipienterRealName,

                                recipienterPhone,

                                receiveUnit,

                                ...rest

                            }

              this.form.acceptingUnitIds.push(obj)

            }

            this.form.acceptingUnitIds = [...this.form.acceptingUnitIds,...this.sendLeaders]

            if(this.form.recipient.length>0){

              const bList = this.form.recipient.map(item => this.filteredOptions.find(i=>i.id == item))

                            const bList = this.form.recipient.map(item => this.filteredOptions.find(i => i.id ==

                                item))

              for(let i of bList){

                const {id:recipienterId,recipientName: recipienterName,phone: recipienterPhone, company: receiveUnit,...rest} = i

                const obj = {recipienterId, recipienterName,recipienterPhone,receiveUnit,unittype:this.unittype,recipienterRealName:recipienterName,...rest}

                                const {

                                    id: recipienterId,

                                    recipientName: recipienterName,

                                    phone: recipienterPhone,

                                    company: receiveUnit,

                                    ...rest

                                } = i

                                const obj = {

                                    recipienterId,

                                    recipienterName,

                                    recipienterPhone,

                                    receiveUnit,

                                    unittype: this.unittype,

                                    recipienterRealName: recipienterName,

                                    ...rest

                                }

                this.form.peerRecipientIds.push(obj)

              }

            }

            this.form.attachments = this.fileList.map(i=>i.response.data.id)

            const {receiver,recipient,id,...data} = this.form

                        const {

                            receiver,

                            recipient,

                            id,

                            ...data

                        } = this.form

            msgSend(data).then( res =>{

              if(res.data.code == 100){

                this.deleteFile()

@@ -460,10 +573,14 @@
      // 将树状数据所有id和name放入对象数组

      traverseTree(treeData) {

        let result = [];



        function traverse(data) {

          for(const node of data){

            if(node.users && node.users.length>0) {

              result.push({label: node.name, value: node.id});

                            result.push({

                                label: node.name,

                                value: node.id

                            });

              if (node.children && node.children.length > 0) {

                  traverse(node.children);

              }