解决pages冲突

.hbuilderx/launch.json

@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+            "type": "uniCloud",
+            "default": {
+                "launchtype": "remote"
+            }
+        }
+    ]
+}

pages.json

@@ -68,11 +68,25 @@
     {
       "path": "pages/improve-mission-list/improve-mission-list",
       "style": {
-          "navigationBarTitleText": "改善列表",
-          "enablePullDownRefresh": false
-        }
+        "navigationBarTitleText": "改善列表",
+        "enablePullDownRefresh": false
       }
-    ],
+    },
+    {
+      "path" : "pages/situationsCenter/situationsCenter",
+      "style": {
+        "navigationBarTitleText": "情境中心",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path" : "pages/situationDetail/situationDetail",
+      "style": {
+        "navigationBarTitleText": "情境详情",
+        "enablePullDownRefresh": false
+      }
+    }
+  ],
 	"globalStyle": {
 		"navigationStyle": "custom",
 		"navigationBarTextStyle": "black",
@@ -82,6 +96,7 @@
 		"app-plus": {
 			"background": "#efeff4"
 		},
-		"rpxCalcMaxDeviceWidth": 9999
+		"rpxCalcMaxDeviceWidth": 9999,
+		"onReachBottomDistance":184
 	}
 }

pages/model.js

@@ -4,6 +4,8 @@ import roleSwitching from './role-switching/model.js';
 import configure from './configure/model.js';
 import messages from './messages/model.js';
 import mission from './mission/model.js';
+import situationsCenter from './situationsCenter/model.js';
+import situationDetail from './situationDetail/model.js';
 import creatingSituations from "./creatingSituations/model.js";
 
 export default module = {
@@ -13,5 +15,7 @@ export default module = {
   roleSwitching,
   messages,
   mission,
+	situationsCenter,
+	situationDetail,
 	creatingSituations
 }

pages/role-switching/role-switching.vue

@@ -15,7 +15,9 @@
 		</view>
 	</view>
 </template>
-
+/**
+ * 角色切换
+ */
 <script>
 	export default {
 		data() {
@@ -64,11 +66,9 @@
 						}
 					}
 				}).then((data)=>{
-					if(data!==null){
-						uni.navigateTo({
-							url: '/pages/home/home'
-						});
-					}
+					uni.navigateTo({
+						url: '/pages/home/home'
+					});
 				});
 			}
 		},

pages/situationDetail/model.js

@@ -0,0 +1,14 @@
+import { commServer } from './server.js';
+
+export default {
+  namespaced: true,
+  state: {
+  },
+  mutations: {},
+  actions: {
+		commActions({ commit, state }, { payload }) {
+			// payload = {key,data} // data是请求数据，key是请求接口id
+      return commServer(payload);
+		},
+  }
+}

pages/situationDetail/server.js

@@ -0,0 +1,18 @@
+import { creatRequest } from '../../utils/request.js';
+
+const requestList = {
+  //情境详情
+  situationDetail: {
+    method: 'GET',
+    url: 'situation'
+  },
+	//情境作废
+	situationDelete:{
+		method:'DELETE',
+		url: 'situation'
+	},
+};
+export const commServer = ({ key, data }) => {
+  let obj = requestList[key];
+  return creatRequest(obj, data);
+}

pages/situationDetail/situationDetail.vue

@@ -0,0 +1,432 @@
+<template>
+	<view class="detail-page">
+		<view class="content-info">
+			<view class="top-box">
+				<view class="subscript">
+					<!-- <image class="sub-pic" src="../../static/sDetail-subscript.png"></image> -->
+					<text class="sub-text">{{topic}}</text>
+				</view>
+				<text class="name-text">{{name}}</text>
+				<text class="time-text">| 情境起止时间：{{startDate}}~{{endDate}}</text>
+				<text class="nextTime-text">| 下次查核时间：{{nextCheckTime}}</text>
+				<text class="startEndTime-text" v-show="isStartEndTimeShow">| {{startEndTime}}</text>
+				<text class="team-text">{{checkGroupName}}</text>
+			</view>
+			<view class="list-box">
+				<view class="check-list" v-show="isCheckImproveShow" @click="gotoCheckPage">
+					<image class="check-pic" src="../../static/check-list.png"></image>
+					<text class="list-title">查核列表</text>
+					<text class="list-info">{{checkStatus}}</text>
+				</view>
+				<view class="improve-list" v-show="isCheckImproveShow" @click="gotoImprovePage">
+					<image class="improve-pic" src="../../static/improve-list.png"></image>
+					<text class="list-title">改善列表</text>
+					<text class="list-info">查看改善记录</text>
+				</view>
+				<view class="plan-list" v-show="isCheckLeader" @click="gotoPlanPage">
+					<image class="check-pic" src="../../static/check-list.png"></image>
+					<text class="list-title">计划列表</text>
+					<text class="list-info">共{{planCount}}次查核计划，剩余{{toDistribute}}个待分配</text>
+				</view>
+			</view>
+			<view class="info-box">
+				<view class="text-box">
+					<text class="info-text">评价医院对医院评审标准与要点的遵从程度，即评价医院对规章、制度、流程、诊疗常规与操作规程的执行力。评价病人在接受诊疗的服务过程品质、环境设施，注重病人的安全、权益及隐私的保护、医院感染的控制。</text>
+				</view>
+			</view>
+		</view>
+		<view class="button-box">
+			<view class="btn-left" @click="delSituation" v-show="isAdmin">
+				<text class="left-text">作废</text>
+			</view>
+			<view class="btn-right" @click="editSituation" v-show="isAdmin">
+				<text class="right-text">编辑</text>
+			</view>
+			<view class="btn-center" v-show="isChecker" @click="startUnplanned">
+				<text class="center-text">开始一次计划外查核</text>
+			</view>
+			<view class="btn-left" v-show="isUnplanned">
+				<text class="left-text">新建一个计划外查核</text>
+			</view>
+			<view class="btn-right" v-show="isUnplanned">
+				<text class="right-text">提前开始一个计划内查核</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				nowPermission:'',//用户当前权限
+				situaionID:'',//情境id
+				checkGroupName:'',//查核组名
+				checkStatus:'',//查核状态
+				name:'',//查核名
+				startDate:'',//查核开始时间
+				endDate:'',//查核结束时间
+				nextCheckTime:'',//下次查核时间
+				topic:'',//个案或系统
+				startEndTime:'',//距离情境开始或结束时间
+				planCount:'',//总查核计划数
+				toDistribute:'',//待分配计划数
+				firstCheckTime:'',//首次查核时间
+				isCheckImproveShow:false,//查核改善列表是否显示
+				isStartEndTimeShow:false,//距离情境开始或结束时间是否显示
+				isAdmin:false,//是否为管理员
+				isCheckLeader:false,//是否为查核组长
+				isChecker:false,//是否为查核者
+				isUnplanned:false,//是否计划外查核
+			}
+		},
+		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;
+			this.isStartEndTimeShow=this.nowPermission==2||this.nowPermission==3?true:false;
+			this.isCheckImproveShow=this.nowPermission==1||this.nowPermission==4||this.nowPermission==3?true:false;
+			this.situaionID=uni.getStorageSync('situaionID');
+			this.$store.dispatch({
+				type: 'situationDetail/commActions',
+				payload: {
+					key: 'situationDetail',
+					data:{
+						id:this.situaionID
+					}
+				}
+			}).then((data) => {
+				if (data) {
+					this.name=data.name;
+					this.startDate=data.startDate;
+					this.endDate=data.endDate;
+					this.nextCheckTime=data.nextCheckTime;
+					this.checkGroupName=data.checkGroupName;
+					this.topic=data.topic==0?'个案':'系统';
+					this.checkStatus=data.checkStatus;
+					this.startEndTime=data.startEndTime;
+					this.planCount=data.planCount;
+					this.toDistribute=data.toDistribute;
+					this.firstCheckTime=data.firstCheckTime;
+				}
+			});
+		},
+		methods: {
+			delSituation(){
+				uni.showModal({
+					title:'提示',
+					content:'请确认是否作废此情境，作废的情境无法被还原',
+					success:function(res){
+						if(res.confirm){
+							this.$store.dispatch({
+								type: 'situationDetail/commActions',
+								payload: {
+									key: 'situationDelete',
+									data:{
+										id:this.situaionID
+									}
+								}
+							}).then((data) => {
+								if (data) {
+									uni.showToast({
+										title:'作废成功',
+										icon:'none',
+										duration:1000
+									});
+								}
+							});
+						}
+						else if(res.cancel){
+							return;
+						}
+					}
+				})
+				
+			},
+			editSituation(){
+				let editEnable=this.compareTime();
+				if(editEnable){
+					uni.navigateTo({
+						url: '/pages/creatingSituations/creatingSituations'
+					});
+				}
+				else{
+					uni.showModal({
+						title:'提示',
+						content:'已进行过一次查核，不可编辑',
+					  showCancel:false
+					})
+				}
+			},
+			compareTime(){
+				let myDate=new Date();
+				let firstCheckTime=this.firstCheckTime.replace(/-/g,"/");
+				firstCheckTime=Date.parse(firstCheckTime);
+				if(myDate>firstCheckTime){
+					return false;
+				}else{
+					return true;
+				}
+			},
+			gotoCheckPage(){
+				//跳转到查核列表
+				uni.navigateTo({
+					url: '/pages/creatingSituations/creatingSituations'
+				});
+			},
+			gotoImprovePage(){
+				//跳转到改善列表
+				uni.navigateTo({
+					url: '/pages/creatingSituations/creatingSituations'
+				});
+			},
+			gotoPlanPage(){
+				//跳转到计划列表
+				uni.navigateTo({
+					url: '/pages/creatingSituations/creatingSituations'
+				});
+			},
+			startUnplanned(){
+				this.isUnplanned=true;
+				this.isChecker=false;
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	.detail-page{
+		.content-info{
+			background-color: #FFFFFF;
+			.top-box{
+				width: 750rpx;
+				height: 300rpx;
+				background: linear-gradient(270deg, #3071F2 0%, #4C95FC 100%);
+				.subscript{
+					width: 84.37rpx;
+					height: 35rpx;
+					float: right;
+					margin-top: 15rpx;
+					text-align: center;
+					background-image: url(../../static/sDetail-subscript.png);
+					.sub-text{
+						font-size: 17.5rpx;
+						font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+						font-weight: 500;
+						color: #2E6CE6;
+						line-height: 35rpx;
+					}
+				}
+				
+				.name-text{
+					font-size: 40rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					float: left;
+					margin-left: 50rpx;
+					margin-top: 50rpx;
+					margin-bottom: 31.25rpx;
+				}
+				.time-text{
+					font-size: 20rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					position: absolute;
+					top: 115rpx;
+					left: 55rpx;
+				}
+				.nextTime-text{
+					font-size: 20rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					position: absolute;
+					left: 55rpx;
+					top: 155rpx;
+				}
+				.startEndTime-text{
+					font-size: 20rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					position: absolute;
+					left: 55rpx;
+					top: 195rpx;
+				}
+				.team-text{
+					font-size: 20rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					position: absolute;
+					top: 115rpx;
+					right: 50rpx;
+				}
+			}
+			.list-box{
+				width: 687.5rpx;
+				height: 137.5rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 10px 30px 0px rgba(0, 13, 51, 0.1);
+				border-radius: 16px;
+				position: absolute;
+				left: 31.25rpx;
+				top: 250rpx;
+				.check-list{
+					width: 225rpx;
+					height: 97.5rpx;
+					float: left;
+					margin-top: 40rpx;
+					margin-left: 81.25rpx;
+					.check-pic{
+						width: 38.75rpx;
+						height: 41.87rpx;
+						margin-top: 8.12rpx;
+					}
+					.list-title{
+						font-size: 25rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #292C33;
+						position: absolute;
+						left: 145rpx;
+						top: 40rpx;
+					}
+					.list-info{
+						font-size: 17.5rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #666F80;
+						position: absolute;
+						left: 145rpx;
+						top: 80rpx;
+					}
+				}
+				.improve-list{
+					width: 225rpx;
+					height:97.5rpx;
+					float: right;
+					margin-top: 40rpx;
+					margin-right: 81.25rpx;
+					.improve-pic{
+						width: 40rpx;
+						height: 40rpx;
+						margin-top: 8.12rpx;
+					}
+					.list-title{
+						font-size: 25rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #292C33;
+						position: absolute;
+						top: 40rpx;
+						left: 458.75rpx;
+					}
+					.list-info{
+						font-size: 17.5rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #666F80;
+						position: absolute;
+						top: 80rpx;
+						left: 458.75rpx;
+					}
+				}
+				.plan-list{
+					width: 225rpx;
+					height: 97.5rpx;
+					float: left;
+					margin-top: 40rpx;
+					margin-left: 81.25rpx;
+					.check-pic{
+						width: 38.75rpx;
+						height: 41.87rpx;
+						margin-top: 8.12rpx;
+					}
+					.list-title{
+						font-size: 25rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #292C33;
+						position: absolute;
+						left: 145rpx;
+						top: 40rpx;
+					}
+					.list-info{
+						font-size: 17.5rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #666F80;
+						position: absolute;
+						left: 145rpx;
+						top: 80rpx;
+					}
+				}
+			}
+			.info-box{
+				height: 823.12rpx;
+				.text-box{
+					width: 687.5rpx;
+					margin-top: 116.87rpx;
+					margin-left: 31.25rpx;
+					.info-text{
+						font-size: 22.5rpx;
+						font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+						font-weight: 400;
+						color: #292C33;
+					}
+				}
+			}
+		}
+		.button-box{
+			width: 750rpx;
+			height: 75rpx;
+			position: absolute;
+			bottom: 0rpx;
+			.btn-center{
+				background: #3377FF;
+				text-align: center;
+				.center-text{
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 75rpx;
+				}
+			}
+			.btn-left{
+				width: 375rpx;
+				height: 75rpx;
+				background: #FFFFFF;
+				float: left;
+				text-align: center;
+				border: 0.62rpx solid #DADEE6;
+				.left-text{
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #3377FF;
+					line-height: 75rpx;
+				}
+			}
+			.btn-right{
+				width: 375rpx;
+				height: 75rpx;
+				background: #3377FF;
+				float: right;
+				text-align: center;
+				.right-text{
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 75rpx;
+				}
+			}
+		}
+	}
+</style>

pages/situationsCenter/model.js

@@ -0,0 +1,14 @@
+import { commServer } from './server.js';
+
+export default {
+  namespaced: true,
+  state: {
+  },
+  mutations: {},
+  actions: {
+		commActions({ commit, state }, { payload }) {
+			// payload = {key,data} // data是请求数据，key是请求接口id
+      return commServer(payload);
+		},
+  }
+}

pages/situationsCenter/server.js

@@ -0,0 +1,13 @@
+import { creatRequest } from '../../utils/request.js';
+
+const requestList = {
+  //获取情境列表
+  situationList: {
+    method: 'GET',
+    url: 'situation/list'
+  },
+};
+export const commServer = ({ key, data }) => {
+  let obj = requestList[key];
+  return creatRequest(obj, data);
+}

pages/situationsCenter/situationsCenter.vue

@@ -0,0 +1,340 @@
+<template>
+	<view class="situationsCenter-page">
+		<view class="situation-list">
+			<view class="search-box">
+				<view class="search-model" @click="openSearchBar" v-show="isSearchBoxShow">
+					<image class="search-pic" src="/static/search.png"></image>
+				</view>
+				<view class="search-bar" v-show="isSearchBarShow">
+					<view class="search-item">
+						<image class="search-pic" src="/static/search.png"></image>
+						<image class="text-clear" @click="valueEmpty" src="/static/text-clear.png"></image>
+						<input class="searh-input" v-model="inputValue" @confirm="searchByKeywords($event)" placeholder="搜索项目" placeholder-style="font-weight: 400,color: #A1A7B3" />		
+					</view>
+					<text class="cancel-text" @click="closeSearchBar">取消</text>
+				</view>
+			</view>
+		  <scroll-view class="scroll-box" scroll-y="true" @scrolltolower="toLower" lower-threshold="184">
+				<view class="content">
+					<view class="situation" v-for="(item,index) in situationList" :key="item.id" @click="gotoDetail(item.situationID)">
+						<image class="situation-topic" :src="`/static/${item.topic ? 'situation-case' : 'situation-system'}.png`"></image>
+						<view class="title">
+							<text class="title-name">{{item.name}}</text>
+						</view>
+						<view class="check-group">
+							<text class="group-text">{{item.checkGroupName}}</text>
+						</view>
+						<view class="row">
+							<image class="situation-check" src="/static/situation-check.png"></image>
+							<text class="text">{{item.checkStatus}}</text>
+						</view>
+						<view class="row">
+							<image class="situation-time" src="/static/situation-time.png"></image>
+							<text class="text">{{item.nextCheckTime}}</text>
+						</view>
+					</view>
+				</view>
+		  </scroll-view>
+		</view>
+		<view class="situaions-add" @click="gotoCreate">
+			<image class="add-pic" src="/static/situation-add.png"></image>
+		</view>
+		<tm-tabbar :permission="nowPermission" />
+	</view>
+</template>
+/**
+ * 情境中心
+ */
+<script>
+	export default {
+		data() {
+			return {
+				page:1,//页数
+				inputValue:'',
+				nowPermission:'',
+				isSearchBarShow:false,//搜索栏是否可见
+				isSearchBoxShow:true,//搜索图标是否可见
+				situationList:[],//情境卡片列表
+				totalCount:'',//返回数据的总条数
+			}
+		},
+		created: function() {
+			this.nowPermission=uni.getStorageSync('nowPermission');
+			this.$store.dispatch({
+				type: 'situationsCenter/commActions',
+				payload: {
+					key: 'situationList',
+					data:{
+						pageNum:1,
+						pageSize:10
+					}
+				}
+			}).then((data) => {
+				if (data) {
+					this.totalCount=data.totalCount;
+					this.situationList=data.list.map((item,index)=>{
+						return{
+							name:item.name,
+							checkStatus:item.checkStatus,
+							nextCheckTime:item.nextCheckTime,
+							checkGroupName:item.checkGroupName,
+							topic:item.topic==0?true:false,
+							situationID:item.id,
+						}
+					});
+				}
+			});
+		},
+		methods: {
+			openSearchBar(){
+				this.isSearchBarShow=true;
+				this.isSearchBoxShow=false;
+			},
+			closeSearchBar(){
+				this.isSearchBarShow=false;
+				this.isSearchBoxShow=true;
+			},
+			valueEmpty(){
+			 this.inputValue='';
+			},
+			gotoCreate(){
+				uni.navigateTo({
+					url: '/pages/creatingSituations/creatingSituations'
+				});
+			},
+			gotoDetail(id){
+				uni.setStorageSync('situaionID', id);
+				uni.navigateTo({
+					url: '/pages/situationDetail/situationDetail'
+				});
+			},
+			searchByKeywords(event){
+				console.log(event);
+				this.$store.dispatch({
+					type: 'situationsCenter/commActions',
+					payload: {
+						key: 'situationList',
+						data:{
+							pageNum:1,
+							pageSize:10,
+							keyword:event.target.value,
+						}
+					}
+				}).then((data)=>{
+					if (data) {
+						this.situationList=data.list.map((item,index)=>{
+							return{
+								name:item.name,
+								checkStatus:item.checkStatus,
+								nextCheckTime:item.nextCheckTime,
+								checkGroupName:item.checkGroupName,
+								topic:item.topic==0?true:false,
+							}
+						});
+					}
+				});
+			},
+			toLower(){
+				uni.showToast({
+					title:'加载中....',
+					icon:'loading',
+					duration:2000
+				});
+				let count=this.situationList.length;
+				if(this.totalCount!=count){
+					this.page++;
+					this.$store.dispatch({
+						type: 'situationsCenter/commActions',
+						payload: {
+							key: 'situationList',
+							data:{
+								pageNum:this.page,
+								pageSize:10
+							}
+						}
+					}).then((data) => {
+						if (data) {
+							this.situationList=data.list.map((item,index)=>{
+								return{
+									name:item.name,
+									checkStatus:item.checkStatus,
+									nextCheckTime:item.nextCheckTime,
+									checkGroupName:item.checkGroupName,
+									topic:item.topic==0?true:false,
+									situationID:item.id,
+								}
+							});
+						}
+					});
+				}
+				else{
+					uni.showToast({
+						title:'没有更多数据了',
+						icon:'none',
+						duration:1000
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	.situationsCenter-page{
+		height: 100%;
+		.situation-list{
+			// display: flex;
+			// flex-flow: row wrap;
+			// margin-top: 12.5rpx;
+			position: relative;
+			.search-box{
+				position: absolute;
+				left: 25rpx;
+				top: 0rpx;
+				z-index: 2;
+				.search-model{
+					height: 62.5rpx;
+					width: 62.5rpx;
+					background-color: #FFFFFF;
+					text-align: center;
+					border-radius: 50%;
+					box-shadow: 0px 10px 10px 0px rgba(217, 221, 228, 0.5);
+					border: 1px solid #E6EAF2;
+					opacity: 0.85;
+					.search-pic{
+						width: 27.5rpx;
+						height: 27.5rpx;
+						margin-top: 17.5rpx;
+					}
+				}
+				.search-bar{
+						background-color: #FFFFFF;
+						width: 700rpx;
+						height: 62.5rpx;
+						top: 31.25rpx;
+						position: absolute;
+						z-index: 2;
+					.search-item{
+						background-color: #FFFFFF;
+						width: 593.75rpx;
+						height: 62.5rpx;	
+						float: left;
+						border-radius: 6.25rpx;
+						border: 1.25rpx solid #F0F2F7;
+						.search-pic{
+							width: 21.87rpx;
+							height: 21.87rpx;
+							margin-left:12.5rpx ;
+							margin-top: 20.62rpx;
+							float: left;
+						}
+						.searh-input{
+							background-color: #FFFFFF;
+							width: 525rpx;
+							height: 55rpx;	
+							font-size: 22.5rpx;
+							float: right;
+							margin-top: 3.75rpx;
+							margin-left: 3.12rpx;
+						}
+						.text-clear{
+							width: 21.87rpx;
+							height: 21.87rpx;
+							float: right;
+							margin-top: 20.62rpx;
+							margin-right: 6.25rpx;
+						}
+						
+					}
+					.cancel-text{
+						font-size: 22.5rpx;
+						line-height: 62.5rpx;
+						color: #A1A7B3;
+						margin-right: 31.25rpx;
+						float: right;
+					}
+				}
+				
+			}
+			
+			.scroll-box{
+				height: 1072.5rpx;
+				width: 750rpx;
+				// margin-top: 25rpx;
+				.content{
+					display: flex;
+					flex-flow: row wrap;
+					.situation{
+						height: 187.5rpx;
+						width: 337.5rpx;
+						background: #FFFFFF;
+						box-shadow: 0px 6px 20px 0px rgba(0, 13, 51, 0.1);
+						border-radius: 8px;
+						margin-left: 25rpx;
+						margin-top: 25rpx;
+						
+						.situation-topic{
+							width: 62.5rpx;
+							height: 25rpx;
+							float: right;
+						}
+						.title{
+							margin-left: 20rpx;
+							// margin-top: 31.25rpx;
+							padding-top: 25rpx;
+							.title-name{
+								font-size: 22.5rpx;
+								font-family: SourceHanSansCN-Bold, SourceHanSansCN;
+								font-weight: bold;
+								color: #292C33;
+							}
+						}
+						.check-group{
+							margin-left: 20rpx;
+							margin-top: 15rpx;
+							margin-bottom: 7.5rpx;
+							.group.text{
+								font-size: 17.5rpx;
+								font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+								font-weight: 400;
+								color: #666E80;
+							}
+						}
+						.row{
+							margin-left: 20rpx;
+							margin-top: 17.5rpx;
+							.situation-check{
+								width: 20rpx;
+								height: 20rpx;
+							}
+							.situation-time{
+								width: 20rpx;
+								height: 20rpx;
+							}
+							.text{
+								font-size: 20rpx;
+								font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+								font-weight: 400;
+								color: #292C33;
+								margin-left: 11.25rpx;
+							}
+							
+						}
+					}
+				}
+				
+			}
+			
+			
+		}
+		.situaions-add{
+			position: absolute;
+			right: 25rpx;
+			bottom: 130rpx;
+			.add-pic{
+				width: 75rpx;
+				height: 75rpx;
+			}
+		}
+	}
+</style>