From 01ea333978f757b7c739edd2e39df217e5d92a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E5=B0=8F=E5=A7=BF?= <1613162410@qq.com>
Date: Thu, 11 Apr 2024 18:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                   | 17 +++--
 pages.json                                | 24 ++++++
 pages/deviceRepair/RepairReport.vue       | 12 ++-
 pages/deviceRepair/deviceRepair.vue       | 58 ++++++++-------
 pages/deviceRepair/repairOrder.vue        | 91 +++++++++++++++++++++++
 pages/deviceStatus/detectionEventList.vue | 49 ++++++++++++
 pages/deviceStatus/deviceCamera.vue       | 65 ++++++++++++++++
 pages/deviceStatus/deviceStatus.vue       | 13 +++-
 pages/equipmentManage/bindingDevice.vue   | 10 +--
 pages/equipmentManage/deviceDetail.vue    | 46 ++++++------
 pages/equipmentManage/editDevice.vue      | 10 +--
 pages/equipmentManage/equipmentManage.vue | 26 +++----
 pages/index/materialYield.vue             | 44 +++++------
 pages/index/schedule.vue                  | 44 +++++------
 pages/person/accountCenter.vue            | 42 +++++------
 pages/person/alarm.vue                    | 48 ++++++------
 pages/person/changePhone.vue              | 44 +++++------
 pages/person/myAuthority.vue              | 42 +++++------
 pages/person/safetyAccidents.vue          | 44 +++++------
 pages/production/productionDetail.vue     | 44 +++++------
 pages/production/productionOrder.vue      | 52 +++++++------
 21 files changed, 538 insertions(+), 287 deletions(-)
 create mode 100644 pages/deviceRepair/repairOrder.vue
 create mode 100644 pages/deviceStatus/detectionEventList.vue
 create mode 100644 pages/deviceStatus/deviceCamera.vue

diff --git a/App.vue b/App.vue
index 1378ee1..9d01108 100644
--- a/App.vue
+++ b/App.vue
@@ -33,7 +33,7 @@
 		color: #333;
 		padding: 10px;
 	}
-	.pagepaddings{padding: 14px;}
+	.page_padding{padding: 14px;}
 	.page_content{padding: 0 12px 10px;}
 	//内容框
 	.contentboxsty{border-radius: 8px;background: #1C2755;}
@@ -54,8 +54,8 @@
 	.font_bold{font-weight: bold;}
 	//文字颜色
 	.text_color_black{color: #000;}
-	.theme_color{color: #009688 }
-	//颜色
+	.theme_color{color: #009688 }//主题绿
+	//按钮颜色
 	.but_color{background: #009688 !important;}
 	// .text_{color: #00B68D;}
 	
@@ -85,8 +85,15 @@
 		.list_content{padding:12px;}
 	}
 	//页面固定按钮
-	.bottom_but{bottom: 40px;bottom: 40px;position: fixed;width: calc(100% - 28px);
-		view{width: 50%;text-align: center;margin: 0 20px;border-radius: 19px;background: #DDD;line-height: 38px;}
+	.bottom_but{
+		    width: 100%;
+		    position: fixed;
+		    bottom: 0px;
+		    background-color: #060B26;
+		    border-top: 1px solid #2E3249;
+		    height: 80px;
+		// bottom: 40px;bottom: 40px;position: fixed;width: calc(100% - 28px);
+		view{width: 50%;text-align: center;margin: 0 20px;border-radius: 19px;background: #DDD;line-height: 38px;height: 38px;margin-top: 6px;}
 	}
 	//底部固定添加按钮
 	.page_bottom_button{width: 100%;position: fixed;bottom: 0px;background-color: #060B26;border-top: 1px solid #2E3249;height: 80px;
diff --git a/pages.json b/pages.json
index 1d85178..41078b0 100644
--- a/pages.json
+++ b/pages.json
@@ -159,6 +159,30 @@
 			"navigationBarTitleText" : "安全事故",
 			"enablePullDownRefresh" : false
 		}
+	},
+	{
+		"path" : "pages/deviceStatus/deviceCamera",
+		"style" : 
+		{
+			"navigationBarTitleText" : "设备状态",
+			"enablePullDownRefresh" : false
+		}
+	},
+	{
+		"path" : "pages/deviceStatus/detectionEventList",
+		"style" : 
+		{
+			"navigationBarTitleText" : "设备状态",
+			"enablePullDownRefresh" : false
+		}
+	},
+	{
+		"path" : "pages/deviceRepair/repairOrder",
+		"style" : 
+		{
+			"navigationBarTitleText" : "设备维修",
+			"enablePullDownRefresh" : false
+		}
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/deviceRepair/RepairReport.vue b/pages/deviceRepair/RepairReport.vue
index 77700d4..8dc4475 100644
--- a/pages/deviceRepair/RepairReport.vue
+++ b/pages/deviceRepair/RepairReport.vue
@@ -1,10 +1,10 @@
 <template>
 	<!-- 设备报修 -->
-	<view class="pagepaddings">
+	<view class="page_padding">
 		<view class="page_content contentboxsty font14">
 			<view class="content_row">
 				<view class="name">值班工程师</view>
-				<view class="">
+				<view class="flex1">
 					<picker placeholder="请选择设备" @change="bindPickerChange" :value="index" :range="array" >
 						 <input type="text" :value="array[index]"  placeholder="请选择设备" disabled />
 					</picker>
@@ -13,7 +13,7 @@
 			</view>
 			<view class="content_row">
 				<view class="name">故障时间</view>
-				<view class="">
+				<view class="flex1">
 					<view :class="[downtime ? 'haveTime' : 'noTime']">
 						<uni-datetime-picker placeholder="清选择时间" type="datetime" v-model="downtime" @change="changeLog" />
 					</view>
@@ -66,6 +66,10 @@
 			</view>
 		</view>
 	</view>
+	<view class="bottom_but flex_layout">
+		<view class="font13">保存</view>
+		<view class="font13">取消</view>
+	</view>
 </template>
 
 <script>
@@ -95,7 +99,7 @@
 	}
 	.textarea_row{
 		.name{padding: 12px 0;}
-		textarea{border-radius: 4px;background: rgba(255, 255, 255, 0.50);padding: 10px;}
+		textarea{border-radius: 4px;background: rgba(255, 255, 255, 0.50);padding: 10px;height: 100px;}
 	}
 	.img_row{
 		.name{padding: 12px 0;}
diff --git a/pages/deviceRepair/deviceRepair.vue b/pages/deviceRepair/deviceRepair.vue
index bf111f5..23baece 100644
--- a/pages/deviceRepair/deviceRepair.vue
+++ b/pages/deviceRepair/deviceRepair.vue
@@ -1,6 +1,6 @@
-<template>
+<template>
 	<!-- 设备报修 -->
-	<view class="pagepaddings bot_padding">
+	<view class="page_padding bot_padding">
 		<view v-for="(item,index) in list" :key="index">	
 			<view class="page_list contentboxsty font13">
 				<view class="list_top flex_layout">
@@ -37,15 +37,15 @@
 					</view>
 				</view>
 				<view class="list_below flex_layout">
-					<view class="below_left">
-						修改
+					<view class="below_left" @click="toRepairOrder()">
+						维修单
 					</view>
 					<view class="below_right">
-						查看详情
+						修改
 					</view>
 				</view>
 			</view>
-		</view>
+		</view>
 	</view>
 	<view class="page_bottom_button">
 		<view class="page_add"  @click="toAddRepairReport()">
@@ -56,13 +56,13 @@
 			<text>添加</text>
 		</view>
 		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				list:[{name:"双头立锯"},
 				{name:"双头立锯"},
 				{name:"双头立锯"},
@@ -72,22 +72,28 @@
 				{name:"双头立锯"},
 				{name:"双头立锯"},
 				{name:"双头立锯"},
-				]
-			}
-		},
+				]
+			}
+		},
 		methods: {
-			//新增报修页面
+			//新增报修页面
 			toAddRepairReport(){
 					uni.navigateTo({
 						url:'/pages/deviceRepair/RepairReport'
 					})
 			},
-			//维修页面
-		}
-	}
-</script>
-
-<style lang="scss">
+			//维修页面
+			toRepairOrder(){
+				uni.navigateTo({
+					url:'/pages/deviceRepair/repairOrder'
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
 	.page_list{
 		.list_top{line-height: 44px;align-items: center;border-bottom: 1px solid #2D3A6F;
 			.top_left{flex: 1;}
@@ -99,7 +105,7 @@
 		.list_below{line-height: 49px;align-items: center;border-top: 1px solid #2D3A6F;
 			view{width: 50%;    text-align: center;}
 			.below_left{border-right: 1px solid #2D3A6F;}
-		}
+		}
 
-	}
-</style>
+	}
+</style>
diff --git a/pages/deviceRepair/repairOrder.vue b/pages/deviceRepair/repairOrder.vue
new file mode 100644
index 0000000..2761eb1
--- /dev/null
+++ b/pages/deviceRepair/repairOrder.vue
@@ -0,0 +1,91 @@
+<template>
+	<!-- 维修单 -->
+	<view class="page_padding">
+		<view class="page_content contentboxsty font14">
+			<view class="content_row">
+				<view class="name">维修工程师</view>
+				<view class="flex1">
+					<picker placeholder="请选择" @change="bindPickerChange" :value="index" :range="array" >
+						 <input type="text" :value="array[index]"  placeholder="请选择" disabled />
+					</picker>
+				</view>
+				<view class="iconfont icon-xiala"></view>
+			</view>
+			<view class="content_row">
+				<view class="name">故障解除时间</view>
+				<view class="flex1">
+					<view :class="[downtime ? 'haveTime' : 'noTime']">
+						<uni-datetime-picker placeholder="清选择时间" type="datetime" v-model="downtime" @change="changeLog" />
+					</view>
+				</view>
+			</view>
+			<view class="textarea_row">
+				<view class="name">维修描述</view>
+					<textarea placeholder="请输入维修描述..."/>
+					<!-- <uni-easyinput type="textarea" v-model="value" placeholder="请输入维修描述..."></uni-easyinput> -->
+					
+			</view>
+			<view class="img_row">
+				<view class="name">维修照片</view>
+				<uni-file-picker limit="3" v-model="imageValue"  title="">
+					<view class="img_but">
+						<view class="iconfont icon-a-shangchuanzhaopian2 font35"></view>
+						<view class="font12">
+							上传图片
+						</view>
+					</view>
+				</uni-file-picker>
+			</view>
+		</view>
+	</view>
+	<view class="bottom_but flex_layout">
+		<view class="font13">保存</view>
+		<view class="font13">取消</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				array: ['中国', '美国', '巴西', '日本'],
+				downtime:'',
+			}
+		},
+		methods: {
+			changeLog(){
+				console.log(this.downtime)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page_content{padding: 0 12px 10px;}
+	.content_row{display: flex;border-bottom: 1px solid #2D3A6F;height: 44px;align-items: center;
+		.name{width: 30%;}
+		.flex_layout{
+			.contenticon{width: 20px;height: 20px;}
+			.text{padding: 0 20px 0 5px;}
+		}
+	}
+	.textarea_row{
+		.name{padding: 12px 0;}
+		textarea{border-radius: 4px;background: rgba(255, 255, 255, 0.50);padding: 10px;height: 100px;}
+	}
+	.img_row{
+		.name{padding: 12px 0;}
+		.file-title {color: #fff;}
+		.is-add{background: rgba(255, 255, 255, 0.5);}
+		.img_but{    position: relative;display: flex;align-items: center;justify-content: center;flex-direction: column;}
+	}
+	
+	.uni-date-x{
+		    background-color: #1C2755 !important;color: #fff!important;
+	}
+	.uni-date-x--border{border:none !important}
+	.haveTime{
+		.uni-date__x-input{color: #fff;}
+	}
+	.noTime{.uni-date__x-input{color: #666;}}
+</style>
diff --git a/pages/deviceStatus/detectionEventList.vue b/pages/deviceStatus/detectionEventList.vue
new file mode 100644
index 0000000..f7f14a8
--- /dev/null
+++ b/pages/deviceStatus/detectionEventList.vue
@@ -0,0 +1,49 @@
+<template>
+	<!-- 检测事件列表 -->
+	<view class="page_padding">
+		<view class="padd_bot12 font14">
+			<text>安全生产监控设备检测事件列表</text>
+		</view>
+		<view class="page_list contentboxsty flex_layout">
+			<view class="content_left padd_rigth12">
+				<image class="img" src="http://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/background.png" mode=""></image>
+			</view>
+			<view class="content_right">
+				<view class="content_row font13">
+					2024-01-11 19:09:56
+				</view>
+				<view class="content_row tip font_bold font14">
+					穿越警戒线
+				</view>
+				<view class="content_row font12">
+					(检测到指定区域内有目标越过警戒线，请注意安全)
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+.page_list{padding: 12px;}
+.content_left{
+	flex-basis: 126px;height: 96px;
+	.img{width: 100%;height: 100%;border-radius: 8px;}
+}
+.content_right{
+	flex:1;
+	.tip{color: #FA3758;padding: 6px 0 5px 0;}
+}
+</style>
diff --git a/pages/deviceStatus/deviceCamera.vue b/pages/deviceStatus/deviceCamera.vue
new file mode 100644
index 0000000..85aa79c
--- /dev/null
+++ b/pages/deviceStatus/deviceCamera.vue
@@ -0,0 +1,65 @@
+<template>
+	<view class="page_padding font14">
+		<view class="padd_bot12">
+			<text>硬件设备状态</text>
+		</view>
+		<view class="body-view contentboxsty">
+			<view class="content-top flex_layout padd_bot12">
+				<view class="flex1 theme_color">
+					相机工作中
+				</view>
+				<view class="top_right" @click="toList()">
+					更多安全事件
+					<text class="iconfont icon-gengduo"></text>
+				</view>
+			</view>
+			<view class="content_monitor" style="width: 100%;">
+				<image style="width: 100%;" src="http://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/background.png" mode=""></image>
+			</view>
+			<view class="content_data">
+				<view class="device_row">
+					<text class="name font_bold">设备名称</text>
+					<text>安全监控相机</text>
+				</view>
+				<view class="device_row">
+					<text class="name font_bold">开机时间</text>
+					<text>2024-02-11 08:00:45</text>
+				</view>
+				<view class="device_row">
+					<text class="name font_bold">安全事件</text>
+					<text>检测到指定区域内有目标越过警戒线</text>
+				</view>
+				<view class="device_row">
+					<text class="name font_bold">检测时间</text>
+					<text>2024-01-11 19:09:56</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			toList(){
+				uni.navigateTo({
+					url:'/pages/deviceStatus/detectionEventList'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.body-view{padding: 12px 13px;}
+.top_right{color: #E6A23C;}
+.device_row{padding: 6px 0;
+			.name {padding-right: 12px;}
+		}
+
+</style>
diff --git a/pages/deviceStatus/deviceStatus.vue b/pages/deviceStatus/deviceStatus.vue
index bb5cf80..fe13693 100644
--- a/pages/deviceStatus/deviceStatus.vue
+++ b/pages/deviceStatus/deviceStatus.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="pagepaddings">
+	<view class="page_padding">
 		<view class=".padd_bot12">
 			<text>硬件设备状态</text>
 		</view>
@@ -31,6 +31,9 @@
 							<view class="device_row">	
 								<text class="name font_bold">设备名称</text>
 								<text>双头立锯</text>
+								<view @click="toCamera()" class="" style="position: absolute;right: 0;">
+									相机
+								</view>
 							</view>
 							<view class="device_row">
 								<text class="name font_bold">开机时间</text>
@@ -45,6 +48,7 @@
 								<text>5次</text>
 							</view>
 						</view>
+						
 					</view>
 				</swiper-item>
 			</swiper>
@@ -157,7 +161,12 @@
       // 获取标题区域宽度，和每个子元素节点的宽度
       this.getScrollW()
     },
-    methods: {
+    methods: {
+		toCamera(){
+			uni.navigateTo({
+				url:'/pages/deviceStatus/deviceCamera'
+			})
+		},
       // 获取标题区域宽度，和每个子元素节点的宽度以及元素距离左边栏的距离
       getScrollW() {
         let query = uni.createSelectorQuery().in(this);
diff --git a/pages/equipmentManage/bindingDevice.vue b/pages/equipmentManage/bindingDevice.vue
index 0ed6525..ee9fe1c 100644
--- a/pages/equipmentManage/bindingDevice.vue
+++ b/pages/equipmentManage/bindingDevice.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 绑定安全生产监控相机 -->
 	<view>
-		<view class="pagepaddings">
+		<view class="page_padding">
 			<view class="page_name font14">绑定安全生产监控相机</view>
 			<view class="page_content contentboxsty font13">
 				<view class="content_row">
@@ -68,10 +68,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="bottom_but flex_layout">
-				<view class="font13">保存</view>
-				<view class="font13">取消</view>
-			</view>
+		</view>
+		<view class="bottom_but flex_layout">
+			<view class="font13">保存</view>
+			<view class="font13">取消</view>
 		</view>
 	</view>
 </template>
diff --git a/pages/equipmentManage/deviceDetail.vue b/pages/equipmentManage/deviceDetail.vue
index d0c5727..c29d2b0 100644
--- a/pages/equipmentManage/deviceDetail.vue
+++ b/pages/equipmentManage/deviceDetail.vue
@@ -1,5 +1,5 @@
-<template>
-	<view class="pagepaddings">
+<template>
+	<view class="page_padding">
 		<view class="contentboxsty page_content ">
 			
 			<view class="content_row">
@@ -31,33 +31,33 @@
 				<view class="">
 					{{form.remark}}
 				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				form:{}
-			}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form:{}
+			}
 		},
 		onLoad(options){
 			this.getDetail(options.id);
-		},
-		methods: {
+		},
+		methods: {
 			getDetail(id){
 				this.$api.postFuncLoading('/device.info',{id:id}).then(res=>{
 					console.log(res)
 					this.form = res.data
 				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
 .content_row{display: flex;height: 44px;align-items: center;
 	.name{width: 30%;font-size: 13px;}
 	.data{font-size: 14px;}
@@ -65,5 +65,5 @@
 .textarea_row{
 	.name{padding: 12px 0;}
 	// textarea{border-radius: 4px;background: rgba(255, 255, 255, 0.50);width: 100%;}
-}
-</style>
+}
+</style>
diff --git a/pages/equipmentManage/editDevice.vue b/pages/equipmentManage/editDevice.vue
index 160de5e..5ec2e6c 100644
--- a/pages/equipmentManage/editDevice.vue
+++ b/pages/equipmentManage/editDevice.vue
@@ -2,7 +2,7 @@
 	<page-meta>
 		<navigation-bar title="添加设备" color="white"></navigation-bar>
 	</page-meta>
-	<view class="pagepaddings">
+	<view class="page_padding">
 	<!-- 	<view class="page_name font14">
 			添加/编辑设备
 		</view> -->
@@ -68,10 +68,10 @@
 					
 			</view>
 		</view>
-		<view class="bottom_but flex_layout">
-			<view class="font13 but_color">保存</view>
-			<view class="font13">取消</view>
-		</view>
+	</view>
+	<view class="bottom_but flex_layout">
+		<view class="font13 but_color">保存</view>
+		<view class="font13">取消</view>
 	</view>
 </template>
 
diff --git a/pages/equipmentManage/equipmentManage.vue b/pages/equipmentManage/equipmentManage.vue
index de505be..61ab208 100644
--- a/pages/equipmentManage/equipmentManage.vue
+++ b/pages/equipmentManage/equipmentManage.vue
@@ -1,6 +1,6 @@
 <template>
-	<!-- 设备管理 -->
-	<view class="pagepaddings bot_padding">
+	<!-- 设备管理 -->
+	<view class="page_padding bot_padding">
 		<view class="" v-for="(item,index) in list" :key="index" >
 			<view class="page_list contentboxsty font13" @click="toDeviceDetail(item.id)">
 				<view class="list_row">
@@ -26,7 +26,7 @@
 				</view>
 			</view>
 		</view>
-	</view>
+	</view>
 	<view class="page_bottom_button">
 		<view class="page_add"  @click="toAddDevice()">
 		<!-- 	<view class="name_left font14">
@@ -36,10 +36,10 @@
 			<text>添加</text>
 		</view>
 		
-	</view>
-</template>
-
-<script>
+	</view>
+</template>
+
+<script>
 	export default {
 		data() {
 			return {
@@ -74,14 +74,14 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style>
 	/* .page_name{display: flex;margin-bottom: 10px;align-items: center;} */
 	/* .name_left{flex: 1;} */
-	.page_list{padding: 6px 12px;}
+	.page_list{padding: 6px 12px;}
 	.list_row{display: flex;padding: 6px 0;align-items: center;}
 	.row_name{width:30%;}
-	.row_data{width: 65%;}
-</style>
+	.row_data{width: 65%;}
+</style>
diff --git a/pages/index/materialYield.vue b/pages/index/materialYield.vue
index adbc0db..1430158 100644
--- a/pages/index/materialYield.vue
+++ b/pages/index/materialYield.vue
@@ -1,6 +1,6 @@
 <template>
-	<!-- 工单出材率 -->
-	<view class="pagepaddings font13">
+	<!-- 工单出材率 -->
+	<view class="page_padding font13">
 		<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty">
 			<view class="list_top">
 				<view class="top_left">
@@ -47,14 +47,14 @@
 					</view> -->
 				</view>
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				list:[{
 					name:'SO202401111004',
 					algorithm:'81.5',
@@ -91,16 +91,16 @@
 					time:'jan-11 10:05',
 					timeConsuming:'3.5H',
 					number:'12.66m³'
-				}]
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
+				}]
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
 .detail_list{
 	// .list_top{display: flex;padding: 12px 0;border-bottom: 1px solid #2D3A6F;margin-bottom: 8px;
 	// 	.top_left{flex: 1;}
@@ -117,5 +117,5 @@
 		view{flex: 1;}
 		.percentage{color: #00B68D;}
 	}
-}	
-</style>
+}	
+</style>
diff --git a/pages/index/schedule.vue b/pages/index/schedule.vue
index 19bfb13..a95c919 100644
--- a/pages/index/schedule.vue
+++ b/pages/index/schedule.vue
@@ -1,6 +1,6 @@
 <template>
-	<!-- 工单进度管理 -->
-	<view class="pagepaddings">
+	<!-- 工单进度管理 -->
+	<view class="page_padding">
 		<view class="detail_list contentboxsty font13">
 			<view class="list_top">
 				<view class="top_left">
@@ -29,35 +29,35 @@
 				</view>
 			</view>
 			<!-- <annularProgressBar :progress_txt="20" :width="84"  :height="69" title="出材率"/> -->
-		</view>
-	</view>
-</template>
-
+		</view>
+	</view>
+</template>
+
 <script>
 	import progressBar from '/components/progressBar.vue'
-	import annularProgressBar from '/components/chocolate-progress-bar/chocolate-progress-bar.vue'
+	import annularProgressBar from '/components/chocolate-progress-bar/chocolate-progress-bar.vue'
 	export default {
 	  components: {
 		"progressBar":progressBar,
 		"annularProgressBar":annularProgressBar,
-	  },
-		data() {
-			return {
-				list:[{name:''}]
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
+	  },
+		data() {
+			return {
+				list:[{name:''}]
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
 .detail_list{
 	.list_content{
 		.list_row{display: flex;
 			.row_left{display: flex;}
 		}
 	}
-}
-</style>
+}
+</style>
diff --git a/pages/person/accountCenter.vue b/pages/person/accountCenter.vue
index 2bf974b..7953341 100644
--- a/pages/person/accountCenter.vue
+++ b/pages/person/accountCenter.vue
@@ -1,5 +1,5 @@
-<template>
-	<view class="person_page pagepaddings font13">
+<template>
+	<view class="person_page page_padding font13">
 		<view class="person_dataA contentboxsty">
 			<view class="content_box logo_box">
 				<view class="data_name">头像</view>
@@ -53,19 +53,19 @@
 				<view class="data_name">清除缓存</view>
 				<view class=""></view>
 			</view>
-		</view>
-	</view>
-</template>
-
+		</view>
+	</view>
+</template>
+
 <script>
 	const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0';
-	
-	export default {
-		data() {
-			return {
-				avatarUrl:defaultAvatarUrl
-			}
-		},
+	
+	export default {
+		data() {
+			return {
+				avatarUrl:defaultAvatarUrl
+			}
+		},
 		methods: {
 			onChooseAvatar(e) {
 				
@@ -75,16 +75,16 @@
 				})
 				this.avatarUrl = e.detail.avatarUrl
 			},
-			//跳转更改手机号页面
+			//跳转更改手机号页面
 			toChangPhone(){
 				uni.navigateTo({
 					url: '/pages/person/changePhone'
 				  })
-			}
-		}
-	}
-</script>
-
+			}
+		}
+	}
+</script>
+
 <style lang="scss" >
 .person_page{
 	.person_dataA{
@@ -104,5 +104,5 @@
 	.data_name{flex: 1;}
 }
 
- 
-</style>
+ 
+</style>
diff --git a/pages/person/alarm.vue b/pages/person/alarm.vue
index 74933d2..7cad5c0 100644
--- a/pages/person/alarm.vue
+++ b/pages/person/alarm.vue
@@ -1,6 +1,6 @@
 <template>
-	<!-- 设备报警 -->
-	<view class="pagepaddings">
+	<!-- 设备报警 -->
+	<view class="page_padding">
 		<view class="content_layout" @click="cancelLongpress">
 			<view class="item_layout" v-for="(item, index) in list" :key="index">
 				<view :class="islongpress?'longpress_style':''" @longpress="longpress" @click="deleteAlarm">
@@ -11,25 +11,23 @@
 					<text>{{item.time}}</text>
 				</view>
 			</view>
-			
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				islongpress:false,
 				list:[
 					{name:'周边侵入警报',time:'2023-09-01',url:'../../static/logo.png'},
 					{name:'周边侵入警报',time:'2023-09-01',url:'../../static/logo.png'},
 					{name:'周边侵入警报',time:'2023-09-01',url:'../../static/logo.png'},
-				]
-			}
-		},
-		methods: {
+				]
+			}
+		},
+		methods: {
 			longpress(){
 				console.log('长按事件')
 				this.islongpress = true
@@ -43,13 +41,13 @@
 				if(this.islongpress){
 					console.log('删除')
 				}
-			},
-		}
-	}
-</script>
-
+			},
+		}
+	}
+</script>
+
 <style>
-/* .content_layout{display: flex;flex-flow: wrap;}
+/* .content_layout{display: flex;flex-flow: wrap;}
 .item_layout{width: 50%;} */
 .content_layout{ 
 	display: grid;
@@ -57,6 +55,6 @@
 	grid-gap: 10px; /* 可选的间距 */
 }
 .img_style{height: 110px;width: 100%;}
-.longpress_style{background-color: #000;
-    opacity: 0.2;}
-</style>
+.longpress_style{background-color: #000;
+    opacity: 0.2;}
+</style>
diff --git a/pages/person/changePhone.vue b/pages/person/changePhone.vue
index 6de3feb..50beb8c 100644
--- a/pages/person/changePhone.vue
+++ b/pages/person/changePhone.vue
@@ -1,5 +1,5 @@
-<template>
-	<view class="pagepaddings font13">
+<template>
+	<view class="page_padding font13">
 		<view class="phone_page contentboxsty">
 			<view class="content_row">
 				<input placeholder="请输入要更换的手机号码" />
@@ -8,25 +8,25 @@
 				<input placeholder="请输入短信验证码" />
 				<view class="theme_color">获取验证码</view>
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
 <style>
-.phone_page{padding: 0 12px;}
+.phone_page{padding: 0 12px;}
 .content_row{display: flex;height: 49px;align-items: center;border-bottom: 1px solid #2D3A6F;}
-.content_row input{flex: 1;}
-</style>
+.content_row input{flex: 1;}
+</style>
diff --git a/pages/person/myAuthority.vue b/pages/person/myAuthority.vue
index 6053563..b4236fe 100644
--- a/pages/person/myAuthority.vue
+++ b/pages/person/myAuthority.vue
@@ -1,5 +1,5 @@
-<template>
-	<view class="pagepaddings">
+<template>
+	<view class="page_padding">
 		<!-- <checkbox-group @change="checkboxChange">
 			<label class="uni-list-cell uni-list-cell-pd" v-for="item in items" :key="item.value">
 				<view>
@@ -38,12 +38,12 @@
 				</view>
 			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
 				items: [{
 						value: 'USA',
@@ -70,7 +70,7 @@
 						value: 'FRA',
 						name: '法国'
 					}
-				],
+				],
 			list:[
 					{name:'首页',checked:true,id:1,child:[{
 							id: 2,
@@ -100,9 +100,9 @@
 					// 	],
 					// }
 				],
-				arr:[]
-			}
-		},
+				arr:[]
+			}
+		},
 		methods: {
 			checkboxChange: function (e) {
 				var items = this.items,
@@ -130,17 +130,17 @@
 				// 	}
 				// }
 				// console.log(items)
-			},
+			},
 			selectPath(e,item){
 				console.log(e,item,222)
-			},
-		}
-	}
-</script>
-
+			},
+		}
+	}
+</script>
+
 <style>
-.contentboxsty{padding: 14px 12px;margin-bottom: 12px;}
-.list_name{display: flex;align-items: center;padding-bottom: 7px;border-bottom: 1px solid #2D3A6F;}
+.contentboxsty{padding: 14px 12px;margin-bottom: 12px;}
+.list_name{display: flex;align-items: center;padding-bottom: 7px;border-bottom: 1px solid #2D3A6F;}
 .content_name{padding:8px 0 ;display: flex;align-items: center;}
 .content_item{display: flex;align-items: center;flex-wrap: wrap;}
 .content_data{padding: 4px 15px 4px 0;display: flex;align-items: center;}
@@ -155,4 +155,4 @@ checkbox.checkbox-backgroun-yellow.checked .uni-checkbox-input{
 	
 </style>
 
-
+
diff --git a/pages/person/safetyAccidents.vue b/pages/person/safetyAccidents.vue
index 517bfd4..aeae105 100644
--- a/pages/person/safetyAccidents.vue
+++ b/pages/person/safetyAccidents.vue
@@ -1,6 +1,6 @@
 <template>
-	<!-- 安全事故 -->
-	<view class="pagepaddings">
+	<!-- 安全事故 -->
+	<view class="page_padding">
 		<view class="contentboxsty font13" v-for="(item, index) in list" :key="index">
 			<view class="name font_bold font14">
 				{{item.name}}
@@ -16,28 +16,28 @@
 				事件描述事件描述事件描述事件描述事件描述事件描述
 				事件描述事件描述事件描述事件描述事件描述事件描述
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				list:[
 					{name:'设备一',url:'../../static/logo.png'},
 					{name:'设备一',url:'../../static/logo.png'},
-				]
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
+				]
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
 <style>
 .contentboxsty{padding: 14px 12px;margin-bottom: 12px;}
-.img_style{padding: 12px 0 14px 0;}
-
-</style>
+.img_style{padding: 12px 0 14px 0;}
+
+</style>
diff --git a/pages/production/productionDetail.vue b/pages/production/productionDetail.vue
index ed0afdd..1c03872 100644
--- a/pages/production/productionDetail.vue
+++ b/pages/production/productionDetail.vue
@@ -1,5 +1,5 @@
-<template>
-	<view class="pagepaddings">
+<template>
+	<view class="page_padding">
 		<view class="detail_list contentboxsty ">
 			<view class="list_top">
 				<view class="top_left">
@@ -52,16 +52,16 @@
 					
 				</view>
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				form:{}
-			}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form:{}
+			}
 		},
 		onLoad(option){
 			console.log(option)
@@ -69,18 +69,18 @@
 		},
 		onShow(){
 			// this.detailData()
-		},
-		methods: {
+		},
+		methods: {
 			detailData(id){
 				this.$api.postFuncLoading('/order.info',{id:id}).then(res=>{
 					console.log(res.data)
 					this.form = res.data
 				})
-			},
-		}
-	}
-</script>
-
+			},
+		}
+	}
+</script>
+
 <style lang="scss">
 	.list_top{
 		.top_right{background: #243168;border-radius: 4px 4px 4px 4px;width: 46px;height: 20px;text-align: center;}
@@ -88,6 +88,6 @@
 	.list_content{		
 		.content_row{display: flex;padding:6px 0;
 			.name{width: 90px;}
-		}
-	}
-</style>
+		}
+	}
+</style>
diff --git a/pages/production/productionOrder.vue b/pages/production/productionOrder.vue
index 0e0eaa6..ea14912 100644
--- a/pages/production/productionOrder.vue
+++ b/pages/production/productionOrder.vue
@@ -1,6 +1,6 @@
-<template>
-	<!-- 生产工单 -->
-	<view class="pagepaddings">
+<template>
+	<!-- 生产工单 -->
+	<view class="page_padding">
 		<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty font13">
 			<view @click="toDetail(item.id)">
 				<view class="list_top">
@@ -59,41 +59,38 @@
 						</view>
 					</view>
 				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list:[]
-			}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[]
+			}
 		},
 		onShow(){
 			this.listData();
-		},
+		},
 		methods: {
 			listData(){
 				this.$api.postFuncLoading('/order.list',{page: 1,pageSize: 15}).then(res=>{
 					this.list = res.data.rows
-					
-					
-				})
-			},
+			},
 			//跳转工单详情
 			toDetail(id){
 				console.log(id)
 				uni.navigateTo({
 					url:'/pages/production/productionDetail?id='+id
 				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
 .detail_list{
 	.list_centre{display: flex;text-align: center;padding-bottom: 10px;
 		view{flex: 1;}
@@ -101,9 +98,10 @@
 	}
 	.list_below{padding-bottom: 12px;
 		.row{display: flex;padding-top: 10px;
+			.row_left{    white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 			view{flex: 1;}
 		}
 	}
 	
-}
-</style>
+}
+</style>