Browse Source

首页及其季度详情页面样式重构且兼容1440*900,加分项用红色向上箭头,扣分项用绿色向下箭头;任务中心年度考评问题修改;公告页面根据后端需求服务增加参数;其他页面样式问题;

SunZehao 1 year ago
parent
commit
e52fcd7b7f

BIN
src/assets/getwayImg/botNewS.png


BIN
src/assets/getwayImg/topNewS.png


+ 7 - 7
src/components/assessment/assessmentApplicationFrom.vue

@@ -341,7 +341,7 @@ export default {
                     employeeId: item.employeeId,
                     employeeName: emName,
                     employeeNo: item.employeeNo ? item.employeeNo : emNo,
-                    suggestedValue: item.suggestedValue.toString(),
+                    suggestedValue: item.suggestedValue.toFixed(2).toString(),
                     serialNumber: item.serialNumber
                 }
                 if (!item.showInput) {
@@ -445,7 +445,7 @@ export default {
                         border: 1px solid #D6DBEA;
                         padding: 10px 20px;
                         border-radius: 10px;
-                        margin-bottom: 20px;
+                        margin-bottom: 10px;
                         .danjuMsg_data{
                             padding: 5px 0 10px 0;
                             .data_tit{
@@ -481,13 +481,13 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        position: relative;
-                        top: 32px;
-                        left: 48vw;
-                        width: 50%;
+                        // position: relative;
+                        // top: 32px;
+                        // left: 48vw;
+                        width: 100%;
                         .detaTableBtns{
                             display: flex;
-                            width: 400px;
+                            width: 410px;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;

+ 3 - 0
src/components/assessment/assessmentApplicationPage.vue

@@ -275,11 +275,14 @@ export default {
         // 查询列表页面
         getassessmentApplicationList() {
             let that = this
+            // let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 orderNumber: that.orderNumber,
                 deptName: that.departNameS,
+                // deptId: userMes.deptId,
+                deptId: '',
                 annual: that.timeIds ? this.timeIds.substring(0, this.timeIds.indexOf('-')) : '',
                 declarationMonth: that.timeIds ? this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1 : ''
             }

+ 5 - 5
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -369,7 +369,7 @@ export default {
                         border: 1px solid #D6DBEA;
                         padding: 10px 20px;
                         border-radius: 10px;
-                        margin-bottom: 20px;
+                        margin-bottom: 10px;
                         .danjuMsg_data{
                             padding: 5px 0 10px 0;
                             .data_tit{
@@ -405,10 +405,10 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        position: relative;
-                        top: 32px;
-                        left: 50vw;
-                        width: 50%;
+                        // position: relative;
+                        // top: 32px;
+                        // left: 50vw;
+                        width: 100%;
                         .detaTableBtns{
                             display: flex;
                             width: 300px;

+ 7 - 7
src/components/assessment/evaluationDeptStartFrom.vue

@@ -70,7 +70,7 @@
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
                          style="width: 100%" @select="rowClick" @select-all="rowClick" :row-class-name="tableRowClassName">
                             <el-table-column label="序号" type="index" width="80" />
-                            <el-table-column label="部门名称" prop="deptName" width="300">
+                            <el-table-column label="部门名称" prop="deptName" width="200">
                                 <template #default="scope">
                                     <el-select v-model="scope.row.deptName" placeholder="请选择所属部门" filterable v-if="scope.row.showInput">
                                         <el-option
@@ -110,7 +110,7 @@
                                      :precision="2" :step="0.1" :min="0" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="评价标准" >
+                            <el-table-column label="评价标准" width="500" >
                                 <template #default="scope">
                                     <el-input v-model="scope.row.evaluationCriteria"
                                     type="textarea" :rows="2" placeholder="请输入评价标准"></el-input>
@@ -463,7 +463,7 @@ export default {
                         border: 1px solid #D6DBEA;
                         padding: 10px 20px;
                         border-radius: 10px;
-                        margin-bottom: 20px;
+                        margin-bottom: 10px;
                         .danjuMsg_data{
                             padding: 5px 0 10px 0;
                             .data_tit{
@@ -499,10 +499,10 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        position: relative;
-                        top: 32px;
-                        left: 50vw;
-                        width: 50%;
+                        // position: relative;
+                        // top: 32px;
+                        // left: 50vw;
+                        width: 100%;
                         .detaTableBtns{
                             display: flex;
                             width: 300px;

+ 15 - 1
src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -32,6 +32,7 @@
                 <el-table :data="evaluationDepartmentData" style="width: 100%" :class="departmentTableSty()"
                  @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                    <el-table-column label="序号" prop="serialNumber" width="100" />
                     <el-table-column label="部门名称" prop="deptName" />
                     <el-table-column label="部门领导名称" prop="chargePersonName" />
                     <el-table-column label="部门应用">
@@ -92,6 +93,9 @@
                                 <el-checkbox label="绩效考核申报" name="type" />
                             </el-checkbox-group>
                         </el-form-item>
+                        <el-form-item label="排序" >
+                            <el-input-number v-model="ruleForm.serialNumber" :min="1" />
+                        </el-form-item>
                     </el-form>
                 </div>
                 <template #footer>
@@ -133,6 +137,7 @@ export default {
                 department: '',
                 depart2ment: '',
                 departmentLeader: '',
+                serialNumber: 1,
                 departmentIn: []
             },
             rules: {
@@ -236,6 +241,7 @@ export default {
                 this.ruleForm = {
                     department: '',
                     departmentLeader: '',
+                    serialNumber: 1,
                     departmentIn: []
                 }
             })
@@ -253,10 +259,17 @@ export default {
                 departmentInStr.push('绩效考核申报')
             }
             this.ruleForm = {
-                department: this.evalradio.deptId,
                 departmentLeader: this.evalradio.chargePersonId,
+                serialNumber: this.evalradio.serialNumber,
                 departmentIn: departmentInStr
             }
+            if (this.evalradio.parentId !== '') {
+                this.ruleForm.department = this.evalradio.parentId
+                this.ruleForm.depart2ment = this.evalradio.deptId
+                this.changedepart2Data(this.evalradio.parentId)
+            } else {
+                this.ruleForm.department = this.evalradio.deptId
+            }
             this.getuserPageList(this.evalradio.deptId)
         },
         saveevaluationDepartmentMsg(formName) {
@@ -300,6 +313,7 @@ export default {
             let params = {
                 chargePersonId: that.ruleForm.departmentLeader,
                 chargePersonName: deptLeaderNameS,
+                serialNumber: that.ruleForm.serialNumber,
                 yjzbjhType: yjzbjhTypeIn,
                 jxjgkhsbType: jxjgkhsbTypeIn
             }

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

@@ -228,8 +228,8 @@
 
 <script>
 import {apiGetevaluationportallist} from '../../api/api'
-import topImg from '../../assets/getwayImg/topNew.png'
-import botImg from '../../assets/getwayImg/botNew.png'
+import topImg from '../../assets/getwayImg/topNewS.png'
+import botImg from '../../assets/getwayImg/botNewS.png'
 import cenImg from '../../assets/getwayImg/cenNew.png'
 export default {
     data() {

+ 2 - 2
src/components/gatewaynMobeil.vue

@@ -297,8 +297,8 @@ import cup1 from '../assets/getwayImg/cup1.png'
 import cup2 from '../assets/getwayImg/cup2.png'
 import cup3 from '../assets/getwayImg/cup3.png'
 
-import topImg from '../assets/getwayImg/topNew.png'
-import botImg from '../assets/getwayImg/botNew.png'
+import topImg from '../assets/getwayImg/topNewS.png'
+import botImg from '../assets/getwayImg/botNewS.png'
 import cenImg from '../assets/getwayImg/cenNew.png'
 
 import {apiGetevaluationportallist, apiGetevaluationCircularDisplaylist} from '../api/api'

+ 2 - 2
src/components/gatewaynNewPage.vue

@@ -313,8 +313,8 @@
     import cup2 from '../assets/getwayImg/cup2.png'
     import cup3 from '../assets/getwayImg/cup3.png'
 
-    import topImg from '../assets/getwayImg/topNew.png'
-    import botImg from '../assets/getwayImg/botNew.png'
+    import topImg from '../assets/getwayImg/topNewS.png'
+    import botImg from '../assets/getwayImg/botNewS.png'
     import cenImg from '../assets/getwayImg/cenNew.png'
 
     import {

+ 5 - 5
src/components/taskCenter/taskApplicationFrom.vue

@@ -514,7 +514,7 @@ export default {
                         border: 1px solid #D6DBEA;
                         padding: 10px 20px;
                         border-radius: 10px;
-                        margin-bottom: 20px;
+                        margin-bottom: 10px;
                         .danjuMsg_data{
                             padding: 5px 0 10px 0;
                             .data_tit{
@@ -570,10 +570,10 @@ export default {
                         display: flex;
                         z-index: 11111;
                         justify-content: end;
-                        position: relative;
-                        top: 32px;
-                        left: 50vw;
-                        width: 50%;
+                        // position: relative;
+                        // top: 32px;
+                        // left: 50vw;
+                        width: 100%;
                         .detaTableBtns{
                             display: flex;
                             width: 300px;

+ 2 - 2
src/mobeilComponent/reportConpanyPage.vue

@@ -117,8 +117,8 @@ import daohangImg from '../assets/mobeilImg/daohang.png'
 import dateImg from '../assets/mobeilImg/date.png'
 import sortImg from '../assets/mobeilImg/sort.png'
 import seachImg from '../assets/mobeilImg/seach.png'
-import topImg from '../assets/getwayImg/topNew.png'
-import botImg from '../assets/getwayImg/botNew.png'
+import topImg from '../assets/getwayImg/topNewS.png'
+import botImg from '../assets/getwayImg/botNewS.png'
 import cenImg from '../assets/getwayImg/cenNew.png'
 
 import {apiGetEvalReportList, apiGetbinsectionList} from '../api/api'

+ 2 - 2
src/mobeilComponent/seasonConpanyPage.vue

@@ -101,8 +101,8 @@ import seachImg from '../assets/mobeilImg/seach.png'
 import cup1 from '../assets/getwayImg/cup1.png'
 import cup2 from '../assets/getwayImg/cup2.png'
 import cup3 from '../assets/getwayImg/cup3.png'
-import topImg from '../assets/getwayImg/topNew.png'
-import botImg from '../assets/getwayImg/botNew.png'
+import topImg from '../assets/getwayImg/topNewS.png'
+import botImg from '../assets/getwayImg/botNewS.png'
 import cenImg from '../assets/getwayImg/cenNew.png'
 
 import {apiGetevaluationportallist} from '../api/api'