heyang 1 年之前
父节点
当前提交
aba0389273

+ 2 - 2
api/request/config.js

@@ -3,14 +3,14 @@ const config = {
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
-    // base_url: 'http://192.168.1.8:8080',//高升
+     base_url: 'http://192.168.1.8/api',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
     //base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	//base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
-     base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+    // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
     //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
    // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址

+ 2 - 1
pages/safetyExamineWorkbench.vue

@@ -118,7 +118,8 @@
               <view class="list_tow_li_t_r"></view>
             </view>
             <view class="list_tow_li_m">
-              <view class="list_tow_li_m_t">{{item.title}}</view>
+              <view class="list_tow_li_m_t" v-if="curTabTow==0 || curTabTow==1">{{item.title}}</view>
+              <view class="list_tow_li_m_t" v-if="curTabTow==2">{{item.hazardDescribe}}</view>
               <view class="list_tow_li_m_b">
                 <text class="blue_color" v-if="item.manageStatus==0">待检查</text>
                 <text class="red_color" v-if="item.manageStatus==1">检查中</text>

+ 1 - 1
pages_safetyExamine/dangerManage/dangerList.vue

@@ -39,7 +39,7 @@
 					<view class="list_three_li_t_r"></view>
 				</view>
 				<view class="list_three_li_m">
-					<view class="list_three_li_m_t">{{item.title}}</view>
+					<view class="list_three_li_m_t">{{item.hazardDescribe}}</view>
 					<view class="list_three_li_m_b">
 						<text class="green_color" v-if="item.rectifyStatus==1">已完成</text>
 						<text class="blue_color" v-if="item.rectifyStatus==2">待整改</text>

+ 1 - 1
pages_safetyExamine/dangerManage/dangerManage.vue

@@ -46,7 +46,7 @@
 					<view class="list_three_li_t_r"></view>
 				</view>
 				<view class="list_three_li_m">
-					<view class="list_three_li_m_t">{{item.title}}</view>
+					<view class="list_three_li_m_t">{{item.hazardDescribe}}</view>
 					<view class="list_three_li_m_b">
 						<text class="green_color" v-if="item.rectifyStatus==1">已完成</text>
 						<text class="blue_color" v-if="item.rectifyStatus==2">待整改</text>

+ 15 - 0
pages_safetyExamine/examineManage/examineAdd.vue

@@ -512,6 +512,21 @@ export default {
 								this.form.checkHazardDtoList[i].voiceRemark=[];
 							}
 						}
+					}else{
+						let checkHazardDtoList=[
+													{
+														voiceRemark:[],//语音备忘存储
+														hazardLevel:2,//隐患等级
+														hazardLevelName:'一般隐患',//隐患等级
+														hazardCheckCode:'', //检查项目code序号
+														hazardCheckName:'', //检查项目名称
+														hazardCheckPro:'', //最后一级的id
+														hazardCheckPoint:'',// 检查要点
+														hazardDescribe:'', //隐患描述
+														uploadDtoList:[],//隐患照片
+													}
+												];
+						this.form.checkHazardDtoList=checkHazardDtoList;
 					}
 				}else if(data.data.checkCategory==2){//专项检查
 					if(_this.form.checkHazardInfoVoList[0]){

+ 1 - 1
pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -428,7 +428,7 @@ export default {
 		clickContent(){
 			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			this.form.scopeIndex=this.scopeIndex//检查范围
-			uni.redirectTo({
+			uni.navigateTo({
 			    url: '/pages_safetyExamine/patrolPlan/patrolPlanAddContent?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
 			});
 		},