diff --git a/src/pages/TaskCount/index.js b/src/pages/TaskCount/index.js
index 9431cdc..5470959 100644
--- a/src/pages/TaskCount/index.js
+++ b/src/pages/TaskCount/index.js
@@ -1,27 +1,67 @@
-import React,{useMemo} from "react";
+import React, {Fragment, useEffect, useMemo} from "react";
import {getTaskCount} from "../../utils";
import dayjs from "dayjs";
+import {DATE_FORMAT} from "../../utils/timeFormatUtil";
+import {getDictionary} from "../../utils/dictUtil";
+import {Tag} from "antd-mobile";
+
const TaskCount = (props) => {
let currentDay = props.currentDay;
const [taskCount, setTaskCount] = React.useState([]);
- useMemo(() => {
- if (!currentDay){
- return;
+ const [stateMap, setStateMap] = React.useState(new Map);
+ const [priorityMap, setPriorityMap] = React.useState(new Map);
+ useEffect(() => {
+ console.log("useEffect");
+ if (currentDay) {
+ getTaskCount(dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0),
+ dayjs(currentDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0))
+ .then(taskCount => {
+ setTaskCount(taskCount)
+ })
}
- console.log('currentDay',dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0))
- console.log("currentDay",currentDay?"true":"false")
- getTaskCount(dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0),
- dayjs(currentDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0))
- .then(taskCount => {
- console.log("taskCount",taskCount)
- })
- }, [props]);
+ getDictionary("2").then(state => {
+ setStateMap(state)
+ })
+ getDictionary("1").then(priority => {
+ console.log(priority)
+ setPriorityMap(priority)
+ })
+ }, [currentDay])
+
return (
-
-
今天代办:
-
任务状态
-
优先级
+
+
TODO日{dayjs(currentDay).format(DATE_FORMAT)}代办:
+
任务状态
+ {
+ // taskCount.map(task => {
+ // // if (dayjs(task.todoDay).isSame(dayjs(currentDay))){
+ // // console.log(dict);
+ // // return
{task.todoDay}
+ // return Array.from(stateMap.entries()).map(([item,value]) => {
+ // console.log("key",item,"value",value,task.state)
+ // return
value.itemName + task.state[item]
+ // })
+ //
+ // // return task.priority.map((key,value)=>getDictionary(2).get(key)+value)
+ // // }
+ // })
+ taskCount[0] && Object.keys(taskCount[0].state).map(ob => {
+ return
{stateMap.get(ob).itemName} 共
+ {taskCount[0].state[ob]} 项代办;
;
+ })
+ }
+
优先级
+ {
+ taskCount[0] && Object.keys(taskCount[0].priority).map(ob => {
+ console.log("stateMap.get(ob).jsonValue?.color", priorityMap.get(ob))
+ return
{priorityMap.get(ob).itemName} 共
+ {taskCount[0].priority[ob]} 项代办;
;
+ })
+ }
)
}
diff --git a/src/utils/dictUtil.js b/src/utils/dictUtil.js
index dd84cd2..1ec0f4c 100644
--- a/src/utils/dictUtil.js
+++ b/src/utils/dictUtil.js
@@ -1,10 +1,18 @@
import {requestUtil} from "./requestUtil";
-const dict = new Map();
+// const dict = new Map();
+
export const getDictionary = async (typeId) => {
- if (dict.has(typeId)) {
- return dict.get(typeId);
+ let item1 = localStorage.getItem("huayu-dict-" + typeId);
+ console.log("item1: ", item1);
+ if (item1) {
+ return new Map(JSON.parse(item1).map(item => {
+ return [item.itemCode, item]
+ }))
}
+ // if (dict.has(typeId)) {
+ // return dict.get(typeId);
+ // }
let search = encodeURI(`{"data":[
{"code":"type_id","value":"${typeId}","operateType":"="},
{"code":"enable_flag","value":"1","operateType":"="}
@@ -13,8 +21,14 @@ export const getDictionary = async (typeId) => {
let context = todo.content;
let result;
if (context.length > 0) {
- result = new Map(context.map(item => [item.itemCode, item]))
- dict.set(typeId, result);
+ result = new Map(context.map(item => {
+ if (item.jsonValue) {
+ item.jsonValue = JSON.parse(item.jsonValue);
+ }
+ return [item.itemCode, item]
+ }))
+ localStorage.setItem("huayu-dict-" + typeId, JSON.stringify(context));
+ // dict.set(typeId, result);
}
return result;
}
\ No newline at end of file
diff --git a/src/utils/index.js b/src/utils/index.js
index c427b10..dfc4936 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -26,7 +26,7 @@ export const getCurrentCity=()=>{
export const getTaskList= (data) => {
let request = encodeURI(JSON.stringify(data))
- return requestUtil.get('http://localhost:8092/V2/search/task_message_tree?search='+request);
+ return requestUtil.get('/todo-server/V2/search/task_message_tree?search='+request);
}
// 根据pid获取未完成的任务
export const getTaskByPid = (pid) => {
@@ -34,7 +34,7 @@ export const getTaskByPid = (pid) => {
}
export const getTaskCount = (startDate,endDate)=>{
- return requestUtil.get(`http://localhost:8092/task/taskCount?startDate=${startDate}&endDate=${endDate}`);
+ return requestUtil.get(`/todo-server/task/taskCount?startDate=${startDate}&endDate=${endDate}`);
}
export const getTaskById= (id) => {
diff --git a/src/utils/requestUtil.js b/src/utils/requestUtil.js
index 4be193d..a2ec6ca 100644
--- a/src/utils/requestUtil.js
+++ b/src/utils/requestUtil.js
@@ -3,7 +3,7 @@ import axios from "axios";
export const requestUtil = axios.create({
baseURL: 'http://www.huaruyu.com/',
timeout: 1000,
- headers: {'Authorization': 'Bearer eyJraWQiOiJmNWUyYjA5MC04OGFlLTQ0OWUtOGVjYi02OGU2MDc3NjZjYmYiLCJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJzaGl4aWFvaHVhIiwic3ViIjoie1wiaWRcIjpcIjM2OTg0Nzc3MTAxODAzNTIwXCIsXCJuaWNrbmFtZVwiOlwi5biI5pmT5Y2OXCIsXCJ1c2VybmFtZVwiOlwic2hpeGlhb2h1YVwifSJ9.czZQu3TQauvyZ0Qy_6rVjK-5iH9Jh4NKrOL2-sNpfmsM9T_5rmDuOrLZ8OCblMHIh9rU9PIIml4Sq14jTr0iiSyHxRyzxtQShIKfxaJKOKNrNhrsGQWv7AD067CJ-kiSP4qeTFIS9SIjPlWJq29l5PieEdU381MXpZS2GJ2_0kr5rKQbHcr4GkSSPY0FhTrTKtnvxqB32Bs3BDPncjwV_0w_YKrQaNl5vmJ7jZIEs_cc7CgLBzOA9001xeENGsAG8yxVGYrDA4fSu2BsUdx-YtWnv5apCFVRoMfY82_I5Yjg9CWWpY6zHcgDoyNCQ-nBPgCcVbMJFlooG8ipt1SGKQ'}
+ headers: {'Authorization': 'Bearer eyJraWQiOiJjZDE5YjcxYy05ZDkwLTQyY2EtOGM5NC02YmMyNWY4YTdmNjgiLCJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJzaGl4aWFvaHVhIiwic3ViIjoie1wiaWRcIjpcIjM2OTg0Nzc3MTAxODAzNTIwXCIsXCJuaWNrbmFtZVwiOlwi5biI5pmT5Y2OXCIsXCJ1c2VybmFtZVwiOlwic2hpeGlhb2h1YVwifSJ9.3Wu8VMAuk59WP_EIRGX6hVp1ShuvYiAwFmvE6CGe5zA_9AzvUVMyRGWWcEQQzuU3BlZ14cV8-9b_g9_tZepQE_mSlDn0yJ92jB3ATxFPsAdcC5m2o7UY6spUs3zrlJ7v99Gtd6YzzUZvk0JTPjJCIpSi5-_PtIcOmZEkjgLwa2fnOj8eh9U3B2YdQ6p8J8r1ZeNfSMlzFuIyVcLFR-ftDz3Gr6wbs3fPgh03GqevL-HKyTCku2Fb9oYWis4UYDYQFfEVYVLzocsS3DpKyeq8BGxRRqQkSXsodDaO2piib-60Zp5WOg6hQb0n9utH-fQDVU5hIhUYkAbKkGDmTrnyqg'}
});
// 添加响应拦截器
requestUtil.interceptors.response.use(function (response) {