问题修改

src/api/api.js

@@ -157,6 +157,13 @@ export function apiGettaskevalStartDetail(params) {
         params: params
     })
 }
+//----------e办公根据任务ID获取任务信息
+export function apiPosteProGetTaskInfo(params) {
+    return httpRequest({
+        url: `workflow/getTaskData?taskId=${params.taskId}`,
+        method: 'post'
+    })
+}
 
 //----------任务处理-获取考评启动头部详情
 export function apiGetHeaderDeptResponsibility(params) {

src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -239,6 +239,7 @@ export default {
             evaluationSeasonDataRight: [],
             optionArr: [],
             optionName: '',
+            newyearData: '',
             yearData: '',
             seasonData: '',
             topImg: topImg,
@@ -277,14 +278,15 @@ export default {
         ]
     },
     methods: {
-        init(name, year, season) {
+        init(name, newyear, year, season) {
             this.dialogVisible = true
             this.optionName = name
+            this.newyearData = newyear
             this.yearData = year
             this.seasonData = season
             this.evaluationSeasonDataLeft = []
             this.evaluationSeasonDataRight = []
-            this.getYearData(name, year, season)
+            this.getYearData(name, newyear, year, season)
         },
         seasonWidth() {
             if (this.innerWidth < 1800) {
@@ -312,12 +314,13 @@ export default {
         changeOption(val) {
             this.evaluationSeasonDataLeft = []
             this.evaluationSeasonDataRight = []
-            this.getYearData(val, this.yearData, this.seasonData)
+            this.getYearData(val, this.newyearData, this.yearData, this.seasonData)
         },
-        getYearData(name, year, season) {
+        getYearData(name, newyear, year, season) {
             let that = this
             let params = {
                 binSection: name,
+                newyear: newyear,
                 year: year,
                 season: season === '第一季度' ? '1' : season === '第二季度' ? '2' : '3'
             }

src/components/gateWay/gatewayNewYearFrom.vue

@@ -98,6 +98,7 @@ export default {
             evaluationYearDataRight: [],
             optionArr: [],
             optionName: '',
+            newyearData: '',
             yearData: '',
             seasonData: '',
             winPix: window.devicePixelRatio,
@@ -133,9 +134,10 @@ export default {
         ]
     },
     methods: {
-        init(name, year, season) {
+        init(name, newyear, year, season) {
             this.dialogVisible = true
             this.optionName = name
+            this.newyearData = newyear
             this.yearData = year
             this.seasonData = season
             this.evaluationYearDataLeft = []
@@ -178,12 +180,13 @@ export default {
         changeOption(val) {
             this.evaluationYearDataLeft = []
             this.evaluationYearDataRight = []
-            this.getYearData(val, this.yearData, this.seasonData)
+            this.getYearData(val, this.newyearData, this.yearData, this.seasonData)
         },
-        getYearData(name, year, season) {
+        getYearData(name, newyear, year, season) {
             let that = this
             let params = {
                 binSection: name,
+                newyear: newyear,
                 year: year,
                 season: season === '第一季度' ? '1' : season === '第二季度' ? '2' : '3'
             }

src/components/gatewaynNewPage.vue

@@ -3,17 +3,24 @@
         <el-row>
             <el-col :span="18" class="quarter">
                 <div class="searchFn">
-                    <el-date-picker v-model="changeYear" type="year" value-format="YYYY" placeholder="选择年份"
-                        @change="changeYearFn" :style="getPickerSty()" />
-                    <div class="quarterChoose">
-                        <el-icon :size="20" color="#3B7AD1" @click="arrowLeft">
-                            <ArrowLeft />
-                        </el-icon>
-                        <span class="choose">{{seasonStr}}</span>
-                        <el-icon :size="20" color="#3B7AD1" @click="arrowRight">
-                            <ArrowRight />
-                        </el-icon>
+                    <div class="searchFn_left">
+                        <el-date-picker v-model="changeNewYear" type="year" value-format="YYYY" placeholder="选择年份"
+                            @change="changeNewYearFn" :style="getPickerSty()" />
+                    </div>
+                    <div class="searchFn_right">
+                        <el-date-picker v-model="changeYear" type="year" value-format="YYYY" placeholder="选择年份"
+                            @change="changeYearFn" :style="getPickerSty()" />
+                        <div class="quarterChoose">
+                            <el-icon :size="20" color="#3B7AD1" @click="arrowLeft">
+                                <ArrowLeft />
+                            </el-icon>
+                            <span class="choose">{{seasonStr}}</span>
+                            <el-icon :size="20" color="#3B7AD1" @click="arrowRight">
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
                     </div>
+                    
                 </div>
                 <div class="tableHeader">
                     <div class="headerOne"></div>
@@ -350,6 +357,7 @@
                 topImg: topImg,
                 botImg: botImg,
                 cenImg: cenImg,
+                changeNewYear: '',
                 changeYear: '',
                 seasonStr: '',
                 seasonArr: ['第一季度', '第二季度', '第三季度'],
@@ -388,6 +396,7 @@
                 apiGetevaluationportalhomeSeason().then(datas => {
                     if (datas.success) {
                         if (datas.data) {
+                            that.changeNewYear = datas.data.newyear
                             that.changeYear = datas.data.year
                             if (datas.data.season === '1') {
                                 that.seasonStr = '第一季度'
@@ -454,8 +463,15 @@
                     return 'width: 3.4vw;padding: 5px 3px 0;'
                 }
             },
+            changeNewYearFn(val) {
+                this.changeNewYear = val
+                this.changeComYearFn()
+            },
             changeYearFn(val) {
                 this.changeYear = val
+                this.changeComYearFn()
+            },
+            changeComYearFn() {
                 this.cupDataYearArr = {
                     section: [],
                     integration: []
@@ -513,6 +529,7 @@
                 let that = this
                 let params = {
                     binSection: '',
+                    newyear: that.changeNewYear,
                     year: that.changeYear,
                     season: that.seasonStr === '第一季度' ? '1' : that.seasonStr === '第二季度' ? '2' : '3'
                 }
@@ -609,8 +626,6 @@
                                 }
                             }
                         })
-                        debugger
-
                         that.cupDataYearArr.section.forEach(item => {
                             for (let i in datas.data.season) {
                                 let it = datas.data.season[i]
@@ -693,9 +708,9 @@
             },
             yearSeeMore(name, type) {
                 if (type === 'year') {
-                    this.$refs.yearFrom.init(name, this.changeYear, this.seasonStr)
+                    this.$refs.yearFrom.init(name, this.changeNewYear, this.changeYear, this.seasonStr)
                 } else {
-                    this.$refs.seasonFrom.init(name, this.changeYear, this.seasonStr)
+                    this.$refs.seasonFrom.init(name, this.changeNewYear, this.changeYear, this.seasonStr)
                 }
             }
         }
@@ -720,6 +735,31 @@
                 height: 5vh;
                 display: flex;
                 border-bottom: 1px solid #E1E3EA;
+                .searchFn_left{
+                    width: 43%;
+                }
+                .searchFn_right{
+                    width: 57%;
+                    position: relative;
+                    
+                    .quarterChoose {
+                        position: absolute;
+                        left: 33%;
+                        top: 15px;
+                        width: 225px;
+                        display: flex;
+                        justify-content: space-around;
+
+                        .choose {
+                            position: relative;
+                            top: -1px;
+                        }
+
+                        .el-icon {
+                            cursor: pointer;
+                        }
+                    }
+                }
 
                 .el-date-editor--year {
                     width: 130px;
@@ -741,23 +781,6 @@
                     color: #fff;
                 }
 
-                .quarterChoose {
-                    position: relative;
-                    left: 33%;
-                    top: 15px;
-                    width: 225px;
-                    display: flex;
-                    justify-content: space-around;
-
-                    .choose {
-                        position: relative;
-                        top: -1px;
-                    }
-
-                    .el-icon {
-                        cursor: pointer;
-                    }
-                }
             }
 
             .tableHeader {

src/components/taskCenter/taskCenterPage.vue

@@ -68,6 +68,7 @@
 <script>
     import {
         apiPostTodoTaskList,
+        apiPosteProGetTaskInfo,
         apiPostgetInstanceAndChildren
     } from '../../api/api'
     import taskUnitRatingFrom from './taskUnitRatingFrom.vue'
@@ -142,9 +143,22 @@
             },
             iamTaskProcess(query) {
                 let obj = {
-                    instId: query.taskInfo
+                    instId: query.taskInfo,
+                    taskId: query.taskId
                 }
-                this.taskProcess(obj)
+                this.eProGetTaskInfo(obj)
+            },
+            // e办公获取任务信息
+            eProGetTaskInfo(obj) {
+                let that = this
+                let params = {
+                    taskId: obj.taskId
+                }
+                apiPosteProGetTaskInfo(params).then(datas => {
+                    if (datas && datas.data) {
+                        that.taskProcess(datas.data.task)
+                    }
+                })
             },
             taskProcess(row) {
                 let that = this

src/utils/baseUrl.js

@@ -10,7 +10,7 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        baseUrl.URL = "http://192.168.2.10:28800"
+        baseUrl.URL = "http://192.168.2.6:28800"
         // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break