首页及其季度详情页面样式重构且兼容1440*900；任务中心年度考评问题修改；公告页面根据后端需求服务增加参数；

src/components/gateWay/gateWayNotificationDetail.vue

@@ -7,7 +7,7 @@
                         <el-input v-model="ruleForm.noticeTitle"  placeholder="请输入公告标题" />
                     </el-form-item>
                     <el-form-item label="公告内容" prop="noticeContent">
-                        <el-input v-model="ruleForm.noticeContent"
+                        <el-input v-model="ruleForm.noticeContent" disabled
                             type="textarea" :rows="10" placeholder="请输入公告内容"></el-input>
                     </el-form-item>
                     <el-form-item label="发布对象" prop="sendTo">

src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="seasonLeagueTable">
-        <el-dialog v-model="dialogVisible" :width="seasonWidth()" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <template #header>
                 <div class="seasonHeader">
                     <span style="font-size:14px;color:#fff">考核排行榜</span>
@@ -16,194 +16,210 @@
             </template>
             <el-row class="seasonFrom">
                 <el-col :span="evaluationSeasonDataRight.length>0?12:24" :style="evaluationSeasonDataRight.length>0?'border-right: 1px solid #E1E3EA;':''">
-                    <div class="seasonFromHeader">
-                        <div class="headerNameForeTit">
-                            <div class="headerNameForeTit_left">
-                                <span>排名</span>
-                                <span style="margin-left: 20px">单位名称</span>
-                            </div>
-                            <div class="headerNameForeTit_right" :style="winPix === 1.25 || innerWidth < 1920?'':'width:71%'">
-                                <span>得分</span>
-                                <span>加分事项</span>
-                                <span>扣分事项</span>
-                                <span>管理加分</span>
-                                <span>管理扣分</span>
-                                <span>高于基准</span>
-                                <span>低于基准</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div style="margin-top:10px">
-                        <div style="display: flex;" v-for="(item, index) in evaluationSeasonDataLeft" :key="index">
-                            <div class="mainFourMsg">
-                                <span :style="winPix === 1.25 || innerWidth < 1920?'width:10%':''">{{item.rank}}</span>
-                                <span>{{item.company}}</span>
-                                <span :style="winPix === 1.25 || innerWidth < 1920?'width:20%':''">{{item.score}}</span>
-                                <div class="mainFourImg">
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.matter_heigh_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.matter_heigh === 0 ? cenImg : item.matter_heigh === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.matter_low_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.matter_low === 0 ? cenImg : item.matter_low === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.manage_heigh_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.manage_heigh === 0 ? cenImg : item.manage_heigh === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.manage_low_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.manage_low === 0 ? cenImg : item.manage_low === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.standard_heigh_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.standard_heigh === 0 ? cenImg : item.standard_heigh === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                    <el-popover
-                                        placement="right-start"
-                                        :title="item.company +' '+ item.score"
-                                        :width="200"
-                                        trigger="hover"
-                                        :content="item.standard_low_note"
-                                    >
-                                        <template #reference>
-                                            <img :src="item.standard_low === 0 ? cenImg : item.standard_low === 1 ? topImg : botImg" alt="">
-                                        </template>
-                                    </el-popover>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                    <el-table :data="evaluationSeasonDataLeft" style="width: 100%">
+                        <el-table-column label="排名" prop="rank" width="50" align="center" />
+                        <el-table-column label="单位名称">
+                            <template #default="scope">
+                                <span class="companyStyle">{{scope.row.company}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="得分" prop="score" align="center" />
+                        <el-table-column label="加分事项" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.matter_heigh_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.matter_heigh === 0 ? cenImg : scope.row.matter_heigh === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                            </template>
+                        </el-table-column> 
+                        <el-table-column label="扣分事项" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.matter_low_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.matter_low === 0 ? cenImg : scope.row.matter_low === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                                
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="管理加分" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.manage_heigh_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.manage_heigh === 0 ? cenImg : scope.row.manage_heigh === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="管理扣分" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.manage_low_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.manage_low === 0 ? cenImg : scope.row.manage_low === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                                
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="高于基准" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.standard_heigh_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.standard_heigh === 0 ? cenImg : scope.row.standard_heigh === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="低于基准" align="center">
+                            <template #default="scope">
+                                <el-popover
+                                    placement="right-start"
+                                    :title="scope.row.company +' '+ scope.row.score"
+                                    :width="200"
+                                    trigger="hover"
+                                    :content="scope.row.standard_low_note"
+                                >
+                                    <template #reference>
+                                        <img :src="scope.row.standard_low === 0 ? cenImg : scope.row.standard_low === 1 ? topImg : botImg" alt="">
+                                    </template>
+                                </el-popover>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </el-col>
                 <el-col :span="12" v-if="evaluationSeasonDataRight.length>0">
-                    <div class="seasonFromHeader">
-                        <div class="headerNameForeTit">
-                            <div class="headerNameForeTit_left">
-                                <span>排名</span>
-                                <span style="margin-left: 20px">单位名称</span>
-                            </div>
-                            <div class="headerNameForeTit_right" :style="winPix === 1.25 || innerWidth < 1920?'':'width:71%'">
-                                <span>得分</span>
-                                <span>加分事项</span>
-                                <span>扣分事项</span>
-                                <span>管理加分</span>
-                                <span>管理扣分</span>
-                                <span>高于基准</span>
-                                <span>低于基准</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div style="display: flex" v-for="(item, index) in evaluationSeasonDataRight" :key="index">
-                        <div class="mainFourMsg">
-                            <span :style="winPix === 1.25 || innerWidth < 1920?'width:10%':''">{{item.rank}}</span>
-                            <span>{{item.company}}</span>
-                            <span :style="winPix === 1.25 || innerWidth < 1920?'width:20%':''">{{item.score}}</span>
-                            <div class="mainFourImg">
+                    <el-table :data="evaluationSeasonDataRight" style="width: 100%">
+                        <el-table-column label="排名" prop="rank" width="50" align="center" />
+                        <el-table-column label="单位名称" prop="company">
+                            <template #default="scope">
+                                <span class="companyStyle">{{scope.row.company}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="得分" prop="score" align="center" />
+                        <el-table-column label="加分事项" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.matter_heigh_note"
+                                    :content="scope.row.matter_heigh_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.matter_heigh === 0 ? cenImg : item.matter_heigh === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.matter_heigh === 0 ? cenImg : scope.row.matter_heigh === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
+                            </template>
+                        </el-table-column> 
+                        <el-table-column label="扣分事项" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.matter_low_note"
+                                    :content="scope.row.matter_low_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.matter_low === 0 ? cenImg : item.matter_low === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.matter_low === 0 ? cenImg : scope.row.matter_low === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
+                                
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="管理加分" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.manage_heigh_note"
+                                    :content="scope.row.manage_heigh_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.manage_heigh === 0 ? cenImg : item.manage_heigh === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.manage_heigh === 0 ? cenImg : scope.row.manage_heigh === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="管理扣分" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.manage_low_note"
+                                    :content="scope.row.manage_low_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.manage_low === 0 ? cenImg : item.manage_low === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.manage_low === 0 ? cenImg : scope.row.manage_low === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
+                                
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="高于基准" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.standard_heigh_note"
+                                    :content="scope.row.standard_heigh_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.standard_heigh === 0 ? cenImg : item.standard_heigh === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.standard_heigh === 0 ? cenImg : scope.row.standard_heigh === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="低于基准" align="center">
+                            <template #default="scope">
                                 <el-popover
                                     placement="right-start"
-                                    :title="item.company +' '+ item.score"
+                                    :title="scope.row.company +' '+ scope.row.score"
                                     :width="200"
                                     trigger="hover"
-                                    :content="item.standard_low_note"
+                                    :content="scope.row.standard_low_note"
                                 >
                                     <template #reference>
-                                        <img :src="item.standard_low === 0 ? cenImg : item.standard_low === 1 ? topImg : botImg" alt="">
+                                        <img :src="scope.row.standard_low === 0 ? cenImg : scope.row.standard_low === 1 ? topImg : botImg" alt="">
                                     </template>
                                 </el-popover>
-                            </div>
-                        </div>
-                    </div>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </el-col>
             </el-row>
         </el-dialog>
@@ -306,6 +322,7 @@ export default {
                     if (datas.data.season[name].length>0) {
                         datas.data.season[name].forEach((item, index) =>{
                             item.rank = index+1
+                            item.score = item.score.toFixed(2)
                         })
                         if (datas.data.season[name].length>15) {
                             that.evaluationSeasonDataLeft = datas.data.season[name].splice(0, 15)
@@ -325,7 +342,7 @@ export default {
 .seasonLeagueTable{
     .el-overlay{
         .el-dialog{
-            margin-top: 5vh !important;
+            // margin-top: 5vh !important;
             .el-dialog__header{
                 .seasonHeader{
                     width: 97%;
@@ -346,84 +363,20 @@ export default {
             }
             .seasonFrom{
                 padding: 0 20px;
-                .seasonFromHeader{
-                    width: 100%;
-                    border-bottom: 1px solid #E1E3EA;
-                    .headerNameForeTit{
-                        display: flex;
-                        justify-content: space-between;
-                        padding: 8px 20px;
-                        font-size: 14px;
-                        color: #414141;
-                        .headerNameForeTit_left{
-                            width: 26%;
-                        }
-                        .headerNameForeTit_right{
-                            width: 74%;
-                            display: flex;
-                            justify-content: space-between;
-                        }
-                    }
-                    .headerTit{
-                        position: relative;
-                        top: 10px;
-                        left: 150px;
-                    }
-                }
-                .mainFourMsg{
-                    display: flex;
-                    margin: 0 10px;
-                    width: 100%;
-                    height: 33px;
-                    background: #F6F7FA;
-                    margin-bottom: 8px;
-                    padding-left: 10px;
-                    padding-top: 2px;
-                    border-radius: 5px;
-                    .mainFourImg{
-                        display: flex;
-                        justify-content: space-around;
-                        width: 65%;
-                        img{
-                            width: 20px;
-                            height: 20px;
-                            position: relative;
-                            top: 5px;
-                            margin-right: 33px;
-                            margin-left: 22px;
+                .el-table{
+                    .el-table__inner-wrapper{
+                        .el-table__body-wrapper{
+                            .el-table__body{
+                                .companyStyle{
+                                    width: 100%;
+                                    display: inline-block;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                    white-space: nowrap;
+                                }
+                            }
                         }
                     }
-                    span{
-                        font-size: 14px;
-                        font-family: Microsoft YaHei;
-                        position: relative;
-                        top: 6px;
-                    }
-                    span:nth-child(1){
-                        display: inline-block;
-                        width: 5%;
-                        font-weight: 600;
-                        color: #666;
-                        margin-left: 10px;
-                        margin-right: 13px;
-                    }
-                    span:nth-child(2){
-                        display: inline-block;
-                        width: 33%;
-                        overflow: hidden;
-                        text-overflow: ellipsis;
-                        white-space: nowrap;
-                        font-weight: 400;
-                        color: #666;
-                        margin-right: 17px;
-                    }
-                    span:nth-child(3){
-                        display: inline-block;
-                        width: 13%;
-                        font-weight: 600;
-                        margin-right: 15px;
-                        color: #666;
-                    }
                 }
             }
         }

src/components/gatewaynNewPage.vue

@@ -93,7 +93,7 @@
                                     <span
                                         :style="winPix === 1.25  || innerWidth < 1920?'font-size: 12px;width: 65%':''">{{item.company}}</span>
                                     <span>{{item.grade}}</span>
-                                    <span :style="winPix === 1.25 || innerWidth < 1920?'width: 25%':''">{{item.score}}</span>
+                                    <span :style="winPix === 1.25 || innerWidth < 1920?'width: 25%':''">{{item.score.toFixed(2)}}</span>
                                 </div>
                             </div>
                         </div>
@@ -104,7 +104,7 @@
                             <div class="mainFourMsg">
                                 <span class="mainFourcompany" :style="getFooter12Sty()">{{item.company}}</span>
                                 <div class="mainFourImg">
-                                    <span class="mainFourImgSpan" :style="getFooterseaSty()">{{item.score}}</span>
+                                    <span class="mainFourImgSpan" :style="getFooterseaSty()">{{item.score.toFixed(2)}}</span>
                                     <el-popover placement="right-start" :title="item.company +' '+ item.score"
                                         :width="200" trigger="hover" :content="item.matter_heigh_note">
                                         <template #reference>

src/components/notification/notificationMangePage.vue

@@ -456,6 +456,9 @@ export default {
                 releasePeople: that.userMes.id,
                 releasePeopleName: that.userMes.name
             }
+            if (type === '发布') {
+                params.releaseDate = new Date()
+            }
             if (that.isSave) {
                 params.id = that.evalradio.id
             }

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -308,7 +308,7 @@ export default {
             })
         },
         //根据业务属性获取业务阶段
-        getStageData() {
+        getStageData(type) {
             let that = this
             let params = {}
             if (type !== 'nddwkplc') {