dedsudiyu 1 mēnesi atpakaļ
vecāks
revīzija
46446e552a

+ 2 - 2
api/request/config.js

@@ -2,7 +2,7 @@ const config = {
 	/************************************ 后台服务地址 ************************************/
 	
 	// base_url: 'http://192.168.1.43/api', //43服务器
-	// base_url: 'http://192.168.1.8/api',//1.8服务器
+	base_url: 'http://192.168.1.8/api',//1.8服务器
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
@@ -22,7 +22,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 	// base_url: 'https://metersphere.zjznai.com/labSystem/', //中国海关

+ 13 - 0
pages.json

@@ -1108,6 +1108,19 @@
 					}
 				}
 			]
+		},
+		{
+			/* 危废回收分包 */
+			"root": "pages_hazardousWasteRecycling", //分包根路径
+			"name": "hazardousWasteRecycling", //分包名字可写可不写
+			"pages": [
+				{
+					"path": "views/home/home",
+					"style": {
+						"navigationBarTitleText": "危废回收"
+					}
+				}
+			]
 		}
 
 	],

+ 12 - 0
pages/views/pupilPage/pupilHome.vue

@@ -30,6 +30,10 @@
 				<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 				<view class="button-name">笼位预约</view>
 			</view> -->
+			<view class="button-min" @click="goPage('hazardousWasteRecyclingPupil')" style="margin:23rpx 0 0 20rpx;">
+				<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
+				<view class="button-name">危废回收</view>
+			</view>
 		</view>
 		<view class="button-two-box">
 			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
@@ -190,6 +194,14 @@
 					uni.navigateTo({
 						url: "/pages_basics/views/deviceCageSitePage?pageType=5",
 					});
+				}else if(type == 'hazardousWasteRecyclingPupil'){
+					//危废回收
+					//判断1.没有任何权限	跳转危废回收权限申请页面
+					
+					//判断2.有权限/有申请	跳转危废回收首页
+					uni.navigateTo({
+						url: "/pages_hazardousWasteRecycling/views/home/home",
+					});
 				}
 			},
 			/* 扫一扫*/

+ 17 - 0
pages_hazardousWasteRecycling/api/index.js

@@ -0,0 +1,17 @@
+import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
+
+export const demo1 = (data) => {
+	return apiResquest({
+		url: `/system/dept/dropList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+
+export const demo2 = (data) => {
+	return apiResquest({
+		url: `/laboratory/applet/getSubDetailInfo`,
+		method: 'GET',
+		data: data,
+	})
+};

+ 90 - 0
pages_hazardousWasteRecycling/views/home/home.vue

@@ -0,0 +1,90 @@
+<template>
+	<view id="hazardousWasteRecyclingHome">
+		<view class="max-big-button-box">
+			<img class="left-box" :src="imagesUrl('hazardousWasteRecycling/wfhs_hsbb.png')">
+			<view class="right-box">
+				<view>回收报备</view>
+				<view>可在回收日前填写报备单</view>
+			</view>
+		</view>
+		<view class="max-big-button-box">
+			<img class="left-box" :src="imagesUrl('hazardousWasteRecycling/wfhs_czdj.png')">
+			<view class="right-box">
+				<view>登记称重</view>
+				<view>请在回收日等待回收,完成称重登记</view>
+			</view>
+		</view>
+		<view class="max-big-button-box">
+			<img class="left-box" :src="imagesUrl('hazardousWasteRecycling/wfhs_lsjl.png')">
+			<view class="right-box">
+				<view>历史记录</view>
+				<view>查看我的危废回收记录</view>
+			</view>
+		</view>
+		<view class="max-big-button-box">
+			<img class="left-box" :src="imagesUrl('hazardousWasteRecycling/wfhs_qxsq.png')">
+			<view class="right-box">
+				<view>权限申请</view>
+				<view>查看我的申请,提交新申请</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		demo1,
+		demo2
+	} from '@/pages_hazardousWasteRecycling/api/index.js'
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(option) {
+			
+		},
+		onShow() {
+
+		},
+		mounted() {
+			
+		},
+		methods: {
+			
+		},
+	}
+</script>
+
+<style lang="stylus" scoped>
+	#hazardousWasteRecyclingHome {
+		height: 100%;
+		display flex;
+		flex-direction column;
+		.max-big-button-box{
+			background-color: #fff;
+			border-radius:20rpx;
+			margin:40rpx 40rpx 0;
+			display: flex;
+			.left-box{
+				margin:40rpx 40rpx 40rpx 60rpx;
+				width:160rpx;
+				height:160rpx;
+				border-radius:20rpx;
+			}
+			.right-box{
+				view:nth-child(1){
+					font-size:28rpx;
+					color:#333;
+					margin-top:70rpx;
+				}
+				view:nth-child(2){
+					font-size:22rpx;
+					color:#999;
+					margin-top:20rpx;
+				}
+			}
+		}
+	}
+</style>