浏览代码

首页详情,考评得分规则,考评评级规则,考评预警规则页面兼容125%;部门考评配置页面新增功能,绩效结果考评页面启动功能根据甲方需求进行功能优化;

SunZehao 1 年之前
父节点
当前提交
c619bda1e2

+ 11 - 0
src/api/api.js

@@ -315,6 +315,17 @@ export function apideptAdState(params) {
         params: params
     })
 }
+
+//  获取人数
+
+export function apiGetparticipantsNumber(params) {
+    return httpRequest({
+        url: `evaluation-dept-ad/participantsNumber/${params}`,
+        method: 'get'
+    })
+}
+
+
 //----"部门考评指标考核-保存or修改"----新增后修改状态
 export function apideptModifyassessmentState(params) {
     return httpRequest({

+ 39 - 30
src/components/assessment/assessmentApplicationPage.vue

@@ -164,7 +164,7 @@ import seachs from '../seachGroup.vue'
 import { saveAs } from 'file-saver'
 import {apiGetevaluatiodeptadList, apiPostevaluationdeptadSave,apiGetdoAction,apiGetDepartmentLeader,
 apiGetworkflowgetOpinion,apiGetevaluationdeptadReport,apiGetEvaluationDeptListAll,
-apideptAdState, apiGetorganizationstructureFromTree, apiPostevaluationdeptadDelete} from '../../api/api'
+apideptAdState, apiGetparticipantsNumber, apiPostevaluationdeptadDelete} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -296,7 +296,7 @@ export default {
         //新增/修改
         saveAndEditIndicatorData() {
             let that = this
-            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            // let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let deptName = ''
             that.departData.forEach(itv =>{
                 if (itv.deptId === that.ruleForm.deptName) {
@@ -312,8 +312,8 @@ export default {
                 annual: that.ruleForm.annual,
                 declarationMonth: that.ruleForm.declarationMonth,
                 declarationReason: that.ruleForm.declarationReason,
-                applicantId: userMes.id,
-                applicantName: userMes.name
+                // applicantId: userMes.id,
+                // applicantName: userMes.name
             }
             if (that.isSave) {
                 params.id = that.evalradio.id
@@ -344,38 +344,47 @@ export default {
         },
         agetdeptresponsibility(row) {
             let that = this
-            let par = {
-                defKey: "jxjgkhsb",
-                businessKey: row.id,
-                action: "start",
-                opinion: "绩效结果考核申报",
-                iamCode: window.localStorage.getItem('code')
-            }
-            apiGetdoAction(par).then(datas =>{
-                if (datas && datas.data) {
-                    if (!datas.data.isOk) {
-                        that.$message({
-                            message: datas.data.msg,
-                            type: 'error'
-                        });
-                    } else {
-                        let params = {
-                            id: row.id,
-                            stage: '流程已开始'
-                        }
-                        apideptAdState(params).then(values =>{
-                            if (values.success) {
-                                that.getassessmentApplicationList()
-                            } else {
+            apiGetparticipantsNumber(row.id).then(res =>{
+                if (res.success) {
+                    that.$message({
+                        message: row.annual+'年度'+row.declarationMonth+'月份本次申报人数为'+res.data+'人',
+                        type: 'success'
+                    });
+                    let par = {
+                        defKey: "jxjgkhsb",
+                        businessKey: row.id,
+                        action: "start",
+                        opinion: "绩效结果考核申报",
+                        iamCode: window.localStorage.getItem('code')
+                    }
+                    apiGetdoAction(par).then(datas =>{
+                        if (datas && datas.data) {
+                            if (!datas.data.isOk) {
                                 that.$message({
-                                    message: values.message,
+                                    message: datas.data.msg,
                                     type: 'error'
                                 });
+                            } else {
+                                let params = {
+                                    id: row.id,
+                                    stage: '流程已开始'
+                                }
+                                apideptAdState(params).then(values =>{
+                                    if (values.success) {
+                                        that.getassessmentApplicationList()
+                                    } else {
+                                        that.$message({
+                                            message: values.message,
+                                            type: 'error'
+                                        });
+                                    }
+                                })
                             }
-                        })
-                    }
+                        }
+                    })
                 }
             })
+            
         },
         clickDes(row, column, cell, event) {
             let userMes = JSON.parse(window.sessionStorage.getItem('user'))

+ 63 - 18
src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -65,8 +65,8 @@
             <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">
-                        <el-form-item label="考评部门" prop="department">
-                            <el-select v-model="ruleForm.department" placeholder="请选择所属部门" filterable  @change="changeDeptLead">
+                        <el-form-item label="一级部门" prop="department">
+                            <el-select v-model="ruleForm.department" placeholder="请选择所属部门" filterable  @change="changedepart2Data">
                                 <el-option
                                 v-for="item in departData"
                                 :key="item.id"
@@ -75,15 +75,25 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item label="二级部门">
+                            <el-select v-model="ruleForm.depart2ment" placeholder="请选择所属部门" >
+                                <el-option
+                                v-for="item in depart2Data"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
                         <el-form-item label="部门领导" prop="departmentLeader">
-                            <el-select v-model="ruleForm.departmentLeader" placeholder="请选择部门领导">
+                            <el-select v-model="ruleForm.departmentLeader" placeholder="请选择部门领导" filterable>
                                 <el-option
                                 v-for="item in deptLeaderOption"
                                 :key="item.id"
-                                :label="item.userName"
+                                :label="item.name"
                                 :value="item.id">
-                                <span style="float: left;display:inline-block;width:100px">{{ item.userName }}</span>
-                                <span style="float: right;color: #909399;font-size: 13px;" >{{ item.posName }}</span>
+                                <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
+                                <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -113,7 +123,7 @@ import seachs from '../seachGroup.vue'
 import addW from '../../assets/btnIcon/addW.png'
 import addIcon from '../../assets/btnIcon/add.png'
 import {apiGetEvaluationDeptList, apiGetevaluationdeptSave, apiGetevaluationdeptremoveAll, apiGetorganizationstructureFromTree,
-apiGetDepartmentallocationLeader, apiGetevaluationdeptremoveItem} from '../../api/api'
+apiGetuserPageList} from '../../api/api'
 export default {
   components: { importDailog, btns, seachs },
     data() {
@@ -125,12 +135,23 @@ export default {
             departmentS: '',
             leaderS: '',
             evaluationDepartmentData:[],
-            departData: [],
+            departData: [
+                {
+                    id: '123546',
+                    name: 'cesss'
+                },
+                {
+                    id: '55552',
+                    name: 'sssss'
+                }
+            ],
+            depart2Data: [],
             deptLeaderOption: [],
             addW: addW,
             addIcon: addIcon,
             ruleForm: {
                 department: '',
+                depart2ment: '',
                 departmentLeader: '',
                 departmentIn: []
             },
@@ -162,6 +183,7 @@ export default {
     created() {
         this.getEvalCompanyData()
         this.getDepartmentFromTreeData()
+        this.getuserPageList()
         this.indicatorCategorys = [
             {
                 label: '指标计划',
@@ -190,7 +212,7 @@ export default {
                 }
             })
         },
-        // 查询部门
+        // 一级部门
         getDepartmentFromTreeData() {
             let that = this
             let params = {
@@ -200,17 +222,28 @@ export default {
             apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
                     that.departData = datas.data[0].children
-                    // that.changeDeptLead(that.departData[0].id)
                 }
             })
         },
-        // 根据部门查询人员
-        changeDeptLead(val) {
+        // 二级部门
+        changedepart2Data(val) {
+            let that = this
+            let params = {
+                id: val,
+                num: 2
+            }
+            apiGetorganizationstructureFromTree(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.depart2Data = datas.data[0].children
+                }
+            })
+        },
+        // 查询人员
+        getuserPageList(val) {
             let that = this
-            apiGetDepartmentallocationLeader(val).then(datas =>{
+            apiGetuserPageList(val).then(datas =>{
                 if (datas && datas.data) {
-                    that.deptLeaderOption = datas.data
-                    that.ruleForm.departmentLeader = datas.data[0].id
+                    that.deptLeaderOption = datas.data.records
                 }
             })
         },
@@ -258,15 +291,21 @@ export default {
         saveAndEditIndicatorData() {
             let that = this
             let deptNameS = ''
+            let dept2NameS = ''
             let deptLeaderNameS = ''
             that.departData.forEach(item =>{
                 if (item.id === that.ruleForm.department) {
                     deptNameS = item.name
                 }
             })
+            that.depart2Data.forEach(item =>{
+                if (item.id === that.ruleForm.depart2ment) {
+                    dept2NameS = item.name
+                }
+            })
             that.deptLeaderOption.forEach(item =>{
                 if (item.id === that.ruleForm.departmentLeader) {
-                    deptLeaderNameS = item.userName
+                    deptLeaderNameS = item.name
                 }
             })
             let yjzbjhTypeIn = '0'
@@ -279,13 +318,19 @@ export default {
                 }
             })
             let params = {
-                deptId: that.ruleForm.department,
-                deptName: deptNameS,
                 chargePersonId: that.ruleForm.departmentLeader,
                 chargePersonName: deptLeaderNameS,
                 yjzbjhType: yjzbjhTypeIn,
                 jxjgkhsbType: jxjgkhsbTypeIn
             }
+            if (that.ruleForm.depart2ment === '') {
+                params.deptId = that.ruleForm.department
+                params.deptName = deptNameS
+            } else {
+                params.parentId = that.ruleForm.department
+                params.deptId = that.ruleForm.depart2ment
+                params.deptName = dept2NameS
+            }
             if (that.isSave) {
                 params.id = that.evalradio.id
             }

+ 20 - 5
src/components/evaluationknowledgePage/earlyWarningRulePage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="earlyWarningRules" v-loading="loadingImport">
         <div class="earlyWarningRulesBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务属性:</span>
                     <el-select v-model="businessStr" placeholder="请选择业务属性" clearable >
@@ -19,7 +19,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="reset"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <!-- $utils.havePurview('earlyWarningRules:oneLevel:add') -->
                 <btns
                 :showImport="false"
@@ -31,7 +31,7 @@
                 ></btns>
             </div>
             <div class="earlyWarningRulesTableData">
-                <el-table :data="earlyWarningRulesData" style="width: 100%" @row-dblclick="handleEdit">
+                <el-table :data="earlyWarningRulesData" style="width: 100%" @row-dblclick="handleEdit" :class="warningTableSty()">
                     <el-table-column label="序号" type="index" align="center" />
                     <el-table-column label="预警名称" prop="ruleName" />
                     <el-table-column label="业务属性" prop="sectionName"  width="200" />
@@ -339,7 +339,8 @@ export default {
                 pagesize: 12,
                 currentPage: 1,
                 total: 0
-            }
+            },
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -596,6 +597,13 @@ export default {
         handleCurrentChange(val){
             this.page.currentPage =val
             this.getEvalscoringData()
+        },
+        warningTableSty() {
+            if (this.winPix === 1.25) {
+                return 'warning125Table'
+            } else {
+                return 'warning100Table'
+            }
         }
     }
 }
@@ -663,10 +671,17 @@ export default {
         }
     }
     .earlyWarningRulesTableData{
-        .el-table{
+        .warning125Table{
+            .el-table__body-wrapper{
+                height: 53vh !important;
+            }
+        }
+        .warning100Table{
             .el-table__body-wrapper{
                 height: 60vh !important;
             }
+        }
+        .el-table{
             .el-input__inner{
                 height: 30px !important;
             }

+ 20 - 6
src/components/evaluationknowledgePage/evalRatingRulesPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="evalratingRules" v-loading="loadingImport">
+    <div class="evalratingRules">
         <div class="evalratingRulesBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan" style="width:100px">评级名称:</span>
                     <el-input v-model="indicatorStr" placeholder="请输入评级名称"></el-input>
@@ -30,7 +30,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="reset"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <!-- $utils.havePurview('evalratingRules:oneLevel:add') -->
                 <btns
                 :showImport="false"
@@ -42,7 +42,7 @@
                 ></btns>
             </div>
             <div class="evalratingRulesTableData">
-                <el-table :data="evalratingRulesData" style="width: 100%" @row-dblclick="handleEdit">
+                <el-table :data="evalratingRulesData" style="width: 100%" @row-dblclick="handleEdit" :class="ratingTableSty()">
                     <el-table-column label="序号" type="index" align="center" />
                     <el-table-column label="评级名称" prop="ruleName" />
                     <el-table-column label="业务属性" prop="binSectionName"  width="200" />
@@ -277,6 +277,7 @@ export default {
   components: { btns,seachs },
     data() {
         return {
+            winPix: window.devicePixelRatio,
             dialogVisible: false,
             title: '',
             indicItemoptions: [],
@@ -324,7 +325,6 @@ export default {
                     { required: true, message: '请输入描述', trigger: 'blur' }
                 ]
             },
-            loadingImport: false,
             evalratingRulesData:[],
             page:{
                 pagesize: 12,
@@ -564,6 +564,13 @@ export default {
         handleCurrentChange(val){
             this.page.currentPage =val
             this.getEvalscoringData()
+        },
+        ratingTableSty() {
+            if (this.winPix === 1.25) {
+                return 'rating125Table'
+            } else {
+                return 'rating100Table'
+            }
         }
     }
 }
@@ -631,10 +638,17 @@ export default {
         }
     }
     .evalratingRulesTableData{
-        .el-table{
+        .rating125Table{
+            .el-table__body-wrapper{
+                height: 53vh !important;
+            }
+        }
+        .rating100Table{
             .el-table__body-wrapper{
                 height: 60vh !important;
             }
+        }
+        .el-table{
             .el-input__inner{
                 height: 30px !important;
             }

+ 21 - 5
src/components/evaluationknowledgePage/scoringRulesPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="scoringRules" v-loading="loadingImport">
         <div class="scoringRulesBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务属性:</span>
                     <el-select v-model="businessStr" placeholder="请选择业务属性" clearable >
@@ -19,7 +19,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="reset"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -36,7 +36,8 @@
                 ></btns>
             </div>
             <div class="scoringRulesTableData">
-                <el-table :data="scoringRulesData" style="width: 100%" @select="rowClick" @select-all="allSelect" @row-dblclick="scoringRuleDetail">
+                <el-table :data="scoringRulesData" style="width: 100%" @select="rowClick"
+                 @select-all="allSelect" @row-dblclick="scoringRuleDetail" :class="scoringTableSty()">
                     <el-table-column type="selection" label="操作" align="center" />
                     <el-table-column label="规则名称" prop="scoreRuleName" />
                     <el-table-column label="业务属性" prop="businessName"  width="200" />
@@ -162,7 +163,8 @@ export default {
                 pagesize: 12,
                 currentPage: 1,
                 total: 0
-            }
+            },
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -196,6 +198,13 @@ export default {
                 }
             })
         },
+        scoringTableSty() {
+            if (this.winPix === 1.25) {
+                return 'scoring125Table'
+            } else {
+                return 'scoring100Table'
+            }
+        },
         changeBinstation(val) {
             this.getEvaluationData(val)
         },
@@ -395,10 +404,17 @@ export default {
         }
     }
     .scoringRulesTableData{
-        .el-table{
+        .scoring125Table{
+            .el-table__body-wrapper{
+                height: 53vh !important;
+            }
+        }
+        .scoring100Table{
             .el-table__body-wrapper{
                 height: 60vh !important;
             }
+        }
+        .el-table{
             .el-input__inner{
                 height: 30px !important;
             }

+ 48 - 21
src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="seasonLeagueTable">
-        <el-dialog v-model="dialogVisible" :width="evaluationSeasonDataRight.length>0?'80vw':'40vw'" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :width="seasonWidth()" :close-on-click-modal="false">
             <template #header>
                 <div class="seasonHeader">
                     <span style="font-size:14px;color:#fff">考核排行榜</span>
@@ -17,19 +17,19 @@
             <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="headerNameTit">
-                            <div class="headerNameTit_left">
+                        <div class="headerNameForeTit">
+                            <div class="headerNameForeTit_left">
                                 <span>排名</span>
                                 <span style="margin-left: 20px">单位名称</span>
                             </div>
-                            <div class="headerNameTit_right">
+                            <div class="headerNameForeTit_right">
                                 <span>得分</span>
-                                <span style="margin-left: 20px">加分事项</span>
-                                <span style="margin-left: 20px">扣分事项</span>
-                                <span style="margin-left: 20px">管理加分</span>
-                                <span style="margin-left: 20px">管理扣分</span>
-                                <span style="margin-left: 20px">高于基准</span>
-                                <span style="margin-left: 20px">低于基准</span>
+                                <span>加分事项</span>
+                                <span>扣分事项</span>
+                                <span>管理加分</span>
+                                <span>管理扣分</span>
+                                <span>高于基准</span>
+                                <span>低于基准</span>
                             </div>
                         </div>
                     </div>
@@ -113,19 +113,19 @@
                 </el-col>
                 <el-col :span="12" v-if="evaluationSeasonDataRight.length>0">
                     <div class="seasonFromHeader">
-                        <div class="headerNameTit">
-                            <div class="headerNameTit_left">
+                        <div class="headerNameForeTit">
+                            <div class="headerNameForeTit_left">
                                 <span>排名</span>
                                 <span style="margin-left: 20px">单位名称</span>
                             </div>
-                            <div class="headerNameTit_right">
+                            <div class="headerNameForeTit_right">
                                 <span>得分</span>
-                                <span style="margin-left: 20px">加分事项</span>
-                                <span style="margin-left: 20px">扣分事项</span>
-                                <span style="margin-left: 20px">管理加分</span>
-                                <span style="margin-left: 20px">管理扣分</span>
-                                <span style="margin-left: 20px">高于基准</span>
-                                <span style="margin-left: 20px">低于基准</span>
+                                <span>加分事项</span>
+                                <span>扣分事项</span>
+                                <span>管理加分</span>
+                                <span>管理扣分</span>
+                                <span>高于基准</span>
+                                <span>低于基准</span>
                             </div>
                         </div>
                     </div>
@@ -228,6 +228,7 @@ export default {
             topImg: topImg,
             botImg: botImg,
             cenImg: cenImg,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -264,6 +265,21 @@ export default {
             this.evaluationSeasonDataRight = []
             this.getYearData(name, year, season)
         },
+        seasonWidth() {
+            if (this.winPix === 1.25) {
+                if (this.evaluationSeasonDataRight.length>0) {
+                    return '90vw'
+                } else {
+                    return '50vw'
+                }
+            } else {
+                if (this.evaluationSeasonDataRight.length>0) {
+                    return '80vw'
+                } else {
+                    return '40vw'
+                }
+            }
+        },
         changeOption(val) {
             this.evaluationSeasonDataLeft = []
             this.evaluationSeasonDataRight = []
@@ -324,12 +340,20 @@ export default {
                 .seasonFromHeader{
                     width: 100%;
                     border-bottom: 1px solid #E1E3EA;
-                    .headerNameTit{
+                    .headerNameForeTit{
                         display: flex;
                         justify-content: space-between;
                         padding: 8px 20px;
                         font-size: 14px;
                         color: #414141;
+                        .headerNameForeTit_left{
+                            width: 30%;
+                        }
+                        .headerNameForeTit_right{
+                            width: 72%;
+                            display: flex;
+                            justify-content: space-between;
+                        }
                     }
                     .headerTit{
                         position: relative;
@@ -377,13 +401,16 @@ export default {
                     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: 5%;
+                        width: 7%;
                         font-weight: 600;
                         margin-right: 15px;
                         color: #666;

+ 38 - 8
src/components/gateWay/gatewayNewYearFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="annualLeagueTable">
-        <el-dialog v-model="dialogVisible" :width="evaluationYearDataRight.length>0?'50vw':'28vw'" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :width="yearWidth()" :close-on-click-modal="false">
             <template #header>
                 <div class="yearHeader">
                     <span style="font-size:14px;color:#fff">年度排行榜</span>
@@ -31,8 +31,8 @@
                     <div style="display: flex" v-for="(item, index) in evaluationYearDataLeft" :key="index">
                         <div class="yearFromMsg">
                             <div class="msgProgress">
-                                <span>{{item.rank}}</span>
-                                <span>{{item.company}}</span>
+                                <span :style="rankStyle()">{{item.rank}}</span>
+                                <span :style="companyStyle()">{{item.company}}</span>
                                 <span>{{item.grade}}</span>
                                 <span>{{item.score}}</span>
                             </div>
@@ -55,8 +55,8 @@
                     <div style="display: flex" v-for="(item, index) in evaluationYearDataRight" :key="index">
                         <div class="yearFromMsg">
                             <div class="msgProgress">
-                                <span>{{item.rank}}</span>
-                                <span>{{item.company}}</span>
+                                <span :style="rankStyle()">{{item.rank}}</span>
+                                <span :style="companyStyle()">{{item.company}}</span>
                                 <span>{{item.grade}}</span>
                                 <span>{{item.score}}</span>
                             </div>
@@ -79,7 +79,8 @@ export default {
             optionArr: [],
             optionName: '',
             yearData: '',
-            seasonData: ''
+            seasonData: '',
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -112,6 +113,31 @@ export default {
             this.evaluationYearDataRight = []
             this.getYearData(name, year, season)
         },
+        yearWidth() {
+            if (this.winPix === 1.25) {
+                if (this.evaluationYearDataRight.length>0) {
+                    return '50vw'
+                } else {
+                    return '28vw'
+                }
+            } else {
+                if (this.evaluationYearDataRight.length>0) {
+                    return '50vw'
+                } else {
+                    return '28vw'
+                }
+            }
+        },
+        rankStyle() {
+            if (this.winPix === 1.25) {
+                return 'width: 13%'
+            }
+        },
+        companyStyle() {
+            if (this.winPix === 1.25) {
+                return 'width: 68%'
+            }
+        },
         changeOption(val) {
             this.evaluationYearDataLeft = []
             this.evaluationYearDataRight = []
@@ -213,7 +239,10 @@ export default {
                             }
                             span:nth-child(2){
                                 display: inline-block;
-                                width: 68%;
+                                width: 72%;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
                                 font-weight: 400;
                                 color: #666;
                                 margin-right: 20px;
@@ -224,7 +253,8 @@ export default {
                                 color: #F65177;
                             }
                             span:nth-child(4){
-                                // width: 10%;
+                                display: inline-block;
+                                width: 10%;
                                 font-weight: 600;
                                 color: #666;
                             }

+ 3 - 1
src/components/gatewaynNewPage.vue

@@ -684,6 +684,8 @@
                     }
                     .headerNameTit_right{
                         width: 29%;
+                        display: flex;
+                        justify-content: center;
                     }
                 }
 
@@ -1090,7 +1092,7 @@
                                 display: inline-block;
                                 // width: 100%;
                                 // width: 48px;
-                                width: 2.5vw;
+                                width: 3vw;
                                 // height: 30px;
                                 height: 3vh;
                                 padding: 5px 8px 0;

+ 18 - 3
src/components/notification/notificationMangePage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="notification">
         <div class="notificationBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="PeriodBtn">
                     <btns
                     :showImport="false"
@@ -30,7 +30,7 @@
             </div>
             
             <div class="notificationTableData">
-                <el-table :data="notificationData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="notificationData" style="width: 100%" @select="rowClick" @select-all="rowClick" :class="notificationTableSty()">
                     <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="发布状态" prop="releaseState" width="100" align="center">
@@ -275,6 +275,7 @@ export default {
     },
     data() {
         return {
+            winPix: window.devicePixelRatio,
             dialogVisible: false,
             filesVisible: false,
             isSave: false,
@@ -382,6 +383,13 @@ export default {
                 }
             })
         },
+        notificationTableSty() {
+            if (this.winPix === 1.25) {
+                return 'notification125Table'
+            } else {
+                return 'notification100Table'
+            }
+        },
         notificationFn() {
             if (this.notificationData.length>0) {
                 notificationData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize)
@@ -718,10 +726,17 @@ export default {
         }
         .notificationTableData{
             margin-top: 20px;
-            .el-table{
+            .notification125Table{
+                .el-table__body-wrapper{
+                    height: 60vh !important;
+                }
+            }
+            .notification100Table{
                 .el-table__body-wrapper{
                     height: 65vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 19 - 3
src/components/taskCenter/taskCenterPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="taskCenter">
         <div class="taskCenterTableData">
-            <el-table :data="taskCenterData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+            <el-table :data="taskCenterData" style="width: 100%" @select="rowClick" @select-all="rowClick" :class="taskCenterTableSty()">
                 <!-- <el-table-column type="selection" label="操作" align="center"></el-table-column> -->
 
                 <el-table-column label="序号" type="index" align="center" width="80" />
@@ -88,7 +88,8 @@ export default {
                 pagesize: 12,
                 currentPage: 1,
                 total: 0
-            }
+            },
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -156,6 +157,13 @@ export default {
             if (val) {
                 this.getEvaluationData()
             }
+        },
+        taskCenterTableSty() {
+            if (this.winPix === 1.25) {
+                return 'taskCenter125Table'
+            } else {
+                return 'taskCenter100Table'
+            }
         }
     }
 }
@@ -165,10 +173,18 @@ export default {
 .taskCenter{
     .taskCenterTableData{
         margin-top: 20px;
-        .el-table{
+        .taskCenter125Table{
+            .el-table__body-wrapper{
+                height: 70vh !important;
+            }
+        }
+        .taskCenter100Table{
             .el-table__body-wrapper{
                 height: 78vh !important;
             }
+        }
+        .el-table{
+            
             .el-input__inner{
                 height: 30px !important;
             }

+ 15 - 0
src/utils/index.js

@@ -6,6 +6,21 @@ import {apiGetExportMsg} from '../api/api'
 const checkNull = val => val === undefined || val === null
 
 const until = {
+    //搜索栏兼容125%
+    collectSeachSty() {
+        let winPix = window.devicePixelRatio
+        if (winPix === 1.25) {
+            return 'padding: 15px 20px 15px 0;'
+        }
+    },
+    //按钮栏兼容125%
+    PeriodBtnSty() {
+        let winPix = window.devicePixelRatio
+        if (winPix === 1.25) {
+            return 'padding: 10px 0;'
+        }
+    },
+
     //后端导出
     downloadPer(url,fileName, idss, idsmo) {
         let params = {}