src/okr/components/project/ProjectTj.vue

@@ -1,18 +1,20 @@
 <template>
   <div class="br-5 scroll-bar" style="height: calc(100vh - 258px);overflow-y: scroll;">
-    <div style="overflow-x: auto;" class="scroll-bar">
-      <div class="flex-box-ce header">
-          <div class="tab-item clamp" :class="{'active':0==milestone_id}" @click="milestone_id=0">项目总览</div>
-          <div class="tab-item clamp" :class="{'active':item.id==milestone_id}" v-for="(item, index) in milestoneList" :key="index" @click="milestone_id=item.id">
-             <Tooltip :preHtml="item.name">
-             <span>{{item.name}}</span>
-             </Tooltip>
-          </div>
-          <div class="tab-item clamp" >
-            <Tooltip preHtml="本页面统计项目内的所有任务数（含子任务）">
-             <span>统计说明<i class="el-icon-question" style="font-size: 16px;position: relative;top: 1px;"></i></span>
-             </Tooltip>
-          </div>
+    <div class="circular_header">
+      <div style="overflow-x: auto;flex: 1;" class="scroll-bar">
+        <div class="flex-box-ce header">
+            <div class="tab-item clamp" :class="{'active':0==milestone_id}" @click="milestone_id=0">项目总览</div>
+            <div class="tab-item clamp" :class="{'active':item.id==milestone_id}" v-for="(item, index) in milestoneList" :key="index" @click="milestone_id=item.id">
+              <Tooltip :preHtml="item.name">
+              <span>{{item.name}}</span>
+              </Tooltip>
+            </div>
+        </div>
+      </div>
+      <div class=" circular_headerL" >
+        <Tooltip preHtml="本页面统计项目内的所有任务数（含子任务）">
+          <span><i class="el-icon-question" style="font-size: 16px;position: relative;top: 1px;"></i>统计说明</span>
+          </Tooltip>
       </div>
     </div>
     <div class="flex-box-ce" style="margin-bottom: 10px;" v-loading="loading">
@@ -382,6 +384,17 @@ export default {
 .select ::v-deep .el-input__inner {
   border-radius: 25px;
 }
+.circular_header{
+  display: flex;
+  justify-content: space-between;
+  // align-items: center;
+  &L{
+    width: 85px;
+    line-height: 33px;
+    display: flex;
+    flex-direction: row-reverse;
+  }
+}
 .circular_item {
   background-color: #F7F8FA;
   padding: 20px;

src/okr/components/public/TaskItem.vue

@@ -268,7 +268,7 @@ export default {
               item.day=this.$moment(item.end_date).diff(this.$moment().format('YYYY-MM-DD'), 'day');
               item.isShow=false;
             })
-            console.log("渲染了",list,this.isParent,this.isShowChild)
+            // console.log("渲染了",list,this.isParent,this.isShowChild)
             this.parentList=list;
 
           }

src/okr/views/project/myProject.vue

@@ -80,9 +80,10 @@
                           <span>{{$moment(item.end_date).format('MM/DD')}}截止</span>
                         </template>
                         <template v-else>
-                          <span v-if="item.day>0" class="green">剩余{{item.day}}天</span>
-                          <span v-if="item.day==0" class="green">剩余1天</span>
+                          <span v-if="item.day>0&&item.composite_state != 4" class="green">剩余{{item.day}}天</span>
+                          <span v-if="item.day==0&&item.composite_state != 4" class="green">剩余1天</span>
                           <span v-if="item.day<0&&item.composite_state != 4" class="red">逾期{{Math.abs(item.day)}}天</span>
+                          <span v-if="item.composite_state == 4">{{$moment(item.end_date).format('YY/MM/DD')}}截止</span>
                         </template>
                         <Progress :inputStyle="{ height: '14px', width: '140px', lineHeight: '14px' }" :status="item.composite_state==3? 3:1" :value="Number(item.process)" style="margin-left: 10px;"></Progress>
                       </div>

src/okr/views/project/projectDetail.vue

@@ -207,6 +207,7 @@
       },
       tabsIndex(val,lat){
         if(val==1){
+          this.page = 1;
           this.getPastTask();
         }
         if(lat==7){
@@ -216,6 +217,7 @@
     },
     created() {
         if(this.$route.query.id){
+          this.$store.commit('setProjectDetailTaskPage',1)
           this.projectId=Number(this.$route.query.id);
           this.getProjectDateil();
           this.$nextTick(()=>{
@@ -285,7 +287,10 @@
         this.tabsIndex = item.code;
       },
       getPastTask(is){
-        is? '':this.page=1;
+        // is? '':this.page=1;
+        if(!is){
+          this.page = (this.$store.state.okrStore.projectDetailTaskPage!=0)?this.$store.state.okrStore.projectDetailTaskPage:1
+        }
         this.taskShow=false;
         let data={
           project_id:this.projectId,
@@ -293,7 +298,8 @@
           start_day:'2022-01-01',
           end_day:this.$moment().format('YYYY-MM-DD'),
           employee_id:this.userInfo.id,
-          page:is? this.page:1,
+          // page:is? this.page:1,
+          page:this.page,
           page_size:this.page_size,
           keyword:this.keyword,
         }
@@ -331,6 +337,7 @@
       // 页面跳转
       handleCurrentChange(val) {
         this.page = val;
+        this.$store.commit('setProjectDetailTaskPage',val)
         this.getPastTask(true);
       },
     }

src/point/views/pointHome.vue

@@ -20,6 +20,7 @@
             </el-carousel-item>
           </el-carousel>
       </div>
+      
       <el-row  style="width: 100%;">
         <el-col :span="18">
           <div class="flex-box-ce br-5" style="background-color: #fff;padding:20px;">

src/point/views/setting/set_role.vue

@@ -21,8 +21,9 @@
             <div class="role_list">
               <div v-loading="table_loading">
                 <el-row style="margin:20px auto 10px;">
-                  <el-col :span="18">
+                  <el-col :span="18" style="display: flex;align-items: center;">
                     <span class="roleNameClass" >{{item_info.name}}</span>
+                    <span class="blue cursor" style="margin-left: 5px;" v-if="item_info.code == 'dept_manager'" @click="isShowImg=true"><i class='el-icon-question'></i>如何添加部门管理员</span>
                   </el-col>
                   <el-col :span="6" style="text-align: right;">
                     <el-button type="text" style=" padding: 0; line-height: initial;" v-show="item_info.code !== 'creator'" @click="dataAccessPopup">数据查看权限></el-button>
@@ -46,7 +47,7 @@
                         <el-button type="primary" @click="add_employee_show = true">添加</el-button>
                         <div style="display: inline-block;" class="orange">有管理范围人员才能进行积分管理和奖扣，别忘了设置哦！</div>
                       </template>
-                      <el-button type="primary" v-if="item_info.code == 'dept_manager'" @click="isShowImg=true">添加管理员</el-button>
+                      <!-- <el-button type="primary" v-if="item_info.code == 'dept_manager'" @click="isShowImg=true">添加管理员</el-button> -->
                       <el-button type="primary" plain v-if="item_info.code == 'dept_manager'" @click="syncScope"><i class="el-icon-refresh"></i>同步管理范围</el-button>
                       <el-button type="success" plain v-if="item_info.code == 'dept_manager'" @click="isShowMessage=true"><i class="el-icon-refresh"></i>同步全部人员及管理范围</el-button>
                       <div class="gap-right-8 fr" style="display:inline-block;" v-if="item_info.code == 'dept_manager'">
@@ -655,7 +656,7 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <el-dialog title="添加管理员" :visible.sync="isShowImg">
+    <el-dialog title="添加部门管理员" :visible.sync="isShowImg">
       <div>
          <img src="static/images/tjbmgly.png" style="width: 100%;"/>
       </div>

src/store/modules/okrStore.js

@@ -1,13 +1,17 @@
 import axiosUser from '@/utils/axiosUser'
 const okrStore = {
   state: {
-    sumTotal:0
+    sumTotal:0,
+    projectDetailTaskPage:0,
   },
 
   mutations: {
     sumTotal: (state, sumTotal) => {
       state.sumTotal = sumTotal
     },
+    setProjectDetailTaskPage: (state, projectDetailTaskPage) => {
+      state.projectDetailTaskPage = projectDetailTaskPage
+    },
   },
 
   actions: {

src/views/login.vue

@@ -65,7 +65,7 @@
               <div class="login_reg">
                 <el-button type="text" @click="$router.push({ path: '/reg' })" style="float:right">
                   <span style="color:#909399">还没账号？</span>
-                  <span style="color: #006EFF;">免费注册体验</span>
+                  <span style="color: #006EFF;">注册账号</span>
                 </el-button>
               </div>
             </div>