From 487c8099a9bd8a819aebe564eb0067b50947c8ed Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Tue, 12 Apr 2022 08:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=AF=95=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=8F=90?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95(=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8A=E6=95=85=E9=9A=9C--->=E7=BB=B4=E4=BF=9D=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE--->=E7=BB=B4=E4=BF=9D=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=95=85=E9=9A=9C--->=E5=AE=9E=E6=97=B6=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=AD=A3=E5=8F=8D=E9=9D=A2?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=BA=E4=B8=A4=E4=B8=AA=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5)=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A390%=E3=80=81=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=AF=95=E3=80=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A380%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/flying-monkey.css                     |   5 +
 pages/dataQuery/dataQuery.vue                 |   6 +-
 pages/dataQuery/projectDetails.vue            |   6 +-
 pages/faultStatistics/faultStatistics.vue     |   4 +-
 pages/faultStatistics/projectOverview.vue     |   6 +-
 pages/project/details.vue                     | 104 +++++++++-------
 pages/project/projectList.vue                 | 111 +++++++++---------
 pages/repairsPage/repairsPage.vue             |  12 +-
 pages/tabbar/pagehome/pagehome.vue            |  16 +--
 pages/workOrder/details.vue                   |  10 +-
 pages/workOrder/workOrder.vue                 |  24 ++--
 pages/workOrder/workOrderLlsit.vue            |   2 +-
 pages/workOrder/workorderTwo.vue              |  12 +-
 pagesB/message-center/message-center.vue      |  39 +++---
 pagesB/my-account/my-account.vue              |  10 +-
 .../personal-information.vue                  |  15 ++-
 16 files changed, 213 insertions(+), 169 deletions(-)

diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 38e248e..9567a97 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -361,9 +361,11 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
 	margin-top: 10rpx;
 }
 /* 消息中心 */
+.message-circle{display: flex;align-items: center;}
 .message-circle::before {
 	content: '';
 	display: flex;
+	flex-shrink: 0;
 	width: 24rpx;
 	height: 24rpx;
 	background-color: #6f91ff;
@@ -378,4 +380,7 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
 }
 .system-notification::before {
 	background-color: #2cfc3b;
+}
+.server-message::before {
+	background-color: #FF0000;
 }
\ No newline at end of file
diff --git a/pages/dataQuery/dataQuery.vue b/pages/dataQuery/dataQuery.vue
index e65e2ca..73d7bce 100644
--- a/pages/dataQuery/dataQuery.vue
+++ b/pages/dataQuery/dataQuery.vue
@@ -37,7 +37,7 @@
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                    <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维保</text>
                 </view>
             </view>
             <view class="li">
@@ -73,7 +73,7 @@
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                    <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维保</text>
                 </view>
             </view>
             <view class="li">
@@ -109,7 +109,7 @@
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                    <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维保</text>
                 </view>
             </view>
         </view>
diff --git a/pages/dataQuery/projectDetails.vue b/pages/dataQuery/projectDetails.vue
index e50c36e..e330638 100644
--- a/pages/dataQuery/projectDetails.vue
+++ b/pages/dataQuery/projectDetails.vue
@@ -49,7 +49,7 @@
                        <view class="last-date-content">
                            <image class="icon" src="../../static/iocn/gzzt.png" mode=""></image>
                            <view class="text">
-                               最近一次故障时间：2021-11-18 17：00：16
+                               最近一次维保时间：2021-11-18 17：00：16
                            </view>
                        </view>
                    </view>
@@ -232,7 +232,7 @@
                    <view class="list">
                      <view class="li pad-z40 fon27 col9" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in 10" :key="index">
                      	<view class="disac fw line-h60">
-                     		<view class="text">“部分模组不显示”故障【陈志远】已处理。</view>
+                     		<view class="text">“部分模组不显示”维保【陈志远】已处理。</view>
                      		<view class="date">2020-05-15 16:00</view>
                      	</view>
                      </view>
@@ -260,7 +260,7 @@
                 interval: 3000,
                 index: 1,
                 recordState: [{
-                        title: '维修记录',
+                        title: '维保记录',
                         state: true
                     },
                     {
diff --git a/pages/faultStatistics/faultStatistics.vue b/pages/faultStatistics/faultStatistics.vue
index 5cbcee2..3ad90ce 100644
--- a/pages/faultStatistics/faultStatistics.vue
+++ b/pages/faultStatistics/faultStatistics.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<statusNav navBarTitle="故障统计"  returnColor="#c2c2c2"></statusNav>
+		<statusNav navBarTitle="维保统计"  returnColor="#c2c2c2"></statusNav>
 		<container-subgroup-two>
 			<view slot="content" style="margin: 0 -30rpx;">
 				<view class="faultStatistics-nav">
@@ -33,7 +33,7 @@
 					</view>
 				</view>
 				<view class="fault-type">
-					<view class="settlement-type-title">故障类型</view>
+					<view class="settlement-type-title">维保类型</view>
 					<view class="charts-box">
 						<qiun-data-charts type="ring" :chartData="chartData" background="none" />
 					</view>
diff --git a/pages/faultStatistics/projectOverview.vue b/pages/faultStatistics/projectOverview.vue
index c01495c..c7bb25b 100644
--- a/pages/faultStatistics/projectOverview.vue
+++ b/pages/faultStatistics/projectOverview.vue
@@ -54,7 +54,7 @@
                                             </view>
                                             <view class="date-con-li">
                                                 <view class="text">
-                                                    项目故障率
+                                                    项目维保率
                                                 </view>
                                                 <view class="single-amount">
                                                     0单
@@ -87,7 +87,7 @@
                                             </view>
                                             <view class="date-con-li">
                                                 <view class="text">
-                                                    项目故障率
+                                                    项目维保率
                                                 </view>
                                                 <view class="single-amount">
                                                     0单
@@ -120,7 +120,7 @@
                                             </view>
                                             <view class="date-con-li">
                                                 <view class="text">
-                                                    项目故障率
+                                                    项目维保率
                                                 </view>
                                                 <view class="single-amount">
                                                     0单
diff --git a/pages/project/details.vue b/pages/project/details.vue
index 51b0650..6f620ab 100644
--- a/pages/project/details.vue
+++ b/pages/project/details.vue
@@ -7,35 +7,25 @@
 					<view class="details-head">
 						<view class="swiper-head">
 							<swiper class="swiper" @change="changeAutoplay" :autoplay="autoplay" :interval="interval" circular>
-								<swiper-item>
+								<swiper-item v-for="(item,index) in projectObj.completed_img" :key="index">
 									<view class="swiper-item uni-bg-red">
-										<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-									</view>
-								</swiper-item>
-								<swiper-item>
-									<view class="swiper-item uni-bg-red">
-										<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-									</view>
-								</swiper-item>
-								<swiper-item>
-									<view class="swiper-item uni-bg-red">
-										<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+										<image class="img" :src="item" mode="aspectFill"></image>
 									</view>
 								</swiper-item>
 							</swiper>
-							<view class="indication-point fon24 disjcac">{{index}}/3</view>
+							<view class="indication-point fon24 disjcac">{{index}}/{{projectObj.completed_img.length}}</view>
 						</view>
-						<view class="title">湖南工业大学生化学院会议室P2.5全彩LED显示屏</view>
-						<view class="code">XM20220108-1001</view>
+						<view class="title">{{projectObj.project_name}}</view>
+						<view class="code">{{projectObj.project_number}}</view>
 						<view class="address">
 							<image class="img" src="../../static/iocn/im.png" mode=""></image>
-							<view class="text">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
+							<view class="text">{{projectObj.address}}</view>
 						</view>
 					</view>
 					<view class="last-date">
 						<view class="last-date-content">
 							<image class="icon" src="../../static/iocn/gzzt.png" mode=""></image>
-							<view class="text">最近一次故障时间：2021-11-18 17：00：16</view>
+							<view class="text">最近一次维保时间：{{projectObj.downtime}}</view>
 						</view>
 					</view>
 				</view>
@@ -44,26 +34,26 @@
 					<view class="text">项目概况</view>
 				</view>
 				<view class="project-message-content">
-					<view class="li">
+					<view class="li" v-if="projectObj.product_brand">
 						<view class="title-one">
 							<text>品</text>
 							<text>牌：</text>
 						</view>
-						<view class="text">海康威视</view>
+						<view class="text">{{projectObj.product_brand}}</view>
 					</view>
-					<view class="li">
+					<view class="li" v-if="projectObj.product_model">
 						<view class="title-one">
 							<text>型</text>
-							<text>品：</text>
+							<text>号：</text>
 						</view>
-						<view class="text">DS-CK25FI/H</view>
+						<view class="text">{{projectObj.product_model}}</view>
 					</view>
-					<view class="li">
+					<view class="li" v-if="projectObj.product_size">
 						<view class="title-one">
 							<text>尺</text>
 							<text>寸：</text>
 						</view>
-						<view class="text">3.94*2.02m</view>
+						<view class="text">{{projectObj.product_size}}</view>
 					</view>
 					<view class="li">
 						<view class="title">安装位置：</view>
@@ -81,14 +71,15 @@
 					</view>
 				</view>
 				<view class="record-content">
-					<view class="title">维修追踪</view>
+					<view class="title">维保追踪</view>
 					<view class="list">
-						<view class="li pad-z40 fon27 col9" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in 10" :key="index">
+						<view class="li pad-z40 fon27 col9" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in recordList" :key="index">
 							<view class="disac fw line-h60">
-								<view class="text">“部分模组不显示”故障【陈志远】已处理。</view>
-								<view class="date">2020-05-15 16:00</view>
+								<view class="text">{{item.time_line}}</view>
+								<!-- <view class="date">2020-05-15 16:00</view> -->
 							</view>
 						</view>
+						<pitera v-if="recordList.length==0" :textStr="nomoreText"></pitera>
 					</view>
 				</view>
 			</view>
@@ -99,10 +90,12 @@
 <script>
 	import statusNav from "../../components/status-nav.vue"
 	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	import pitera from '@/components/nothing/pitera.vue';
 	export default {
 		components: {
 			statusNav,
-			containerSubgroupTwo
+			containerSubgroupTwo,
+			pitera
 		},
 		data() {
 			return {
@@ -111,7 +104,7 @@
 				index: 1,
 				projectId: "",
 				recordState: [{
-						title: '维修记录',
+						title: '维保记录',
 						state: true
 					},
 					{
@@ -122,35 +115,66 @@
 						title: '巡检记录',
 						state: false
 					},
-				]
+				],
+				projectObj:'',
+				typeId:1,//记录类型 1：维修记录 2:保养记录 3: 巡检记录  
+				list_rows:200,
+				page:1,
+				recordList:[],//记录列表
+				nomoreText:''
 			}
 		},
-		onLoad(option) {
-			this.projectId = option.id
-			this.getData()
+		onLoad(op) {
+			this.projectId = op.id
+			this.getData(this.projectId);
+			this.getRecord();
 		},
-
 		methods: {
+			// 查询维保记录、保养记录、巡检记录
+			getRecord(){
+				let params = {
+					project_id: this.projectId,  
+					type_id: this.typeId, //记录类型 1：维修记录 2:保养记录 3: 巡检记录  
+					list_rows: this.list_rows,
+					page:this.page
+				}
+				this.$requst.get('/universal/api.project/recording',params).then(res=>{
+					if(res.code) {
+						/**
+						 * {
+						 * 	 time_line:''
+						 * }
+						 */
+						this.recordList = res.data.data;
+					} else {
+						this.nomoreText = res.msg;
+					}
+				})
+			},
 			changeAutoplay(data) {
-				console.log()
 				this.index = data.detail.current - 0 + 1
 			},
-			getData() {
+			getData(id) {
 				this.$requst.get('/universal/api.project/project_info', {
-					id: this.projectId,
+					project_id: id,
 				}).then(res => {
-					if (res.code == 1) {
-						console.log(res.data.data)
+					if (res.code) {
+						this.projectObj = res.data;
+						console.log(this.projectObj);
 					} else {
 
 					}
 				})
 			},
 			recordNav(index) {
+				if(index==0) this.typeId = 1;
+				if(index==1) this.typeId = 2;
+				if(index==2) this.typeId = 3;
 				for (var i = 0; i < this.recordState.length; i++) {
 					this.recordState[i].state = false
 				}
 				this.recordState[index].state = true
+				this.getRecord();
 			}
 		}
 	}
diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue
index 94f794e..1fbe415 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -12,18 +12,17 @@
 					</view>
 				</view>
 				<view class="screen bbot mar-sx20">
-					<picker class="width30 disjcac" @change="bindPickerChange" :value="index" :range="array" :range-key="'title'">
+					<picker class="width30 disjcac" @change="bindPickerChange" :value="index" :range="array" :range-key="'name'">
 						<view class="li">
 							<view v-if="initial_value!=''" class="text">{{initial_value}}</view>
-							<view v-else class="text">{{array[index].title}}</view>
+							<view v-else class="text clips1">{{array[index].name}}</view>
 							<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
 						</view>
 					</picker>
 					<picker class="width30 disjcac" mode="date" :value="date" @change="bindDateChange">
 						<view class="li">
-							<view class="text">竣工日期</view>
-							<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load>
-							</image>
+							<view class="text">{{completion_time || '竣工日期'}}</view>
+							<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
 						</view>
 					</picker>
 					<view class="li width30 disjcac">
@@ -33,17 +32,16 @@
 					</view>
 				</view>
 				<view class="project-list">
-					<view class="li" @click="projectDetailsFun(item.id)" v-for="(item,index) in dataList.data" :key="index">
+					<view class="li" @click="projectDetailsFun(item.project_id)" v-for="(item,index) in dataList.data" :key="index">
 						<view class="message">
 							<image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
 							<view class="text disjb fc" style="height: 180rpx;">
 								<view class="clips1 fon24 bold">{{item.project_name}}</view>
-								<view class="disjb fc" style="margin-left: -20rpx;height: 80%;">
-									<view class="serial-number scal09">项目编号：{{item.projectCode}}</view>
-									<view class="specification scal09">规格型号：{{item.project_number}}</view>
-									<view class="specification scal09">产品尺寸：{{item.size}}</view>
-									<view class="installation-site scal09">安装位置：{{item.installation_location}}
-									</view>
+								<view class="line-h38" style="margin-left: -20rpx;height: 80%;">
+									<view class="serial-number scal09" v-if="item.project_number">项目编号：{{item.project_number}}</view>
+									<view class="specification scal09" v-if="item.product_model">规格型号：{{item.product_model}}</view>
+									<view class="specification scal09" v-if="item.product_size">产品尺寸：{{item.product_size}}</view>
+									<view class="installation-site scal09" v-if="item.installation_location">安装位置：{{item.installation_location}}</view>
 								</view>
 							</view>
 						</view>
@@ -54,12 +52,14 @@
 								<view class="text  scal09" style="margin-left: -26rpx;">{{item.address}}
 								</view>
 							</view>
-							<view class="date scal09">{{item.date}}</view>
+							<view class="date scal09 flexs">{{item.joint_starting_times}}</view>
 						</view>
 						<view v-if="item.warranty_time==1" class="icon iconBera">质保中</view>
 						<view v-else class="icon iconBer">质保到期</view>
 					</view>
+					<pitera v-if="total==dataList.data.length && dataList.data.length" textStr="暂无更多项目列表数据"></pitera>
 				</view>
+				<nothing-page v-if="dataList.data.length==0" content="暂无更多项目列表数据"></nothing-page>
             </view>
 		</container-subgroup-two>
 		<footTabOne :current="1"></footTabOne>
@@ -70,11 +70,13 @@
     import statusNav from '../../components/status-nav.vue';
     import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
     import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	import pitera from '@/components/nothing/pitera.vue';
     export default {
         components: {
             footTabOne,
             statusNav,
-            containerSubgroupTwo
+            containerSubgroupTwo,
+			pitera
         },
         data() {
             const currentDate = this.getDate({
@@ -85,15 +87,7 @@
                 inputData: "",
                 date: currentDate,
 				initial_value:'产品类型',
-                array: [{
-                    title: "质保中",
-                    key: 0,
-
-                }, {
-                    title: "质保到期",
-                    key: 1
-
-                }, ],
+                array: [],
                 index: 0,
                 statusHeight: uni.getSystemInfoSync().statusBarHeight + 40,
                 dataList: {
@@ -101,27 +95,37 @@
                     page: 1,
                     data: [
                     ]
-                }
+                },
+				productType:'',//产品类型id
+				completion_time:'',//竣工日期
+				total:''//总数
             }
         },
+		onReachBottom() {
+			if(this.total!=this.dataList.data.length) {
+				this.dataList.page++;
+				this.getData();
+			}
+		},
         onLoad() {
             this.getData()
-
+			// 调用产品类型事件
+			this.getProjectType();
         },
         methods: {
-
+			// 查询项目列表
             getData() {
+				if(this.dataList.page==1) this.dataList.data = [];
                 this.$requst.get('/universal/api.project/project_list', {
+                    product_type:this.productType,
+                    completion_time:this.completion_time,
                     list_rows: this.dataList.list_rows,
-                    page: this.dataList.page,
+                    page: this.dataList.page
                 }).then(res => {
-                    // this.$toolAll.tools.showToast(res.msg);
-                    console.log(res.data.data)
-                    if (res.code == 1) {
-                        this.dataList.data = res.data.data
-                        
-                    } else {
-
+                    if (res.code) {
+						// 设置项目总数
+                        this.total = res.data.total;
+                        this.dataList.data = [...this.dataList.data,...res.data.data];
                     }
                 })
             },
@@ -130,30 +134,31 @@
                     url: `/pages/project/details?id=${id}`
                 })
             },
-            // 查询
-            inquireProject() {
-
-                this.$requst.post('/universal/api.project/project_list', {
-                    list_rows: this.dataList.list_rows,
-                    page: this.dataList.page,
-                    value: this.inputData,
-                }).then(res => {
-                    // this.$toolAll.tools.showToast(res.msg);
-                    if (res.code == 0) {
-                        console.log(res.data.data)
-                        // this.dataList = res.data.data
-                    } else {
-
-                    }
-                })
-            },
+			// 查询产品类型
+			getProjectType(){
+				this.$requst.get('/universal/api.project/project_type').then(res=>{
+					if(res.code) {
+						this.array = res.data;
+					}
+				})
+			},
             bindPickerChange(data) {
-                console.log(data)
+                // console.log(data)
 				this.initial_value = '';
 				this.index = data.detail.value;
+				this.dataList.page = 1;
+				// 设置产品类型id
+				this.productType = this.array[this.index].id;
+				// 调用查询项目列表事件
+				this.getData();
             },
             bindDateChange(date) {
-                console.log(date)
+                // console.log(date)
+				this.dataList.page = 1;
+				// 设置竣工日期
+				this.completion_time = date.detail.value;
+				// 调用查询项目列表事件
+				this.getData();
             },
             getDate(type) {
                 const date = new Date();
diff --git a/pages/repairsPage/repairsPage.vue b/pages/repairsPage/repairsPage.vue
index 38560e5..301200a 100644
--- a/pages/repairsPage/repairsPage.vue
+++ b/pages/repairsPage/repairsPage.vue
@@ -12,10 +12,10 @@
                 <view class="repairs-hint padding">
                     <image class="icon" src="../../static/iocn/lp.png" mode="aspectFill"></image>
                     <view class="text">
-                        请务必拍好故障照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
+                        请务必拍好维保照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
                     </view>
                 </view>
-                <view class="fault-type-title padding">故障类型：</view>
+                <view class="fault-type-title padding">维保类型：</view>
                 <view class="padding fault-type-content">
                     <view class="li" @click="repairsTypeFun(index)" :class="index==indexType?'on':''"
                         v-for="(item,index) in faultTypeData">
@@ -33,10 +33,10 @@
                             mode="aspectFill"></image>
                         <view class="fault-pictures-con" v-else>
                             <image class="img" src="../../static/iocn/gz.png" lazy-load mode="aspectFill"></image>
-                            <view class="text">添加故障图片</view>
+                            <view class="text">添加维保图片</view>
                         </view>
                     </view>
-                    <textarea v-model="data.fault_describe" class="fault-description radius10" placeholder="故障情况描述"
+                    <textarea v-model="data.fault_describe" class="fault-description radius10" placeholder="维保情况描述"
                         placeholder-class="fault-description-text" />
                     <view class="detailed-address inputCss">
                         <input type="text" v-model="data.service_address" class="fon26 width100"
@@ -52,7 +52,7 @@
                         placeholder="请选择上门时间" placeholder-class="inputCss-input" />
                     <yy-mm-dd-hh-ss ref="myPicker" @submit="handleSubmit" :start-year="2022" :end-year="2122">
                     </yy-mm-dd-hh-ss>
-                    <button class="submit-button" @click="submitButton()" type="default">提交故障申报</button>
+                    <button class="submit-button" @click="submitButton()" type="default">提交维保申报</button>
                 </view>
             </view>
         </container-subgroup>
@@ -105,7 +105,7 @@
         },
 
         methods: {
-            // 获取故障类型
+            // 获取维保类型
             getType() {
                 // /universal/api.order/fault_type
                 this.$requst.post('/universal/api.work_order/fault_type').then(res => {
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 43d1454..956646b 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -41,7 +41,7 @@
 							</view>
 							<view class="bleft" style="height: 90rpx;"></view>
 							<view class="disjcac fc width50">
-								<view class="fon26 col9">实时故障</view>
+								<view class="fon26 col9">实时工单</view>
 								<view class="fon60 bold">116</view>
 							</view>
 						</view>
@@ -91,9 +91,9 @@
 					</view>
 					<!-- 工程师可见 -->
 					<view v-if="role==4 || role==3">
-						<!-- 项目维修 -->
+						<!-- 项目维保 -->
 						<view class="home-fun-box" v-if="role==4">
-							<view class="fun-title col3 fon28 disac bold">项目维修</view>
+							<view class="fun-title col3 fon28 disac bold">项目维保</view>
 							<view class="disac mar-s40">
 								<view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index">
 									<view class="posir" style="height: 58rpx;">
@@ -250,7 +250,7 @@
 				role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
-				noticeList:[{id:1,title:'2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。一天服务暂停一天服务暂停一天。'}],//公告
+				noticeList:[{id:1,title:'2021年11月06日公司团建，维保服务暂停一天服务暂停一天服务暂停一天。一天服务暂停一天服务暂停一天。'}],//公告
 				// 故障报修
 				repairList:[
 					{imgsrc:'/static/public/icon-home-repair.png',title:'报修'},
@@ -266,7 +266,7 @@
 				],
 				// 其他
 				otherList:[
-					{imgsrc:'/static/public/icon-home-largeScreen.png',title:'故障统计'},
+					{imgsrc:'/static/public/icon-home-largeScreen.png',title:'维保统计'},
 					{imgsrc:'/static/public/icon-home-reportForm.png',title:'数据看板'},
 					{imgsrc:'/static/public/icon-home-product.png',title:'新产品'},
 				],
@@ -277,11 +277,11 @@
 					{imgsrc:'/static/deleteImg/flying-img03.png',title:'会议室解决方案'},
 					{imgsrc:'/static/deleteImg/flying-img04.png',title:'实体店解决方案'},
 				],
-				// 项目维修
+				// 项目维保
 				projectRepairList:[
 					{imgsrc:'/static/public/icon-home-staySingle.png',title:'待接单',num:0,id:2},
 					{imgsrc:'/static/public/icon-home-stayImplement.png',title:'待执行',num:99,id:0},
-					{imgsrc:'/static/public/icon-home-repairIng.png',title:'维修中',num:6,id:4},
+					{imgsrc:'/static/public/icon-home-repairIng.png',title:'维保中',num:6,id:4},
 				],
 				// 工单数据
 				workOrderList:[
@@ -300,7 +300,7 @@
 				stayWorkOrderList:[
 					{imgsrc:'/static/public/icon-home-stayImplement.png',title:'待受理',num:0,id:0},
 					{imgsrc:'/static/public/icon-home-stayAssign.png',title:'待指派',num:6,id:0},
-					{imgsrc:'/static/public/icon-home-stayRepair.png',title:'待维修',num:6,id:3},
+					{imgsrc:'/static/public/icon-home-stayRepair.png',title:'待维保',num:6,id:3},
 					{imgsrc:'/static/public/icon-home-returnVisit.png',title:'待回访',num:0,id:8},
 				],
 				// 待办事件
diff --git a/pages/workOrder/details.vue b/pages/workOrder/details.vue
index a9ac2f0..affb82e 100644
--- a/pages/workOrder/details.vue
+++ b/pages/workOrder/details.vue
@@ -38,7 +38,7 @@
                                         <input type="text" disabled class="input" placeholder="" value="详细地址+某某栋11楼会议室" />
                                     </view>
                                     <view class="li">
-                                        <view class="title">故障类型：</view>
+                                        <view class="title">维保类型：</view>
                                         <input type="text" class="input" placeholder="" value="供电不足" />
                                     </view>
                                     <view class="li">
@@ -46,13 +46,13 @@
                                         <input type="text" disabled class="input" placeholder="" value="紧急" />
                                     </view>
                                     <view class="li">
-                                        <view class="title">故障说明：</view>
+                                        <view class="title">维保说明：</view>
                                         <textarea auto-height disabled class="input"
                                             value="*********************************************************************************************************"
                                             placeholder="" />
                                     </view>
                                     <view class="li">
-                                        <view class="title">故障图片：</view>
+                                        <view class="title">维保图片：</view>
                                         <view class="input">
                                             <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
                                             <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
@@ -142,7 +142,7 @@
                                         </view>
                                     </view>
                                     <view class="li">
-                                        <view class="title">故障原因：</view>
+                                        <view class="title">维保原因：</view>
                                         <textarea auto-height disabled class="input "
                                             value="*********************************************************************************************************"
                                             placeholder="" />
@@ -220,7 +220,7 @@
                                         <view class="list">
                                          <view class="li pad-z40 fon27 col9 pad-x20" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in 10" :key="index">
                                          	<view class="disac fw line-h40">
-                                         		<view class="text">“部分模组不显示”故障【陈志远】已处理。</view>
+                                         		<view class="text">“部分模组不显示”维保【陈志远】已处理。</view>
                                          		<view class="date">2020-05-15 16:00</view>
                                          	</view>
                                          </view>
diff --git a/pages/workOrder/workOrder.vue b/pages/workOrder/workOrder.vue
index ced308a..23a1471 100644
--- a/pages/workOrder/workOrder.vue
+++ b/pages/workOrder/workOrder.vue
@@ -39,19 +39,19 @@
                         <input type="text" class="input" v-model="targetObj.installLocation" placeholder="请填写安装位置(例:详细地址+某某栋11楼会议室)" :style="{color: targetObj.installLocation!='' ? '#000' : ''}" />
                     </view>
                     <view class="li">
-                        <view class="title flexs">故障类型：</view>
-                        <input type="text" class="input" v-model="targetObj.faultType" placeholder="请填写故障类型(例:供电不足)" :style="{color: targetObj.faultType!='' ? '#000' : ''}" />
+                        <view class="title flexs">维保类型：</view>
+                        <input type="text" class="input" v-model="targetObj.faultType" placeholder="请填写维保类型(例:供电不足)" :style="{color: targetObj.faultType!='' ? '#000' : ''}" />
                     </view>
                     <view class="li">
                         <view class="title flexs">紧急程度：</view>
                         <input type="text" disabled class="input" placeholder="" :value="targetObj.urgentDegree" />
                     </view>
                     <view class="li">
-                        <view class="title flexs"> 故障说明：</view>
-                        <textarea class="input line-h36" v-model="targetObj.faultExplain" style="height: 110rpx;" placeholder="请输入故障说明" :style="{color: targetObj.faultExplain!='' ? '#000' : ''}" />
+                        <view class="title flexs"> 维保说明：</view>
+                        <textarea class="input line-h36" v-model="targetObj.faultExplain" style="height: 110rpx;" placeholder="请输入维保说明" :style="{color: targetObj.faultExplain!='' ? '#000' : ''}" />
                     </view>
                     <view class="li">
-                        <view class="title flexs">故障图片：</view>
+                        <view class="title flexs">维保图片：</view>
                         <view class="input">
 							<view v-for="(item,index) in targetObj.faultImgList" :key="index" v-if="targetObj.faultImgList.length!=0">
 								<image class="img" :src="item" mode="aspectFill" ></image>
@@ -104,10 +104,10 @@
 					projectName:'湖南省林业科学院11楼会议室P2.5', // 项目名称
 					productType:'一拳超人', // 产品类型
 					installLocation:'手臂', // 安装位置
-					faultType:'脱节', // 故障类型
+					faultType:'脱节', // 维保类型
 					urgentDegree:'紧急', // 紧急程度
-					faultExplain:'摔了一跤', // 故障说明
-					faultImgList:[], // 故障图片
+					faultExplain:'摔了一跤', // 维保说明
+					faultImgList:[], // 维保图片
 					reporter:'林某', // 报单人
 					declarationTime:'2022/3/31 12:01:00', //报单时间
 					serviceMode: '手把手' ,// 服务方式
@@ -120,7 +120,7 @@
 					ifParts:false,//是否更换配件
 					workDescribe:'',// 工作描述
 					maintenanceImgList:[],//维保图片
-					faultReason:'',//故障原因
+					faultReason:'',//维保原因
 					maintenancePersonnel:''//维保人员
 				},
 				flag:true
@@ -177,11 +177,11 @@
 				} else if(!this.targetObj.installLocation) {
 					this.$toolAll.tools.showToast('请填写安装位置');
 				} else if(!this.targetObj.faultType) {
-					this.$toolAll.tools.showToast('请填写故障类型');
+					this.$toolAll.tools.showToast('请填写维保类型');
 				} else if(!this.targetObj.faultExplain) {
-					this.$toolAll.tools.showToast('请填写故障说明');
+					this.$toolAll.tools.showToast('请填写维保说明');
 				} else if(this.targetObj.faultImgList.length==0) {
-					this.$toolAll.tools.showToast('请添加故障图片');
+					this.$toolAll.tools.showToast('请添加维保图片');
 				} else if(!this.targetObj.serviceMode) {
 					this.$toolAll.tools.showToast('请填写服务方式');
 				} else {
diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue
index e9a02ca..bcb79f1 100644
--- a/pages/workOrder/workOrderLlsit.vue
+++ b/pages/workOrder/workOrderLlsit.vue
@@ -50,7 +50,7 @@
 										紧急程度：<view class="text"> {{item.emergency_level_view}}</view>
 									</view>
 									<view class="specification scal09">主负责人：{{item.principal}}</view>
-									<view class="installation-site scal09 clips1">故障描述：{{item.failure_description}}</view>
+									<view class="installation-site scal09 clips1">维保描述：{{item.failure_description}}</view>
 								</view>
 							</view>
 						</view>
diff --git a/pages/workOrder/workorderTwo.vue b/pages/workOrder/workorderTwo.vue
index ef43cd0..5fed46b 100644
--- a/pages/workOrder/workorderTwo.vue
+++ b/pages/workOrder/workorderTwo.vue
@@ -39,7 +39,7 @@
                         <input type="text" class="input input-black" disabled :value="targetObj.installLocation" />
                     </view>
                     <view class="li">
-                        <view class="title">故障类型：</view>
+                        <view class="title">维保类型：</view>
                         <input type="text" class="input input-black" disabled :value="targetObj.faultType" />
                     </view>
                     <view class="li">
@@ -47,11 +47,11 @@
                         <input type="text" class="input input-black" disabled :value="targetObj.serviceMode" />
                     </view>
                     <view class="li">
-                        <view class="title">故障说明：</view>
+                        <view class="title">维保说明：</view>
                         <textarea auto-height disabled class="input input-black" :value="targetObj.faultExplain" />
                     </view>
                     <view class="li">
-                        <view class="title">故障图片：</view>
+                        <view class="title">维保图片：</view>
                         <view class="input add-display">
                             <view class="">
                                 <image class="img" v-for="(item,index) in targetObj.faultImgList" :src="item" mode="aspectFill" lazy-load></image>
@@ -122,8 +122,8 @@
                         </view>
                     </view>
                     <view class="li">
-                        <view class="title">故障原因：</view>
-                        <textarea maxlength="-1" v-model="targetObj.faultReason" class="input input-black line-h36" placeholder="请填写故障原因" style="height: 110rpx;" />
+                        <view class="title">维保原因：</view>
+                        <textarea maxlength="-1" v-model="targetObj.faultReason" class="input input-black line-h36" placeholder="请填写维保原因" style="height: 110rpx;" />
                     </view>
                     <view class="li">
                         <view class="title">维保人员：</view>
@@ -235,7 +235,7 @@
 				} else if(this.targetObj.maintenanceImgList.length==0) {
 					this.$toolAll.tools.showToast('请上传维保图片');
 				} else if(!this.targetObj.faultReason) {
-					this.$toolAll.tools.showToast('请填写故障原因');
+					this.$toolAll.tools.showToast('请填写维保原因');
 				} else if(!this.targetObj.maintenancePersonnel) {
 					this.$toolAll.tools.showToast('请填写维保人员');
 				} else {
diff --git a/pagesB/message-center/message-center.vue b/pagesB/message-center/message-center.vue
index 9d3139b..0847723 100644
--- a/pagesB/message-center/message-center.vue
+++ b/pagesB/message-center/message-center.vue
@@ -7,10 +7,11 @@
 		</view>
 		<container-subgroup>
 			<view slot="content"> 
-				<view @longtap.stop="longTap(index)" @tap="chooseDel(index,item.id)" class="mar-x10 bacf" :style="{backgroundColor: (ifDel && item.status) ? '#dddddd' :''}" v-for="(item,index) in dataList" :key="index">
+				<!-- <view @longtap.stop="longTap(index)" @tap="chooseDel(index,item.id)" class="mar-x10 bacf" :style="{backgroundColor: (ifDel && item.status) ? '#dddddd' :''}" v-for="(item,index) in dataList" :key="index"> -->
+				<view class="mar-x10 bacf" :style="{backgroundColor: (ifDel && item.status) ? '#dddddd' :''}" v-for="(item,index) in dataList" :key="index">
 					<view class="pad-sx30 pad-zy20 disjbac">
-						<view class="fon30 message-circle disac" :class="['activity-message','audit-failed','system-notification'][index]">{{item.title}}{{item.id}}</view>
-						<view class="fon26 col9">{{item.time}}</view>
+						<view class="fon30 message-circle disac" :class="['','system-notification','activity-message','server-message','audit-failed'][item.message_type]"><view class="clips1 mar-y20">{{item.title}}</view></view>
+						<view class="fon26 col9 flexs">{{item.time}}</view>
 					</view>
 					<view class="bbot"></view>
 					<view class="fon27 line-h46 pad-zy20 pad-sx30" style="color: #737373;">{{item.content}}</view>
@@ -34,20 +35,7 @@
 				newTop: uni.getSystemInfoSync().statusBarHeight + 40,
 				ifDel:false,
 				total:12,
-				dataList:[
-					{id:1,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:2,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:3,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:4,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:5,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:6,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:7,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:8,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:9,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:10,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:11,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-					{id:12,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
-				],
+				dataList:[],
 				delArrId:[]
 			}
 		},
@@ -58,7 +46,22 @@
 			// 查询消息列表
 			getMessageList(){
 				this.$requst.get('/universal/api.message/message_list',{page: 1,list_rows: 200}).then(res=>{
-					
+					if(res.code) {
+						if(res.data.data.length) {
+							res.data.data.forEach(item=>{
+								let obj = {
+									id:item.message_id,
+									title:item.title,
+									content:item.content,
+									time:item.create_time,
+									is_read:item.is_read,
+									message_type:item.message_type,
+									status:false
+								}
+								this.dataList.push(obj);
+							})
+						}
+					}
 				})
 			},
 			// 长按事件
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index bf4ce7c..ca1dcd8 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -66,7 +66,7 @@
 						</view>
 						<view class="fon24 disjbac mar-sx10">
 							<view class="col9">工单编号：{{item.number}}</view>
-							<view style="color: #00a2e9;">故障类型：{{item.type}}</view>
+							<view style="color: #00a2e9;">维保类型：{{item.type}}</view>
 						</view>
 						<view class="fon24">
 							<view class="col9 disac width100">
@@ -110,10 +110,10 @@
 					{prices:'1088',workOrderNum:'GD20220112-1001',way:'现金',date:'2019-7-24'},
 				],
 				unsettledList:[
-					{id:1,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组故障',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
-					{id:2,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组故障',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
-					{id:3,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组故障',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
-					{id:4,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组故障',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
+					{id:1,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组维保',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
+					{id:2,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组维保',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
+					{id:3,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组维保',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
+					{id:4,title:'株洲市XXX项目名称',name:'林小雨',number:'GD20220112-1001',date:'2022-01-12  13:25:16',type:'模组维保',status:'维保已完成',address:'湖南省长沙市xx区1001栋6-12',priceo:'260.0'},
 				],
 				ifDetail:false
 			}
diff --git a/pagesB/personal-information/personal-information.vue b/pagesB/personal-information/personal-information.vue
index e854bdc..4958f92 100644
--- a/pagesB/personal-information/personal-information.vue
+++ b/pagesB/personal-information/personal-information.vue
@@ -48,33 +48,40 @@
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30 flexs">身份证正反面</view>
+						<view class="bold width30 flexs">身份证正面</view>
 						<view style="color: #f26803;" class="width100 disjbac">
 							<text @tap="previewImageEv(0)">查看</text>
 							<image @tap="uploadImgEv(0)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30 flexs">意外险材料</view>
+						<view class="bold width30 flexs">身份证反面</view>
 						<view style="color: #f26803;" class="width100 disjbac">
 							<text @tap="previewImageEv(1)">查看</text>
 							<image @tap="uploadImgEv(1)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold flexs mar-y40">签署工程师合作协议</view>
+						<view class="bold width30 flexs">意外险材料</view>
 						<view style="color: #f26803;" class="width100 disjbac">
 							<text @tap="previewImageEv(2)">查看</text>
 							<image @tap="uploadImgEv(2)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30 flexs">技能证书</view>
+						<view class="bold flexs mar-y40">签署工程师合作协议</view>
 						<view style="color: #f26803;" class="width100 disjbac">
 							<text @tap="previewImageEv(3)">查看</text>
 							<image @tap="uploadImgEv(3)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
+					<view class="bacf pad-sx30 pad-zy40 disac bbot">
+						<view class="bold width30 flexs">技能证书</view>
+						<view style="color: #f26803;" class="width100 disjbac">
+							<text @tap="previewImageEv(4)">查看</text>
+							<image @tap="uploadImgEv(4)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
+						</view>
+					</view>
 				</view>
 				<view class="person-btn" @tap="sumbmitData">提交保存</view>
 			</view>