首页统计

刘淇
1 parent 2d57b60f
Showing 4 changed files with 290 additions and 212 deletions
pages-sub/daily/maintain-manage/add-record.vue
pages-sub/daily/maintain-manage/finish-plan-detail.vue
pages-sub/problem/regional-order-manage/list-detail.vue
pages/index/index.vue
@@ -4,14 +4,21 @@
       <up-form label-position="left" :model="inspectForm" ref="inspectFormRef" label-width="140rpx">
         <!-- ========== 动态表单区域 ========== -->
         <template v-for="item in dynamicFields" :key="item.fieldCode">
-          <up-form-item :label="item.fieldName" :prop="item.fieldCode" :required="item.required === 1" class="form-item"
-                        @click="openPickerIfNeeded(item)">
+          <up-form-item :label="item.fieldName" :prop="item.fieldCode" class="form-item" @click="openPickerIfNeeded(item)">
+
             <!-- type 1 数值：u-number-box，最多2位小数，min=0，max取item.length -->
             <view v-if="item.fieldType === 1" class="number-box-wrap">
-              <u-number-box v-model="inspectForm[item.fieldCode]" min="1" :step="1"
-                            :max="item.length ? 10 ** Number(item.length) - 1 : null"
-                            :placeholder="`请输入${item.fieldName}${item.unit} `" @change="valChange(item)" class="large-number-box">
-              </u-number-box>
+             <u-number-box 
+  v-model="inspectForm[item.fieldCode]" 
+  min="1" 
+  :step="1"
+  :max="item.length ? 10 ** Number(item.length) - 1 : null"
+  :placeholder="`请输入${item.fieldName}${item.unit} `" 
+  @change="valChange(item)"
+  @blur="valChange(item)"
+  class="large-number-box">
+</u-number-box>
+
               <text class="unit-text" v-if="item.unit">{{ item.unit }}</text>
             </view>
             <!-- type 2 文本 -->
@@ -132,10 +139,14 @@
       </up-form>
     </view>
     <!-- 底部提交按钮 -->
-    <view class="fixed-bottom-btn-wrap">
-      <up-button type="primary" text="提交" @click="submitInspect"
-                 style="width: 100%; height: 88rpx; font-size:32rpx; border-radius: 0;"></up-button>
-    </view>
+   <view v-if="dynamicFields.length === 0" class="empty-field-tip">
+  <text>请去平台配置业务类型字段</text>
+</view>
+<!-- ========== 底部提交按钮：只有存在动态字段才显示 ========== -->
+<view class="fixed-bottom-btn-wrap" v-if="dynamicFields.length > 0">
+<up-button type="primary" text="提交" @click="submitInspect"
+style="width: 100%; height: 88rpx; font-size:32rpx; border-radius: 0;"></up-button>
+</view>
     <!-- uview-plus 日期时间选择器（全局复用） -->
     <up-datetime-picker :show="datePickerShow" v-model="datePickerValue" mode="datetime" close-on-click-overlay
                         @confirm="onDateConfirm" @cancel="onDateClose" @close="onDateClose"></up-datetime-picker>
@@ -646,31 +657,51 @@ export default {
      * 7/8/9/11 的值是数组或对象，async-validator 的 required 按默认 string 类型判定，
      * 会放过「空数组」「null」⇒ 必须用 validator 显式判空，否则未选也能提交
      */
-    buildRequiredRule(field: any) {
-      const type = field.fieldType
-      if (type === 6 || type === 7 || type === 8) {
-        const action = type === 6 ? '请选择' : '请上传'
-        return {
-          required: true,
-          trigger: 'change',
-          validator: (rule, value, callback) => {
-            Array.isArray(value) && value.length > 0 ? callback() : callback(new Error(`${action}${field.fieldName}`))
-          }
-        }
+buildRequiredRule(field: any) {
+  const type = field.fieldType
+  if (type === 6 || type === 7 || type === 8) {
+    const action = type === 6 ? '请选择' : '请上传'
+    return {
+      required: true,
+      trigger: ['change','blur'],
+      validator: (rule, value, callback) => {
+        Array.isArray(value) && value.length > 0 ? callback() : callback(new Error(`${action}${field.fieldName}`))
       }
-      if (type === 9 || type === 11) {
-        return {
-          required: true,
-          trigger: 'change',
-          validator: (rule, value, callback) => {
-            value ? callback() : callback(new Error(type === 9 ? `请选择${field.fieldName}` : `请选择${field.fieldName}的位置`))
-          }
+    }
+  }
+  if (type === 9 || type === 11) {
+    return {
+      required: true,
+      trigger: ['change','blur'],
+      validator: (rule, value, callback) => {
+        value ? callback() : callback(new Error(type === 9 ? `请选择${field.fieldName}` : `请选择${field.fieldName}的位置`))
+      }
+    }
+  }
+  // ========= 新增：数值类型单独校验 =========
+  if (type === 1) {
+    return {
+      required: true,
+      trigger: ['change','blur'],
+      validator: (rule, value, callback) => {
+        // 空字符串、null、undefined 才是空；数字 1,7,100 全部合法
+        if (value === '' || value === null || value === undefined) {
+          callback(new Error(`请填写${field.fieldName}`))
+        } else {
+          callback()
         }
       }
-      // 1数值/2文本/4日期/5布尔/10链接 为字符串；3枚举/6单选为选择项
-      const action = type === 3 || type === 5 ? '请选择' : '请填写'
-      return { required: true, message: `${action}${field.fieldName}`, trigger: 'change' }
-    },
+    }
+  }
+  // 2文本 /4日期 /5布尔 /10链接
+  const action = type === 3 || type === 5 ? '请选择' : '请填写'
+  return { 
+    required: true, 
+    message: `${action}${field.fieldName}`, 
+    trigger: ['change','blur'] 
+  }
+},
+
     /** 幂等流水号（后端按 userId+clientSeq 去重，命中则返回已存在的 recordId） */
     genClientSeq() {
       return `${Date.now()}-${Math.random().toString(16).slice(2, 10)}`
@@ -910,6 +941,12 @@ this.$refs.inspectFormRef.validateField(code)
      * 重试安全：commitId 一旦取到就缓存住，重试只补写 ②（② 自身按 clientSeq 幂等），避免重复创建养护记录
      */
     async submitInspect() {
+      // 调试打印，打开小程序控制台查看
+  console.log('=====调试=====')
+  console.log('dynamicFields', this.dynamicFields)
+  this.dynamicFields.forEach(item=>{
+    console.log(item.fieldCode, this.inspectForm[item.fieldCode], typeof this.inspectForm[item.fieldCode])
+  })
       try {
         await this.$refs.inspectFormRef.validate()
         const dynamicValues = this.buildDynamicFields()
@@ -1068,4 +1105,13 @@ this.$refs.inspectFormRef.validateField(code)
     }
   }
 }
+
+.empty-field-tip {
+  padding: 80rpx 30rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #999;
+}
+
+
 </style>
@@ -95,7 +95,7 @@
               title="提交人"
               :value="i.userName || '--'"
               align="middle"
-              :border="false"
+             
           ></up-cell>
         </up-cell-group>
  
@@ -105,9 +105,12 @@
             :border="false"
             inset
             title=""
-            style="margin-top: 16rpx;"
+            
         >
-          <up-cell v-for="(f, fi) in i.fieldRows" :key="fi" :title="f.name" align="middle">
+          <up-cell v-for="(f, fi) in i.fieldRows" :key="fi"  align="middle">
+            <template #title>
+    <view class="field-cell-title-multi">{{f.name}}</view>
+  </template>
             <template #value>
               <!-- 7 图片：复用本页照片的相册组件（预览/尺寸一致） -->
               <up-album
@@ -616,4 +619,8 @@ onLoad((options) =&gt; {
   font-size: 26rpx;
   word-break: break-all;
 }
+:deep(.field-cell-title-multi) {
+  min-width: 160rpx; // 固定左侧标题最大宽度，文字会在这个宽度内自动换行
+}
+
 </style>
 \ No newline at end of file
@@ -96,8 +96,8 @@
                   <up-album
                     v-if="!!orderDetail.problemsImgs?.length"
                     :urls="orderDetail.problemsImgs.slice(0, 3)"
-                    :singleSize="70"
-                    :multipleSize="70"
+                    singleSize="70"
+                multipleSize="70"
                     :preview-full-image="true"
                   ></up-album>
                   <text v-else class="empty-text">暂无问题照片</text>
@@ -8,27 +8,25 @@
           <view class="login-desc">蓟城山水全域智能运营管理平台</view>
         </view>
       </view>
-      <view class="msg-icon" @click="handleMsgClick" hover-class="msg-icon--hover">
+      <!-- <view class="msg-icon" @click="handleMsgClick" hover-class="msg-icon--hover">
         <up-icon name="chat" color="#fff" size="24" />
         <view class="msg-badge">
-          <up-badge type="error" showZero="true" max="999" :value="msgCount"></up-badge>
+          <up-badge type="error" show-zero max="999" :value="msgCount"></up-badge>
         </view>
-      </view>
+      </view> -->
     </view>
-
     <view class="content-wrap">
       <!-- 图表区域 增加平滑动画容器 -->
       <view class="chart-wrap" v-show="showChartArea">
         <!-- 任务完成情况标题 -->
         <view class="module-title">任务完成情况</view>
-
         <!-- 任务完成情况卡片 -->
         <view class="task-chart-card">
           <view class="card-header">
             <view class="unit-tip">数字指标</view>
             <!-- ActionSheet 点击唤起 -->
             <view class="sort-trigger" @click="openActionSheet">
-              {{ sortLabel }}
+              <view class="sort-text">{{ sortLabel }}</view>
               <up-icon name="arrow-down" size="14" style="margin-left:4rpx;"></up-icon>
             </view>
             <!-- ActionSheet组件 -->
@@ -40,14 +38,11 @@
                 @popup-hide="handlePopupHide" />
             </view>
           </view>
-
-
           <!-- 双折线K线图 -->
           <!-- <view class="chart-container">
             <uni-charts v-if="!isDatePickerOpen" type="line" :data="klineChartData" :categories="klineCategories"
               :option="klineOption" :width="chartWidth" :height="chartHeight" />
           </view> -->
-
           <up-grid :border="false" col="4">
             <up-grid-item v-for="(baseListItem, baseListIndex) in baseList" :key="baseListIndex">
               <view class="grid-item-icon-box">
@@ -57,14 +52,30 @@
               </view>
             </up-grid-item>
           </up-grid>
-
         </view>
       </view>
-
       <view class="con-wrap">
-        <view class="con-title">养护任务 </view>
-
-        <!-- 手写Tab切换：胶囊分段样式 -->
+        <!-- ========= 一级大Tab【养护任务 / 巡检任务 / 工单】权限控制 ========= -->
+        <view class="main-tab-wrap">
+          <view
+            v-if="showMainTabYh"
+            class="main-tab-item"
+            :class="{active: mainTab === 'maintain'}"
+            @click="handleMainTabClick('maintain')"
+          >养护任务</view>
+          <view
+            v-if="showMainTabXj"
+            class="main-tab-item"
+            :class="{active: mainTab === 'inspect'}"
+            @click="handleMainTabClick('inspect')"
+          >巡检任务</view>
+          <view
+            class="main-tab-item"
+            :class="{active: mainTab === 'workorder'}"
+            @click="handleMainTabClick('workorder')"
+          >工单</view>
+        </view>
+        <!-- 手写Tab切换：胶囊分段样式（待办/已办）【原有样式完全保留不动】 -->
         <view class="custom-tab-wrap">
           <view class="tab-capsule" :class="{ active: currentTabValue === 0 }" @click="handleTabClick(0)">
             待办事项({{ todoTotal }})
@@ -73,38 +84,27 @@
             已办事项({{ doneTotal }})
           </view>
         </view>
-
-
-        <!-- 动态组信息文案 -->
-        <!-- <view class="tip-top" style="padding: 8px 0  0 70px;">
-          <text>{{ tipText }}</text>
-        </view> -->
-
         <!-- 顶部进度提示栏 -->
         <view v-if="showTipHeader" class="tip-header">
           <up-icon name="checkmark-circle" color="#00b42a" size="20"></up-icon>
           <text style="color: #1677ff;">今日组内：您已经完成{{ finishNum }}项，小组均值{{ avgNum }}项</text>
         </view>
-
-
-        <scroll-view class="task-list-container" scroll-y @scroll="onListScroll" @scrolltoupper="handleTouchTop"
-          enhanced>
+        <scroll-view class="task-list-container" scroll-y @scroll="onListScroll" @scrolltoupper="handleTouchTop" enhanced>
           <view v-if="taskList.length === 0" class="empty-box">
-            <up-empty />
+            <up-empty></up-empty>
           </view>
           <view class="task-item" v-for="(item, index) in taskList" :key="`${item.taskName}_${index}`"
             hover-class="task-item--hover" @click="handleTaskClick(item)">
             <view class="task-item__content">
               <view class="name-fixed-wrap">
-                <view class="task-item__name ">
+                <view class="task-item__name">
                   事项{{ index + 1 }}
                 </view>
                 <view class="task-name-text">
                   {{ item.taskName || '无' }}
                 </view>
               </view>
-
-              <view v-if="currentTabValue === 0" class="task-item__footer" style="padding-left:  60px;">
+              <view v-if="currentTabValue === 0" class="task-item__footer" style="padding-left:  60rpx;">
                 <image class="loc-icon" src="https://img.jichengshanshui.com.cn:28207/appimg/定位icon@3x.png"
                   mode="aspectFit"></image>
                 <template v-if="isWalkTextMode">
@@ -129,7 +129,7 @@ import { ref, computed, nextTick, watch } from &#39;vue&#39;;
 import { onShow, onUnload } from '@dcloudio/uni-app';
 import { useUserStore } from '@/pinia/user';
 import { timeFormat } from '@/uni_modules/uview-plus';
-import uniCharts from '@/components/uni-charts/uni-charts.vue';
+// import uniCharts from '@/components/uni-charts/uni-charts.vue';
 import { getUnreadCount } from "@/api/user";
 import {
   getTaskCompletionSummary,
@@ -189,6 +189,59 @@ const isWalkTextMode = computed(() =&gt; currentGroup.value.useWalkText);
 const useDistanceApi = computed(() => currentGroup.value.useWalkText);
 // =========================================================================
  
+// ========== 一级Tab：养护/巡检/工单 =========
+// 默认期望打开 maintain，watch权限自动修正
+const mainTab = ref<'maintain' | 'inspect' | 'workorder'>('maintain');
+
+// ✅ 修复：用户角色数组
+const userRoles = computed<string[]>(() => userStore.userInfo?.roles || []);
+console.log('当前用户角色数组：', userRoles.value)
+
+// 权限控制角色列表：包含这些角色，则隐藏对应tab
+const hideYhRoleList = ['patrol_leader', 'patrol_global', 'yl_inspector', 'hjws_inspector', 'zxgl_inspector'];
+const hideXjRoleList = ['zxgl_worker', 'team_leader_hjws', 'hjws_worker', 'team_leader_wy', 'wy_worker', 'yl_worker', 'team_leader_yl'];
+
+// ✅ 修复：用户角色数组 和 黑名单数组 存在交集 → 隐藏养护tab
+const showMainTabYh = computed(() => {
+  // 判断：用户角色里是否存在任意一个在hideYhRoleList中的角色
+  const hasHideRole = userRoles.value.some(role => hideYhRoleList.includes(role));
+  return !hasHideRole;
+});
+// ✅ 修复：巡检tab权限
+const showMainTabXj = computed(() => {
+  const hasHideRole = userRoles.value.some(role => hideXjRoleList.includes(role));
+  return !hasHideRole;
+});
+
+// 获取可见tab数组，用于自动选中
+const availableTabList = computed(() => {
+  const list: Array<'maintain' | 'inspect' | 'workorder'> = [];
+  if (showMainTabYh.value) list.push('maintain');
+  if (showMainTabXj.value) list.push('inspect');
+  list.push('workorder');
+  return list;
+});
+
+// 监听权限变化：如果当前选中tab不可见，自动切到第一个可用tab
+watch([showMainTabYh, showMainTabXj], () => {
+  const available = availableTabList.value;
+  console.log('可用tab列表', available);
+  if (!available.includes(mainTab.value)) {
+    mainTab.value = available[0];
+    console.log(`当前角色无【养护任务】权限，自动切换至：${mainTab.value}`)
+  }
+}, { immediate: true });
+
+// 一级Tab切换事件
+const handleMainTabClick = async (tabKey: 'maintain' | 'inspect' | 'workorder') => {
+  if (mainTab.value === tabKey) return;
+  mainTab.value = tabKey;
+  currentTabValue.value = 0; // 切大tab默认回到待办
+  showChartArea.value = true;
+  // 重新拉取对应类型任务
+  await loadAllTaskByDept();
+};
+
 const finishNum = ref(0);
 const avgNum = ref(0);
 const msgCount = ref(0);
@@ -205,7 +258,6 @@ const handlePopupShow = () =&gt; {
 const handlePopupHide = () => {
   isDatePickerOpen.value = false;
 };
-
 const todoTotal = ref(0);
 const doneTotal = ref(0);
 const todoFullList = ref<any[]>([]);
@@ -217,7 +269,6 @@ const chooseOptions = computed(() =&gt; [
   { title: `待办事项(${todoTotal.value})`, id: 'todo' },
   { title: `已办事项(${doneTotal.value})`, id: 'done' },
 ]);
-
 const currentLon = ref<string>('');
 const currentLat = ref<string>('');
 const chartWidth = ref(0);
@@ -264,12 +315,10 @@ ${params[1].seriesName}: ${params[1].value}`;
     textStyle: { fontSize: 12 }
   }
 });
-
-const baseList = ref<Array<{ num: string; title: string }>>([]);
+const baseList = ref<Array<{ num: string; title: string; name: string }>>([]);
 const orgOptions = ref<any[]>([]);
 const value1 = ref<number | string>('');
 const showActionSheet = ref(false);
-
 watch(orgOptions, async (list) => {
   if (list.length && !value1.value) {
     value1.value = list[0].value;
@@ -279,7 +328,6 @@ watch(orgOptions, async (list) =&gt; {
     }
   }
 }, { immediate: true });
-
 const actionSheetOptions = computed(() => {
   return orgOptions.value.map(opt => ({
     name: opt.label,
@@ -302,13 +350,11 @@ const handleSheetSelect = async (item: { name: string; value: number }) =&gt; {
     await fetchOrgIndicator(item.value, dateRange.value[0], dateRange.value[1]);
   }
 };
-
-const userName = computed(() => userStore.userInfo?.nickname || '用户');
+const userName = computed(() => userStore.userInfo.user.nickname || '用户');
 const rpx2px = (rpx: number) => {
   const systemInfo = uni.getSystemInfoSync();
   return Math.floor(systemInfo.screenWidth / 750 * rpx);
 };
-
 // ========== 滚动逻辑 ==========
 const showChartArea = ref(true);
 const scrollHideThreshold = rpx2px(80);
@@ -336,7 +382,6 @@ const handleTabClick = (tabIndex: number) =&gt; {
   currentTabValue.value = tabIndex;
   showChartArea.value = true;
 };
-
 // ========== 公共函数：请求 orgTaskIndicator 指标接口 ==========
 const fetchOrgIndicator = async (orgId: number, beginDate: string, endDate: string) => {
   try {
@@ -355,19 +400,16 @@ const fetchOrgIndicator = async (orgId: number, beginDate: string, endDate: stri
       { num: String(res.pendingCnt ?? 0), title: '待办任务数', name: 'clock' },
       { num: String(res.overdueCnt ?? 0), title: '超时未完成', name: 'close-circle' }
     ];
-
   } catch (err) {
     console.error('orgTaskIndicator 请求失败：', err);
   }
 };
-
 // ========== 初始化日期范围（近7天） ==========
 const initRecent7Days = () => {
   const now = new Date();
   const end = new Date(now);
-  end.setDate(end.getDate() - 1);
+  end.setDate(end.getDate());
   const start = new Date(end);
-  console.log(start)
   start.setDate(start.getDate() - 6);
   dateRange.value = [
     timeFormat(start, 'yyyy-mm-dd'),
@@ -376,7 +418,6 @@ const initRecent7Days = () =&gt; {
   console.log(dateRange.value)
   initChartData(dateRange.value[0], dateRange.value[1]);
 };
-
 const getUnread = async () => {
   try {
     const res = await getUnreadCount();
@@ -385,7 +426,6 @@ const getUnread = async () =&gt; {
     console.error('获取未读消息失败:', error);
   }
 };
-
 // getOrg：只拉组织下拉选项，不处理指标
 const getOrg = async () => {
   try {
@@ -396,7 +436,6 @@ const getOrg = async () =&gt; {
     console.error('获取组织下拉失败:', error);
   }
 };
-
 const initChartData = async (beginTime: string, endTime: string) => {
   try {
     const postData = { beginTime, endTime };
@@ -408,11 +447,10 @@ const initChartData = async (beginTime: string, endTime: string) =&gt; {
     console.error('图表数据请求失败:', error);
   }
 };
-
-const loadDistanceApiTask = async (lon: string, lat: string) => {
+const loadDistanceApiTask = async (lon: string, lat: string, taskType: string) => {
   try {
-    const paramsTodo = { queryType: 1, currentLon: lon, currentLat: lat };
-    const paramsDone = { queryType: 2, currentLon: lon, currentLat: lat };
+    const paramsTodo = { queryType: 1, currentLon: lon, currentLat: lat, taskType };
+    const paramsDone = { queryType: 2, currentLon: lon, currentLat: lat, taskType };
     const [todoRes, doneRes] = await Promise.all([
       taskDetailsWithDistance(paramsTodo),
       taskDetailsWithDistance(paramsDone)
@@ -433,11 +471,11 @@ const loadDistanceApiTask = async (lon: string, lat: string) =&gt; {
     doneTotal.value = 0;
   }
 };
-const loadSmartSortTask = async (lon: string, lat: string) => {
+const loadSmartSortTask = async (lon: string, lat: string, taskType: string) => {
   try {
     const [todoRes, doneRes] = await Promise.all([
-      taskDetailsWithSmartSort({ queryType: 1, currentLon: lon, currentLat: lat }),
-      taskDetailsWithSmartSort({ queryType: 2, currentLon: lon, currentLat: lat })
+      taskDetailsWithSmartSort({ queryType: 1, currentLon: lon, currentLat: lat, taskType }),
+      taskDetailsWithSmartSort({ queryType: 2, currentLon: lon, currentLat: lat, taskType })
     ]);
     todoFullList.value = todoRes?.sortedTasks || [];
     doneFullList.value = doneRes?.sortedTasks || [];
@@ -459,22 +497,27 @@ const loadAllTaskByDept = async () =&gt; {
   const loc = await getCurrentLocation();
   currentLon.value = loc.lon;
   currentLat.value = loc.lat;
-  if (useDistanceApi.value) {
-    await loadDistanceApiTask(loc.lon, loc.lat);
-  } else {
-    await loadSmartSortTask(loc.lon, loc.lat);
-  }
-};
-
-// 日期确认回调：更新图表 + 重新请求指标orgTaskIndicator
-const handleDateConfirm = async (e: string[]) => {
-  dateRange.value = e;
-  await initChartData(e[0], e[1]);
-  if (value1.value) {
-    await fetchOrgIndicator(Number(value1.value), e[0], e[1]);
+  // 根据一级Tab选择不同接口
+  if (mainTab.value === 'maintain') {
+    if (useDistanceApi.value) {
+      await loadDistanceApiTask(loc.lon, loc.lat, 'maintain');
+    } else {
+      await loadSmartSortTask(loc.lon, loc.lat, 'maintain');
+    }
+  } else if (mainTab.value === 'inspect') {
+    if (useDistanceApi.value) {
+      await loadDistanceApiTask(loc.lon, loc.lat, 'inspect');
+    } else {
+      await loadSmartSortTask(loc.lon, loc.lat, 'inspect');
+    }
+  } else if (mainTab.value === 'workorder') {
+    // ========= 工单tab，后续对接工单接口，先置空列表占位 =========
+    todoFullList.value = [];
+    doneFullList.value = [];
+    todoTotal.value = 0;
+    doneTotal.value = 0;
   }
 };
-
 const getCurrentLocation = (): Promise<{ lon: string; lat: string }> => {
   return new Promise((resolve, reject) => {
     uni.getSetting({
@@ -533,7 +576,6 @@ const getCurrentLocation = (): Promise&lt;{ lon: string; lat: string }&gt; =&gt; {
     });
   });
 };
-
 const handleMsgClick = () => {
   uni.navigateTo({ url: '/pages-sub/msg/msg' });
 };
@@ -561,39 +603,34 @@ const handleTaskClick = (item: any) =&gt; {
     }
   }
 };
-
 onShow(async () => {
   showChartArea.value = true;
   chartWidth.value = rpx2px(750 - 60);
   chartHeight.value = rpx2px(300);
   initRecent7Days();
-  getUnread();
+  // getUnread();
   await getOrg(); // 拉取组织下拉列表
   await loadAllTaskByDept();
 });
-
 onUnload(() => {
   if (scrollTimer) clearTimeout(scrollTimer);
 });
 </script>
  
-
-
 <style scoped lang="scss">
 $primary-color: #1677ff;
 $danger-color: #E53935;
 $text-color: #333;
 $text-color-light: #666;
-$text-color-placeholder: #999;
+$text-placeholder: #999;
 $bg-color: #f5f5f7;
 $card-bg: #fff;
-$border-radius: 16px;
-$card-radius: 5px;
-$spacing-sm: 5px;
-$spacing-md: 10px;
-$spacing-lg: 15px;
+$border-radius: 16rpx;
+$card-radius: 5rpx;
+$spacing-sm: 5rpx;
+$spacing-md: 10rpx;
+$spacing-lg: 15rpx;
 $border-color: #e5e5e5;
-
 .page-container {
   height: 100vh;
   background-color: $bg-color;
@@ -601,128 +638,134 @@ $border-color: #e5e5e5;
   display: flex;
   flex-direction: column;
 }
-
 .user-info-bar {
   flex-shrink: 0;
   background: url("https://img.jichengshanshui.com.cn:28207/appimg/bg.jpg") no-repeat;
   background-size: 100% 100%;
-  padding: 80px $spacing-lg 135px;
+  padding: 140rpx $spacing-lg 165rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
   color: #fff;
-
   .username {
-    font-size: 16px;
-    margin-bottom: 4px;
+    font-size: 32rpx;
+    margin-bottom: 4rpx;
   }
-
   .login-desc {
-    font-size: 16px;
+    font-size: 28rpx;
   }
-
   .msg-icon {
     position: relative;
-    padding: 5px;
-    top: 10px;
+    padding: 5rpx;
+    top: 10rpx;
     border-radius: 50%;
-
     &--hover {
       background-color: rgba(255, 255, 255, 0.2);
     }
-
     .msg-badge {
       position: absolute;
-      top: -2px;
-      right: -3px;
+      top: -2rpx;
+      right: -3rpx;
     }
   }
 }
-
 .content-wrap {
   flex: 1;
-  margin-top: -122px;
+  margin-top: -122rpx;
   border-radius: $border-radius $border-radius 0 0;
   background-color: $bg-color;
   overflow: hidden;
   display: flex;
   flex-direction: column;
 }
-
 .chart-wrap {
   flex-shrink: 0;
   transition: all 0.35s ease-out;
   opacity: 1;
   overflow: hidden;
+  &[hidden] {
+    opacity: 0;
+    height: 0;
+    margin: 0;
+  }
 }
-
-.chart-wrap[hidden] {
-  opacity: 0;
-  height: 0;
-  margin: 0;
-}
-
 .module-title {
   padding: $spacing-lg;
-  font-size: 14px;
+  font-size: 28rpx;
   font-weight: 600;
   color: $text-color-light;
   flex-shrink: 0;
 }
-
 .task-chart-card {
   background-color: $card-bg;
   border-radius: $card-radius;
   margin: 0 $spacing-lg $spacing-md;
   padding: $spacing-md;
   flex-shrink: 0;
-
   .card-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-size: 12px;
-    color: $text-color-placeholder;
+    font-size: 24rpx;
+    color: $text-placeholder;
     margin-bottom: $spacing-md;
-
     .date-picker-wrap {
-      border-radius: 3px;
+      border-radius: 3rpx;
       transition: background-color 0.2s;
       position: relative;
       z-index: 999;
-
       &:active {
         background-color: $bg-color;
       }
     }
   }
-
   .chart-container {
     width: 100%;
-    height: 150px;
+    height: 150rpx;
     display: flex;
     align-items: center;
     justify-content: center;
   }
 }
-
 .con-wrap {
-  border-radius: 8px;
+  border-radius: 8rpx;
   background-color: #fff;
-  margin: 0 15px;
+  margin: 0 15rpx;
   flex: 1;
   min-height: 0;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
-
-.con-title {
-  padding: 10px 15px;
-  border-bottom: 1px solid #f0e9e9;
-  flex-shrink: 0;
+// ========= 【仅一级Tab：养护/巡检/工单】下划线样式，其余全部保留原有css =========
+.main-tab-wrap {
+  display: flex;
+  align-items: center;
+  background: #fff;
+  padding: 0 30rpx;
 }
-
+.main-tab-item {
+  padding: 24rpx 16rpx;
+  font-size: 30rpx;
+  color: #666;
+  position: relative;
+  transition: color 0.24s;
+  &.active {
+    color: #1677ff;
+    font-weight: 500;
+    &::after {
+      content: '';
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 100%;
+      height: 4rpx;
+      background-color: #1677ff;
+      border-radius: 2rpx;
+    }
+  }
+}
+// 待办/已办胶囊tab【原样保留你原来的样式，完全没改动！！】
 .custom-tab-wrap {
   display: flex;
   align-items: center;
@@ -731,88 +774,76 @@ $border-color: #e5e5e5;
   background: #fff;
   flex-shrink: 0;
 }
-
 .tab-capsule {
   padding: 10rpx 20rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
   font-size: 28rpx;
   color: #999;
   background: #f5f5f5;
   border-radius: 0;
   transition: all 0.2s ease;
   font-weight: 500;
+  &.active {
+    color: #d4af37;
+    background: #fff8dc;
+  }
 }
-
-.tab-capsule.active {
-  color: #d4af37;
-  background: #fff8dc;
-}
-
 .tip-header {
   display: flex;
   align-items: center;
   gap: 8rpx;
   padding: 12rpx 15rpx;
   background: #e6f7ff;
-  font-size: 14px;
+  font-size: 28rpx;
   color: #000;
   flex-shrink: 0;
 }
-
 .tip-top {
-  padding: 8px 0 0 70px;
+  padding: 8rpx 0 0 70rpx;
   flex-shrink: 0;
 }
-
 .task-list-container {
   width: 100%;
   height: 100%;
   padding-bottom: 300rpx;
   box-sizing: border-box;
 }
-
 .empty-box {
   padding: 60rpx 0;
 }
-
 .sort-trigger {
   display: flex;
   align-items: center;
-  font-size: 12px;
-  color: $text-color-placeholder;
+  font-size: 24rpx;
+  color: $text-placeholder;
+  .sort-text {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 220rpx;
+  }
 }
-
-
 .task-item {
   padding: $spacing-md;
   transition: background-color 0.2s;
-  border-bottom: 1px solid $border-color;
-
+  border-bottom: 1rpx solid $border-color;
   &:last-child {
     border-bottom: none;
   }
-
   &--hover {
     background-color: $bg-color;
   }
-
   &__content {
     width: 100%;
   }
-
   .name-fixed-wrap {
     display: flex;
   }
-
   .task-item__name {
-    width: 60px;
+    width: 80rpx;
   }
-
   .task-name-text {
     flex: 1;
-    font-size: 14px;
+    font-size: 24rpx;
     color: $text-color;
     display: -webkit-box;
     -webkit-line-clamp: 2;
@@ -820,49 +851,43 @@ $border-color: #e5e5e5;
     overflow: hidden;
     text-overflow: ellipsis;
   }
-
   &__name {
-    font-size: 15px;
+    font-size: 24rpx;
     color: $text-color;
     display: inline-block;
   }
-
   &__footer {
     display: flex;
     align-items: flex-start;
     gap: 6rpx;
-    font-size: 13px;
+    font-size: 24rpx;
     color: $text-color-light;
     margin-top: $spacing-sm;
     align-items: center;
   }
 }
-
 .loc-icon {
-  width: 20px;
-  height: 20px;
+  width: 28rpx;
+  height: 28rpx;
 }
-
 .urgency-tag {
   color: #7D7D7D;
 }
-
 .grid-item-icon-box {
-  display:flex;
-  flex-direction:column;
-  align-items:center;
-  padding:16rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 16rpx;
 }
 .grid-num-icon {
-  font-size:40rpx;
-  font-weight:600;
-  color:#333;
-  margin-top:8rpx;
+  font-size: 40rpx;
+  font-weight: 600;
+  color: #333;
+  margin-top: 8rpx;
 }
 .grid-label-icon {
-  font-size:22rpx;
-  color:#666;
-  margin-top:4rpx;
+  font-size: 22rpx;
+  color: #666;
+  margin-top: 4rpx;
 }
-
-</style>
 \ No newline at end of file
+</style>