优化

pages/auditItemDetails/auditItemDetails.vue

@@ -69,11 +69,13 @@
 					lastResult: '',
 					checkResult: '',
 					checkItemName: '',
-					checkResultRequestList: []
+					checkResultRequestList: [],
+					checkPointId: ''
 				}
 			};
 		},
-		onLoad: function ({id}) {
+		onLoad: function ({id, checkPointId}) {
+			this.checkPointId = checkPointId;
 			this.dispatch('checkTaskDetail', {id}).then((data)=>{
 				if(data) {
 					this.detail = data;
@@ -87,7 +89,7 @@
 			goLegendDetails(checkItemId) {
 				//跳转到图例详情
 				uni.navigateTo({
-					url: `/pages/legendDetails/legendDetails?checkItemId=${checkItemId}`
+					url: `/pages/legendDetails/legendDetails?checkItemId=${checkItemId}&checkPointId=${this.checkPointId}`
 				});
 			},
 			dispatch(key, data) {

pages/checkList/server.js

@@ -22,9 +22,9 @@ const requestList = {
 	  url: 'checkTask/checkTaskDetail',
 	}, 
 	// 获取查核任务正确答案（小灯泡）
-	rightAnswer: {
+	getArticle: {
 	  method: 'GET',
-	  url: 'checkTask/rightAnswer',
+	  url: 'article/getArticle',
 	}, 
 };
 

pages/checkMainPoints/checkMainPoints.vue

@@ -41,7 +41,7 @@
 			<view class="title" v-if="item.responseList.length > 0">查核要点：{{item.checkPointName}}</view>
 			<view class="item" 
 				v-for="(child, n) in item.responseList" 
-				@click="childClick(child)"
+				@click="childClick(child,item.checkPointId)"
 				:key="n">
 				<view class="top-box">
 					<view class="top-box-left">
@@ -50,7 +50,7 @@
 						<!-- <text>ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)的抢救全过程(访谈)</text> -->
 					</view>
 					<image src="../../static/tuli.png" 
-						@click="goLegendDetails($event ,child.checkItemId)"></image>
+						@click="goLegendDetails($event ,child.checkItemId, item.checkPointId)"></image>
 				</view>
 				<view class="children">
 					<view class="child">
@@ -117,7 +117,7 @@
 				this.active = id;
 				this.filterCompleteFlag(id);
 			},
-			childClick(child) {
+			childClick(child, checkPointId) {
 				// 查核者，管理员
 				if(this.nowPermission == 1 || this.nowPermission == 3) { 
 					let str = '';
@@ -131,13 +131,14 @@
 							  content: '请切换至查核者角色再进行查核操作！',
 							  showCancel: false
 							});
+							return;
 						} else {
 							// 跳转到查核结果提交
 							str = 'mainPointsDetail/mainPointsDetail';
 						}
 					}
 					uni.navigateTo({
-						url: `/pages/${str}?id=${child.id}`
+						url: `/pages/${str}?id=${child.id}&checkPointId=${checkPointId}`
 					});
 				}
 			},
@@ -184,11 +185,11 @@
 					});
 				}
 			},
-			goLegendDetails(e, checkItemId) {
+			goLegendDetails(e, checkItemId, checkPointId) {
 				_stopPropagation(e);
 				//跳转到图例详情
 				uni.navigateTo({
-					url: `/pages/legendDetails/legendDetails?checkItemId=${checkItemId}`
+					url: `/pages/legendDetails/legendDetails?checkItemId=${checkItemId}&checkPointId=${checkPointId}`
 				});
 			},
 			dispatch(key, data) {

pages/creatingSituations/components/condition.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="condition">
 		<view class="title">请选择追踪条件（可多选）</view>
-		<view class="select-btn">
+		<view class="select-btn" v-if="theme.id === 0">
 			<text>选择门诊或急诊</text>
 			<view>
 				<button :class="{active: condition.depType === 1}" 
@@ -39,7 +39,7 @@
 					data: this.editConfig.condition
 				});
 			} else if(this.needReload) {
-				this.getOptions(this.condition.depType);
+				this.getOptions(this.theme.id === 1 ? 1 :this.condition.depType);
 			}
 		},
 		methods: {

pages/home/home.vue

@@ -58,11 +58,11 @@
 		<tm-modal v-if="showJournal">
 			<view class="journal">
 				<view class="journal-title">
-					<text>{{journalData.versionTitle}}</text>
-					<text>{{journalData.versionDate}}</text>
+					<text>{{journalData.logTitle}}</text>
+					<text>{{journalData.logDate}}</text>
 				</view>
 				<scroll-view scroll-y="true" class="journal-content">
-					{{journalData.versionContent}}
+					{{journalData.logContent}}
 				</scroll-view>
 				<button class="journal-ok" @click="journalOk">确定</button>
 			</view>
@@ -77,10 +77,10 @@
 				showJournal: false,
 				version: '0.5.3',
 				journalData: {
-					versionId: '',
-					versionTitle: '',
-					versionDate: '',
-					versionContent: ''
+					logId: '',
+					logTitle: '',
+					logDate: '',
+					logContent: ''
 				},
 				nowPermission: '', //用户当前第一权限
 				nowPermissionName:'',//当前权限名
@@ -130,8 +130,12 @@
 				}
 			}).then((data) => {
 				if (data) {
-					this.showJournal = data.versionId ? true : false;
-					this.journalData = data;
+					if(!data.logId) {
+						this.showJournal = false;
+					} else {
+						this.showJournal = true;
+						this.journalData = data;
+					}
 				}
 			});
 		},
@@ -161,7 +165,7 @@
 					type: 'home/commActions',
 					payload: {
 						key: 'hadRead',
-						data: {versionNo: this.version, versionId: this.journalData.versionId}
+						data: {versionNO: this.version, versionId: this.journalData.logId}
 					}
 				});
 			}
@@ -183,8 +187,9 @@
 		transform: translateX(-50%) translateY(-50%);
 		border-radius: 15rpx;
 		padding: 50rpx;
+		padding-bottom: 75rpx;
 		width: 562.5rpx;
-		height: 625rpx;
+		// height: 625rpx;
 		font-size: 22.5rpx;
 		line-height: 35rpx;
 		background: #FFFFFF;
@@ -202,8 +207,8 @@
 			}
 		}
 		.journal-content {
-			margin-top: 25rpx;
-			height: 332.5rpx;
+			margin: 25rpx 0;
+			max-height: 332.5rpx;
 		}
 		.journal-ok {
 			position: fixed;

pages/legendDetails/legendDetails.vue

@@ -1,11 +1,27 @@
 <template>
 	<view class="legendDetails">
 		<view class="box-item">
-			<view>图例介绍</view>
-			<view>{{rightAnswer.rightAnswerText}}</view>
+			<view>条款</view>
+			<view v-if="rightAnswer.articleVersions">
+				<text class="articleVersions" v-for="(item, index) in rightAnswer.articleVersions">{{item}}</text>
+			</view>
 		</view>
 		<view class="box-item">
-			<view>图例图片</view>
+			<view>条文</view>
+			<view v-if="rightAnswer.articleName">
+				<view v-for="(item, index) in rightAnswer.articleName">{{item}}</view>
+			</view>
+		</view>
+		<view class="box-item">
+			<view>制度名称</view>
+			<view>{{rightAnswer.ruleName}}</view>
+		</view>
+		<view class="box-item">
+			<view>应知应会</view>
+			<view>{{rightAnswer.pfmName}}</view>
+		</view>
+		<view class="box-item">
+			<view>图例</view>
 			<view class="img-wrap">
 				<image mode="widthFix"
 					v-for="(img, i) in getArr" 
@@ -24,19 +40,22 @@
 		data() {
 			return {
 				rightAnswer: {
-					rightAnswerText: '',
-					rightAnswerImage: ''
+					articleVersions: [],
+					articleName: [],
+					ruleName: '',
+					pfmName: '',
+					picUrl: '',
 				}
 			};
 		},
 		computed: {
 			getArr() {
-				const {rightAnswerImage} = this.rightAnswer;
-				return rightAnswerImage ? rightAnswerImage.split(',') : [];
+				const {picUrl} = this.rightAnswer;
+				return picUrl ? picUrl.split(',') : [];
 			}
 		},
-		onLoad: function ({checkItemId}) {
-			this.dispatch('rightAnswer', {checkItemId}).then((data)=>{
+		onLoad: function ({checkItemId, checkPointId}) {
+			this.dispatch('getArticle', {checkItemId, checkPointId}).then((data)=>{
 				if(data) {
 					this.rightAnswer = data;
 				}
@@ -64,6 +83,9 @@
 			}
 			>view {
 				width: 100%;
+				.articleVersions {
+					margin-right: 10rpx;
+				}
 				&:first-child {
 					width: 175rpx;
 					white-space: nowrap;

pages/mainPointsDetail/mainPointsDetail.vue

@@ -223,6 +223,7 @@ export default {
       editIndex: null,
       resultConfigList: [],
       id: "",
+      checkPointId: "",
     };
   },
   mounted() {
@@ -413,7 +414,7 @@ export default {
                       },
                     }).then(() => {
                       uni.navigateTo({
-                        url: `/pages/auditItemDetails/auditItemDetails?id=${this.data.id}`,
+                        url: `/pages/auditItemDetails/auditItemDetails?id=${this.data.id}&checkPointId=${this.checkPointId}`,
                       });
                     });
                 }
@@ -429,7 +430,7 @@ export default {
     },
     toTuLi() {
       uni.navigateTo({
-        url: `/pages/legendDetails/legendDetails?checkItemId=${this.data.checkItemId}`,
+        url: `/pages/legendDetails/legendDetails?checkItemId=${this.data.checkItemId}&checkPointId=${this.checkPointId}`,
       });
     },
     toHistory() {
@@ -438,8 +439,9 @@ export default {
       });
     },
   },
-  onLoad({ id }) {
+  onLoad({ id, checkPointId }) {
     this.id = id;
+    this.checkPointId = checkPointId;
   },
 };
 </script>

pages/mission-details/mission-details.vue

@@ -179,7 +179,7 @@
         if(detailInfo.navigateUrl){ // 跳转其他页面(如查核项详情) 目前hasAnyData都为false
           const {navigateUrl, key, isOutvalueKey, hasAnyData} = detailInfo;
           uni.navigateTo({
-            url: `${detailInfo.navigateUrl}?id=${(isOutvalueKey ? this.missionDetails : currentInfo)[detailInfo.key]}`
+            url: `${detailInfo.navigateUrl}?id=${(isOutvalueKey ? this.missionDetails : currentInfo)[detailInfo.key]}&checkPointId=${this.missionDetails.checkPointId}`
 				  });
         }else {
           uni.navigateTo({

pages/role-switching/role-switching.vue

@@ -3,7 +3,7 @@
 		<view class="row-box">
 			<view class="role-list" v-for="(item,index) in permissionList" :key="index">
 				<text class="role-name">{{item.label}}</text>
-				<view class="radio-item" @click="toggleSelect(item,index)">
+				<view class="radio-item" @click="toggleSelect(item)">
 					<image class="icon" :src="`/static/${item.isChecked ? 'check-radio' : 'check-no'}.png`"></image>
 				</view>
 				<text class="nowrole" v-show="item.isNowRole" >当前角色</text>
@@ -55,11 +55,11 @@
 			this.oldPermission = obj ? obj.value : '';
 		},
 		methods: {
-			toggleSelect(item,index) {
-				this.permissionList.map((item,index)=>{
-					item.isChecked=false;
+			toggleSelect(item) {
+				this.permissionList.map((ntem,n)=>{
+					ntem.isChecked = ntem.value === item.value ? true : false;
 				});
-				this.permissionList[item.value-1].isChecked=true;
+				// this.permissionList[item.value-1].isChecked=true;
 			},
 			saveChange(){
 				let obj = this.permissionList.find((item)=>item.isChecked);

pages/situationDetail/situationDetail.vue

@@ -334,7 +334,7 @@
 					color: #FFFFFF;
 					position: absolute;
 					left: 55rpx;
-					top: 195rpx;
+					top: 240rpx;
 				}
 				.team-text{
 					font-size: 20rpx;
@@ -354,7 +354,7 @@
 				border-radius: 16px;
 				position: absolute;
 				left: 31.25rpx;
-				top: 250rpx;
+				top: 280rpx;
 				.check-list{
 					width: 225rpx;
 					height: 97.5rpx;
@@ -447,7 +447,8 @@
 				}
 			}
 			.info-box{
-				// height: 823.12rpx;
+				overflow: hidden;
+				padding-bottom: 20rpx;
 				.text-box{
 					width: 687.5rpx;
 					margin-top: 116.87rpx;

utils/requestUrl.js

@@ -1,4 +1,4 @@
-// export const URL = 'http://192.168.38.140:8088'; // 李磊
+// export const URL = 'http://192.168.51.80:8801'; // 本地
 // export const URL = 'http://192.168.38.174:8088';
 // export const URL = 'http://192.168.1.45:8088'; //内网
 // export const URL = 'http://s1.nsloop.com:5137';  // 外网