2024.3.14 细节调整 3

src/api/websocket.js

@@ -76,7 +76,9 @@ let sendData = (data, callback) => {
 			ws.send(data)
 		} else if (ws.readyState === ws.CONNECTING) {// 正在开启状态中,则 1 秒后重新发送
 			setTimeout(() => {
-				ws.send(data)
+        if(ws){
+          ws.send(data)
+        }
 			}, 2000)
 		}
 	}else {

src/components/organization/Post.vue

@@ -93,7 +93,7 @@
     		<el-button type="primary" @click="confirm('params')">确 定</el-button>
     	</div>
     </el-dialog>
-    <EmployeeSelector :selected="selected" @confirm='add_employee_confirm' title="添加人员" :visible.sync="add_employee_show"></EmployeeSelector>
+    <EmployeeSelector :is_filtration_creator="false" :selected="selected" @confirm='add_employee_confirm' title="添加人员" :visible.sync="add_employee_show"></EmployeeSelector>
   </div>
 </template>
 
@@ -240,7 +240,6 @@ export default {
         this.add_employee_show = false;
         this.$message.success('修改成功');
       })
-
     },
     deleteCate(){
       this.$confirm('确定删除该岗位','提示', {

src/examine/views/kouFenTj.vue

@@ -127,8 +127,8 @@
                 :page-size="post_page_size"
                 :current-page="post_page"
                 layout="prev, pager, next"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+                @size-change="handleSizeChange2"
+                @current-change="handleCurrentChange2"
                 :total="post_total">
               </el-pagination>
             </center>

src/okr/components/project/Dhtmlx.vue

@@ -460,8 +460,10 @@ export default {
     // 定位到今日线
     changeToday() {
       this.$nextTick(() => {
-        let ganTT = document.getElementsByClassName('gantt_marker today')
-        gantt.scrollTo(ganTT[0].offsetLeft - 300, null);
+        let ganTT = document.getElementsByClassName('gantt_marker today');
+        if(ganTT.length>0){
+          gantt.scrollTo(ganTT[0].offsetLeft - 300, null);
+        }
       })
     },
     changeFull() {

src/okr/components/project/KanMilestone.vue

@@ -282,6 +282,9 @@
               }
             })
             if(plans.length>0){
+              plans.forEach((a)=>{
+                  a.pId=0
+              })
               milestones.unshift({id:0,plans:plans,name:'默认分组'})
             }
             milestones.forEach((item)=>{

src/performance/views/myPerformance/adjustment2.vue

@@ -44,7 +44,7 @@
                 <template slot-scope="scope">
                   <span v-if="scope.row.result_type == 'none'">不开启</span>
                   <span v-if="scope.row.result_type == 'self'">被考核人</span>
-                  <span v-if="scope.row.result_type == 'special'">指定员工</span>
+                  <span v-if="scope.row.result_type == 'special'">指定员工 ({{$getEmployeeMapItem(scope.row.result_employee_id).name}}) </span>
                   <span v-if="scope.row.result_type == 'supervisor'">指定管理员</span>
                 </template>
               </el-table-column>

src/point/views/attendance/attendance_dialognew.vue

@@ -21,7 +21,7 @@
             </el-form-item>
             <el-form-item label="早上班前三名，上班提前" class="distance">
               <el-input v-model="compnayInfoForm[5].value" oninput="value=value.replace(/[^0-9]/g,'')" style="width:80px;"></el-input>
-              分钟有效
+              分钟有效（设为0分钟时，此项加分设置不生效）
             </el-form-item>
 
             <div style="padding-left: 70px;font-size: 16px;color:#303133;margin-bottom: 12px;">下班</div>
@@ -42,7 +42,7 @@
             </el-form-item>
             <el-form-item class="distance" label="晚下班后三名，下班延迟后">
               <el-input v-model="compnayInfoForm[9].value" style="width:80px;" oninput="value=value.replace(/[^0-9]/g,'')"></el-input>
-              分钟有效
+              分钟有效（设为0分钟时，此项加分设置不生效）
             </el-form-item>
 
             <div style="padding-left: 75px;font-size: 16px;color:#303133;margin-bottom: 12px;" >出勤</div>

src/point/views/pointHome.vue

@@ -276,7 +276,7 @@
                       {{ prize.point }} B分
                     </span>
                   </p>
-                  <p style="task-remark">{{ prize.remark ? prize.remark.customize : '' }}</p>
+                  <p class="task-remark">{{ prize.remark ? prize.remark.customize : '' }}</p>
                 </div>
               </div>
             </div>
@@ -286,7 +286,7 @@
             <div class="grid-content bg-purple" v-loading="highestPrizeBuckleloading" style="padding: 20px 20px 0;">
               <span class="title">本周扣分最多</span>
               <NoData style="padding-bottom: 20px;" content="暂无积分数据" v-if="!buckle.id"></NoData>
-              <div v-else style="display:flex">
+              <div v-else style="display:flex;padding-bottom:20px;">
                 <userImage width="45px" height="45px" :id="buckle.id" :user_name="buckle.name" style="margin-right:8px"></userImage>
                 <div class="rightexamineAndApproveList">
                   <p style="width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#73767c;font-size:16px;display:flex;justify-content: space-between;">
@@ -2206,7 +2206,7 @@ box-sizing: content-box;
 .rightexamineAndApproveList {
   text-align: left;
   width: 100%;
-  border-bottom: 1px solid #efefef;
+  /* border-bottom: 1px solid #efefef; */
 }
 .List_border:nth-child(5) .rightexamineAndApproveList {
   border-bottom: 0px solid #fff;

src/views/inform.vue

@@ -107,6 +107,18 @@ export default {
 					let list = res.data.data.list;
           this.announcement = list;
           if(this.articleOne.id){
+            let is=false
+            list.forEach(item=>{
+              if(item.id==this.articleOne.id){
+                is=true;
+              }
+            })
+            if(is){
+              this.noticeDetails();
+            }else if(list[0]){
+              this.articleOne = list[0];
+              this.noticeDetails();
+            }
             this.noticeDetails();
           }else if(list[0]){
             this.articleOne = list[0];