浏览代码

Merge commit 'b4e01f0fe04778effd09fedf923e64f65cb082a2' into master-uat

zhengkaixin 2 年之前
父节点
当前提交
93cff925e2

+ 6 - 3
App.vue

@@ -35,9 +35,12 @@
 	} 
 /deep/.u-divider{
 	color: rgba(182, 189, 195, 1);
-	font-size: 12px;
-	font-weight: bold;
-}
+	font-size: 24rpx;
+}
+/* tabs标签 */
+/deep/.u-tab-item{
+			  font-weight: normal !important;
+		  }
 	.uni-icon-success-no-circle:before {
 	    content: "" !important ;
 		display: none;

二进制
assets/img/equipent.png


二进制
assets/img/riFill-chat-settings-fill@1x.png


二进制
assets/img/riFill-inbox-archive-fill@1x.png


二进制
assets/img/riFill-inbox-unarchive-fill@1x.png


二进制
assets/img/riFill-volume-up-fill@1x.png


二进制
assets/img/riLine-device-recover-line@1x.png


二进制
assets/img/riLine-robot-line@1x.png


二进制
assets/img/riLine-todo-line@1x.png


二进制
assets/img/暂无数据-缺省页.png


+ 27 - 0
pages.json

@@ -132,6 +132,33 @@
             }
             
         }
+        ,{
+            "path" : "pages/storeManagement/equipmentRetrieval/equipmentDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/messageCenter/messageCenter",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/messageCenter/messageList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

+ 505 - 0
pages/storeManagement/equipmentRetrieval/equipmentDetail.vue

@@ -0,0 +1,505 @@
+<template>
+	<view>
+		<u-navbar title="接地线无杆(新)"></u-navbar>
+		<!-- 图片 -->
+		<view class="picture">
+			<img src="../../../assets/img/equipent.png" alt="">
+			<view class="amount">
+				<text>1</text>/
+				<text>5</text>
+			</view>
+		</view>
+		<!-- 信息 -->
+		<view class="main">
+			<view class="title">
+				接地线无杆(新)
+			</view>
+			<!-- 标签 -->
+			<view class="tabs ">
+				<u-tabs bar-width="120" inactive-color="#999999" active-color="#000000"   :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			</view>
+			<view class="content">
+				<!-- 设备信息 -->
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="../../../assets/img/riLine-robot-line@1x.png" alt=""></view>
+					<view class="text">
+						设备信息
+					</view>
+					</view>
+					
+					<view class="details">
+						<view class="item">
+							<view class="item-title">
+								规格
+							</view>
+							<view class="item-value">
+								220kV
+							</view>
+						</view>
+						
+						<view class="item" >
+							<view class="item-title">
+								购置时间
+							</view>
+							<view class="item-value">
+								2022.5
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								数量
+							</view>
+							<view class="item-value">
+								48
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								设备状况
+							</view>
+							<view class="item-value">
+								合格
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								单位
+							</view>
+							<view class="item-value">
+								根
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								试验时间
+							</view>
+							<view class="item-value">
+								2022.05.19
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								制造厂家
+							</view>
+							<view class="item-value">
+								鸿瑞电力工程有限公司
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								试验周期
+							</view>
+							<view class="item-value">
+								1年
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								单价
+							</view>
+							<view class="item-value">
+								无
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 存放地点 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="../../../assets/img/riLine-robot-line@1x.png" alt=""></view>
+					<view class="text">
+						存放地点
+					</view>
+					</view>
+					
+					<view class="details">
+						<view class="location">
+							荆力总包仓库A区C货架2-12
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 巡检记录 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="../../../assets/img/riLine-device-recover-line@1x.png" alt=""></view>
+					<view class="text">
+						巡检记录
+					</view>
+					
+					<view class="all">
+						全部记录<u-icon name="arrow-right"></u-icon>
+					</view>
+					</view>
+					<!-- 提示 -->
+					<view class="hint">
+						<u-alert-tips  icon="bell-fill" show-icon="true" type="warning" :title="title" :description="description"></u-alert-tips>
+					</view>
+					
+					<view class="inspection-contents">
+						<view class="inspection-title">
+							<view class="text">
+								巡检内容名称
+							</view>
+							<view class="state">
+								合格
+							</view>
+						</view>
+						<view class="inspection-infos">
+							<view class="inspection-personnel">
+								<view class="inspection-name">
+									巡检人:
+								</view>
+								<view class="value">
+									孙斌
+								</view>
+							</view>
+							<view class="inspection-date">
+								2023/03/15 09:45:21
+							</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+			<!-- 出入库记录 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="../../../assets/img/riLine-todo-line@1x.png" alt=""></view>
+					<view class="text">
+						出入库记录
+					</view>
+					<view class="all">
+						全部记录<u-icon name="arrow-right"></u-icon>
+					</view>
+					</view>
+					<view class="records">
+						<view class="records-title">
+							洪湖华电光伏线路
+						</view>
+						<view class="records-infos">
+							<view class="item">
+								<view class="item-title">
+									借用数量:
+								</view>
+								<view class="item-value">
+									4
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借出时间:
+								</view>
+								<view class="item-value">
+									2023.2.13
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借用人:
+								</view>
+								<view class="item-value">
+									丁文
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									归还时间:
+								</view>
+								<view class="item-value highlight">
+									未归还
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<view class="records">
+						<view class="records-title">
+							仙桃华润恒升线路
+						</view>
+						<view class="records-infos">
+							<view class="item">
+								<view class="item-title">
+									借用数量:
+								</view>
+								<view class="item-value">
+									4
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借出时间:
+								</view>
+								<view class="item-value">
+									2023.2.13
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借用人:
+								</view>
+								<view class="item-value">
+									丁文
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									归还时间:
+								</view>
+								<view class="item-value">
+									2023.4.1
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+							description: '下次巡检时间:2023/03/30',
+				list: [{
+					name: '设备信息'
+				}, {
+					name: '设备位置'
+				}, {
+					name: '巡检记录',
+				},{
+					name:'出入库记录'
+				}],
+				current: 0
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom:100px;
+	}
+	/deep/.u-line-1{
+		overflow: inherit;	
+	}
+	// 图片
+	.picture{
+		width: 100%;
+		height: 400rpx;
+		overflow: hidden;
+		position: relative;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		.amount{
+			width: 108rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			border-radius: 4px;
+			background-color: rgba(0, 0, 0, 1);
+			color: rgba(255, 255, 255, 1);
+			font-size: 28rpx;
+			text-align: center;
+			font-family: Arial;
+			position: absolute;
+			bottom: 48rpx;
+			right: 32rpx;
+		}
+	}
+  // 信息
+  .main{
+	  border-radius: 16px 16px 0px 0px;
+	  background-color: #ffffff;
+	  padding-top: 24rpx;
+	  margin-top:-24rpx;
+	  z-index: 999;
+	  position: relative;
+	  .title{
+		  color: rgba(51, 51, 51, 1);
+		  font-size: 36rpx;
+		  margin-bottom: 24rpx;
+		  padding:0 32rpx;
+	  }
+	  // 标签
+	  .tabs{
+		  position: sticky;
+		  top: 0;
+		  z-index: 9999;
+		  /deep/.u-tab-bar{
+			  background-color: #2A8EFB !important;
+			  bottom:-8rpx;
+		  }
+	  }
+	
+	  
+	  .content{
+		  
+		  border-top: 1px solid #B7BDBF;
+		  .infos{
+			  padding: 32rpx;
+		  }
+		  .name{
+			  font-size: 32rpx;
+			  margin-bottom: 16rpx;
+			  display: flex;
+			  align-items: center;
+			  color: rgba(51, 51, 51, 1);
+			  .icon{
+				  width: 32rpx;
+				  height: 32rpx;
+				  margin-right: 8rpx;
+				  img{
+					  width: 100%;
+					  height: 100%;
+				  }
+			  }
+			 .text{
+				 line-height: 50rpx;
+			 }
+		  }
+		  .all{
+			  margin-left: auto;
+			  color: rgba(119, 119, 119, 1);
+			  font-size: 24rpx;
+		  }
+		  // 提示
+		  .hint{
+			  /deep/.u-alert-desc{
+				  color: rgba(255, 121, 0, 1);
+				  font-size: 28rpx
+			  }
+		  }
+		  .details{
+			  border-radius: 8px;
+			  background-color: rgba(245, 246, 249, 1);
+			  padding: 24rpx 24rpx 8rpx 24rpx;
+			  display: flex;
+			  justify-content: space-between;
+			  flex-wrap: wrap;
+			  .item{
+				  display: flex;
+				  margin-bottom: 16rpx;
+				  font-size: 24rpx;
+				  width: 45%;
+				  .item-title{
+					  width: 96rpx;
+					  color: rgba(119, 119, 119, 1);	  
+				  }
+				  @media screen and (max-width: 375px) {
+				     .item-title{
+				     	width: 120rpx;
+				     					  
+				     }
+				  }
+				  @media screen and (max-width: 300px) {
+				     .item-title{
+				     	width: 130rpx;
+				     					  
+				     }
+				  }
+				  .item-value{
+					  flex: 1;
+					  color: rgba(51, 51, 51, 1);
+					  margin-left: 16rpx;
+					  white-space: nowrap;
+					  overflow: hidden;
+					  text-overflow: ellipsis;
+				  }
+			  }
+			  
+			  .location{
+				  color: rgba(51, 51, 51, 1);
+				  padding-bottom: 8rpx;
+			  }
+		  }
+	  }
+	  
+	  .inspection-contents{
+		  border-radius: 8px;
+		  background-color: rgba(245, 246, 249, 1);
+		  padding: 24rpx ;
+		  margin-top: 16rpx;
+		  .inspection-title{
+			  display: flex;
+			  justify-content: space-between;
+			  align-items: center;
+			  font-weight: bold;
+			  color: rgba(51, 51, 51, 1);
+			  .state{
+				  width: 80rpx;
+				  height: 48rpx;
+				  line-height: 48rpx;
+				  border-radius: 4px;
+				  background-color: rgba(255, 255, 255, 1);
+				  color: rgba(0, 185, 98, 1);
+				  font-size: 24rpx;
+				  text-align: center;
+				  font-family: Microsoft Yahei;
+				  border: 1px solid rgba(141, 217, 181, 1);
+			  }
+			  
+		  }
+		  .inspection-infos{
+			  display: flex;
+			  justify-content: space-between;
+			  align-items: center;
+			  font-size: 24rpx;
+			  margin-top: 8rpx;
+			  line-height: 36rpx;
+			  .inspection-personnel{
+			  			  display: flex;
+						  align-items: center;
+			  			  color: rgba(119, 119, 119, 1);
+			  			  
+			  };
+			  .date{
+				  color: rgba(119, 119, 119, 1);
+				  
+			  }
+		  }
+		  
+	  }
+	  // 出入库记录
+	  .records{
+		  border-radius: 8px;
+		  background-color: rgba(245, 246, 249, 1);
+		  padding: 24rpx 24rpx 8rpx 24rpx ;
+		  margin-top: 16rpx;
+		  .records-title{
+			  font-weight: bold;
+			  color: #333333;
+		  }
+		  .records-infos{
+			  display: flex;
+			  flex-wrap: wrap;
+			  margin-top: 16rpx;
+			  .item{
+				  font-size: 24rpx;
+				  width: 230rpx;
+				  display: flex;
+				  margin-bottom: 16rpx;
+				  color: rgba(119, 119, 119, 1);
+			  }
+		  }
+	  }
+  }
+  .highlight{
+	  color:#E60012
+  }
+</style>

+ 187 - 0
pages/storeManagement/messageCenter/messageCenter.vue

@@ -0,0 +1,187 @@
+<template>
+	<view>
+		<u-navbar title="消息中心">
+			<slot name="right">一键已读</slot>
+		</u-navbar>
+		<view class="message">
+			<view class="message-item">
+				<view class="icon" style="background: linear-gradient(180deg, rgba(218,230,245,1) 1%,rgba(180,206,238,1) 100%);">
+					<img src="../../../assets/img/riFill-volume-up-fill@1x.png" alt="">
+				
+				<view class="amount">
+					80
+				</view>
+				</view>
+				
+				<view class="infos">
+					<view class="head">
+						<view class="title">
+							系统公告
+						</view>
+						<view class="time">
+							48分钟前
+						</view>
+					</view>
+					<view class="unread">
+						32条未读消息
+					</view>
+				</view>
+			</view>
+			
+			<view class="message-item">
+				<view class="icon" style="background: linear-gradient(180deg, rgba(226,219,251,1) 1%,rgba(207,195,255,1) 100%);">
+					<img src="../../../assets/img/riFill-chat-settings-fill@1x.png" alt="">
+				
+				<view class="amount">
+					80
+				</view>
+				</view>
+				
+				<view class="infos">
+					<view class="head">
+						<view class="title">
+							巡检消息
+						</view>
+						<view class="time">
+							10:00
+						</view>
+					</view>
+					<view class="unread">
+						32条未读消息
+					</view>
+				</view>
+			</view>
+			
+			<view class="message-item">
+				<view class="icon" style="background: linear-gradient(180deg, rgba(214,249,214,1) 1%,rgba(170,226,170,1) 100%);">
+					<img src="../../../assets/img/riFill-inbox-archive-fill@1x.png" alt="">
+				
+				<view class="amount">
+					3
+				</view>
+				</view>
+				
+				<view class="infos">
+					<view class="head">
+						<view class="title">
+							入库提醒
+						</view>
+						<view class="time">
+							2天前
+						</view>
+					</view>
+					<view class="unread">
+						32条未读消息
+					</view>
+				</view>
+			</view>
+			
+			<view class="message-item">
+				<view class="icon" style="background: linear-gradient(180deg, rgba(249,235,225,1) 1%,rgba(238,206,182,1) 100%);">
+					<img src="../../../assets/img/riFill-inbox-unarchive-fill@1x.png" alt="">
+				
+				<view class="amount">
+					4
+				</view>
+				</view>
+				
+				<view class="infos">
+					<view class="head">
+						<view class="title">
+							出库提醒
+						</view>
+						<view class="time">
+							2023/03/01 12:00
+						</view>
+					</view>
+					<view class="unread">
+						32条未读消息
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100px;
+		background-color: #fff;
+	}
+	/deep/.u-slot-content {
+		justify-content: end;
+		margin-right: 32rpx;
+		color: rgba(51, 51, 51, 1);
+	}
+    .message{
+		padding: 32rpx;
+		 .message-item{
+			 display: flex;
+			 margin-bottom: 24rpx;
+			 .icon{
+				 width: 104rpx;
+				 height: 104rpx;
+				 border-radius: 8px;
+				 text-align: center;
+				 line-height: 104rpx;
+				 position: relative;
+				.amount{
+					width: 40rpx;
+					height: 32rpx;
+					line-height: 32rpx;
+					border-radius: 8rpx;
+					background-color: rgba(255, 61, 0, 1);
+					color: rgba(255, 255, 255, 1);
+					font-size: 22rpx;
+					text-align: center;
+					position: absolute;
+					top: 0;
+					right:-12rpx;
+				}
+				 img{
+					 width: 56rpx;
+					 height: 56rpx;
+					 vertical-align: middle;
+				 }
+			 }
+			 .infos{
+				 display: flex;
+				 flex:1;
+				 flex-direction: column;
+				 justify-content: space-around;
+				 margin-left: 32rpx;
+				 .head{
+					 display: flex;
+					 justify-content: space-between;
+					 .title{
+						 color: rgba(51, 51, 51, 1);
+						 font-size: 32rpx;
+					 }
+					 .time{
+						 color: rgba(119, 119, 119, 1);
+						 font-size: 24rpx;
+					 }
+				 }
+				 
+				 .unread{
+					 color: rgba(119, 119, 119, 1);
+					 font-size: 24rpx;
+				 }
+			 }
+		 }
+	}
+</style>

+ 143 - 0
pages/storeManagement/messageCenter/messageList.vue

@@ -0,0 +1,143 @@
+
+<template>
+	<view>
+		<u-navbar title="巡检消息" ></u-navbar>
+		
+		<view class="main">
+			<view class="item" v-for="item in 2">
+				<view class="date">
+					2023-01-02 12:00
+				</view>
+				<view class="message-infos">
+					<view class="title">
+						待巡检提醒
+					</view>
+					<view class="infos">
+						<view class="info-name">
+							巡检类型:
+						</view>
+						<view class="info-content">
+							设备巡检
+							
+						</view>
+					</view>
+					<view class="infos">
+						<view class="info-name">
+							巡检设备:
+						</view>
+						<view class="info-content">
+							线缆检测设备
+							
+						</view>
+					</view>
+					<view class="infos">
+						<view class="info-name">
+							巡检人:
+						</view>
+						<view class="info-content ">
+							孙斌
+							
+						</view>
+					</view>
+					<view class="infos">
+						<view class="info-name">
+							巡检日期:
+						</view>
+						<view class="info-content">
+                  2023/03/15-2023/03/20
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			
+			
+			
+			<u-divider bg-color="#f2f2f2">没有更多数据了</u-divider>
+			
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 60px;
+	}
+	.main{
+		padding: 32rpx;
+		.item{
+			margin-bottom: 48rpx;
+			.date{
+				margin:0 auto 32rpx;
+				width: 39.3%;
+				height: 56rpx;
+				line-height: 56rpx;
+				border-radius: 50px;
+				background-color: #c3c5c5;
+				color: rgba(255, 255, 255, 1);
+				font-size: 24rpx;
+				text-align: center;
+			}
+			.message-infos{
+				padding: 40rpx ;
+				border-radius: 12px;
+				background-color: rgba(255, 255, 255, 1);
+				color: rgba(16, 16, 16, 1);
+				font-size: 28rpx;
+				border: 1px solid rgba(232, 232, 232, 1);
+				.title{
+					color: rgba(51, 51, 51, 1);
+					font-size: 36rpx;
+					font-weight: bold;
+					margin-bottom: 32rpx;
+				}
+				.details{
+					color: #777777;
+					margin-bottom: 24rpx;
+					line-height: 40rpx;
+				}
+				.infos{
+					display: flex;
+					margin-bottom: 16rpx;
+					.info-name{
+						color: rgba(136, 136, 136, 1);
+						
+						width: 150rpx;
+						font-size: 28rpx;
+						margin-right: 32rpx;
+						
+					}
+					.info-content{
+						flex: 1;
+						colot:#101010;
+						
+					}
+					.location{
+						color: #101010;
+						font-weight: bold;
+					}
+					.temperature{
+						color: #43c9d3;
+					}
+				}
+				
+			}
+		}
+	}
+  
+  
+</style>