bug修改

pages/home/home.vue

@@ -52,7 +52,7 @@
 		</view>
 		<view class="copyright">
 			<text>浙江新医智联信息科技有限公司</text>
-			<text>0.5.1</text>
+			<text>0.5.2</text>
 		</view>
 		<tm-tabbar :permission="nowPermission" />
 	</view>

pages/mission-action/components/pdca.vue

@@ -63,7 +63,8 @@
 	import oneTextarea from './pdca-components/one-textarea.vue'
   import doAndCheck from './pdca-components/do-and-check.vue'
   import modal from './modal.vue'
-
+  import { mapState } from "vuex";
+	
 	export default {
     props: {
       // 是否禁用
@@ -114,7 +115,10 @@
         return this.pdcaSetting === 'p'
           ? ['改善计划(P)']
           : ['改善计划(P)', '执行过程(D)', '改善确认(C)', '对策处置(A)'];
-      }
+      },
+			...mapState({
+			  missionDetails: state => state.mission.missionDetails
+			}),
     },
 		created() {
 			uni.setNavigationBarTitle({
@@ -205,6 +209,9 @@
           // 注意暂存的时候接收人是当前登录的账号
            requestParams['receiveEmpId'] = uni.getStorageSync('id');
            requestParams['receiveEmpName'] = uni.getStorageSync('name');
+					 if([4, 6].includes(requestParams['taskType'])) {
+						 requestParams['needApproveFlag'] = this.missionDetails.needApproveFlag;
+					 }
         }
         this.$emit('comRequest', requestParams);
         improveScheme && this.toggleModalVisibile();

pages/situationsCenter/situationsCenter.vue

@@ -39,7 +39,7 @@
         @scrolltolower="toLower"
         lower-threshold="184"
       >
-        <view class="content">
+        <view class="content" :style="{height: situationList.length === 0 ? '100%' : 'auto'}">
           <view
             class="situation"
             v-for="(item, index) in situationList"
@@ -401,7 +401,6 @@ export default {
         display: flex;
         flex-flow: row wrap;
         padding-bottom: 25rpx;
-				height: 100%;
         .situation {
           height: 187.5rpx;
           width: 337.5rpx;

pages/todayCheck/todayCheck.vue

@@ -186,9 +186,12 @@ export default {
           font-weight: bold;
         }
         .pointsGK {
+					overflow: hidden;
           padding-bottom: 25rpx;
           border-bottom: 0.62rpx solid #dadee6;
           font-size: 20rpx;
+					white-space: nowrap;
+					text-overflow: ellipsis;
           color: #666f80;
         }
         .checkName {

utils/requestUrl.js

@@ -1,8 +1,8 @@
 // export const URL = 'http://192.168.38.140:8088'; // 李磊
 // export const URL = 'http://192.168.38.174:8088';
-// export const URL = 'http://192.168.1.45:8088'; //内网
+export const URL = 'http://192.168.1.45:8088'; //内网
 // export const URL = 'http://s1.nsloop.com:5137';  // 外网
-export const URL = 'http://121.43.139.179:8801';  // 云端服务1
+// export const URL = 'http://121.43.139.179:8801';  // 云端服务1
 // export const URL = 'http://172.18.116.20:8801';  // 云端服务2
 
 

utils/wsUrl.js

@@ -1,3 +1,3 @@
-// export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
-export const wsURL = `ws://121.43.139.179:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务1
+export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
+// export const wsURL = `ws://121.43.139.179:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务1
 // export const wsURL = `ws://172.18.116.20:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务2