工作报告代码优化

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

@@ -1,16 +1,22 @@
 <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>
+  <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>
 
   <oa-scroll
     customClass="record-details-container scroll-height"
+    :style="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 44px)',
+      //#endif
+      //#ifdef H5
+      height: 'calc(100vh - 44px)',
+      //#endif
+    }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"
@@ -42,7 +48,7 @@
             <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>
+          <u-text :text="child.workContent" color="#000000" size="14"></u-text>
         </view>
         <view class="content-area-center mb10">
           <view class="content-area-center-top"> 明日计划 </view>
@@ -80,7 +86,10 @@ const state = reactive({
   current: 1,
   total: 0,
 
-  options: {},
+  options: {
+    reportId: "",
+    createBy: "",
+  },
 });
 
 const { dataList, pageSize, current, total } = toRefs(state);
@@ -93,9 +102,10 @@ function init() {
   state.loading = true;
   projectApi()
     .Details({
-      reportId: state.options?.reportId,
+      reportId: state.options.reportId,
     })
     .then((requset) => {
+      state.options.createBy = requset.data[0].createBy;
       state.dataList = requset.data;
       state.loading = false;
     })
@@ -112,7 +122,7 @@ onShow(() => {
 });
 
 onLoad((options) => {
-  state.options = options;
+  state.options.reportId = options?.reportId;
   init();
 });
 </script>
@@ -120,7 +130,7 @@ onLoad((options) => {
 <style lang="scss" scoped>
 .content-area {
   margin: 0;
-  padding: 15px;
+  padding: 15px 20px;
   overflow: hidden;
 
   &-header {

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

@@ -7,7 +7,6 @@
         </view>
       </template>
     </u-navbar>
-
     <u-tabs
       :list="tabsList"
       :current="tabsCurrent"
@@ -24,6 +23,11 @@
     :pageSize="pageSize"
     :total="total"
     :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 88px)',
+      //#endif
+    }"
     :refresherLoad="true"
     :refresherEnabled="true"
     :refresherDefaultStyle="'none'"
@@ -110,8 +114,8 @@ function init() {
         el.workContents.forEach((cl) => {
           el.contentText += `${cl.projectName} ${cl.workTime}h \n ${cl.workContent}`;
         });
-        state.dataList.push(el);
       });
+      state.dataList = requset.data.records;
       state.total = requset.data.total;
       state.loading = false;
     })
@@ -124,7 +128,7 @@ function init() {
  * @跳转详情
  */
 function goContentDetails(e) {
-  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}&createBy=${e.createBy}`);
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
 }
 
 /**
@@ -147,7 +151,6 @@ function refresh() {
  * @tabs点击事件
  */
 function tabsClick(e) {
-  state.dataList = [];
   state.tabsCurrent = e.index;
   init();
 }

src/pages/common/appMessage/index.vue

@@ -58,17 +58,16 @@ const { scrollIntoView, tabsCurrent, noticeList } = toRefs(state);
  */
 function goContentDetails(e) {
   if (e.infoType == 4) {
-    proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.contentId}`).then(() => {
-      if (!e.readFlag) {
-        updateMceReceiveStatus({ id: e.id });
-      }
-    });
+    proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.contentId}`).then(() => {});
+  } else if (e.infoType == 5) {
+    proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`).then(() => {});
   } else {
-    proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {
-      if (!e.readFlag) {
-        updateMceReceiveStatus({ id: e.id });
-      }
-    });
+    proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {});
+  }
+
+  //是否已读
+  if (!e.readFlag) {
+    updateMceReceiveStatus({ id: e.id });
   }
 }