单位考评月季年页面新增查看任务详情；移动端新增登录页面

src/components/assessment/assessmentApplicationFrom.vue

@@ -70,6 +70,11 @@
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
                          style="width: 100%">
                             <el-table-column label="序号" type="index" width="80" />
+                            <el-table-column label="人员编号" prop="employeeNo">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.employeeNo" @blur="employeeNoInputBlur(scope.row.employeeNo, scope.row)" />
+                                </template>
+                            </el-table-column>
                             <el-table-column label="人员" prop="deptName">
                                 <template #default="scope">
                                     <el-select v-model="scope.row.employeeId" placeholder="请选择人员">
@@ -82,11 +87,6 @@
                                     </el-select>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="人员编号" prop="employeeNo">
-                                <template #default="scope">
-                                    <el-input v-model="scope.row.employeeNo" @blur="employeeNoInputBlur(scope.row.employeeNo, scope.row)" />
-                                </template>
-                            </el-table-column>
                             <el-table-column label="建议值">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
@@ -325,8 +325,8 @@ export default {
             //根据数据自己调整
             let colums = []
             colums = [
-                { header: 'ID', key: 'id', width: 26 },
-                { header: '申报ID', key: 'assessmentDeclarationId', width: 26 },
+                // { header: 'ID', key: 'id', width: 26, hidden: true },
+                { header: '申报ID', key: 'assessmentDeclarationId', width: 26, hidden: true },
                 { header: '人员编号', key: 'employeeNo', width: 26 },
                 // { header: '员工ID', key: 'employeeId', width: 26 },
                 { header: '员工名称', key: 'employeeName', width: 26 },

src/components/assessment/evaluationMonthPage.vue

@@ -149,6 +149,20 @@
                     </span>
                 </template>
             </el-dialog>
+            <el-dialog title="流程详情" v-model="statesVisible" :fullscreen="true" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <el-table :data="stageArr" style="width: 100%">
+                        <el-table-column type="index" label="序号" align="center" />
+                        <el-table-column label="任务名称" prop="taskName" />
+                        <el-table-column label="任务创建时间" prop="createTime" />
+                        <el-table-column label="任务处理时间" prop="approveTime" />
+                        <el-table-column label="候选人" prop="assignInfo" width="500" />
+                        <el-table-column label="执行人" prop="approverName" />
+                        <el-table-column label="处理状态" prop="status" />
+                        <el-table-column label="备注/意见" prop="opinion" />
+                    </el-table>
+                </div>
+            </el-dialog>
         </div>
         <start-from-list ref="startFromDetail"></start-from-list>
         <month-quarter-year-report ref="reportDia"></month-quarter-year-report>
@@ -172,6 +186,8 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            statesVisible: false,
+            stageArr: [],
             title: '',
             windframradio: {},
             deleteSelect: [],

src/components/assessment/evaluationQuarterPage.vue

@@ -150,6 +150,20 @@
                     </span>
                 </template>
             </el-dialog>
+            <el-dialog title="流程详情" v-model="statesVisible" :fullscreen="true" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <el-table :data="stageArr" style="width: 100%">
+                        <el-table-column type="index" label="序号" align="center" />
+                        <el-table-column label="任务名称" prop="taskName" />
+                        <el-table-column label="任务创建时间" prop="createTime" />
+                        <el-table-column label="任务处理时间" prop="approveTime" />
+                        <el-table-column label="候选人" prop="assignInfo" width="500" />
+                        <el-table-column label="执行人" prop="approverName" />
+                        <el-table-column label="处理状态" prop="status" />
+                        <el-table-column label="备注/意见" prop="opinion" />
+                    </el-table>
+                </div>
+            </el-dialog>
         </div>
         <start-from-list ref="startFromDetail"></start-from-list>
         <month-quarter-year-report ref="reportDia"></month-quarter-year-report>
@@ -173,6 +187,8 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            statesVisible: false,
+            stageArr: [],
             title: '',
             windframradio: {},
             deleteSelect: [],

src/components/assessment/evaluationYearPage.vue

@@ -146,6 +146,20 @@
                     </span>
                 </template>
             </el-dialog>
+            <el-dialog title="流程详情" v-model="statesVisible" :fullscreen="true" :close-on-click-modal="false">
+                <div class="flowSty">
+                    <el-table :data="stageArr" style="width: 100%">
+                        <el-table-column type="index" label="序号" align="center" />
+                        <el-table-column label="任务名称" prop="taskName" />
+                        <el-table-column label="任务创建时间" prop="createTime" />
+                        <el-table-column label="任务处理时间" prop="approveTime" />
+                        <el-table-column label="候选人" prop="assignInfo" width="500" />
+                        <el-table-column label="执行人" prop="approverName" />
+                        <el-table-column label="处理状态" prop="status" />
+                        <el-table-column label="备注/意见" prop="opinion" />
+                    </el-table>
+                </div>
+            </el-dialog>
         </div>
         <start-from-list ref="startFromDetail"></start-from-list>
         <month-quarter-year-report ref="reportDia"></month-quarter-year-report>
@@ -170,6 +184,8 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            statesVisible: false,
+            stageArr: [],
             title: '',
             windframradio: {},
             deleteSelect: [],

src/components/assessment/monthQuarterYearFrom.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="startFrom">
+    <div class="monthQuarterYearFrom">
         <el-dialog title="考评详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
@@ -437,7 +437,7 @@ export default {
 </script>
 
 <style lang="less">
-.startFrom{
+.monthQuarterYearFrom{
     .el-overlay{
         .el-dialog{
             // margin-top: 7vh;

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="startFrom">
+    <div class="taskEvalFrom">
         <el-dialog title="考评详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
@@ -494,11 +494,11 @@ export default {
                     actionCS = 'agree'
                 }
             } else {
-                if (that.rowMsg.taskType === 'SIGN') {
-                    actionCS = 'signReject'
-                } else if (that.rowMsg.taskType === 'NORMAL') {
-                    actionCS = 'reject'
-                }
+                // if (that.rowMsg.taskType === 'SIGN') {
+                //     actionCS = 'signReject'
+                // } else if (that.rowMsg.taskType === 'NORMAL') {
+                //     }
+                actionCS = 'reject'
             }
             let params = {
                 taskId: that.rowMsg.id, //任务ID
@@ -534,7 +534,7 @@ export default {
 </script>
 
 <style lang="less">
-.startFrom{
+.taskEvalFrom{
     .el-overlay{
         .el-dialog{
             // margin-top: 7vh;

src/views/Login.vue

@@ -1,46 +1,54 @@
 <template>
     <div class="loginPic" v-if="isMobile === 'PC'">
-            <!-- <div class="login_left">
-                <p>Welcome!</p>
-                <p class="title">光耀集中式风电功率预测系统</p>
-            </div> -->
-            <div class="login_right">
-                <img class="titleIcon" src="../assets/loginImage/logo.png" alt="">
-                <div class="loginCom" style="margin-bottom: 30px">
-                    <img class="userIcon" src="../assets/loginImage/userIcon.png" alt="">
-                    <el-input v-model="inputUser" placeholder="请输入用户名" />
-                </div>
-                <div class="loginCom" style="margin-bottom: 16px">
-                    <img class="passwordIcon" src="../assets/loginImage/passwordIcon.png" alt="">
-                    <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
-                </div>
-                <div class="remeber">
-                    <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
-                </div>
-                <!-- 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 class="login_right">
+            <img class="titleIcon" src="../assets/loginImage/logo.png" alt="">
+            <div class="loginCom" style="margin-bottom: 30px">
+                <img class="userIcon" src="../assets/loginImage/userIcon.png" alt="">
+                <el-input v-model="inputUser" placeholder="请输入用户名" />
+            </div>
+            <div class="loginCom" style="margin-bottom: 16px">
+                <img class="passwordIcon" src="../assets/loginImage/passwordIcon.png" alt="">
+                <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
+            </div>
+            <div class="remeber">
+                <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
+            </div>
+            <!-- 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 class="loginFooter">
-                    <span>Copyright © 2021-2022 GuangYaoDianLi All Rights Reserved.</span>
-                </div> -->
+        </div>
     </div>
-    <div v-else>
-        <div>
-            <van-tabbar v-model="vantActive">
-                <van-tabbar-item icon="home-o">标签</van-tabbar-item>
-                <van-tabbar-item icon="search">标签</van-tabbar-item>
-                <van-tabbar-item icon="friends-o">标签</van-tabbar-item>
-                <van-tabbar-item icon="setting-o">标签</van-tabbar-item>
-            </van-tabbar>
+    <div class="loginMobeil" v-else>
+        <div class="login_mobeilMain">
+            <img class="titleIcon" src="../assets/loginImage/logo.png" alt="">
+            <div class="loginCom" style="margin-bottom: 30px">
+                <img class="userIcon" src="../assets/loginImage/userIcon.png" alt="">
+                <el-input v-model="inputUser" placeholder="请输入用户名" />
+            </div>
+            <div class="loginCom" style="margin-bottom: 16px">
+                <img class="passwordIcon" src="../assets/loginImage/passwordIcon.png" alt="">
+                <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
+            </div>
+            <div class="remeber">
+                <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
+            </div>
+            <!-- v-if="!loginLoading"  v-else -->
+            <div class="loginMobeilBtn" @click="handleLogin" v-if="!loginLoading">
+                <span class="loginSpan">登录</span>
+            </div>
+            <div class="loginMobeilBtn" v-else>
+                <div class="loading">
+                    <el-icon color="#fff"><Loading /></el-icon>
+                    <span class="loadingSpan">登录</span>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -312,4 +320,112 @@ export default {
         letter-spacing: 1px;
     }
 }
+.loginMobeil{
+    position: relative;
+    width: 100%;
+    height:1080px;
+    background-image: url('../assets/loginImage/logindefBak.png');
+    background-position: 0 0;
+    background-repeat: no-repeat;
+    .login_mobeilMain{
+        width: 470px;
+        height:680px;
+        // background: rgba(0,0,0,0.4);
+        position: relative;
+        right: 5%;
+        // top: 15%;
+        .titleIcon{
+            margin: 100px 0px 43px 75px;
+        }
+        .loginCom{
+            margin: 0 30px 0px 43px;
+            width: 350px;
+            height: 56px;
+            background: #1B1A1F;
+            border-radius: 5px;
+            display: flex;     
+            .userIcon {
+                width: 24px;
+                height: 24px;
+                margin: 16px;
+            }   
+            .passwordIcon {
+                width: 24px;
+                height: 24px;
+                margin: 16px;
+            }
+            .el-input{
+                border: 0 solid transparent;
+                .el-input__wrapper{
+                    background: transparent;
+                    box-shadow: none;
+                    .el-input__inner, .el-input__inner:focus{
+                        background-color: transparent;
+                        border: none !important;
+                        color: #fff;
+                        height: 30px;
+                        width: 100%;
+                        font-size: 14px;
+                    }
+                }
+            }
+        }
+        .remeber{
+            margin: 0 0 0 50px;
+            .el-checkbox{
+                .el-checkbox__label{
+                    color: #fff;
+                    font-size: 12px;
+                    padding-left:6px;
+                }
+            }
+        }
+        .loginMobeilBtn{
+            margin: 48px 0 0 43px;
+            width: 350px;
+            height: 56px;
+            // background-image: url('../assets/loginImage/loginBtn.png');
+            background: linear-gradient(#1e5adf, #1746d3);
+            border-radius: 5px;
+            cursor: pointer;
+            .loginSpan{
+                position: relative;
+                top: 27%;
+                left: 45%;
+                font-size: 18px;
+                font-family: Microsoft YaHei;
+                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;
+        }
+        input::-moz-input-placeholder{ /*Mozilla Firefox*/
+            color: #fff;
+        }
+        input::-ms-input-placeholder{ /*Internet Explorer*/
+            color: #fff;
+        }
+    }
+}
 </style>