Browse Source

考评报告页面新增搜索功能,并服务联调;修改考评报告详情页面内容;考评预警规则配置页面新增时将参数转码调取服务;配合后端修改发现的问题;

SunZehao 1 năm trước cách đây
mục cha
commit
9dbfc1451b

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

@@ -26,6 +26,10 @@
                         </el-option>
                     </el-select>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan">考评时间:</span>
+                    <el-date-picker v-model="resAnnual"  value-format="YYYY-MM" type="month" placeholder="选择时间" />
+                </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn">
@@ -44,7 +48,7 @@
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="报告名称" prop="evaluateReportName" width="330" />
                     <el-table-column label="业务属性" prop="binSectionName" />
-                    <el-table-column label="业务类别">
+                    <el-table-column label="考评周期">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
                             <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
@@ -91,6 +95,7 @@ export default {
         return {
             rescycle: '',
             resbinSection: '',
+            resAnnual: '',
             periodData: [],
             moduleData: [],
             changeDateSelect: [],
@@ -109,15 +114,24 @@ export default {
     },
     methods:{
         // 查询列表页面
-        getevaluStartList(type) {
+        getevaluStartList() {
             let that = this
+            let year = ''
+            let month = ''
+            if (that.resAnnual !== '') {
+                year = that.resAnnual.substring(0, that.resAnnual.indexOf('-'))
+                month = that.resAnnual.substring(that.resAnnual.indexOf('-')+1, that.resAnnual.length)
+                if (month<10) {
+                    month = month.substring(1, 2)
+                }
+            }
             let params = {
                 pageNum: that.page.currentPage,
-                pageSize: that.page.pagesize
-            }
-            if (type) {
-                params.responsibilityCode = that.rescode
-                params.des = that.resDes
+                pageSize: that.page.pagesize,
+                binSection: that.resbinSection,
+                checkCycle: that.rescycle,
+                year: year,
+                month: month
             }
             apiGetEvalReportList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -152,12 +166,13 @@ export default {
         },
         getSeachData() {
             this.page.currentPage = 1
-            this.getevaluStartList('seach')
+            this.getevaluStartList()
         },
         resetSeach() {
             this.page.currentPage = 1
             this.rescycle = ''
             this.resbinSection = ''
+            this.resAnnual = ''
             this.getevaluStartList()
         },
         handleSizeChange(val){

+ 6 - 5
src/components/assessment/evaluationReportTable.vue

@@ -1,10 +1,11 @@
 <template>
     <div class="reportTItem">
-        <el-dialog title="考评报告详情" v-model="editEvaluaVisible" width="90vw" :close-on-click-modal="false">
+        <el-dialog title="考评报告详情" v-model="editEvaluaVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="reportTAll">
                 <div class="reportTBtn">
                     <div class="PeriodBtn">
-                        <el-row :gutter="10" style="padding-left: 10px;">
+                        <p style="font-size: 14px">{{rowevalradio.evaluateReportName}}</p>
+                        <el-row :gutter="10" style="padding-left: 10px;position: relative;right: -39vw;">
                             <el-col :span="1.5">
                                 <el-button
                                 type="warning"
@@ -116,7 +117,7 @@ export default {
 .reportTItem{
     .el-overlay{
         .el-dialog{
-            margin-top: 5vh !important;
+            // margin-top: 5vh !important;
             .el-dialog__body{
                 padding: 0 20px 30px 20px !important;
                 .reportTAll{
@@ -127,7 +128,7 @@ export default {
                         padding: 10px 20px 0 20px;
                         .PeriodBtn{
                             display: flex;
-                            justify-content: end;
+                            justify-content: center;
                             padding: 20px 0;
                             .el-button{
                                 height: 30px;
@@ -144,7 +145,7 @@ export default {
                     .reportTTableData{
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 60vh !important;
+                                height: 65vh !important;
                             }
                             .el-input__inner{
                                 height: 30px !important;

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

@@ -485,7 +485,7 @@ export default {
                     warningLevel: '',
                     warningType: '',
                     warningDate: '',
-                    isEnable: isEnable,
+                    isEnable: true,
                     representation: '',
                     desc: ''
                 }
@@ -528,7 +528,7 @@ export default {
                 type: that.ruleForm.warningType,
                 cronTime: that.ruleForm.warningDate+' 00:00:00',
                 enable: that.ruleForm.isEnable,
-                expression: that.ruleForm.representation,
+                expression: encodeURI(that.ruleForm.representation),
                 ruleDes: that.ruleForm.desc
             }
             if (that.isSave) {