Merge branch 'equipManage' into dev

src/api/home-new/home-new.js

@@ -139,3 +139,12 @@ export function getPushMessage(query) {
     params: query
   })
 }
+
+//查询设备台账列表全量
+export function getDeviceList(query) {
+  return request({
+    url: '/equipment/ledger/notice',
+    method: 'get',
+    params: query
+  })
+}

src/pages.json

@@ -321,6 +321,12 @@
       }
     },
     {
+      "path": "pages/selfCheck/index",
+      "style": {
+        "navigationBarTitleText": "定/自检"
+      }
+    },
+    {
       "path": "pages/seizeStatistics/index",
       "style": {
         "navigationBarTitleText": "查获统计"

src/pages/home-new/components/selfCheck.vue

@@ -0,0 +1,263 @@
+<template>
+    <view class="self-check-container">
+        <view class="self-check-header">
+            <text class="header-title">定/自检</text>
+            <text class="view-all" @click="goToSelfCheckPage('all')">查看全部</text>
+        </view>
+
+        <view class="self-check-content">
+            <!-- 已过期定检提醒 -->
+            <view class="check-section" v-if="expiredItems.length > 0">
+                <view class="section-header">
+                    <text class="section-title">已过期定检提醒</text>
+                    <text class="view-more" @click="goToSelfCheckPage('expired')">查看更多</text>
+                </view>
+                <view class="check-item" v-for="(item, index) in expiredItems" :key="index">
+                    <view class="item-indicator expired"></view>
+                    <view class="item-content">
+                        <view class="item-row">
+                            <text class="item-label">{{ item.name }}</text>
+                            <text class="item-label">{{ item.serialNumber }}</text>
+                            <text class="item-date">{{ item.date }}</text>
+                        </view>
+                        <view class="item-row">
+                            <text class="item-label">{{ item.location }}</text>
+                            <text class="item-role">{{ item.role }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 两周内到期提醒 -->
+            <view class="check-section" v-if="twoWeeksItems.length > 0">
+                <view class="section-header">
+                    <text class="section-title">两周内到期提醒</text>
+                    <text class="view-more" @click="goToSelfCheckPage('twoWeeks')">查看更多</text>
+                </view>
+                <view class="check-item" v-for="(item, index) in twoWeeksItems" :key="index">
+                    <view class="item-indicator urgent"></view>
+                    <view class="item-content">
+                        <view class="item-row">
+                            <text class="item-label">{{ item.name }}</text>
+                            <text class="item-label">{{ item.serialNumber }}</text>
+                            <text class="item-date">{{ item.date }}</text>
+                        </view>
+                        <view class="item-row">
+                            <text class="item-label">{{ item.location }}</text>
+                            <text class="item-role">{{ item.role }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 一月内检到期提醒 -->
+            <view class="check-section" v-if="oneMonthItems.length > 0">
+                <view class="section-header">
+                    <text class="section-title">一月内检到期提醒</text>
+                    <text class="view-more" @click="goToSelfCheckPage('oneMonth')">查看更多</text>
+                </view>
+                <view class="check-item" v-for="(item, index) in oneMonthItems" :key="index">
+                    <view class="item-indicator normal"></view>
+                    <view class="item-content">
+                        <view class="item-row">
+                            <text class="item-label">{{ item.name }}</text>
+                            <text class="item-label">{{ item.serialNumber }}</text>
+                            <text class="item-date">{{ item.date }}</text>
+                        </view>
+                        <view class="item-row">
+                            <text class="item-label">{{ item.location }}</text>
+                            <text class="item-role">{{ item.role }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { getDeviceList } from "@/api/home-new/home-new";
+
+export default {
+    name: 'SelfCheck',
+    data() {
+        return {
+            // 已过期定检数据
+            expiredItems: [],
+            // 两周内到期数据
+            twoWeeksItems: [],
+            // 一月内到期数据
+            oneMonthItems: []
+        }
+    },
+    mounted() {
+        this.fetchDeviceList();
+    },
+    methods: {
+        goToSelfCheckPage(tab) {
+            uni.navigateTo({
+                url: `/pages/selfCheck/index?tab=${tab}`
+            });
+        },
+        fetchDeviceList() {
+            // 分别请求三种颜色的数据
+            Promise.all([
+                getDeviceList({ colorType: 'RED' }),      // 已过期 - 红色
+                getDeviceList({ colorType: 'ORANGE' }),   // 两周内到期 - 橙色
+                getDeviceList({ colorType: 'YELLOW' })     // 一月内到期 - 黄色
+            ]).then(results => {
+                // 处理红色数据（已过期）
+                if (results[0].code === 200) {
+                    this.expiredItems = (results[0].data || []).slice(0, 2).map(item => this.formatDeviceItem(item));
+                }
+                // 处理橙色数据（两周内到期）
+                if (results[1].code === 200) {
+                    this.twoWeeksItems = (results[1].data || []).slice(0, 2).map(item => this.formatDeviceItem(item));
+                }
+                // 处理黄色数据（一月内到期）
+                if (results[2].code === 200) {
+                    this.oneMonthItems = (results[2].data || []).slice(0, 2).map(item => this.formatDeviceItem(item));
+                }
+            }).catch(err => {
+                console.error('获取设备列表失败', err);
+            });
+        },
+        formatDeviceItem(item) {
+            return {
+                name: item.equipmentName || '空',
+                serialNumber: item.equipmentCode || '空',
+                location: item.installationLocation || '空',
+                role:`${item.inspectionTeamLeaderName || ''}、${item.inspectionTeamMember1Name || ''}、${item.inspectionTeamMember2Name || ''}`|| '空',
+                date: this.formatDate(item.nextInspectionDueDate)|| '空'
+            };
+        },
+        formatDate(dateStr) {
+            if (!dateStr) return '';
+            const date = new Date(dateStr);
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        }
+    }
+}
+</script>
+
+<style scoped>
+.self-check-container {
+    width: 100%;
+    padding: 12px;
+    background-color: #f5f7fa;
+}
+
+.self-check-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+}
+
+.header-title {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+}
+
+.view-all {
+    font-size: 14px;
+    color: #409eff;
+}
+
+.self-check-content {
+    background-color: #fff;
+    border-radius: 12px;
+    padding: 12px;
+}
+
+.check-section {
+    margin-bottom: 16px;
+}
+
+.check-section:last-child {
+    margin-bottom: 0;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+}
+
+.section-title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+}
+
+.view-more {
+    font-size: 14px;
+    color: #409eff;
+}
+
+.check-item {
+    display: flex;
+    align-items: flex-start;
+    padding: 10px 0;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.check-item:last-child {
+    border-bottom: none;
+}
+
+.item-indicator {
+    width: 6px;
+    border-radius: 3px;
+    margin-right: 10px;
+    flex-shrink: 0;
+}
+
+.item-indicator.expired {
+    background-color: #FF0000;
+    height: 48px;
+}
+
+.item-indicator.urgent {
+    background-color: #FFA500;
+    height: 48px;
+}
+
+.item-indicator.normal {
+    background-color: #FFD700;
+    height: 48px;
+}
+
+.item-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+}
+
+.item-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.item-label {
+    font-size: 14px;
+    color: #333;
+}
+
+.item-date {
+    font-size: 14px;
+    color: #333;
+}
+
+.item-role {
+    font-size: 14px;
+    color: #333;
+}
+</style>

src/pages/home-new/index.vue

@@ -35,41 +35,47 @@
             <Notice ref="notice" />
             <MessagePush ref="messagePush" />
 
-            <!-- 时间范围选择 -->
-            <div class="time-range-section">
-                <div class="time-tags-container">
-                    <div v-for="tag in timeTags" :key="tag.value"
-                        :class="['time-tag', { 'active': selectedTimeRange === tag.value, 'time-range-label': tag.isLabel }]"
-                        @click="tag.isLabel ? null : handleTimeTagClick(tag)">
-                        {{ tag.label }}
-                    </div>
-
-                    <!-- 自定义时间显示 - 紧跟自定义时间标签 -->
-                    <div v-if="selectedTimeRange === 'custom'" class="custom-time-inline">
-                        <uni-datetime-picker v-model="dateRange" type="daterange" rangeSeparator="至"
-                            @change="handleDateRangeChange" class="date-range-picker" :clear-icon="false" />
-                        <div class="days-count">共 {{ totalDays }} 天</div>
+            <!-- 当 currentDepartment === '设备维修中心' 时显示 SelfCheck 组件 -->
+            <SelfCheck v-if="this.userInfo.includes('设备维修中心')" />
+
+            <!-- 当 currentDepartment !== '设备维修中心' 时显示原内容 -->
+            <template v-else>
+                <!-- 时间范围选择 -->
+                <div class="time-range-section">
+                    <div class="time-tags-container">
+                        <div v-for="tag in timeTags" :key="tag.value"
+                            :class="['time-tag', { 'active': selectedTimeRange === tag.value, 'time-range-label': tag.isLabel }]"
+                            @click="tag.isLabel ? null : handleTimeTagClick(tag)">
+                            {{ tag.label }}
+                        </div>
+
+                        <!-- 自定义时间显示 - 紧跟自定义时间标签 -->
+                        <div v-if="selectedTimeRange === 'custom'" class="custom-time-inline">
+                            <uni-datetime-picker v-model="dateRange" type="daterange" rangeSeparator="至"
+                                @change="handleDateRangeChange" class="date-range-picker" :clear-icon="false" />
+                            <div class="days-count">共 {{ totalDays }} 天</div>
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            <!-- TypeDetail组件 -->
-            <TypeDetail :data-list="typeDetailData" @sort-change="handleSortChange" />
+                <!-- TypeDetail组件 -->
+                <TypeDetail :data-list="typeDetailData" @sort-change="handleSortChange" />
 
-            <!-- TotalDetail组件 -->
-            <TotalDetail :homePageWholeData="homePageWholeData" :start-date="startDate" :end-date="endDate"
-                :time-range="selectedTimeRange" :selectedRole="selectedRole" />
+                <!-- TotalDetail组件 -->
+                <TotalDetail :homePageWholeData="homePageWholeData" :start-date="startDate" :end-date="endDate"
+                    :time-range="selectedTimeRange" :selectedRole="selectedRole" />
 
 
-            <!-- QualityControlAnalysis组件 -->
-            <QualityControlAnalysis v-if="role.includes('zhijianke') || role.includes('test')"
-                :checkProblemDistributionData="checkProblemDistributionData"
-                :accuracyAnalysisData="accuracyAnalysisData" :prohibitedTop3Data="prohibitedTop3Data"
-                :concealmentPositionTop1Data="concealmentPositionTop1Data" />
+                <!-- QualityControlAnalysis组件 -->
+                <QualityControlAnalysis v-if="role.includes('zhijianke') || role.includes('test')"
+                    :checkProblemDistributionData="checkProblemDistributionData"
+                    :accuracyAnalysisData="accuracyAnalysisData" :prohibitedTop3Data="prohibitedTop3Data"
+                    :concealmentPositionTop1Data="concealmentPositionTop1Data" />
 
-            <!-- PerformanceAnalysis组件 -->
-            <PerformanceAnalysis v-if="role.includes('zhijianke') || role.includes('test')"
-                :performanceData="performanceData" />
+                <!-- PerformanceAnalysis组件 -->
+                <PerformanceAnalysis v-if="role.includes('zhijianke') || role.includes('test')"
+                    :performanceData="performanceData" />
+            </template>
         </div>
     </view>
 </template>
@@ -86,6 +92,7 @@ import Notice from "@/pages/home/components/notice.vue";
 import SelectTag from "@/components/select-tag/select-tag.vue";
 import TypeDetail from "@/pages/home-new/components/type-detail.vue";
 import TotalDetail from "@/pages/home-new/components/total-detail.vue";
+import SelfCheck from "@/pages/home-new/components/selfCheck.vue";
 import { getUserProfile, getAppListByRoleId, getAppList } from "@/api/system/user";
 import { getAttendanceList } from "@/api/attendance/attendance"
 import { getUnreadCount } from "@/api/check/checkTask"
@@ -104,6 +111,7 @@ export default {
         SelectTag,
         TypeDetail,
         TotalDetail,
+        SelfCheck,
         QualityControlAnalysis,
         PerformanceAnalysis,
         uniDatetimePicker,
@@ -111,6 +119,7 @@ export default {
     },
     data() {
         return {
+            currentDepartment: '设备维修中心', // 用于控制显示不同内容的变量
             checkerId: this.$store.state.user.id,
             userInfo: '',
             todayCheckInTime: '未打卡',

src/pages/selfCheck/index.vue

@@ -0,0 +1,288 @@
+<template>
+    <home-container :customStyle="{ background: 'none',padding: '0' }" >
+        <view class="self-check-page">
+            <!-- 标签页区域 -->
+            <view class="tabs-section">
+                <view v-for="(tab, index) in tabs" :key="index"
+                    :class="['tab-item', { 'active': currentTab === tab.value }]"
+                    @click="switchTab(tab.value)">
+                    <text class="tab-text">{{ tab.label }}</text>
+                </view>
+            </view>
+
+            <!-- 卡片列表区域 -->
+            <view class="cards-section">
+                <view class="check-card" v-for="(item, index) in filteredItems" :key="index">
+                    <view class="card-content">
+                        <view class="card-row">
+                            <text class="card-label">{{ item.name }}</text>
+                            <text class="card-label">{{ item.serialNumber }}</text>
+                            <text class="card-date">{{ item.date }}</text>
+                        </view>
+                        <view class="card-row" style="justify-content: flex-start;">
+                            <text class="card-label">{{ item.location }}</text>
+                            <text class="card-role" style="margin-left: 10px;">{{ item.role }}</text>
+                        </view>
+                    </view>
+                    <view :class="['status-tag', getStatusClass(item.colorType)]">
+                        {{ getStatusText(item.colorType) }}
+                    </view>
+                </view>
+            </view>
+        </view>
+    </home-container>
+</template>
+
+<script>
+import HomeContainer from "@/components/HomeContainer.vue";
+import { getDeviceList } from "@/api/home-new/home-new";
+
+export default {
+    name: 'SelfCheckPage',
+    components: {
+        HomeContainer
+    },
+    data() {
+        return {
+            currentTab: 'all',
+            tabs: [
+                { label: '全部', value: 'all' },
+                { label: '两周临期', value: 'twoWeeks' },
+                { label: '一月临期', value: 'oneMonth' },
+                { label: '已过期', value: 'expired' }
+            ],
+            allItems: [],
+            redItems: [],
+            orangeItems: [],
+            yellowItems: []
+        }
+    },
+    onLoad(options) {
+        // 接收跳转参数
+        if (options && options.tab) {
+            this.currentTab = options.tab;
+        }
+        this.fetchDeviceList();
+    },
+    computed: {
+        filteredItems() {
+            switch(this.currentTab) {
+                case 'all':
+                    return this.allItems;
+                case 'expired':
+                    return this.redItems;
+                case 'twoWeeks':
+                    return this.orangeItems;
+                case 'oneMonth':
+                    return this.yellowItems;
+                default:
+                    return [];
+            }
+        }
+    },
+    methods: {
+        switchTab(tabValue) {
+            this.currentTab = tabValue;
+            this.fetchDeviceList();
+        },
+        getStatusClass(colorType) {
+            switch(colorType) {
+                case 'RED':
+                    return 'expired';
+                case 'ORANGE':
+                    return 'urgent';
+                case 'YELLOW':
+                    return 'normal';
+                default:
+                    return '';
+            }
+        },
+        getStatusText(colorType) {
+            switch(colorType) {
+                case 'RED':
+                    return '已过期';
+                case 'ORANGE':
+                    return '两周临期';
+                case 'YELLOW':
+                    return '一月临期';
+                default:
+                    return '';
+            }
+        },
+        fetchDeviceList() {
+            // 根据当前 tab 请求不同的接口
+            let colorType = '';
+            switch(this.currentTab) {
+                case 'all':
+                    colorType = 'MIXED';
+                    break;
+                case 'expired':
+                    colorType = 'RED';
+                    break;
+                case 'twoWeeks':
+                    colorType = 'ORANGE';
+                    break;
+                case 'oneMonth':
+                    colorType = 'YELLOW';
+                    break;
+            }
+            
+            getDeviceList({ colorType }).then(res => {
+                if (res.code === 200) {
+                    const data = res.data || [];
+                    switch(this.currentTab) {
+                        case 'all':
+                            this.allItems = data.map(item => this.formatDeviceItem(item));
+                            break;
+                        case 'expired':
+                            this.redItems = data.map(item => this.formatDeviceItem(item));
+                            break;
+                        case 'twoWeeks':
+                            this.orangeItems = data.map(item => this.formatDeviceItem(item));
+                            break;
+                        case 'oneMonth':
+                            this.yellowItems = data.map(item => this.formatDeviceItem(item));
+                            break;
+                    }
+                }
+            }).catch(err => {
+                console.error('获取设备列表失败', err);
+            });
+        },
+        formatDeviceItem(item) {
+            return {
+                name: item.equipmentName || '空',
+                serialNumber: item.equipmentCode || '空',
+                location: item.installationLocation || '空',
+                role: `${item.inspectionTeamLeaderName || ''}、${item.inspectionTeamMember1Name || ''}、${item.inspectionTeamMember2Name || ''}` || '空',
+                date: this.formatDate(item.nextInspectionDueDate) || '空',
+                colorType: item.colorType || 'YELLOW'
+            };
+        },
+        formatDate(dateStr) {
+            if (!dateStr) return '';
+            const date = new Date(dateStr);
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        }
+    }
+}
+</script>
+
+<style scoped>
+.self-check-page {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #fff;
+}
+
+.tabs-section {
+    display: flex;
+    padding: 10px;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.tab-item {
+    margin-right: 20px;
+    padding: 5px 0;
+    position: relative;
+}
+
+.tab-item:last-child {
+    margin-right: 0;
+}
+
+.tab-text {
+    font-size: 16px;
+    color: #999;
+}
+
+.tab-item.active .tab-text {
+    color: #409eff;
+    font-weight: bold;
+}
+
+.tab-item.active::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 3px;
+    background-color: #409eff;
+}
+
+.cards-section {
+    padding: 10px;
+}
+
+.check-card {
+    background-color: #fff;
+    border-radius: 10px;
+    padding: 12px;
+    margin-bottom: 12px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.card-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.card-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.card-label {
+    font-size: 14px;
+    color: #333;
+}
+
+.card-date {
+    font-size: 14px;
+    color: #333;
+}
+
+.card-role {
+    font-size: 14px;
+    color: #333;
+}
+
+.status-tag {
+    padding: 4px 12px;
+    border-radius:10px 0  10px 0;
+    font-size: 14px;
+    font-weight: bold;
+    margin: -12px -12px -12px 0;
+    align-self: flex-end;
+}
+
+.status-tag.expired {
+    background-color: #FF0000;
+    color: #fff;
+}
+
+.status-tag.urgent {
+    background-color: #FFA500;
+    color: #fff;
+}
+
+.status-tag.normal {
+    background-color: #FFD700;
+    color: #333;
+}
+</style>
+
+
+
+
+