fixed bug

App.vue

@@ -10,9 +10,9 @@
 			// 	});
 			// }
 			if (uni.getSystemInfoSync().platform === 'android'){
-				//pad下锁死竖屏
+				//pad下锁死竖屏适配布局
 				// #ifdef APP-PLUS
-				plus.screen.lockOrientation('portrait-primary');
+				   plus.screen.lockOrientation('portrait-primary');
 				// #endif
 			}
 			
@@ -24,30 +24,16 @@
 			uni.getSystemInfo({
 			    success(e){
 			        /* 窗口宽度大于420px且不在PC页面且不在移动设备时跳转至 PC.html 页面 */
-			        if(e.windowWidth>420 && !window.top.isPC && !/iOS|Android/i.test(e.system)){
-						
-					    let hospSign = '';
-						let query = window.location.search.substring(1);
-					    let vars = query.split("=");
-					    for (let i=0;i<vars.length;i++) {
-							
-							   if(vars[i] == 'hospSign'){
-								   hospSign=vars[i+1];
-							   }
-					    }
-						uni.removeStorageSync('hospSign');
-						uni.setStorageSync('hospSign',hospSign);
+					console.log(e,window.top.isPC,!/iOS|Android/i.test(e.system));
 					
-						console.log({hospSign,query,vars});
-						
+			        if(e.windowWidth>420 && !window.top.isPC && !/iOS|Android/i.test(e.system)){
 						
 						const url = decodeURIComponent(`/TracerMethodology/static/html/template.html`);
-						console.log({hospSign,url});
+						// console.log({hospSign,url});
 						window.location.pathname = url;
 							
-						
-			 
-			            /* 若你的项目未设置根目录（默认为 / 时），则使用下方代码 */
+		
+			            /* 若项目未设置根目录（默认为 / 时），则使用下方代码 */
 			            // window.location.pathname = '/static/html/pc.html';
 			        }
 			    }

components/app-update/app-update.vue

@@ -70,7 +70,7 @@
 		mounted() {
 			const updateRejectStart = uni.getStorageSync('updateRejectStart');
 			const updateRejectCurrent = new Date().getTime();
-			const timeLeft = updateRejectCurrent-(updateRejectStart?updateRejectStart:9999999999999999999999999999);
+			const timeLeft = updateRejectCurrent-(updateRejectStart?updateRejectStart:0);
 			console.log({updateRejectStart,updateRejectCurrent,timeLeft});
 			if(timeLeft>=600000){
 				   this.getSystemInfo() //获取系统新
@@ -102,33 +102,13 @@
 				});
 				// 获取版本号
 				// #ifdef APP-PLUS
-				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-					vm.version = inf.version
+				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+					console.log({inf});
+					vm.version = inf.version
+					vm.getUpdateInfo(); //获取更新信息
 				});
 				// #endif
-				// #ifdef APP-PLUS
-				vm.getUpdateInfo(); //获取更新信息
-				// #endif
-				// // #ifdef APP-PLUS
-				// plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
-				// 		//appid属性
-				// 		var wgtStr = "appid:"+wgtinfo.appid;
-				// 		//version属性
-				// 		wgtStr += "<br/>version:"+wgtinfo.version;
-				// 		//name属性
-				// 		wgtStr += "<br/>name:"+wgtinfo.name;
-				// 		//description属性
-				// 		wgtStr += "<br/>description:"+wgtinfo.description;
-				// 		//author属性
-				// 		wgtStr += "<br/>author:"+wgtinfo.author;
-				// 		//email属性
-				// 		wgtStr += "<br/>email:"+wgtinfo.email;
-				// 		//features 属性
-				// 		wgtStr += "<br/>features:"+wgtinfo.features;
-				// 		console.log( wgtStr );
-				// 	} );
-			    
-    //             // #endif
+		
 			},
 
 			// 获取线上版本信息
@@ -138,7 +118,7 @@
 					method: 'GET',
 					url: 'versionInfo/getVersionData'
 				}
-		
+		        console.log('当前版本',vm.version);
 				creatRequest(obj,{versionNo:vm.version}).then(res=>{
 					  console.log({res});
 					  if(res.isNew){

manifest.json

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

pages.json

@@ -169,9 +169,18 @@
 				"enablePullDownRefresh": false
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/resetInfo/resetInfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "重置密码",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
-		"navigationStyle": "default",
+		"navigationStyle": "custom",
 		"autoBackButton": true,
 		// "homeButton": true,
 		"navigationBarTextStyle": "black",

pages/creatingSituations/components/checkPlan.vue

@@ -8,7 +8,7 @@
 						<input v-if="item.id === 'custom'" 
 							v-model="item.model" 
 							@focus="checkModel(item)"
-							type="number" 
+							type="number"
 							@input="createList"
 							placeholder="自定义" />
 						<text>{{item.label}}</text>

pages/creatingSituations/creatingSituations.vue

@@ -46,6 +46,7 @@
 		editCheckRent,
 		editCheckMap,
 		editCheckPlan,
+		checkPlanList,
 		editSituationPreview
 	} from "./components/utils.js";
 	import {dateHandle} from "../../utils/dateHandle.js";
@@ -203,13 +204,13 @@
 							this.nextHandle(this.stepActive);
 						break;
 					case 'checkPlanCreate': // 生成查核计划
-						if(this.checkPlan.checkList.length === 0) {
+						if(this.checkPlan.checkList.length === 0&&this.checkPlan.dateObj.dayNum<1) {
 							uni.showModal({
 							  title: '错误提示',
 							  content: '查核频次必须大于或等于1！',
 							  showCancel: false
 							});
-						} else {
+						}else {
 							this.myCommit('showCheckPlan1', false);
 						}
 						break;
@@ -268,13 +269,14 @@
 				}
 			},
 			myCommit: function(key, data) {
-				console.log({key, data});
+				// console.log({key, data});
 				this.$store.commit({type: 'creatingSituations/comChangeState',key,data});
 			},
 			dispatch: function(key, data) {
 				return this.$store.dispatch({type: 'creatingSituations/commActions', key, data});
 			},
 			clearData:function() {
+				checkPlanList[5].model = null;
 				this.$store.commit({type: 'creatingSituations/setInit'});
 			},
 		},

pages/creatingSituations/model.js

@@ -51,6 +51,7 @@ export default {
 		},
 		setInit(state) {
 			let _initState = JSON.parse(JSON.stringify(initState));
+			console.log({_initState});
 			for(let key in _initState) {
 				state[key] = _initState[key];
 			}

pages/home/home.vue

@@ -48,6 +48,10 @@
 				<view class="suggestions-feedback-btn" @click="feedbackFunc">
 					<text class="func-text">建议与反馈</text>
 					<image class="icon-more" src="/static/images/icon-more.png"></image>
+				</view>
+				<view class="resetPsd-btn" @click="resetCallbackFunc">
+					<text class="func-text">修改密码</text>
+					<image class="icon-more" src="/static/images/icon-more.png"></image>
 				</view>
 				
 			</view>
@@ -56,7 +60,7 @@
 			<text class="logout-text">退出登录</text>
 		</view>
 		<view class="copyright" @click="showVersionInfo">
-			<text>浙江新医智联信息科技有限公司</text>
+			<text>康程智医(成都)信息科技有限公司</text>
 			<text>{{version}}</text>
 		</view>
 		<tm-tabbar :permission="nowPermission" />
@@ -95,7 +99,7 @@
 			return {
 				ifshowVersionInfo:false,
 				showJournal: false,
-				version: '0.5.5',
+				version: '0.6.1',
 				versionData: {
 					versionNo: '',
 					versionId: '',
@@ -230,7 +234,16 @@
 						key: 'logout',
 					}
 				}).then((data)=>{
-					if(data){
+					if(data){
+						uni.removeStorageSync('hiId');
+						uni.removeStorageSync('permissions');
+						uni.removeStorageSync('token');
+						uni.removeStorageSync('code');
+						uni.removeStorageSync('nowPermission');
+						uni.removeStorageSync('id');
+						uni.removeStorageSync('name');
+						// uni.setStorageSync('hospSign', this.hospSign);
+						
 						uni.redirectTo({
 							url: `/pages/login/login?hospSign=${uni.getStorageSync('hospSign')}`
 						});
@@ -246,6 +259,11 @@
 				uni.navigateTo({
 					url: '/pages/suggestionsFeedback/suggestionsFeedback'
 				});
+			},
+			resetCallbackFunc(){
+				uni.navigateTo({
+					url: '/pages/resetInfo/resetInfo'
+				});
 			},
 			journalOk() {
 				this.showJournal = false;
@@ -509,10 +527,16 @@
 					width: 725rpx;
 					margin-left: 25rpx;
 					background: #FFFFFF;
-					// border-bottom: 0.62rpx solid #DADEE6;
+					border-bottom: 0.62rpx solid #DADEE6;
 					.func-text {
 						
 					}
+				}
+				.resetPsd-btn {
+					height: 100rpx;
+					width: 725rpx;
+					margin-left: 25rpx;
+					background: #FFFFFF;
 				}
 				.func-text {
 					font-size: 22.5rpx;
@@ -540,7 +564,7 @@
 			width: 750rpx;
 			height: 100rpx;
 			background-color: #FFFFFF;
-			margin-top:112.5rpx;
+			margin-top:210rpx;
 
 			.logout-text {
 				font-size: 22.5rpx;

pages/login/login.vue

@@ -3,7 +3,7 @@
 		<view class="com-model">
 			<view class="top-box">
 				<image class="pic" src="/static/images/shade.png"></image>
-				<text class="title-top">你好，</text>
+				<text class="title-top" @click="openModal">你好，</text>
 				<text class="title-buttom">欢迎使用追踪方法学系统</text>
 			</view>
 			<view class="main-content">
@@ -12,7 +12,7 @@
 					placeholder-style="color: #A1A7B3"
 					v-model="username" />
 				<input class="uni-input-box"
-				  placeholder="请输入密码"
+				    placeholder="请输入密码"
 					placeholder-style="color: #A1A7B3"
 					password
 					v-model="password" />
@@ -20,6 +20,16 @@
 					:width="998" :height="120" :fontSize="48" :background="isLogin?'#A3B1CC':''" btnText="登录" @btnClick="login" />
 			</view>
 		</view>
+		<tm-modal v-if="showInputModal" @click="clickModalhandle">
+			<view class="checkItemResultModal">
+				 <view class="modalContent">
+				 	  <view class="modalBar">开发者模式</view>
+					  <input class="keyInutArea" type="text" @input='setHospSign' placeholder="请输入hospSign" />
+					  <button class="commitActBtn" @click="updateHospSign(true)" type="default">确定</button>
+					  <button class="commitActBtn" @click="updateHospSign(false)" type="default">确定</button>
+				 </view>
+			</view>
+		</tm-modal>
 	</view>
 </template>
 
@@ -28,6 +38,9 @@
 	export default {
 		data() {
 			return {
+				index:0,
+				appHospSign:'tYAoFaa20yCAgaiy',//app端更新hospSign
+				showInputModal:false,
 				hospSign: '', // 医院标识
 				username: '', // 用户名
 				password: '', // 密码
@@ -41,21 +54,46 @@
 			}
 		},
 		onLoad({ hospSign }){
-			  console.log({hospSign});
-		      if(hospSign){
-				  this.hospSign = hospSign;
-			
-			  }else {
-				  const value = uni.getStorageSync('hospSign');
-				  console.log('hospSign',value);
-				  if(hospSign){
-				  	  this.hospSign = value;
-				  }
-			  }
 			  
+	
+			  this.hospSign = hospSign;
 			
 		},
+		mounted(){
+			  // uni.getSystemInfo({
+				 //  success: function (res) {
+					// 	  // console.log('res.model',res.model);
+					// 	  // console.log('res.pixelRatio',res.pixelRatio);
+					// 	  // console.log('res.windowWidth',res.windowWidth);
+					// 	  // console.log('res.windowHeight',res.windowHeight);
+					// 	  // console.log('res.language',res.language);
+					// 	  // console.log('res.version',res.version);
+					// 	  // console.log('res.platform',res.platform);
+					// 	 //  uni.showModal({
+					// 		// title: '测试',
+					// 		// content:res.windowWidth,
+					// 		// showCancel: true
+					// 	 //  });
+				 //  }
+			  // });
+		},
 		methods: {
+			setHospSign(e){
+				this.appHospSign = e.target.value
+			},
+			openModal(){
+				// #ifdef APP-PLUS
+				this.index = this.index + 1;
+				if(this.index==3)this.showInputModal = true;
+				// #endif
+			},
+			updateHospSign(bool){
+				if(bool){
+					 this.hospSign = this.appHospSign;
+				}
+				this.index=0;
+				this.showInputModal = false;
+			},
 			login() {
 				if(this.isLogin) return
 				this.$store.dispatch({
@@ -65,22 +103,31 @@
 						data: {
 							username: encryption(this.username),
 							password: encryption(this.password),
-							hospSign: this.hospSign
-							// hospSign:'vdQpm2OvmLVTPnXL'
+							// #ifdef APP-PLUS
+							hospSign: this.appHospSign,
+							// #endif
+							// #ifdef H5
+							hospSign: this.hospSign,
+							// #endif
+							// hospSign:'tYAoFaa20yCAgaiy'
 						}
 					}
 				}).then((data) => {
 					if (data) {
 						uni.setStorageSync('hiId', data.hiId);
 						uni.setStorageSync('permissions', data.permissions);
-			      uni.setStorageSync('token', data.token);
-					  uni.setStorageSync('nowPermission', data.nowPermission);
+			            uni.setStorageSync('token', data.token);
+						uni.setStorageSync('code', data.code);
+					    uni.setStorageSync('nowPermission', data.nowPermission);
 						uni.setStorageSync('id', data.id);
 						uni.setStorageSync('name', data.name);
 						uni.setStorageSync('hospSign', this.hospSign);
 						this.rolToTarget(data.nowPermission)
 					}
 				});
+			},
+			clickModalhandle(){
+				
 			},
 			//角色和对应的跳转页面
 			rolToTarget(nowPermission) {
@@ -106,8 +153,43 @@
 
 <style lang="less" scoped>
 	.login-page {
-		height: 100%;
+		height:100vh;
 		background-color: #FFFFFF;
+		.checkItemResultModal {
+			  display: flex;
+			  height: 100%;
+			  justify-content: center;
+			  align-items: center;
+			  .modalContent {
+				   position: relative;
+				   width: 90%;
+				   height:500rpx;
+				   border-radius: 20rpx;
+				   background-color: #FFFFFF;
+				   .modalBar{
+					   display: flex;
+					   justify-content: center;
+					   align-items: center;
+					   height: 80rpx;
+					   color: #4E78FF;
+					   font-size: 22.5rpx;
+					   border-bottom: 0.1rpx solid #E5E5E5;
+				   }
+				   .keyInutArea {
+					   height: 80rpx;
+					   color: #4E78FF;
+					   font-size: 22.5rpx;
+					   padding: 0 20rpx;
+					   border: 0.1rpx solid #E5E5E5;
+				   }
+				   .commitActBtn {
+					   position: absolute;
+					   width: 100%;
+					   bottom: 0;
+					   border-radius: 0;
+				   }
+			  }
+		}
 		.top-box {
 			display: flex;
 			flex-direction: column;
@@ -116,7 +198,7 @@
 				position: absolute;
 				top: 0;
 				right: 0;
-			  width: 430rpx;
+			    width: 430rpx;
 				height: 281.25rpx;
 			}
 			.title-top{

pages/mainPointsDetail/mainPointsDetail.vue

@@ -6,14 +6,6 @@
 			 	  <view class="modalBar">请选择查核结果</view>
 				  <scroll-view class="scroll" scroll-y="true" >
 				  	<view v-for="item in checkItemResultList" class="list" :key="item.id" @click="selectResultHandle(item.resultName)" >{{item.resultName}}</view>
-					<!-- <view class="list">无缺失</view>
-					<view class="list">主要缺失</view>
-					<view class="list" >不适用</view>
-					<view class="list">无缺失</view>
-					<view class="list">主要缺失</view>
-					<view class="list" >不适用</view>
-					<view class="list">无缺失</view>
-					<view class="list">主要缺失</view> -->
 				  </scroll-view>
 			 </view>
 		</view>
@@ -62,8 +54,8 @@
             <view
               class="checked-checkItem"
 			  v-for="item in checkConfiglist"
-			  :key="item.value"
-              @click="checkedOne(item.attr)"
+			  :key="item.attr"
+              @click="checkedOne(item)"
               :style="
                 Index == item.attr
                   ? { backgroundColor: '#3377FF', color: '#fff' }
@@ -79,96 +71,7 @@
                 <text class="lastName">上次</text></view
               >
             </view>
-			<!-- <view
-			  class="checked-checkItem"
-			  @click="checkedOne(1)"
-			  :style="
-			    Index == 1
-			      ? { backgroundColor: '#3377FF', color: '#fff' }
-			      : { backgroundColor: '#EBEFF7' }
-			  "
-			  >不适用
-			  <view v-if="lastIndex == 1"
-			    ><image
-			      src="../../static/shangci.png"
-			      mode=""
-			      class="img"
-			    ></image>
-			    <text class="lastName">上次</text></view
-			  >
-			</view> -->
-            <!-- <view
-              class="checked-checkItem"
-              @click="checkedOne(2)"
-              :style="
-                Index == 2
-                  ? { backgroundColor: '#3377FF', color: '#fff' }
-                  : { backgroundColor: '#EBEFF7' }
-              "
-              >无缺失
-              <view v-if="lastIndex == 2"
-                ><image
-                  src="../../static/shangci.png"
-                  mode=""
-                  class="img"
-                ></image>
-                <text class="lastName">上次</text></view
-              >
-            </view>
-            <view
-              class="checked-checkItem"
-              @click="checkedOne(3)"
-              :style="
-                Index == 3
-                  ? { backgroundColor: '#3377FF', color: '#fff' }
-                  : { backgroundColor: '#EBEFF7' }
-              "
-              >主要缺失
-              <view v-if="lastIndex == 3"
-                ><image
-                  src="../../static/shangci.png"
-                  mode=""
-                  class="img"
-                ></image>
-                <text class="lastName">上次</text></view
-              >
-            </view>
-            <view
-              class="checked-checkItem"
-              @click="checkedOne(4)"
-              :style="
-                Index == 4
-                  ? { backgroundColor: '#3377FF', color: '#fff' }
-                  : { backgroundColor: '#EBEFF7' }
-              "
-              >次要缺失
-              <view v-if="lastIndex == 4"
-                ><image
-                  src="../../static/shangci.png"
-                  mode=""
-                  class="img"
-                ></image>
-                <text class="lastName">上次</text></view
-              >
-            </view>
-            <view
-              class="checked-checkItem"
-              @click="checkedOne(5)"
-              :style="
-                Index == 5
-                  ? { backgroundColor: '#3377FF', color: '#fff' }
-                  : { backgroundColor: '#EBEFF7' }
-              "
-              >观察事项
-              <view v-if="lastIndex == 5"
-                ><image
-                  src="../../static/shangci.png"
-                  mode=""
-                  class="img"
-                ></image>
-                <text class="lastName">上次</text></view
-              >
-            </view> -->
+			
           </view>
           <view class="more" @click="toHistory">
             <text>查看改善历史</text>
@@ -226,9 +129,8 @@
           <textarea
             maxlength="300"
             class="seeTextarea"
-            value=""
             placeholder="请输入"
-            :value="recordList[0].talkResult"
+            :value="recordList[0].seeResult"
             @blur="changeTextarea2"
           ></textarea>
         </view>
@@ -283,6 +185,8 @@ export default {
 	  currentEditTextAreaIndex:'',
 	  checkItemResultList:[],//查核结果说明下拉列表
 	  currentSelect:'',
+	  checkItemScore:null,//查核选中的分数
+	  checkItemValue:null,//查核选中的分数占比
 	  checkConfiglist:[],//查核情况可配置列表
     };
   },
@@ -303,12 +207,12 @@ export default {
 		this.showSelectModal = true;
 	},
     selectResultHandle(val){
-		console.log({val});
-		console.log('currentEditTextAreaIndex',this.currentEditTextAreaIndex);
+		// console.log({val});
+		// console.log('currentEditTextAreaIndex',this.currentEditTextAreaIndex);
 		if(this.data.checkModelName == '访谈'){
 			this.talkList[this.currentEditTextAreaIndex].talkResult = val;
 		}else {
-			this.recordList[0].talkResult = val;
+			this.recordList[0].seeResult = val;
 		}
 	    this.showSelectModal = false;
 	},
@@ -324,7 +228,7 @@ export default {
         }).then((res) => {
 		  this.id = id;
           if (res) {
-            this.data = res;
+            this.data = res;			
             if (res && res.lastResult == "不适用") {
               // this.lastIndex = 1;
 			  this.lastIndex = res.lastResult;
@@ -352,9 +256,17 @@ export default {
           this.resultConfigList = res ? res : [];
         });
     },
+	//查核点击回调
     checkedOne(data) {
-      this.Index = data;
-	  this.data.checkResult = data;
+		const parsedData = JSON.parse(JSON.stringify(data));
+		console.log({parsedData})
+		this.Index = parsedData.attr;
+		this.data.checkResult = parsedData.attr;
+		this.checkItemScore = parsedData.score;
+		this.checkItemValue = parsedData.value;
+		
+   //    this.Index = data;
+	  // this.data.checkResult = data;
       // if (data == 1) {
       //   this.data.checkResult = "不适用";
       // } else if (data == 2) {
@@ -413,6 +325,8 @@ export default {
           id: this.data.id,
           checkResult: this.data.checkResult,
           checkResultRequestList: [],
+		  checkItemScore:this.checkItemScore,
+		  value:this.checkItemValue
         };
         if (this.data.checkModelName == "访谈") {
           let list = [];
@@ -430,6 +344,9 @@ export default {
               checkResultDescribe: this.talkList[i].talkResult,
               checkResultUrl: path,
             };
+			
+			// console.log({'访谈':item});
+			// return;
             list.push(item);
           }
           params.checkResultRequestList = list;
@@ -448,13 +365,15 @@ export default {
             checkResultDescribe: this.recordList[0].seeResult,
             checkResultUrl: path,
           };
+		  // console.log({item});
+		  // return;
           list.push(item);
           params.checkResultRequestList = list;
         }
-		const checkConfiglist = JSON.parse(JSON.stringify(this.checkConfiglist))
-  //       console.log({'checkConfiglist':this.checkConfiglist});
-		// console.log(checkConfiglist[0].attr);
+		const checkConfiglist = JSON.parse(JSON.stringify(this.checkConfiglist));
 		
+  //     	console.log({params});
+		// return;
         this.$store.dispatch({
             type: "mainPointsDetail/commActions",
             payload: {
@@ -473,6 +392,7 @@ export default {
                     checkConfiglist[i].resultType == 3)
                 ) {
 				console.log('开始提交改善前准备');
+				 
                   let param = {
                     situationId: this.data.situationId,
                     situationName: this.data.situationName,
@@ -503,13 +423,14 @@ export default {
                           ...param,
                         },
                       },
-                    }).then(() => {
-                      uni.navigateTo({
-                        url: `/pages/auditItemDetails/auditItemDetails?id=${this.data.id}&checkPointId=${this.checkPointId}`,
-                      });
-                    });
+					}).then(() => {
+					  
+					});
                 }
               }
+			  uni.navigateTo({
+			    url: `/pages/auditItemDetails/auditItemDetails?id=${this.data.id}&checkPointId=${this.checkPointId}`,
+			  });
             }
           });
       } else {
@@ -554,6 +475,14 @@ export default {
 	   */
       
     },
+	clearForm(){
+		 this.Index = '';
+		 if(this.data.checkModelName == '访谈'){
+		 	this.talkList[this.currentEditTextAreaIndex].talkResult = '';
+		 }else {
+		 	this.recordList[0].talkResult ='';
+		 }
+	},
 	goToPrevPage(){
 		// window.history.back();
 		// const pages = getCurrentPages();
@@ -589,6 +518,7 @@ export default {
 		let needItemIndex = num>0?current[0].index+1:current[0].index-1;
 		let needItemId = this.itemBelongGroup[needItemIndex].id;
 		// console.log({needItemIndex,needItemId});
+		this.clearForm();
 		this.checkTaskDetail(needItemId);	
 	},
 	// 获取查核项可配置列表

pages/mission-action/components/assign-mission.vue

@@ -84,7 +84,21 @@
 				this.desicion = selectVal;
       },
       switchChange(e) {
-        this.needApproveFlag = e.target.value;
+		if(this.missionDetails.improveEmpId){
+			this.needApproveFlag = e.target.value;
+		}else{
+			uni.showModal({
+			    title: '提示',
+			    content: '请先选择改善人',
+				showCancel:false,
+				success: function (res) {
+				        if (res.confirm) {
+							this.needApproveFlag=false;
+				            console.log('用户点击确定');
+				        }
+				}
+			});
+		}
       },
        // 更改指派人
 			changeDesPersopn(selectVal, selectData, i) {

pages/mission-action/mission-action.vue

@@ -14,12 +14,12 @@
 </template>
 
 <script>
-  import { mapState } from "vuex";
+    import { mapState } from "vuex";
 	import assignMission from './components/assign-mission.vue';
 	import disagree from './components/disagree.vue'
 	import personnel from './components/personnel.vue'
 	import writeBack from './components/write-back.vue'
-  import pdca from './components/pdca.vue'
+    import pdca from './components/pdca.vue'
 
 	export default {
     computed: {
@@ -44,11 +44,13 @@
 					{type: 5, name: 'PDCA', component: 'pdca'}
         ],
         // pdca类型
-        pdcaSetting: 'p'
-			}
+        pdcaSetting: 'p',
+		ifSetImproveEmp:null,//是否指定改善着
+		}
     },
-    onLoad({ details }){
+    onLoad({ details,ifSetImproveEmp }){
       this.getComponentInfo(details ? JSON.parse(details) : {});
+	  this.ifSetImproveEmp = ifSetImproveEmp;
     },
 		methods: {
       // 获取组件信息

pages/mission-details/mission-details.vue

@@ -106,7 +106,9 @@
 				taskId,
 				pathName
 			} = option;
-			this.taskId = taskId;
+			this.taskId = taskId;
+			
+			// console.log('missionDetails',this.missionDetails);
 		
 			this.botBtnText = pathName == 'missionDetails' ? '返回改善任务列表' : '返回改善消息列表'
 		},
@@ -175,7 +177,7 @@
 						}
 					}
 					uni.navigateTo({
-						url: `/pages/mission-action/mission-action?details=${encodeURIComponent(JSON.stringify({...currentInfo, ...btnInfo}))}`
+						url: `/pages/mission-action/mission-action?ifSetImproveEmp=${this.missionDetails.improveEmpId}&details=${encodeURIComponent(JSON.stringify({...currentInfo, ...btnInfo}))}`
 					});
 				} else { // 直接调接口
 					let requestParams = {};

pages/model.js

@@ -15,6 +15,7 @@ import mainPointsDetail from './mainPointsDetail/model.js';
 import editCheckList from './editCheckList/model.js';
 import allocationPerson from './allocationPerson/model.js';
 import suggestionsFeedback from './suggestionsFeedback/model.js';
+import resetInfo from './resetInfo/model.js';
 
 
 export default module = {
@@ -37,5 +38,6 @@ export default module = {
   checkList,
   editCheckList,
   allocationPerson,
-  suggestionsFeedback
+  suggestionsFeedback,
+  resetInfo
 }

pages/resetInfo/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/resetInfo/resetInfo.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="form">
+		<view class="formContent">
+			   <view class="row noBorder">
+			   	   <view class="label">用户名：</view>
+				   <input class="formInput" type="text" :value="userId"  disabled />
+			   </view>
+			   <view class="row noBorder">
+			   	   <view class="label">姓名：</view>
+			   				   <input class="formInput" type="text" :value="name"  disabled />
+			   </view>
+			   <view class="row">
+			   	   <view class="label">新密码：</view>
+			   	   <input class="formInput" type="text" password @input="e=>onKeyInput(e,'password')" />
+			   </view>
+			   <view class="row">
+			   	   <view class="label">确认新密码：</view>
+			   	   <input class="formInput" type="text" password  @input="e=>onKeyInput(e,'confirmPassword')" />
+			   </view>
+		</view>
+		<button type="primary" class="commitBtn" @click="commitHandle">确认修改</button>
+		
+		<tm-modal v-if="showModal">
+			<view class="modalContent">
+				<view class="inner">
+					  <image class="normalTipIcon" src="/static/normalTipIcon.png" ></image>
+					  <view class="tipText">
+					  	{{modalText}}
+					  </view>
+					  <view class="comfirmBtn" @click="goback">确定</view>
+				</view>
+			</view>
+		</tm-modal>
+	</view>
+</template>
+
+<script>
+	// import uploadImage from '../../components/tm-upload-img/tm-upload-img.vue'
+	import encryption from "../../utils/crypto.js";
+	export default {
+		data() {
+			return {
+				showModal:false,
+				userId:'',
+				name:'',
+				password:'',
+				confirmPassword:'',
+				modalText:'',
+				ifCompleted:false
+			};
+		},
+		onLoad(){
+			// console.log(window.location.host);
+			this.name  = uni.getStorageSync('name');
+			this.userId  = uni.getStorageSync('code');
+		
+		},
+		mounted() {
+		
+		},
+		methods: {
+			commitHandle(){
+				console.log(this.password,this.confirmPassword);
+				if(this.password&&this.confirmPassword){
+					if(this.password != this.confirmPassword){
+						this.modalText = '两次密码输入不一致！';
+						this.showModal = true;
+						return;
+					}
+					
+					this.$store.dispatch({
+						type: 'resetInfo/commActions',
+						payload: {
+							key: 'reSetPsdName',
+							data: {
+								password: encryption(this.password),
+								confirmPassword: encryption(this.confirmPassword)
+							}
+						}
+					}).then(data=>{
+						 if(data){
+							   this.ifCompleted = true;
+							   this.modalText = '密码修改成功，前往重新登录！';
+							   this.showModal = true
+						 }
+					})
+				}else {
+					this.modalText = '请完整填写表单信息！';
+					this.showModal = true
+				}	
+			},
+			logOut() {
+				this.$store.dispatch({
+					type: 'home/commActions',
+					payload: {
+						key: 'logout',
+					}
+				}).then((data)=>{
+					if(data){
+						uni.removeStorageSync('hiId');
+						uni.removeStorageSync('permissions');
+						uni.removeStorageSync('token');
+						uni.removeStorageSync('code');
+						uni.removeStorageSync('nowPermission');
+						uni.removeStorageSync('id');
+						uni.removeStorageSync('name');
+						// uni.setStorageSync('hospSign', this.hospSign);
+						
+						uni.redirectTo({
+							url: `/pages/login/login?hospSign=${uni.getStorageSync('hospSign')}`
+						});
+					}
+				});
+			},
+			onKeyInput(e,key){
+				 // console.log({e,key});
+				 if(key=='password'){
+					 this.password = e.target.value;
+				 }
+				 if(key=='confirmPassword'){
+				 	 this.confirmPassword = e.target.value;
+				 }
+			},
+			goback(){
+				if(this.ifCompleted){
+					   this.showModal = false;
+					   this.logOut();
+				}else {
+					   this.showModal = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.form {
+		position: relative;
+		padding-top: 15rpx;
+		height: 100vh;
+		background: #F5F6FA;
+		.formContent {
+			padding: 28rpx;
+			margin-top: 10rpx;
+			border-radius: 5rpx;
+			background-color: #FFFFFF;
+			.row {
+				display: flex;
+				flex-direction: row;
+				justify-content: flex-start;
+				align-items: center;
+				padding: 0 10rpx;
+				border-radius: 10rpx;
+				margin-bottom: 20rpx;
+				border: 0.62rpx solid #DADEE6;
+				.label {
+					font-size: 27rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #292C33;
+				}
+				.formInput {
+					height: 80rpx;
+					font-size: 27rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #292C33;
+				}
+				&.noBorder {
+					border:none;
+				}
+				&:first-child {
+					margin-bottom: 0;
+				}
+			}
+		}
+		.commitBtn {
+			position: fixed;
+			bottom:0rpx;
+			width: 100%;
+			height: 75rpx;
+			line-height: 75rpx;
+			margin:0 auto;
+			font-size: 25rpx;
+			font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+			font-weight: 400;
+            border-radius: 0;
+			// margin: 0 20rpx;
+		}
+        .modalContent {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 100vw;
+			height: 100vh;
+			.inner {
+				// position: relative;
+				display: flex;
+				flex-direction: column;
+				// justify-content: center;
+				align-items: center;
+				width: 562.5rpx;
+				height: 361.25rpx;
+				margin: 0 auto;
+				top:50%;
+				padding-top: 50rpx;
+				background: #FFFFFF;
+				border-radius: 15rpx;
+				.normalTipIcon {
+					width: 80rpx;
+					height:80rpx;
+					margin-bottom: 28.75rpx;
+				}
+				.tipText {
+					display: flex;
+					justify-content:center;
+					align-items: center;
+					width: 427.5rpx;
+					height: 95rpx;
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #292C33;
+					line-height: 31.25rpx;
+					margin-bottom: 39.37rpx;
+				}
+				.comfirmBtn {
+					width: 100%;
+					height: 75rpx;
+					line-height: 75rpx;
+					text-align: center;
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					background: #3377FF;
+				}
+			}
+		}
+	}
+</style>

pages/resetInfo/server.js

@@ -0,0 +1,13 @@
+import { creatRequest } from '../../utils/request.js';
+
+const requestList = {
+  //登录
+  reSetPsdName: {
+    method: 'POST',
+    url: 'user/modifyPwd',
+  },
+};
+export const commServer = ({ key, data }) => {
+  let obj = requestList[key];
+  return creatRequest(obj, data);
+}

pages/suggestionsFeedback/suggestionsFeedback.vue

@@ -39,14 +39,14 @@
 			
 		</view>
 		<uploadImage @changeFilePaths="uploadImgFunc" :isMultiple="true" :filePaths="imgList"></uploadImage>
-		<view class="bottomForm">
+		<!-- <view class="bottomForm">
 			<view class="jobTitle">
 				<text class="label">* 您的职位</text><input cursor=10 class="inputArea" type="text" v-model="position" />
 			</view>
 			<view class="jobTitle">
 				<text class="label">* 您的手机号码</text><input class="inputArea" type="text" v-model="phoneNum" />
 			</view>
-		</view>
+		</view> -->
 		<view class="btn-confirm" @click="commitFeedback">
 			<text class="btn-text">确定</text>
 		</view>
@@ -56,7 +56,7 @@
 				<view class="inner">
 					  <image class="normalTipIcon" src="/static/normalTipIcon.png" ></image>
 					  <view class="tipText">
-					  	我们已经收到您的意见和反馈，感谢您对新 医智联的信任与支持，我们将尽快处理并与 您联系
+					  	我们已经收到您的意见和反馈，感谢您对康程智医的信任与支持，我们将尽快处理并与 您联系
 					  </view>
 					  <view class="comfirmBtn" @click="goback">确定</view>
 				</view>
@@ -148,8 +148,8 @@
 				if(this.score==0)tipAlertStr="请完善评分！";
 				if(this.selectedFeedbackType=='')tipAlertStr="请选择反馈类型！";
 				if(this.decDetail.length==0)tipAlertStr="请填写反馈内容！";
-				if(this.position.length==0)tipAlertStr="请填职位信息！";
-				if(this.phoneNum.length==0)tipAlertStr="请填写手机号码！";
+				// if(this.position.length==0)tipAlertStr="请填职位信息！";
+				// if(this.phoneNum.length==0)tipAlertStr="请填写手机号码！";
 				
 				if(tipAlertStr.length>0){
 					uni.showModal({

static/html/template.html

@@ -103,8 +103,8 @@
 		
 		
 		
-		localStorage.removeItem('hospSign');
-		localStorage.setItem('hospSign',hospSign);
+		// localStorage.removeItem('hospSign');
+		// localStorage.setItem('hospSign',hospSign);
 		
 		let url = `/TracerMethodology?hospSign=${hospSign}`;
 		
@@ -113,7 +113,8 @@
 		createIframe(
 		     'frame',
 			 url,
-			 '100%',
+			 '100vw',
+			 '100vh',
 			 onLoadCallback,
 			 1000,
 			 timeOutCallback

utils/request.js

@@ -26,6 +26,7 @@ function creatRequest(obj, data) {
       url = data ? `${url}?${stringify(data)}` : url;
       data = null;
     }
+	console.log({data});
     return request(url, { method: obj.method, data }, additional);
   } else {
     uni.showModal({
@@ -110,7 +111,7 @@ function notifyException(resArr, additional) {
     return false;
   } else if (res.data.code !== 'SUCCESS') {
     const { code, msg } = res.data;
-	console.log(res.data);
+	console.log('res.data',res.data);
     if (code === '410' || code === '401') {
       LoginExpired();
     } else if (code === '403') {

utils/requestUrl.js

@@ -13,6 +13,8 @@
 // export const URL = 's1.nsloop.com:5137/imed/pfm/';  // 外网
 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
 export const wsURL = (hiId, user, permission) => {
 	return `ws://${URL}websocket/${hiId}/${user}/${permission}`;
 }