问题修改，样式调整；登录常规功能增加；

src/api/api.js

@@ -214,15 +214,22 @@ export function apiPostgetInstanceAndChildren(params) {
         params: params
     })
 }
-//----------任务处理-详情
-export function apiGettaskDetail(params) {
+//----------任务处理-获取考评启动详情
+export function apiGettaskevalStartDetail(params) {
     return httpRequest({
         url: 'dept-responsibility/getByidAndInfo',
         method: 'get',
         params: params
     })
 }
-
+//----------任务处理-获取考评启动详情
+export function apiGettaskmothAyearDetail(params) {
+    return httpRequest({
+        url: 'organization-evaluation/getByidAndInfo',
+        method: 'get',
+        params: params
+    })
+}
 
 
 //----------------------------------------考评体系配置------------------------------------------------

src/assets/css/main.css

@@ -233,4 +233,21 @@ a {
     font-family: Microsoft YaHei;
     font-weight: bold;
     color: #3B7AD1; 
+}
+.el-popper{
+    width: 300px;
+}
+.el-popper.is-customized {
+/* Set padding to ensure the height is 32px */
+padding: 6px 12px;
+/* background: linear-gradient(90deg, rgb(159, 229, 151), rgb(204, 229, 129)); */
+background: #3B7AD1;
+color: #fff;
+font-size: 14px;
+}
+
+.el-popper.is-customized .el-popper__arrow::before {
+/* background: linear-gradient(45deg, #b2e68d, #bce689); */
+background: #3B7AD1;
+right: 0;
 }

src/components/assessment/evaluationStartFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="考评启动详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog title="考评启动详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -219,7 +219,7 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 7vh;
+            // margin-top: 7vh;
             .el-dialog__body{
                 padding: 0 20px !important;
                 .startDetail{
@@ -272,7 +272,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 73vw;
+                        left: 90vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;
@@ -333,7 +333,7 @@ export default {
                         
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 40vh;
+                                height: 55vh;
                             }
                             .el-table__row{
                                 .cell{

src/components/assessment/evaluationStartPage.vue

@@ -31,7 +31,18 @@
                 <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="responsibilityCode" width="300" />
-                    <el-table-column label="考评单位" prop="organizationName" width="330" />
+                    <el-table-column label="考评单位" width="330">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.organizationName"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.organizationName}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
@@ -41,13 +52,23 @@
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
                     <el-table-column label="月度/季度" prop="month" />
-                    <el-table-column label="流程状态" prop="stage" />
-                    <el-table-column label="业务简述" prop="des" />
-                    <!-- <el-table-column label="综合得分" prop="checkCycle" /> -->
-                    <el-table-column label="考核开始时间" prop="beginDate" />
-                    <el-table-column label="考核截止时间" prop="endDate" />
-                    <!-- <el-table-column label="考评排名" prop="beginDate" />
-                    <el-table-column label="考评评级" prop="endDate" /> -->
+                    <el-table-column label="流程状态" prop="stage">
+                        <!-- <template #default="scope">
+                            <p class="indicitem" @click="seeStates(scope.row)">查看流程</p>
+                        </template> -->
+                    </el-table-column>
+                    <el-table-column label="业务简述" prop="des" width="230">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.des"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.des}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作">
                         <template #default="scope">
                             <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
@@ -121,6 +142,14 @@
                     </span>
                 </template>
             </el-dialog>
+            <el-dialog title="流程详情" v-model="statesVisible" width="70vw" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <iframe id="iframeContain" width="100%" height="100%" 
+                    frameborder="0" class="iframe" name="iframeContain"
+                    seamless scrolling="no" src="http://10.65.78.23:28900/#/login">            
+                    </iframe>
+                </div>
+            </el-dialog>
         </div>
         <start-from-list ref="startFromDetail"></start-from-list>
     </div>
@@ -140,6 +169,7 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            statesVisible: false,
             title: '',
             windframradio: {},
             deleteSelect: [],
@@ -330,6 +360,9 @@ export default {
         getDetail(row) {
             this.$refs.startFromDetail.init(row)
         },
+        seeStates(row) {
+            this.statesVisible = true
+        },
         getSeachData() {
             this.page.currentPage = 1
             this.getevaluStartList('seach')
@@ -453,6 +486,20 @@ export default {
                 .el-radio__label{
                     display: none;
                 }
+                .tooltipCC{
+                    width: 300px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .tooltipCCDes{
+                    width: 200px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
                 .indicitem{
                     color: #409EFF;
                     font-size: 12px;
@@ -481,6 +528,10 @@ export default {
                             height: 30px;
                         }
                     }
+                    .flowSty{
+                        width: 100%;
+                        height: 70vh;
+                    }
                 }
             }
         }

src/components/assessment/evaluationYearFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="月/季度考评详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog title="月/季度考评详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -73,8 +73,9 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" />
+                            <el-table-column label="指标项" prop="optionName" />
+                            <el-table-column label="值" width="150">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
                                 </template>
@@ -90,8 +91,9 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门" prop="deptName" width="260" />                                
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" />
+                            <el-table-column label="指标项" prop="optionName" />
+                            <el-table-column label="值" width="150">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" />
                                 </template>
@@ -219,7 +221,7 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 7vh;
+            // margin-top: 7vh;
             .el-dialog__body{
                 padding: 0 20px !important;
                 .startDetail{
@@ -272,7 +274,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 73vw;
+                        left: 90vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;
@@ -333,7 +335,7 @@ export default {
                         
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 40vh;
+                                height: 55vh;
                             }
                             .el-table__row{
                                 .cell{

src/components/assessment/evaluationYearPage.vue

@@ -31,7 +31,18 @@
                 <el-table :data="evaluationYearData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
-                    <el-table-column label="考评单位" prop="organizationName" width="330" />
+                    <el-table-column label="考评单位" width="330">                        
+                        <template #default="scope">
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.organizationName"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.organizationName}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
@@ -42,12 +53,18 @@
                     <el-table-column label="年度" prop="year" />
                     <el-table-column label="月度/季度" prop="month" />
                     <el-table-column label="流程状态" prop="stage" />
-                    <el-table-column label="业务简述" prop="des" />
-                    <!-- <el-table-column label="综合得分" prop="checkCycle" /> -->
-                    <el-table-column label="考核开始时间" prop="beginDate" />
-                    <el-table-column label="考核截止时间" prop="endDate" />
-                    <!-- <el-table-column label="考评排名" prop="beginDate" />
-                    <el-table-column label="考评评级" prop="endDate" /> -->
+                    <el-table-column label="业务简述" prop="des" width="230">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.des"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.des}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作">
                         <template #default="scope">
                             <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
@@ -435,6 +452,20 @@ export default {
                 .el-radio__label{
                     display: none;
                 }
+                .tooltipCC{
+                    width: 300px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .tooltipCCDes{
+                    width: 200px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
                 .indicitem{
                     color: #409EFF;
                     font-size: 12px;

src/components/assessment/monthQuarterFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="月/季度考评详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog title="月/季度考评详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -73,8 +73,9 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" />
+                            <el-table-column label="指标项" prop="optionName" />
+                            <el-table-column label="值" width="150">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
                                 </template>
@@ -90,8 +91,9 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门" prop="deptName" width="260" />                                
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" />
+                            <el-table-column label="指标项" prop="optionName" />
+                            <el-table-column label="值" width="150">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" />
                                 </template>
@@ -219,7 +221,7 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 7vh;
+            // margin-top: 7vh;
             .el-dialog__body{
                 padding: 0 20px !important;
                 .startDetail{
@@ -272,7 +274,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 73vw;
+                        left: 90vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;
@@ -333,7 +335,7 @@ export default {
                         
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 40vh;
+                                height: 55vh;
                             }
                             .el-table__row{
                                 .cell{

src/components/assessment/monthQuarterPage.vue

@@ -31,7 +31,18 @@
                 <el-table :data="monthQuarterData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
-                    <el-table-column label="考评单位" prop="organizationName" width="330" />
+                    <el-table-column label="考评单位" width="330">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="tooltipName"
+                                effect="customized"
+                                :content="scope.row.organizationName"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.organizationName}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
@@ -42,12 +53,18 @@
                     <el-table-column label="年度" prop="year" />
                     <el-table-column label="月度/季度" prop="month" />
                     <el-table-column label="流程状态" prop="stage" />
-                    <el-table-column label="业务简述" prop="des" />
-                    <!-- <el-table-column label="综合得分" prop="checkCycle" /> -->
-                    <el-table-column label="考核开始时间" prop="beginDate" />
-                    <el-table-column label="考核截止时间" prop="endDate" />
-                    <!-- <el-table-column label="考评排名" prop="beginDate" />
-                    <el-table-column label="考评评级" prop="endDate" /> -->
+                    <el-table-column label="业务简述" width="230">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="tooltipDes"
+                                effect="customized"
+                                :content="scope.row.des"
+                                placement="top"
+                            >
+                                <span class="tooltipCCDes">{{scope.row.des}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作">
                         <template #default="scope">
                             <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
@@ -441,6 +458,20 @@ export default {
                 .el-radio__label{
                     display: none;
                 }
+                .tooltipCC{
+                    width: 300px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .tooltipCCDes{
+                    width: 200px;
+                    display: inline-block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
                 .indicitem{
                     color: #409EFF;
                     font-size: 12px;

src/components/gatewayPage.vue

@@ -1,16 +1,17 @@
 <template>
     <div class="gatewayPage">
         <el-row class="gateway_top">
-            <el-col :span="6" v-for="it in titleMsgArr" :key="it.isClass">
-                <div class="comClass" :class="it.isClass">
+            <el-col :span="6" v-for="it in titleMsgArr" :key="it.isClass" @click="changeTit(it)">
+                <div class="comClass" :class="!it.showClick ? it.isClass : it.isClassC">
                     <div class="huodian_tit">
-                        <img :src="it.img">
-                        <span>{{it.isName}}</span>
+                        <img :src="it.img" v-if="!it.showClick">
+                        <img :src="it.clickImg" v-else>
+                        <span :style="!it.showClick?'color: #333;': 'color: #fff;'">{{it.isName}}</span>
                     </div>
                     <div class="huodian_main">
                         <div v-for="item in huodianArr" :key="item" style="margin-right: 15px">
-                            <p :style="{'color': it.color}">{{item.Num}}</p>
-                            <p>{{item.Name}}</p>
+                            <p :style="!it.showClick ? {'color': it.color} : 'color: #fff;'">{{item.Num}}</p>
+                            <p :style="!it.showClick?'color: #999;': 'color: #fff;'">{{item.Name}}</p>
                         </div>
                     </div>
                 </div>
@@ -151,6 +152,11 @@ import shuidian from '../assets/getwayImg/shuidianIcon.png'
 import xinnengyuan from '../assets/getwayImg/xinnengyuanIcon.png'
 import meidian from '../assets/getwayImg/meidianIcon.png'
 
+import huodianC from '../assets/getwayImg/huodianIconC.png'
+import shuidianC from '../assets/getwayImg/shuidianIconC.png'
+import xinnengyuanC from '../assets/getwayImg/xinnengyuanIconC.png'
+import meidianC from '../assets/getwayImg/meidianIconC.png'
+
 import cup1 from '../assets/getwayImg/cup1.png'
 import cup2 from '../assets/getwayImg/cup2.png'
 import cup3 from '../assets/getwayImg/cup3.png'
@@ -175,27 +181,39 @@ export default {
         this.titleMsgArr = [
             {
                 isClass: 'huodian',
+                isClassC: 'huodianC',
                 isName: '火电',
                 img: huodian,
-                color: '#F65177'
+                clickImg: huodianC,
+                color: '#F65177',
+                showClick: false
             },
             {
                 isClass: 'shuidian',
+                isClassC: 'shuidianC',
                 isName: '水电',
                 img: shuidian,
-                color: '#3B7AD1'
+                clickImg: shuidianC,
+                color: '#3B7AD1',
+                showClick: false
             },
             {
                 isClass: 'xinnengyuan',
+                isClassC: 'xinnengyuanC',
                 isName: '新能源',
                 img: xinnengyuan,
-                color: '#50C14E'
+                clickImg: xinnengyuanC,
+                color: '#50C14E',
+                showClick: false
             },
             {
                 isClass: 'meidian',
+                isClassC: 'meidianC',
                 isName: '煤电一体化',
                 img: meidian,
-                color: '#F5A623'
+                clickImg: meidianC,
+                color: '#F5A623',
+                showClick: false
             },
         ]
         this.huodianArr = [
@@ -394,6 +412,14 @@ export default {
 
     },
     methods: {
+        changeTit(it) {
+            this.titleMsgArr.forEach(item =>{
+                item.showClick = false
+                if (item.isName === it.isName) {
+                    item.showClick = true
+                }
+            })
+        }
     }
 }
 </script>
@@ -418,7 +444,7 @@ export default {
                     font-size: 16px;
                     font-family: Microsoft YaHei;
                     font-weight: bold;
-                    color: #333333;
+                    
                 }
             }
             .huodian_main{
@@ -433,22 +459,33 @@ export default {
                     font-size: 14px;
                     font-family: Microsoft YaHei;
                     font-weight: 400;
-                    color: #999999;
                 }
             }
         }
         .huodian{
             background-image: url('../assets/getwayImg/huodian.png');
         }
+        .huodianC{
+            background-image: url('../assets/getwayImg/huodianC.png');
+        }
         .shuidian{
             background-image: url('../assets/getwayImg/shuidian.png');
         }
+        .shuidianC{
+            background-image: url('../assets/getwayImg/shuidianC.png');
+        }
         .xinnengyuan{
             background-image: url('../assets/getwayImg/xinnengyuan.png');
         }
+        .xinnengyuanC{
+            background-image: url('../assets/getwayImg/xinnengyuanC.png');
+        }
         .meidian{
             background-image: url('../assets/getwayImg/meidian.png');
         }
+        .meidianC{
+            background-image: url('../assets/getwayImg/meidianC.png');
+        }
     }
     .gateway_bot{
         padding: 24px 0 16px 26px;

src/components/knowledgePage/scoringRulesPage.vue

@@ -37,14 +37,25 @@
             <div class="scoringRulesTableData">
                 <el-table :data="scoringRulesData" style="width: 100%" @select="rowClick" @select-all="allSelect">
                     <el-table-column type="selection" label="操作" align="center" />
-                    <el-table-column label="规则名称" prop="scoreRuleName" width="200" />
+                    <el-table-column label="规则名称" prop="scoreRuleName" />
                     <el-table-column label="业务属性" prop="businessName"  width="200" />
                     <el-table-column label="指标名称" width="300">
                         <template #default="scope">
                             <span>{{scope.row.indicatorNames.join(',')}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="描述" prop="describe" />
+                    <el-table-column label="描述">
+                        <template #default="scope">
+                            <el-tooltip
+                                class="box-item"
+                                effect="customized"
+                                :content="scope.row.describe"
+                                placement="top"
+                            >
+                                <span class="tooltipCC">{{scope.row.describe}}</span>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="100">
                         <template #default="scope">
                             <p class="indicitem" @click="scoringRuleDetail(scope.row)">详情</p>
@@ -402,6 +413,13 @@ export default {
             .el-radio__label{
                 display: none;
             }
+            .tooltipCC{
+                width: 400px;
+                display: inline-block;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
             .indicitem{
                 color: #409EFF;
                 font-size: 12px;

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="任务详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog title="任务详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -65,16 +65,16 @@
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
-                        <el-table :data="quantifiedList" style="width: 100%" @select="rowClick" @select-all="rowClick">
-                            <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                        <el-table :data="quantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="业务类别" prop="stageName" />
                             <el-table-column label="所属板块" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" v-if="instanceChild.defKey === 'yddwkplc'" />
+                            <el-table-column label="指标项" prop="optionName" v-if="instanceChild.defKey === 'yddwkplc'" />
+                            <el-table-column label="计划值" width="150">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
                                 </template>
@@ -90,8 +90,9 @@
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门" prop="deptName" width="260" />                                
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
-                            <el-table-column label="计划值">
+                            <el-table-column label="指标名称" prop="childName" v-if="instanceChild.defKey === 'yddwkplc'" />
+                            <el-table-column label="指标项" prop="optionName" v-if="instanceChild.defKey === 'yddwkplc'" />
+                            <el-table-column label="计划值" width="150">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" />
                                 </template>
@@ -115,7 +116,7 @@
 </template>
 
 <script>
-import {apiGettaskDetail,apiGetindicatorsaveBatchDto, apiPostIsdoAction, apiPostgetInstanceAndChildren} from '../../api/api'
+import {apiGettaskevalStartDetail,apiGettaskmothAyearDetail,apiGetindicatorsaveBatchDto, apiPostIsdoAction, apiPostgetInstanceAndChildren} from '../../api/api'
 import addIcon from '../../assets/btnIcon/add.png'
 import saveIcon from '../../assets/btnIcon/save.png'
 import editIcon from '../../assets/btnIcon/edit.png'
@@ -144,7 +145,8 @@ export default {
             editIcon: editIcon,
             deleteIcon: deleteIcon,
             rowMsg: {},
-            descMsg: ''
+            descMsg: '',
+            instanceChild: {}
         }
     },
     created() {
@@ -153,15 +155,13 @@ export default {
         init(row) {
             this.dialogVisible = true
             this.activeName = 'first'
+            this.instanceChild = {}
             this.getTaskId(row)
             this.rowMsg = row
         },
         handleClick() {
             this.changeDateSelect = []
         },
-        rowClick(selection, row) {
-            this.changeDateSelect = selection
-        },
         // 根据流程ID获取业务ID
         getTaskId(row) {
             let that = this
@@ -171,34 +171,44 @@ export default {
             }
             apiPostgetInstanceAndChildren(params).then(datas =>{
                 if (datas && datas.data) {
+                    that.instanceChild = datas.data.data.bpmInstance
                     let keyId = datas.data.data.bpmInstance.bizKey
-                    that.getDetails(keyId)
+                    that.getevalStartDetails(keyId, that.instanceChild.defKey)
                 }
             })
         },
         //获取详情
-        getDetails(id) {
+        getevalStartDetails(id, defKey) {
             let that = this
             let params = {
                 id: id
             }
-            apiGettaskDetail(params).then(datas =>{
-                if (datas && datas.data) {
-                    let item = datas.data
-                    that.receiptMsg = {
-                        code: item.responsibilityCode,
-                        des: item.des,
-                        stage: item.stage,
-                        creator: item.createBy,
-                        createDate: item.createTime,
-                        type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
-                        year: item.year,
-                        recStage: '有效'
-                    }
-                    that.quantifiedList = item.map.quantifiedList
-                    that.nonQuantifiedList = item.map.nonQuantifiedList
+            if (defKey === 'yddwkplc') {
+                apiGettaskmothAyearDetail(params).then(datas =>{
+                    that.getDataMsg('yddwkplc', datas)
+                })
+            } else if(defKey === 'dwkpmbqd') {
+                apiGettaskevalStartDetail(params).then(datas =>{
+                    that.getDataMsg('dwkpmbqd', datas)
+                })
+            }
+        },
+        getDataMsg(type, datas) {
+            if (datas && datas.data) {
+                let item = datas.data
+                this.receiptMsg = {
+                    code: type === 'dwkpmbqd'?item.responsibilityCode:item.organizationEvaluationCode,
+                    des: item.des,
+                    stage: item.stage,
+                    creator: item.createBy,
+                    createDate: item.createTime,
+                    type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                    year: item.year,
+                    recStage: '有效'
                 }
-            })
+                this.quantifiedList = item.map.quantifiedList
+                this.nonQuantifiedList = item.map.nonQuantifiedList
+            }
         },
         saveDetail() {
             let that = this
@@ -240,17 +250,25 @@ export default {
                 action: type, //固定值
                 instanceId: that.rowMsg.instId, //流程实例ID
                 opinion: that.descMsg, //审批意见
-                iamCode: getToken('code') //认证后code值
+                iamCode: getToken('code'), //认证后code值
+                taskName: that.rowMsg.name,
+                defKey: that.instanceChild.defKey,
+                bizKey: that.instanceChild.bizKey
             }
             apiPostIsdoAction(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.$message({
-                        message: datas.data.data,
-                        type: 'success'
-                    })
                     if (datas.data.isOk) {
+                        that.$message({
+                            message: datas.data.data,
+                            type: 'success'
+                        })
                         that.dialogVisible = false
                         that.$emit('approveMsg', datas.data.isOk)
+                    } else {
+                        that.$message({
+                            message: datas.data.msg,
+                            type: 'error'
+                        })
                     }
                 }
             })
@@ -263,7 +281,6 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 7vh;
             .el-dialog__body{
                 padding: 0 20px !important;
                 .startDetail{
@@ -316,7 +333,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 73vw;
+                        left: 90vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;
@@ -377,7 +394,7 @@ export default {
                         
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 30vh;
+                                height: 40vh !important;
                             }
                             .el-table__row{
                                 .cell{

src/components/taskCenter/taskCenterPage.vue

@@ -49,13 +49,13 @@
                 layout="total, prev, pager, next, jumper"
                 :total="page.total">
             </el-pagination>
+            <el-dialog title="流程详情" v-model="workflowVisible" width="70vw" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <iframe id="iframeContain" width="100%" height="100%" frameborder="0" class="iframe" name="iframeContain" seamless scrolling="no" :src="iframeURL">            
+                    </iframe>
+                </div>
+            </el-dialog>
         </div>        
-        <el-dialog title="流程详情" v-model="workflowVisible" width="70vw" :close-on-click-modal="false">
-            <div class="flowSty">
-                <iframe id="iframeContain" width="100%" height="100%" frameborder="0" class="iframe" name="iframeContain" seamless scrolling="no" :src="iframeURL">            
-                </iframe>
-            </div>
-        </el-dialog>
         <task-center-evl ref="taskCenterEvl" @approveMsg="approveMsg"></task-center-evl>
     </div>
 </template>
@@ -158,14 +158,14 @@ export default {
             text-align: end;
             position: relative;
         }
-    }
-    .el-overlay{
-        .el-dialog{
-            margin-top: 8vh !important;
-            .el-dialog__body{
-                .flowSty{
-                    width: 100%;
-                    height: 70vh;
+        .el-overlay{
+            .el-dialog{
+                margin-top: 8vh !important;
+                .el-dialog__body{
+                    .flowSty{
+                        width: 100%;
+                        height: 70vh;
+                    }
                 }
             }
         }

src/views/Login.vue

@@ -15,11 +15,18 @@
                 <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
             </div>
             <div class="remeber">
-                    <el-checkbox v-model="ememberMe" disabled>记住密码</el-checkbox>
+                <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
             </div>
-            <div class="loginBtn" @click="handleLogin">
+             <!-- v-if="!loginLoading"  v-else -->
+            <div class="loginBtn" @click="handleLogin" v-if="!loginLoading">
                 <span class="loginSpan">登录</span>
             </div>
+            <div class="loginBtn" v-else>
+                <div class="loading">
+                    <el-icon color="#fff"><Loading /></el-icon>
+                    <span class="loadingSpan">登录</span>
+                </div>
+            </div>
         </div>
         <!--  底部  -->
             <!-- <div class="loginFooter">
@@ -41,29 +48,58 @@ export default {
             codeUrl:'',
             ememberMe:false,
             loading:false,
-            loginText: ''
+            loginText: '',
+            loginLoading: false
         }
     },
     created() {
+        if (window.localStorage.getItem('userData')) {
+            let userData = JSON.parse(window.localStorage.getItem('userData'))
+            this.inputUser = userData.user
+            this.inputMima = userData.password
+            this.ememberMe = true
+        } else {
+            this.ememberMe = false
+        }
     },
     methods:{
         handleLogin() {
             if (this.inputUser !== '' && this.inputMima !== '') {
+                this.loginLoading = true
+                if (this.ememberMe) {
+                    this.changeBox(this.ememberMe)
+                }
                 this.getLogin(this.inputUser, this.inputMima)
             } else {
                 ElMessage.error('请输入账号或密码');
             }
         },
+        changeBox(val) {
+            if (val) {
+                if (this.inputUser !== '' && this.inputMima !== '') {
+                    let obj = {
+                        user: this.inputUser,
+                        password: this.inputMima
+                    }
+                    window.localStorage.setItem('userData', JSON.stringify(obj))
+                }
+            } else {
+                window.localStorage.removeItem('userData')
+            }
+        },
         //登录接口
         getLogin(userName, password) {
             // setToken('userMsg', params)
             let that = this
             loginApi(userName, password).then(datas=>{
                 if (datas) {
-                    setToken('token', datas.data.access_token)
-                    that.getTokenCode(datas.data.access_token)
-                } else {
-                    ElMessage.error(datas.data.msg);
+                    if (datas.success) {
+                        setToken('token', datas.data.access_token)
+                        that.getTokenCode(datas.data.access_token)
+                    } else {
+                        ElMessage.error(datas.message);
+                        that.loginLoading = false
+                    }
                 }
             }).catch(e =>{
                 that.loading = false
@@ -205,6 +241,25 @@ export default {
                 font-weight: 400;
                 color: #FFFFFF;
             }
+            .loading{
+                display: flex;
+                justify-content: center;
+                padding-top: 13px;
+                .loadingSpan{
+                    position: relative;
+                    top: 2px;
+                    left: -9px;
+                    font-size: 18px;
+                    font-family: Microsoft YaHei;
+                    font-weight: 400;
+                    color: #FFFFFF;
+                }
+                .el-icon{
+                    position: relative;
+                    top: 7px;
+                    left: -12px;
+                }
+            }
         }
         input::-webkit-input-placeholder{ /*WebKit browsers*/
             color: #fff;