none

manifest.json

@@ -2,7 +2,7 @@
     "name" : "追踪方法学",
     "appid" : "__UNI__03C4C69",
     "description" : "",
-    "versionName" : "0.6.6",
+    "versionName" : "0.6.7",
     "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {

pages/batchDistribution/batchDistribution.vue

@@ -97,17 +97,20 @@
 			this.clearTimer();
 		},
 		methods: {
-			getComponentInfo(details) {
+			getComponentInfo(details) {
+		
 				const {
 					checkGroupId,
 					situationType,
 					checkId,
-					deptId,
+					// deptId,
+					checkedList,
 					empId,
 					empName,
 					categoryId
 				} = details;
 				this.details = details;
+				const deptId = checkedList.join(',');
 				this.getEmpDeptTree(checkGroupId, situationType,deptId);
 				//查核人回显
 				if(empId&&empName){

pages/checkMainPoints/checkMainPoints.vue

@@ -92,8 +92,9 @@
 								<text>{{child.checkItemName}}</text>
 								<!-- <text>ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)的抢救全过程(访谈)</text> -->
 							</view>
-							<view class="topRightGroup">
-								<view class="checkStatus" @click.stop="checkNoApplicable(child)">
+							<view class="topRightGroup">
+								<!-- showNotApplicable==0展示，1不展示 -->
+								<view class="checkStatus" v-if="!child.showNotApplicable" @click.stop="checkNoApplicable(child)">
 									<image v-if="child.isNoApplicable&&!notApplicableList.includes(child.id)" class="checkIcon"
 										src="../../static/check-no.png" mode=""></image>
 									<image v-if="notApplicableList.includes(child.id)||!child.isNoApplicable" class="checkIcon"
@@ -465,7 +466,9 @@
 									"pages/checkList/checkList") {
 									uni.showModal({
 										title: '提示',
-										content: '目前未批量分配当事人，是否前往选择？',
+										content: '目前未批量分配当事人，是否前往选择？',
+										confirmText:'前往设置',
+										cancelText:'暂不设置',
 										success: (res) => {
 											if (res.confirm) {
 												uni.navigateTo({

pages/creatingSituations/components/situationPreview.vue

@@ -70,6 +70,12 @@
 					type="number" />
 				<text>天前提醒</text>
 			</view>
+			<view class="setIfShowNotApplicable" @click="setIfShowNotApplicable">
+				<text>是否需要不适用场景</text>
+				<image class="icon"
+					:src="`/static/${situationPreview.showNotApplicable == 0 ? 'check-checkbox' : 'check-no'}.png`">
+				</image>
+			</view>
 		</view>
 	</view>
 </template>
@@ -99,7 +105,7 @@
 		methods: {
 			...mapMutations(['comChangeState']),
 			situationTypeChanged(type,name){
-				console.log({type,name});
+				// console.log({type,name});
                 this.$store.commit('creatingSituations/comChangeState',{key:'situationPreview',data:{...this.situationPreview,situationType:type}});
 			},
 			selectSituationType(){
@@ -122,6 +128,10 @@
 				uni.navigateTo({
 					url: '/pages/checkMapList/checkMapList'
 				});
+			},
+			setIfShowNotApplicable(){
+				const showNotApplicable = this.situationPreview.showNotApplicable;
+				this.$store.commit('creatingSituations/comChangeState',{key:'situationPreview',data:{...this.situationPreview,showNotApplicable:showNotApplicable?0:1}});
 			}
 		}
 	}
@@ -231,6 +241,7 @@
 					white-space: nowrap;
 					color: #292C33;
 				}
+				
 				>input {
 					padding: 0 9.37rpx;
 					width: 80rpx;
@@ -267,6 +278,16 @@
 					}
 				}
 			}
+			.setIfShowNotApplicable {
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				.icon {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 25rpx;
+				}
+			}
 			.situationType {
 				position: relative;
 				.typeValue {

pages/creatingSituations/creatingSituations.vue

@@ -106,7 +106,6 @@
 				this.editID = id;
 				this.dispatch('detialConfig',{id}).then((data)=>{
 					if(data) {
-						console.log({data});
 						const {topic} = data;
 						let theme = themeList[Number(topic)],
 							condition = editCondition(data),
@@ -143,10 +142,10 @@
 		},
 		methods: {
 			save: function() {
-				const {sitName,preDay,preH,startDay, description,situationType} = this.situationPreview;
+				const {sitName,preDay,preH,startDay, description,situationType,showNotApplicable} = this.situationPreview;
 				const {dateObj,checkedItem,checkList} = this.checkPlan;
 				const {depType, options, conditionIds} = this.condition;
-				console.log({preDay,preH});
+
 				if(!sitName || sitName.length < 2) {
 					uni.showModal({
 						title: '温馨提示',
@@ -197,6 +196,7 @@
 					remindPlanHour: preH,
 					remindCheckDay: startDay,
 					depType,
+					showNotApplicable:showNotApplicable,
 					situationType:situationType,
 					filterCondition: optionsHandle(options, conditionIds),
 					checkGroup: checkGroup(this.checkRent),

pages/creatingSituations/model.js

@@ -1,7 +1,6 @@
 import { commServer } from './server.js';
 import {dateHandle} from "../../utils/dateHandle.js";
 
-console.log('dateHandle.todayDate()',dateHandle.todayDate());
 	
 const initState = {
 	showCheckMapDetail: false,
@@ -40,7 +39,8 @@ const initState = {
 		preDay: null,
 		preH: null,
 		startDay: null,
-		situationType:1
+		situationType:1,
+		showNotApplicable:0, //情境是否需要展示不适用快捷按钮 0 展示 1不展示
 	},
 	situationTypeList:[],//情境类型列表
 	editConfig: null // 编辑时候的原始数据

pages/editCheckList/editCheckList.vue

@@ -2,7 +2,7 @@
 	<view class="check-map-list">
 		<scroll-view :class="[ifAllPlanListHasDistribution==true?'scroll-y noBottom':'scroll-y']" scroll-y="true" v-if="checkList.length > 0">
 			<view class="item" v-for="(item, index) in checkList" :key="index">
-				<view v-if="multiple != 'true'&&ifStartCheck(item.startDate)"
+				<view v-if="multiple != 'true'&&ifStartCheck(item.startDate)&&!item.isDistribution"
 					:class="{'checkPoint':true,checked:checkedList.includes(item.deptId)}"
 					@click="checkedHandle(item.deptId)">
 					<image class="innerImg" v-if="checkedList.includes(item.deptId)"
@@ -174,7 +174,9 @@
 				return true;
 
 			},
-			bottomBtnClickHandle(key) {
+			bottomBtnClickHandle(key) {
+				
+				
 
 				let details = {
 					index: '', // 修改的下标

pages/home/home.vue

@@ -99,7 +99,7 @@
 			return {
 				ifshowVersionInfo:false,
 				showJournal: false,
-				version: '0.6.6',
+				version: '0.6.7',
 				versionData: {
 					versionNo: '',
 					versionId: '',

pages/login/login.vue

@@ -1,25 +1,17 @@
 <template>
 	<view class="login-page">
-		<view class="com-model">
-			<view class="top-box">
-				<image class="pic" src="/static/images/shade.png"></image>
-				<text class="title-top" @click="openModal">你好，</text>
-				<text class="title-buttom">欢迎使用追踪方法学系统</text>
-			</view>
-			<view class="main-content">
-				<input class="uni-input-box"
-				  placeholder="请输入账号"
-					placeholder-style="color: #A1A7B3"
-					v-model="username" />
-				<input class="uni-input-box"
-				    placeholder="请输入密码"
-					placeholder-style="color: #A1A7B3"
-					password
-					v-model="password" />
-				<com-button class="login-button"
-					:width="998" :height="120" :fontSize="48" :background="isLogin?'#A3B1CC':''" btnText="登录" @btnClick="login" />
-			</view>
+		<image class="bgImage" src="/static/images/shade.png"></image>
+		<text class="titleOne row" @click="openModal">你好，</text>
+		<view class="titleTwo row">欢迎使用追踪方法学系统</view>
+		<view class="inputArea">
+	       <input class="inputTag" type="text" placeholder="请输入账号" placeholder-class="inputTagHolderPlace" v-model="username"  />
 		</view>
+		<view class="inputArea pwd">
+		   <input class="inputTag" password="true" type="text" placeholder="请输入密码" placeholder-class="inputTagHolderPlace"  v-model="password" />
+		</view>
+		
+		<button :class="[isInput?'loginBtn on':'loginBtn']" type="default" @click="login" >登录</button>
+		
 		<tm-modal v-if="showInputModal" @click="clickModalhandle">
 			<view class="checkItemResultModal">
 				 <view class="modalContent">
@@ -54,6 +46,11 @@
 				]
 			}
 		},
+		computed:{
+			isInput:function(){
+				return (this.username.length>0&&this.password.length>0)?true:false
+			}
+		},
 		onLoad({ hospSign }){
 			  this.hospSign = hospSign;
 			  // #ifdef APP-PLUS
@@ -65,7 +62,7 @@
 			  // #endif
 		},
 		mounted(){
-
+            console.log(this.username);
 		},
 		methods: {
 			openScanner(){
@@ -145,20 +142,94 @@
 					}
 				}
 			}
-		},
-		computed:{
-			//判断是否输入了用户名和密码
-			isLogin(){
-				return !this.username || !this.password;
-			}
 		}
 	}
 </script>
 
 <style lang="less" scoped>
 	.login-page {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
 		height:100vh;
+		padding: 0 62.5rpx;
+		padding-bottom: 100rpx;
 		background-color: #FFFFFF;
+		.bgImage {
+			position: absolute;
+			right: 0;
+			top:0;
+			width: 430rpx;
+			height: 281.25rpx;
+		}
+		.row {
+			font-size: 45rpx;
+			font-family: SourceHanSansCN-Bold, SourceHanSansCN;
+			font-weight: bold;
+			color: #2E2F33;
+			line-height: 67.5rpx;
+		}
+		.titleTwo {
+			margin-bottom: 75rpx;
+		}
+		.inputArea {
+			height: 80rpx;
+			margin-bottom: 37.5rpx;
+			border-bottom: 1.25rpx solid #E6EAF2;
+			input {
+				-webkit-box-shadow: 0 0 0 1000px white inset;
+			}
+			.inputTag {
+				height: 100%;
+				width: 100%;
+				font-size: 30rpx;
+				font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+				font-weight: 500;
+				color: #292C33;
+				
+				// &.-internal-autofill-selected {
+				// 	background-color:#FFFFFF;
+				// }
+			}
+			// /deep/.inputTag .uni-input-input {
+			// 	font-size: 30rpx;
+			// 	font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+			// 	font-weight: 500;
+			// 	color: #292C33;
+			// 	box-shadow: 0 0 0 54rpx #fff inset;
+			// }
+			.inputTagHolderPlace {
+				font-size: 30rpx;
+				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+				font-weight: 400;
+				color: #B8BECC;
+			}
+			// /deep/.inputTag .uni-input-placeholder {
+			// 	font-size: 30rpx;
+			// }
+			&.pwd {
+				margin-bottom: 62.5rpx;
+			}
+		}
+		.loginBtn {
+			display: block;
+			width: 100%;
+			height: 75rpx;
+			text-align: center;
+			line-height: 75rpx;
+			font-size: 30rpx;
+			font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+			font-weight: 400;
+			color: #FFFFFF;
+			background: #A3B1CC;
+			border-radius: 37.5rpx;
+			border:none;
+			background-color: #A3B1CC;
+			&.on {
+				background: linear-gradient(90deg, #3377FF 0%, #4D97FF 100%);
+			}
+		}
+		
 		.checkItemResultModal {
 			  display: flex;
 			  height: 100%;
@@ -205,53 +276,7 @@
 				   }
 			  }
 		}
-		.top-box {
-			display: flex;
-			flex-direction: column;
-			padding-left: 62.5rpx;
-			.pic{
-				position: absolute;
-				top: 0;
-				right: 0;
-			    width: 430rpx;
-				height: 281.25rpx;
-			}
-			.title-top{
-				height: 45rpx;
-				font-size: 45rpx;
-				font-weight: bold;
-				margin-top: 250rpx;
-				font-family: SourceHanSansCN-Bold, SourceHanSansCN;
-				color: #2E2F33;
-			}
-			.title-buttom{
-				 margin-top: 40rpx;
-				 height: 45rpx;
-				 font-size: 45rpx;
-				 font-family: SourceHanSansCN-Bold, SourceHanSansCN;
-				 font-weight: bold;
-				 color: #2E2F33;
-			}
-		}
-		.main-content{
-			 margin-top: 37.5rpx;
-			 float: left;
-		}
-		.uni-input-box{
-			 width: 625rpx;
-			 float: left;
-			 margin-left: 62.5rpx;
-			 margin-top: 62.5rpx;
-			 font-size: 30rpx;
-			 padding-bottom: 25rpx;
-			 border-bottom:1.25rpx solid #E6EAF2 ;
-		}
-		.login-button{
-			  float: left;
-			  margin-left: 62.5rpx;
-			  margin-top: 62.5rpx;
-			  background-color: #A3B1CC;
-		}
+
   }
 
 </style>

pages/mainPointsDetail/mainPointsDetail.vue

@@ -108,7 +108,7 @@
 			</view>
 			<view class="box">
 				<text class="lable">本次得分</text>
-				<text class="currentScore">{{currentScore}}</text>
+				<text class="currentScore">{{currentScore>0?currentScore:0}}</text>
 			</view>
 		  </view>
 		  <view class="inputScore">
@@ -237,7 +237,7 @@ export default {
 	  checkItemValue:null,//查核选中的分数占比
 	  checkConfiglist:[],//查核情况可配置列表
 	  totalScore:0,//总分
-	  // currentScore:0,//当前得分
+	  currentScore:0,//当前得分
 	  inputScore:null,//手动填写分值
 	  selectedScore:0,//缺失项分值
 	  checkedResponsibleList:[],
@@ -245,7 +245,7 @@ export default {
 	  checkedResponsibleData:[],
 	  checkedSelectResultListData:[],
 	  multiSelectScore:[],
-	  deductPointFromRes:0,
+	  deductPoint:0,//本次扣分
     };
   },
   onShow() {
@@ -254,27 +254,6 @@ export default {
   	this.checkedResponsibleList = responsibleList.checkedResponsibleList.map(item=>item.main);
   },
   computed:{
-	  currentScore:{
-		 get: function () {
-			   if(this.inputScore>0){
-				   const tempCount = this.totalScore  - this.inputScore;
-				   return tempCount > 0?tempCount:0;
-			   }
-               const tempCount = (this.totalScore-this.selectedScore-this.checkItemScore-this.deductPointFromRes).toFixed(2);
-		       return tempCount>=0?tempCount:0;
-		 },
-		 set:function(newValue){
-		
-		 },
-		 
-	  },
-	  deductPoint:function(){
-		  // console.log(Number(this.inputScore),Number(this.selectedScore),Number(this.checkItemScore));
-		  if(this.inputScore){
-			   return this.inputScore;
-		  }
-		  return (this.deductPointFromRes-Number(this.inputScore)+Number(this.selectedScore)+Number(this.checkItemScore)).toFixed(2)
-	  }
   },
   watch:{
 	  checkedResponsibleList:function(){
@@ -330,7 +309,7 @@ export default {
 	},
 	onInputScore(e){
 		this.inputScore = e.target.value;
-		this.currentScore = e.target.value;
+		this.currentScore = this.totalScore - e.target.value;
 	},
     selectResultHandle(item){
 	
@@ -395,6 +374,12 @@ export default {
 			this.talkList[this.currentEditTextAreaIndex].talkResult = this.checkedSelectResultList[this.currentEditTextAreaIndex].join(',');
 			this.multiSelectScore[this.currentEditTextAreaIndex] = tempScore;
 			this.selectedScore = this.multiSelectScore.reduce((prev,cur)=>(prev+cur),0);
+			
+			if(!this.inputScore){
+				this.deductPoint = this.checkItemScore+this.selectedScore;
+				this.currentScore = this.totalScore - this.deductPoint;
+			}
+			
 		 
 		}else {
 			const tempArr = this.checkedSelectResultListData.map(item=>item.percentScore);
@@ -403,6 +388,11 @@ export default {
 			},0);
 			this.recordList[0].seeResult = this.checkedSelectResultList.join(',');
 			this.selectedScore = tempScore;
+			
+			if(this.inputScore){
+				this.deductPoint = this.checkItemScore+this.selectedScore;
+				this.currentScore = this.totalScore - this.deductPoint;
+			}
 		}
 
 		this.showSelectModal = false;
@@ -421,15 +411,15 @@ export default {
 		  this.deptId = res.deptId;
 		  //再次编辑回显
 		  const filePath = res.checkResultTxt?JSON.parse(res.checkResultTxt):[];
-		  this.filePath = filePath[0]&&filePath[0].checkResultUrl.split(',');
+		  this.filePath = filePath[0]&&filePath[0].checkResultUrl != ''?filePath[0].checkResultUrl.split(','):[];
 		  this.Index = res.checkResult;
 		  this.totalScore = res.totalScore;
-		  this.deductPointFromRes = res.deductPoint;
-		
-		  if(res.lastResult){
-			  const lastConfig = this.checkConfiglist.filter(item=>item.attr == res.lastResult);
-			  this.checkItemScore = lastConfig[0].score*lastConfig[0].value;
-		  }
+		  this.deductPoint = res.deductPoint;
+		  this.currentScore = res.score;
+		  // if(res.lastResult){
+			 //  const lastConfig = this.checkConfiglist.filter(item=>item.attr == res.lastResult);
+			 //  this.checkItemScore = lastConfig[0].itemGetScore;
+		  // }
 		  
 		  // this.deductPoint = res.deductPoint;
 		  if(res.checkResultRequestList&&res.checkResultRequestList.length>0){
@@ -462,7 +452,7 @@ export default {
 			      			  			  } 
 			      			  });
 			      			  //设置回显分数
-			      			  // this.selectedScore = this.multiSelectScore.reduce((prev,cur)=>(prev+cur),0);
+			      			  this.selectedScore = this.multiSelectScore.reduce((prev,cur)=>(prev+cur),0);
 							  
 			      }else {
 					    //       console.log('非访谈');
@@ -537,6 +527,10 @@ export default {
 		this.checkItemScore = parsedData.itemGetScore;
 		this.checkItemValue = parsedData.value;
 		this.calScore = parsedData.calScore;
+		if(!this.inputScore){
+			this.deductPoint = parsedData.itemGetScore;
+			this.currentScore = this.totalScore - parsedData.itemGetScore;
+		}
 		
    //    this.Index = data;
 	  // this.data.checkResult = data;

utils/compatible.js

@@ -21,7 +21,7 @@ export const _goBackFresh = (pathName,bool)=>{
 	const pages = getCurrentPages();
 	const reversed = pages.reverse();
 	const currentPageIndex = 0;
-	// console.log({reversed,pages});
+	console.log({reversed,pages});
 
 	if(true){
 		pages.some((item,index)=>{

utils/dateHandle.js

@@ -12,7 +12,6 @@ export const dateHandle = {
 		var year = date.getFullYear();
 		var month = date.getMonth() + 1;
 		var day = date.getDate();
-		console.log(dateHandle.add0(day))
 		return year + "-" + dateHandle.add0(month) + "-" + dateHandle.add0(day);
 	},
 	/**

utils/requestUrl.js

@@ -7,12 +7,14 @@
  * @FilePath: /web_TracerMethodology/utils/requestUrl.js
  */
 // const base = '192.168.51.80:8801/imed/pfm/';
-export const URL = '192.168.51.80:8801/imed/pfm/'; // 本地
+
+// export const URL = '192.168.51.80:8801/imed/pfm/'; // 本地
+
 // export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
 // export const URL = '192.168.38.174:8088/imed/pfm/';
 // export const URL = '192.168.1.45:8088/imed/pfm/'; //内网
 // export const URL = 's1.nsloop.com:5137/imed/pfm/';  // 外网
-// export const URL = '121.43.139.179:8801/imed/pfm/';  // 云端服务1
+export const URL = '121.43.139.179:8801/imed/pfm/';  // 云端服务1
 // export const URL = '172.18.116.20:8801/imed/pfm/';  // 云端服务2
 
 // export const URL = '172.18.116.20:9002/imed/pfm/';  // 云端服务2