瀏覽代碼

首页参数问题修改及样式调整;调整测试环境及生产环境菜单配置;业绩考核系数配置页面,党建考核系数配置页面按照业务需要增加搜索功能;

SunZehao 1 年之前
父節點
當前提交
654415ba29

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

@@ -1,11 +1,15 @@
 <template>
-    <div class="achievement" v-loading="loadingImport">
+    <div class="achievement">
         <div class="achievementBtn">
             <div class="collectSeach">
                 <div class="exceed">
                     <span class="exceedSpan">业务编码:</span>
                     <el-input v-model="coefficientStr" placeholder="请输入业务编码"></el-input>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan" style="width: 80px">考评时间:</span>
+                    <el-date-picker v-model="resAnnual"  value-format="YYYY" type="year" placeholder="选择时间" />
+                </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn">
@@ -247,6 +251,7 @@ export default {
             changeDateSelect: [],
             changeTableSelect: [],
             coefficientStr: '',
+            resAnnual: '',
             achievementData:[],
             departmentDataAll: [],
             weightAllocation: [],
@@ -263,11 +268,11 @@ export default {
                 total: 0
             },
             evalradio: {},
-            loadingImport: false,
             activeName: 'first',
         }
     },
     created() {
+        this.resAnnual = new Date().getFullYear().toString()
         this.getachievementData()
         this.getDepartmentFromTreeData()
         this.getOrganizetionData()
@@ -280,7 +285,8 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                coefficientCode: that.coefficientStr
+                coefficientCode: that.coefficientStr,
+                year: that.resAnnual
             }
             apiGetyeargroupcoefficientList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -516,6 +522,7 @@ export default {
         resetSeach() {
             this.page.currentPage = 1
             this.coefficientStr = ''
+            this.resAnnual = ''
             this.getachievementData()
         },
         handleSizeChange(val){
@@ -555,8 +562,9 @@ export default {
                     }
                     .el-input{
                         margin-right:10px;
+                        height: 40px;
                         .el-input__inner{
-                            height:30px;
+                            height:40px;
                         }
                         .el-input__suffix{
                             .el-select__caret{

+ 23 - 13
src/components/evaluationSystem/partyBuildingKPage.vue

@@ -13,6 +13,10 @@
                         </el-option>
                     </el-select>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan">考评时间:</span>
+                    <el-date-picker v-model="resAnnual"  value-format="YYYY" type="year" placeholder="选择时间" />
+                </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn">
@@ -124,6 +128,7 @@ export default {
             isSave: false,
             changeDateSelect: [],
             sectionStr: '',
+            resAnnual: '',
             partyBuildingData:[],
             departmentDataAll: [],
             companyDatas: [],
@@ -162,6 +167,7 @@ export default {
         }
     },
     created() {
+        this.resAnnual = new Date().getFullYear().toString()
         this.getpartyBuildingData()
         this.getOrganizetionData()
         this.getBinSectionS()
@@ -172,7 +178,8 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                sectionId: that.sectionStr
+                sectionId: that.sectionStr,
+                year: that.resAnnual
             }
             apiGetpartybuildingList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -318,6 +325,7 @@ export default {
         resetSeach() {
             this.page.currentPage = 1
             this.sectionStr = ''
+            this.resAnnual = ''
             this.getpartyBuildingData()
         },
         successImport(val) {
@@ -363,10 +371,23 @@ export default {
                         line-height: 12px;
                         margin-top: 14px;
                     }
+                    .el-select{
+                        margin-right:10px;
+                        line-height: 40px !important;
+                        .el-input__inner, .is-disabled{
+                            height:40px !important;
+                        }
+                        .el-input__suffix{
+                            .el-select__caret{
+                                line-height:40px;
+                            }
+                        }
+                    }
                     .el-input{
                         margin-right:10px;
+                        height: 40px;
                         .el-input__inner{
-                            height:30px;
+                            height:40px;
                         }
                         .el-input__suffix{
                             .el-select__caret{
@@ -375,17 +396,6 @@ export default {
                         }
                     }
                 }
-                .el-select{
-                    margin-right:10px;
-                    .el-input__inner{
-                        height:30px;
-                    }
-                    .el-input__suffix{
-                        .el-select__caret{
-                            line-height:30px;
-                        }
-                    }
-                }
         }
         span{
             font-size:14px;

+ 1 - 1
src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -246,7 +246,7 @@ export default {
             },
             {
                 label: '海外业务',
-                value: 'GJYE'
+                value: 'GJYW'
             },
             {
                 label: '煤电一体化',

+ 58 - 55
src/components/gateWay/gatewayNewYearFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="annualLeagueTable">
-        <el-dialog v-model="dialogVisible" :width="evaluationYearDataRight.length>0?'50vw':'26vw'" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" :width="evaluationYearDataRight.length>0?'50vw':'28vw'" :close-on-click-modal="false">
             <template #header>
                 <div class="yearHeader">
                     <span style="font-size:14px;color:#fff">年度排行榜</span>
@@ -98,7 +98,7 @@ export default {
             },
             {
                 label: '海外业务',
-                value: 'GJYE'
+                value: 'GJYW'
             }
         ]
     },
@@ -168,63 +168,66 @@ export default {
                     }
                 }
             }
-            .yearFrom{
-                padding: 0 20px;
-                .yearFromHeader{
-                    width: 100%;
-                    border-bottom: 1px solid #E1E3EA;
-                    .headerNameTit{
-                        display: flex;
-                        justify-content: space-between;
-                        padding: 8px 20px;
-                        font-size: 14px;
-                        color: #414141;
-                    }
-                    .headerTit{
-                        position: relative;
-                        top: 10px;
-                        left: 150px;
-                    }
-                }
-                .yearFromMsg{
-                    display: flex;
-                    width: 100%;
-                    height: 35px;
-                    background: #F6F7FA;
-                    margin: 5px 8px;
-                    padding: 2px 10px 0;
-                    border-radius: 5px;
-                    .msgProgress{
-                        margin-top: 5px;
-                        display: flex;
+            .el-dialog__body{
+                padding: 20px 0;
+                .yearFrom{
+                    padding: 0 20px;
+                    .yearFromHeader{
                         width: 100%;
-                        span{
+                        border-bottom: 1px solid #E1E3EA;
+                        .headerNameTit{
+                            display: flex;
+                            justify-content: space-between;
+                            padding: 8px 20px;
                             font-size: 14px;
-                            font-family: Microsoft YaHei;
-                        }
-                        span:nth-child(1){
-                            display: inline-block;
-                            width: 10%;
-                            font-weight: 600;
-                            color: #666;
-                            margin-left: 10px;
-                        }
-                        span:nth-child(2){
-                            display: inline-block;
-                            width: 68%;
-                            font-weight: 400;
-                            color: #666;
-                            margin-right: 10px;
+                            color: #414141;
                         }
-                        span:nth-child(3){
-                            font-weight: 600;
-                            margin-right: 30px;
-                            color: #F65177;
+                        .headerTit{
+                            position: relative;
+                            top: 10px;
+                            left: 150px;
                         }
-                        span:nth-child(4){
-                            width: 10%;
-                            font-weight: 600;
-                            color: #666;
+                    }
+                    .yearFromMsg{
+                        display: flex;
+                        width: 100%;
+                        height: 35px;
+                        background: #F6F7FA;
+                        margin: 5px 8px;
+                        padding: 2px 10px 0;
+                        border-radius: 5px;
+                        .msgProgress{
+                            margin-top: 5px;
+                            display: flex;
+                            width: 100%;
+                            span{
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                            }
+                            span:nth-child(1){
+                                display: inline-block;
+                                width: 10%;
+                                font-weight: 600;
+                                color: #666;
+                                margin-left: 10px;
+                            }
+                            span:nth-child(2){
+                                display: inline-block;
+                                width: 68%;
+                                font-weight: 400;
+                                color: #666;
+                                margin-right: 20px;
+                            }
+                            span:nth-child(3){
+                                font-weight: 600;
+                                margin-right: 30px;
+                                color: #F65177;
+                            }
+                            span:nth-child(4){
+                                // width: 10%;
+                                font-weight: 600;
+                                color: #666;
+                            }
                         }
                     }
                 }

+ 1 - 1
src/components/gatewaynNewPage.vue

@@ -432,7 +432,7 @@ export default {
             }
             apiGetevaluationportallist(params).then(datas =>{
                 if (datas && datas.data) {
-                    let secArr = ['HD', 'SD', 'XNYFG', 'GJYE', 'MDYTH']
+                    let secArr = ['HD', 'SD', 'XNYFG', 'GJYW', 'MDYTH']
                     secArr.forEach(item =>{
                         for(let i in datas.data.year) {
                             let it = datas.data.year[i]