+ {/**
-
+
*/} + +
@@ -176,13 +215,13 @@ const CreateOutApplication=()=>{ } }} value={item.inventoryProductName!=null? - item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition+"号库"+item.inventoryRepository+"位" + item.inventoryProductName+"--"+item.inventoryProduct+"--"+getPosition(item.inventoryProductName,item.inventoryProduct)+"号库"+getRepository(item.inventoryProductName,item.inventoryProduct)+"位" :"名称--货物编号--仓库"} onSelect={(value,key) => { console.log(value,key); let newList = [...productVOList]; newList[index].inventoryProductName = key.title; - newList[index].inventoryId = key.key; + newList[index].inventoryProduct = key.key; newList[index].inventoryPosition = getPosition(key.title,key.key) newList[index].inventoryRepository = getRepository(key.title,key.key); setProductVOList([...newList]); @@ -196,8 +235,8 @@ const CreateOutApplication=()=>{ > {allData?.map((item) => { return ( - ); })} @@ -214,6 +253,9 @@ const CreateOutApplication=()=>{ }} placeholder="请输入货物数量" /> + {index !== 0 && (
+
+ 确定
+
+
+ ]}>
+
+
)
}
diff --git a/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js b/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
index d3b6de79a4a9aacf13fc2e280f7d20167f34f5eb..f6cec7e88c4411fdc5ebb31127cae294e8885430 100644
--- a/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
+++ b/src/userComponents/userManageCenter/homeTrading/CreateTradingApplication.js
@@ -1,13 +1,11 @@
import React, { useState, useEffect } from 'react';
import ReactDOM from 'react-dom/client';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Space, Typography, Select } from 'antd';
+import { Select, Modal } from 'antd';
import axios from "axios";
import { CgRemove } from "react-icons/cg";
-import { nanoid } from "nanoid";
-import { StorgeChosen, DateSelect, GoodsChosen } from '../../index';
-
+import { Link } from 'react-router-dom';
+/*
const allData=[
{
"inventoryOwner": "ICb4e2ad2c",
@@ -75,15 +73,56 @@ const allData=[
"inventoryId": 21
}
]
- const { Option } = Select;
+ */
+
+const { Option } = Select;
const CreateTradingApplication=()=>{
- const [productVOList, setProductVOList] = useState([[]]);
+ const [productVOList, setProductVOList] = useState([]);
+ const [allData,setAllData]=useState([]);
const [userIc, setUserIc] = useState(null);
+ const [orderBuyer, setOrderBuyer] = useState(null);
+ const [isModalVisible, setIsModalVisible] = useState(false);
+
+ useEffect(() => {
+ axios({
+ method: 'get',
+ url: '/passport/userinfo',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ token:localStorage.getItem('token'),
+ }
+ })
+ .then(response=> {
+
+ setUserIc(response.data.data.userIC);
+ return axios({
+ method: 'post',
+ url: '/user/userhome/manage/trading/inventory',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ user_ic:response.data.data.userIC,
+ }
+ })
+ .then(response=> {
+ console.log(response.data.data.items);
+ setAllData(response.data.data.items);
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+
+
+
+ },[]);
const addGoodsItem = () => {
setProductVOList([
...productVOList,
- { inventoryNum: null, inventoryId: null, inventoryProductName: null },
+ { inventoryNum: null, inventoryProduct: null, inventoryProductName: null, inventoryOwner:userIc },
]);
};
@@ -102,6 +141,9 @@ const CreateTradingApplication=()=>{
method: 'post',
url: '/user/userhome/manage/trading/order',
data:productVOList,
+ params:{
+ order_buyer:orderBuyer,
+ }
//orderCreatetime: "2022-07-14T07:47:57.850Z",
//orderCreatetime:time,
@@ -111,20 +153,39 @@ const CreateTradingApplication=()=>{
})
.then(response=> {
console.log(response);
- console.log("1");
+ if(response.data.message==="过户申请成功"){
+ setIsModalVisible(true);
+ }else{
+ alert(response.data.message);
+ }
})
.catch(function (error) {
console.log(error.config);
- console.log("2");
});
}
+ const getPosition=(a,b)=>{
+ let data=allData.filter(item=>item.inventoryProductName==a&&item.inventoryProduct==b);
+ let position=data[0].inventoryPosition;
+ return position;
+ }
+
+ const getRepository=(a,b)=>{
+ let data=allData.filter(item=>item.inventoryProductName==a&&item.inventoryProduct==b);
+ let repository=data[0].inventoryRepository;
+ return repository;
+ }
+
+ const getAmount=(a,b)=>{
+ let data=allData.filter(item=>item.inventoryProductName==a&&item.inventoryProduct==b);
+ let amount=data[0].inventoryNum;
+ return amount;
+ }
+
return(
+
*/} + +
@@ -176,13 +215,13 @@ const CreateOutApplication=()=>{ } }} value={item.inventoryProductName!=null? - item.inventoryProductName+"--"+item.inventoryId+"--"+item.inventoryPosition+"号库"+item.inventoryRepository+"位" + item.inventoryProductName+"--"+item.inventoryProduct+"--"+getPosition(item.inventoryProductName,item.inventoryProduct)+"号库"+getRepository(item.inventoryProductName,item.inventoryProduct)+"位" :"名称--货物编号--仓库"} onSelect={(value,key) => { console.log(value,key); let newList = [...productVOList]; newList[index].inventoryProductName = key.title; - newList[index].inventoryId = key.key; + newList[index].inventoryProduct = key.key; newList[index].inventoryPosition = getPosition(key.title,key.key) newList[index].inventoryRepository = getRepository(key.title,key.key); setProductVOList([...newList]); @@ -196,8 +235,8 @@ const CreateOutApplication=()=>{ > {allData?.map((item) => { return ( - ); })} @@ -214,6 +253,9 @@ const CreateOutApplication=()=>{ }} placeholder="请输入货物数量" /> + {index !== 0 && (
{
+
您已提交申请，即将返回主界面。
+
-
-
-
+ {/**
@@ -138,7 +199,9 @@ const CreateTradingApplication=()=>{
-
+
*/} + +
@@ -146,7 +209,7 @@ const CreateTradingApplication=()=>{
)
}
diff --git a/src/userComponents/userMessageCenter/MessageCenter.js b/src/userComponents/userMessageCenter/MessageCenter.js
index 26686c89b26f9aef7b7d37ea4542908ba8ed65cd..b354fad1c975b115b43d0a094d2f59969891c36a 100644
--- a/src/userComponents/userMessageCenter/MessageCenter.js
+++ b/src/userComponents/userMessageCenter/MessageCenter.js
@@ -1,9 +1,209 @@
-import React from 'react';
+import React, { useState, useEffect, forwardRef } from 'react';
import ReactDOM from 'react-dom/client';
-import { Navigate, Route, Routes } from "react-router-dom";
+import { Navigate, Route, Routes, Router } from "react-router-dom";
import Logo from "../../img/logo1.png";
import { UserHelpSidebar, MessageList } from "../index";
+import axios from 'axios';
+import { Modal} from 'antd';
+import { EventSourcePolyfill } from 'event-source-polyfill';
+
+
+
+const MessageCenter=forwardRef((props, ref)=>{
+ const [userIc,setUserIc]=useState(null);
+ //const [isok,setIsok]=useState(true);
+ useEffect(() => {
+ //console.log(evtSource.readyState);
+ axios({
+ method: 'get',
+ url: '/passport/userinfo',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ token:localStorage.getItem('token'),
+ }
+ })
+ .then(response=> {
+ setUserIc(response.data.data.userIC);
+ return axios({
+ method: 'get',
+ url: '/sse/getMessage',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ //token:localStorage.getItem('token'),
+ userIC:response.data.data.userIC,
+ }
+ })
+ .then(response=> {
+ console.log(response);
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+
+
+ },[]);
+
+
+
+ const evtSource = new EventSourcePolyfill('http://10.133.128.40:8088/sse/connect/'+userIc, {
+ headers: {
+ token:localStorage.getItem('token'),
+ }
+ });
+
+ //var evtSource=new EventSource('http://localhost/sse/connect'+userIc);
+
+ if(props.isok){
+ evtSource.onopen = function(event){
+ console.log("ok");
+ };
+
+ evtSource.addEventListener("msg", function(event){
+ console.log(evtSource.readyState);
+ console.log(props.isok);
+ var result = document.getElementById("result").innerText;
+ result +='\n' + " message:" + event.data;
+ document.getElementById("result").innerText=result;
+ })
+
+ evtSource.onerror = function(event) {
+ console.log("no");
+ evtSource.close();
+ console.log(evtSource.readyState);
+
+ };
+
+ }
+
+
+
+
+
+
+ useEffect(()=>{
+ console.log('useEffect=>Index')
+ return ()=>{
+ //setIsok(false);
+ console.log(evtSource.readyState);
+ evtSource.close();
+ one();
+ console.log(evtSource.readyState);
+ //setIsok(false);
+ axios({
+ method: 'get',
+ url: '/sse/close/'+userIc,
+ //headers: {'Authorization': localStorage.getItem('token')},
+
+ params:{
+ token:localStorage.getItem('token'),
+ }
+
+ })
+ .then(response=> {
+ console.log(response);
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+ console.log(evtSource.readyState);
+
+ }
+ },[])
+
+ const one=()=>{
+ console.log('Index页面离开');
+ }
+
+
+
+ const onClick=()=>{
+ axios({
+ method: 'get',
+ url: '/sse/getIds',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ token:localStorage.getItem('token'),
+ }
+ })
+ .then(response=> {
+ console.log(response);
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+
+ axios({
+ method: 'post',
+ url: '/sse/pushOne',
+ //headers: {'Authorization': localStorage.getItem('token')},
+ params:{
+ token:localStorage.getItem('token'),
+ message:"123456",
+ userIC:userIc,
+ }
+ })
+ .then(response=> {
+ console.log(response);
+ })
+ .catch(function (error) {
+ console.log(error.config);
+ });
+ }
+
+ /*
+ customConfirm = (message,callback) => {
+ Modal.confirm({
+ title:"确定离开该页面？",
+ onCancel: () => {
+ callback(false);
+ },
+ onOk: () => {
+ evtSource.close();
+ callback(true);
+ }
+ })
+ }
+*/
+
+//}/>
}/>
- }/>
+ } />
@@ -138,7 +199,9 @@ const CreateTradingApplication=()=>{
+
*/} + +
@@ -146,7 +209,7 @@ const CreateTradingApplication=()=>{
- {setUserIc(e.target.value)}} className='rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44'>
+ {setOrderBuyer(e.target.value)}} className='rounded-md outline outline-1 outline-gray-700 relative inset-x-1 w-44'>
{productVOList.map((item, index) => (
+
+ ]}>
+ {productVOList.map((item, index) => (
您已提交申请，即将返回主界面。
+
+
+
+
+ )
+})
+
+/*
class MessageCenter extends React.Component{
render(){
@@ -28,5 +228,6 @@ class MessageCenter extends React.Component{
)
}
}
+*/
export default MessageCenter;
\ No newline at end of file
diff --git a/src/userComponents/userMessageCenter/MessageList.js b/src/userComponents/userMessageCenter/MessageList.js
index f4f640e916f2f67a7b49ff568d6b9d349b7c40b7..b09f61ef6849d603e809c01005eb36c0df32f62a 100644
--- a/src/userComponents/userMessageCenter/MessageList.js
+++ b/src/userComponents/userMessageCenter/MessageList.js
@@ -14,9 +14,8 @@ evtSource.onmessage = function(e) {
}
*/
-function MessageList(){
-
- var evtSource=new EventSource('http://localhost:8080/sse/connect/8');
+const MessageList=()=>{
+ var evtSource=new EventSource('/sse/connect/8');
evtSource.onopen = function(event){
console.log("ok");
@@ -49,21 +48,43 @@ function MessageList(){
)
}
-
-
/*
-class MessageList extends React.Component{
- constructor(props){
- super(props);
- }
+function MessageList(){
- render(){
- return(
-
- )
- }
+ var evtSource=new EventSource('/sse/connect/8');
+
+ evtSource.onopen = function(event){
+ console.log("ok");
+ };
+ evtSource.addEventListener("message", function(event){
+
+ var result = document.getElementById("result").innerText;
+ result +='\n' + " message:" + event.data;
+ document.getElementById("result").innerText=result;
+ })
+
+ evtSource.onerror = function(event) {
+ console.log("no");
+ };
+
+
+ return(
+
+
+
+
+
+
+
+ 
+
+ +
物流仓储管理系统
++
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ )
}
*/
+
+
export default MessageList;
\ No newline at end of file
diff --git a/src/userPages/IntoHomePage.js b/src/userPages/IntoHomePage.js
index 72682d695786d096839f16295cee3767c77ef225..f4cffb0f0b4399e141a723815b9a3bf85ea0f285 100644
--- a/src/userPages/IntoHomePage.js
+++ b/src/userPages/IntoHomePage.js
@@ -8,15 +8,22 @@ import { ManageCenter, HelpCenter, UserHeader, MessageCenter } from "../userComp
const Into=()=> {
- const {username}=useParams();
+ //const {username}=useParams();
const [userName, setUserName] = useState(null);
- console.log(username);
-
+ //console.log(username);
+ const [isright,setIsright]=useState(false);
+ const location=useLocation();
+ console.log(location);
useEffect(() => {
-
- setUserName(username);
- console.log(username);
- },[]);
+ if(location.pathname=="/user/userhome/message"){
+ setIsright(true);
+ }else{
+ setIsright(false);
+ }
+ console.log(isright);
+ //setUserName(username);
+ //console.log(username);
+ });
return (
@@ -30,7 +37,7 @@ const Into=()=> {
+
+
+
+ +
+
+
+
+