heyang

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
 	//base_url: 'http://192.168.1.8/api',//V3
-	 //base_url: 'http://192.168.1.9:8080',//柴
-	base_url: 'http://192.168.1.24:8080',//林总
+	 base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟

pages/home/home.vue

@@ -2,21 +2,21 @@
   <view id="home">
    <manage-home v-if="userType==1" ref="manage"></manage-home>
    <user-home v-if="userType==2"></user-home>
-    <!-- <supplier-home v-if="userType==3"></supplier-home> -->
+    <supplier-home v-if="userType==3"></supplier-home>
     <tab-bar v-if="userType!=3"></tab-bar>
   </view>
 </template>
 <script>
 import { manageHome } from '@/pages/home/manageWorkbench'
 import { userHome } from '@/pages/home/studentWorkbench.vue'
-// import { supplierHome } from '@/pages/home/supplierWorkbench.vue'
+import { supplierHome } from '@/pages/home/supplierWorkbench.vue'
 import { tabBar } from '@/component/tabBar.vue'
 export default {
   name: "home",
   components: {
     manageHome,
     userHome,
-    // supplierHome,
+    supplierHome,
     tabBar
   },
   data() {

pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -4,7 +4,7 @@
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view class="basics">
 			<view class="title">
-				<view class="title_t">计划标题</view>
+				<view class="title_t">计划标题11</view>
 				<textarea class="title_b" type="text" v-model="form.title" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
 			</view>
 			<view class="type">
@@ -500,21 +500,32 @@ export default {
 				});
 				return;
 			}
+			console.log(_this.form.checkCategory)
+			console.log(_this.form.hazardNum)
+			if( _this.form.checkCategory==2 && _this.form.hazardNum==0){
+				uni.showToast({
+				    title: '请选择检查内容!',
+				    icon:"none",
+				    mask:true,
+				    duration: 2000
+				});
+				return;
+			}
 
 
-			const {data} = await checkPlanAdd(_this.form);
-			if(data.code == 200){
-			    uni.showToast({
-			        title: '提交成功',
-			        icon:"none",
-			        mask:true,
-			        duration: 2000
-			    });
-				uni.redirectTo({
-					url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
-				});
+			// const {data} = await checkPlanAdd(_this.form);
+			// if(data.code == 200){
+			//     uni.showToast({
+			//         title: '提交成功',
+			//         icon:"none",
+			//         mask:true,
+			//         duration: 2000
+			//     });
+			// 	uni.redirectTo({
+			// 		url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
+			// 	});
 
-			}
+			// }
 		},
 
 

pages_supplier/backlogManage/backlogManage.vue

@@ -4,7 +4,7 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
 		    <view class="for-big-box" v-for="(item,index) in dataList" :key="index">
 		        <view class="for-time-p">{{item.createTimeApp}}</view>
-		        <img class="for-back-img" src="@/pages_supplier/images/Version2.2/for_min_bg.png">
+		        <img class="for-back-img" src="@/images/basicsModules/for_min_bg.png">
 				<!-- 供气 -->
 		        <view class="for-box" @click="goInfo(item2)" v-for="(item2,index2) in item.taskVOList" :key="index2">
 		        	<view class="for-title-box">
@@ -13,11 +13,11 @@
 
 		        	</view>
 		        	<view class="for-address-box">
-		        		<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+		        		<img src="@/images/basicsModules/icon_wtzg_sj.png">
 		        		<view>{{item2.createTime}}</view>
 		        	</view>
 		        	<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 		        		<view>{{item2.campus}}-{{item2.building}}-{{item2.room}}</view>
 		        	</view>
 		        </view>
@@ -29,11 +29,11 @@
 
 					</view>
 					<view class="for-address-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+						<img src="@/images/basicsModules/icon_wtzg_sj.png">
 						<view>{{item4.createTime}}</view>
 					</view>
 					<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 						<view>{{item4.campus}}-{{item4.building}}-{{item4.room}}</view>
 					</view>
 				</view>
@@ -45,11 +45,11 @@
 
 					</view>
 					<view class="for-address-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+						<img src="@/images/basicsModules/icon_wtzg_sj.png">
 						<view>{{item6.createTime}}</view>
 					</view>
 					<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 
 						<view>{{item6.campus}}-{{item6.building}}-{{item6.room}}</view>
 					</view>

pages_supplier/gasManage/gasManage.vue

@@ -5,7 +5,7 @@
 		    <view class="register_li"  @click="goPage(item)" v-for="(item,index) in dataList" >
 		    	<view class="register_li_min" :style="index2===item.configVos.length-1?'border:none':''" v-for="(item2,index2) in item.configVos">
 		    		<view class="register_li_min_t">
-		    			<img class="right-img" src="@/pages_supplier/images/Version3.0/icon_qpgl_qp.png">
+		    			<img class="right-img" src="@/pages_supplier/images/icon_qpgl_qp.png">
 		    			<text>{{item.airName}}</text>
 		    		</view>
 		    		<view class="register_li_min_b" >
@@ -15,11 +15,11 @@
 		    </view>
 		</scroll-view>
 		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_supplier/images/Version3.0/img_ysrygl_zwsj.png">
+			<img class="for-back-img" src="@/images/basicsModules/img_ysrygl_zwsj.png">
 			<view>暂无数据</view>
 		</view>
 
-		<view class="sub_btn" @click="subBtn()"><img class="right-img" src="@/pages_supplier/images/Version3.0/icon_gysqpgl_xzqp.png">新增气瓶</view>
+		<view class="sub_btn" @click="subBtn()"><img class="right-img" src="@/pages_supplier/images/icon_gysqpgl_xzqp.png">新增气瓶</view>
 	</view>
 </template>
 

pages_supplier/gasRecycle/gasRecycle.vue

@@ -10,7 +10,7 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
 		    <view class="for-big-box" v-for="(item,index) in dataList" :key="index">
 		        <view class="for-time-p">{{item.createTimeApp}}</view>
-		        <img class="for-back-img" src="@/pages_supplier/images/Version2.2/for_min_bg.png">
+		        <img class="for-back-img" src="@/images/basicsModules/for_min_bg.png">
 				<!-- 供气 -->
 		        <view class="for-box" @click="goInfo(item2)" v-for="(item2,index2) in item.taskVOList" :key="index2">
 		        	<view class="for-title-box">
@@ -19,11 +19,11 @@
 
 					</view>
 		        	<view class="for-address-box">
-		        		<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+		        		<img src="@/images/basicsModules/icon_wtzg_sj.png">
 		        		<view>{{item2.createTime}}</view>
 		        	</view>
 		        	<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 
 		        		<view>{{item2.campus}}-{{item2.building}}-{{item2.room}}</view>
 		        	</view>
@@ -36,11 +36,11 @@
 
 					</view>
 					<view class="for-address-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+						<img src="@/images/basicsModules/icon_wtzg_sj.png">
 						<view>{{item4.createTime}}</view>
 					</view>
 					<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 
 						<view>{{item4.campus}}-{{item4.building}}-{{item4.room}}</view>
 					</view>
@@ -53,11 +53,11 @@
 
 					</view>
 					<view class="for-address-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_sj.png">
+						<img src="@/images/basicsModules/icon_wtzg_sj.png">
 						<view>{{item6.createTime}}</view>
 					</view>
 					<view class="for-time-box">
-						<img src="@/pages_supplier/images/Version2.2/icon_wtzg_xx.png">
+						<img src="@/images/basicsModules/icon_wtzg_xx.png">
 
 						<view>{{item6.campus}}-{{item6.building}}-{{item6.room}}</view>
 					</view>

pages_supplier/mine/mine.vue

@@ -5,12 +5,12 @@
 			<view class="register_li_min" @click="goPage('datum')">
 				<view>修改资料</view>
 			    <view class="view-three-type" :class="state==0?'colorA':'colorB'">{{state==0?'审核未通过':'审核已通过'}}</view>
-				<img class="right-img" src="@/pages_supplier/images/icon_04.png">
+				<img class="right-img" src="@/images/basicsModules/icon_04.png">
 			</view>
 			<view class="register_li_min" @click="goPage('password')" style="border: none;">
 				<view>修改密码</view>
 				<view></view>
-				<img class="right-img" src="@/pages_supplier/images/icon_04.png">
+				<img class="right-img" src="@/images/basicsModules/icon_04.png">
 			</view>
 		</view>
 		<view class="sub_btn" @click="clickOut()">退出登录</view>

pages_supplier/register/registerSuccess.vue

@@ -2,7 +2,7 @@
 <template>
     <view id="register">
 		<view class="register_li">
-			<img  class="register_li_t" src="@/pages_supplier/images/Version3.0/img_zc_zccg.png">
+			<img  class="register_li_t" src="@/pages_supplier/images/img_zc_zccg.png">
 			<view class="register_li_m">
 				<text>申请提交成功，请牢记您的账号密码，</text>
 				<text>为避免丢失和遗忘，建议您截图保存。</text>

pages_supplier/register/registerTow.vue

@@ -4,9 +4,9 @@
 		<view class="register_li" v-for="(item,index) in qpSupplierCredentialsDtos">
 			<view class="register_li_t"><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>{{item.naturalName}}</view>
 			<view class="register_li_b">
-				<img  src="@/pages_supplier/images/Version3.0/icon_zc_scbg.png">
+				<img  src="@/pages_supplier/images/icon_zc_scbg.png">
 				<img v-if="item.naturalName" :src="baseUrl+item.naturalUrl">
-				<img src="@/pages_supplier/images/Version3.0/icon_zc_sc.png" @click="selectImage(item)">
+				<img src="@/pages_supplier/images/icon_zc_sc.png" @click="selectImage(item)">
 			</view>
 			<view class="register_li_b2">
 				<view><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>有效期</view>

pages_supplier/transportCar/transportCar.vue

@@ -18,7 +18,7 @@
 			</view>
 		</scroll-view>
 		<view class="empty" v-if="pageType==2">
-			<img class="for-back-img" src="@/pages_supplier/images/Version3.0/img_ysrygl_zwsj.png">
+			<img class="for-back-img" src="@/images/basicsModules/img_ysrygl_zwsj.png">
 			<view>暂无数据</view>
 		</view>
 		<view class="sub_btn" @click="addBtn()">新增运输车辆</view>

pages_supplier/transportCar/transportCarAdd.vue

@@ -14,9 +14,9 @@
 		<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>
 			<view class="register_li_b">
-				<img class="register_li_b_img1" src="@/pages_supplier/images/Version3.0/icon_zc_scbg.png">
+				<img class="register_li_b_img1" src="@/pages_supplier/images/icon_zc_scbg.png">
 				<img class="register_li_b_img2" v-if="item.naturalName" :src="baseUrl+item.naturalUrl">
-				<img class="register_li_b_img3" src="@/pages_supplier/images/Version3.0/icon_zc_sc.png" @click="selectImage(item)">
+				<img class="register_li_b_img3" src="@/pages_supplier/images/icon_zc_sc.png" @click="selectImage(item)">
 			</view>
 			<view class="register_li_b2">
 				<view><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>有效期</view>

pages_supplier/transportPerson/transportPerson.vue

@@ -10,7 +10,7 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
 		    <view class="list" >
 				<view class="list_li" @click="detailClick(item)" v-for="(item,index) in dataList">
-					<img class="for-back-img" src="@/pages_supplier/images/Version3.0/icon_ysry_ry.png">
+					<img class="for-back-img" src="@/pages_supplier/images/icon_ysry_ry.png">
 					<text class="list_li_text">{{item.userName}}</text>
 					<text class="list_li_text2">{{item.phone}}</text>
 					<text class="list_li_text3" v-if="item.pastDue==1">证照过期</text>
@@ -18,7 +18,7 @@
 			</view>
 		</scroll-view>
 		<view class="empty" v-if="pageType==2">
-			<img class="for-back-img" src="@/pages_supplier/images/Version3.0/img_ysrygl_zwsj.png">
+			<img class="for-back-img" src=@/images/basicsModules/img_ysrygl_zwsj.png">
 			<view>暂无数据</view>
 		</view>
 		<view class="sub_btn" @click="addBtn()">新增运输人员</view>

pages_supplier/transportPerson/transportPersonAdd.vue

@@ -16,9 +16,9 @@
 		<view class="register_li2"  v-for="(item,index) in userCredentialsDtos">
 			<view class="register_li_t"><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>{{item.naturalName}}</view>
 			<view class="register_li_b">
-				<img class="register_li_b_img1" src="@/pages_supplier/images/Version3.0/icon_zc_scbg.png">
+				<img class="register_li_b_img1" src="@/pages_supplier/images/icon_zc_scbg.png">
 				<img class="register_li_b_img2" v-if="item.naturalName" :src="baseUrl+item.naturalUrl">
-				<img class="register_li_b_img3" src="@/pages_supplier/images/Version3.0/icon_zc_sc.png" @click="selectImage(item)">
+				<img class="register_li_b_img3" src="@/pages_supplier/images/icon_zc_sc.png" @click="selectImage(item)">
 			</view>
 			<view class="register_li_b2">
 				<view><text v-if="item.required==1" style="color: #f00;margin-right: 10rpx;">*</text>有效期</view>