Merge branch 'master' of ssh://1582597470426922.onaliyun.com@s1.nsloop.com:29418/web_TracerMethodology

pages/checkList/checkList.vue

@@ -37,7 +37,7 @@
 		</view>
 		<view class="null" v-if="depList.length === 0">暂无数据</view>
 		<tm-modal v-show="showModal" v-on:click="showModalHandle(false)">
-			<view class="content-list">
+			<scroll-view scroll-y="true" class="content-list">
 				<view class="list-item" 
 					v-for="(item, index) in planList"
 					:class="{active: checkId === item.id}" 
@@ -55,7 +55,7 @@
 						v-if="checkId === item.id"
 						src="../../static/checkStatus.png"></image>
 				</view>
-			</view>
+			</scroll-view>
 		</tm-modal>
 	</view>
 </template>
@@ -182,6 +182,7 @@
 	.content-list {
 		padding-top: 50rpx;
 		width: 100%;
+		height: 100%;
 		background-color: #fff;
 		.list-item {
 			display: flex;

pages/creatingSituations/components/checkMapDetail.vue

@@ -70,9 +70,16 @@
 			btnClick: function(id) {
 				if(id === 'ok') {
 					const {id, pointList} = this.checkMap.actionItem;
+					let _pointList = pointList.map((item)=>{
+						let obj = item.itemList.find(({selectFlag}) => selectFlag);
+						return {
+							...item,
+							selectFlag: obj ? true : false
+						}
+					});
 					let list = [...this.checkMap.list];
 					let index = list.findIndex((item)=> item.id === id);
-					list[index].pointList = pointList;
+					list[index].pointList = _pointList;
 					this.myCommit('list', list);
 				} 
 				this.commit('showCheckMapDetail', false);

pages/creatingSituations/components/checkPlan.vue

@@ -142,7 +142,7 @@
 				const { model } = this.checkPlan.checkedItem;
 				const {start, dayNum} = this.checkPlan.dateObj;
 				let checkList = [];
-				if(model && dayNum > 0) { // 确保前两步都做好了
+				if(model && dayNum > 0 && dayNum >= model) { // 确保前两步都做好了
 					let num = Math.floor(dayNum / model);
 					checkList = [start];
 					for(let i = 0; i < num - 1; i++) {

pages/creatingSituations/components/checkRent.vue

@@ -28,9 +28,7 @@
 						<view class="chid-item"> 
 							<view>负责要点</view>
 							<view>
-								<text v-for="(point, c) in item.points" :key="c">
-									{{point.name}}；
-								</text>
+								<text>{{item.allPoints}}</text>
 							</view>
 						</view>
 					</view>

pages/creatingSituations/creatingSituations.vue

@@ -164,6 +164,10 @@
 				}
 				this.dispatch(`save${this.saveType}`, data).then((data)=>{
 					if(data) {
+						// 保存成功先清空数据
+						this.myCommit('stepActive', 0);
+						this.myCommit('theme', {id: null, title: null, des: null});
+						this.myCommit('editConfig', null);
 						uni.navigateTo({
 							url: '/pages/situationsCenter/situationsCenter'
 						});
@@ -182,7 +186,15 @@
 							this.nextHandle(this.stepActive);
 						break;
 					case 'checkPlanCreate': // 生成查核计划
-						this.myCommit('showCheckPlan1', false);
+						if(this.checkPlan.checkList.length === 0) {
+							uni.showModal({
+							  title: '错误提示',
+							  content: '查核频次必须大于或等于1！',
+							  showCancel: false
+							});
+						} else {
+							this.myCommit('showCheckPlan1', false);
+						}
 						break;
 					case 'checkPlanCallback': // 生成查核计划-返回
 						this.myCommit('showCheckPlan1', true);

pages/situationDetail/situationDetail.vue

@@ -60,7 +60,8 @@
 </template>
 
 <script>
-	import popup from './components/bottom-popup.vue'
+	import popup from './components/bottom-popup.vue';
+	import {dateHandle} from "../../utils/dateHandle.js";
 	export default {
 		data() {
 			return {
@@ -99,7 +100,6 @@
 		},
 		created: function() {
 			this.nowPermission=uni.getStorageSync('nowPermission');
-			console.log(this.nowPermission);
 			this.isAdmin=this.nowPermission==1?true:false;
 			this.isCheckLeader=this.nowPermission==2?true:false;
 			this.isChecker=this.nowPermission==3?true:false;
@@ -180,9 +180,10 @@
 				}
 			},
 			compareTime(time){
-				let myDate=new Date();
+				let myDate=dateHandle.todayDate().replace(/-/g,"/");
 				let firstCheckTime=time.replace(/-/g,"/");
 				firstCheckTime=Date.parse(firstCheckTime);
+				myDate=Date.parse(myDate);
 				if(myDate>firstCheckTime){
 					return false;
 				}else{

pages/situationsCenter/situationsCenter.vue

@@ -63,6 +63,8 @@
 				refTimer: null,
 				isInitWs: null,
 				messageType: null,
+				num: 1,
+				timer: null
 			}
 		},
 		created: function() {
@@ -73,17 +75,18 @@
 			  this.isInitWs = websocket.ws ? false : true;
 			  this.init(this.isInitWs);
 			}, 3 * 60 * 1000);
-			this.messStatus();
+			this.messStatus(1);
 		},
 		beforeDestroy() {
 		  // 关闭ws连接
 		  websocket.close();
 		  clearInterval(this.refTimer);
+			clearTimeout(this.timer);
 		},
 		watch:{
 			  "$route":{
 				  handler(route){
-					  this.messStatus();
+					  this.messStatus(1);
 				  }
 			  }
 		},
@@ -211,32 +214,30 @@
 					this.isInitWs && this.initWebsocket(hiId, user, permission);
 				});
 			},
-			messStatus(){
-				let num = 1;
-				let timer = setInterval(()=>{
-				  this.$store.dispatch({
-					  type: "calendar/commActions",
-					  payload: {
-						key: "messagesList",
-						data: {
-						  pageNum: num,
-						  pageSize: 100,
-						},
-					  },
-					}).then((res)=>{
-						if(res && res.list.length == 0){
-							clearInterval(timer)
-						}else if(res && res.list.length != 0){
-							res.list.map((item)=>{
-								if(!item.readStatus){
-									this.messageType = true;
-									return;
-								}
-							})
-						}
-					})
-				  num++;
-				},200)
+			messStatus(num){
+				this.$store.dispatch({
+					type: "calendar/commActions",
+					payload: {
+					key: "messagesList",
+					data: {
+						pageNum: num,
+						pageSize: 100,
+					},
+					},
+				}).then((res)=>{
+					if(res && res.list.length != 0){
+						res.list.map((item)=>{
+							if(!item.readStatus){
+								this.messageType = true;
+								return;
+							}
+						})
+						this.num++;
+						this.timer = setTimeout(()=>{
+							this.messStatus(this.num);
+						}, 200);
+					}
+				})
 			}
 		}
 	}