@titaui/pc 1.7.26 → 1.7.30

package/src/components/weekly-report/index.scss

@@ -7,11 +7,11 @@
   &-wrapper {
     overflow: hidden;
     width: 336px;
-    height: 548px;
+    height: 534px;
     border-radius: 24px;
     .weekly-report-card-content {
       position: relative;
-      top: -66px;
+      top: -52px;
       left: -20px;
       transform: scale(0.9);
     }
@@ -31,7 +31,7 @@
     align-items: center;
     width: 375px;
     height: 710px;
-    background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 100%);
+    background: linear-gradient(180deg, #B7D5FF 0%, #186FFF 50%);
   }
   &__title {
     width: 220px;
@@ -51,20 +51,28 @@
     flex-direction: column;
     align-items: center;
     width: 335px;
-    height: 452px;
+    height: 422px;
     background: transparent;
     padding-top: 55px;
     border-radius: 12px;
     background-image: url('./img/body.png');
     background-size: 100% 100%;
     background-position-y: -1px;
+    box-sizing: content-box;
   }
   &__avatar {
     position: absolute;
-    left: 129px;
-    top: 17px;
-    border: 3px solid #fff;
+    left: 150px;
+    top: 135px;
+    // border: 2px solid #fff;
+    width: 76px;
+    height: 76px;
+    background-color: #FFF;
     border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 2;
     & > img {
       width: 72px;
       height: 72px;
@@ -94,6 +102,7 @@
     margin: 28px 0;
     max-width: 279px;
     text-align: center;
+    min-height: 52px;
   }
   &__quote {
     position: absolute;
@@ -109,21 +118,43 @@
     position: relative;
     &__done {
       position: absolute;
-      width: 154px;
-      height: 154px;
+      width: 150px;
+      height: 150px;
       border-radius: 50%;
-      background: linear-gradient(360deg, #2879FF 0%, #5B8FF9 50%);
+      background: linear-gradient(90deg, #2879FF 0%, #5B8FF9 50%);
       overflow: hidden;
+      top: 2px;
+      left: 2px;
     }
     &__undone {
       position: absolute;
-      width: 154px;
-      height: 77px;
+      left: -5px;
+      bottom: 75px;
+      width: 160px;
+      height: 80px;
       background-color: rgb(234, 241, 254);
       transform-origin: center bottom;
       transform: rotate(90deg);
       // background: radial-gradient(at bottom center,rgb(234, 241, 254) 0,rgb(234, 241, 254) 77px,transparent 77px);
     }
+    &__cover {
+      width: 154px;
+      height: 154px;
+      position: absolute;
+      border-radius: 50%;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      z-index: 10;
+    }
+    &__cover--bottom {
+      width: 154px;
+      height: 2px;
+      position: absolute;
+      bottom: 0;
+      box-sizing: border-box;
+      background-color: #FFF;
+      z-index: 10;
+    }
     &__space {
       position: absolute;
       width: 2px;
@@ -202,7 +233,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-top: 29px;
+    margin-top: 18px;
     
     &__item {
       position: relative;
@@ -251,15 +282,15 @@
   }
   &__laba {
     position: absolute;
-    left: 0;
-    top: 118px;
+    left: 6px;
+    top: 108px;
     width: 94px;
     height: 65px;
   }
   &__bofang {
     position: absolute;
-    right: 0;
-    top: 130px;
+    right: 4px;
+    top: 124px;
     width: 62px;
     height: 66px;
     z-index: 1;
@@ -286,6 +317,8 @@
     background-color: transparent;
     font-size: 14px;
     color: #FFF;
+    backdrop-filter: blur(2px);
+    background-color: rgba($color: #FFF, $alpha: .1);
     &:hover{
       background-color: transparent;
     }

package/src/components/weekly-report/index.tsx

@@ -3,7 +3,7 @@ import classnames from 'classnames'
 import RectBtn from "../button/rect-btn";
 import CommonShare from "../common-share";
 import Card from "./card";
-import {rpost,rget} from '../../utils/request'
+import {rpost,rget, rput, rdelete} from '../../utils/request'
 import {getQueryString,changeQueryString} from '../../utils/tools'
 import "./index.scss";
 
@@ -26,12 +26,12 @@ function WeeklyReportPreview({ onShare,onClose,data }) {
 
   return (
     <div style={{ position: "relative"}}>
-      <div className={classnames("tu-icon-circle",preCls + "__close")} onClick={onClose}/>
+      <div className={classnames(preCls + "__close")} onClick={onClose}/>
       <div style={{ position: "absolute", left: "-99999999px" }}>
-        <Card ref={cardRef} />
+        <Card data={data} ref={cardRef} />
       </div>
       <div className={preCls + "-wrapper"}>
-        <Card />
+        <Card data={data}/>
       </div>
       <div className={preCls + "__button-container"}>
         <RectBtn
@@ -63,41 +63,42 @@ function WeeklyReportPreview({ onShare,onClose,data }) {
 
 function WeeklyReportModal({}: Props) {
   const [visible, setVisible] = useState<boolean>(!!getQueryString().redisKey);
-  const [redisKey, setRedisKey] = useState<string>()
+  const [redisKey, setRedisKey] = useState<string>(getQueryString().redisKey||null)
   const [data,setData] = useState<any>()
-
   useEffect(() => {
     window?.Talent?.app.vent.off('open-weekly-report-modal')
     window?.Talent?.app.vent.on('open-weekly-report-modal',(redisKey)=>{
+      if(visible) return;
       setRedisKey(redisKey)
       setVisible(true)
     })
     return () => window?.Talent?.app.vent.off('open-weekly-report-modal')
-  }, [])
+  }, [visible])
 
   useEffect(()=>{
-    let param = ''
+    if(!visible) return
+    const current = new Date()
+    const dateTimeTicks=(current.getFullYear()+'/'+(current.getMonth()+1)+'/'+current.getDate())
+    let param = `redisKey=${redisKey||null}&dateTimeTicks=${dateTimeTicks||null}`
     if(data) {
       setData(null)
     }
-    if(redisKey){
-      param = 'redisKey='+redisKey
-    }else {
-      const current = new Date()
-      param = 'dateTimeTicks='+(current.getFullYear()+'/'+(current.getMonth()+1)+'/'+current.getDate())
-    }
    
     rget('v1')('okr/wwsummary/get?'+param).then(res => {
-      
+      if(res.Code == 1){
+        setData(res.Data)
+      }else {
+        setVisible(false)
+      }
     })
-  },[redisKey])
+  },[redisKey,visible])
 
   useEffect(() => {
     if(!!getQueryString().redisKey){
       location.replace(decodeURIComponent(location.href).replace(/&?redisKey=\S*(&|$)/g,''))
     }
     if(visible){
-      rpost('vi')('Indicator/Clear?message_type=0&indicator_type=15')
+      rdelete('v1')('Indicator/Clear?message_type=0&indicator_type=15')
     }
   },[visible])
   if(!data) return null;

package/src/components/weekly-report/interface.ts

@@ -0,0 +1,31 @@
+
+export interface IWeeklyReportData {
+  WeekCycle: string;
+  Lnteraction: string;
+  LoveTopNum: string;
+  LoveNum: string;
+  TaskNum: string;
+  PromptLanguage: string;
+  Increase: string;
+  Quotations: string;
+  Complete: string;
+  User: User;
+}
+
+interface User {
+  UserId: number;
+  Name: string;
+  Avatar: Avatar;
+  UserMark?: any;
+}
+
+interface Avatar {
+  Original: string;
+  Small: string;
+  Medium: string;
+  Big: string;
+  Large: string;
+  Normal: string;
+  HasAvatar: boolean;
+  Color?: any;
+}

package/src/components/weekly-report/statistics.tsx

@@ -1,24 +1,25 @@
 import React, { ReactElement } from 'react'
 import classnames from 'classnames'
+import { IWeeklyReportData } from './interface'
 
 interface Props {
-  
+  data:IWeeklyReportData
 }
 const preCls = 'weekly-report-card__statistics'
-function Statistics({}: Props): ReactElement {
+function Statistics({data}: Props): ReactElement {
   return (
     <div className={preCls}>
       <div className={classnames(preCls+'__item',preCls+'__finish')}>
-        <div className={preCls+'__num'}>12</div>
+        <div className={preCls+'__num'}>{data.TaskNum}</div>
         <div className={preCls+'__text'}>完成任务</div>
       </div>
       <div className={classnames(preCls+'__item',preCls+'__praise')}>
-        <div className={preCls+'__num'}>12</div>
+        <div className={preCls+'__num'}>{data.LoveNum}</div>
         <div className={preCls+'__text'}>获得点赞</div>
-        <div className={preCls+'__tips'}>Top1</div>
+        {data.LoveTopNum && data.LoveTopNum != '0' && <div className={preCls+'__tips'}>Top{data.LoveTopNum}</div>}
       </div>
       <div className={classnames(preCls+'__item',preCls+'__communication')}>
-        <div className={preCls+'__num'}>12</div>
+        <div className={preCls+'__num'}>{data.Lnteraction}</div>
         <div className={preCls+'__text'}>参与互动</div>
       </div>
     </div>

package/src/pages/new-okr-list/header/filter.tsx

@@ -26,7 +26,6 @@ const Filter = (props) => {
     return num;
   });
   const [cycle, setCycle] = useState<any>(()=>{
-    debugger
     const routerData = getQueryString()
     const {annualNum,cycleType,yqmNum} = routerData
     if(!!annualNum&&!!cycleType&&!!yqmNum){