Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/home/homeStaff.vue

@@ -38,13 +38,15 @@
       <div class="handle-events"> <HandleEvents /> </div>
     </div>
     <div class="card-item-common card-flex-col">
-      <CardTitle title="日报统计" showMore @moreClick="moreClick" />
-      <!-- <CardTitle title="周报统计" showMore @moreClick="moreClick" /> -->
+      <CardTitle
+        :title="isWeeklySummary ? '周报统计' : '日报统计'"
+        showMore
+        @moreClick="moreClick"
+      />
       <!-- <div>
         <el-input style="width: calc(100% - 60px); color: #f7f7f7" placeholder="输入关键字搜索" />
       </div> -->
       <div style="flex: 1">
-        <!-- <BarList :list="barListData" unit="条" /> -->
         <!-- 首页显示周报 -->
         <WeeklySummary v-if="isWeeklySummary" />
         <!-- 首页显示日报 -->
@@ -60,11 +62,9 @@ import CardTitle from './components/CardTitle.vue'
 import CardItemSeven3 from './components/CardItemSeven3.vue'
 import HandleEvents from './components/HandleEvents.vue'
 import ProjectTimeChart from './components/TimeChart.vue'
-// import BarList from './components/BarList.vue'
 import WeeklySummary from './components/weekly/index.vue'
 import dailySummary from './components/daily/index.vue'
 import PubsubService from '@/utils/PubsubService'
-// import BarList from './components/BarList.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useQuery } from '@tanstack/vue-query'
 import { getRecordsDetail } from '@/api/oa/staffRecords'
@@ -85,28 +85,6 @@ const moreClick = () => {
   // 发布点击更多事件
   PubsubService.publish('homepage-click-weeklyAndDaily-more', {})
 }
-const barListData = [
-  {
-    name: '规划类',
-    value: '280'
-  },
-  {
-    name: '软件类',
-    value: '132'
-  },
-  {
-    name: '行政类',
-    value: '214'
-  },
-  {
-    name: '市场类',
-    value: '127'
-  },
-  {
-    name: '财务类',
-    value: '15'
-  }
-]
 
 const panelList = reactive([
   {

client/src/views/OaSystem/officeCenter/main/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="officeCenterBox">
-    <iframe :src="iframeUrl"></iframe>
+    <iframe :src="iframeUrl" loading="lazy"></iframe>
   </div>
 </template>
 
@@ -9,6 +9,10 @@ defineOptions({
   name: 'OfficeCenter'
 })
 
+<<<<<<< HEAD
+// const iframeUrl: string = 'http://localhost:6090/HandlerCaseCenter/index'
+=======
+>>>>>>> 2ffb222930f13ca9583bb20836293a3825d2a18f
 const iframeUrl: string = 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/index'
 // const iframeUrl: string =
 // 'http://localhost:6010/WorkFlow/index?flowInstanceId=018bbd46bf18087013178bbd3ebd000e&activityInstanceId=018bbd46bf34087013178bbd3ebd0012&_fm=018bb7307083087087e58bb722830009&participant=018bbd46bf4f087013178bbd3ebd0014&first=1&status=1&child=0&sourcewindowid=handlerCaseCenter&userId=dc794fe0-66fe-4b1d-9273-f747950b27c3'

client/src/views/OaSystem/personnelManagement/CompletionRate/index.vue

@@ -17,11 +17,11 @@
         :data="dataSource"
         style="width: 100%"
         row-key="id"
-        border
-        stripe
         v-loading="loading"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        stripe
         default-expand-all
+        border
         header-row-class-name="table-header"
         :span-method="objectSpanMethod"
       >
@@ -199,11 +199,15 @@ const handleView = (row) => {
   // 还需判断是跳转周报还是日报
   if (row.reportType == 'weekly') {
     push(
-      `/oaSystem/DeptCenter/weeklyStatistic?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`
+      `/oaSystem/DeptCenter/weeklyStatistic?deptId=${row.deptId}&date=${moment(
+        selectDate.value
+      ).format('YYYY-MM')}`
     )
   } else {
     push(
-      `/oaSystem/DeptCenter/dailyStatistic?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`
+      `/oaSystem/DeptCenter/dailyStatistic?deptId=${row.deptId}&date=${moment(
+        selectDate.value
+      ).format('YYYY-MM')}`
     )
   }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportDingServiceImpl.java

@@ -3,10 +3,8 @@ package com.zjugis.module.adm.service.report;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
-
 import com.zjugis.module.adm.controller.admin.report.vo.base.ReportCreateReqVO;
 import com.zjugis.module.adm.controller.admin.report.vo.comment.ReportCommentCreateReqVO;
 import com.zjugis.module.adm.controller.admin.report.vo.workload.ReportWorkloadCreateReqVO;