wuhb hai 2 meses
pai
achega
6935167e3d

+ 6 - 1
pages/index/index.uvue

@@ -144,7 +144,8 @@
 </template>
 </template>
 
 
 <script setup lang="uts">
 <script setup lang="uts">
-    import { ref, onMounted, reactive, onLoad, onShow, nextTick } from 'vue'
+    import { ref, onMounted, reactive, nextTick } from 'vue';
+    import { onLoad, onShow } from '@dcloudio/uni-app';
     import { getUserInfo,checkPermi } from '../../utils/storage'
     import { getUserInfo,checkPermi } from '../../utils/storage'
     import FlowChart from '../../components/index/flow-chart/flow-chart.uvue'
     import FlowChart from '../../components/index/flow-chart/flow-chart.uvue'
     import { getOrderList, almostOverdueList, overdueList, pendingList } from '../../api/order/list'
     import { getOrderList, almostOverdueList, overdueList, pendingList } from '../../api/order/list'
@@ -154,7 +155,9 @@
 	// import {startKeepAlive,stopKeepAlive} from '@/uni_modules/ygtx-keepService'
 	// import {startKeepAlive,stopKeepAlive} from '@/uni_modules/ygtx-keepService'
 	// import { RequestOption } from '@/uni_modules/ygtx-keepService/utssdk/interface.uts';
 	// import { RequestOption } from '@/uni_modules/ygtx-keepService/utssdk/interface.uts';
 	import { getBaseUrl } from '../../utils/request'
 	import { getBaseUrl } from '../../utils/request'
+	// #ifndef WEB
 	import { KeepLive } from '@/uni_modules/android-keeplive'
 	import { KeepLive } from '@/uni_modules/android-keeplive'
+	// #endif
 	import { getMyNotify, registerServer} from '../../api/index/index'
 	import { getMyNotify, registerServer} from '../../api/index/index'
 	// const handleStartKeepAlive = (userId: string) => {
 	// const handleStartKeepAlive = (userId: string) => {
 	// 	let notifyUrl = getBaseUrl() + "/mobile/notify";
 	// 	let notifyUrl = getBaseUrl() + "/mobile/notify";
@@ -698,7 +701,9 @@
 			const userId = userInfo['userId']?.toString()
 			const userId = userInfo['userId']?.toString()
 			if(userId!=null){
 			if(userId!=null){
 				console.log("监听:"+userId)
 				console.log("监听:"+userId)
+				// #ifndef WEB
 				handleKeepAlive()
 				handleKeepAlive()
+				// #endif
 				registerPush();
 				registerPush();
 			}
 			}
         }
         }

+ 1 - 1
pages/order/detail/restartIndex.uvue

@@ -46,7 +46,7 @@
 								    class="input-field"
 								    class="input-field"
 								    placeholder="请选择恢复运行时间"
 								    placeholder="请选择恢复运行时间"
 								    v-model="restartTime"
 								    v-model="restartTime"
-									:disabled="true"
+									type="none"
 								/>
 								/>
 						    </view>
 						    </view>
 						</view>
 						</view>

+ 2 - 1
pages/score/detail/reEvaluate.uvue

@@ -212,7 +212,8 @@
 </template>
 </template>
 
 
 <script setup lang="uts">
 <script setup lang="uts">
-import { ref, computed, onLoad } from 'vue'
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
 import { getOrderScoreDetail, submitReEvaluation, getMaintenanceTypes, listInspectionTypesByFanType } from '@/api/score/index'
 import { getOrderScoreDetail, submitReEvaluation, getMaintenanceTypes, listInspectionTypesByFanType } from '@/api/score/index'
 import { getDictDataByType } from '@/api/dict/index'
 import { getDictDataByType } from '@/api/dict/index'
 import type { SysDictData } from '@/types/dict'
 import type { SysDictData } from '@/types/dict'

+ 2 - 1
pages/score/detail/selfEvaluate.uvue

@@ -221,7 +221,8 @@
 </template>
 </template>
 
 
 <script setup lang="uts">
 <script setup lang="uts">
-import { ref, onMounted, onLoad, onUnload } from 'vue'
+import { ref, onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
 import { getOrderScoreDetail, submitSelfEvaluation, getMaintenanceTypes, listInspectionTypesByFanType } from '@/api/score/index'
 import { getOrderScoreDetail, submitSelfEvaluation, getMaintenanceTypes, listInspectionTypesByFanType } from '@/api/score/index'
 import { getDictDataByType } from '@/api/dict/index'
 import { getDictDataByType } from '@/api/dict/index'
 import type { UserInfo } from '@/types/user'
 import type { UserInfo } from '@/types/user'

+ 2 - 1
pages/score/index.uvue

@@ -277,7 +277,8 @@
 </template>
 </template>
 
 
 <script setup lang="uts">
 <script setup lang="uts">
-    import { ref, computed, onMounted, onBeforeUnmount, onShow, reactive } from 'vue'
+    import { ref, computed, onMounted, onBeforeUnmount, reactive } from 'vue'
+	import { onShow, onLoad } from '@dcloudio/uni-app';
     import { listOrderScores, getOrderScoreStatistics, listMobileOrderScores } from '@/api/score/index'
     import { listOrderScores, getOrderScoreStatistics, listMobileOrderScores } from '@/api/score/index'
     import { getDictDataByType } from '@/api/dict/index'
     import { getDictDataByType } from '@/api/dict/index'
     import { selectHomePageData } from '@/api/index/index'
     import { selectHomePageData } from '@/api/index/index'