zc

pages/views/login/accountLogin.vue

@@ -109,6 +109,7 @@
 						uni.setStorageSync('dataBoardType', false);
 						uni.setStorageSync('token', data.data.token);
 						uni.setStorageSync('userId', data.data.userId);
+						uni.setStorageSync('user-name', data.data.userName);
 						uni.setStorageSync('isInitPwd', true);
 						// userType 0-系统 1-教职工 2-学生 3-大屏
 						uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :

pages/views/login/ssoCertification.vue

@@ -60,6 +60,7 @@
 				if (data.code == 200) {
 					uni.setStorageSync('dataBoardType', false);
 					uni.setStorageSync('userId', data.data.userId);
+					uni.setStorageSync('user-name', data.data.userName);
 					uni.setStorageSync('isInitPwd', true);
 					// userType 0-系统 1-教职工 2-学生 3-大屏
 					uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :

pages/views/pages_patrolInspector/identityVerify.vue

@@ -28,7 +28,7 @@
 		onLoad(option) {
 			this.$set(this.queryParams,'code',option.code);
 			this.$set(this.queryParams,'subId',option.subId);
-			this.$set(this.queryParams,'userId',uni.setStorageSync('userId'));
+			this.$set(this.queryParams,'userId',uni.getStorageSync('userId'));
 			this.chemicalAioIdentityScanLogin();
 			
 		},

pages_equipmentUtilization/api/index.js

@@ -10,7 +10,7 @@ export const demo1 = (data) => {
 
 export const mpDeviceDetail = (data) => {
 	return apiResquest({
-		url: `/mp/device/detail`,
+		url: `/device/mp/device/detail`,
 		method: 'GET',
 		data: data,
 	})

pages_equipmentUtilization/views/equipmentInformation/infoPage.vue

@@ -1,28 +1,29 @@
 <template>
 	<view class="equipmentInformationInfoPage">
 		<view class="info-max-box">
-			<img class="left-img" src="">
+			<img class="left-img" v-if="imageUrls[0]" :src="baseUrl+imageUrls[0]">
+			<img class="left-img" v-if="!imageUrls[0]" src="">
 			<view class="right-box">
-				<view>设备分类：</view>
-				<view>设备名称：</view>
-				<view>设备编号：</view>
-				<view>设备状态：</view>
+				<view>设备分类：{{newData.categoryName}}</view>
+				<view>设备名称：{{newData.deviceName}}</view>
+				<view>设备编号：{{newData.deviceCode}}</view>
+				<view>设备状态：{{newData.deviceStatusName}}</view>
 			</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>类型</view>
-			<view>类型</view>
+			<view>{{newData.deviceType}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>品牌</view>
-			<view>品牌</view>
+			<view>{{newData.brand}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>设备原值(元)</view>
-			<view>500,000</view>
+			<view>{{newData.price}}</view>
 		</view>
 		<view class="text-title-box">参数用途</view>
 		<view class="text-max-box">
@@ -44,33 +45,33 @@
 		<view class="text-max-box">
 			<img src="">
 			<view>设备管理员</view>
-			<view>设备管理员</view>
+			<view>{{newData.adminDisplay}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>管理部门</view>
-			<view>管理部门</view>
+			<view>{{newData.manageDeptName}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>存放位置</view>
-			<view>存放位置</view>
+			<view>{{newData.location}}</view>
 		</view>
 		<view class="text-title-box">厂家产地</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>单位</view>
-			<view>单位</view>
+			<view>{{newData.unit}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>生产厂家</view>
-			<view>生产厂家</view>
+			<view>{{newData.manufacturer}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>产地</view>
-			<view>产地</view>
+			<view>{{newData.originPlace}}</view>
 		</view>
 		<view class="bottom-button" @click="onShade()">登记使用信息</view>
 		<view class="shade-max-big-box" v-if="shadeType == 1||shadeType == 2||shadeType == 3||shadeType == 4">
@@ -78,6 +79,7 @@
 			<view class="shade-big-box">
 				<view class="shade-title-box" v-if="shadeType == 1||shadeType == 2||shadeType == 3">登记使用信息</view>
 				<view class="shade-title-box" v-if="shadeType == 4">{{shadeDataD.data1}}</view>
+				<!-- 登记 -->
 				<view class="shade-box" v-if="shadeType == 1">
 					<view class="shade-text-box">
 						<view>使用人</view>
@@ -85,16 +87,19 @@
 					</view>
 					<view class="shade-text-box">
 						<view>使用类型</view>
-						<view>{{shadeDataA.data2}}</view>
+						<!-- <view>{{shadeDataA.data2}}</view> -->
+						<picker @change="pickerChange" :value="pickerIndex" :range="pickerList">
+							<view style="width:400rpx;text-align:right;">{{pickerList[pickerIndex]}}</view>
+						</picker>
 					</view>
 					<view class="shade-text-box">
 						<view>开机时间</view>
-						<view>{{shadeDataA.data3}}</view>
+						<view>{{timestampToStr(shadeDataA.data3)}}</view>
 					</view>
 					<view class="shade-text-box">
 						<view>关机时间</view>
 						<view>
-							<uni-datetime-picker v-model="shadeDataA.data4">{{shadeDataA.data4}}</uni-datetime-picker>
+							<uni-datetime-picker :start="timeApplication" @change="timePickerChange()" return-type="timestamp" v-model="shadeDataA.data4">{{timestampToStr(shadeDataA.data4)}}</uni-datetime-picker>
 						</view>
 					</view>
 					
@@ -102,8 +107,9 @@
 						<view>使用总时长</view>
 						<view>{{shadeDataA.data5}}</view>
 					</view>
-					<view class="shade-button">确定</view>
+					<view class="shade-button" @click="submitButton(1)">确定</view>
 				</view>
+				<!-- 结束 -->
 				<view class="shade-box" v-if="shadeType == 2">
 					<view class="shade-text-box">
 						<view>使用人</view>
@@ -127,6 +133,7 @@
 					</view>
 					<view class="shade-button">确定</view>
 				</view>
+				<!-- 查看 -->
 				<view class="shade-box-c" v-if="shadeType == 3">
 					<view class="shade-text-title">当前设备已被【{{shadeDataC.data1}}】登记使用，</view>
 					<view class="shade-text-title">开机时间：{{shadeDataC.data2}}</view>
@@ -146,6 +153,7 @@
 	import {
 		mpDeviceDetail,
 	} from '@/pages_equipmentUtilization/api/index.js'
+	import { config } from '@/api/request/config.js'
 	export default {
 		props: {
 			equipmentId: {},
@@ -153,13 +161,27 @@
 		data() {
 			return {
 				shadeType:0,
-				shadeDataA:{
-					data1:'张工',
-					data2:'自用',
-					data3:'2026-01-25 15:30',
-					data4:'2026-01-25 15:30',
-					data5:'3天2小时15分',
+				baseUrl:config.base_url,
+				userId: uni.getStorageSync('userId'),
+				newData:{
+					categoryName:'',
+					deviceCode:'',
+					deviceName:'',
+					deviceStatusName:'',
+					deviceType:'',
+					brand:'',
+					price:'',
+					adminDisplay:'',
+					manageDeptName:'',
+					location:'',
+					unit:'',
+					manufacturer:'',
+					originPlace:'',
+					purpose:'',
+					techParams:'',
+					remark:'',
 				},
+				shadeDataA:{},
 				shadeDataB:{
 					data1:'张工',
 					data2:'自用',
@@ -176,12 +198,19 @@
 					data1:'张工',
 					data2:'2026-01-25 15:30',
 				},
+				pickerList:['自用','对外服务'],
+				pickerIndex:0,
+				timeApplication:null,
 			}
 		},
 		mounted() {
 			this.mpDeviceDetail(this.equipmentId);
 		},
 		methods: {
+			pickerChange(val){
+				console.log('val',val.mp.detail.value);
+				this.$set(this,'pickerIndex',val.mp.detail.value);
+			},
 			//获取设备信息
 			async mpDeviceDetail(id) {
 				let self = this;
@@ -189,35 +218,99 @@
 					data
 				} = await mpDeviceDetail({id:id});
 				if (data.code == 200) {
-					
+					this.$set(this,'newData',data.data);
 				}
 			},
 			lookText(type){
 				if(type == 1){
 					this.$set(this,'shadeDataD',{
 						data1:'设备用途',
-						data2:'设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途设备用途',
+						data2:this.newData.purpose,
 					});
 				}else if(type == 2){
 					this.$set(this,'shadeDataD',{
 						data1:'技术参数',
-						data2:'技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数技术参数',
+						data2:this.newData.techParams,
 					});
 				}else if(type == 3){
 					this.$set(this,'shadeDataD',{
 						data1:'备注',
-						data2:'备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注',
+						data2:this.newData.remark,
 					});
 				}
 				this.$set(this,'shadeType',4);
 			},
 			onShade(){
 				//判断 登记时1 退订2 已占用3
-				this.$set(this,'shadeType',1);
+				if(this.newData.runStatus == 0){
+					//无人使用
+					const now = new Date();
+					now.setSeconds(0, 0);  // 将秒和毫秒都设为0
+					const timestamp = now.getTime()
+					this.$set(this,'timeApplication',timestamp);
+					this.$set(this,'pickerIndex',0);
+					this.$set(this,'shadeDataA',{
+						data1:uni.getStorageSync('user-name'),
+						data2:null,
+						data3:this.timeApplication,
+						data4:this.timeApplication,
+						data5:'0天0小时0分',
+					});
+					this.$set(this,'shadeType',1);
+				}else if(this.newData.runStatus != 0 || this.newData.currentUserId != this.userId){
+					//别人使用中
+					this.$set(this,'shadeType',3);
+				}else if(this.newData.runStatus != 0 || this.newData.currentUserId == this.userId){
+					//自己使用中
+					this.$set(this,'shadeType',2);
+				}
 			},
 			offShade(){
 				this.$set(this,'shadeType',0);
 			},
+			timestampToStr(timestamp) {
+			  const date = new Date(timestamp); // 传入毫秒级时间戳
+			  const year = date.getFullYear();
+			  const month = String(date.getMonth() + 1).padStart(2, '0');  // 月份从0开始，需+1
+			  const day = String(date.getDate()).padStart(2, '0');
+			  const hours = String(date.getHours()).padStart(2, '0');
+			  const minutes = String(date.getMinutes()).padStart(2, '0');
+			  // 注意：这里没有拼接秒
+			  return `${year}-${month}-${day} ${hours}:${minutes}`;
+			},
+			formatTimeDiff(timestamp1, timestamp2) {
+			  // 计算绝对差值（毫秒）
+			  const diffMs = Math.abs(timestamp1 - timestamp2);
+			  // 转换为总分钟数（向下取整）
+			  const totalMinutes = Math.floor(diffMs / (1000 * 60));
+			  // 计算天、小时、分钟
+			  const days = Math.floor(totalMinutes / (60 * 24));
+			  const remainingMinutes = totalMinutes % (60 * 24);
+			  const hours = Math.floor(remainingMinutes / 60);
+			  const minutes = remainingMinutes % 60;
+			  // 构建输出字符串
+			  const parts = [];
+			  if (days > 0) parts.push(days + '天');
+			  if (hours > 0) parts.push(hours + '小时');
+			  if (minutes > 0 || parts.length === 0) parts.push(minutes + '分'); // 确保至少显示“0分”
+			  return parts.join('');
+			},
+			timePickerChange(){
+				if(this.shadeDataA.data4>this.shadeDataA.data3){
+					this.$set(this.shadeDataA,'data5',this.formatTimeDiff(this.shadeDataA.data3,this.shadeDataA.data4));
+				}else{
+					uni.showToast({
+						title: '开机时间与关机时间不能相等',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+				
+			},
+			submitButton(type){
+				console.log('shadeDataA',this.shadeDataA)
+			},
 		},
 	}
 </script>
@@ -236,9 +329,20 @@
 				width:200rpx;
 				height:200rpx;
 				display: inline-block;
+				border:1rpx solid #dedede;
+				margin:40rpx 20rpx 20rpx 20rpx;
 			}
 			.right-box{
 				flex:1;
+				margin:40rpx 20rpx 20rpx 0;
+				view{
+					width: 480rpx;
+					display:block;
+					overflow:hidden;
+					text-overflow:ellipsis;
+					white-space:nowrap;
+					margin-bottom:14rpx;
+				}
 			}
 		}
 		.text-max-box{