工作报告功能模块完成

src/api/business/project.js

@@ -0,0 +1,24 @@
+import { request } from "@/utils/request";
+
+/**
+ * 项目管理接口集合
+ * @method Record 记录详情
+ */
+export function projectApi() {
+    return {
+        Record(data) {
+            return request({
+                url: "/service-iot/pmWorkContent/page",
+                method: "GET",
+                data: data,
+            });
+        },
+        Details(data) {
+            return request({
+                url: "/service-iot/pmWorkContent/reportRecord",
+                method: "GET",
+                data: data,
+            });
+        },
+    };
+}

src/pages.json

@@ -685,7 +685,24 @@
           "path": "projectMange/record/index",
           "style": {
             "navigationBarTitleText": "报告记录",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "projectMange/record/details",
+          "style": {
+            "navigationBarTitleText": "报告详情",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
           }
         }
       ]

src/pages/business/common/fastMail/index.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/business/common/projectMange/record/details.vue

@@ -0,0 +1,146 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="state.options?.createBy + '的日报'" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="19" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-details-container scroll-height"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherEnabledTitle="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="content-area radius bg-white" v-for="(item, ind) in state.dataList" :key="ind">
+        <view class="content-area-header flex mb10">
+          <u-avatar
+            class="content-area-header-avatar mr10"
+            :text="item.createBy.length > 2 ? item.createBy.slice(1, 3) : item.createBy"
+            shape="square"
+            size="40"
+            fontSize="12"
+            color="#ffffff"
+            bgColor="#149eff"
+          ></u-avatar>
+          <view>
+            <view class="content-area-header-title font16 mb5">{{ item.createBy }}</view>
+            <view class="content-area-header-time font14">{{ item.createTime.replace("T", " ") }}</view>
+          </view>
+        </view>
+
+        <view class="content-area-center mb10" v-for="child in item.workContents" :key="child">
+          <view class="content-area-center-top flex">
+            <view class="content-area-center-top-title" style="margin-right: 10px">{{ child.projectName }}</view>
+            <view class="content-area-center-top-time" style="color: #48a4ff">{{ child.workTime }}h</view>
+          </view>
+          <u-text class="ml10" :text="child.workContent" color="#000000" size="14"></u-text>
+        </view>
+        <view class="content-area-center mb10">
+          <view class="content-area-center-top"> 明日计划 </view>
+          <u-text :text="item.tomorrowPlan" color="#000000" size="14"></u-text>
+        </view>
+        <view class="content-area-center mb10">
+          <view class="content-area-center-top"> 工作协调 </view>
+          <u-text :text="item.coordinateWork" color="#000000" size="14"></u-text>
+        </view>
+        <view class="content-area-center mb10">
+          <view class="content-area-center-top">抄送人 </view>
+          <u-text :text="item.ccTo" color="#000000" size="14"></u-text>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { projectApi } from "@/api/business/project.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: true,
+  dataList: [],
+  pageSize: 10,
+  current: 1,
+  total: 0,
+
+  options: {},
+});
+
+const { dataList, pageSize, current, total } = toRefs(state);
+
+/**
+ * @初始化
+ */
+function init() {
+  state.dataList = [];
+  state.loading = true;
+  projectApi()
+    .Details({
+      reportId: state.options?.reportId,
+    })
+    .then((requset) => {
+      state.dataList = requset.data;
+      state.loading = false;
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+}
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+onLoad((options) => {
+  state.options = options;
+  init();
+});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+  margin: 0;
+  padding: 15px;
+  overflow: hidden;
+
+  &-header {
+    &-avatar {
+      margin: auto 0;
+    }
+
+    &-title {
+      margin: 0 0 15px 0;
+      font-weight: 600;
+      color: #000000;
+    }
+  }
+
+  &-center {
+    line-height: 25px;
+    &-top {
+      color: #000000;
+      font-weight: 600;
+    }
+  }
+}
+</style>

src/pages/business/common/projectMange/record/index.vue

@@ -1,10 +1,26 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="报告记录" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="19" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll
-    customClass="repairManage-container scroll-height"
+    customClass="record-container scroll-height"
     :pageSize="pageSize"
     :total="total"
     :isSticky="true"
@@ -19,21 +35,27 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <view class="menu-list m0">
-        <view class="list-cell list-cell-arrow" style="color: #666666; line-height: 25px" v-for="(base, index) in dataList" :key="index" @click="handleToDetails(base)">
-          <view class="content-area-top menu-item">
-            <view class="content-area-top-time">
-              {{ base.repairStatus == 1 ? (base.createTime ? base.createTime.replace("T", " ") : "") : base.handleTime ? base.handleTime.replace("T", " ") : "" }}
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.dataList, 'createTime')" :key="date">
+        <view class="content-area-time font12">{{ proxy.$common.jktTimes(date, "否") }}</view>
+        <view class="content-area-center radius bg-white" v-for="(el, ind) in group" :key="ind" @click="goContentDetails(el)">
+          <view class="flex mb10">
+            <u-avatar
+              class="content-area-center-avatar mr10"
+              :text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
+              shape="square"
+              size="35"
+              fontSize="10"
+              color="#ffffff"
+              bgColor="#149eff"
+            ></u-avatar>
+            <view>
+              <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
+              <view class="content-area-center-time font12">{{ proxy.$common.jktTimes(el.createTime.replace("T", " ")) }}</view>
             </view>
-            <view class="content-area-top-status" v-if="base.repairStatus == 1" style="background-color: #23dedc"> 受理中 </view>
-            <view class="content-area-top-status" v-if="base.repairStatus == 2" style="background-color: #16bf00"> 处理完成 </view>
           </view>
-          <view class="content-area-row_wrap menu-item">
-            <view class="content-area-row_wrap-view"> 项目名称：{{ base.projectName }} </view>
-            <view class="content-area-row_wrap-view"> 报修人：{{ base.reflectName }} </view>
-            <view class="content-area-row_wrap-view"> 报修人电话：{{ base.reflectPhone }} </view>
-            <view class="content-area-row_wrap-view"> 报修内容：{{ base.repairContent }} </view>
-            <view class="content-area-row_wrap-view"> 报修地址：{{ base.projectAddress }} </view>
+          <view>
+            <u-text :text="el.contentText.slice(0, 100) + '···'" color="#666666" size="14"></u-text>
           </view>
         </view>
       </view>
@@ -46,23 +68,22 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { page } from "@/api/business/fireIot/repairManage.js";
+import { projectApi } from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
-import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
-const commonStore = commonStores(); //全局公共Store
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   tabsList: [
-    { name: "我收到的", value: "" },
-    { name: "我发出的", value: 1 },
-    { name: "我负责的", value: 2 },
+    { name: "我收到的", value: 2 },
+    { name: "我发出的", value: 3 },
+    { name: "我负责的", value: 1 },
   ],
-  tabsCurrent: 1,
+  tabsCurrent: 0,
 
+  loading: false,
   dataList: [],
   pageSize: 20,
   current: 1,
@@ -72,34 +93,38 @@ const state = reactive({
 const { tabsList, tabsCurrent, dataList, pageSize, current, total } = toRefs(state);
 
 /**
- * @页面初始化
+ * @初始化
  */
 function init() {
-  selectListApi();
-}
-
-/**
- * @列表查询
- * @api接口查询
- */
-function selectListApi() {
-  page({
-    repairStatus: state.tabsList[state.tabsCurrent].value,
-    current: state.current,
-    size: state.pageSize,
-  }).then((requset) => {
-    if (requset.status === "SUCCESS") {
-      state.dataList = requset.data.records;
+  projectApi()
+    .Record({
+      // startDate: "2024-07-10",
+      // endDate: "2024-07-10",
+      pageNum: state.current,
+      pageSize: state.pageSize,
+      projectAscription: state.tabsList[state.tabsCurrent].value,
+    })
+    .then((requset) => {
+      requset.data.records.forEach((el) => {
+        el.contentText = "";
+        el.workContents.forEach((cl) => {
+          el.contentText += `${cl.projectName} ${cl.workTime}h \n ${cl.workContent}`;
+        });
+        state.dataList.push(el);
+      });
       state.total = requset.data.total;
-    }
-  });
+      state.loading = false;
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
 }
 
 /**
- * @跳转详情事件
+ * @跳转详情
  */
-function handleToDetails(e) {
-  proxy.$tab.navigateTo(`/pages/business/fireIot/repairManage/repairDetails?repairCode=${e.repairCode}`);
+function goContentDetails(e) {
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}&createBy=${e.createBy}`);
 }
 
 /**
@@ -122,6 +147,7 @@ function refresh() {
  * @tabs点击事件
  */
 function tabsClick(e) {
+  state.dataList = [];
   state.tabsCurrent = e.index;
   init();
 }
@@ -139,51 +165,31 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
-.repairManage-container {
-  .content-area {
-    &-top {
-      padding-right: 10px;
-      font-size: 16px;
-      font-weight: 600;
-      color: #000000;
+.content-area {
+  &-time {
+    padding: 10px 0;
+    text-align: center;
+    color: #909399;
+  }
 
-      &-time {
-        max-width: 70%;
-        margin: auto 0;
-        font-size: 14px;
-        color: rgb(102, 102, 102);
-      }
-
-      &-name {
-        max-width: 70%;
-        color: #000;
-      }
-
-      &-status {
-        max-width: 30%;
-        margin: auto 0 auto auto;
-        font-size: 12px;
-        color: #ffffff;
-        padding: 0 5px;
-        border-radius: 20px;
-        line-height: 20px;
-      }
+  &-center {
+    margin: 0;
+    padding: 15px;
+    overflow: hidden;
+    border-bottom: 1px solid #eaeef1;
+
+    &:last-child {
+      border-bottom: 0px solid #eaeef1;
     }
 
-    &-row_wrap {
-      padding-right: 10px;
-      font-size: 13px;
-      flex-flow: row wrap;
-
-      &-view {
-        display: flex;
-        min-width: 50%;
-        > .iconfont {
-          font-size: 14px;
-          color: #909399;
-          margin-left: 5px;
-        }
-      }
+    &-avatar {
+      margin: auto 0;
+    }
+
+    &-title {
+      margin: 0 0 15px 0;
+      font-weight: 600;
+      color: #000000;
     }
   }
 }

src/pages/business/fireIot/alarmManage/alarmDetailsList/index.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="state.tabsList" :current="state.tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="state.tabsList"
+      :current="state.tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/business/fireIot/repairManage/repairDetailsList.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/business/mhxf/informationSelect/index.vue

@@ -1,6 +1,13 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="list" :current="state.current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
+    <u-tabs
+      :list="list"
+      :current="state.current"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/business/mhxf/needMatter/index.vue

@@ -1,6 +1,13 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="state.tabsList" :current="state.current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
+    <u-tabs
+      :list="state.tabsList"
+      :current="state.current"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/business/zhaf/xunJian/error/errorList.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="state.tabsList" :current="state.tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="state.tabsList"
+      :current="state.tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll
@@ -79,7 +87,7 @@ function pageQueryApi() {
  * @复制粘贴板
  */
 function toDetail(row) {
-  proxy.$tab.navigateTo(`/pages/business/zhaf/xunJian/error/errorListDetail?id=${row.id}`)
+  proxy.$tab.navigateTo(`/pages/business/zhaf/xunJian/error/errorListDetail?id=${row.id}`);
 }
 
 /**

src/pages/business/zhxf/fireInspect/inspectDetailsList/index.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="state.tabsList" :current="state.tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="state.tabsList"
+      :current="state.tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/common/invoicing/index.vue

@@ -1,6 +1,14 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
   </u-sticky>
 
   <oa-scroll

src/pages/info copy.vue

@@ -1,170 +0,0 @@
-<template>
-  <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
-    <template #left>
-      <view class="u-navbar__content__left__item">
-        <view class="u-navbar__content__left__item__title" style="color: #fff">消息</view>
-      </view>
-    </template>
-    <template #right>
-      <view class="u-navbar__content__right__item">
-        <text class="iconfont oaIcon-qingchu" @click="handleIconClick('清除')"></text>
-      </view>
-      <view class="u-navbar__content__right__item">
-        <text class="iconfont oaIcon-sousuo" @click="handleIconClick('搜索')"></text>
-      </view>
-      <view class="u-navbar__content__right__item">
-        <text class="iconfont oaIcon-jiahao" @click="handleIconClick('加号')"></text>
-      </view>
-    </template>
-  </u-navbar>
-
-  <oa-scroll
-    customClass="info-container  scroll-height bg-white"
-    :customStyle="{ height: `calc(100vh - (50px + ${proxy.$settingStore.barHightTop} + ${proxy.$settingStore.tabBarHeight}))` }"
-    :refresherLoad="false"
-    :refresherEnabled="true"
-    :refresherEnabledTitle="false"
-    :refresherDefaultStyle="'none'"
-    :refresherThreshold="44"
-    :refresherBackground="'#f5f6f7'"
-    @refresh="init()"
-  >
-    <template #default>
-      <view class="content-area" v-for="item in infoList" :key="item" @tap="goAppMessage(item.path)">
-        <view class="content-area-avatar">
-          <image class="image-bg" :src="item.img" />
-        </view>
-        <view class="content-area-child">
-          <view class="uni-item mb5">
-            <view class="uni-item-text font14" style="color: #000000">{{ item.label }}</view>
-            <view class="uni-item-right font12" style="color: #909399">{{ item.time }}</view>
-          </view>
-          <view class="uni-item">
-            <view class="uni-item-text font12" style="color: #909399">{{ item.cont }}</view>
-            <view class="uni-item-right font12" style="margin: auto 0">
-              <u-badge numberType="overflow" max="99" :value="item.badge"></u-badge>
-            </view>
-          </view>
-        </view>
-      </view>
-    </template>
-  </oa-scroll>
-
-  <oa-tabbar :tabbarValue="1"></oa-tabbar>
-</template>
-
-<script setup>
-/*----------------------------------依赖引入-----------------------------------*/
-import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
-/*----------------------------------接口引入-----------------------------------*/
-import { getMceReceiveStatic } from "@/api/mine/info.js";
-/*----------------------------------组件引入-----------------------------------*/
-/*----------------------------------store引入-----------------------------------*/
-import { systemStores } from "@/store/modules/index";
-/*----------------------------------公共方法引入-----------------------------------*/
-/*----------------------------------公共变量-----------------------------------*/
-const { proxy } = getCurrentInstance();
-const systemStore = systemStores();
-const { message_type } = proxy.useDict("message_type");
-/*----------------------------------变量声明-----------------------------------*/
-
-const data = reactive({
-  infoList: [
-    {
-      id: 1,
-      label: "应用消息",
-      img: "/static/images/common/appMessage.png",
-      time: "5月15日",
-      cont: "您收到一条最新消息，请及时查看",
-      badge: 1,
-      path: "/pages/common/appMessage/index",
-    },
-    // {
-    //   id: 2,
-    //   label: "消防知识库",
-    //   time: "5月15日",
-    //   cont: "您收到一条最新消息，请及时查看",
-    //   badge: 0,
-    // },
-    {
-      id: 3,
-      label: "告警通知",
-      img: "/static/images/common/alarmMessage.png",
-      time: "5月15日",
-      cont: "您收到一条最新消息，请及时查看",
-      badge: 0,
-      path: "/pages/common/alarmMessage/index",
-    },
-  ],
-});
-
-const { infoList } = toRefs(data);
-
-function init() {
-  getMceReceiveStatic().then((res) => {
-    systemStore.infoList.messageCountData = res.data;
-    systemStore.infoList.messageTypeData = message_type.value;
-    res.data.infoTypeStatic.forEach((e) => {});
-  });
-}
-
-function goAppMessage(path) {
-  proxy.$tab.navigateTo(path);
-}
-
-function handleIconClick(type) {
-  if (type === "清除") {
-  } else if (type === "搜索") {
-    proxy.$tab.navigateTo("/pages/common/searchSelect/index");
-  } else if (type === "加号") {
-  }
-}
-
-onShow(() => {
-  init();
-});
-
-onLoad((options) => {
-  uni.hideTabBar(); //隐藏自带tabbar
-});
-</script>
-
-<style lang="scss" scoped>
-.info-container {
-  .content-area {
-    display: flex;
-    padding: 13px 13px 0 13px;
-
-    &-avatar {
-      display: flex;
-      margin: auto 20upx auto 0;
-      .image-bg {
-        width: 40px;
-        height: 40px;
-      }
-    }
-
-    &-child {
-      width: calc(100% - (32px + 0.625rem));
-      justify-content: center;
-      margin: auto;
-      .uni-item {
-        display: flex;
-        white-space: nowrap;
-
-        .uni-item-text {
-          margin-right: auto;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .uni-item-right {
-          width: auto;
-          text-align: right;
-        }
-      }
-    }
-  }
-}
-</style>

src/pages/mine/info/index.vue

@@ -1,7 +1,15 @@
 <template>
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="info-container">
     <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-      <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+      <u-tabs
+        :list="tabsList"
+        :current="tabsCurrent"
+        @click="tabsClick"
+        lineColor="#333"
+        :activeStyle="{ color: '#333', fontSize: '14px' }"
+        :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+        :scrollable="false"
+      ></u-tabs>
     </u-sticky>
 
     <view class="content-section" v-show="tabsCurrent == 0">

src/plugins/common.plugins.js

@@ -103,27 +103,51 @@ export default {
   /**
    * @param {时间处理(今日,昨日)} 
    * @param {传入值} time 
+   * @param {是否携带时分秒} isTime
    * @returns 
    */
-  jktTimes(time) {
+  jktTimes(time, isTime) {
     if (time == undefined) return "";
     var today = new Date().getDate();//当前时间-日
     var day = new Date(time).getDate();//传入时间-日
 
     var newday = today - day
     if (newday == 0) {
-      var newTime = time.split(" ")[1]
-      var newTime2 = newTime.split(":")
-      return "今天" + newTime2[0] + ":" + newTime2[1];
+      if (isTime == "否") {
+        return "今天";
+      } else {
+        var newTime = time.split(" ")[1]
+        var newTime2 = newTime.split(":")
+        return "今天 " + newTime2[0] + ":" + newTime2[1];
+      }
     } else if (newday == 1) {
-      var newTime = time.split(" ")[1]
-      var newTime2 = newTime.split(":")
-      return "昨天" + newTime2[0] + ":" + newTime2[1];
+      if (isTime == "否") {
+        return "昨天";
+      } else {
+        var newTime = time.split(" ")[1]
+        var newTime2 = newTime.split(":")
+        return "昨天 " + newTime2[0] + ":" + newTime2[1];
+      }
     } else {
       var newTime = time.split(" ")[0]
       return newTime
     }
   },
+  /**
+   * @根据时间分类数据
+   * @param {数据集} data 
+   * @param {需要处理的时间key} timeKey 
+   * @returns 
+   */
+  groupedItems(data, timeKey) {
+    const grouped = {};
+    data.forEach((item) => {
+      const date = item[timeKey].split("T")[0];
+      grouped[date] = grouped[date] || [];
+      grouped[date].push(item);
+    });
+    return grouped;
+  },
   /**
    * @指定获取开始时间结束时间
    */

src/uni_modules/uview-plus/components/u-avatar/u-avatar.vue

@@ -29,14 +29,14 @@
 				:size="fontSize"
 				:color="color"
 			></u-icon>
-			<up-text
+			<u-text
 				v-else-if="text"
 				:text="text"
 				:size="fontSize"
 				:color="color"
 				align="center"
 				customStyle="justify-content: center"
-			></up-text>
+			></u-text>
 			<image
 				class="u-avatar__image"
 				v-else