From 588925129466fb82e97acfb2779b2c3b4a2ee086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 13 Mar 2025 14:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/deviceManage.vue          | 34 ++++++++++++++++------
 pages/manage/workReport/reportList.vue | 18 ++++++++----
 pages/my/my-order.vue                  | 39 +++++++++++++++-----------
 pages/my/rwm.vue                       |  1 +
 4 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/pages/manage/deviceManage.vue b/pages/manage/deviceManage.vue
index 8df7b10..9525517 100644
--- a/pages/manage/deviceManage.vue
+++ b/pages/manage/deviceManage.vue
@@ -2,7 +2,7 @@
 
 <template>
   <view class="content">
-    <u-loading-page  :loading="isLoading"></u-loading-page>
+    <u-loading-page :loading="isLoading"></u-loading-page>
     <view class="top-heder">
       <view class="t-left" @click="getback()">
         <uni-icons type="left" size="18" color="white"></uni-icons>
@@ -12,9 +12,9 @@
       </view>
       <view class="t-you"></view>
     </view>
-<!--    <headersVue titles="资料管理" style="position: static !important;">-->
-<!--      <u-icon name="arrow-left" color="#fff" size="18"></u-icon>-->
-<!--    </headersVue>-->
+    <!--    <headersVue titles="资料管理" style="position: static !important;">-->
+    <!--      <u-icon name="arrow-left" color="#fff" size="18"></u-icon>-->
+    <!--    </headersVue>-->
 
     <view class="searchContent">
       <view class="t-input">
@@ -45,7 +45,7 @@
           <view class="wimg" v-else>
             <image src="../../static/imgs/wenjian.png" mode=""></image>
           </view>
-          <view class="">{{ item.fileName }}</view>
+          <view class="file-name">{{ item.fileName }}</view>
           <view class="" v-if="item.warnTime">{{ item.warnTime }}</view>
           <view class="" v-if="!item.warnTime" style=" visibility: hidden;">{{ '1' }}</view>
           <view class="" v-if="item.count">文件数:{{ item.count }}</view>
@@ -114,12 +114,12 @@ export default {
       fileName: null,
       isShow: false,
       drawerData: [],
-      isLoading:false
+      isLoading: false
     }
   },
 
   onLoad(data) {
-    console.log('传递进来的数据',data)
+    console.log('传递进来的数据', data)
     if (data.folderId) {
       this.fileId = data.folderId
 
@@ -130,6 +130,16 @@ export default {
     this.getlist()
 
   },
+  onBackPress(options) {
+    // 点击虚拟键或者侧滑的时候触发（不允许返回）
+    if (options.from === 'backbutton') {
+      this.getback()
+      return true
+    }
+    // 否则则允许返回
+    return false;
+  },
+
   onReachBottom() {
     // if (this.pageNum >= this.totalPages) {
     //   uni.showToast({
@@ -564,7 +574,7 @@ export default {
   padding: 5px 15px;
   color: white;
   //margin-top: 2rem;
-  background: linear-gradient( 180deg, #054DF3 0%, #55A3FF 100%);
+  background: linear-gradient(180deg, #054DF3 0%, #55A3FF 100%);
 }
 
 .t-title {
@@ -761,4 +771,12 @@ export default {
   border-radius: 5px;
   margin-top: 10px;
 }
+
+.file-name {
+  width: 100%; /* 重要：需要固定宽度 */
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 5px; /* 根据实际布局调整 */
+}
 </style>
diff --git a/pages/manage/workReport/reportList.vue b/pages/manage/workReport/reportList.vue
index 9127a99..f06ff45 100644
--- a/pages/manage/workReport/reportList.vue
+++ b/pages/manage/workReport/reportList.vue
@@ -25,7 +25,7 @@
             <image :src="baseImageUrl + '/' + item.avatar" mode="" v-if="item.avatar"></image>
             <image src="/static/imgs/yh.png" mode="" v-else></image>
           </view>
-          <view class="name_">{{ item.userName}}</view>
+          <view class="name_">{{ item.userName }}</view>
           <view class="icon_">{{ item.reportTopic }}</view>
         </view>
         <view class="c_ds">
@@ -42,13 +42,13 @@
     </view>
 
     <!-- 筛选弹窗 -->
-    <u-popup :show="showPopup" @close="closeFilterPopup" mode="right" >
+    <u-popup :show="showPopup" @close="closeFilterPopup" mode="right">
       <view class="filter-popup">
         <view class="popup-header">
           <text>时间筛选</text>
         </view>
         <view style="width: 95%; margin: 50px auto;">
-          <uni-datetime-picker v-model="queryParams.reportTime" type="daterange" />
+          <uni-datetime-picker v-model="queryParams.reportTime" type="daterange"/>
         </view>
         <view class="popup-footer">
           <u-button type="primary" @click="applyFilter">应用筛选</u-button>
@@ -118,6 +118,11 @@ export default {
   onShow() {
     this.getReportList();
   },
+  onPullDownRefresh() {
+    this.queryParams.pageNo = 1;
+    this.getReportList();
+    uni.stopPullDownRefresh();
+  },
   onReachBottom() {
     if (this.queryParams.pageNo >= this.totalPages) {
       uni.showToast({
@@ -154,7 +159,7 @@ export default {
         uni.navigateTo({
           url: '/pages/manage/workReport/reportDetals'
         })
-      }else {
+      } else {
         console.log('id', data)
         uni.navigateTo({
           url: '/pages/manage/workReport/reportDetals?id=' + data.id
@@ -225,7 +230,7 @@ export default {
   background: #f4f5f6;
 }
 
-.search_box{
+.search_box {
   box-sizing: border-box;
   padding-bottom: 20rpx;
   border-bottom: 2rpx solid #F5F5F5;
@@ -233,7 +238,7 @@ export default {
   align-items: center;
 }
 
-.top_{
+.top_ {
   width: 100%;
   box-sizing: border-box;
   padding: 20rpx;
@@ -265,6 +270,7 @@ export default {
   width: 90rpx;
   height: 90rpx;
   margin-right: 20rpx;
+
   image {
     width: 100%;
     height: 100%;
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 2cf342a..51a6c1f 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -1,14 +1,17 @@
 <template>
   <view class="content">
-    <view class="top-heder">
-      <view class="t-left" @click="getback()">
-        <uni-icons type="left" size="18"></uni-icons>
-      </view>
-      <view class="t-title">
-        <text>订单详情</text>
-      </view>
-      <view class="t-you"></view>
-    </view>
+<!--    <view class="top-heder">-->
+<!--      <view class="t-left" @click="getback()">-->
+<!--        <uni-icons type="left" size="18"></uni-icons>-->
+<!--      </view>-->
+<!--      <view class="t-title">-->
+<!--        <text>订单详情</text>-->
+<!--      </view>-->
+<!--      <view class="t-you"></view>-->
+<!--    </view>-->
+    <headersVue titles="订单详情" style="position: static !important;">
+      <u-icon name="arrow-left" color="#fff" size="18"></u-icon>
+    </headersVue>
     <view class="x-box">
       <view class="box-top">
         <view style="border-right: 1px solid  #EEEEEE; width: 50%;">
@@ -77,20 +80,20 @@
         <view class="o-zui">{{ (orderInfo.payMoney + orderInfo.balance) / 100 }}</view>
       </view>
 
-      <view class="on-input">
-        <view class="o-left" @click="showLeadMan = true">
+      <view class="on-input" @click="showLeadMan = true">
+        <view class="o-left">
           <text style="color: red;font-weight: bold;text-align: center;">*</text>
           引车员
           <text class="xixi">点击选择</text>
         </view>
         <view class="o-right">
-          <input type="text" v-model="leadManName" placeholder="请输入引车员">
+          <input type="text" disabled v-model="leadManName" placeholder="请选择引车员">
         </view>
       </view>
-      <view class="on-input" @click="toSelectProject()" v-if="isInsert">
+      <view class="on-input" @click="toSelectProject()">
         <view class="o-left">检测流程</view>
         <view class="o-right">
-          <input type="textarea" v-model="inspectionWorkNodeStr" placeholder="点击选择检测流程">
+          <input type="textarea" disabled v-model="inspectionWorkNodeStr" placeholder="点击选择检测流程">
         </view>
       </view>
     </view>
@@ -129,8 +132,10 @@
 <script>
 import config from '@/config'
 import request from '../../utils/request';
+import headersVue from "@/components/header/headers.vue";
 
 export default {
+  components: {headersVue},
   data() {
     return {
       baseUrl: this.$baseUrl,
@@ -373,7 +378,7 @@ image {
 .sanniu {
   width: 105px;
   height: 35px;
-  background: #0D2E8D;
+  background: #0174F6;
   border-radius: 50px;
   display: flex;
   align-items: center;
@@ -388,7 +393,7 @@ image {
 .annniu {
   width: 90%;
   height: 45px;
-  background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
+  background: linear-gradient(180deg, #3F61C0 0%, #0174F6 100%);
   border-radius: 50px;
   display: flex;
   align-items: center;
@@ -462,7 +467,7 @@ image {
 .t-input {
   width: 90%;
   margin: 20px auto;
-  border: 1px solid #0D2E8D;
+  border: 1px solid #0174F6;
   border-radius: 6px;
   box-sizing: border-box;
   padding: 2px 5px;
diff --git a/pages/my/rwm.vue b/pages/my/rwm.vue
index eb42348..919aa40 100644
--- a/pages/my/rwm.vue
+++ b/pages/my/rwm.vue
@@ -96,6 +96,7 @@
 		},
 		onShow() {
 			this.getValidationlist()
+      this.tindex = 0
 		},
 		methods: {
 			ting(index){