heyang пре 2 година
родитељ
комит
9865767636
30 измењених фајлова са 413 додато и 413 уклоњено
  1. 1 1
      api/index.js
  2. 1 1
      pages/avatar.vue
  3. 1 1
      pages/casuallyPat.vue
  4. 1 1
      pages/emergencyEvacuationBig.vue
  5. 1 1
      pages/faceImage.vue
  6. 6 6
      pages/gradingControl/gradingControlAdd.vue
  7. 14 14
      pages/mine.vue
  8. 34 34
      pages_manage/examination/examinationAdd.vue
  9. 12 12
      pages_manage/gasApply/gasApplyReject.vue
  10. 30 30
      pages_manage/useGasApply/useGasApplyAdd.vue
  11. 13 13
      pages_manage/useRegister/giveRegister.vue
  12. 18 18
      pages_manage/useRegister/useRegister.vue
  13. 1 1
      pages_manage/workbench/laboratory/monitor.vue
  14. 23 23
      pages_manage/workbench/problemRectification/rectifyDetails.vue
  15. 3 3
      pages_manage/workbench/problemRectification/rectifyInfo.vue
  16. 11 11
      pages_manage/workbench/receiveCasuallyPat/casuallyPatInfo.vue
  17. 33 33
      pages_manage/workbench/securityCheck/startChecking.vue
  18. 15 15
      pages_manage/workbench/signature/signature.vue
  19. 34 34
      pages_student/examination/examinationAdd.vue
  20. 12 12
      pages_student/gasApply/gasApplyReject.vue
  21. 1 1
      pages_student/mine/upStudentCard.vue
  22. 30 30
      pages_student/useGasApply/useGasApplyAdd.vue
  23. 13 13
      pages_student/useRegister/giveRegister.vue
  24. 19 19
      pages_student/useRegister/useRegister.vue
  25. 1 1
      pages_student/workbench/photoInspection.vue
  26. 1 1
      pages_student/workbench/safeAccess/accessApplication.vue
  27. 37 37
      pages_student/workbench/safeAccess/newApplication.vue
  28. 1 1
      pages_supplier/register/registerTow.vue
  29. 24 24
      pages_supplier/transportCar/transportCarAdd.vue
  30. 22 22
      pages_supplier/transportPerson/transportPersonAdd.vue

+ 1 - 1
api/index.js

@@ -747,7 +747,7 @@ export const subjectMaterialList  = (data) => {
 //上传图片
 export const upImage  = (data) => {
     return apiResquest({
-        url: `/base/upload`,
+        url: `/base/file/upload`,
         method: 'GET',
         data: data,
     })

+ 1 - 1
pages/avatar.vue

@@ -90,7 +90,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages/casuallyPat.vue

@@ -205,7 +205,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

+ 1 - 1
pages/emergencyEvacuationBig.vue

@@ -583,7 +583,7 @@
 			async uploadImg(tempFilePaths){
 			    var self = this;
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages/faceImage.vue

@@ -56,7 +56,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/app/lab/api/commit/face', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/app/lab/api/commit/face', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

+ 6 - 6
pages/gradingControl/gradingControlAdd.vue

@@ -31,7 +31,7 @@
 						<view class="list_li_b_b2"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行描述:</view>
 						<textarea class="list_li_b_b3" v-model="param.detail.remark" maxlength="30" placeholder-class="placeholder-style" placeholder="请输入执行描述"></textarea>
 						<view class="list_li_b_b4" v-if="control.isUpload==1"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行材料:<label @click="itemUpData(item)">+ 请上传执行材料</label></view>
-					
+
 						<view class="list_li_b_b6" v-if="upList.length>0" v-for="(item,index) in upList" :key="index">
 							<view @click="download(item)">{{item.name}}</view>
 							<view @click="delImg(index)">
@@ -84,7 +84,7 @@
 				// this.param.id=item2.recordId;
 				 this.param.ruleType=item2.ruleType;
 				 this.param.endDate=item2.endDate;
-				
+
 				if(option.messageUserId){
 					this.messageUserId = option.messageUserId;
 				}
@@ -169,7 +169,7 @@
 					  self.upList.splice(index,1)
 					  self.$forceUpdate();
 					} else if (res.cancel) {
-			
+
 					}
 				  }
 				})
@@ -242,8 +242,8 @@
 					  console.log(res)
 					  console.log(res.tempFiles)
 					let text = res.tempFiles[0].path.substring(res.tempFiles[0].path.lastIndexOf('.') + 1);
-					
-					
+
+
 					if(text != 'png' && text != 'jpg' && text != 'jpeg' && text!= 'gif' && text != 'pdf' && text != 'doc' && text != 'docx'){
 						uni.showToast({
 							title: '仅支持png/jpg/jpeg/gif/pdf/doc/docx类型的文件上传',
@@ -269,7 +269,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: upObj.path,
 			        name: 'file',

+ 14 - 14
pages/mine.vue

@@ -117,7 +117,7 @@
 				pageType:false,
                 //认证数据
 			    certification:{
-					
+
 				},
 			    userType:0,
 			    userData:{
@@ -138,14 +138,14 @@
 				ifFaceFeature:"",
 				//签名
 				isUpload:"",
-				
+
 			}
 		},
 		onLoad() {
-         
+
 		},
 		onShow(){
-			
+
 		    if(uni.getStorageSync('token')&&uni.getStorageSync('userId')&&uni.getStorageSync('userType')){
                 this.userType = uni.getStorageSync('userType')
 				this.studentinfoFacemy();
@@ -160,7 +160,7 @@
                 });
 			}
 		},
-		
+
 		methods: {
 		    //学生端-信用分/奖励分/扫一扫按钮
             goUserPage(type){
@@ -203,14 +203,14 @@
 					this.pageType = true;
 				}
             },
-			
-			
+
+
 			//查询用户电子签名
 			async querySignature(){
 				let _this=this;
 			    const {data} = await querySignature();
 				if(data.code == 200){
-				
+
 					_this.isUpload=data.data.isUpload;
 					_this.signatureUrl=data.data.signature;
 					console.log(_this.certification.isUpload)
@@ -316,8 +316,8 @@
                         url: '/pages_manage/workbench/signature/signature?item='+this.signatureUrl,//电子签名
                     });
                 }
-				
-				
+
+
 			},
 			// 头像上传
 			selectImage() {
@@ -340,7 +340,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -353,9 +353,9 @@
 							uni.navigateTo({
 								url: '/pages/avatar?src='+config.base_url+res.data.url,//预案执行记录
 							});
-							
-							
-							
+
+
+
 						}else{
 							uni.showToast({
 								title: res.msg,

+ 34 - 34
pages_manage/examination/examinationAdd.vue

@@ -4,9 +4,9 @@
 		<view class="register_li">
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>          
+				<view>申请人:</view>
 				<input v-model="form.applyUser" disabled  type="text" >
-			</view>	
+			</view>
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_dhh.png">
 				<view>联系方式:</view>
@@ -29,7 +29,7 @@
 			</view>
 		</view>
 		<view class="register_li2">
-			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray"> 
+			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
 				<view class="register_li_min">
 					<view>*</view>
 					<view>实验地点:</view>
@@ -66,7 +66,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-if="listType==0" class="sub_btn" @click="submitVerify()">提交</view>
 		<view v-if="listType==2" class="sub_btn">重新申请</view>
 	</view>
@@ -114,7 +114,7 @@
 			}
         },
         onShow(){
-			
+
         },
         methods: {
 			//添加气瓶按钮
@@ -143,7 +143,7 @@
 					res.forEach(function(item){
 						_this.pickerArray.push(item.name);
 					})
-					
+
 				}
 			},
 			//查询用户信息
@@ -174,7 +174,7 @@
 				if(data.code==200){
 					let res=data.data
 					if(res.count>0){//有资格
-						
+
 					}else{//没资格
 						uni.showToast({
 							title:'在申请资格前需要先申请对应实验地点的安全准人资格!',
@@ -186,7 +186,7 @@
 						_this.form.subjectId='';
 					}
 				}
-				
+
 			},
 			//时间选中
 			startChange(e){
@@ -213,13 +213,13 @@
 					this.form.endTime = e.target.value
 				}
 			},
-			
-			
-			
-			
+
+
+
+
 			// 图片上传
 			selectImage() {
-				
+
 			    let self = this;
 			    wx.chooseImage({
 			        count: 1,
@@ -238,7 +238,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -277,7 +277,7 @@
 					_this.form=res.apply;
 					//编辑的时候判断气瓶状态,是选择首次进入列表数据还是修改后的数据
 					if(uni.getStorageSync('listDetail')){
-						
+
 					}else{
 						_this.listDetailArr=res.airBottlelist
 						uni.setStorageSync('listDetail',encodeURIComponent(JSON.stringify(_this.listDetailArr)))
@@ -439,9 +439,9 @@
 					    },2000);
 					}
 				}
-				
+
 			},
-			
+
         },
 		mounted(){
 		   this.labList()
@@ -482,12 +482,12 @@
 						color: #333333;
 						line-height: 28rpx;
 					}
-					
+
 					>text:nth-of-type(1){
 						width: 260rpx;
 					}
 					>text:nth-of-type(2){
-						
+
 					}
 					>text:nth-of-type(3){
 						width: 2rpx;
@@ -511,7 +511,7 @@
 						width: 28rpx;
 						height: 30rpx;
 						margin-left: 128rpx;
-					
+
 					}
 				}
 			}
@@ -525,12 +525,12 @@
 				font-weight: 500;
 				color: #0183FA;
 				line-height: 28rpx;
-			
+
 				>img{
 					width: 30rpx;
 					height: 30rpx;
 						margin-right: 14rpx;
-					
+
 				}
 			}
 		}
@@ -566,7 +566,7 @@
 					font-weight: 500;
 					color: #999999;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -575,10 +575,10 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -612,7 +612,7 @@
 					font-weight: 500;
 					color: #333;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -621,8 +621,8 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
 			/* 时间 */
 			.register_li_min2{
@@ -647,7 +647,7 @@
 					color: #333333;
 					line-height: 100rpx;
 					width: 188rpx;
-					
+
 				}
 				>view:nth-child(2){
 					font-size: 24rpx;
@@ -666,10 +666,10 @@
 					text-align: right;
 				}
 			}
-			
+
 			.issue_li{
 				margin:34rpx 26rpx 0;
-			
+
 				view:nth-child(1){
 					color:red;
 					line-height:28rpx;
@@ -707,7 +707,7 @@
 						position: absolute;
 						left: 278rpx;
 						z-index: 20;
-						
+
 					}
 				}
 				.issue_img{
@@ -718,7 +718,7 @@
 				}
 			}
 		}
-		
+
 		/* 按钮 */
 		.sub_btn{
 			width: 650rpx;

+ 12 - 12
pages_manage/gasApply/gasApplyReject.vue

@@ -18,7 +18,7 @@
 			    </view>
 			</view>
 		</view>
-		
+
 		<view class="sub_btn" @click="submitForm()">提交</view>
 	</view>
 </template>
@@ -33,7 +33,7 @@
 				form:{
 					rejectionApplyRemark:'',
 					rejectionApplyImg:'',
-					
+
 				},
 				imgList:[],
 				item:{},//从列表传过来的值
@@ -44,9 +44,9 @@
 			this.item=JSON.parse(decodeURIComponent(option.item));
 			this.item2=JSON.parse(decodeURIComponent(option.item2));
         },
-        onShow(){	
+        onShow(){
         },
-		
+
         methods: {
 			// 图片上传
 			selectImage(index) {
@@ -77,7 +77,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -87,9 +87,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -126,13 +126,13 @@
 				_this.form.phone=_this.item2.user.phone
 				_this.form.driverName=_this.item2.user.userName
 				_this.form.driverId=_this.item2.user.id
-				
+
 				_this.form.airStatus=1;
 				_this.form.taskId=_this.item.taskId;
 				_this.form.taskDetailId=_this.item.id;
-				
+
 				_this.form.rejectionApplyImg=_this.imgList.join(',')
-				
+
 				const {data} = await gasApplyYjsAdd(_this.form);
 				if(data.code == 200){
 				    uni.showToast({
@@ -186,7 +186,7 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
+
 				>input{
 					width 490rpx;
 					text-align: right;
@@ -195,7 +195,7 @@
 					font-weight: 500;
 					color: #CCCCCC;
 				}
-			}	
+			}
 			.up-img-box{
 			    display flex
 			    margin:34rpx 26rpx;

+ 30 - 30
pages_manage/useGasApply/useGasApplyAdd.vue

@@ -4,9 +4,9 @@
 		<view class="register_li">
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>          
+				<view>申请人:</view>
 				<input v-model="form.applyUser" disabled  type="text" >
-			</view>	
+			</view>
 			<view class="register_li_min" style="border: none;">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_dhh.png">
 				<view>联系方式:</view>
@@ -14,7 +14,7 @@
 			</view>
 		</view>
 		<view class="register_li2">
-			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray"> 
+			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
 				<view class="register_li_min">
 					<view>*</view>
 					<view>实验地点:</view>
@@ -58,7 +58,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-if="listType==0" class="sub_btn" @click="submitForm()">提交</view>
 		<view v-if="listType==2" class="sub_btn">重新申请</view>
 	</view>
@@ -98,13 +98,13 @@
         onLoad(option) {
 			this.status=option.status;
 			this.id=option.id;
-			
+
         },
         onShow(){
-			
+
         },
         methods: {
-			
+
 			//查询实验室
 			async labList(){
 				const {data} = await labList()
@@ -115,7 +115,7 @@
 					res.forEach(function(item){
 						_this.pickerArray.push(item.name);
 					})
-					
+
 				}
 			},
 			//获取气体名称列表
@@ -167,13 +167,13 @@
 						_this.form.subjectId=item.id;
 					}
 				})
-				
+
 				//校验当前用户有乜有当前实验室使用 权限
 				const {data} = await qualificationVerify({subjectId:_this.form.subjectId})
 				if(data.code==200){
 					let res=data.data
 					if(res.count>0){//有资格
-						
+
 					}else{//没资格
 						uni.showToast({
 							title:'申请用气资格前需要先申请对应实验地点的安全准人资格!',
@@ -185,7 +185,7 @@
 						_this.form.subjectId='';
 					}
 				}
-				
+
 			},
 			//时间选中
 			startChange(e){
@@ -214,7 +214,7 @@
 			},
 			// 图片上传
 			selectImage() {
-				
+
 			    let self = this;
 			    wx.chooseImage({
 			        count: 1,
@@ -233,7 +233,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -270,11 +270,11 @@
 			    if(data.code==200){
 					let res=data.data
 					_this.form=res.apply;
-					
-					
+
+
 				}
 			},
-			
+
 			//提交
 			async submitForm(){
 				let _this = this;
@@ -382,9 +382,9 @@
 					    },2000);
 					}
 				}
-				
+
 			},
-			
+
         },
 		mounted(){
 		   this.googsList()
@@ -436,7 +436,7 @@
 					font-weight: 500;
 					color: #999999;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -445,10 +445,10 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
-		
+
 		}
 		.register_li2{
 			background #fff;
@@ -482,7 +482,7 @@
 					font-weight: 500;
 					color: #333;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -491,8 +491,8 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
 			/* 时间 */
 			.register_li_min2{
@@ -517,7 +517,7 @@
 					color: #333333;
 					line-height: 100rpx;
 					width: 188rpx;
-					
+
 				}
 				>view:nth-child(2){
 					font-size: 24rpx;
@@ -536,10 +536,10 @@
 					text-align: right;
 				}
 			}
-			
+
 			.issue_li{
 				margin:34rpx 26rpx 0;
-			
+
 				view:nth-child(1){
 					color:red;
 					line-height:28rpx;
@@ -577,7 +577,7 @@
 						position: absolute;
 						left: 278rpx;
 						z-index: 20;
-						
+
 					}
 				}
 				.issue_img{
@@ -588,7 +588,7 @@
 				}
 			}
 		}
-		
+
 		/* 按钮 */
 		.sub_btn{
 			width: 650rpx;

+ 13 - 13
pages_manage/useRegister/giveRegister.vue

@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		<view  class="sub_btn" @click="submitForm()">确认归还</view>
-		
+
 	</view>
 </template>
 
@@ -40,7 +40,7 @@
 	import { useRegisterDetail,giveRegisterAdd } from '@/api/index.js'
 	import { config } from '@/api/request/config.js'
     export default {
-		
+
         name: "gasRecycle",
         data() {
             return {
@@ -70,12 +70,12 @@
        	this.electronicTag=option.code;
        },
         onShow() {
-			
+
         },
 		mounted(){
 			this.getInfo()
 		},
-        methods: {  
+        methods: {
 			// 图片上传
 			selectImage(index) {
 			    let self = this;
@@ -105,7 +105,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -115,9 +115,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -184,7 +184,7 @@
 				        });
 				    },2000);
 				}
-				
+
 			},
         }
     }
@@ -198,7 +198,7 @@
         display flex;
         flex-direction column;
         overflow hidden;
-		padding-bottom: 220rpx; 
+		padding-bottom: 220rpx;
 		.title{
 			width: 750rpx;
 			height: 100rpx;
@@ -243,7 +243,7 @@
 					color: #333333;
 				}
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -288,7 +288,7 @@
 			    display flex
 			    margin:34rpx 26rpx;
 				.asterisk{
-					padding-top:30rpx; 
+					padding-top:30rpx;
 					color:red;
 					line-height:28rpx;
 					margin-right: 12rpx;
@@ -328,7 +328,7 @@
 			        }
 			    }
 			}
-			
+
 		}
 		/* 按钮 */
 		.sub_btn{
@@ -346,6 +346,6 @@
 			position: fixed;
 			bottom:30rpx;
 		}
-		
+
 	}
 </style>

+ 18 - 18
pages_manage/useRegister/useRegister.vue

@@ -53,7 +53,7 @@
 		<view v-if="pageType==1" class="sub_btn" @click="submitForm(2)">提交余量不符并使用</view>
 		<view v-if="pageType==2" class="sub_btn" @click="handleClick('useGasApply')">申请用气资格</view>
 		<view v-if="pageType==3" class="sub_btn" @click="handleClick('QRcode')">重新扫描</view>
-		
+
 	</view>
 </template>
 
@@ -61,7 +61,7 @@
 	import { useRegisterDetail,useRegisterAdd } from '@/api/index.js'
 	import { config } from '@/api/request/config.js'
     export default {
-		
+
         name: "gasRecycle",
         data() {
             return {
@@ -78,10 +78,10 @@
 				},
 				userType:uni.getStorageSync('userType'),
 				form:{
-					
+
 				},
                 dataList:[],
-				imgList:[],   
+				imgList:[],
 				specificationName:{},
 				currentStatus:null,
 				electronicTag:'',
@@ -91,7 +91,7 @@
 			this.electronicTag=option.code;
         },
         onShow() {
-			
+
         },
 		mounted(){
 		  this.getInfo()
@@ -106,7 +106,7 @@
 				}
 			}); */
 		},
-        methods: { 
+        methods: {
 			//点击事件
 			handleClick(doType) {
 				let _this=this;
@@ -119,14 +119,14 @@
 				   		_this.electronicTag=res.result
 				   	}
 				   });
-				   
+
 			   }else if(doType=='useGasApply'){//申请用气资格
 				   uni.redirectTo({
 				   	 url:'/pages_manage/useGasApply/useGasApplyAdd?status=0'
 				   })
 			   }
 			},
-			
+
 			// 图片上传
 			selectImage(index) {
 			    let self = this;
@@ -156,7 +156,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -166,9 +166,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -246,7 +246,7 @@
 				        });
 				    },2000);
 				}
-				
+
 			},
         }
     }
@@ -260,7 +260,7 @@
         display flex;
         flex-direction column;
         overflow hidden;
-		padding-bottom: 220rpx; 
+		padding-bottom: 220rpx;
 		.title{
 			width: 750rpx;
 			height: 100rpx;
@@ -305,7 +305,7 @@
 					color: #333333;
 				}
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -350,7 +350,7 @@
 			    display flex
 			    margin:34rpx 26rpx;
 				.asterisk{
-					padding-top:30rpx; 
+					padding-top:30rpx;
 					color:red;
 					line-height:28rpx;
 					margin-right: 12rpx;
@@ -390,7 +390,7 @@
 			        }
 			    }
 			}
-			
+
 		}
 		/* 按钮 */
 		.sub_btn{
@@ -432,7 +432,7 @@
 			margin:20rpx 20rpx 0;
 			padding:20rpx 0;
 			box-sizing: border-box;
-			
+
 			>img{
 				width: 100rpx;
 				height: 100rpx;
@@ -447,7 +447,7 @@
 				line-height: 30rpx;
 				text-align: center;
 				margin-top: 42rpx;
-				padding-bottom: 106rpx; 
+				padding-bottom: 106rpx;
 			}
 		}
 	}

+ 1 - 1
pages_manage/workbench/laboratory/monitor.vue

@@ -273,7 +273,7 @@ export default {
     async uploadImg(tempFilePaths){
       var self = this;
       uni.uploadFile({
-        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
         header:{'Authorization':uni.getStorageSync('token')},
         filePath: tempFilePaths,
         name: 'file',

+ 23 - 23
pages_manage/workbench/problemRectification/rectifyDetails.vue

@@ -106,8 +106,8 @@
 								<view>{{details.zmClMs}}</view>
 							</view>
 						</view>
-						<view class="rectified-for-img-max-box">	
-							
+						<view class="rectified-for-img-max-box">
+
 							<view class="rectify_front">
 								<view class="rectify_front_t">整改前照片:</view>
 								<view class="rectify_front_b" @click="lockImg(details.yhImg)">
@@ -164,7 +164,7 @@
 								<view>{{details.yhMs}}</view>
 							</view>
 						</view>
-						<view class="rectified-for-img-max-box">	
+						<view class="rectified-for-img-max-box">
 							<!-- <view class="rectified-for-img-box" @click="lockImg(details.yhImg)" v-if="details.yhImg">
 								<img :src="baseUrl+itemUrl" v-if="indexTwo<4" v-for="(itemUrl,indexTwo) in details.yhImg" :key="indexTwo">
 								<view class="rectified-for-img-min-text" style="color:#999;" v-if="!details.yhImg">未上传隐患照片</view>
@@ -236,7 +236,7 @@
 							</view>
 						</view>
 					</view>
-					
+
 				</view>
 				<view class="bottom-info-title-box" v-if="details.spStatus==3">
 					<img src="@/images/Version2.2/icon_aqjc_zgxx.png">
@@ -380,7 +380,7 @@
 		onShow() {
 			console.log(this.baseUrl)
 			this.getInfo();
-		
+
 		},
 		methods: {
 			pageClick(type){
@@ -484,7 +484,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -515,11 +515,11 @@
 				console.log("index",index)
 				this.form.yhZghImg.splice(index,1);
 			},
-		
+
 			//去整改
 			async goUpData(type){
 				let self = this;
-				
+
 				if(!self.form.zgMs){
 					uni.showToast({
 						title: '请填写整改描述!',
@@ -554,7 +554,7 @@
 			},
 			//查看报告按钮
 			buttonChange(e){
-				
+
 				if(this.buttonArrayType == 1){
 					if(e.target.value == 0){
 						this.genNotice();
@@ -611,7 +611,7 @@
 				})
 			},
 			genReport(){
-				
+
 				uni.showLoading({
 					title: '下载中'
 				});
@@ -671,7 +671,7 @@
 				list.forEach(function(item2){
 					urlList.push(config.base_url+item2)
 				}) */
-			
+
 				wx.previewImage({
 					urls:list, //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
 					current: '', // 当前显示图片的http链接,默认是第一个
@@ -713,7 +713,7 @@
 					this.$set(this,'details',obj.details);
 					let yhImg=[];
 					let yhZghImg=[];
-					
+
 					if(obj.details.yhImg){
 						yhImg=obj.details.yhImg.split(',');
 						let urlList=[];
@@ -730,7 +730,7 @@
 						})
 						this.details.yhZghImg=urlList
 					}
-					
+
 					if(this.details.detailslogList){
 						this.details.detailslogList.forEach(function(item){
 							if(item.yhImg){
@@ -753,17 +753,17 @@
 									urlList.push(config.base_url+item2)
 									console.log(urlList)
 								})
-								
+
 								item.yhZghImg=urlList;
 							}
 						})
 						console.log(this.details.detailslogList)
-						
-						
+
+
 					}
-					
-					
-					
+
+
+
 				}
 				/* if(data.code == 200){
 				  let obj = JSON.parse(JSON.stringify(data.data));
@@ -806,7 +806,7 @@
 					  this.buttonArrayType = 4;
 				  }else if(newOjb.zgType == 1 && (newOjb.zgStatus == 1 || newOjb.zgStatus == 3 || newOjb.zgStatus == 4)){
 					  this.$set(this,'buttonArray',["整改通知书","整改报告"])
-					  this.buttonArrayType = 1; 
+					  this.buttonArrayType = 1;
 				  }else if(newOjb.zgType == 1 && (newOjb.zgStatus != 1 || newOjb.zgStatus != 3 || newOjb.zgStatus != 4)){
 					  this.$set(this,'buttonArray',["整改通知书"])
 					  this.buttonArrayType = 2;
@@ -1044,7 +1044,7 @@
 									}
 								}
 							}
-						
+
 						}
 					}
 				}
@@ -1093,7 +1093,7 @@
 					border-radius: 0 50rpx 50rpx 0;
 				}
 			}
-			
+
 			/* 整改描述 */
 			.input-box{
 				//display flex
@@ -1176,7 +1176,7 @@
 						}
 					}
 				}
-			}	
+			}
 	.input-max-box{
 			flex:1;
 			.input-box{

+ 3 - 3
pages_manage/workbench/problemRectification/rectifyInfo.vue

@@ -102,7 +102,7 @@
 		    this.newData = JSON.parse(JSON.stringify(obj));
 		},
 		onShow() {
-		
+
 		},
 		methods: {
 			//提交数据
@@ -304,7 +304,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -364,7 +364,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 11 - 11
pages_manage/workbench/receiveCasuallyPat/casuallyPatInfo.vue

@@ -70,16 +70,16 @@
         onLoad(option) {
             this.itemData = JSON.parse(decodeURIComponent(option.item));
             console.log("this.itemData",this.itemData)
-		
+
             this.getPhotonote();
 			if(this.itemData.isApply==2){
 				this.readNnreadFun();
 			}
-			
+
         },
         methods: {
 			//已读未读
-		
+
 			async readNnreadFun() {
 			    let self = this;
 			    const {data} = await groupListRead({messageId:this.itemData.messageId})
@@ -90,7 +90,7 @@
 					 this.getPhotonote();
 			    }
 			},
-			    
+
             clickButton(){
                 let self = this;
                 if(self.newData.handleStatus == 0){
@@ -142,9 +142,9 @@
 						this.formData.handleDescribe=data.data.handleDescribe;
 						this.formData.handleImg=data.data.handleImg.split(',');
 					}
-					
+
                     this.newData.imgList = data.data.imgUrl.split(",");
-					
+
                 }
             },
 			// 图片上传
@@ -177,7 +177,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -188,7 +188,7 @@
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
 							self.formData.handleImg.push(res.data.url);
-			              
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -277,8 +277,8 @@
 			 .input-box{
                  height:auto;
                  //display flex;
-			
-                 
+
+
                  .left-box{
                      width:180rpx;
                      line-height:80rpx;
@@ -331,7 +331,7 @@
                 }
             }
         }
-                
+
 		}
         .bottom-button-box{
             width: 550rpx;

+ 33 - 33
pages_manage/workbench/securityCheck/startChecking.vue

@@ -110,7 +110,7 @@
 				   		{{liveType?'松开发送':'按住说话'}}
 				   	</view>
 				   </view>
-					
+
 					<view class="check-for-big-box-position-img-box"
 					v-if="form.detailsList.length>1"
 					@click="delDetailsList(index)">
@@ -384,7 +384,7 @@
 				this.id = option.id;
 				this.getInfo();
 			}else{
-				this.getCheckOptionList();	
+				this.getCheckOptionList();
 			}
         },
         onShow() {
@@ -504,7 +504,7 @@
 
 			    var self = this;
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -905,7 +905,7 @@
 				}
 				const {data} = await checkOptionList(newObj);
 				if(data.code == 200){
-				
+
 					let list = this.getTreeData(data.data);
 					this.checkOptionList.push(JSON.parse(JSON.stringify(list)));
 				}
@@ -1015,7 +1015,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',
@@ -1102,7 +1102,7 @@
 								mask:true,
 								duration: 2000
 							});
-							return	
+							return
 						}else */ if(!self.form.detailsList[i].jcxName){
 							uni.showToast({
 								title: '第'+num+'未选择隐患项',
@@ -1161,11 +1161,11 @@
 			//发布
 			async releaseFun(){
 				let self=this;
-			
+
 				let type=this.submitStatus;
-			
+
 				let obj = JSON.parse(JSON.stringify(this.form))
-			
+
 				for(let i=0;i<obj.detailsList.length;i++){
 					if(obj.detailsList[i].jcxName.indexOf("/") != -1){
 						let list = obj.detailsList[i].jcxName.split("/");
@@ -1174,11 +1174,11 @@
 						obj.detailsList[i].jcxId = obj.detailsList[i].jcxId + ',';
 						obj.detailsList[i].yhImg = obj.detailsList[i].yhImg + '';
 						obj.detailsList[i].voice = JSON.stringify(obj.detailsList[i].voice);
-			
+
 				}
-				
+
 				obj.zgStatus = 0;
-				
+
 				if(self.id){
 					obj.isCg=0;
 					obj.isFabu=1;
@@ -1216,10 +1216,10 @@
 			},
 			//立即提交
 			async saveSubmit(obj,type){
-				
+
 				obj.isCg=0;
 				obj.isFabu=1;
-				
+
 				const {data} = await checkRecordAdd(obj);
 				if(data.code == 200){
 					uni.showToast({
@@ -1233,7 +1233,7 @@
 				    },2000);
 				}
 			},
-			
+
 			//提交接口
 			async upDataClick(type){
 				let self = this;
@@ -1265,10 +1265,10 @@
 					});
 					return
 				}
-				
+
 				let isVoice=false;
 				let obj = JSON.parse(JSON.stringify(this.form))
-				
+
 				for(let i=0;i<obj.detailsList.length;i++){
 					if(obj.detailsList[i].jcxName.indexOf("/") != -1){
 						let list = obj.detailsList[i].jcxName.split("/");
@@ -1277,7 +1277,7 @@
 						obj.detailsList[i].jcxId = obj.detailsList[i].jcxId + ',';
 						obj.detailsList[i].yhImg = obj.detailsList[i].yhImg + '';
 						obj.detailsList[i].voice = JSON.stringify(obj.detailsList[i].voice);
-				
+
 				}
 				if(type==1){//保存草稿
 					self.saveDraft(obj,type)
@@ -1293,7 +1293,7 @@
 						}
 					})
 					if(isVoice==true){//有语音
-					
+
 						uni.showModal({
 							 title: '',
 							cancelText:'保存草稿',
@@ -1304,23 +1304,23 @@
 							success (res) {
 							if (res.confirm) {
 								 console.log('继续发布')
-								  self.minPageType=1;	
+								  self.minPageType=1;
 							 } else if (res.cancel) {
 								console.log('保存草稿')
 							    self.saveDraft(obj,type)
-						
+
 							  }
 						 }
 						})
 					}else{
 						console.log('没有语音')
 						self.$refs.popup.open()
-						
+
 					}
 				}
-				
-				
-				
+
+
+
 
 			},
             /**************************搜索项***************************/
@@ -1397,7 +1397,7 @@
 				this.jcxSstkMs='';
 				this.$set(this.examinationForm,'value',e.detail.value[e.detail.value.length-1].text);
 				this.$set(this.examinationForm,'idList',e.detail.value[e.detail.value.length-1].value);
-				
+
 				let list = [];
 				let listName=[];
 				for(let i=0;i<e.detail.value.length;i++){
@@ -1417,7 +1417,7 @@
 			},
 			onnodeclickTwo(node) {
 				console.log("node",node)
-				
+
 			},
 			//新增检查项-提交
 			async addPopupTwoButtonClick(){
@@ -1454,17 +1454,17 @@
 					list.push(obj);
 					this.$set(this,'checkOptionList',JSON.parse(JSON.stringify(list)));
 					this.temporaryIdList.push(data.data.id);
-					
-				
-					
+
+
+
 					this.$set(this.form.detailsList[this.openIndex],'jcxId',data.data.id);
 					this.$set(this.form.detailsList[this.openIndex],'jcxName',data.data.name);
 					this.$set(this.form.detailsList[this.openIndex],'isLingshi',1);
-					
+
 					this.$set(this.form.detailsList[this.openIndex],'jcxSstkNum',this.jcxSstkNum);
 					this.$set(this.form.detailsList[this.openIndex],'jcxSstkMs',this.jcxSstkMs);
-					
-					
+
+
 					uni.showToast({
 						title: '新增成功',
 						icon:"none",

+ 15 - 15
pages_manage/workbench/signature/signature.vue

@@ -28,21 +28,21 @@
 
 		</view>
 		<view class="save_btn" @click="saveFun()">保存</view>
-	</view>	
-	
+	</view>
+
 </template>
 
 <script>
     import { config } from '@/api/request/config.js'
     import { logout,studentinfoFacemy,simpleInfo,getSafeWarnList,getMyPointsLogInfo,updateSignature} from '@/api/index.js'
 	export default {
-		
+
 		data() {
 			return {
 				baseUrl:config.base_url,
 				signatureData:'',
 				alreadyImg:'',
-				
+
 			}
 		},
 		onLoad(option) {
@@ -54,7 +54,7 @@
 			//用户点击上传签名
 			if(uni.getStorageSync('signatureData')){
 				this.signatureData = uni.getStorageSync('signatureData');
-				uni.removeStorageSync('signatureData')	;		
+				uni.removeStorageSync('signatureData')	;
 			}
 		},
 		methods: {
@@ -67,9 +67,9 @@
 			//保存按钮
 			async saveFun(){
 				let _this=this;
-				
+
 				if(!this.signatureData){
-					
+
 					uni.showToast({
 						title:'请先选择签名上传并保存查看',
 						icon:"none",
@@ -96,9 +96,9 @@
 					// uni.switchTab({
 					//      url: '/pages/mine'
 					//  });
-				    
+
 				 }
-				 
+
 			},
 		// 头像上传
 		selectImage() {
@@ -121,7 +121,7 @@
 		        mask: true
 		    });
 		    uni.uploadFile({
-		        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 		        header:{'Authorization':uni.getStorageSync('token')},
 		        filePath: tempFilePaths,
 		        name: 'file',
@@ -179,8 +179,8 @@
 			font-weight: 500;
 			color: #333333;
 			line-height: 28rpx;
-		
-		} 
+
+		}
 		.signature_li_b{
 			position :relative;
 			margin-top :28rpx;
@@ -215,8 +215,8 @@
 				height: 250rpx;
 				margin :0;
 			}
-			
-		} 
+
+		}
 		.signature_li_img{
 			margin-top :28rpx;
 			width: 668rpx;
@@ -270,5 +270,5 @@
 	 	 margin-top :44rpx;
 	  }
 	}
-	
+
 </style>

+ 34 - 34
pages_student/examination/examinationAdd.vue

@@ -4,9 +4,9 @@
 		<view class="register_li">
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>          
+				<view>申请人:</view>
 				<input v-model="form.applyUser" disabled  type="text" >
-			</view>	
+			</view>
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_dhh.png">
 				<view>联系方式:</view>
@@ -29,7 +29,7 @@
 			</view>
 		</view>
 		<view class="register_li2">
-			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray"> 
+			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
 				<view class="register_li_min">
 					<view>*</view>
 					<view>实验地点:</view>
@@ -66,7 +66,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-if="listType==0" class="sub_btn" @click="submitVerify()">提交</view>
 		<view v-if="listType==2" class="sub_btn">重新申请</view>
 	</view>
@@ -114,7 +114,7 @@
 			}
         },
         onShow(){
-			
+
         },
         methods: {
 			//添加气瓶按钮
@@ -143,7 +143,7 @@
 					res.forEach(function(item){
 						_this.pickerArray.push(item.name);
 					})
-					
+
 				}
 			},
 			//查询用户信息
@@ -174,7 +174,7 @@
 				if(data.code==200){
 					let res=data.data
 					if(res.count>0){//有资格
-						
+
 					}else{//没资格
 						uni.showToast({
 							title:'在申请资格前需要先申请对应实验地点的安全准人资格!',
@@ -186,7 +186,7 @@
 						_this.form.subjectId='';
 					}
 				}
-				
+
 			},
 			//时间选中
 			startChange(e){
@@ -213,13 +213,13 @@
 					this.form.endTime = e.target.value
 				}
 			},
-			
-			
-			
-			
+
+
+
+
 			// 图片上传
 			selectImage() {
-				
+
 			    let self = this;
 			    wx.chooseImage({
 			        count: 1,
@@ -238,7 +238,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -277,7 +277,7 @@
 					_this.form=res.apply;
 					//编辑的时候判断气瓶状态,是选择首次进入列表数据还是修改后的数据
 					if(uni.getStorageSync('listDetail')){
-						
+
 					}else{
 						_this.listDetailArr=res.airBottlelist
 						uni.setStorageSync('listDetail',encodeURIComponent(JSON.stringify(_this.listDetailArr)))
@@ -439,9 +439,9 @@
 					    },2000);
 					}
 				}
-				
+
 			},
-			
+
         },
 		mounted(){
 		   this.labList()
@@ -482,12 +482,12 @@
 						color: #333333;
 						line-height: 28rpx;
 					}
-					
+
 					>text:nth-of-type(1){
 						width: 260rpx;
 					}
 					>text:nth-of-type(2){
-						
+
 					}
 					>text:nth-of-type(3){
 						width: 2rpx;
@@ -511,7 +511,7 @@
 						width: 28rpx;
 						height: 30rpx;
 						margin-left: 128rpx;
-					
+
 					}
 				}
 			}
@@ -525,12 +525,12 @@
 				font-weight: 500;
 				color: #0183FA;
 				line-height: 28rpx;
-			
+
 				>img{
 					width: 30rpx;
 					height: 30rpx;
 						margin-right: 14rpx;
-					
+
 				}
 			}
 		}
@@ -566,7 +566,7 @@
 					font-weight: 500;
 					color: #999999;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -575,10 +575,10 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -612,7 +612,7 @@
 					font-weight: 500;
 					color: #333;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -621,8 +621,8 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
 			/* 时间 */
 			.register_li_min2{
@@ -647,7 +647,7 @@
 					color: #333333;
 					line-height: 100rpx;
 					width: 188rpx;
-					
+
 				}
 				>view:nth-child(2){
 					font-size: 24rpx;
@@ -666,10 +666,10 @@
 					text-align: right;
 				}
 			}
-			
+
 			.issue_li{
 				margin:34rpx 26rpx 0;
-			
+
 				view:nth-child(1){
 					color:red;
 					line-height:28rpx;
@@ -707,7 +707,7 @@
 						position: absolute;
 						left: 278rpx;
 						z-index: 20;
-						
+
 					}
 				}
 				.issue_img{
@@ -718,7 +718,7 @@
 				}
 			}
 		}
-		
+
 		/* 按钮 */
 		.sub_btn{
 			width: 650rpx;

+ 12 - 12
pages_student/gasApply/gasApplyReject.vue

@@ -18,7 +18,7 @@
 			    </view>
 			</view>
 		</view>
-		
+
 		<view class="sub_btn" @click="submitForm()">提交</view>
 	</view>
 </template>
@@ -33,7 +33,7 @@
 				form:{
 					rejectionApplyRemark:'',
 					rejectionApplyImg:'',
-					
+
 				},
 				imgList:[],
 				item:{},//从列表传过来的值
@@ -44,9 +44,9 @@
 			this.item=JSON.parse(decodeURIComponent(option.item));
 			this.item2=JSON.parse(decodeURIComponent(option.item2));
         },
-        onShow(){	
+        onShow(){
         },
-		
+
         methods: {
 			// 图片上传
 			selectImage(index) {
@@ -77,7 +77,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -87,9 +87,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -126,13 +126,13 @@
 				_this.form.phone=_this.item2.user.phone
 				_this.form.driverName=_this.item2.user.userName
 				_this.form.driverId=_this.item2.user.id
-				
+
 				_this.form.airStatus=1;
 				_this.form.taskId=_this.item.taskId;
 				_this.form.taskDetailId=_this.item.id;
-				
+
 				_this.form.rejectionApplyImg=_this.imgList.join(',')
-				
+
 				const {data} = await gasApplyYjsAdd(_this.form);
 				if(data.code == 200){
 				    uni.showToast({
@@ -186,7 +186,7 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
+
 				>input{
 					width 490rpx;
 					text-align: right;
@@ -195,7 +195,7 @@
 					font-weight: 500;
 					color: #CCCCCC;
 				}
-			}	
+			}
 			.up-img-box{
 			    display flex
 			    margin:34rpx 26rpx;

+ 1 - 1
pages_student/mine/upStudentCard.vue

@@ -44,7 +44,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

+ 30 - 30
pages_student/useGasApply/useGasApplyAdd.vue

@@ -4,9 +4,9 @@
 		<view class="register_li">
 			<view class="register_li_min">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>          
+				<view>申请人:</view>
 				<input v-model="form.applyUser" disabled  type="text" >
-			</view>	
+			</view>
 			<view class="register_li_min" style="border: none;">
 				<img class="icon_img" src="@/images/Version3.0/icon_zgsq_dhh.png">
 				<view>联系方式:</view>
@@ -14,7 +14,7 @@
 			</view>
 		</view>
 		<view class="register_li2">
-			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray"> 
+			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
 				<view class="register_li_min">
 					<view>*</view>
 					<view>实验地点:</view>
@@ -58,7 +58,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-if="listType==0" class="sub_btn" @click="submitForm()">提交</view>
 		<view v-if="listType==2" class="sub_btn">重新申请</view>
 	</view>
@@ -98,13 +98,13 @@
         onLoad(option) {
 			this.status=option.status;
 			this.id=option.id;
-			
+
         },
         onShow(){
-			
+
         },
         methods: {
-			
+
 			//查询实验室
 			async labList(){
 				const {data} = await labList()
@@ -115,7 +115,7 @@
 					res.forEach(function(item){
 						_this.pickerArray.push(item.name);
 					})
-					
+
 				}
 			},
 			//获取气体名称列表
@@ -167,13 +167,13 @@
 						_this.form.subjectId=item.id;
 					}
 				})
-				
+
 				//校验当前用户有乜有当前实验室使用 权限
 				const {data} = await qualificationVerify({subjectId:_this.form.subjectId})
 				if(data.code==200){
 					let res=data.data
 					if(res.count>0){//有资格
-						
+
 					}else{//没资格
 						uni.showToast({
 							title:'申请用气资格前需要先申请对应实验地点的安全准人资格!',
@@ -185,7 +185,7 @@
 						_this.form.subjectId='';
 					}
 				}
-				
+
 			},
 			//时间选中
 			startChange(e){
@@ -214,7 +214,7 @@
 			},
 			// 图片上传
 			selectImage() {
-				
+
 			    let self = this;
 			    wx.chooseImage({
 			        count: 1,
@@ -233,7 +233,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -270,11 +270,11 @@
 			    if(data.code==200){
 					let res=data.data
 					_this.form=res.apply;
-					
-					
+
+
 				}
 			},
-			
+
 			//提交
 			async submitForm(){
 				let _this = this;
@@ -382,9 +382,9 @@
 					    },2000);
 					}
 				}
-				
+
 			},
-			
+
         },
 		mounted(){
 		   this.googsList()
@@ -436,7 +436,7 @@
 					font-weight: 500;
 					color: #999999;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -445,10 +445,10 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
-		
+
 		}
 		.register_li2{
 			background #fff;
@@ -482,7 +482,7 @@
 					font-weight: 500;
 					color: #333;
 				}
-				
+
 				>input{
 					flex:1;
 					text-align: right;
@@ -491,8 +491,8 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
-				
+
+
 			}
 			/* 时间 */
 			.register_li_min2{
@@ -517,7 +517,7 @@
 					color: #333333;
 					line-height: 100rpx;
 					width: 188rpx;
-					
+
 				}
 				>view:nth-child(2){
 					font-size: 24rpx;
@@ -536,10 +536,10 @@
 					text-align: right;
 				}
 			}
-			
+
 			.issue_li{
 				margin:34rpx 26rpx 0;
-			
+
 				view:nth-child(1){
 					color:red;
 					line-height:28rpx;
@@ -577,7 +577,7 @@
 						position: absolute;
 						left: 278rpx;
 						z-index: 20;
-						
+
 					}
 				}
 				.issue_img{
@@ -588,7 +588,7 @@
 				}
 			}
 		}
-		
+
 		/* 按钮 */
 		.sub_btn{
 			width: 650rpx;

+ 13 - 13
pages_student/useRegister/giveRegister.vue

@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		<view  class="sub_btn" @click="submitForm()">确认归还</view>
-		
+
 	</view>
 </template>
 
@@ -40,7 +40,7 @@
 	import { useRegisterDetail,giveRegisterAdd } from '@/api/index.js'
 	import { config } from '@/api/request/config.js'
     export default {
-		
+
         name: "gasRecycle",
         data() {
             return {
@@ -70,12 +70,12 @@
        	this.electronicTag=option.code;
        },
         onShow() {
-			
+
         },
 		mounted(){
 			this.getInfo()
 		},
-        methods: {  
+        methods: {
 			// 图片上传
 			selectImage(index) {
 			    let self = this;
@@ -105,7 +105,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -115,9 +115,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -184,7 +184,7 @@
 				        });
 				    },2000);
 				}
-				
+
 			},
         }
     }
@@ -198,7 +198,7 @@
         display flex;
         flex-direction column;
         overflow hidden;
-		padding-bottom: 220rpx; 
+		padding-bottom: 220rpx;
 		.title{
 			width: 750rpx;
 			height: 100rpx;
@@ -243,7 +243,7 @@
 					color: #333333;
 				}
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -288,7 +288,7 @@
 			    display flex
 			    margin:34rpx 26rpx;
 				.asterisk{
-					padding-top:30rpx; 
+					padding-top:30rpx;
 					color:red;
 					line-height:28rpx;
 					margin-right: 12rpx;
@@ -328,7 +328,7 @@
 			        }
 			    }
 			}
-			
+
 		}
 		/* 按钮 */
 		.sub_btn{
@@ -347,6 +347,6 @@
 			bottom:30rpx;
 			z-index: 1000;
 		}
-		
+
 	}
 </style>

+ 19 - 19
pages_student/useRegister/useRegister.vue

@@ -53,7 +53,7 @@
 		<view v-if="pageType==1" class="sub_btn" @click="submitForm(2)">提交余量不符并使用</view>
 		<view v-if="pageType==2" class="sub_btn" @click="handleClick('useGasApply')">申请用气资格</view>
 		<view v-if="pageType==3" class="sub_btn" @click="handleClick('QRcode')">重新扫描</view>
-		
+
 	</view>
 </template>
 
@@ -61,7 +61,7 @@
 	import { useRegisterDetail,useRegisterAdd } from '@/api/index.js'
 	import { config } from '@/api/request/config.js'
     export default {
-		
+
         name: "gasRecycle",
         data() {
             return {
@@ -78,10 +78,10 @@
 				},
 				userType:uni.getStorageSync('userType'),
 				form:{
-					
+
 				},
                 dataList:[],
-				imgList:[],   
+				imgList:[],
 				specificationName:{},
 				currentStatus:null,
 				electronicTag:'333',
@@ -91,7 +91,7 @@
                	this.electronicTag=option.code;
                },
         onShow() {
-			
+
         },
 		mounted(){
 		  this.getInfo()
@@ -106,7 +106,7 @@
 				}
 			}); */
 		},
-        methods: { 
+        methods: {
 			//点击事件
 			handleClick(doType) {
 				let _this=this;
@@ -119,14 +119,14 @@
 				   		_this.electronicTag=res.result
 				   	}
 				   });
-				   
+
 			   }else if(doType=='useGasApply'){//申请用气资格
 				   uni.redirectTo({
 				   	 url:'/pages_student/useGasApply/useGasApplyAdd?status=0'
 				   })
 			   }
 			},
-			
+
 			// 图片上传
 			selectImage(index) {
 			    let self = this;
@@ -156,7 +156,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -166,9 +166,9 @@
 			        success: (uploadFileRes) => {
 			            let res = JSON.parse(uploadFileRes.data);
 						if(res.code == 200){
-						    
+
 							self.imgList.push(res.data.url);
-			          
+
 						}else{
 							uni.showToast({
 								title: res.msg,
@@ -232,7 +232,7 @@
 					obj.isSurplus=1
 					obj.beforeUse=_this.form.beforeUse
 				}
-				
+
 				const {data} = await useRegisterAdd(obj);
 				if(data.code == 200){
 				    uni.showToast({
@@ -247,7 +247,7 @@
 				        });
 				    },2000);
 				}
-				
+
 			},
         }
     }
@@ -261,7 +261,7 @@
         display flex;
         flex-direction column;
         overflow hidden;
-		padding-bottom: 220rpx; 
+		padding-bottom: 220rpx;
 		.title{
 			width: 750rpx;
 			height: 100rpx;
@@ -306,7 +306,7 @@
 					color: #333333;
 				}
 			}
-			
+
 		}
 		.register_li2{
 			background #fff;
@@ -351,7 +351,7 @@
 			    display flex
 			    margin:34rpx 26rpx;
 				.asterisk{
-					padding-top:30rpx; 
+					padding-top:30rpx;
 					color:red;
 					line-height:28rpx;
 					margin-right: 12rpx;
@@ -391,7 +391,7 @@
 			        }
 			    }
 			}
-			
+
 		}
 		/* 按钮 */
 		.sub_btn{
@@ -433,7 +433,7 @@
 			margin:20rpx 20rpx 0;
 			padding:20rpx 0;
 			box-sizing: border-box;
-			
+
 			>img{
 				width: 100rpx;
 				height: 100rpx;
@@ -448,7 +448,7 @@
 				line-height: 30rpx;
 				text-align: center;
 				margin-top: 42rpx;
-				padding-bottom: 106rpx; 
+				padding-bottom: 106rpx;
 			}
 		}
 	}

+ 1 - 1
pages_student/workbench/photoInspection.vue

@@ -163,7 +163,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

+ 1 - 1
pages_student/workbench/safeAccess/accessApplication.vue

@@ -135,7 +135,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

+ 37 - 37
pages_student/workbench/safeAccess/newApplication.vue

@@ -14,7 +14,7 @@
 					<view>*</view>
 					<view>资格有效期:</view>
 				</view>
-				<picker @change="buttonChange2" 
+				<picker @change="buttonChange2"
 					:range-key="'name'" :value="id" :range="buttonArray2">
 					<view class="picker-min-box">
 						<view>{{buttonArray2[buttonArrayIndex2].name}}</view>
@@ -57,7 +57,7 @@
 					<view>申请人:</view>
 					<input v-model="sysUser.nickName"   type="text" placeholder="学生姓名">
 				</view>
-				<view class="user-info-box-min">	
+				<view class="user-info-box-min">
 				     <view>*</view>
 					<view>联系电话:</view>
 					<input v-model="sysUser.phonenumber"   type="text" placeholder="联系电话">
@@ -83,7 +83,7 @@
 					<input v-model="sysUser.tutorUserName" @change="tutorUserNameClick()"  type="text" placeholder="请输入姓名,最少两个字">
 					<uni-data-picker disabled=true  @change="bindPickerChange" :localdata="tutorUserList" ref='picker'> </uni-data-picker>
 				</view>
-			
+
 			</view>
 			<!-- 老师 -->
 			<view v-if="subjectData.sysUser.userType == '11'" v-for="(item,index) in subjectData.listTeacher" :key="index">
@@ -219,9 +219,9 @@
             }
         },
         onLoad(option) {
-			
+
 			console.log(JSON.parse(decodeURIComponent(option.item)))
-		
+
 			if(option.item){
 				let newItem = JSON.parse(decodeURIComponent(option.item));
 				let newObj = {
@@ -240,15 +240,15 @@
 			}
         },
         onShow(){
-			
+
 			this.addTime();
 			this.clearData();
 			this.currentDate=this.getdate();
 			console.log('时间')
 			console.log(this.currentDate)
-			
+
         },
-		
+
         methods: {
 			getdate() {
 					  var date = new Date();
@@ -256,7 +256,7 @@
 					  var year = date.getFullYear();
 					  var month = date.getMonth() + 1;
 					  var strDate = date.getDate();
-				
+
 					  if (month >= 1 && month <= 9) {
 							month = "0" + month;
 					  }
@@ -268,14 +268,14 @@
 				},
 			//清除
 			clearData(){
-			    
+
 				this.tutorUserList=[];
-			   
+
 			},
 			//导师查询
 			async tutorUserNameClick(){
 				let _this=this
-			
+
 				_this.tutorUserList=[]
 				let obj = {
 					nickName:this.sysUser.tutorUserName
@@ -283,16 +283,16 @@
 				const {data} = await teacherApply(obj)
 				if(data.code == 200){
 					console.log(data)
-				
+
 					data.data.forEach(function(item){
 						_this.tutorUserList.push({text: item.nickName,value:item.userId,})
 					})
 					console.log(_this.tutorUserList)
 					_this.$refs.picker.show()
 				}
-				
+
 			},
-	
+
 			 bindPickerChange: function(e) {
 				 let _this=this;
 				console.log('picker发送选择改变,携带值为', e.detail.value)
@@ -300,13 +300,13 @@
 				data.forEach(function(item){
 					_this.sysUser.tutorUserName=item.text
 					_this.sysUser.tutorUserId=item.value
-			
+
 				})
-				
-				
+
+
 			},
-			
-		
+
+
 			//时间选择触发-开始
 			beginDateChange(data){
 			    this.validBeginTime = data.detail.value;
@@ -514,11 +514,11 @@
 				let fileTypeArr= item.fileType.split(',')
 				 _this.strArr = [];
 				fileTypeArr.forEach(function (item){
-					
+
 				  if(item=='1'){
 					_this.strArr.push('pdf')
 				  }else if(item=='2'){
-					_this.strArr.push('doc','docx')  
+					_this.strArr.push('doc','docx')
 				  }else if(item=='3'){
 					 _this.strArr.push('png','jpg','gif')
 				  }
@@ -526,7 +526,7 @@
 				console.log(_this.strArr)
 				//数组去重
 				//strArr= [...new Set(strArr)]
-				  
+
 				let self = this;
 				uni.showActionSheet({
 				    itemList: ['上传文件', '上传图片'],
@@ -546,7 +546,7 @@
 				});
 			},
             upImg(item) {
-			
+
                 let self = this;
                 wx.chooseImage({
                     count: 1,
@@ -554,7 +554,7 @@
                     sourceType: ["album", "camera"],
                     success: function(res) {
 						console.log(res)
-						let text = res.tempFilePaths[0].split('.')    
+						let text = res.tempFilePaths[0].split('.')
 						if(self.strArr.indexOf(text[1])==-1){ uni.showToast({
 							 	title: '请上传'+self.strArr.join(',')+'格式文件',
 							 	icon:"none",
@@ -572,7 +572,7 @@
 							});
 							return
 						}
-						
+
 						let upObj = {
 							name:self.uploadFileName+'.'+text[1],
 							path:res.tempFilePaths[0],
@@ -626,7 +626,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: upObj.path,
 			        name: 'file',
@@ -738,8 +738,8 @@
 				  this.sysUser.cardNum==null?'':this.sysUser.cardNum;
 				  this.sysUser.grade==null?'':this.sysUser.grade;
 				  this.sysUser.tutorUserName==null?'':this.sysUser.tutorUserName;
-				 
-				
+
+
 				  if(this.infoType){
 					this.validLength = this.infoData.labSecurityApply.validLength;
 					for(let i=0;i<self.infoData.listTemp.length;i++){
@@ -843,7 +843,7 @@
 				}
 				>input{
 					width 460rpx;
-				}	
+				}
 			}
 			.picker-title-box{
 				padding:0 20rpx;
@@ -859,14 +859,14 @@
 				     line-height:28rpx;
 				}
 				view:nth-child(2){
-					
+
 				}
 				view:nth-child(3){
 					color:#999;
 				}
-				
+
 			}
-			
+
 		}
 		.newApplication-page{
 			background #fff
@@ -918,10 +918,10 @@
 					}
 					view:nth-child(1){
 						color:red;
-					
+
 					}
 					view:nth-child(2){
-						
+
 					}
 					view:nth-child(3){
 						color:#999;
@@ -968,7 +968,7 @@
 					font-size:28rpx;
 					line-height:40rpx;
 					padding:0 20rpx;
-					
+
 				}
 				.picker-up-img-box{
 					margin:40rpx auto;
@@ -1083,7 +1083,7 @@
 					text-align center;
 					line-height:100rpx;
 					color:#999;
-					
+
 				}
 				.for-box{
 					width:710rpx;

+ 1 - 1
pages_supplier/register/registerTow.vue

@@ -69,7 +69,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 24 - 24
pages_supplier/transportCar/transportCarAdd.vue

@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view>
-			
+
 		</view>
 		<view class="register_li2" v-for="(item,index) in carCredentialsDtos">
 			<view class="register_li_t"><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>{{item.naturalName}}</view>
@@ -30,7 +30,7 @@
 			</view>
 			<view class="register_li_b3">{{item.remark}}</view>
 		</view>
-		
+
 		<view class="sub_btn" @click="submitForm()">提交</view>
 	</view>
 </template>
@@ -51,14 +51,14 @@
 				id:null,
             }
         },
-        onLoad(option) {   
+        onLoad(option) {
 			this.status=option.status;
 			this.id=option.id;
         },
         onShow(){
-			
+
         },
-		
+
        methods: {
        		// 图片上传
        		selectImage(item) {
@@ -80,7 +80,7 @@
        		        mask: true
        		    });
        		    uni.uploadFile({
-       		        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+       		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
        		        header:{'Authorization':uni.getStorageSync('token')},
        		        filePath: tempFilePaths,
        		        name: 'file',
@@ -136,10 +136,10 @@
 					item.endTime=e.target.value
 				}
        		},
-       		
+
 			//校验特殊字符
 			verify(){
-				if(!(/^1[3456789]\d{9}$/.test(this.form.phone))){ 
+				if(!(/^1[3456789]\d{9}$/.test(this.form.phone))){
 				       uni.showToast({
 				       	title: '请输入正确的手机号',
 				       	icon:"none",
@@ -147,8 +147,8 @@
 				       	duration: 2000
 				       });
 				       this.form.phone='';
-				    } 
-				
+				    }
+
 			},
 			//获取列表数据
 			async getList(){
@@ -169,7 +169,7 @@
 					let res=data.data
 					this.isAudit=res.isAudit;
 					this.form=res;
-					
+
 					_this.carCredentialsDtos.forEach(function(item){
 						res.carCredentialsVos.forEach(function(item2){
 							if(item.certificateId==item2.certificateId){
@@ -181,7 +181,7 @@
 					})
 			    }
 			},
-			            
+
        		//注册提交
        		async submitForm(){
        			let _this = this;
@@ -198,9 +198,9 @@
        			//提交的时候过滤空数据
 				let arr=[];
 				for(let i=0;i<_this.carCredentialsDtos.length;i++){
-					
+
 					if(_this.carCredentialsDtos[i].required==1){
-						
+
 						if(!_this.carCredentialsDtos[i].naturalUrl){
 							isPass=false;
 							uni.showToast({
@@ -228,7 +228,7 @@
 				}
 				// _this.carCredentialsDtos.forEach(function(item){
 				// 	if(item.required==1){
-						
+
 				// 		if(!item.naturalUrl){
 				// 			isPass=false;
 				// 			uni.showToast({
@@ -254,7 +254,7 @@
 				// 		arr.push(item)
 				// 	}
 				// })
-				
+
 				if(isPass){
 					_this.form.carCredentialsDtos=arr;
 					if(this.status==0){//新增
@@ -290,17 +290,17 @@
 						}
 					}
 				}
-				
-       			
+
+
        		},
-       		
+
            },
 		mounted(){
 			this.getList();
 			if(this.status==1){
 				this.getInfo();
 			}
-			
+
 		},
 	}
 </script>
@@ -336,7 +336,7 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
+
 				>input{
 					width 500rpx;
 					text-align: right;
@@ -344,8 +344,8 @@
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
-				}	
-			}	
+				}
+			}
 		}
 		.register_li2{
 			background #fff;
@@ -379,7 +379,7 @@
 				// 	position: absolute;
 				// 	left: 187rpx;
 				// 	top: 86rpx;
-					
+
 				// }
 				.register_li_b_img1{
 					width: 450rpx;

+ 22 - 22
pages_supplier/transportPerson/transportPersonAdd.vue

@@ -7,7 +7,7 @@
 				<view>姓名:</view>
 				<input v-model="form.userName"  maxlength="10"  type="text" placeholder-style="color:#999;" placeholder="请输入姓名">
 			</view>
-			<view class="register_li_min" style="border: none;">	
+			<view class="register_li_min" style="border: none;">
 			    <view>*</view>
 				<view>联系方式:</view>
 				<input v-model="form.phone"   type="text" placeholder-style="color:#999;" placeholder="请输入联系方式">
@@ -32,7 +32,7 @@
 			</view>
 			<view class="register_li_b3">{{item.remark}}</view>
 		</view>
-		
+
 		<view class="sub_btn" @click="submitForm()">提交</view>
 	</view>
 </template>
@@ -47,21 +47,21 @@
 				form:{
 					userName:'',
 					phone:'',
-					
+
 				},
 				userCredentialsDtos:[],
 				status:null,//0添加1编辑
 				id:null,
             }
         },
-        onLoad(option) {   
+        onLoad(option) {
 			this.status=option.status;
 			this.id=option.id;
         },
         onShow(){
-			
+
         },
-		
+
        methods: {
        		// 图片上传
        		selectImage(item) {
@@ -83,7 +83,7 @@
        		        mask: true
        		    });
        		    uni.uploadFile({
-       		        url: config.base_url+'/base/upload', //仅为示例,非真实的接口地址
+       		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
        		        header:{'Authorization':uni.getStorageSync('token')},
        		        filePath: tempFilePaths,
        		        name: 'file',
@@ -139,10 +139,10 @@
        				item.endTime=e.target.value
        			}
        		},
-       		
+
 			//校验特殊字符
 			verify(){
-				if(!(/^1[3456789]\d{9}$/.test(this.form.phone))){ 
+				if(!(/^1[3456789]\d{9}$/.test(this.form.phone))){
 				       uni.showToast({
 				       	title: '请输入正确的手机号',
 				       	icon:"none",
@@ -150,8 +150,8 @@
 				       	duration: 2000
 				       });
 				       this.form.phone='';
-				    } 
-				
+				    }
+
 			},
 			//获取列表数据
 			async getList(){
@@ -172,7 +172,7 @@
 					let res=data.data
 					this.isAudit=res.isAudit;
 					this.form=res;
-					
+
 					_this.userCredentialsDtos.forEach(function(item){
 						res.userCredentialsVos.forEach(function(item2){
 							if(item.certificateId==item2.certificateId){
@@ -184,7 +184,7 @@
 					})
 			    }
 			},
-			            
+
        		//注册提交
        		async submitForm(){
        			let _this = this;
@@ -215,13 +215,13 @@
 					duration: 2000
 				   });
 				   return
-				} 
+				}
        			//提交的时候过滤空数据
 				let arr=[];
 				for(let i=0;i<_this.userCredentialsDtos.length;i++){
-					
+
 					if(_this.userCredentialsDtos[i].required==1){
-						
+
 						if(!_this.userCredentialsDtos[i].naturalUrl){
 							isPass=false;
 							uni.showToast({
@@ -311,14 +311,14 @@
 					}
 				}
        		},
-       		
+
            },
 		mounted(){
 			this.getList();
 			if(this.status==1){
 				this.getInfo();
 			}
-			
+
 		},
 	}
 </script>
@@ -357,7 +357,7 @@
 					font-weight: 500;
 					color: #333333;
 				}
-				
+
 				>input{
 					width 490rpx;
 					text-align: right;
@@ -365,8 +365,8 @@
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #333333;
-				}	
-			}	
+				}
+			}
 		}
 		.register_li2{
 			background #fff;
@@ -400,7 +400,7 @@
 				// 	position: absolute;
 				// 	left: 187rpx;
 				// 	top: 86rpx;
-					
+
 				// }
 				.register_li_b_img1{
 					width: 450rpx;