Merge remote-tracking branch 'remotes/origin/xcx-v2' into kdnh-xcx

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
-	// base_url: 'http://192.168.1.17: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.29:8080',//何成
@@ -11,7 +11,7 @@ const config = {
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	// base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
+	 //base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址

pages/mine.vue

@@ -19,7 +19,7 @@
         <view class="back-posi"></view>
         <view class="top-max-box-one">
           <view class="user-img-box" @click="selectImage">
-            <img v-if="userData.avatar" :src="userData.avatar">
+            <img v-if="userData.avatar" :src="userData.avatarUrl">
             <img v-else  src="@/images/icon_01.png">
             <view>{{userData.avatar?'编辑':'未上传'}}</view>
           </view>
@@ -197,7 +197,10 @@ export default {
       if(data.code == 200){
         this.userData = data.data;
         this.userData.avatar=data.data.avatar;
+		
         this.userData.avatarUrl=config.base_url+data.data.avatar;
+		console.log(config.base_url)
+		console.log(this.userData.avatarUrl)
         if(this.userType == 1){
           this.getSafeWarnList();
         }else if(this.userType == 2){

pages_manage/workbench/securityCheck/startChecking.vue

@@ -262,6 +262,8 @@
                 pageType:1,
                 //页面子状态
                 minPageType:1,
+				//临时存储隐患信息ID
+				hiddenDangerIdList:[],
 				//数据
 				form:{
 					checkName:'',//检查名称
@@ -1042,6 +1044,7 @@
             },
 			//删除隐患
 			delDetailsList(index){
+				this.hiddenDangerIdList.push(this.form.detailsList[index].id)
 				this.form.detailsList.splice(index,1);
 				this.$forceUpdate();
 			},
@@ -1146,7 +1149,9 @@
 						obj.detailsList[i].voice = JSON.stringify(obj.detailsList[i].voice);
 
 				}
-
+				for(let b=0;b<obj.detailsList.length;b++){
+				 obj.detailsList[b].jcxId= obj.detailsList[b].jcxId.substring(0,(obj.detailsList[b].jcxId.length)-1)
+				}
 				obj.zgStatus = 0;
 
 				if(self.id){
@@ -1171,6 +1176,8 @@
 			//保存草稿
 			async saveDraft(obj,type){
 				obj.isCg=1;
+				obj.zgStatus=0;
+				obj.ids=this.hiddenDangerIdList
 				const {data} = await checkRecordAddC(obj);
 				if(data.code == 200){
 					uni.showToast({
@@ -1249,8 +1256,31 @@
 						obj.detailsList[i].voice = JSON.stringify(obj.detailsList[i].voice);
 
 				}
+				
+				for(let b=0;b<obj.detailsList.length;b++){
+				 obj.detailsList[b].jcxId= obj.detailsList[b].jcxId.substring(0,(obj.detailsList[b].jcxId.length)-1)
+				}
+				obj.ids=this.hiddenDangerIdList
 				if(type==1){//保存草稿
-					self.saveDraft(obj,type)
+					
+					if(self.id){
+						obj.isCg=1;
+						const {data} = await checkRecordUpdate(obj);
+						if(data.code == 200){
+							uni.showToast({
+								title: type == 1?'保存草稿成功':(type == 2?'提交成功':''),
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+							setTimeout(function(){
+								uni.navigateBack();
+							},2000);
+						}
+					}else{
+						self.saveDraft(obj,type)
+					}
+					
 				}else if(type==2){//提交
 					//如果有语音备注，提示
 					this.form.detailsList.forEach(function(item){