修改首页问题，多牌配置页面问题；公告页面问题；

src/api/api.js

@@ -180,8 +180,8 @@ export function apiPostevaluationdeptnoticeModifiedState(params) {
 export function apiGetevaluationdeptnoticeFilePreview(params) {
     return httpRequest({
         url: 'evaluation-dept-notice/filePreview',
-        header: { 'responseType': 'blob' },
-        // responseType: 'blob',
+        // header: { 'responseType': 'blob' },
+        responseType: 'blob',
         method: 'get',
         params: params
     })

src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -300,10 +300,8 @@ export default {
         },
         resetSeach() {
             this.page.currentPage = 1
-            this.companyS = ''
-            this.periodId = ''
+            this.indicatorIds = ''
             this.stageIds = ''
-            this.binSectionIds = ''
             this.getEvalBenchmarkingIndicData()
         },
         handleExport() {

src/components/baseInfomation/moreBrandPage.vue

@@ -81,7 +81,7 @@
                         <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-form-item label="单位名称" prop="organizationName">
                                 <el-select v-model="ruleForm.organizationName" filterable placeholder="请选择单位名称">
                                     <el-option v-for="item in companyDatas" :key="item.id" :label="item.shortName"
                                         :value="item.id">
@@ -284,17 +284,17 @@ export default {
         //新增/修改指标数据
         saveAndEditRuleData() {
             let that = this
-            // let orgName = ''
-            // that.companyDatas.forEach(item => {
-            //     if (item.id === that.ruleForm.organizationName) {
-            //         orgName = item.name
-            //     }
-            // })
+            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: '杭锦旗国电电力有限公司',
+                id: that.ruleForm.organizationName,
+                organizationName: orgName,
+                // organizationId: '50264514',
+                // organizationName: '杭锦旗国电电力有限公司',
                 binSection: that.ruleForm.binSection,
                 checkCycle: that.ruleForm.checkCycle,
                 profit: that.ruleForm.profit,

src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="seasonLeagueTable">
-        <el-dialog v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :width="evaluationSeasonDataRight.length>0?'80vw':'40vw'" :close-on-click-modal="false">
             <template #header>
                 <div class="seasonHeader">
                     <span style="font-size:14px;color:#fff">考核排行榜</span>
@@ -15,7 +15,7 @@
                 </div>
             </template>
             <el-row class="seasonFrom">
-                <el-col :span="12" style="border-right: 1px solid #E1E3EA;">
+                <el-col :span="evaluationSeasonDataRight.length>0?12:24" :style="evaluationSeasonDataRight.length>0?'border-right: 1px solid #E1E3EA;':''">
                     <div class="seasonFromHeader">
                         <div class="headerNameTit">
                             <div class="headerNameTit_left">
@@ -111,7 +111,7 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" v-if="evaluationSeasonDataRight.length>0">
                     <div class="seasonFromHeader">
                         <div class="headerNameTit">
                             <div class="headerNameTit_left">
@@ -282,10 +282,9 @@ export default {
                         datas.data.season[name].forEach((item, index) =>{
                             item.rank = index+1
                         })
-                        if (datas.data.season[name].length>10) {
-                            that.evaluationSeasonDataLeft = datas.data.season[name].splice(0, 10)
+                        if (datas.data.season[name].length>20) {
+                            that.evaluationSeasonDataLeft = datas.data.season[name].splice(0, 20)
                             that.evaluationSeasonDataRight = datas.data.season[name]
-                            
                         } else {
                             that.evaluationSeasonDataLeft = datas.data.season[name]
                         }

src/components/gateWay/gatewayNewYearFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="annualLeagueTable">
-        <el-dialog v-model="dialogVisible" width="50vw" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :width="evaluationYearDataRight.length>0?'50vw':'26vw'" :close-on-click-modal="false">
             <template #header>
                 <div class="yearHeader">
                     <span style="font-size:14px;color:#fff">年度排行榜</span>
@@ -15,7 +15,7 @@
                 </div>
             </template>
             <el-row class="yearFrom">
-                <el-col :span="12" style="border-right: 1px solid #E1E3EA;">
+                <el-col :span="evaluationYearDataRight.length>0?12:24" :style="evaluationYearDataRight.length>0?'border-right: 1px solid #E1E3EA;': ''">
                     <div class="yearFromHeader">
                         <div class="headerNameTit">
                             <div class="headerNameTit_left">
@@ -39,7 +39,7 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" v-if="evaluationYearDataRight.length>0">
                     <div class="yearFromHeader">
                         <div class="headerNameTit">
                             <div class="headerNameTit_left">
@@ -130,8 +130,8 @@ export default {
                         datas.data.year[name].forEach((item, index) =>{
                             item.rank = index+1
                         })
-                        if (datas.data.year[name].length>10) {
-                            that.evaluationYearDataLeft = datas.data.year[name].splice(0, 10)
+                        if (datas.data.year[name].length>20) {
+                            that.evaluationYearDataLeft = datas.data.year[name].splice(0, 20)
                             that.evaluationYearDataRight = datas.data.year[name]
                             
                         } else {

src/components/gatewaynNewPage.vue

@@ -345,18 +345,19 @@ export default {
     },
     mounted() {
         this.getGateWayData()
-        this.getDeptNoticeData()
+        // 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
-                }
-            })
+            if (userMes.deptId) {
+                apiGetevaluationCircularDisplaylist(userMes.deptId).then(datas =>{
+                    if (datas && datas.data) {
+                        that.noticeData = datas.data
+                    }
+                })
+            }
         },
         changeYearFn(val) {
             this.changeYear = val

src/components/notification/notificationMangePage.vue

@@ -227,10 +227,16 @@
                     </el-form>
                 </div>
                 <template #footer>
-                    <span class="dialog-footer">
-                        <el-button type="warning" @click="saveevaluaStart('ruleForm', '草稿')">草 稿</el-button>
-                        <el-button type="primary" @click="saveevaluaStart('ruleForm', '发布')">发 布</el-button>
-                        <el-button @click="saveevaluaStart('ruleForm', '取消')">取 消</el-button>
+                    <span class="notificationFooter">
+                        <el-button type="primary" size="mini" @click="saveevaluaStart('ruleForm', '发布')">
+                            <img :src="release" style="margin-right: 10px">
+                            <span>发布公告</span>
+                        </el-button>
+                        <el-button type="warning" size="mini" @click="saveevaluaStart('ruleForm', '草稿')">
+                            <img :src="draft" style="margin-right: 10px">
+                            <span>保存草稿</span>
+                        </el-button>
+                        <!-- <el-button @click="saveevaluaStart('ruleForm', '取消')">取 消</el-button> -->
                     </span>
                 </template>
             </el-dialog>
@@ -252,6 +258,8 @@ import fileW from '../../assets/btnIcon/fileW.png'
 import file from '../../assets/btnIcon/file.png'
 import yulan from '../../assets/btnIcon/yulan.png'
 import fileDelete from '../../assets/btnIcon/fileDelete.png'
+import draft from '../../assets/btnIcon/draft.png'
+import release from '../../assets/btnIcon/release.png'
 import {apiGetevaluationdeptnoticeList, apiGetevaluationdeptnoticeSave,apievaluationdeptnoticeDelete,
 apiGetdatadictionaryList, apiPostevaluationdeptnoticeDelete, apiPostevaluationdeptnoticeModifiedState,
 apiGetevaluationdeptnoticeFilePreview} from '../../api/api'
@@ -275,6 +283,8 @@ export default {
             fabuW: fabuW,
             editW: editW,
             deleteW: deleteW,
+            draft: draft,
+            release: release,
             fileW: fileW,
             file: file,
             yulan: yulan,
@@ -318,7 +328,7 @@ export default {
         }
     },
     created() {
-        this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+        // this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
         this.sendToData = [
             {
                 label: '所有单位',
@@ -400,10 +410,10 @@ export default {
                 sendTo: that.ruleForm.sendTo,
                 sendToContent: that.ruleForm.sendToContent.join(','),
                 releaseState: type === '草稿'? '草稿': type === '发布'?'已发布':'未发布',
-                releaseDept: that.userMes.deptId,
-                releaseDeptName: that.userMes.deptName,
-                releasePeople: that.userMes.id,
-                releasePeopleName: that.userMes.name
+                // releaseDept: that.userMes.deptId,
+                // releaseDeptName: that.userMes.deptName,
+                // releasePeople: that.userMes.id,
+                // releasePeopleName: that.userMes.name
             }
             const formData = new FormData()
             if (that.filesList.length>0) {
@@ -462,7 +472,7 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.isSave = false
-            this.title = '新建通告'
+            this.title = '公告发布'
             this.$nextTick(() =>{
                 this.$refs['ruleForm'].resetFields()
                 this.filesList = []
@@ -480,7 +490,7 @@ export default {
         handleEdit(row) {
             this.dialogVisible = true
             this.isSave = true
-            this.title = '修改通告'
+            this.title = '公告发布'
             this.filesList = []
             this.filesListEdit = []
             if (row) {
@@ -781,6 +791,17 @@ export default {
                         height: 70vh;
                     }
                 }
+                .el-dialog__footer{
+                    background: #fff;
+                    border-radius: 0 0 10px 10px;
+                    text-align: left;
+                    .notificationFooter{
+                        margin-left: 20px;
+                        .el-button{
+                            height: 30px !important;
+                        }
+                    }
+                }
             }
         }
     }