feat(): 接口对接
parent
f0b8f07df5
commit
01204ca96d
|
|
@ -1 +1 @@
|
|||
PUBLIC_URL=/ykz
|
||||
PUBLIC_URL=/test
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
GENERATE_SOURCEMAP=false
|
||||
PUBLIC_URL=/ykz
|
||||
PUBLIC_URL=/test
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<script type="text/javascript" src="%PUBLIC_URL%/popmotion.xl.min.js"></script>
|
||||
<script type="text/javascript" src="%PUBLIC_URL%/imouplayer.js"></script>
|
||||
<script src="%PUBLIC_URL%/h5Player/h5player.min.js"></script>
|
||||
<title>盐卡引水闸信息化系统</title>
|
||||
<title>测试</title>
|
||||
|
||||
<style>
|
||||
.lf{
|
||||
|
|
|
|||
|
|
@ -187,9 +187,13 @@ export async function loadMenu(): Promise<MenuItem[]> {
|
|||
const tree = buildTree(data,0)
|
||||
const tree2 = tree?.filter((item:any) =>(item.menuId != "1" && item.menuId != "2" && item.menuId != "3"))
|
||||
handelTreeData(tree2,id)
|
||||
return tree2
|
||||
// return tree2
|
||||
|
||||
|
||||
return [
|
||||
{ id: id(), title: '测试', path: '/testLine', icon: 'yzt' },
|
||||
]
|
||||
|
||||
// const id = idgen()
|
||||
// return [
|
||||
// { id: id(), title: '首页', path: '/home', icon: 'yzt' },
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
|
|||
module.exports = function (app) {
|
||||
//咸丰调度系统
|
||||
app.use(
|
||||
'/gunshiApp',
|
||||
'/api',
|
||||
createProxyMiddleware({
|
||||
target: 'http://local.gunshiiot.com:18083/',//测试
|
||||
target: 'http://202.103.169.18:10100/',//测试
|
||||
// target: 'http://192.168.66.7:24106/',//正式
|
||||
// target: 'http://36.139.207.50:18083/',//移动云
|
||||
// target: 'http://192.168.66.49:24105/',//移动云
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ import MenuM from './SystemMangant/menuM'
|
|||
import TestLine from './TestLine'
|
||||
// const HomePage = lazy(() => import('./Home'))
|
||||
|
||||
|
||||
|
||||
const AppRouters: React.FC = () => {
|
||||
const dispatch = useDispatch<Dispatch>()
|
||||
|
||||
|
|
@ -37,7 +39,8 @@ const AppRouters: React.FC = () => {
|
|||
}, [dispatch])
|
||||
|
||||
let element = useRoutes([
|
||||
{ path: '/', element: <LoginPage /> },
|
||||
// { path: '/', element: <LoginPage /> },
|
||||
{ path: '/', element: <TestLine /> },
|
||||
{ path: '/home', element: <HomePage /> },
|
||||
{
|
||||
path: '/mgr',
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -6,10 +6,28 @@ import moment from 'moment';
|
|||
const { RangePicker } = DatePicker;
|
||||
const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
|
||||
|
||||
const types = Array(5).fill(0).map((item,i) => ({
|
||||
label: `${i + 1}#水库`,
|
||||
value: i + 1
|
||||
}))
|
||||
const types = [
|
||||
{
|
||||
label: "hjw",
|
||||
value: "hjw"
|
||||
},
|
||||
{
|
||||
label: "cq",
|
||||
value: "cq"
|
||||
},
|
||||
{
|
||||
label: "sxs",
|
||||
value: "sxs"
|
||||
},
|
||||
{
|
||||
label: "szl",
|
||||
value: "szl"
|
||||
},
|
||||
{
|
||||
label: "wpc",
|
||||
value: "wpc"
|
||||
},
|
||||
]
|
||||
|
||||
const timeType = [
|
||||
{
|
||||
|
|
@ -49,17 +67,20 @@ const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
|
|||
save()
|
||||
}
|
||||
|
||||
const onValuesChange = (val) =>{
|
||||
const onValuesChange = (val,o) =>{
|
||||
if ('time' in val) {
|
||||
setSearchVal({time: val.time})
|
||||
setType({time: val.time})
|
||||
form1.resetFields()
|
||||
}
|
||||
if ('code' in val) {
|
||||
setSearchVal(o)
|
||||
}
|
||||
}
|
||||
useEffect(() => {
|
||||
const params = {
|
||||
code: 1,
|
||||
// time:'1h'
|
||||
code: "hjw",
|
||||
time:'1h'
|
||||
}
|
||||
form.setFieldsValue(params)
|
||||
setSearchVal(params)
|
||||
|
|
@ -77,9 +98,9 @@ const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
|
|||
<Form.Item label="预见期" name="time">
|
||||
<NormalSelect allowClear style={{ width: '150px' }} options={timeType} />
|
||||
</Form.Item>
|
||||
<Form.Item>
|
||||
{/* <Form.Item>
|
||||
<Button type="primary" htmlType="submit">生成</Button>
|
||||
</Form.Item>
|
||||
</Form.Item> */}
|
||||
</Form>
|
||||
</div>
|
||||
</>
|
||||
|
|
|
|||
Loading…
Reference in New Issue