();
const updateTime = () => {
const date = new Date();
const month = (date.getMonth() + 1).toString().padStart(2, "0");
@@ -26,6 +30,11 @@ const Home = observer(() => {
// 每秒钟更新一次时间
useEffect(() => {
let tim = setInterval(updateTime, 1000);
+ setTimeout(() => {
+ MapUtl.wecherInfo?.getLive("双流区", (err, data) => {
+ setWechaer(data);
+ });
+ }, 2000);
return () => {
clearInterval(tim);
};
@@ -42,6 +51,20 @@ const Home = observer(() => {
+
+
天气:{wechaer?.weather}
+
风向:{wechaer?.windDirection}
+
风级:{wechaer?.windPower}
+
湿度:{wechaer?.humidity}
+
+ {/* */}
+
diff --git a/src/pages/home/homeLeft/home_left.tsx b/src/pages/home/homeLeft/home_left.tsx
index 41878d7..ca878cf 100644
--- a/src/pages/home/homeLeft/home_left.tsx
+++ b/src/pages/home/homeLeft/home_left.tsx
@@ -3,8 +3,6 @@ import Orgin from "./orgin";
import Pover from "./pover";
import Turn from './turn';
const HomeLeft = () => {
-
-
// const openDispatch = () => {
// 位置移动
// MapUtl.makerList[0].setPosition([103.55, 30.342]);
diff --git a/src/pages/home/homeLeft/turn.tsx b/src/pages/home/homeLeft/turn.tsx
index 982c24a..b669a39 100644
--- a/src/pages/home/homeLeft/turn.tsx
+++ b/src/pages/home/homeLeft/turn.tsx
@@ -73,6 +73,7 @@ const Turn = (props: Store) => {
{trainingStore.list?.map((item) => {
return (
{
type="dashed"
size="small"
onClick={() => {
- trainingStore.back(record?.identity);
+ trainingStore.back(record?.identity,2);
}}
>
物资归还
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 216d1fa..e5d8d55 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -8,6 +8,7 @@ import React from "react";
import { columns, defaultConfig } from "./user_config";
import "./user.less";
import Move from "./move";
+import dayjs from "dayjs";
const { Option } = Select;
const User = (props: Store) => {
@@ -24,15 +25,16 @@ const User = (props: Store) => {
const edit = (record) => {
record = {
...record,
+ vet_in_time: dayjs(record.vet_in_time),
+ vet_out_time: dayjs(record.vet_out_time),
imageUrl: [{ url: record.imageUrl }],
};
setProjectConfig(defaultConfig(team, per));
setIsModalOpen(true);
- formRef.current?.setFieldsValue(record);
setRecord(record);
setId(record.id);
};
- const onFinish = (values: any) => {
+ const onFinish = async (values: any) => {
let data = {
...values,
};
@@ -42,10 +44,17 @@ const User = (props: Store) => {
data.head_img = "";
}
if (!userId) {
- usrStore.add(data);
+ let res = await usrStore.add(data);
+ console.log(res);
+ if (res) {
+ setIsModalOpen(false);
+ }
} else {
+ let res = await usrStore.putItem(userId, data);
+ if (res) {
+ setIsModalOpen(false);
+ }
}
- setIsModalOpen(false);
};
useEffect(() => {
usrStore.getlist();
@@ -74,6 +83,7 @@ const User = (props: Store) => {
const addHandler = () => {
setProjectConfig(defaultConfig(team, per));
setId(null);
+ setRecord(null)
setIsModalOpen(true);
};
const onFinishFailed = () => {};
@@ -104,7 +114,6 @@ const User = (props: Store) => {
编辑
-