8.1.8细节_1

src/okr/views/project/myProject.vue

@@ -80,8 +80,8 @@
                           <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>

src/point/views/setting/set_role.vue

@@ -656,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/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>