From 90444aef03f4ca6daa066204cf0cac639bf875b9 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 28 Nov 2024 11:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/alarm.vue     |  9 ++++++++-
 pages/home/components/eacharts.vue  |  6 ++++++
 pages/home/components/swiper.vue    |  9 +++++++++
 pages/home/index.vue                |  7 ++++---
 pages/inspection/quest.vue          | 18 +++++++++++++++---
 pages/submission/records.vue        |  2 +-
 pages/submission/recordsdetails.vue |  8 ++++----
 7 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/pages/home/components/alarm.vue b/pages/home/components/alarm.vue
index 327451e..4719f44 100644
--- a/pages/home/components/alarm.vue
+++ b/pages/home/components/alarm.vue
@@ -1,5 +1,6 @@
 <template>
-  <view>
+  <view v-if="list.length>0">
+    <view class="work-title">设备报警</view>
     <view v-for="(item, index) in list" :key="index" class="alarm-box">
       <view class="alarm-left" :style="{ borderColor: item.color }">
         <i>{{ item.alarmName }}</i>
@@ -55,6 +56,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.work-title {
+  color: rgba(16, 16, 16, 1);
+  font-size: 32rpx;
+  padding: 0 0 32rpx 36rpx;
+}
+
 .alarm-box {
   margin: 0 40rpx 32rpx;
   background-color: #ffffff;
diff --git a/pages/home/components/eacharts.vue b/pages/home/components/eacharts.vue
index 587f2b2..e1c1579 100644
--- a/pages/home/components/eacharts.vue
+++ b/pages/home/components/eacharts.vue
@@ -72,6 +72,12 @@ export default {
         startTime: this.form.startTime,
         endTime: this.form.endTime,
       }
+      // if(this.form.startTime!=''){
+      //   query_.startTime=this.form.startTime
+      // }
+      // if(this.form.endTime!=''){
+      //   query_.endTime=this.form.endTime
+      // }
       this.$u.api.upkeepStat(query_).then(res => {
         if (res.code == 200) {
           this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
diff --git a/pages/home/components/swiper.vue b/pages/home/components/swiper.vue
index 0cda1be..08196f1 100644
--- a/pages/home/components/swiper.vue
+++ b/pages/home/components/swiper.vue
@@ -1,5 +1,8 @@
 <template>
+  <view v-if="list.length>0">
+    <view class="work-title">实验室巡检</view>
   <view class="notice_bg">
+    
     <view class="line"></view>
     <swiper
       autoplay="true"
@@ -24,6 +27,7 @@
       </swiper-item>
     </swiper>
   </view>
+  </view>
 </template>
 <script>
 export default {
@@ -54,6 +58,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.work-title {
+  color: rgba(16, 16, 16, 1);
+  font-size: 32rpx;
+  padding: 0 0 32rpx 36rpx;
+}
 .notice_bg {
   margin: 0 40rpx 32rpx;
   background-color: #ffffff;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5f40543..0c4f9d7 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -4,7 +4,8 @@
       <view class="banner-swiper" v-if="swiperList.length > 0">
         <view class="logo-txt">科研医疗建筑运维平台</view>
         <!-- <u-icon class="logo-scan" style="padding-right:12rpx" @click="scanCode" size="45" name="scan"></u-icon> -->
-        <u-swiper height="444" :list="swiperList" mode="none"></u-swiper>
+        <!-- <u-swiper height="444" :list="swiperList" mode="none"></u-swiper> -->
+         <image :src="swiperList[0]" style="padding-right:12rpx;height:444rpx"></image>
       </view>
       <view class="work-title">工作台</view>
       <view class="workbench">
@@ -18,11 +19,11 @@
           <view class="workbench-name">{{ item.name }}</view>
         </view>
       </view>
-      <view class="work-title">实验室巡检</view>
+      
       <view>
         <swiperSlider></swiperSlider>
       </view>
-      <view class="work-title">设备报警</view>
+      <!-- <view class="work-title">设备报警</view> -->
       <view>
         <alarm></alarm>
       </view>
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index d06af63..23f9974 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -13,7 +13,7 @@
             <u-tabs v-if="subsectionCurrent == '0'" :list="tabList" :is-scroll="true" :current="current"
                 @change="changeTab"></u-tabs>
             <u-tabs v-if="subsectionCurrent == '1'" :list="tasktabList" :is-scroll="true" :current="current"
-                @change="changeTab"></u-tabs>
+                @change="subsectionChangeTab"></u-tabs>
         </view>
         <view class="order-box">
             <view class="order-item" v-for="(item, index) in orderData" :key="index">
@@ -124,6 +124,7 @@ export default {
                 requirementCode: "",
                 type: '',//状态
                 reportUnit: '',//提报单位
+                statusSearch:'',//巡检任务状态
             },
             userInfo: {},//用户信息
             rowInfo: {},//选中行数据
@@ -229,8 +230,10 @@ export default {
             }
             let res = {}
             if (this.subsectionCurrent == '0') {
+                query.statusSearch = this.searchInfo.statusSearch
                 res = await this.$u.api.getTaskPage(query)
             } else {
+                query.statusSearch = this.searchInfo.statusSearch
                 res = await this.$u.api.getRepairPage(query)
             }
             if (res.code == 200) {
@@ -265,10 +268,18 @@ export default {
             this.page.currentPage = 1;
             this.getRecordsList()
         },
-        // tab切换
+        // 巡检任务 tab切换
         changeTab(index) {
             this.current = index;
-            this.searchInfo.type = this.tabList[index].key == '9999' ? '' : this.tabList[index].key
+            this.searchInfo.statusSearch = this.tabList[index].key == '9999' ? '' : this.tabList[index].key
+            this.isNomore = false
+            this.page.currentPage = 1;
+            this.getRecordsList()
+        },
+        // 巡检维修  tab切换
+        subsectionChangeTab(index){
+            this.current = index;
+            this.searchInfo.statusSearch = this.tasktabList[index].key == '9999' ? '' : this.tasktabList[index].key
             this.isNomore = false
             this.page.currentPage = 1;
             this.getRecordsList()
@@ -296,6 +307,7 @@ export default {
         },
         subsectionChange(e) {
             this.subsectionCurrent = e;
+            this.searchInfo.statusSearch=''
             this.getRecordsList()
         },
         // 指派
diff --git a/pages/submission/records.vue b/pages/submission/records.vue
index 2f4b28c..5b0d435 100644
--- a/pages/submission/records.vue
+++ b/pages/submission/records.vue
@@ -41,7 +41,7 @@ export default {
           key: "6",
         },
         {
-          name: "代付款",
+          name: "待付款",
           key: "7",
         },
         {
diff --git a/pages/submission/recordsdetails.vue b/pages/submission/recordsdetails.vue
index f3b7375..4f68b43 100644
--- a/pages/submission/recordsdetails.vue
+++ b/pages/submission/recordsdetails.vue
@@ -117,7 +117,7 @@
 				</view>
 			</view>
 			<!--  主管审批 审批详情 -->
-			<view class="repair_detail" v-if="detailForm.approveResult >= 0">
+			<!-- <view class="repair_detail" v-if="detailForm.approveResult >= 0">
 				<view class="repair_title">主管审批</view>
 				<view class="detail_item">
 					<text class="item_left_txt">审批结果：</text>
@@ -127,9 +127,9 @@
 					<text class="item_left_txt">审批意见：</text>
 					<text class="item_right_txt">{{ detailForm.approveRemark }}</text>
 				</view>
-			</view>
+			</view> -->
 			<!-- 客户审批 审批详情 -->
-			<view class="repair_detail" v-if="detailForm.approveResult >= 0">
+			<!-- <view class="repair_detail" v-if="detailForm.approveResult >= 0">
 				<view class="repair_title">客户审批</view>
 				<view class="detail_item">
 					<text class="item_left_txt">审批结果：</text>
@@ -139,7 +139,7 @@
 					<text class="item_left_txt">审批意见：</text>
 					<text class="item_right_txt">{{ detailForm.approveRemark }}</text>
 				</view>
-			</view>
+			</view> -->
 			<view class="repair_detail" v-if="detailForm.status != -1">
 				<view class="repair_title">其他信息</view>
 				<view class="detail_item">