From 48df29845f93656956aeb89fd6eb2193f5aa46df Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 12 Dec 2024 19:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/eacharts_nightpie.vue |  4 ++-
 pages/home/components/eacharts_pie.vue      |  4 ++-
 pages/inspection/questOrder.vue             | 37 ++++++++++++++++-----
 pages/submission/recordsdetails.vue         |  2 +-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/pages/home/components/eacharts_nightpie.vue b/pages/home/components/eacharts_nightpie.vue
index 8cb7f6e..5dab3ab 100644
--- a/pages/home/components/eacharts_nightpie.vue
+++ b/pages/home/components/eacharts_nightpie.vue
@@ -22,7 +22,9 @@ export default {
     },
     echartData: {
       type: Array,
-      default: []
+      default: function(){
+        return []
+      }
     }
   },
   watch: {
diff --git a/pages/home/components/eacharts_pie.vue b/pages/home/components/eacharts_pie.vue
index 12ddd80..a9710f4 100644
--- a/pages/home/components/eacharts_pie.vue
+++ b/pages/home/components/eacharts_pie.vue
@@ -22,7 +22,9 @@ export default {
     },
     echartData: {
       type: Array,
-      default: []
+       default: function(){
+        return []
+      }
     }
   },
   watch: {
diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue
index a97469b..031beba 100644
--- a/pages/inspection/questOrder.vue
+++ b/pages/inspection/questOrder.vue
@@ -237,7 +237,7 @@
         <view class="repair-btn" style="margin-right: 32rpx;width:100%"
             v-if="dataTypes == 4 && detailForm.taskStatus == 2 && detailsType == 'task'">
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
-            <u-button size="medium" type="primary" @click="submitQuest()">提交</u-button>
+            <u-button size="medium" type="primary" @click="openModel()">提交</u-button>
         </view>
         <!-- 客户  确认巡检任务是否完成提交 -->
         <view class="repair-btn" style="margin-right: 32rpx;width:100%"
@@ -268,6 +268,13 @@
         <u-calendar v-model="calendarShow" mode="date" @change="calendarChange" :min-date="minDate"
             :max-date="maxDate"></u-calendar>
 
+        <betone-modal v-model="taskCompleteShow" :title="'提示'" @confirm="taskCompleteShowFn"
+            @cancel="taskCompleteShow = false">
+            <view class="modal-text">
+                请确认是否巡检完成！
+            </view>
+        </betone-modal>
+
         <betone-loading ref="BetLoading" />
     </view>
 </template>
@@ -347,6 +354,7 @@ export default {
             },
             deviceNameSearch: '',//巡检任务  搜索设备名称
             deviceList: [],//记录设备总数
+            taskCompleteShow: false,
         }
     },
     onLoad(options) {
@@ -470,6 +478,16 @@ export default {
                 },
             });
         },
+        openModel() {
+            if (this.signUrl == '') {
+                uni.showToast({ title: "请填写使用人", icon: "none" });
+                return false
+            }
+            this.taskCompleteShow = true
+        },
+        taskCompleteShowFn() {
+            this.submitQuest()
+        },
         // 维修人员提交明细 
         submitQuest() {
             let newArr = this.handleData(this.deviceList)
@@ -481,10 +499,7 @@ export default {
                 uni.showToast({ title: "请选择设备状态", icon: "none" });
                 return false
             }
-            if (this.signUrl == '') {
-                uni.showToast({ title: "请填写使用人", icon: "none" });
-                return false
-            }
+
             let queryData = []
             newArr.forEach(item => {
                 queryData.push({
@@ -815,7 +830,7 @@ export default {
     width: 100%;
     padding: 0;
     padding-top: 26rpx;
-
+    padding-bottom: 160rpx;
     .info {
         margin: 0 24rpx 20rpx;
         border-radius: 20rpx;
@@ -831,8 +846,9 @@ export default {
             margin: 18rpx 0 0rpx 20rpx;
             font-weight: bold;
         }
-        .info_search{
-            padding:0 32rpx
+
+        .info_search {
+            padding: 0 32rpx
         }
 
         .info_item {
@@ -877,9 +893,12 @@ export default {
         /* 水平均匀分布 */
         margin-top: 32rpx;
         padding: 0 32rpx;
-
+        position: fixed;
+        bottom: 0;
+        background: #fff;
         /deep/.u-btn {
             width: 48%;
+            margin-top: 32rpx;
         }
     }
 
diff --git a/pages/submission/recordsdetails.vue b/pages/submission/recordsdetails.vue
index 9b64faf..7c8b076 100644
--- a/pages/submission/recordsdetails.vue
+++ b/pages/submission/recordsdetails.vue
@@ -139,7 +139,7 @@
 
 			</view>
 			<!-- 满意度查看 -->
-			<view class="repair_detail" v-if="detailForm.status == 8">
+			<view class="repair_detail" v-if="detailForm.status == 7||detailForm.status == 8||detailForm.status == 9">
 				<view class="repair_title">满意度</view>
 				<view v-for="(item, index) in questionList" :key="index" class="question-box">
 					<view class="title">{{ index + 1 }}.{{ item.title }}</view>