新增多牌子配置页面，服务联调（新增，修改，删除）；修改通告管理页面列表样式，增加发布，修改，删除功能；新增单位考评目标修订页面，服务联调（列表，详情进行中，考评修订，修订弹框数据进行中），但是暂无数据无法调式；

src/api/api.js

@@ -77,6 +77,13 @@ export function apiGetevaluationportallist(params) {
         params: params
     })
 }
+//----------通告服务
+export function apiGetevaluationCircularDisplaylist(params) {
+    return httpRequest({
+        url: `evaluation-dept-notice/circularDisplay/${params}`,
+        method: 'get'
+    })
+}
 
 
 //----------------------------------------任务中心------------------------------------------------
@@ -161,7 +168,14 @@ export function apiPostevaluationdeptnoticeDelete(params) {
         method: 'post'
     })
 }
-
+//-----修改状态
+export function apiPostevaluationdeptnoticeModifiedState(params) {
+    return httpRequest({
+        url: `evaluation-dept-notice/modifiedState`,
+        method: 'post',
+        params: params
+    })
+}
 
 //----------------------------------------考评业务------------------------------------------------
 
@@ -220,6 +234,44 @@ export function apideptModifyassessmentState(params) {
     })
 }
 
+//单位考评目标修订 ---列表
+export function apiGetevaluationrevisionList(params) {
+    return httpRequest({
+        url: 'evaluation-revision/list',
+        method: 'get',
+        params: params
+    })
+}
+//单位考评目标------启动修订
+export function apiGetevaluationrevisionRevise(params) {
+    return httpRequest({
+        url: 'evaluation-revision/revise',
+        method: 'get',
+        params: params
+    })
+}
+//单位考评目标修订 ---详情
+export function apiGetevaluationrevisionDetails(params) {
+    return httpRequest({
+        url: `evaluation-revision/details/${params}`,
+        method: 'get'
+    })
+}
+//------单位考评修订-详情-修改
+export function apiPostevaluationrevisionSave(params) {
+    return httpRequest.post('evaluation-revision/save', params)
+}
+//单位考评目标修订 ---修订----弹框数据
+export function apiGetevaluationrevisionPopUpData(params) {
+    return httpRequest({
+        url: 'evaluation-revision/popUpData',
+        method: 'get',
+        params: params
+    })
+}
+
+
+
 //------考评启动（流程）
 export function apiGetdoAction(params) {
     return httpRequest.post('workflow/doAction', params)
@@ -772,6 +824,29 @@ export function apiDeletepartyBuildRemove(params) {
 }
 
 
+
+//----------------------------------------基础信息配置------------------------------------------------
+//----多牌配置-list
+export function apiGetmultiplebrandtreeList(params) {
+    return httpRequest({
+        url: 'multiple-brand/tree',
+        method: 'get',
+        params: params
+    })
+}
+//----"多牌配置-保存/修改"
+export function apiPostmultiplebrandSave(params) {
+    return httpRequest.post('multiple-brand/save', params)
+}
+//----"多牌配置批量删除"
+export function apiPostmultiplebrandRemove(params) {
+    return httpRequest({
+        url: `multiple-brand/remove/${params}`,
+        method: 'post'
+    })
+}
+
+
 //----------------------------------------考评知识库------------------------------------------------
 //----考评得分规则列表查询-list
 export function apiGetevaluationscoringruleList(params) {

src/components/assessment/evaluationAmendmentFrom.vue

@@ -0,0 +1,639 @@
+<template>
+    <div class="startFrom">
+        <el-dialog title="考评修订详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
+            <div class="startDetail">
+                <p class="starttitleSty">单据信息：</p>
+                <el-row class="danjuMsg">
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">业务编号:</span>
+                            <span>{{receiptMsg.code}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">创建日期:</span>
+                            <span>{{receiptMsg.createDate}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">业务简述:</span>
+                            <span>{{receiptMsg.des}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">考评周期:</span>
+                            <span>{{receiptMsg.type}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">流程状态:</span>
+                            <span>{{receiptMsg.stage}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">年度:</span>
+                            <span>{{receiptMsg.year}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">创建人:</span>
+                            <span>{{receiptMsg.createName}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">单据状态:</span>
+                            <span>{{receiptMsg.recStage}}</span>
+                        </div>
+                    </el-col>
+                </el-row>
+                <div class="detaTableBtns">
+                    <div class="tableBtn add" @click="addTableDetail">
+                        <img :src="addIcon" alt="">
+                        <span>修订</span>
+                    </div>
+                    <div class="tableBtn save" @click="saveDetail">
+                        <img :src="saveIcon" alt="">
+                        <span>保存</span>
+                    </div>
+                    <div class="tableBtn import" @click="handleImport">
+                        <img :src="importIcon" alt="">
+                        <span>导入</span>
+                    </div>
+                    <div class="tableBtn export" @click="handleExport">
+                        <img :src="exportIcon" alt="">
+                        <span>导出</span>
+                    </div>
+                </div>
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="考评指标项内容" name="first">
+                        <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                            <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                            <el-table-column type="index" label="序号" width="80" />
+                            <el-table-column label="单位名称" prop="organizationName" width="300" />
+                            <el-table-column label="指标分类" prop="typeName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
+                            <el-table-column label="指标名称" prop="indicatorName" />
+                            <el-table-column label="填报部门"  prop="deptName" width="260" />
+                            <el-table-column label="目标值">
+                                <template #default="scope">
+                                    <el-input-number v-model="scope.row.quantifiedValue"
+                                     :precision="2" :step="0.1" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="单位" prop="unit" />
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeLeft"
+                            :current-page="pageLeft.currentPage"
+                            :page-size="pageLeft.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageLeft.total">
+                        </el-pagination>
+                    </el-tab-pane>
+                    <el-tab-pane label="考评评价指标内容" name="second">
+                        <el-table :data="nonQuantifiedList.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)" style="width: 100%">
+                            <el-table-column type="index" label="序号" width="80" />
+                            <el-table-column label="单位名称" prop="organizationName" width="300" />
+                            <el-table-column label="指标分类" prop="typeName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
+                            <el-table-column label="指标名称" prop="childName" />
+                            <el-table-column label="填报部门" prop="deptName" width="260" />
+                            <el-table-column label="值">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.nonQuantifiedValue" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="审核状态">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.state" placeholder="请选择审核状态">
+                                        <el-option
+                                        v-for="item in statusData"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="dialogVisible = false">取 消</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <el-dialog title="修订数据" v-model="revisionVisible" width="70vw" custom-class="revisionClass" :close-on-click-modal="false">
+            <div class="revisionSty">
+                <el-table :data="revisionData" style="width: 100%">
+                    <el-table-column label="单位名称" prop="organizationName" />
+                    <el-table-column label="指标分类" prop="typeName" />
+                    <el-table-column label="业务阶段" prop="stageName" />
+                    <el-table-column label="业务属性" prop="sectionName" />
+                    <el-table-column label="指标名称" prop="indicatorName" />
+                    <el-table-column label="填报部门" prop="deptName" />
+                    <el-table-column label="目标值" prop="quantifiedValue" />
+                    <el-table-column label="值" prop="nonquantifiedValue" />
+                    <el-table-column label="单位" prop="unit" />
+                    <el-table-column label="审核状态" prop="state" />
+                </el-table>
+            </div>
+        </el-dialog>
+        <import-dailog ref="importPage" @successImport="successImport" @importLoading="importLoading"></import-dailog>
+    </div>
+</template>
+
+<script>
+import importDailog from '../importPage/importDailog.vue'
+import {apiGetevaluationrevisionDetails,apiPostevaluationrevisionSave, apiPostIsdoAction,
+apiGetevaluationrevisionPopUpData} from '../../api/api'
+import ExcelJS from 'exceljs'
+import fileSave from 'file-saver'
+import addIcon from '../../assets/btnIcon/add.png'
+import saveIcon from '../../assets/btnIcon/save.png'
+import editIcon from '../../assets/btnIcon/edit.png'
+import deleteIcon from '../../assets/btnIcon/delete.png'
+import exportIcon from '../../assets/btnIcon/export.png'
+import importIcon from '../../assets/btnIcon/import.png'
+export default {
+    components: {
+        importDailog
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            revisionVisible: false,
+            revisionData: [],
+            activeName: 'first',
+            quantifiedList: [],
+            nonQuantifiedList: [],
+            changeDateSelect: [],
+            receiptMsg: {
+                code: '',
+                des: '',
+                stage: '',
+                createName: '',
+                createDate: '',
+                type: '',
+                year: '',
+                recStage: ''
+            },
+            addIcon: addIcon,
+            saveIcon: saveIcon,
+            editIcon: editIcon,
+            deleteIcon: deleteIcon,
+            exportIcon: exportIcon,
+            importIcon: importIcon,
+            rowMsg: {},
+            indicItemoptions: [],
+            statusData: [],
+            pageLeft:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
+            pageRight:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
+        }
+    },
+    created() {
+        this.statusData = [
+            {
+                name: '已完成',
+                id: '1'
+            },
+            {
+                name: '待审核',
+                id: '0'
+            },
+            {
+                name: '未开始',
+                id: '-1'
+            }
+        ]
+    },
+    methods: {
+        init(row) {
+            this.dialogVisible = true
+            this.activeName = 'first'
+            this.receiptMsg = {
+                code: row.responsibilityCode,
+                des: row.des,
+                stage: row.stage,
+                createName: row.createName,
+                createDate: row.createTime,
+                type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                year: row.year,
+                recStage: '有效'
+            }
+            this.getDetails(row.deptResponsibilityId)
+            this.rowMsg = row
+        },
+        handleClick() {
+            this.changeDateSelect = []
+        },
+        rowClick(selection, row) {
+            this.changeDateSelect = selection
+        },
+        handleCurrentChangeLeft(val) {
+            this.pageLeft.currentPage = val
+        },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
+        //获取详情
+        getDetails(id) {
+            let that = this
+            that.quantifiedList = []
+            that.nonQuantifiedList = []
+            apiGetevaluationrevisionDetails(id).then(datas =>{
+                if (datas && datas.data) {
+                    that.quantifiedList = datas.data.quantifiedList
+                    that.pageLeft.total = datas.data.quantifiedList.length
+                    if (datas.data.nonQuantifiedList.length>0) {
+                        datas.data.nonQuantifiedList.forEach(it =>{
+                            it.childName = it.indicatorName //指标id
+                            // nonarr.push(obj)
+                        })
+                    }
+                    that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
+                    that.pageRight.total = datas.data.nonQuantifiedList.length
+                }
+            })
+        },
+        addTableDetail() {
+            this.revisionVisible = true
+            this.getrevisionDataFn(this.rowMsg)
+            // let obj = {
+            //     showInput: true,
+            //     stageName: '',
+            //     sectionName: '',
+            //     organizationName: '',
+            //     deptName: '',
+            //     typeName: '',
+            //     optionName: '',
+            //     nonQuantifiedValue: ''
+            // }
+            // this.nonQuantifiedList.unshift(obj)
+        },
+        // 修订数据
+        getrevisionDataFn(row) {
+            let that = this
+            let params = {
+                deptResponsibilityId: row.deptResponsibilityId,
+                isQuantified: this.activeName === 'first'?'是':'否'
+            }
+            apiGetevaluationrevisionPopUpData(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.revisionData = datas.data
+                }
+            })
+        },
+        saveDetail() {
+            let that = this
+            let params = []
+            if (that.activeName === 'first') {
+                that.quantifiedList.forEach(item =>{
+                    let obj = {
+                        id: item.id,
+                        isQuantified: '是',
+                        quantifiedValue: item.quantifiedValue,
+                        state: item.state
+                    }
+                    params.push(obj)
+                })
+            } else {
+                that.nonQuantifiedList.forEach(item =>{
+                    let obj = {
+                        isQuantified: '否',
+                        quantifiedValue: 0.0,
+                        optionCode: 'ZRMB', // 指标项
+                        nonQuantifiedValue: item.nonQuantifiedValue,
+                        state: item.state,
+                        deptResponsibilityId: that.rowMsg.id
+                    }
+                    if (item.showInput) {
+                        obj.organizationEvaluationRuleId = item.organizationName //单位id
+                        obj.indicatorId = item.childName //指标id
+                        
+                    } else {
+                        obj.id = item.id
+                        obj.organizationEvaluationRuleId = item.organizationEvaluationRuleId
+                        obj.indicatorId = item.indicatorId
+                    }
+                    params.push(obj)
+                })
+            }
+            apiPostevaluationrevisionSave(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: '保存成功',
+                            type: 'success'
+                        });
+                        that.getDetails(that.rowMsg.deptResponsibilityId)
+                    } else {
+                        that.$message({
+                            message: datas.data,
+                            type: 'error'
+                        })
+                    }
+                }
+            })
+        },
+        examineAndApprove(type) {
+            let that = this
+            let actionCS = ''
+            if (type === 'agree') {
+                if (that.rowMsg.taskType === 'SIGN') {
+                    actionCS = 'signAgree'
+                } else if (that.rowMsg.taskType === 'NORMAL') {
+                    actionCS = 'agree'
+                }
+            } else {
+                if (that.rowMsg.taskType === 'SIGN') {
+                    actionCS = 'signReject'
+                } else if (that.rowMsg.taskType === 'NORMAL') {
+                    actionCS = 'reject'
+                }
+            }
+            let params = {
+                taskId: that.rowMsg.id, //任务ID
+                nodeId: that.rowMsg.nodeId, //节点ID
+                action: actionCS, //固定值
+                instanceId: that.rowMsg.instId, //流程实例ID
+                opinion: that.descMsg, //审批意见
+                iamCode: window.localStorage.getItem('code'), //认证后code值
+                taskName: that.rowMsg.name,
+                defKey: that.instanceChild.defKey,
+                bizKey: that.instanceChild.bizKey
+            }
+            apiPostIsdoAction(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (datas.data.isOk) {
+                        that.$message({
+                            message: datas.data.data,
+                            type: 'success'
+                        })
+                        that.dialogVisible = false
+                        that.$emit('approveMsg', datas.data.isOk)
+                    } else {
+                        that.$message({
+                            message: datas.data.msg,
+                            type: 'error'
+                        })
+                    }
+                }
+            })
+        },
+        handleImport() {
+            this.$refs.importPage.upload.title = "考评目标信息导入"
+            this.$refs.importPage.upload.open = true
+            this.$refs.importPage.upload.url = '/responsibility-indicator-info/import'
+        },
+        successImport(val) {
+            this.getDetails(this.rowMsg.deptResponsibilityId)
+        },
+        handleExport() {
+            let data = []  //接口返回数据
+            const workbook = new ExcelJS.Workbook()
+            const worksheet = workbook.addWorksheet('Sheet1')
+            //根据数据自己调整
+            let colums = []
+            colums = [
+                { header: 'ID', key: 'id', width: 26 },
+                { header: '单位名称', key: 'organizationShortName', width: 26 },
+                { header: '指标分类', key: 'typeName', width: 18 },
+                { header: '业务阶段', key: 'stageName', width: 18 },
+                { header: '业务属性', key: 'sectionName', width: 18 },
+                { header: '指标名称', key: 'childName', width: 18 },
+                { header: '填报部门', key: 'deptName', width: 26 },
+            ]
+            if (this.activeName === 'first') {
+                colums.push(
+                    { header: '目标值', key: 'quantifiedValue', width: 18 },
+                    { header: '单位', key: 'unit', width: 18 },
+                    { header: '审核状态', key: 'state', width: 18 }
+                )
+                this.quantifiedList.forEach(item =>{
+                    if (item.updateMark) {
+                        data.push(item)
+                    }
+                })
+            } else {
+                colums.push(
+                    { header: '值', key: 'nonQuantifiedValue', width: 18 },
+                    { header: '审核状态', key: 'state', width: 18 }
+                )
+                this.nonQuantifiedList.forEach(item =>{
+                    if (item.updateMark) {
+                        data.push(item)
+                    }
+                })
+            }
+            worksheet.columns = colums
+            worksheet.getRow(1).font = {
+                size: 12,
+                bold: true
+            }
+            worksheet.addRows(data)
+
+            workbook.xlsx.writeBuffer().then(buffer => {
+                //这里为type
+                const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' })
+                fileSave(blob, `数据导出.xlsx`)
+            })
+        },
+    }
+}
+</script>
+
+<style lang="less">
+.startFrom{
+    .el-overlay{
+        .el-dialog{
+            // margin-top: 7vh;
+            .el-dialog__body{
+                padding: 0 20px !important;
+                .startDetail{
+                    .starttitleSty{
+                        font-size: 18px;
+                        font-family: Microsoft YaHei;
+                        font-weight: bold;
+                        color: #3B7AD1;
+                        // line-height: 12px;
+                        margin: 20px 0 20px 10px;
+                    }
+                    .danjuMsg{
+                        border: 1px solid #D6DBEA;
+                        padding: 10px 20px;
+                        border-radius: 10px;
+                        margin-bottom: 20px;
+                        .danjuMsg_data{
+                            padding: 5px 0 10px 0;
+                            .data_tit{
+                                margin-right: 10px;
+                                font-weight: bold;
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                                color: #8991B0;
+                            }
+                            .data_tit_wd{
+                                display: inline-block;
+                                width: 90px;
+                            }
+                            .el-form-item--small{
+                                .el-input{
+                                    height: 25px;
+                                    width: 160px;
+                                }
+                                margin-bottom: 0;
+                                .el-input-number{
+                                    height: 25px;
+                                    .el-input-number__decrease, .el-input-number__increase{
+                                        right: -39px;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    .el-select, .el-input{
+                        width: 100%;
+                    }
+                    .detaTableBtns{
+                        display: flex;
+                        width: 340px;
+                        position: relative;
+                        top: 32px;
+                        left: 80vw;
+                        z-index: 11111;
+                        .tableBtn {
+                            display: flex;
+                            margin-right: 30px;
+                            img{
+                                margin-right: 5px;
+                                margin-top: 1px;
+                            }
+                            span{
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                                font-weight: 400;
+                            }
+                        }
+                        .add{
+                            cursor: pointer;
+                            span{
+                                color: #3B7AD1;
+                            }
+                        }
+                        .save{
+                            cursor: pointer;
+                            span{
+                                color: #50C14E;
+                            }
+                        }
+                        .edit{
+                            span{
+                                color: #F5A623;
+                            }
+                        }
+                        .delete{
+                            cursor: no-drop;
+                            span{
+                                color: #F65177;
+                            }
+                        }
+                        .export{
+                            cursor: pointer;
+                            span{
+                                color: #2baa8a;
+                            }
+                        }
+                        .import{
+                            cursor: pointer;
+                            span{
+                                color: #ce1e78;
+                            }
+                        }
+                    }
+                    .el-tabs{
+                        .el-tabs__header{
+                            .el-tabs__nav{
+                                .el-tabs__item{
+                                    font-size: 18px;
+                                    font-family: Microsoft YaHei;
+                                    font-weight: bold;
+                                    margin: 0 10px;                                    
+                                    color: #8991B0;
+                                }
+                                .is-active{
+                                    font-size: 18px;
+                                    font-family: Microsoft YaHei;
+                                    font-weight: bold;
+                                    color: #3B7AD1;
+                                    margin: 0 10px;
+                                }
+                            }
+                        }
+                        
+                        .el-table{
+                            margin-bottom: 10px;
+                            .el-table__body-wrapper{
+                                height: 50vh;
+                            }
+                            .el-table__row{
+                                .cell{
+                                    .el-input{
+                                        height: 24px;
+                                        .el-input__inner{
+                                            height: 24px;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            .el-dialog__footer{
+                .dialog-footer{
+                    display: flex;
+                    justify-content: center;
+                    .el-button{
+                        width: 180px !important;
+                        height: 40px !important;
+                    }
+                }
+            }
+        }
+    }
+    .revisionClass{
+        margin-top: 7vh;
+    }
+}
+</style>

src/components/assessment/evaluationAmendmentPage.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="evaluationStart">
-        <div class="evaluationStartBtn">
+    <div class="evaluationAmendment">
+        <div class="evaluationAmendmentBtn">
             <div class="collectSeach">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号：</span>
@@ -26,8 +26,8 @@
                 @handleDelete="handleDelete"
                 ></btns>
             </div>
-            <div class="evaluationStartTableData">
-                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick"
+            <div class="evaluationAmendmentTableData">
+                <el-table :data="evaluationAmendmentData" style="width: 100%" @select="rowClick"
                  @select-all="rowClick" @row-dblclick="getDetail" @cell-click="clickDes">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="responsibilityCode" />
@@ -170,10 +170,10 @@
 </template>
 
 <script>
-import startFromList from './evaluationStartFrom.vue'
+import startFromList from './evaluationAmendmentFrom.vue'
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import {apiGetdeptresponsibilityList, apiGetdeptresponsibilitySave,apiGetdoAction,apiGetworkflowgetOpinion,
+import {apiGetevaluationrevisionList, apiGetdeptresponsibilitySave,apiGetdoAction,apiGetworkflowgetOpinion,
 apiGetdeptresponsibilitygenerate, apiGetdatadictionaryList, apiPostresponsiDelete} from '../../api/api'
 export default {
     components: {
@@ -189,7 +189,7 @@ export default {
             windframradio: {},
             deleteSelect: [],
             changeDateSelect: [],
-            evaluationStartData:[],
+            evaluationAmendmentData:[],
             page:{
                 pagesize: 12,
                 currentPage: 1,
@@ -240,12 +240,12 @@ export default {
                 code: 'BMKP'
             }
         ]
-        this.getevaluStartList()
+        this.getevaluAmendmentList()
         this.getPeriodData()
     },
     methods:{
         // 查询列表页面
-        getevaluStartList() {
+        getevaluAmendmentList() {
             let that = this
             let params = {
                 pageNum: that.page.currentPage,
@@ -254,9 +254,9 @@ export default {
                 responsibilityCode: that.rescode,
                 des: that.resDes
             }
-            apiGetdeptresponsibilityList(params).then(datas =>{
+            apiGetevaluationrevisionList(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.evaluationStartData = datas.data.records
+                    that.evaluationAmendmentData = datas.data.records
                     that.page.total = datas.data.total
                 }
             })
@@ -295,7 +295,7 @@ export default {
                         message: '考评目标修改成功',
                         type: 'success'
                     });
-                    that.getevaluStartList()
+                    that.getevaluAmendmentList()
                 }
             })
         },
@@ -348,17 +348,17 @@ export default {
                     }
                     that.dialogVisible = false
                     that.changeDateSelect = []
-                    that.getevaluStartList()
+                    that.getevaluAmendmentList()
                 }
             })
         },
         agetdeptresponsibility(row) {
             let that = this
             let par = {
-                defKey: "dwkpmbqd",
+                defKey: "dwkpmbxd",
                 businessKey: row.id,
                 action: "start",
-                opinion: "考评目标启动",
+                opinion: "考评目标修订",
                 iamCode: window.localStorage.getItem('code')
             }
             if (row.instId === null || row.instId === '') {
@@ -397,7 +397,7 @@ export default {
                             type: 'success'
                         });
                     }
-                    that.getevaluStartList()
+                    that.getevaluAmendmentList()
                 }
             })
         },
@@ -441,28 +441,28 @@ export default {
         },
         getSeachData() {
             this.page.currentPage = 1
-            this.getevaluStartList()
+            this.getevaluAmendmentList()
         },
         resetSeach() {
             this.page.currentPage = 1
             this.rescode = ''
             this.resDes = ''
-            this.getevaluStartList()
+            this.getevaluAmendmentList()
         },
         handleSizeChange(val){
             this.page.pagesize = val
-            this.getevaluStartList()
+            this.getevaluAmendmentList()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
-            this.getevaluStartList()
+            this.getevaluAmendmentList()
         },
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
         approveMsg(val) {
             if (val) {
-                this.getevaluStartList()
+                this.getevaluAmendmentList()
             }
         },
         handleAdd() {
@@ -497,7 +497,7 @@ export default {
                         type: 'success',
                         message: '删除成功!'
                     });
-                    that.getevaluStartList()
+                    that.getevaluAmendmentList()
                     that.changeDateSelect = []
                 })
             })
@@ -507,8 +507,8 @@ export default {
 </script>
 
 <style lang="less">
-.evaluationStart{
-    .evaluationStartBtn{
+.evaluationAmendment{
+    .evaluationAmendmentBtn{
         .collectSeach{
                 display: flex;
                 padding: 24px 20px;
@@ -567,7 +567,7 @@ export default {
                 margin:0;
             }
         }
-        .evaluationStartTableData{
+        .evaluationAmendmentTableData{
             .el-table{
                 .el-table__body-wrapper{
                     height: 60vh !important;

src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -61,8 +61,8 @@
             <div class="benchmarkingIndicatorTableData">
                 <div class="tableMain">
                     <el-table :data="benchmarkingIndicatorData" style="width: 100%" ref="benchmark">
-                        <el-table-column type="index" label="序号" align="center"></el-table-column>
-                        <el-table-column label="考评单位" prop="organization_name" width="200">
+                        <el-table-column type="index" label="排名" align="center"></el-table-column>
+                        <el-table-column label="考评单位" prop="organization_name" width="300">
                             <template #default="scope">
                                 <el-tooltip class="box-item" effect="customized" :content="scope.row.organization_name"
                                     placement="right">
@@ -70,8 +70,8 @@
                                 </el-tooltip>
                             </template>
                         </el-table-column>
-                        <el-table-column label="排名" prop="level" />
-                        <el-table-column label="综合得分" prop="ZHDF" />
+                        <!-- <el-table-column label="排名" prop="level" /> -->
+                        <el-table-column label="综合得分" prop="score_total" />
                         <el-table-column  v-for="(it, index) in benchmarkingIndicatorHeader" :key="index" :label="it.name" align="center">
                             <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key">
                                 <template #default="scope">
@@ -233,12 +233,14 @@ export default {
                 condition: that.timeStr,
                 date: that.timeIds,
                 type: that.indicatorIds,
-                binSection: that.binSectionStr,
+                binSection: '',
                 binStage: that.stageIds
+                // that.binSectionStr
             }
             apiGetscoreCountevaluationList(params).then(datas => {
                 if (datas && datas.data) {
-                    that.benchmarkingIndicatorData = datas.data.value
+                    // that.benchmarkingIndicatorHeader = datas.data.title
+                    // that.benchmarkingIndicatorData = datas.data.value
                     if (datas.data.title) {
                         let header = []
                         for(let i in datas.data.title) {
@@ -250,6 +252,20 @@ export default {
                         }
                         that.benchmarkingIndicatorHeader = header
                     }
+                    if (datas.data.value.length>0) {
+                        let arr = datas.data.value
+                        for(let i =0; i<arr.length-1; i++) {
+                            for(let j =0; j<arr.length-1-i; j++) {
+                                if (arr[j] > arr[j+1]) {
+                                    const temp = arr[j]
+                                    arr[j] = arr[j+1]
+                                    arr[j+1] = temp
+                                }
+                            }
+                        }
+                        that.benchmarkingIndicatorData = arr
+                        console.log('arr', arr)
+                    }
                 }
             })
         },

src/components/assessment/evaluationStartFrom.vue

@@ -117,7 +117,7 @@
                                         <el-option
                                         v-for="item in orgruleData"
                                         :key="item.id"
-                                        :label="item.shortName"
+                                        :label="item.organizationShortName"
                                         :value="item.id">
                                         </el-option>
                                     </el-select>

src/components/assessment/evaluationStartPage.vue

@@ -78,7 +78,8 @@
                         <template #default="scope">
                             <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
                             <!-- <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p> -->
-                            <p style="font-size: 12px;margin-right: 20px;" v-else-if="scope.row.stage === '流程已结束'" >已结束</p>
+                            <p style="font-size: 12px;margin-right: 20px;"  @click="evaluationRevision(scope.row)"
+                             v-else-if="scope.row.stage === '流程已结束'" >修订</p>
                             <p style="font-size: 12px;margin-right: 20px;" v-else >已启动</p>
                         </template>
                     </el-table-column>
@@ -352,6 +353,13 @@ export default {
                 }
             })
         },
+        //启动修订
+        evaluationRevision(row) {
+            let params = {
+                id: row.id
+            }
+            apiGetevaluationrevisionRevise(params).then(datas =>{})
+        },
         agetdeptresponsibility(row) {
             let that = this
             let par = {

src/components/baseInfomation/moreBrandPage.vue

@@ -0,0 +1,494 @@
+<template>
+    <div class="moreBrand" v-loading="loadingImport">
+        <div class="moreBrandBtn">
+            <div class="collectSeach">
+                <div class="exceed">
+                    <span class="exceedSpan" style="width: 80px">业务属性：</span>
+                    <el-select v-model="moduleStr" placeholder="请选择业务属性">
+                        <el-option
+                        v-for="item in moduleData"
+                        :key="item.id"
+                        :label="item.sectionName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
+                <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
+            </div>
+            <div class="PeriodBtn">
+                <btns 
+                    :showImport="false" :showExport="false" :showSave="false"
+                    :showAdd="true"
+                    :showDelete="false"
+                    @handleAdd="handleAdd('out')"></btns>
+            </div>
+            <div class="moreBrandTableData">
+                <el-table :data="moreBrandData" style="width: 100%">
+                    <el-table-column type="expand">
+                    <template #default="props">
+                        <div class="inTable">
+                            <el-table :data="props.row.children" border>
+                                <el-table-column label="单位名称" prop="organizationName" />
+                                <el-table-column label="业务属性" prop="binSectionName" />
+                                <el-table-column label="考评周期" prop="checkCycle" />
+                                <el-table-column label="利润金额" prop="profit" />
+                                <el-table-column label="分数" prop="score" />
+                                <el-table-column label="年" prop="year" />
+                                <el-table-column label="月" prop="month" />
+                                <el-table-column label="备注" prop="remark" />
+                                <el-table-column label="操作" width="150">
+                                    <template #default="scope">
+                                        <div style="display: flex">
+                                            <p class="indicitem" @click="handleEdit('in', scope.row)">修改</p>
+                                            <p class="indicitem" @click="handleDelete(scope.row)">删除</p>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </template>
+                    </el-table-column>
+                    <el-table-column label="单位名称" prop="organizationName" />
+                    <el-table-column label="业务属性" prop="binSectionName" />
+                    <el-table-column label="考评周期" prop="checkCycle" />
+                    <el-table-column label="利润金额" prop="profit" />
+                    <el-table-column label="分数" prop="score" />
+                    <el-table-column label="年" prop="year" />
+                    <el-table-column label="月" prop="month" />
+                    <el-table-column label="备注" prop="remark" />
+                    <el-table-column label="操作" width="150">
+                        <template #default="scope">
+                            <div style="display: flex">
+                                <p class="indicitem" @click="handleAdd('in', scope.row)">新增</p>
+                                <p class="indicitem" @click="handleEdit('out', scope.row)">修改</p>
+                                <p class="indicitem" @click="handleDelete(scope.row)">删除</p>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="page.currentPage"
+                    :page-size="page.pagesize"
+                    layout="total, prev, pager, next, jumper"
+                    :total="page.total">
+                </el-pagination>
+            </div>
+            <div class="indexRuledialog">
+                <el-dialog :title="title" v-model="dialogVisible" width="600px" :close-on-click-modal="false">
+                    <div class="periodFrom">
+                        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"
+                            class="demo-ruleForm" :validate-on-rule-change="false">
+                             <!-- prop="organizationName" -->
+                            <el-form-item label="单位名称">
+                                <el-select v-model="ruleForm.organizationName" filterable placeholder="请选择单位名称">
+                                    <el-option v-for="item in companyDatas" :key="item.id" :label="item.shortName"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="业务属性" prop="binSection">
+                                <el-select v-model="ruleForm.binSection" placeholder="请选择业务属性">
+                                    <el-option v-for="item in moduleData" :key="item.id" :label="item.sectionName"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="考评周期" prop="checkCycle">
+                                <el-select v-model="ruleForm.checkCycle" placeholder="请选择考评周期">
+                                    <el-option v-for="item in periodData" :key="item.keyValue" :label="item.keyName"
+                                        :value="item.keyValue">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="利润金额">
+                                <el-input-number v-model="ruleForm.profit" :precision="2" :step="0.1" :min="0"
+                                 placeholder="请输入利润金额" />
+                            </el-form-item>
+                            <el-form-item label="分数">
+                                <el-input-number v-model="ruleForm.score" :precision="2" :step="0.1" :min="0"
+                                 placeholder="请输入分数" />
+                            </el-form-item>
+                            <el-form-item label="年份" prop="year">
+                                <el-date-picker
+                                    v-model="ruleForm.year"
+                                    type="year"
+                                    value-format="YYYY"
+                                    placeholder="请选择年份"
+                                    />
+                            </el-form-item>
+                            <el-form-item label="月份">
+                                <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
+                            </el-form-item>
+                            <el-form-item label="备注">
+                                <el-input v-model="ruleForm.remark" :rows="5" type="textarea" placeholder="请输入备注"></el-input>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                    <template #footer>
+                        <span class="dialog-footer">
+                            <el-button @click="dialogVisible = false">取 消</el-button>
+                            <el-button type="primary" @click="savemoreBrandMsg('ruleForm')">确 定</el-button>
+                        </span>
+                    </template>
+                </el-dialog>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import seachs from '../seachGroup.vue'
+import btns from '../elbuttonS.vue'
+import {apiGetmultiplebrandtreeList, apiPostmultiplebrandSave, apiGetorganizationgetTree,
+apiPostmultiplebrandRemove, apiGetbinsectionList, apiGetdatadictionaryList} from '../../api/api'
+export default {
+    components: { btns, seachs },
+    data() {
+        return {
+            dialogVisible: false,
+            title: '',
+            isSave: false,
+            moduleData: [],
+            periodData: [],
+            moduleStr: '',
+            moreBrandData:[],
+            companyDatas: [],
+            addType: '',
+            ruleForm: {
+                organizationName: '',
+                binSection: '',
+                checkCycle: '',
+                profit: 0,
+                score: 0,
+                year: '',
+                month: 1,
+                remark: ''
+            },
+            rules: {
+                organizationName: [
+                    { required: true, message: '请选择单位名称', trigger: 'change' }
+                ],
+                binSection: [
+                    { required: true, message: '请选择业务属性', trigger: 'change' }
+                ],
+                checkCycle: [
+                    { required: true, message: '请选择考评周期', trigger: 'change' }
+                ],
+                year: [
+                    { required: true, message: '请选择年份', trigger: 'change' }
+                ]
+            },
+            page:{
+                pagesize: 12,
+                currentPage: 1,
+                total: 0
+            },
+            evalradio: {},
+            loadingImport: false,
+        }
+    },
+    created() {
+        this.getMoreBrandData()
+        this.getOrganizetionData(23031000, 2)
+        this.getDataDictionary()
+    },
+    methods:{
+        // 查询指标数据
+        getMoreBrandData() {
+            let that = this
+            let params = {
+                pageNum: that.page.currentPage,
+                pageSize: that.page.pagesize
+            }
+            apiGetmultiplebrandtreeList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.moreBrandData = datas.data.records
+                    that.page.total = datas.data.total
+                }
+            })
+        },
+        //查询组织数据
+        getOrganizetionData(id, num) {
+            let that = this
+            let params = {
+                id: id,
+                num: num
+            }
+            apiGetorganizationgetTree(params).then(datas => {
+                if (datas && datas.data && datas.data[0].children.length > 0) {
+                    that.companyDatas = datas.data[0].children
+                }
+            })
+        },
+        // 查询规则模块和阶段数据
+        getDataDictionary() {
+            let that = this
+            apiGetbinsectionList().then(datas =>{
+                if (datas && datas.data) {
+                    that.moduleData = datas.data
+                }
+            })
+            apiGetdatadictionaryList({superKey: 'KPZQ0001'}).then(datas => {
+                if (datas && datas.data) {
+                    that.periodData = datas.data
+                }
+            })
+        },
+        handleAdd(type, row) {
+            this.dialogVisible = true
+            this.evalradio = row
+            this.addType = type
+            this.isSave = false
+            this.title = '新增牌子配置'
+            this.$nextTick(() =>{
+                // this.$refs['ruleForm'].resetFields()
+                this.ruleForm = {
+                    organizationName: '',
+                    binSection: '',
+                    checkCycle: '',
+                    profit: 0,
+                    score: 0,
+                    year: '',
+                    month: 1,
+                    remark: ''
+                }
+            })
+        },
+        handleEdit(type, row) {
+            this.dialogVisible = true
+            this.isSave = true
+            this.addType = type
+            this.title = '修改考评规则'
+            this.evalradio = row
+            this.ruleForm = {
+                organizationName: this.evalradio.id,
+                binSection: this.evalradio.binSection,
+                checkCycle: this.evalradio.checkCycle,
+                profit: this.evalradio.profit,
+                score: this.evalradio.score,
+                year: this.evalradio.year,
+                month: this.evalradio.month,
+                remark: this.evalradio.remark
+            }
+        },
+        savemoreBrandMsg(formName) {
+            let that = this
+            that.$refs[formName].validate((valid) => {
+                if (valid) {
+                    that.saveAndEditRuleData()
+                }
+            });
+        },
+        //新增/修改指标数据
+        saveAndEditRuleData() {
+            let that = this
+            // let orgName = ''
+            // that.companyDatas.forEach(item => {
+            //     if (item.id === that.ruleForm.organizationName) {
+            //         orgName = item.name
+            //     }
+            // })
+            let params = {
+                // id: that.ruleForm.organizationName,
+                // organizationName: orgName,
+                organizationId: '50264514',
+                organizationName: '杭锦旗国电电力有限公司',
+                binSection: that.ruleForm.binSection,
+                checkCycle: that.ruleForm.checkCycle,
+                profit: that.ruleForm.profit,
+                score: that.ruleForm.score,
+                year: that.ruleForm.year,
+                month: that.ruleForm.month.toString(),
+                remark: that.ruleForm.remark
+            }
+            
+            if (that.isSave) {
+                if (that.addType === 'in') {
+                    params.parentId = that.evalradio.parentId
+                }
+                params.id = that.evalradio.id
+            } else {
+                if (that.addType === 'in') {
+                    params.parentId = that.evalradio.organizationId
+                }
+            }
+            apiPostmultiplebrandSave(params).then(datas =>{
+                if (!datas.success) {
+                    that.$message({
+                        message: datas.message,
+                        type: 'error'
+                    });
+                } else {
+                    if (!that.isSave) {
+                        that.$message({
+                            message: '牌子新增成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: '牌子修改成功',
+                            type: 'success'
+                        });
+                    }
+                    that.dialogVisible = false
+                    that.getMoreBrandData()
+                }
+            })
+        },
+        //删除指标数据
+        handleDelete(row) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let that = this
+                apiPostmultiplebrandRemove(row.id).then(datas =>{
+                    that.$message({
+                        type: 'success',
+                        message: '删除成功!'
+                    });
+                    that.getMoreBrandData()
+                })
+            })
+        },
+        getSeachData() {
+            this.page.currentPage = 1
+            this.getMoreBrandData()
+        },
+        resetSeach() {
+            this.page.currentPage = 1
+            this.moduleStr = ''
+            this.getMoreBrandData()
+        },
+        handleSizeChange(val){
+            this.page.pagesize = val
+            this.getMoreBrandData()
+        },
+        handleCurrentChange(val){
+            this.page.currentPage =val
+            this.getMoreBrandData()
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.moreBrand{
+  .moreBrandBtn{
+        .collectSeach{
+            display: flex;
+            padding: 24px 20px;
+            border-bottom: 1px solid#D6DBEA;
+                .exceed{
+                    display: flex;
+                    .exceedSpan{
+                        width: 100px;
+                        height: 12px;
+                        font-size: 14px;
+                        font-family: Microsoft YaHei;
+                        font-weight: 400;
+                        color: #8991B0;
+                        line-height: 12px;
+                        margin-top: 14px;
+                    }
+                    .el-select{
+                        line-height: 40px !important;
+                        .el-input__inner, .is-disabled{
+                            height:40px !important;
+                        }
+                        .el-input__suffix{
+                            .el-select__caret{
+                                line-height:40px;
+                            }
+                        }
+                    }
+                }
+                .el-select{
+                    margin-right:10px;
+                    .el-input__inner{
+                        height:30px;
+                    }
+                    .el-input__suffix{
+                        .el-select__caret{
+                            line-height:30px;
+                        }
+                    }
+                }
+        }
+        span{
+            font-size:14px;
+        }
+        .PeriodBtn{
+            display: flex;
+            justify-content: end;
+            padding: 20px 0;
+        }
+        .el-button{
+            height: 30px;
+            // width:100px;
+            padding: 0 30px ;
+            // padding-top: 8px;
+            span{
+                margin:0;
+            }
+        }
+        .indexRuledialog{
+            .el-overlay{
+                .el-dialog{
+                    .el-dialog__body{
+                        padding: 30px 60px 30px 20px !important;
+                        .periodFrom{
+                            .el-select, .el-input{
+                                width: 100%;
+                            }
+                            .el-input {
+                                height: 30px;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+  .moreBrandTableData{
+    .el-table{
+        .el-table__body-wrapper{
+            height: 60vh !important;
+        }
+        .el-input__inner{
+            height: 30px !important;
+        }
+        .el-radio__label{
+            display: none;
+        }
+        
+        .inTable{
+            padding: 20px;
+            .el-table{
+                .el-table__body-wrapper{
+                    height: 30vh !important;
+                }
+            }
+        }
+        .indicitem{
+            color: #409EFF;
+            font-size: 12px;
+            margin-right: 20px;
+            cursor:pointer;
+            &:hover{
+                text-decoration: underline;
+            }
+        }
+    }
+    .el-pagination{
+        margin-top: 20px;
+        text-align: end;
+        position: relative;
+    }
+    }
+    
+}
+</style>

src/components/elbuttonS.vue

@@ -8,29 +8,29 @@
             @click="handleAdd"
             >
             <img :src="addW" style="margin-right: 10px">
-            <span>新增</span>
+            <span>{{addName}}</span>
             </el-button>
         </el-col>
         <el-col :span="1.5" v-if="showSave">
             <el-button
-            color="#F5A623"
+            type="warning"
             size="mini"
             @click="handleEdit"
             :disabled="disSave"
             >
             <img :src="editW" style="margin-right: 10px">
-            <span>修改</span>
+            <span>{{saveName}}</span>
             </el-button>
         </el-col>
         <el-col :span="1.5" v-if="showDelete">
             <el-button
-            color="#F65177"
+            type="danger"
             size="mini"
             :disabled="disDelete"
             @click="handleDelete"
             >
             <img :src="deleteW" style="margin-right: 10px">
-            <span>删除</span>
+            <span>{{deleteName}}</span>
             </el-button>
         </el-col>
         <el-col :span="1.5" v-if="showImport">
@@ -40,7 +40,7 @@
             size="mini"
             :disabled="disImport"
             @click="handleImport"
-            >导入</el-button>
+            >{{importName}}</el-button>
         </el-col>
         <el-col :span="1.5" v-if="showExport">
             <el-button
@@ -49,7 +49,7 @@
             size="mini"
             :disabled="disExport"
             @click="handleExport"
-            >导出</el-button>
+            >{{exportName}}</el-button>
         </el-col>
     </el-row>
 </template>
@@ -72,6 +72,12 @@ export default {
                 return false;
             },
         },
+        addName: {
+            type: String,
+            default: () => {
+                return '新增';
+            },
+        },
         showSave: {
             type: Boolean,
             default: () => {
@@ -84,6 +90,12 @@ export default {
                 return false;
             },
         },
+        saveName: {
+            type: String,
+            default: () => {
+                return '修改';
+            },
+        },
         showDelete: {
             type: Boolean,
             default: () => {
@@ -96,6 +108,12 @@ export default {
                 return false;
             },
         },
+        deleteName: {
+            type: String,
+            default: () => {
+                return '删除';
+            },
+        },
         showImport: {
             type: Boolean,
             default: () => {
@@ -108,6 +126,12 @@ export default {
                 return false;
             },
         },
+        importName: {
+            type: String,
+            default: () => {
+                return '导入';
+            },
+        },
         showExport: {
             type: Boolean,
             default: () => {
@@ -120,6 +144,12 @@ export default {
                 return false;
             },
         },
+        exportName: {
+            type: String,
+            default: () => {
+                return '导出';
+            },
+        },
     },
     data() {
         return {

src/components/gatewaynNewPage.vue

@@ -270,13 +270,13 @@
                         <p>通告栏</p>
                     </div>
                     <div class="reportMain">
-                        <div class="reportMain_msg" v-for="it in 10" :key="it">
+                        <div class="reportMain_msg" v-for="it in noticeData" :key="it.id">
                             <div class="rightDiv"></div>
                             <div class="rightTitMsg">
-                                <p>关于2022年度各单位年度考评得分</p>
+                                <p>{{it.noticeTitle}}</p>
                                 <div style="margin-top: 5px">
-                                    <span style="margin-right: 10px">2023-01-15</span>
-                                    <span>组织人事部</span>
+                                    <span style="margin-right: 10px">{{it.createTime.substring(0, it.createTime.indexOf(' '))}}</span>
+                                    <span>{{it.releaseDept}}</span>
                                 </div>
                             </div>
                         </div>
@@ -298,7 +298,7 @@ import topImg from '../assets/getwayImg/topNew.png'
 import botImg from '../assets/getwayImg/botNew.png'
 import cenImg from '../assets/getwayImg/cenNew.png'
 
-import {apiGetevaluationportallist} from '../api/api'
+import {apiGetevaluationportallist, apiGetevaluationCircularDisplaylist} from '../api/api'
 
 import yearFrom from './gateWay/gatewayNewYearFrom.vue'
 import seasonFrom from './gateWay/gatewayNewSeasonFrom.vue'
@@ -306,6 +306,7 @@ export default {
     components: {yearFrom, seasonFrom},
     data() {
         return {
+            noticeData: [],
             cupDataYearArr: {
                 section: [],
                 integration: []
@@ -344,8 +345,19 @@ export default {
     },
     mounted() {
         this.getGateWayData()
+        // this.getDeptNoticeData()
     },
     methods: {
+        getDeptNoticeData() {
+            let that = this
+            // 1633346265041498113
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            apiGetevaluationCircularDisplaylist(userMes.deptId).then(datas =>{
+                if (datas && datas.data) {
+                    that.noticeData = datas.data
+                }
+            })
+        },
         changeYearFn(val) {
             this.changeYear = val
             this.cupDataYearArr = {

src/components/notification/notificationMangePage.vue

@@ -2,33 +2,42 @@
     <div class="notification">
         <div class="notificationBtn">
             <div class="collectSeach">
-                <div class="exceed">
-                    <span class="exceedSpan">通告标题：</span>
-                    <el-input v-model="noticeTitle" placeholder="请输入通告标题"></el-input>
+                <div class="PeriodBtn">
+                    <btns
+                    :showImport="false"
+                    :showExport="false"
+                    :addName="'新建通告'"
+                    :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
+                    :disDelete="changeDateSelect.length === 0"
+                    :disImport="false"
+                    :disExport="false"
+                    @handleAdd="handleAdd"
+                    @handleEdit="handleEdit"
+                    @handleDelete="handleDelete"
+                    ></btns>
+                </div>
+                <div style="display: flex;">
+                    <div class="exceed">
+                        <!-- <span class="exceedSpan">通告标题：</span> -->
+                        <el-input v-model="noticeTitle" placeholder="请输入通告标题"></el-input>
+                    </div>
+                    <seachs :showRest="false" @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
                 </div>
-                <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
-            </div>
-            <div class="PeriodBtn">
-                <btns
-                :showImport="false"
-                :showExport="false"
-                :showSave="true"
-                :showAdd="true"
-                :showDelete="true"
-                :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
-                :disDelete="changeDateSelect.length === 0"
-                :disImport="false"
-                :disExport="false"
-                @handleAdd="handleAdd"
-                @handleEdit="handleEdit"
-                @handleDelete="handleDelete"
-                ></btns>
             </div>
+            
             <div class="notificationTableData">
                 <el-table :data="notificationData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
-                    <el-table-column label="序号" prop="serialNumber" align="center" width="80"></el-table-column>
-                    <el-table-column label="通告标题" width="300">
+                    <!-- <el-table-column label="序号" prop="serialNumber" align="center" width="80"></el-table-column> -->
+                    <el-table-column label="发布状态" prop="releaseState" width="100" align="center">
+                        <template #default="scope">
+                            <span class="statusSty"
+                             :style="scope.row.releaseState === '已发布'?'background:#61C760':scope.row.releaseState === '未发布'?'background:#5093E1':'background:#9DA5BE'">
+                             {{scope.row.releaseState}}
+                             </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="通告标题" width="200">
                         <template #default="scope">
                             <el-tooltip
                                 class="box-item"
@@ -36,7 +45,7 @@
                                 :content="scope.row.noticeTitle"
                                 placement="right"
                             >
-                                <span class="tooltipCC">{{scope.row.noticeTitle}}</span>
+                                <span class="tooltipCCDes">{{scope.row.noticeTitle}}</span>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -52,9 +61,25 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="通告对象" prop="sendTo" />
-                    <el-table-column label="个别部门" prop="deptNames" />
-                    <el-table-column label="发布状态" prop="releaseState" />
+                    <el-table-column label="发布部门" prop="releaseDeptName" width="200" />
+                    <el-table-column label="发布至" prop="sendTo" />
+                    <el-table-column label="发布人" prop="releasePeopleName" />
+                    <el-table-column label="发布时间" prop="createTime" />
+                    <el-table-column label="发布" width="80" align="center">
+                        <template #default="scope">
+                            <img :src="fabuW" style="cursor:pointer" @click="changeStatus(scope.row)">
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="修改" width="80" align="center">
+                        <template #default="scope">
+                            <img :src="editW" style="cursor:pointer" @click="handleEdit(scope.row)">
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="删除" width="80" align="center">
+                        <template #default="scope">
+                            <img :src="deleteW" style="cursor:pointer" @click="handleDelete(scope.row)">
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <el-pagination
                     @size-change="handleSizeChange"
@@ -161,8 +186,11 @@
 <script>
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
+import fabuW from '../../assets/btnIcon/fabu.png'
+import editW from '../../assets/btnIcon/edit.png'
+import deleteW from '../../assets/btnIcon/delete.png'
 import {apiGetevaluationdeptnoticeList, apiGetevaluationdeptnoticeSave,apievaluationdeptnoticeDelete,
-apiGetdatadictionaryList, apiPostevaluationdeptnoticeDelete} from '../../api/api'
+apiGetdatadictionaryList, apiPostevaluationdeptnoticeDelete, apiPostevaluationdeptnoticeModifiedState} from '../../api/api'
 export default {
     components: {
         btns,
@@ -178,6 +206,9 @@ export default {
             notificationData:[],
             departData: [],
             sendToData: [],
+            fabuW: fabuW,
+            editW: editW,
+            deleteW: deleteW,
             page:{
                 pagesize: 12,
                 currentPage: 1,
@@ -264,6 +295,19 @@ export default {
                 notificationData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize)
             }
         },
+        //修改状态
+        changeStatus(row) {
+            let that = this
+            let params = {
+                id: row.id,
+                releaseState: '已发布'
+            }
+            apiPostevaluationdeptnoticeModifiedState(params).then(datas =>{
+                if (datas.success) {
+                    that.getevalunotificationList()
+                }
+            })
+        },
         saveevaluaStart(formName, type) {
             let that = this
             that.$refs[formName].validate((valid) => {
@@ -275,7 +319,7 @@ export default {
         //新增/修改考评启动数据
         saveAndEditnotificationData(type) {
             let that = this
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            // let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 serialNumber: that.ruleForm.serialNumber,
                 noticeTitle: that.ruleForm.noticeTitle,
@@ -283,10 +327,11 @@ export default {
                 sendTo: that.ruleForm.sendTo,
                 sendToContent: that.ruleForm.sendToContent.join(','),
                 releaseState: type === '草稿'? '草稿': type === '发布'?'已发布':'未发布',
-                releaseDept: userMes.deptId,
-                releasePeople: userMes.id
+                // releaseDept: userMes.deptId,
+                // releaseDeptName: userMes.deptName,
+                // releasePeople: userMes.id,
+                // releasePeopleName: userMes.name
             }
-            debugger
             const formData = new FormData()
             if (that.filesList.length>0) {
                 that.filesList.forEach(item =>{
@@ -359,13 +404,17 @@ export default {
                 }
             })
         },
-        handleEdit() {
+        handleEdit(row) {
             this.dialogVisible = true
             this.isSave = true
             this.title = '修改通告'
             this.filesList = []
             this.filesListEdit = []
-            this.evalradio = this.changeDateSelect[0]
+            if (row) {
+                this.evalradio = row
+            } else {
+                this.evalradio = this.changeDateSelect[0]
+            }
             this.ruleForm = {
                 serialNumber: this.evalradio.serialNumber,
                 noticeTitle: this.evalradio.noticeTitle,
@@ -382,18 +431,24 @@ export default {
             })
         },
         //删除
-        handleDelete() {
+        handleDelete(row) {
             this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
                 let that = this
-                let paramsArr = []
-                that.changeDateSelect.forEach(it =>{
-                    paramsArr.push(it.id)
-                })
-                apiPostevaluationdeptnoticeDelete(paramsArr.join(',')).then(datas =>{
+                let paramsStr = ''
+                if (row) {
+                    paramsStr = row.id
+                } else {
+                    let paramsArr = []
+                    that.changeDateSelect.forEach(it =>{
+                        paramsArr.push(it.id)
+                    })
+                    paramsStr = paramsArr.join(',')
+                }
+                apiPostevaluationdeptnoticeDelete(paramsStr).then(datas =>{
                     that.$message({
                         type: 'success',
                         message: '删除成功!'
@@ -473,8 +528,9 @@ export default {
     .notificationBtn{
         .collectSeach{
             display: flex;
-            padding: 24px 20px;
+            padding: 24px 20px 24px 0;
             border-bottom: 1px solid#D6DBEA;
+            justify-content: space-between;
             .exceed{
                 display: flex;
                 .exceedSpan{
@@ -518,7 +574,6 @@ export default {
         .PeriodBtn{
             display: flex;
             justify-content: end;
-            padding: 20px 0;
         }
         .el-button{
             height: 30px;
@@ -530,9 +585,10 @@ export default {
             }
         }
         .notificationTableData{
+            margin-top: 20px;
             .el-table{
                 .el-table__body-wrapper{
-                    height: 60vh !important;
+                    height: 65vh !important;
                 }
                 .el-input__inner{
                     height: 30px !important;
@@ -540,6 +596,14 @@ export default {
                 .el-radio__label{
                     display: none;
                 }
+                .statusSty{
+                    width: 52px;
+                    height: 21px;
+                    line-height: 21px;
+                    display: inline-block;
+                    border-radius: 3px;
+                    color: #fff;
+                }
                 .tooltipCC{
                     width: 300px !important;
                     display: inline-block;
@@ -548,7 +612,7 @@ export default {
                     white-space: nowrap;
                 }
                 .tooltipCCDes{
-                    width: 50px;
+                    width: 200px;
                     display: inline-block;
                     overflow: hidden;
                     text-overflow: ellipsis;

src/components/seachGroup.vue

@@ -10,7 +10,7 @@
             <span>搜索</span>
             </el-button>
         </el-col>
-        <el-col :span="1.5">
+        <el-col :span="1.5" v-if="showRest">
             <el-button
             size="mini"
             @click="handleRest"
@@ -26,6 +26,14 @@
 import seach from '../assets/btnIcon/seach.png'
 import rest from '../assets/btnIcon/rest.png'
 export default {
+    props: {
+        showRest: {
+            type: Boolean,
+            default: () => {
+                return true;
+            },
+        }
+    },
     data() {
         return {
             seach: seach,

src/router/index.js

@@ -262,10 +262,30 @@ const routes = [
                 ]
             },
             {
+                path: '/baseInfomation',
+                name: 'baseInfomation',
+                meta: {
+                    title: '基础信息配置',
+                },
+                children: [
+                    {
+                        path: '/baseInfomation/moreBrand',
+                        name: 'moreBrand',
+                        meta: {
+                            title: '多牌配置',
+                        },
+                        component: () =>
+                            import(
+                                '../components/baseInfomation/moreBrandPage.vue'
+                            ),
+                    }
+                ]
+            },
+            {
                 path: '/evaluationknowledge',
                 name: 'evaluationknowledge',
                 meta: {
-                    title: '知识库',
+                    title: '对标考评知识库',
                 },
                 children: [
                     {

src/views/homePage.vue

@@ -53,6 +53,9 @@ import yewuImg from '../assets/menuImg/yewu.png'
 import tixiImg from '../assets/menuImg/tixi.png'
 import zhishikuImg from '../assets/menuImg/zhishiku.png'
 import quanxianImg from '../assets/menuImg/quanxian.png'
+import tonggaoImg from '../assets/menuImg/tonggao.png'
+import benbuImg from '../assets/menuImg/benbu.png'
+import renyuanImg from '../assets/menuImg/renyuan.png'
 import closeBtn from '../assets/getwayImg/closeBtn.png'
 
 import { getToken, removeToken } from '../api/auth'
@@ -75,188 +78,192 @@ export default {
         }
     },
     created(){
-        this.getMenuData()
-        // this.forecastDatas = [
-        //     {
-        //         index: '/home',
-        //         name: '考评首页',
-        //         img: homeImg
-        //     },
-        //     {
-        //         index: '/taskCenter',
-        //         name: '任务中心',
-        //         img: taskImg
-        //     },
-        //     {
-        //         index: '/notification',
-        //         name: '通告管理',
-        //         img: taskImg
-        //     },
-        //     {
-        //         index: '1',
-        //         name: '考评体系配置',
-        //         img: tixiImg,
-        //         children: [
-        //             {
-        //                 index: '/evaluationSystem/evaluationIndex',
-        //                 name: '考评指标管理',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/evaluationRules',
-        //                 name: '考评规则配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/company',
-        //                 name: '单位权重配置',
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '单位季度营业收入',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/achievementK',
-        //                 name: '业绩考核系数配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/partyBuildingK',
-        //                 name: '党建考核系数配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/department',
-        //                 name: '部门考评配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/personnel',
-        //                 name: '人员考评配置',
-        //             },
-        //         ]
-        //     },
-        //     {
-        //         index: '2',
-        //         name: '单位考评业务',
-        //         img: yewuImg,
-        //         children: [
-        //             {
-        //                 index: '/assessment/evaluationStart',
-        //                 name: '单位考评目标启动',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationAmendment',
-        //                 name: '单位考评目标修订',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationMonth',
-        //                 name: '单位月度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationQuarter',
-        //                 name: '单位季度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationYear',
-        //                 name: '单位年度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationBenchmarkingIndic',
-        //                 name: '考评对标分析'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '考评预警'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '单位考评评级'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '考评监督管理'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationReport',
-        //                 name: '考评报告'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '单位考核结果应用'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '3',
-        //         name: '本部考评业务',
-        //         img: yewuImg,
-        //         children: [
-        //             {
-        //                 index: '/assessment/evaluationDeptStart',
-        //                 name: '业绩指标计划',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationDeptBusiness',
-        //                 name: '业绩指标考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationDeptRating',
-        //                 name: '部门考评评级'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '绩效结果考核申报'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '4',
-        //         name: '本部人员考评',
-        //         img: yewuImg,
-        //         children: [
-        //             {
-        //                 index: '',
-        //                 name: '人员考评结果',
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '任期考评结果'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '人员考评评级'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '5',
-        //         name: '基础信息配置',
-        //         img: quanxianImg,
-        //         children: [
-        //             {
-        //                 index: '',
-        //                 name: '人员权限配置',
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '工作流程配置',
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '6',
-        //         name: '对标考评知识库',
-        //         img: zhishikuImg,
-        //         children: [
-        //             {
-        //                 index: '/evaluationknowledge/scoringRules',
-        //                 name: '考评得分规则',
-        //             },
-        //             {
-        //                 name: '考评评级规则',
-        //             },
-        //             {
-        //                 name: '考评预警规则',
-        //             }
-        //         ]
-        //     },
-        // ]
+        // this.getMenuData()
+        this.forecastDatas = [
+            {
+                index: '/home',
+                name: '考评首页',
+                img: homeImg
+            },
+            {
+                index: '/taskCenter',
+                name: '任务中心',
+                img: taskImg
+            },
+            {
+                index: '/notification',
+                name: '通告管理',
+                img: tonggaoImg
+            },
+            {
+                index: '1',
+                name: '考评体系配置',
+                img: tixiImg,
+                children: [
+                    {
+                        index: '/evaluationSystem/evaluationIndex',
+                        name: '考评指标管理',
+                    },
+                    {
+                        index: '/evaluationSystem/evaluationRules',
+                        name: '考评规则配置',
+                    },
+                    {
+                        index: '/evaluationSystem/company',
+                        name: '单位权重配置',
+                    },
+                    {
+                        index: '',
+                        name: '单位季度营业收入',
+                    },
+                    {
+                        index: '/evaluationSystem/achievementK',
+                        name: '业绩考核系数配置',
+                    },
+                    {
+                        index: '/evaluationSystem/partyBuildingK',
+                        name: '党建考核系数配置',
+                    },
+                    {
+                        index: '/evaluationSystem/department',
+                        name: '部门考评配置',
+                    },
+                    {
+                        index: '/evaluationSystem/personnel',
+                        name: '人员考评配置',
+                    },
+                ]
+            },
+            {
+                index: '2',
+                name: '单位考评业务',
+                img: yewuImg,
+                children: [
+                    {
+                        index: '/assessment/evaluationStart',
+                        name: '单位考评目标启动',
+                    },
+                    {
+                        index: '/assessment/evaluationAmendment',
+                        name: '单位考评目标修订',
+                    },
+                    {
+                        index: '/assessment/evaluationMonth',
+                        name: '单位月度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationQuarter',
+                        name: '单位季度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationYear',
+                        name: '单位年度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationBenchmarkingIndic',
+                        name: '考评对标分析'
+                    },
+                    {
+                        index: '',
+                        name: '考评预警'
+                    },
+                    {
+                        index: '',
+                        name: '单位考评评级'
+                    },
+                    {
+                        index: '',
+                        name: '考评监督管理'
+                    },
+                    {
+                        index: '/assessment/evaluationReport',
+                        name: '考评报告'
+                    },
+                    {
+                        index: '',
+                        name: '单位考核结果应用'
+                    }
+                ]
+            },
+            {
+                index: '3',
+                name: '本部考评业务',
+                img: benbuImg,
+                children: [
+                    {
+                        index: '/assessment/evaluationDeptStart',
+                        name: '业绩指标计划',
+                    },
+                    {
+                        index: '/assessment/evaluationDeptBusiness',
+                        name: '业绩指标考评'
+                    },
+                    {
+                        index: '/assessment/evaluationDeptRating',
+                        name: '部门考评评级'
+                    },
+                    {
+                        index: '',
+                        name: '绩效结果考核申报'
+                    }
+                ]
+            },
+            {
+                index: '4',
+                name: '本部人员考评',
+                img: renyuanImg,
+                children: [
+                    {
+                        index: '',
+                        name: '人员考评结果',
+                    },
+                    {
+                        index: '',
+                        name: '任期考评结果'
+                    },
+                    {
+                        index: '',
+                        name: '人员考评评级'
+                    }
+                ]
+            },
+            {
+                index: '5',
+                name: '基础信息配置',
+                img: quanxianImg,
+                children: [
+                    {
+                        index: '',
+                        name: '人员权限配置',
+                    },
+                    {
+                        index: '',
+                        name: '工作流程配置',
+                    },
+                    {
+                        index: '/baseInfomation/moreBrand',
+                        name: '多牌配置',
+                    }
+                ]
+            },
+            {
+                index: '6',
+                name: '对标考评知识库',
+                img: zhishikuImg,
+                children: [
+                    {
+                        index: '/evaluationknowledge/scoringRules',
+                        name: '考评得分规则',
+                    },
+                    {
+                        name: '考评评级规则',
+                    },
+                    {
+                        name: '考评预警规则',
+                    }
+                ]
+            },
+        ]
         if (window.sessionStorage.getItem('routeTags')) {
             this.routeTags = JSON.parse(window.sessionStorage.getItem('routeTags'))
             if (this.$route?.path === '/') {
@@ -320,7 +327,7 @@ export default {
                         } else if(item.name === '任务中心') {
                             obj.img = taskImg
                         } else if(item.name === '通告管理') {
-                            obj.img = taskImg
+                            obj.img = tonggaoImg
                         } else if(item.name === '考评体系配置') {
                             obj.img = tixiImg
                             obj.children = that.changeMenuData(item.children)
@@ -328,10 +335,10 @@ export default {
                             obj.img = yewuImg
                             obj.children = that.changeMenuData(item.children)
                         } else if(item.name === '本部考评业务') {
-                            obj.img = yewuImg
+                            obj.img = benbuImg
                             obj.children = that.changeMenuData(item.children)
                         } else if(item.name === '本部人员考评') {
-                            obj.img = yewuImg
+                            obj.img = renyuanImg
                             obj.children = that.changeMenuData(item.children)
                         } else if(item.name === '基础信息配置') {
                             obj.img = quanxianImg