Parcourir la source

项目软件中所有一级页面兼容125%;部门考评配置页面新增功能,绩效结果考评页面启动功能根据甲方需求进行功能优化

SunZehao il y a 1 an
Parent
commit
286b5d2b6e
25 fichiers modifiés avec 417 ajouts et 168 suppressions
  1. 7 0
      src/components/assessment/assessmentApplicationFrom.vue
  2. 23 8
      src/components/assessment/assessmentApplicationPage.vue
  3. 21 6
      src/components/assessment/evaluationAmendmentPage.vue
  4. 3 3
      src/components/assessment/evaluationBenchmarkingIndicPage.vue
  5. 1 1
      src/components/assessment/evaluationDeptBusinessPage.vue
  6. 19 4
      src/components/assessment/evaluationDeptRatingPage.vue
  7. 20 5
      src/components/assessment/evaluationDeptStartPage.vue
  8. 21 5
      src/components/assessment/evaluationMonthPage.vue
  9. 21 5
      src/components/assessment/evaluationQuarterPage.vue
  10. 3 61
      src/components/assessment/evaluationReportPage.vue
  11. 21 6
      src/components/assessment/evaluationStartPage.vue
  12. 20 5
      src/components/assessment/evaluationUnitRatingPage.vue
  13. 19 4
      src/components/assessment/evaluationWarningPage.vue
  14. 21 5
      src/components/assessment/evaluationYearPage.vue
  15. 20 6
      src/components/baseInfomation/moreBrandPage.vue
  16. 20 4
      src/components/evaluationSystem/achievementKPage.vue
  17. 22 6
      src/components/evaluationSystem/evaluationCompanyPage.vue
  18. 21 6
      src/components/evaluationSystem/evaluationDepartmentPage.vue
  19. 21 5
      src/components/evaluationSystem/evaluationIndexPage.vue
  20. 24 8
      src/components/evaluationSystem/evaluationMultiSequencePage.vue
  21. 20 4
      src/components/evaluationSystem/evaluationPersonnelPage.vue
  22. 20 4
      src/components/evaluationSystem/evaluationRulesPage.vue
  23. 21 5
      src/components/evaluationSystem/partyBuildingKPage.vue
  24. 1 2
      src/components/evaluationknowledgePage/earlyWarningRulePage.vue
  25. 7 0
      src/components/taskCenter/taskApplicationFrom.vue

+ 7 - 0
src/components/assessment/assessmentApplicationFrom.vue

@@ -44,6 +44,12 @@
                             <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                     </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">评定等级:</span>
+                            <span>{{receiptMsg.ratingGrade}}</span>
+                        </div>
+                    </el-col>
                 </el-row>
                 <div class="btnASeach">
                     <div class="detaTableBtns">
@@ -195,6 +201,7 @@ export default {
                     code: row.orderNumber,
                     des: row.declarationReason,
                     stage: row.stage,
+                    ratingGrade: row.ratingGrade,
                     deptLeaderName: row.deptLeaderName,
                     deptName: row.deptName,
                     createDate: row.createTime,

+ 23 - 8
src/components/assessment/assessmentApplicationPage.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="assessmentApplication">
         <div class="assessmentApplicationBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">申报单号:</span>
                     <el-input v-model="orderNumber" placeholder="请输入申报单号"></el-input>
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -23,7 +23,7 @@
                 ></btns>
             </div>
             <div class="assessmentApplicationTableData">
-                <el-table :data="assessmentApplicationData" style="width: 100%" @select="rowClick"
+                <el-table :data="assessmentApplicationData" style="width: 100%" @select="rowClick" :class="evalApplicationTableSty()"
                  @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="orderNumber" width="200"/>
@@ -216,7 +216,8 @@ export default {
             orderNumber: '',
             stageArr: [],
             departData: [],
-            DepartmentLeaderObj: {}
+            DepartmentLeaderObj: {},
+            winPix: window.devicePixelRatio
         }
     },
     created() {
@@ -296,7 +297,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 +313,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
@@ -491,6 +492,13 @@ export default {
                 let blob = new Blob([datas], { type: "application/vnd.ms-excel" })
                 saveAs(blob, '公司本部部门及员工月度绩效考核结果申报表.xlsx')
             })
+        },
+        evalApplicationTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalApplication125Table'
+            } else {
+                return 'evalApplication100Table'
+            }
         }
     }
 }
@@ -558,10 +566,17 @@ export default {
             }
         }
         .assessmentApplicationTableData{
-            .el-table{
+            .evalApplication125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .evalApplication100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 21 - 6
src/components/assessment/evaluationAmendmentPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationAmendment">
         <div class="evaluationAmendmentBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -27,7 +27,7 @@
                 ></btns>
             </div>
             <div class="evaluationAmendmentTableData">
-                <el-table :data="evaluationAmendmentData" style="width: 100%" @select="rowClick"
+                <el-table :data="evaluationAmendmentData" style="width: 100%" @select="rowClick" :class="evalAmendmentTableSty()"
                  @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" />
@@ -226,7 +226,8 @@ export default {
             isShowYear: true,
             rescode: '',
             resDes: '',
-            stageArr: []
+            stageArr: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -501,7 +502,14 @@ export default {
                     that.changeDateSelect = []
                 })
             })
-        },  
+        },
+        evalAmendmentTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalAmendment125Table'
+            } else {
+                return 'evalAmendment100Table'
+            }
+        }
     }
 }
 </script>
@@ -568,10 +576,17 @@ export default {
             }
         }
         .evaluationAmendmentTableData{
-            .el-table{
+            .evalAmendment125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .evalAmendment100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 3 - 3
src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="benchmarkingIndicator">
         <div class="benchmarkingIndicatorBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div style="display: flex;width:70%">
                     <div class="exceed">
                         <span class="exceedSpan" style="margin-left: 10px;width: 50px">阶段:</span>
@@ -141,7 +141,7 @@ export default {
                 total: 0
             },
             titleMsgArr: [],
-            timerData: []
+            timerData: [],
         }
     },
     created() {
@@ -325,7 +325,7 @@ export default {
             } catch (e) {
                 if (typeof console !== 'undefined') console.error(e)
             }
-        }
+        },
     }
 }
 </script>

+ 1 - 1
src/components/assessment/evaluationDeptBusinessPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationStart">
         <div class="evaluationStartBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>

+ 19 - 4
src/components/assessment/evaluationDeptRatingPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationRating">
         <div class="evaluationRatingBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">部门名称:</span>
                     <el-input v-model="resDeptName" placeholder="请输入部门名称"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="true"
                 :showExport="true"
@@ -33,7 +33,7 @@
             <div class="evaluationRatingTableData">
                  <!-- @row-click="rowClickToggle" -->
                 <!-- .length>0?evaluationRatingData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize):evaluationRatingData -->
-                <el-table :data="evaluationRatingData" style="width: 100%" ref="tableRating"
+                <el-table :data="evaluationRatingData" style="width: 100%" ref="tableRating" :class="evaldeptRatingTableSty()"
                  @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column type="index" label="序号" align="center"></el-table-column>
@@ -200,6 +200,7 @@ export default {
                 novContent: '',
                 deceContent: ''
             },
+            winPix: window.devicePixelRatio,
             rules: {
                 department: [
                     { required: true, message: '请选择考评部门', trigger: 'change' }
@@ -649,6 +650,13 @@ export default {
                 const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' })
                 fileSave(blob, `部门考评评级数据导出.xlsx`)
             })
+        },
+        evaldeptRatingTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evaldeptRating125Table'
+            } else {
+                return 'evaldeptRating100Table'
+            }
         }
     }
 }
@@ -716,10 +724,17 @@ export default {
             }
         }
         .evaluationRatingTableData{
-            .el-table{
+            .evaldeptRating125Table{
+                .el-table__body-wrapper{
+                    height: 63vh !important;
+                }
+            }
+            .evaldeptRating100Table{
                 .el-table__body-wrapper{
                     height: 65vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 20 - 5
src/components/assessment/evaluationDeptStartPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationStart">
         <div class="evaluationStartBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -27,7 +27,7 @@
                 ></btns>
             </div>
             <div class="evaluationStartTableData">
-                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick"
+                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick" :class="evalDeptStartTableSty()"
                  @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" width="300"  />
@@ -212,7 +212,8 @@ export default {
             rescode: '',
             resDes: '',
             stageArr: [],
-            departData: []
+            departData: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -531,6 +532,13 @@ export default {
                     });
                 }
             })
+        },
+        evalDeptStartTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalDeptStart125Table'
+            } else {
+                return 'evalDeptStart100Table'
+            }
         }
     }
 }
@@ -598,10 +606,17 @@ export default {
             }
         }
         .evaluationStartTableData{
-            .el-table{
+            .evalDeptStart125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .evalDeptStart100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 21 - 5
src/components/assessment/evaluationMonthPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationMonth">
         <div class="evaluationMonthBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -28,7 +28,8 @@
                 ></btns>
             </div>
             <div class="evaluationMonthTableData">
-                <el-table :data="evaluationMonthData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+                <el-table :data="evaluationMonthData" style="width: 100%" :class="monthTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
                     <el-table-column label="考评单位" width="330">
@@ -227,7 +228,8 @@ export default {
             periodData: [],
             ruleDataAll: [],
             rescode: '',
-            resDes: ''
+            resDes: '',
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -507,6 +509,13 @@ export default {
         },
         handleReport(row) {
             this.$refs.reportDia.init(row)
+        },
+        monthTableSty() {
+            if (this.winPix === 1.25) {
+                return 'month125Table'
+            } else {
+                return 'month100Table'
+            }
         }
     }
 }
@@ -574,10 +583,17 @@ export default {
             }
         }
         .evaluationMonthTableData{
-            .el-table{
+            .month125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .month100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 21 - 5
src/components/assessment/evaluationQuarterPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationQuarter">
         <div class="evaluationQuarterBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <!-- $utils.havePurview('evaluationQuarter:oneLevel:add') -->
                 <btns
                 :showImport="false"
@@ -28,7 +28,8 @@
                 ></btns>
             </div>
             <div class="evaluationQuarterTableData">
-                <el-table :data="evaluationQuarterData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+                <el-table :data="evaluationQuarterData" style="width: 100%" :class="quarterTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
                     <el-table-column label="考评单位" width="330">
@@ -228,7 +229,8 @@ export default {
             periodData: [],
             ruleDataAll: [],
             rescode: '',
-            resDes: ''
+            resDes: '',
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -519,6 +521,13 @@ export default {
         }, 
         handleReport(row) {
             this.$refs.reportDia.init(row)
+        },
+        quarterTableSty() {
+            if (this.winPix === 1.25) {
+                return 'quarter125Table'
+            } else {
+                return 'quarter100Table'
+            }
         }
     }
 }
@@ -586,10 +595,17 @@ export default {
             }
         }
         .evaluationQuarterTableData{
-            .el-table{
+            .quarter125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .quarter100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 3 - 61
src/components/assessment/evaluationReportPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationReport">
         <div class="evaluationReportBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">考评周期:</span>
                     <!-- <el-input v-model="restype" placeholder="请输入业务类别"></el-input> -->
@@ -33,7 +33,7 @@
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn">
-                <btns
+                <!-- <btns
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
@@ -41,7 +41,7 @@
                 :showDelete="false"
                 :disDelete="changeDateSelect.length === 0"
                 @handleExport="exportDataMsg"
-                ></btns>
+                ></btns> -->
             </div>
             <div class="evaluationReportTableData">
                 <el-table :data="evaluationReportData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
@@ -186,64 +186,6 @@ export default {
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
-        exportDataMsg() {
-            let data = this.evaluationReportData  //接口返回数据
-            let col = [
-                { name: '报告名称'},
-                { name: '业务属性'},
-                { name: '考评周期'},
-                { name: '年'},
-                { name: '月'}
-            ]
-            let colEn = ['evaluateReportName', 'binSectionName', 'checkCycle', 'year', 'month']
-            let rowData = []
-            for(let i =0; i<data.length; i++) {
-                let item = data[i]
-                let arr = []
-                for(let j =0; j<colEn.length; j++) {
-                    let it = colEn[j]
-                    arr.push(item[it])
-                }
-                rowData.push(arr)
-            }
-            const workbook = new ExcelJS.Workbook()
-            const worksheet = workbook.addWorksheet('Sheet1')
-            //定义表格标题
-            const Targetrow = worksheet.getRow(1);
-            Targetrow.height = 30;
-            const Targetcell = worksheet.getCell(`A1`);
-            worksheet.mergeCells(`A1:E1`);
-            Targetcell.value = `测试表格`;
-            Targetcell.font = { name: "宋体", family: 4, size: 11, bold: true }; // 字体
-            Targetcell.alignment = { vertical: "middle", horizontal: "center" }; //对齐
-            
-            worksheet.columns = [
-                { header: '月份', key: 'name', width: 24 },
-                { header: '合计', key: 'statistic', width: 24 },
-                { header: '一月', key: 'january' },
-                { header: '二月', key: 'february' },
-                { header: '三月', key: 'march' },
-                { header: '四月', key: 'april' },
-                { header: '五月', key: 'may' },
-                { header: '六月', key: 'june' },
-                { header: '七月', key: 'july' },
-                { header: '八月', key: 'august' },
-                { header: '九月', key: 'september' },
-                { header: '十月', key: 'october' },
-                { header: '十一月', key: 'november' },
-                { header: '十二月', key: 'december' }
-            ]
-            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>

+ 21 - 6
src/components/assessment/evaluationStartPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationStart">
         <div class="evaluationStartBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -27,7 +27,7 @@
                 ></btns>
             </div>
             <div class="evaluationStartTableData">
-                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick"
+                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick" :class="evalStartTableSty()"
                  @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" />
@@ -227,7 +227,8 @@ export default {
             isShowYear: true,
             rescode: '',
             resDes: '',
-            stageArr: []
+            stageArr: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -509,7 +510,14 @@ export default {
                     that.changeDateSelect = []
                 })
             })
-        },  
+        },
+        evalStartTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalStart125Table'
+            } else {
+                return 'evalStart100Table'
+            }
+        }
     }
 }
 </script>
@@ -576,10 +584,17 @@ export default {
             }
         }
         .evaluationStartTableData{
-            .el-table{
+            .evalStart125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .evalStart100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 20 - 5
src/components/assessment/evaluationUnitRatingPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationUnitRating">
         <div class="evaluationUnitRatingBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">单位名称:</span>
                     <el-input v-model="resCompanyName" placeholder="请输入单位名称"></el-input>
@@ -23,7 +23,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="true"
                 :showExport="true"
@@ -43,7 +43,7 @@
             </div>
             <div class="evaluationUnitRatingTableData">
                  <!-- @row-click="rowClickToggle" -->
-                <el-table :data="evaluationUnitRatingData" style="width: 100%" ref="tableSS"
+                <el-table :data="evaluationUnitRatingData" style="width: 100%" ref="tableSS" :class="unitRatingTableSty()"
                  @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column type="index" label="序号" align="center"></el-table-column>
@@ -208,7 +208,8 @@ export default {
             businessStr: '',
             resAnnual: '',
             monthArr: [],
-            ratingArr: []
+            ratingArr: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -436,6 +437,13 @@ export default {
                 const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' })
                 fileSave(blob, `单位考评评级数据导出.xlsx`)
             })
+        },
+        unitRatingTableSty() {
+            if (this.winPix === 1.25) {
+                return 'unitRating125Table'
+            } else {
+                return 'unitRating100Table'
+            }
         }
     }
 }
@@ -503,10 +511,17 @@ export default {
             }
         }
         .evaluationUnitRatingTableData{
-            .el-table{
+            .unitRating125Table{
+                .el-table__body-wrapper{
+                    height: 63vh !important;
+                }
+            }
+            .unitRating100Table{
                 .el-table__body-wrapper{
                     height: 65vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 19 - 4
src/components/assessment/evaluationWarningPage.vue

@@ -2,7 +2,7 @@
     <div class="evaluationWaring">
         <div class="evaluationWaringBtn">
             <div style="display:flex;justify-content: space-between;border-bottom: 1px solid#D6DBEA;">
-                <div class="collectSeach">
+                <div class="collectSeach" :style="$utils.collectSeachSty()">
                     <div class="exceed">
                         <span class="exceedSpan">业务属性:</span>
                         <el-select v-model="sectionStr" placeholder="请选择业务属性">
@@ -38,7 +38,7 @@
                 </div>
             </div>
             <div class="evaluationWaringTableData">
-                <el-table :data="evaluationWaringData" style="width: 100%">
+                <el-table :data="evaluationWaringData" style="width: 100%" :class="evalwarningTableSty()">
                     <el-table-column label="序号" type="index" align="center" />
                     <el-table-column label="考评单位" prop="company" width="200" />
                     <el-table-column label="指标类型" prop="title" width="200" />
@@ -94,7 +94,8 @@ export default {
                 pagesize: 15,
                 currentPage: 1,
                 total: 0
-            }
+            },
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -205,6 +206,13 @@ export default {
                 fileSave(blob, `考评预警数据导出.xlsx`)
             })
         },
+        evalwarningTableSty() {
+            if (this.winPix === 1.25) {
+                return 'warning125Table'
+            } else {
+                return 'warning100Table'
+            }
+        }
     }
 }
 </script>
@@ -269,10 +277,17 @@ export default {
         }
         .evaluationWaringTableData{
             margin-top: 20px;
-            .el-table{
+            .warning125Table{
+                .el-table__body-wrapper{
+                    height: 59vh !important;
+                }
+            }
+            .warning100Table{
                 .el-table__body-wrapper{
                     height: 65vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 21 - 5
src/components/assessment/evaluationYearPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationYear">
         <div class="evaluationYearBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号:</span>
                     <el-input v-model="rescode" placeholder="请输入业务编号"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showSave="false"
@@ -27,7 +27,8 @@
                 ></btns>
             </div>
             <div class="evaluationYearTableData">
-                <el-table :data="evaluationYearData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+                <el-table :data="evaluationYearData" style="width: 100%" :class="yearTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
                     <el-table-column label="考评单位" width="330">                        
@@ -225,7 +226,8 @@ export default {
             periodData: [],
             ruleDataAll: [],
             rescode: '',
-            resDes: ''
+            resDes: '',
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -491,6 +493,13 @@ export default {
         },
         handleReport(row) {
             this.$refs.reportDia.init(row)
+        },
+        yearTableSty() {
+            if (this.winPix === 1.25) {
+                return 'year125Table'
+            } else {
+                return 'year100Table'
+            }
         }
     }
 }
@@ -558,10 +567,17 @@ export default {
             }
         }
         .evaluationYearTableData{
-            .el-table{
+            .year125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .year100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 20 - 6
src/components/baseInfomation/moreBrandPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="moreBrand" v-loading="loadingImport">
+    <div class="moreBrand">
         <div class="moreBrandBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan" style="width: 80px">业务属性:</span>
                     <el-select v-model="moduleStr" placeholder="请选择业务属性">
@@ -15,7 +15,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns 
                     :showImport="false" :showExport="false" :showSave="false"
                     :showAdd="true"
@@ -23,7 +23,7 @@
                     @handleAdd="handleAdd('out')"></btns>
             </div>
             <div class="moreBrandTableData">
-                <el-table :data="moreBrandData" style="width: 100%">
+                <el-table :data="moreBrandData" style="width: 100%" :class="moreBrandTableSty()">
                     <el-table-column type="expand">
                     <template #default="props">
                         <div class="inTable">
@@ -186,7 +186,7 @@ export default {
                 total: 0
             },
             evalradio: {},
-            loadingImport: false,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -370,6 +370,13 @@ export default {
         handleCurrentChange(val){
             this.page.currentPage =val
             this.getMoreBrandData()
+        },
+        moreBrandTableSty() {
+            if (this.winPix === 1.25) {
+                return 'moreBrand125Table'
+            } else {
+                return 'moreBrand100Table'
+            }
         }
     }
 }
@@ -454,10 +461,17 @@ export default {
         }
     }
   .moreBrandTableData{
-    .el-table{
+    .moreBrand125Table{
+        .el-table__body-wrapper{
+            height: 53vh !important;
+        }
+    }
+    .moreBrand100Table{
         .el-table__body-wrapper{
             height: 60vh !important;
         }
+    }
+    .el-table{
         .el-input__inner{
             height: 30px !important;
         }

+ 20 - 4
src/components/evaluationSystem/achievementKPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="achievement">
         <div class="achievementBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务编码:</span>
                     <el-input v-model="coefficientStr" placeholder="请输入业务编码"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -31,7 +31,8 @@
                 ></btns>
             </div>
             <div class="achievementTableData">
-                <el-table :data="achievementData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="detailWatch">
+                <el-table :data="achievementData" style="width: 100%" :class="achievementTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="detailWatch">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="序号" type="index" />
                     <el-table-column label="业务编码" prop="coefficientCode" />
@@ -269,6 +270,7 @@ export default {
             },
             evalradio: {},
             activeName: 'first',
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -537,6 +539,13 @@ export default {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"
             this.$refs.importPage.upload.open = true
         },
+        achievementTableSty() {
+            if (this.winPix === 1.25) {
+                return 'achievement125Table'
+            } else {
+                return 'achievement100Table'
+            }
+        }
     }
 }
 </script>
@@ -738,10 +747,17 @@ export default {
             }
         }
         .achievementTableData{
-            .el-table{
+            .achievement125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .achievement100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 22 - 6
src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationCompany" v-loading="loadingImport">
         <div class="evaluationCompanyBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div style="display: flex;width:70%">
                     <div class="exceed">
                         <span class="exceedSpan" style="width: 60px">单位:</span>
@@ -47,7 +47,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns 
                     :showImport="false" :showExport="false" 
                     :showAdd="$utils.havePurview('evalCompany:oneLevel:add')"
@@ -59,7 +59,8 @@
                     @handleImport="handleImport" @handleExport="handleExport"></btns>
             </div>
             <div class="evaluationCompanyTableData">
-                <el-table :data="evaluationCompanyData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="evaluationCompanyData" style="width: 100%" :class="evaluationCompanyTableSty()"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="单位名称" prop="organizationShortName" width="300">
                         <template #default="scope">
@@ -304,7 +305,8 @@
                 periodId: '',
                 resAnnual: '',
                 stageIds: '',
-                binSectionIds: ''
+                binSectionIds: '',
+                winPix: window.devicePixelRatio,
             }
         },
         created() {
@@ -583,6 +585,13 @@
                 this.$refs.importPage.upload.title = "考评指标管理信息导入"
                 this.$refs.importPage.upload.open = true
             },
+            evaluationCompanyTableSty() {
+                if (this.winPix === 1.25) {
+                    return 'evalCompany125Table'
+                } else {
+                    return 'evalCompany100Table'
+                }
+            }
         }
     }
 </script>
@@ -680,10 +689,17 @@
         }
 
         .evaluationCompanyTableData {
-            .el-table {
-                .el-table__body-wrapper {
+            .evalCompany125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .evalCompany100Table{
+                .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table {
 
                 .el-input__inner {
                     height: 30px !important;

+ 21 - 6
src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="evaluationDepartment" v-loading="loadingImport">
+    <div class="evaluationDepartment">
         <div class="evaluationDepartmentBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">部门名称:</span>
                     <el-input v-model="departmentS" placeholder="请输入部门名称"></el-input>
@@ -12,7 +12,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <!-- $utils.havePurview('evalDepartment:oneLevel:add')
                 $utils.havePurview('evalDepartment:oneLevel:save')
                 $utils.havePurview('evalDepartment:oneLevel:delete') -->
@@ -32,7 +32,8 @@
                 ></btns>
             </div>
             <div class="evaluationDepartmentTableData">
-                <el-table :data="evaluationDepartmentData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="evaluationDepartmentData" style="width: 100%" :class="departmentTableSty()"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <!-- <el-table-column label="部门编码" prop="shortDeptName" /> -->
                     <el-table-column label="部门名称" prop="deptName" />
@@ -177,7 +178,7 @@ export default {
                 total: 0
             },
             evalradio: {},
-            loadingImport: false,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -403,6 +404,13 @@ export default {
             this.page.currentPage =val
             this.getEvalCompanyData()
         },
+        departmentTableSty() {
+            if (this.winPix === 1.25) {
+                return 'department125Table'
+            } else {
+                return 'department100Table'
+            }
+        }
     }
 }
 </script>
@@ -495,10 +503,17 @@ export default {
         }
     }
   .evaluationDepartmentTableData{
-    .el-table{
+    .department125Table{
+        .el-table__body-wrapper{
+            height: 53vh !important;
+        }
+    }
+    .department100Table{
         .el-table__body-wrapper{
             height: 60vh !important;
         }
+    }
+    .el-table{
         .el-input__inner{
             height: 30px !important;
         }

+ 21 - 5
src/components/evaluationSystem/evaluationIndexPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationIndex" v-loading="loadingImport">
         <div class="evaluationIndexBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">指标名称:</span>
                     <el-input v-model="indicatorIdS" placeholder="请输入指标名称"></el-input>
@@ -19,7 +19,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -38,7 +38,8 @@
                 ></btns>
             </div>
             <div class="evaluationIndexTableData">
-                <el-table :data="evaluationIndexData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="editEvaluaIndex">
+                <el-table :data="evaluationIndexData" style="width: 100%"  :class="evaluationIndexTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="editEvaluaIndex">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="指标编码" prop="indicatorCode" width="200" />
                     <el-table-column label="业务属性" prop="binSectionName" />
@@ -358,7 +359,8 @@ export default {
             addIcon: addIcon,
             indicatoroptions: [],
             indicItemoptions: [],
-            isShowEvaluation: []
+            isShowEvaluation: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -727,6 +729,13 @@ export default {
                 desc: row.des
             }
             this.getIndidicselectById(row.id)
+        },
+        evaluationIndexTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalIndex125Table'
+            } else {
+                return 'evalIndex100Table'
+            }
         }
     }
 }
@@ -947,10 +956,17 @@ export default {
         }
     }
   .evaluationIndexTableData{
-    .el-table{
+    .evalIndex125Table{
+        .el-table__body-wrapper{
+            height: 53vh !important;
+        }
+    }
+    .evalIndex100Table{
         .el-table__body-wrapper{
             height: 60vh !important;
         }
+    }
+    .el-table{
         .el-input__inner{
             height: 30px !important;
         }

+ 24 - 8
src/components/evaluationSystem/evaluationMultiSequencePage.vue

@@ -1,14 +1,14 @@
 <template>
-    <div class="evaluationCombination" v-loading="loadingImport">
+    <div class="evaluationCombination">
         <div class="evaluationCombinationBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">组合名称:</span>
                     <el-input v-model="combinationS" placeholder="请输入组合名称"></el-input>
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -25,7 +25,8 @@
                 ></btns>
             </div>
             <div class="evaluationCombinationDataC">
-                <el-table :data="evaluationCombinationData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="evaluationCombinationData" style="width: 100%" :class="multisequenceTableSty()"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="组合名称" prop="citeCalculationName" />
                     <el-table-column label="所属板块" prop="binSectionName" />
@@ -130,7 +131,8 @@ export default {
             evalradio: {},
 
             binSectionOptions: [],
-            indicItemoptions: []
+            indicItemoptions: [],
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -302,6 +304,13 @@ export default {
             this.page.currentPage =val
             this.getcitecalculationData()
         },
+        multisequenceTableSty() {
+            if (this.winPix === 1.25) {
+                return 'multisequence125Table'
+            } else {
+                return 'multisequence100Table'
+            }
+        }
     }
 }
 </script>
@@ -383,10 +392,17 @@ export default {
         }
     }
   .evaluationCombinationDataC{
+      .multisequence125Table{
+          .el-table__body-wrapper{
+              height: 53vh !important;
+          }
+      }
+      .multisequence100Table{
+          .el-table__body-wrapper{
+              height: 60vh !important;
+          }
+      }
     .el-table{
-        .el-table__body-wrapper{
-            height: 60vh !important;
-        }
         .el-input__inner{
             height: 30px !important;
         }

+ 20 - 4
src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="evaluationPerson" v-loading="loadingImport">
         <div class="evaluationPersonBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">人员名称:</span>
                     <el-input v-model="companyS" placeholder="请输入人员名称"></el-input>
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -27,7 +27,8 @@
                 ></btns>
             </div>
             <div class="evaluationPersonTableData">
-                <el-table :data="evaluationPersonData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="evaluationPersonData" style="width: 100%" :class="personTableSty()"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="所属公司" prop="companyName" />
                     <el-table-column label="所属部门" prop="deptName" />
@@ -225,6 +226,7 @@ export default {
             },
             evalradio: {},
             loadingImport: false,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -498,6 +500,13 @@ export default {
             this.$refs.importPage.upload.title = "考评指标管理信息导入"
             this.$refs.importPage.upload.open = true
         },
+        personTableSty() {
+            if (this.winPix === 1.25) {
+                return 'person125Table'
+            } else {
+                return 'person100Table'
+            }
+        }
     }
 }
 </script>
@@ -581,10 +590,17 @@ export default {
         }
     }
   .evaluationPersonTableData{
-    .el-table{
+    .person125Table{
+        .el-table__body-wrapper{
+            height: 53vh !important;
+        }
+    }
+    .person100Table{
         .el-table__body-wrapper{
             height: 60vh !important;
         }
+    }
+    .el-table{
         .el-input__inner{
             height: 30px !important;
         }

+ 20 - 4
src/components/evaluationSystem/evaluationRulesPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="evaluationRule" v-loading="loadingImport">
         <div class="evaluationRuleBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan" style="width: 80px">业务属性:</span>
                     <el-select v-model="moduleStr" placeholder="请选择业务属性">
@@ -30,7 +30,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="false"
                 :showExport="false"
@@ -49,7 +49,8 @@
                 ></btns>
             </div>
             <div class="evaluationRuleTableData">
-                <el-table :data="evaluationRuleData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="editRuleDetail">
+                <el-table :data="evaluationRuleData" style="width: 100%" :class="evaluationRuleTableSty()"
+                 @select="rowClick" @select-all="rowClick" @row-dblclick="editRuleDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="规则名称" prop="ruleName" />
                     <el-table-column label="业务阶段" prop="binStageName" />
@@ -204,6 +205,7 @@ export default {
             },
             evalradio: {},
             loadingImport: false,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -391,6 +393,13 @@ export default {
         //指标项配置
         editRuleDetail(row) {
             this.$refs.ruleDetail.init(row)
+        },
+        evaluationRuleTableSty() {
+            if (this.winPix === 1.25) {
+                return 'evalRule125Table'
+            } else {
+                return 'evalRule100Table'
+            }
         }
     }
 }
@@ -475,10 +484,17 @@ export default {
         }
     }
   .evaluationRuleTableData{
-    .el-table{
+    .evalRule125Table{
+        .el-table__body-wrapper{
+            height: 53vh !important;
+        }
+    }
+    .evalRule100Table{
         .el-table__body-wrapper{
             height: 60vh !important;
         }
+    }
+    .el-table{
         .el-input__inner{
             height: 30px !important;
         }

+ 21 - 5
src/components/evaluationSystem/partyBuildingKPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="partyBuildingK" v-loading="loadingImport">
         <div class="partyBuildingBtn">
-            <div class="collectSeach">
+            <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
                     <span class="exceedSpan">业务属性:</span>
                     <el-select v-model="sectionStr" placeholder="请选择业务属性">
@@ -19,7 +19,7 @@
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
-            <div class="PeriodBtn">
+            <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
                 :showImport="true"
                 :showExport="true"
@@ -38,7 +38,8 @@
                 ></btns>
             </div>
             <div class="partyBuildingTableData">
-                <el-table :data="partyBuildingData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                <el-table :data="partyBuildingData" style="width: 100%" :class="partyBuildTableSty()"
+                 @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="序号" type="index" />
                     <el-table-column label="单位名称" prop="organizationName" width="300" />
@@ -163,7 +164,8 @@ export default {
                 total: 0
             },
             evalradio: {},
-            loadingImport: false
+            loadingImport: false,
+            winPix: window.devicePixelRatio,
         }
     },
     created() {
@@ -348,6 +350,13 @@ export default {
         handleExport() {
             this.$utils.downloadPer('party-building-multiplier/export1', '党建考核系数信息数据.xlsx')
         },
+        partyBuildTableSty() {
+            if (this.winPix === 1.25) {
+                return 'partyBuild125Table'
+            } else {
+                return 'partyBuild100Table'
+            }
+        }
     }
 }
 </script>
@@ -415,10 +424,17 @@ export default {
             }
         }
         .partyBuildingTableData{
-            .el-table{
+            .partyBuild125Table{
+                .el-table__body-wrapper{
+                    height: 53vh !important;
+                }
+            }
+            .partyBuild100Table{
                 .el-table__body-wrapper{
                     height: 60vh !important;
                 }
+            }
+            .el-table{
                 .el-input__inner{
                     height: 30px !important;
                 }

+ 1 - 2
src/components/evaluationknowledgePage/earlyWarningRulePage.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="earlyWarningRules" v-loading="loadingImport">
+    <div class="earlyWarningRules">
         <div class="earlyWarningRulesBtn">
             <div class="collectSeach" :style="$utils.collectSeachSty()">
                 <div class="exceed">
@@ -333,7 +333,6 @@ export default {
                     { required: true, message: '请输入描述', trigger: 'blur' }
                 ]
             },
-            loadingImport: false,
             earlyWarningRulesData:[],
             page:{
                 pagesize: 12,

+ 7 - 0
src/components/taskCenter/taskApplicationFrom.vue

@@ -44,6 +44,12 @@
                             <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                     </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">评定等级:</span>
+                            <span>{{receiptMsg.ratingGrade}}</span>
+                        </div>
+                    </el-col>
                 </el-row>
                 <div class="btnASeach">
                     <!-- <div class="detaTableBtns">
@@ -226,6 +232,7 @@ export default {
                         code: row.orderNumber,
                         des: row.des,
                         stage: row.stage,
+                        ratingGrade: row.ratingGrade,
                         createName: row.createName,
                         createDate: row.createTime,
                         type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',