This commit is contained in:
wanggeng 2024-05-27 21:25:36 +08:00
parent 68bd64e134
commit b76f6322c8
11 changed files with 18 additions and 86 deletions

View File

@ -5,7 +5,6 @@ import {CheckOutlined, EditOutlined, ReloadOutlined} from "@ant-design/icons";
import { get } from "../../../util/AjaxUtils.ts"; import { get } from "../../../util/AjaxUtils.ts";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { import {
message message
} from "antd"; } from "antd";
type PropsType = { type PropsType = {
@ -33,7 +32,7 @@ export default function AiHelperText(props: PropsType) {
}, []) }, [])
const [messageApi, contextHolder] = message.useMessage(); const [messageApi] = message.useMessage();
const [text, setText] = useState(''); const [text, setText] = useState('');
const [newText, setNewText] = useState(''); const [newText, setNewText] = useState('');

View File

@ -3,19 +3,17 @@ import './card-proj.css';
import { import {
CheckOutlined, CheckOutlined,
ClockCircleOutlined, ClockCircleOutlined,
CloseCircleOutlined, CloseCircleOutlined, DeleteOutlined,
CreditCardOutlined, DeleteOutlined,
DownloadOutlined, DownOutlined, DownloadOutlined, DownOutlined,
EditOutlined, EditOutlined,
EyeOutlined, EyeOutlined,
LoadingOutlined, LoadingOutlined,
SearchOutlined, SearchOutlined,
SettingOutlined,
WarningOutlined, WarningOutlined,
FolderOutlined FolderOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import { Button, ConfigProvider, Dropdown, Tag } from 'antd'; import { Button, Dropdown, Tag } from 'antd';
import { GenerateStatus, IProj, PayStatus, ProjChargeType } from "../../interfaces/proj/IProj.ts"; import { GenerateStatus, IProj, ProjChargeType } from "../../interfaces/proj/IProj.ts";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { Axios, put } from "../../util/AjaxUtils.ts"; import { Axios, put } from "../../util/AjaxUtils.ts";
import { useContext, useEffect, useState } from "react"; import { useContext, useEffect, useState } from "react";
@ -24,7 +22,6 @@ import useMessage from "antd/es/message/useMessage";
import setImg from '../../static/right/set.png' import setImg from '../../static/right/set.png'
import orderImg from '../../static/right/order.png' import orderImg from '../../static/right/order.png'
import menuImg from '../../static/right/menu.png' import menuImg from '../../static/right/menu.png'
import testImg from '../../static/test.jpg'
export default function CardProj(props: { item: IProj }) { export default function CardProj(props: { item: IProj }) {
const nav = useNavigate(); const nav = useNavigate();
// const [showZpi,setShowZpi] = useState(false) // const [showZpi,setShowZpi] = useState(false)
@ -60,64 +57,6 @@ export default function CardProj(props: { item: IProj }) {
return <Tag color="red"><CloseCircleOutlined /> </Tag> return <Tag color="red"><CloseCircleOutlined /> </Tag>
} }
const renderOption = () => {
if (data.pay.payStatus == PayStatus.UNPAID) {
return (
<>
<div className="option">
<Button size="small" type="text"><CreditCardOutlined /> </Button>
</div>
</>
)
}
return (
<>
<div className="option">
<Button size="small" type="text" onClick={() => {
if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
nav(`/proj-edit/config-loginpage-show/${data.projId}`)
} else {
nav(`/proj-edit/config-loginpage/${data.projId}`)
}
}}><SettingOutlined /> </Button>
<Button size="small" type="text" onClick={() => {
if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
nav(`/proj-edit/config-mod-list-show/${data.projId}`)
} else {
nav(`/proj-edit/config-mod-list/${data.projId}`)
}
}}><SettingOutlined /> ({data.projModCount})</Button>
<Button size="small" type="text" onClick={() => {
if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
nav(`/proj-edit/config-menu-list-show/${data.projId}`)
} else {
nav(`/proj-edit/config-menu-list/${data.projId}`)
}
}}><SettingOutlined /> ({data.projModCount})</Button>
</div>
{
data.generate.generateStatus == GenerateStatus.SUCCESS ? (
<div className="option">
<Button size="small" type="text" onClick={() => {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${data.projId}`)
}}><DownloadOutlined /> </Button>
<Button size="small" type="text" onClick={() => {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${data.projId}`)
}}><DownloadOutlined /> </Button>
<Button size="small" type="text" onClick={() => {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${data.projId}`)
}}><DownloadOutlined /> </Button>
<Button size="small" type="text" onClick={() => {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${data.projId}`)
}}><DownloadOutlined /> </Button>
</div>
) : <></>
}
</>
)
}
const goEdit = () => { const goEdit = () => {
if (charge == ProjChargeType.ALL) { if (charge == ProjChargeType.ALL) {
nav(`/proj-eall/${data.projId}`); nav(`/proj-eall/${data.projId}`);

View File

@ -26,7 +26,7 @@ export default function ListProjAgent() {
const [agents, setAgents] = useState<IAgent[]>([]); const [agents, setAgents] = useState<IAgent[]>([]);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [keywords, setKeywords] = useState(''); const [keywords] = useState('');
const domHeight = window.innerHeight - 280; const domHeight = window.innerHeight - 280;
useEffect(() => { useEffect(() => {

View File

@ -1,5 +1,3 @@
import React from 'react'
export default function CopyrightGgoods() { export default function CopyrightGgoods() {
return ( return (
<div> <div>

View File

@ -1,5 +1,3 @@
import React from 'react'
export default function ProductRelease() { export default function ProductRelease() {
return ( return (
<div> <div>

View File

@ -1,4 +1,3 @@
import React from 'react'
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import './searchList.css' import './searchList.css'
import { Pagination, Spin, Image, message } from 'antd'; import { Pagination, Spin, Image, message } from 'antd';

View File

@ -1,5 +1,3 @@
import React from 'react'
export default function TradingGoods() { export default function TradingGoods() {
return ( return (
<div></div> <div></div>

View File

@ -1,5 +1,3 @@
import React from 'react'
export default function TransactionOrder() { export default function TransactionOrder() {
return ( return (
<div></div> <div></div>

View File

@ -681,14 +681,14 @@ export default function ProjEditStep2() {
<Column <Column
title="所属类型" title="所属类型"
dataIndex="type" dataIndex="type"
render={(text, record: any) => ( render={(_text, record: any) => (
record.type === 'PERSONAL' ? '自然人' : '企业/组织' record.type === 'PERSONAL' ? '自然人' : '企业/组织'
)} )}
/> />
<Column <Column
title="所属证件类型" title="所属证件类型"
dataIndex="idCardType" dataIndex="idCardType"
render={(text, record: any) => ( render={(_text, record: any) => (
record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' record.idCardType === 'ID_CARD' ? '身份证' : '营业执照'
)} )}
/> />

View File

@ -678,14 +678,14 @@ export default function ProjEditStep2() {
<Column <Column
title="所属类型" title="所属类型"
dataIndex="type" dataIndex="type"
render={(text, record: any) => ( render={(_text, record: any) => (
record.type === 'PERSONAL' ? '自然人' : '企业/组织' record.type === 'PERSONAL' ? '自然人' : '企业/组织'
)} )}
/> />
<Column <Column
title="所属证件类型" title="所属证件类型"
dataIndex="idCardType" dataIndex="idCardType"
render={(text, record: any) => ( render={(_text, record: any) => (
record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' record.idCardType === 'ID_CARD' ? '身份证' : '营业执照'
)} )}
/> />

View File

@ -4,13 +4,14 @@ import type {MessageInstance} from "antd/es/message/interface";
export const Axios = axios; export const Axios = axios;
// axios.defaults.baseURL = 'http://192.168.0.163:7025/copyright'; // axios.defaults.baseURL = 'http://192.168.0.163:7025/copyright';
axios.defaults.baseURL = 'http://192.168.0.15:7025/copyright'; // axios.defaults.baseURL = 'http://192.168.0.15:7025/copyright';
// axios.defaults.baseURL = '/copyright'; // axios.defaults.baseURL = 'https://www.aimzhu.com/copyright';
export const WebSocketBaseUrl: string = 'ws://192.168.0.15:7025/copyright'; axios.defaults.baseURL = '/copyright';
// export const WebSocketBaseUrl: string = '/copyright'; // export const WebSocketBaseUrl: string = 'wss://www.aimzhu.com/copyright';
export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067 export const WebSocketBaseUrl: string = '/copyright';
// export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067
// export const DevUserId: string = 'c2438eb8-2685-49a9-bf02-5111a5192d96'; // 18647109157 // export const DevUserId: string = 'c2438eb8-2685-49a9-bf02-5111a5192d96'; // 18647109157
// export const DevUserId: string = ''; export const DevUserId: string = '';
type Req<T> = { type Req<T> = {
messageApi: MessageInstance; messageApi: MessageInstance;
@ -44,10 +45,12 @@ export function websocketUrl() {
} }
const location = window.location; const location = window.location;
const protocol = location.protocol; const protocol = location.protocol;
console.log(protocol);
let wsProtocol = 'ws'; let wsProtocol = 'ws';
if (protocol == 'https') { if (protocol == 'https') {
wsProtocol = 'wss'; wsProtocol = 'wss';
} }
console.log(wsProtocol);
return `${wsProtocol}://${location.host}${WebSocketBaseUrl}`; return `${wsProtocol}://${location.host}${WebSocketBaseUrl}`;
} }