heyang 10 달 전
부모
커밋
2b1e186b78
6개의 변경된 파일422개의 추가작업 그리고 19개의 파일을 삭제
  1. 3 3
      api/request/config.js
  2. 13 2
      pages.json
  3. BIN
      pages/images/for_min_bg.png
  4. 179 0
      pages/views/empowerOpen.vue
  5. 5 14
      pages/views/mine/mine.vue
  6. 222 0
      pages/views/photoInspectionInfo.vue

+ 3 - 3
api/request/config.js

@@ -1,10 +1,11 @@
 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.9: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.17:8080',//小飞
+	//base_url: 'http://192.168.1.43/api',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
@@ -18,7 +19,6 @@ 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/', //苏大临时地址
-	service_url:'http://192.168.1.43/labSystem/'
 }
 export {
 	config

+ 13 - 2
pages.json

@@ -1,6 +1,6 @@
 {
 	"pages": [
-
+		
 		{
 			"path": "pages/views/login/login",//登录
 			"style": {
@@ -9,7 +9,18 @@
 				"navigationStyle":"custom"  //关闭原生导航
 			}
 		},
-
+        {
+			"path": "pages/views/empowerOpen",
+			"style": {
+				"navigationBarTitleText": "授权开门"
+			}
+		},
+		{
+			"path": "pages/views/photoInspectionInfo",
+			"style": {
+				"navigationBarTitleText": "拍照检查"
+			}
+		},
 
 		{
 			"path": "pages/views/mine/mine",//我的

BIN
pages/images/for_min_bg.png


+ 179 - 0
pages/views/empowerOpen.vue

@@ -0,0 +1,179 @@
+<!-- 拍照检查 -->
+<template>
+	<view id="empowerOpen">
+		<view class="page-one" v-if="pageType==1">
+			<view class="header">
+				<input class="header-l" type="text" v-model="newData.subId" placeholder="实验室名称">
+			</view>
+			<view class="list">
+				<view class="list-li">
+					<view class="list-li-l">实验室名称(房间号)</view>
+					<view class="list-li-r">授权</view>
+				</view>
+			</view>
+		</view>
+		<view class="page-tow" v-if="pageType==2">
+			<view class="list-tow">
+				<view class="list-tow-li">
+					<view class="list-tow-li-t">被授权人</view>
+					<input class="list-tow-li-b" type="text" v-model="newData.subId" placeholder="">
+				</view>
+				<view class="list-tow-li">
+					<view class="list-tow-li-t">生效时间</view>
+					<view class="time">
+						<view class="time-l">2024/02/04  12:23</view>
+						<view class="time-c">-</view>
+						<view class="time-r">2024/02/04  12:23</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+
+</template>
+
+<script>
+	import {
+		config
+	} from '@/api/request/config.js'
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				pageType: 2,
+				baseUrl: config.base_url,
+				newData: {
+					
+				},
+				
+
+			}
+		},
+		onLoad(option) {
+
+		},
+		onShow() {
+
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+	#empowerOpen {
+		.page-one{
+			.header{
+				width: 749rpx;
+				height: 120rpx;
+				background: #FFFFFF;
+				padding: 20rpx 30rpx;
+				box-sizing: border-box;
+				border-bottom: 1rpx solid #D8D8D8;
+				.header-l{
+					width: 690rpx;
+					height: 80rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					border: 1rpx solid #E0E0E0;
+					padding: 20rpx;
+					box-sizing: border-box;
+				}
+			}
+			.list{
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				background: #fff;
+				.list-li{
+					height: 90rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					border-bottom: 1rpx solid #D8D8D8;
+					
+					.list-li-l{
+						flex: 1;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 400;
+						font-size: 30rpx;
+						color: #333333;
+						line-height: 42rpx;	
+					}
+					.list-li-r{
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #0183FA;
+						line-height: 39rpx;
+					}
+				}
+			}
+			
+		}
+		.page-tow{
+			.list-tow{
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				background: #fff;
+				.list-tow-li{
+					.list-tow-li-t{
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 400;
+						font-size: 30rpx;
+						color: #333333;
+						line-height: 42rpx;
+						text-align: left;
+						margin: 24rpx 0;
+					}
+					.list-tow-li-b{
+						width: 690rpx;
+						height: 80rpx;
+						border-radius: 10rpx 10rpx 10rpx 10rpx;
+						border: 1rpx solid #E0E0E0;
+					}
+					.time{
+						display:flex;
+						justify-content: flex-start;
+						align-items: center;
+						width: 690rpx;
+						height: 80rpx;
+						border-radius: 10rpx 10rpx 10rpx 10rpx;
+						border: 1rpx solid #E0E0E0;
+						.time-l{
+							height: 80rpx;
+							width: 324rpx;
+							border-right:1rpx solid #E0E0E0;
+							font-family: PingFang SC, PingFang SC;
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #333333;
+							line-height: 80rpx;
+							text-align: left;
+						}
+						.time-c{
+							height: 80rpx;
+							width: 40rpx;
+							text-align: center;
+							line-height: 80rpx;
+						}
+						.time-r{
+							height: 80rpx;
+							width: 324rpx;
+							background: #E0E0E0;
+							border-left:1rpx solid #E0E0E0;
+							font-family: PingFang SC, PingFang SC;
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #333333;
+							line-height: 80rpx;
+							text-align: left;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

+ 5 - 14
pages/views/mine/mine.vue

@@ -86,29 +86,21 @@
 	import {
 		getMineConfig
 	} from '@/utils/mineConfig'
-	// #ifdef MP-WEIXIN
+
 	import {
 		tabBar
 	} from '@/pages/component/tabBar.vue'
 	import {
 		mineConfigurationSlot
 	} from '@/pages/component/mineConfigurationSlot'
-	// #endif
-
 
 	export default {
-		// #ifdef MP-WEIXIN
+
 		components: {
 			tabBar,
 			mineConfigurationSlot,
 		},
-		// #endif
-		// #ifdef H5
-		components: {
-			"tabBar": () => import('@/pages/component/tabBar.vue'),
-			"mineConfigurationSlot": () => import('@/pages/component/mineConfigurationSlot.vue'),
-		},
-		// #endif
+		
 		data() {
 			return {
 				baseUrl: config.base_url,
@@ -500,9 +492,8 @@
 			}
 
 			.top-max-box-two {
-				background url("@/pages/images/img_wd_bg.png");
-				background-size: 100%;
-				height: 245rpx;
+				background: #0183FA;
+				height: 180rpx;
 
 				display flex;
 				overflow hidden;

+ 222 - 0
pages/views/photoInspectionInfo.vue

@@ -0,0 +1,222 @@
+<!-- 拍照检查 -->
+<template>
+	<view id="photoInspectionInfo">
+		<view class="header">
+			<view class="header-t">
+				<img class="header-t-l" src="@/pages/images/icon_01.png" />
+				<view class="header-t-c">刘瑶瑶 13233556655</view>
+				<view class="header-t-r">实验中</view>
+			</view>
+			<img class="header-line" src="@/pages/images/for_min_bg.png" />
+			<view class="header-b">
+				<view class="header-li">签到时间:2024-03-15 13:00</view>
+				<view class="header-li">离开时间:-</view>
+				<view class="header-li">停留时间:-</view>
+			</view>
+
+		</view>
+		<view class="small-title">检查项</view>
+		<view class="main-li" v-if="pageType==1">
+			<img class="main-li-t" src="@/pages/images/img_bg_cjcx.png" />
+			<view class="main-li-b">实验室照片</view>
+		</view>
+		<view class="photo-b" v-if="pageType==2">
+			<view v-for="(item,index) in photoList" :key="index" @click="photoClick(item)" class="list-li"
+				:class="!item.type?'color-A':'color-B'">
+				<view>{{item.name}}</view>
+				<img v-if="item.type" :src="item.icon">
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		config
+	} from '@/api/request/config.js'
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				pageType: 1,
+				baseUrl: config.base_url,
+				newData: {
+					
+				},
+				photoList: [{
+						type: false,
+						name: '实验室照片',
+						icon: require('@/pages_basics/images/icon_pzjc_xz.png')
+					},
+					{
+						type: false,
+						name: '垃圾桶清理后照片',
+						icon: require('@/pages_basics/images/icon_pzjc_xz.png')
+					},
+				],
+
+			}
+		},
+		onLoad(option) {
+
+		},
+		onShow() {
+
+		},
+		methods: {
+			photoClick(item) {
+				item.type = !item.type;
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+	#photoInspectionInfo {
+		padding: 0 30rpx;
+		box-sizing: border-box;
+
+		.header {
+			.header-t {
+				height: 116rpx;
+				background: #fff;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				border-radius: 10rpx 10rpx 0rpx 0rpx;
+
+				.header-t-l {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 35rpx;
+					margin: 0 22rpx 0 30rpx;
+				}
+
+				.header-t-c {
+					flex: 1;
+					font-family: Source Han Sans, Source Han Sans;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 41rpx;
+				}
+
+				.header-t-r {
+					font-family: Source Han Sans, Source Han Sans;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #0183FA;
+					line-height: 41rpx;
+					margin-right: 38rpx;
+				}
+			}
+
+			.header-line {
+				width: 100%;
+				height: 30rpx;
+			}
+
+			.header-b {
+				width: 100%;
+				height: 222rpx;
+				background: #fff;
+				padding: 20rpx 30rpx 0;
+				box-sizing: border-box;
+				border-radius: 0rpx 0rpx 10rpx 10rpx;
+
+				.header-li {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 28rpx;
+					text-align: left;
+				}
+
+				.header-li:nth-of-type(1) {
+					margin-bottom: 42rpx;
+				}
+
+				.header-li:nth-of-type(2) {
+					margin-bottom: 42rpx;
+				}
+			}
+		}
+
+		.small-title {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			text-align: left;
+			margin: 30rpx 0;
+		}
+
+		.main-li {
+			margin-bottom: 20rpx;
+
+			.main-li-t {
+				width: 690rpx;
+				height: 250rpx;
+				border-radius: 20rpx 20rpx 0rpx 0rpx;
+			}
+
+			.main-li-b {
+				width: 690rpx;
+				height: 82rpx;
+				background: #FFFFFF;
+				border-radius: 0rpx 0rpx 20rpx 20rpx;
+				border: 2rpx dashed #E0E0E0;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 82rpx;
+				text-align: left;
+				padding-left: 28rpx;
+				box-sizing: border-box;
+			}
+		}
+
+		.photo-b {
+			padding-bottom: 140rpx;
+
+			.list-li {
+				width: 690rpx;
+				height: 100rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 20rpx;
+
+				>view {
+					font-weight: 400;
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 100rpx;
+					text-align: left;
+					padding-left: 28rpx;
+				}
+
+				>img {
+					width: 60rpx;
+					height: 60rpx;
+					margin-top: 44rpx;
+				}
+
+			}
+
+			.color-A {
+				border: 2rpx dotted #E0E0E0;
+			}
+
+			.color-B {
+				border: 2rpx dotted #0183FA;
+			}
+		}
+	}
+</style>