Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-mobile

src/api/schedule/task.ts

@@ -0,0 +1,21 @@
+import { http } from '@/http/http'
+
+enum Api {
+  base = '/scheduleTasks/tasks',
+}
+
+export function transferTask(data: any) {
+  return http.put(`${Api.base}/forward`, data, {
+    successMessageMode: 'message',
+  })
+}
+// 关闭任务
+export function closeTask(data: any) {
+  return http.put(`${Api.base}/cancel`, data, {
+    successMessageMode: 'message',
+  })
+}
+
+export function getTaskDetail(id: number) {
+  return http.get(`${Api.base}/${id}`)
+}

src/pages/schedule/details/index.vue

@@ -2,50 +2,82 @@
   <view class="details-box">
     <!-- 标题区域 -->
     <view class="details-box-title">
-      <view class="details-box-title-text">巡站日检 AI</view>
+      <view class="details-box-title-text">
+        巡站日检 AI
+      </view>
     </view>
 
     <!-- 标签区域 -->
     <view class="tags-box">
-      <view class="tag tag-mandatory">必做</view>
-      <view class="tag tag-authorize">可授权</view>
-      <view class="tag tag-time">按时完成</view>
+      <view class="tag tag-mandatory">
+        必做
+      </view>
+      <view class="tag tag-authorize">
+        可授权
+      </view>
+      <view class="tag tag-time">
+        按时完成
+      </view>
     </view>
 
     <!-- 任务描述 -->
     <view class="section">
-      <view class="section-title">任务描述</view>
+      <view class="section-title">
+        任务描述
+      </view>
       <view class="task-description">
-        <view class="task-item">1、每日到站第一事，巡视油站；</view>
-        <view class="task-item">2、了解人、财、物情况；</view>
-        <view class="task-item"
-          >3、可随手解决当场解决，其他后续跟进，直到解决；</view
-        >
-        <view class="task-item"
-          >4、检查标识识：AI的不需要人为判断异常，默认正常即可。</view
-        >
+        <view class="task-item">
+          1、每日到站第一事，巡视油站；
+        </view>
+        <view class="task-item">
+          2、了解人、财、物情况；
+        </view>
+        <view class="task-item">
+          3、可随手解决当场解决，其他后续跟进，直到解决；
+        </view>
+        <view class="task-item">
+          4、检查标识识：AI的不需要人为判断异常，默认正常即可。
+        </view>
       </view>
     </view>
 
     <!-- 标准指引 -->
     <view class="section">
-      <view class="section-title">标准指引</view>
+      <view class="section-title">
+        标准指引
+      </view>
       <view class="standard-guide">
         <view class="guide-item">
-          <view class="guide-label">执行人</view>
-          <view class="guide-value">李玫玮（站长）</view>
+          <view class="guide-label">
+            执行人
+          </view>
+          <view class="guide-value">
+            李玫玮（站长）
+          </view>
         </view>
         <view class="guide-item">
-          <view class="guide-label">计划时间</view>
-          <view class="guide-value">12月5日</view>
+          <view class="guide-label">
+            计划时间
+          </view>
+          <view class="guide-value">
+            12月5日
+          </view>
         </view>
         <view class="guide-item">
-          <view class="guide-label">任务时间</view>
-          <view class="guide-value">12月5日 00:00-12月5日 18:00</view>
+          <view class="guide-label">
+            任务时间
+          </view>
+          <view class="guide-value">
+            12月5日 00:00-12月5日 18:00
+          </view>
         </view>
         <view class="guide-item">
-          <view class="guide-label">完成时间</view>
-          <view class="guide-value">12月5日</view>
+          <view class="guide-label">
+            完成时间
+          </view>
+          <view class="guide-value">
+            12月5日
+          </view>
         </view>
       </view>
     </view>
@@ -57,19 +89,25 @@
         class="arrow"
         :name="isExpanded ? 'arrow-up' : 'arrow-down'"
         size="20px"
-      ></wd-icon>
+      />
     </view>
 
     <!-- 更多内容（默认隐藏） -->
-    <view class="more-content" v-if="isExpanded">
+    <view v-if="isExpanded" class="more-content">
       <view class="section">
-        <view class="section-title">注意事项</view>
+        <view class="section-title">
+          注意事项
+        </view>
         <view class="notice-content">
-          <view class="notice-item"
-            >• 巡视过程中请注意安全，佩戴好防护装备</view
-          >
-          <view class="notice-item">• 发现异常情况请及时记录并上报</view>
-          <view class="notice-item">• 确保所有检查项目都已完成并签字确认</view>
+          <view class="notice-item">
+            • 巡视过程中请注意安全，佩戴好防护装备
+          </view>
+          <view class="notice-item">
+            • 发现异常情况请及时记录并上报
+          </view>
+          <view class="notice-item">
+            • 确保所有检查项目都已完成并签字确认
+          </view>
         </view>
       </view>
     </view>
@@ -85,9 +123,12 @@
     </view>
   </view>
 </template>
+
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
+
+import { getTaskDetail } from '@/api/schedule/task'
 
 // 定义页面配置，注册路由
 definePage({
@@ -98,28 +139,43 @@ definePage({
 const isExpanded = ref(false)
 const router = useRouter()
 
+const route = useRoute()
+const taskId = ref(Number(route.params.id))
+
 // 切换更多内容显示/隐藏
-const toggleMore = () => {
+function toggleMore() {
   isExpanded.value = !isExpanded.value
 }
 
 // 查看详情按钮点击事件
-const viewDetails1 = () => {
+function viewDetails1() {
   uni.navigateTo({
     url: '/pages/schedule/details/taskmanagement/index1',
   })
 }
 // 查看详情按钮点击事件2
-const viewDetails2 = () => {
+function viewDetails2() {
   uni.navigateTo({
     url: '/pages/schedule/details/taskmanagement/index2',
   })
 }
-const viewDetails3 = () => {
+function viewDetails3() {
   uni.navigateTo({
     url: '/pages/schedule/details/taskdetails/index',
   })
 }
+
+async function init() {
+  const res = await getTaskDetail(taskId.value)
+  taskInfo.value = res
+  if (!taskInfo.value.status) {
+    taskInfo.value.status = 0
+  }
+}
+
+onMounted(async () => {
+  await init()
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/schedule/view/components/day/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 // @ts-ignore
-import { ref, computed, defineEmits, onMounted, defineProps, watch } from 'vue'
-const emit = defineEmits(['handletabs'])
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+
 const props = defineProps({
   overduedaylist: {
     type: Array,
@@ -16,7 +16,8 @@ const props = defineProps({
     default: '',
   },
 })
-//props.selectedDate:Thu Jan 29 2026 18:47:27 GMT+0800 (中国标准时间)
+const emit = defineEmits(['handletabs'])
+// props.selectedDate:Thu Jan 29 2026 18:47:27 GMT+0800 (中国标准时间)
 // console.log(props.selectedDate)
 // console.log(new Date(props.selectedDate))
 watch(
@@ -25,7 +26,7 @@ watch(
     if (newVal) {
       console.log(newVal)
     }
-  }
+  },
 )
 
 const tab = ref<string>('全部')
@@ -67,7 +68,7 @@ const overduelist = computed(() => {
         const currentDate = new Date(
           now.getFullYear(),
           now.getMonth(),
-          now.getDate()
+          now.getDate(),
         )
 
         // 解析任务截止日期
@@ -75,13 +76,14 @@ const overduelist = computed(() => {
         const deadlineDate = new Date(
           taskDate.getFullYear(),
           taskDate.getMonth(),
-          taskDate.getDate()
+          taskDate.getDate(),
         )
 
         // 计算天数差（毫秒转天数）
         const timeDiff = currentDate.getTime() - deadlineDate.getTime()
         overduedays = Math.ceil(timeDiff / (1000 * 3600 * 24))
-      } catch (error) {
+      }
+      catch (error) {
         console.error('日期解析错误:', error)
         overduedays = 0
       }
@@ -95,7 +97,8 @@ const overduelist = computed(() => {
 
 // 今日任务
 const todaylist = computed(() => {
-  if (!props.selectedDate || props.todoaskslist.length === 0) return []
+  if (!props.selectedDate || props.todoaskslist.length === 0)
+    return []
   // 解析选中日期，处理不同格式
   let selected: Date
   try {
@@ -106,15 +109,18 @@ const todaylist = computed(() => {
         // @ts-ignore
         const [year, month, day] = props.selectedDate.split('-').map(Number)
         selected = new Date(year, month - 1, day)
-      } else {
+      }
+      else {
         // 其他字符串格式，直接转换
         selected = new Date(props.selectedDate)
       }
-    } else {
+    }
+    else {
       // 已经是 Date 对象
       selected = new Date(props.selectedDate)
     }
-  } catch (error) {
+  }
+  catch (error) {
     console.error('选中日期解析错误:', error)
     selected = new Date() // 失败时使用当前日期
   }
@@ -125,16 +131,18 @@ const todaylist = computed(() => {
 
   return props.todoaskslist
     .filter((item: any) => {
-      if (!item.displayDate) return false
+      if (!item.displayDate)
+        return false
       try {
         const taskDate = new Date(item.displayDate)
         return (
-          taskDate.getFullYear() === selectedYear &&
-          taskDate.getMonth() === selectedMonth &&
-          taskDate.getDate() === selectedDay &&
-          item.isOverdue !== '1' // 排除逾期任务
+          taskDate.getFullYear() === selectedYear
+          && taskDate.getMonth() === selectedMonth
+          && taskDate.getDate() === selectedDay
+          && item.isOverdue !== '1' // 排除逾期任务
         )
-      } catch (error) {
+      }
+      catch (error) {
         console.error('任务日期解析错误:', error)
         return false
       }
@@ -149,7 +157,7 @@ const todaylist = computed(() => {
           // 计算剩余时间（毫秒转天、小时、分钟）
           const days = Math.floor(timeDiff / (1000 * 3600 * 24))
           const hours = Math.floor(
-            (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600)
+            (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
           )
           const minutes = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60))
 
@@ -179,24 +187,29 @@ const todaylist = computed(() => {
             remainingTime.dayobj.day += `还剩${days}天截止`
             remainingTime.dayobj.topbackcolor = '#86909C'
             remainingTime.dayobj.mainbackcolor = '#F1F1F1'
-          } else if (days > 0) {
+          }
+          else if (days > 0) {
             remainingTime.dayobj.day += `还剩${days}天截止`
             if (days >= 30) {
               remainingTime.dayobj.topbackcolor = '#86909C'
               remainingTime.dayobj.mainbackcolor = '#F1F1F1'
-            } else {
+            }
+            else {
               remainingTime.dayobj.topbackcolor = '#215ACD'
               remainingTime.dayobj.mainbackcolor = '#E4EDFF'
             }
-          } else if (hours > 0) {
+          }
+          else if (hours > 0) {
             remainingTime.hours.hour += `还剩${hours}小时截止`
             remainingTime.hours.topbackcolor = '#FF9428'
             remainingTime.hours.mainbackcolor = '#FFEAD6'
-          } else if (minutes > 0) {
+          }
+          else if (minutes > 0) {
             remainingTime.minutes.minute += `还剩${minutes}分钟截止`
             remainingTime.minutes.topbackcolor = '#FF9428'
             remainingTime.minutes.mainbackcolor = '#FFEAD6'
-          } else {
+          }
+          else {
             remainingTime.default.topbackcolor = '#339169'
             remainingTime.default.mainbackcolor = '#D6EFE6'
           }
@@ -205,7 +218,8 @@ const todaylist = computed(() => {
             remainingTime,
             timeDiff,
           }
-        } catch (error) {
+        }
+        catch (error) {
           console.error('日期解析错误:', error)
           return {
             ...item,
@@ -221,7 +235,8 @@ const todaylist = computed(() => {
 
 // 明日任务列表
 const tomorrowlist = computed(() => {
-  if (!props.selectedDate || props.todoaskslist.length === 0) return []
+  if (!props.selectedDate || props.todoaskslist.length === 0)
+    return []
 
   // 解析选中日期，处理不同格式
   let selected: Date
@@ -233,15 +248,18 @@ const tomorrowlist = computed(() => {
         // @ts-ignore
         const [year, month, day] = props.selectedDate.split('-').map(Number)
         selected = new Date(year, month - 1, day)
-      } else {
+      }
+      else {
         // 其他字符串格式，直接转换
         selected = new Date(props.selectedDate)
       }
-    } else {
+    }
+    else {
       // 已经是 Date 对象
       selected = new Date(props.selectedDate)
     }
-  } catch (error) {
+  }
+  catch (error) {
     console.error('选中日期解析错误:', error)
     selected = new Date() // 失败时使用当前日期
   }
@@ -256,16 +274,18 @@ const tomorrowlist = computed(() => {
 
   return props.todoaskslist
     .filter((item: any) => {
-      if (!item.displayDate) return false
+      if (!item.displayDate)
+        return false
       try {
         const taskDate = new Date(item.displayDate)
         return (
-          taskDate.getFullYear() === tomorrowYear &&
-          taskDate.getMonth() === tomorrowMonth &&
-          taskDate.getDate() === tomorrowDay &&
-          item.isOverdue !== '1' // 排除逾期任务
+          taskDate.getFullYear() === tomorrowYear
+          && taskDate.getMonth() === tomorrowMonth
+          && taskDate.getDate() === tomorrowDay
+          && item.isOverdue !== '1' // 排除逾期任务
         )
-      } catch (error) {
+      }
+      catch (error) {
         console.error('任务日期解析错误:', error)
         return false
       }
@@ -280,7 +300,7 @@ const tomorrowlist = computed(() => {
           // 计算剩余时间（毫秒转天、小时、分钟）
           const days = Math.floor(timeDiff / (1000 * 3600 * 24))
           const hours = Math.floor(
-            (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600)
+            (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
           )
           const minutes = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60))
 
@@ -311,19 +331,23 @@ const tomorrowlist = computed(() => {
             if (days >= 30) {
               remainingTime.dayobj.topbackcolor = '#86909C'
               remainingTime.dayobj.mainbackcolor = '#F1F1F1'
-            } else {
+            }
+            else {
               remainingTime.dayobj.topbackcolor = '#215ACD'
               remainingTime.dayobj.mainbackcolor = '#E4EDFF'
             }
-          } else if (hours > 0) {
+          }
+          else if (hours > 0) {
             remainingTime.hours.hour += `还剩${hours}小时截止`
             remainingTime.hours.topbackcolor = '#FF9428'
             remainingTime.hours.mainbackcolor = '#FFEAD6'
-          } else if (minutes > 0) {
+          }
+          else if (minutes > 0) {
             remainingTime.minutes.minute += `还剩${minutes}分钟截止`
             remainingTime.minutes.topbackcolor = '#FF9428'
             remainingTime.minutes.mainbackcolor = '#FFEAD6'
-          } else {
+          }
+          else {
             remainingTime.default.topbackcolor = '#339169'
             remainingTime.default.mainbackcolor = '#D6EFE6'
           }
@@ -332,7 +356,8 @@ const tomorrowlist = computed(() => {
             remainingTime,
             timeDiff,
           }
-        } catch (error) {
+        }
+        catch (error) {
           console.error('日期解析错误:', error)
           return {
             ...item,
@@ -356,27 +381,28 @@ const filList = computed(() => {
 })
 
 // 跳转到任务详情页
-const goTaskDetail = (taskId: number) => {
+function goTaskDetail(taskId: number) {
   uni.navigateTo({
     url: `/pages/schedule/details/index?id=${taskId}`,
   })
 }
-const handleClick = (item: string) => {
+function handleClick(item: string) {
   tab.value = item
   emit('handletabs', tab.value)
 }
 </script>
+
 <template>
   <view class="box-day">
     <view class="tab">
       <view
         v-for="item in tabs"
         :key="item"
-        :class="['tab-item', { 'tab-item-active': tab === item }]"
+        class="tab-item" :class="[{ 'tab-item-active': tab === item }]"
         @click="handleClick(item)"
       >
         {{ item }}
-        <view class="tab-item-line" v-if="tab === item" />
+        <view v-if="tab === item" class="tab-item-line" />
       </view>
     </view>
     <view
@@ -392,7 +418,9 @@ const handleClick = (item: string) => {
     >
       <!-- 已逾期 -->
       <view>
-        <view class="title">已逾期（{{ filList['已逾期'].length }}）</view>
+        <view class="title">
+          已逾期（{{ filList['已逾期'].length }}）
+        </view>
         <view
           v-for="task in filList['已逾期']"
           :key="task.id"
@@ -419,19 +447,23 @@ const handleClick = (item: string) => {
                     : authStatusMap[task?.authStatus || 'null']?.name
                 }}
               </view>
-              <view class="list_dev_right_bottom" style="color: #d85e3e">{{
-                task.overduedays
-              }}</view>
+              <view class="list_dev_right_bottom" style="color: #d85e3e">
+                {{
+                  task.overduedays
+                }}
+              </view>
             </view>
           </view>
         </view>
-        <view v-if="filList['已逾期'].length === 0" class="no-data"
-          >暂无数据</view
-        >
+        <view v-if="filList['已逾期'].length === 0" class="no-data">
+          暂无数据
+        </view>
       </view>
       <!-- 今日 -->
       <view>
-        <view class="title">今日（{{ filList['今日'].length }}）</view>
+        <view class="title">
+          今日（{{ filList['今日'].length }}）
+        </view>
         <view
           v-for="task in filList['今日']"
           :key="task.id"
@@ -497,13 +529,15 @@ const handleClick = (item: string) => {
             </view>
           </view>
         </view>
-        <view v-if="filList['今日'].length === 0" class="no-data"
-          >暂无数据</view
-        >
+        <view v-if="filList['今日'].length === 0" class="no-data">
+          暂无数据
+        </view>
       </view>
       <!-- 明日 -->
       <view>
-        <view class="title">明日（{{ filList['明日'].length }}）</view>
+        <view class="title">
+          明日（{{ filList['明日'].length }}）
+        </view>
         <view
           v-for="task in filList['明日']"
           :key="task.id"
@@ -569,9 +603,9 @@ const handleClick = (item: string) => {
             </view>
           </view>
         </view>
-        <view v-if="filList['明日'].length === 0" class="no-data"
-          >暂无数据</view
-        >
+        <view v-if="filList['明日'].length === 0" class="no-data">
+          暂无数据
+        </view>
       </view>
       <view
         style="
@@ -580,11 +614,13 @@ const handleClick = (item: string) => {
           font-weight: 400;
           margin: 0 auto;
         "
-        >- 加载完毕 -</view
       >
+        - 加载完毕 -
+      </view>
     </view>
   </view>
 </template>
+
 <style lang="scss" scoped>
 .box-day {
   padding-left: 8px;

tsconfig.json

@@ -7,7 +7,7 @@
     ],
     "baseUrl": ".",
     "module": "esnext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "paths": {
       "@/*": [
         "./src/*"