日报分页接口对接

src/api/business/project.js

@@ -125,14 +125,21 @@ export function projectApi() {
             })
         },
         //日报统计
-        pmTimeConf(params) {
+        pmTimeConfCount(params) {
             return request({
                 url: '/service-iot/pmTimeConf/submitCount',
                 method: 'GET',
                 params
             })
         },
-        
+        //日报统计分页
+        pmTimeConfPage(params) {
+            return request({
+                url: '/service-iot/pmTimeConf/submitPage',
+                method: 'GET',
+                params
+            })
+        },
         
     }
 }

src/config.js

@@ -9,7 +9,8 @@ export default {
   //#endif
 
   //#ifdef H5
-  baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
+  baseUrl: "https://gateWay.usky.cn/prod-api",
+  // baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
   //#endif
 
   websiteUrl: "https://qhome.usky.cn",

src/pages/business/common/projectMange/statistics/dailyReport.vue

@@ -8,78 +8,238 @@
         </template>
       </u-navbar>
     </u-sticky>
+    <view class="timeSelect">
+      <view @click="daySwitch(0)"><u-icon name="arrow-left" size="14" color="#000" class="left"></u-icon></view>
+      <view><text>{{ day }}</text></view>
+      <view @click="daySwitch(1)" ><u-icon name="arrow-right" size="14" :color="statusNext ? '#000' : '#ccc'" class="right" aria-disabled="true"></u-icon></view>
+    </view>
     <view class="container">
       <view class="menu-list">
         <view class="list-cell">
-          <view class="list active">
-            <text>{{ statistics.submitOnTime }}</text> 
-            <text>按时提交</text> 
-            <text></text> 
-            <text class="line"></text> 
-          </view>
-          <view class="list">
-            <text>{{ statistics.submitLate }}</text> 
-            <text>迟交</text> 
-            <text></text> 
-            <text class="line"></text> 
-          </view>
-          <view class="list">
-            <text>{{ statistics.notSubmitted }}</text> 
-            <text>未提交</text> 
+          <view class="list"  :class="{ active: query.queryType == item.value }" @click="tabsClick(item.value)" v-for="(item,index) in activeList" :key="index">
+            <text>{{ index == 0 ? statistics.submitOnTime :index == 1 ? statistics.submitLate : index == 2 ? statistics.notSubmitted : '' }}</text> 
+            <text>{{ item.name }}</text> 
+            <text v-if="item.value == 0 || item.value == 1"></text> 
             <text class="line"></text> 
           </view>
         </view>
       </view>
     </view>
+    <oa-scroll
+    customClass="record-container scroll-height"
+    :pageSize="query.pageSize"
+    :total="total"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (138px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (138px))`,
+      //#endif
+    }"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <!-- <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page> -->
+      <!-- start -->
+      <view class="content-area" v-for="(el, index) in reportList" :key="index">
+        <!-- <view class="flex mb10" @click="goContentDetails(el)">
+            <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
+            <u-avatar
+              v-if="!el.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="proxy.$settingStore.themeColor.color"
+            ></u-avatar>
+            <view>
+              <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
+              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
+            </view>
+          </view> -->
+        <!-- <view class="content-area-center bg-white" v-else style="margin: 0 10px 10px; border-radius: 10px">
+          <view class="content-area-top menu-item" style="float: right; padding: 10px 0px">
+            <view class="content-area-top-time"> </view>
+            <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
+          </view>
+          <view class="flex mb10" @click="goContentDetails(el)">
+            <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
+            <u-avatar
+              v-if="!el.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="proxy.$settingStore.themeColor.color"
+            ></u-avatar>
+            <view>
+              <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
+              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
+            </view>
+          </view>
+          <view class="mb5" @click="goContentDetails(el)">
+            <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
+          </view>
+          <view class="flex" v-if="el.createBy != useStore.nickName" @click="goContentDetails(el)">
+            <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
+            <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
+            <u-text text="全文" :color="proxy.$settingStore.themeColor.color" size="14"></u-text>
+          </view>
+        </view> -->
+      </view>
+      <!-- end -->
+    </template>
+  </oa-scroll>
 </template>
   
   <script setup>
   /*----------------------------------依赖引入-----------------------------------*/
   import { onLoad, onShow, onReady } from "@dcloudio/uni-app";
-  import { ref, getCurrentInstance } from "vue";
+  import { ref, getCurrentInstance, reactive } from "vue";
+  import { useRouter, useRoute } from "vue-router";
   /*----------------------------------接口引入-----------------------------------*/
   import { projectApi } from "@/api/business/project.js";
   // import dayjs from 'dayjs/esm/index'
   /*----------------------------------组件引入-----------------------------------*/
   /*----------------------------------store引入-----------------------------------*/
-  import { useStores } from "@/store/modules/index";
   import dayjs from "dayjs";
+  const route = useRoute();
   /*----------------------------------公共方法引入-----------------------------------*/
   /*----------------------------------公共变量-----------------------------------*/
   const { proxy } = getCurrentInstance();
+  const day = ref("")
+  const statusNext = ref(false)//下一天按钮状态
+  const currentDate = ref("")//当前日期
+  const date = reactive({
+    year:"",
+    month:"",
+    day:""
+  })
+  const activeList = reactive([
+    {name:"按时提交",value:0},
+    {name:"迟交",value:1},
+    {name:"未提交",value:2},
+  ])
+  const query = ref({
+    queryType:0,
+    submitDate:dayjs().format("YYYY-MM-DD"),
+    reportId:null,
+    pageNum:1,
+    pageSize:10,
+  })
   /*----------------------------------变量声明-----------------------------------*/
   const statistics = ref({
     submitOnTime: 0, //按时提交
     submitLate: 0, //迟交
     notSubmitted:0,  //未交
   })
+  const loading = ref(false)
+  const reportList =reactive([])
+  const pageSize = ref(20)
+  const current = ref(1)
+  const total = ref(0)
   /**
    * @页面初始化
    */
-  function init() {
-    return
-    projectApi().pmTimeConf().then((res) => {
+  function init(id) {
+    if(id){
+      query.value.queryType = id
+    }
+    var time = dayjs().format("YYYY-MM-DD").split("-")
+    currentDate.value = `${time[0]}${time[1]}${time[2]}`
+    day.value = `${time[0]}年${time[1]}月${time[2]}日`
+    date.value = {
+      year:time[0],
+      month:time[1],
+      day:time[2]
+    }
+    getStatistics()
+    getPageList()
+  }
+  //获取统计数据
+  function getStatistics(time) {
+    projectApi().pmTimeConfCount(time ? {submitDate:query.value.submitDate} : null ).then((res) => {
       statistics.value = res.data;
     });
   }
+  //获取分页数据
+  function getPageList() {
+    projectApi().pmTimeConfPage(query.value).then((res) => {
+      reportList.value = res.data.records[0];
+      console.log(reportList.value)
+    });
+  }
+  /** 日期选择*/
+  function daySwitch(id){
+    //获取前一天/后一天日期
+      if(id == 1 && statusNext.value == false){
+        return
+      }
+      const targetDate = dayjs(`${date.value.year}-${date.value.month}-${date.value.day}`);
+      var previousDay;
+      if(id == 0){
+        previousDay = targetDate.subtract(1, 'day');
+      }
+      if(id == 1){
+        previousDay = targetDate.subtract(-1, 'day');
+      }
+      var time = previousDay.format("YYYY-MM-DD").split("-")
+      day.value = `${time[0]}年${time[1]}月${time[2]}日`
+      date.value = {
+        year:time[0],
+        month:time[1],
+        day:time[2]
+      }
+      query.value.submitDate = `${time[0]}-${time[1]}-${time[2]}`
+    //获取下一天按钮状态
+      var changeDate = `${date.value.year}${date.value.month}${date.value.day}`
+      if(changeDate >= currentDate.value){
+        statusNext.value = false
+      }else{
+        statusNext.value = true
+      }
+    getStatistics(query.value.submitDate)
+    getPageList()
+  }
   /**
-   * @tabs点击事件
+   * @scrollView加载数据
    */
-  function tabsClick(e) {
-  
+  function load() {
+    query.value.current ++;
+    init();
   }
   /**
-   * 跳转项目概览
-   * @param id 项目id
+   * @scrollView刷新数据
    */
-  function toPage(id) {
-    proxy.$tab.navigateTo(`/pages/business/common/projectMange/overview/index?id=${id}`);
+  function refresh() {
+    query.value.current = 1;
+    init();
   }
-  
-  onReady(() => {});
+
+
+  onLoad(() => {
+  });
   
   onShow(() => {
-    init();
+    if(route?.query?.id){
+      init(route.query.id)
+    }else{
+      init()
+    }
     //调用系统主题颜色
     proxy.$settingStore.systemThemeColor([1]);
   });
@@ -94,10 +254,42 @@
   }
   </style>
   <style lang="scss" scoped>
+  .timeSelect{
+    width:100%;
+    height:35px;
+    background: #fff;
+    >view{
+      display: inline-block;
+      height:35px;
+      line-height: 35px;
+      position: relative;
+      .left{
+        position: absolute;
+        top:11px;
+        right:20px;
+      }
+      .right{
+        position: absolute;
+        top:11px;
+        left:20px;
+      }
+    }
+    view:nth-child(1),view:nth-child(3){
+      width:20%;
+    }
+    view:nth-child(2){
+      width:60%;
+      text{
+        position: absolute;
+        width:100%;
+        text-align: center;
+      }
+    }
+  }
   .container{
-    width:calc(100% - 20px);
+    width:100%;
     height:calc(100% - 20px);
-    margin:10px;
+    margin:10px 0;
     .statisticsSearchBox {
       width: 100%;
       vertical-align: middle;

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

@@ -16,32 +16,22 @@
           <view>统计时间：18:00 ~ 22:00</view>
         </view>
     <view class="menu-list">
-      <view class="title">{{ statistics?.submitDate == dayjs().format('YYYY-MM-DD') ? '今日' : statistics?.submitDate }}报告</view>
+      <view class="title">{{ statistics?.statisticalDate == currentDate ? '今日' : statistics?.statisticalDate }}报告</view>
       <view class="list-cell">
-        <view class="list" @click="toPage(1)">
-          <text>{{ statistics.submitOnTime }}</text> 
-          <text>按时提交</text> 
-          <text></text> 
-        </view>
-        <view class="list" @click="toPage(2)">
-          <text>{{ statistics.submitLate }}</text> 
-          <text>迟交</text> 
-          <text></text> 
-        </view>
-        <view class="list" @click="toPage(3)">
-          <text>{{ statistics.notSubmitted }}</text> 
-          <text>未提交</text> 
+        <view class="list"  @click="toPage(item.value)" v-for="(item,index) in activeList" :key="index">
+            <text>{{ index == 0 ? statistics.submitOnTime :index == 1 ? statistics.submitLate : index == 2 ? statistics.notSubmitted : '' }}</text> 
+            <text>{{ item.name }}</text> 
+            <text v-if="item.value == 0 || item.value == 1"></text> 
         </view>
       </view>
     </view>
   </view>
- 
 </template>
 
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow, onReady } from "@dcloudio/uni-app";
-import { ref, getCurrentInstance } from "vue";
+import { ref, reactive, getCurrentInstance } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
@@ -55,14 +45,19 @@ const statistics = ref({
   submitOnTime: 0, //按时提交
   submitLate: 0, //迟交
   notSubmitted:0,  //未交
-  submitDate:null, //统计日期
+  statisticalDate:null, //统计日期
 })
+const activeList = reactive([
+  {name:"按时提交",value:0},
+  {name:"迟交",value:1},
+  {name:"未提交",value:2},
+])
+const currentDate = dayjs().format('YYYY-MM-DD');
 /**
  * @页面初始化
  */
 function init() {
-  return
-  projectApi().pmTimeConf().then((res) => {
+  projectApi().pmTimeConfCount().then((res) => {
     statistics.value = res.data;
   });
 }
@@ -71,7 +66,7 @@ function init() {
  * @param id 项目id
  */
 function toPage(id) {
-  proxy.$tab.navigateTo(`/pages/business/common/projectMange/statistics/dailyReport?id=${id}`);
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/statistics/dailyReport?id=${id}&statisticalDate=2025-02-20`);
 }
 
 onReady(() => {});

src/pages/login.vue

@@ -180,11 +180,11 @@ function init() {
   useStore.GetWxOpenId(1); //调用获取微信公众号openId
 
   if (window.location.host) {
-    linkUrl.value = window.location.host;
+    // linkUrl.value = window.location.host;
     // linkUrl.value = "192.168.10.165:13200";
     // linkUrl.value = "localhost:81";
     // linkUrl.value = "120.26.164.249:13212";
-    // linkUrl.value = "manager.usky.cn";
+    linkUrl.value = "manager.usky.cn";
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }
   //#endif

src/plugins/constData.plugins.js

@@ -115,14 +115,14 @@ let projectTabbar = [
 		text: "报告填写",
 		dot: false,
 	},
-	// {
-	// 	pagePath: "/pages/business/common/projectMange/statistics/index",
-	// 	iconClass: "oaIcon-tab-reportInsert",
-	// 	iconPath: "",
-	// 	selectedIconPath: "",
-	// 	text: "报告统计",
-	// 	dot: false,
-	// },
+	{
+		pagePath: "/pages/business/common/projectMange/statistics/index",
+		iconClass: "oaIcon-tab-reportInsert",
+		iconPath: "",
+		selectedIconPath: "",
+		text: "报告统计",
+		dot: false,
+	},
 	{
 		pagePath: "/pages/business/common/projectMange/list/index",
 		iconClass: "oaIcon-tab-projectsList",