Skip to content

C
CivManage
Commit 528d33ac authored by shaoan123's avatar shaoan123
Browse files
Options

对接人工智能方案管理接口

parent e45a7f6d
Pipeline #27247 skipped with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 844 additions and 384 deletions
        .env
        View file @ 528d33ac
        # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
        PROXY=/Cityinterface:http://192.168.10.150:8777;/Publish:http://192.168.10.150:8777;/Web4:http://192.168.10.150:8777;/CityTemp:http://192.168.10.150:8777 # PROXY=/Cityinterface:http://192.168.10.150:8777;/Publish:http://192.168.10.150:8777;/Web4:http://192.168.10.150:8777;/CityTemp:http://192.168.10.150:8777
        PROXY=/Cityinterface:http://192.168.12.121:8082;/Publish:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
        # 可设置第二个代理，test为转发前缀，后面为代理转发的地址 # 可设置第二个代理，test为转发前缀，后面为代理转发的地址
        # PROXY2 = test : http://localhost:8006/ # PROXY2 = test : http://localhost:8006/
        ......
        src/pages/artificial/policiesIssued/policiesIssued.less
        View file @ 528d33ac
        ...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
        background-color: #ffffff; background-color: #ffffff;
        color: #000000; color: #000000;
        } }
        .ant-card-body{
        padding-bottom: 0 !important;
        }
        } }
        .predict{ .predict{
        display: flex; display: flex;
        ...@@ -31,4 +34,13 @@ ...@@ -31,4 +34,13 @@
        margin-left:1rem; margin-left:1rem;
        text-decoration: underline; text-decoration: underline;
        width: 8rem; width: 8rem;
        }
        .deviceList{
        max-height: 20rem;
        overflow-y: scroll;
        }
        .deleteItem{
        position:relative;
        right: -100%;
        top: -8rem;
        } }
        \ No newline at end of file
        src/pages/artificial/policiesIssued/predictionConfig/AddModal.jsx
        View file @ 528d33ac
        import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
        import { Form, Modal, Input, Select, notification, DatePicker, Spin } from 'antd'; import { Form, Modal, Input, Select, notification, DatePicker, Spin, Button, Card, Row, Col } from 'antd';
        import styles from '../policiesIssued.less' import styles from '../policiesIssued.less'
        // import moment from 'moment'; // import moment from 'moment';
        // import locale from 'antd/es/date-picker/locale/zh_CN'; // import locale from 'antd/es/date-picker/locale/zh_CN';
        ...@@ -10,8 +10,9 @@ import locale from 'antd/lib/date-picker/locale/zh_CN' ...@@ -10,8 +10,9 @@ import locale from 'antd/lib/date-picker/locale/zh_CN'
        import 'moment/locale/zh-cn' import 'moment/locale/zh-cn'
        moment.locale('zh-cn') moment.locale('zh-cn')
        import { import {
        getEquipmentInfo getEquipmentInfo, getQutaList, addPredictOptions, getSceneNameInfo, editPredictOptions
        } from '@/services/intelligence/api'; } from '@/services/intelligence/api';
        import { DeleteOutlined } from '@ant-design/icons';
        const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
        ...@@ -21,91 +22,150 @@ const AddModal = props => { ...@@ -21,91 +22,150 @@ const AddModal = props => {
        const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
        const [isloading, setIsLoading] = useState(false); const [isloading, setIsLoading] = useState(false);
        const [deviceCodes, setDeviceCode] = useState([]); //设备编码列表 const [deviceCodes, setDeviceCode] = useState([]); //设备编码列表
        const [deviceList, setDeviceList] = useState([]); //设备列表
        const [card, setCard] = useState([]); //卡片列表值
        const [timeType, setTimeType] = useState(['分钟', '小时', '天']); const [timeType, setTimeType] = useState(['分钟', '小时', '天']);
        const [intervalType, setIntervalType] = useState('分钟') const [intervalType, setIntervalType] = useState('分钟')
        const [CycleValue, setCycleValue] = useState('')
        const [sceneList, setSceneList] = useState([])
        const [form] = Form.useForm(); const [form] = Form.useForm();
        const { Item } = Form; const { Item } = Form;
        // 提交 // 提交
        const onSubmit = () => { const onSubmit = () => {
        console.log('deviceList', deviceList);
        form.validateFields().then(validate => { form.validateFields().then(validate => {
        if (validate) { if (validate) {
        let obj = form.getFieldsValue(); let obj = form.getFieldsValue();
        let DateFrom = moment(obj.Date[0]).format('YYYY-MM-DD') let DateFrom = moment(obj.time[0]).format('YYYY-MM-DD')
        let DateTo = moment(obj.Date[1]).format('YYYY-MM-DD') let DateTo = moment(obj.time[1]).format('YYYY-MM-DD')
        setLoading(true); let api = addPredictOptions
        let query = {
        if (type === 'add') { SceneName: obj.SceneName,
        Cycle: intervalType,
        } else if (type === 'edit') { CycleValue: CycleValue,
        handleEdit(); DateFrom: DateFrom,
        DateTo: DateTo,
        DeviceType: obj.DeviceType,
        PredictDateFrom: "",
        PredictDateTo: "",
        PredictName: obj.PredictName,
        Remarks: obj.Remarks,
        DeviceDetails:card
        } }
        // card.length ? query.DeviceDetails = card : delete query.DeviceDetails
        type === 'edit' ? (query.ID = formObj.ID) && (api = editPredictOptions) : delete query.ID && (api = addPredictOptions)
        setLoading(true);
        api(query).then(res => {
        setLoading(false);
        console.log('res', res);
        if (res.errMsg === '') {
        form.resetFields();
        callBackSubmit();
        prompt('success', `${type === 'add' ? "增加成功" : "编辑成功"}`)
        } else {
        prompt('fail', res.errMsg)
        }
        })
        } }
        }); });
        }; };
        const prompt = (type, content) => {
        const handleEdit = () => { if (type == 'success') {
        // SetServiceConfig({ notification.success({
        // servicename: serviceName, message: '提示',
        // terminalType: 'base', duration: 3,
        // isBaseMap: true, description: content,
        // jsonCfg: JSON.stringify(query) });
        // }) }
        // .then(res => { else {
        // setLoading(false); notification.error({
        // if (res.success) { message: '提示',
        // form.resetFields(); duration: 3,
        // callBackSubmit(); description: content,
        // notification.success({ });
        // message: '提示', }
        // duration: 3, }
        // description: res.message || '编辑成功',
        // });
        // } else {
        // notification.error({
        // message: '提示',
        // duration: 3,
        // description: res.message || '编辑失败',
        // });
        // }
        // })
        // .catch(err => setLoading(false));
        };
        const onFinish = value => { }; const onFinish = value => { };
        useEffect(() => { useEffect(() => {
        switch (type) { switch (type) {
        case 'add': case 'add':
        deviceType.length && getDeviceCode(deviceType[0].DeviceType) initData()
        break; break;
        case 'edit': case 'edit':
        form.setFieldsValue({ ...formObj }); initData()
        break; break;
        default: default:
        break; break;
        } }
        }, [visible]); }, [visible]);
        //页面初始化
        const initData = () => {
        if (type === 'add') {
        form.resetFields();
        setCycleValue('');
        setIntervalType('');
        setCard([])
        setDeviceList([])
        }
        else {
        setDeviceList([])
        form.setFieldsValue({ time: [moment(formObj.DateFrom, "YYYYMMDD"), moment(formObj.DateTo, "YYYYMMDD")], ...formObj });
        setCycleValue(formObj.CycleValue);
        setIntervalType(formObj.Cycle);
        if (formObj.DeviceDetails.length) {
        getEquipmentInfo(formObj.DeviceType).then(respone => {
        respone.getMe.length && respone.getMe[0].DeviceList.length && setDeviceCode(respone.getMe[0].DeviceList)
        let arr = [...deviceList]
        formObj.DeviceDetails.map((item, index) => {
        arr[index] = {}
        arr[index].code = respone.getMe.length ? respone.getMe[0].DeviceList : []
        form.setFieldsValue({
        [`deviceCode${index}`]: item.DeviceCode,
        [`indextr${index}`]: item.PointAddress,
        [`max${index}`]: item.MaxValue,
        [`min${index}`]: item.MinValue
        })
        })
        setCard(formObj.DeviceDetails)
        setDeviceList(arr)
        setLoading(false)
        })
        }
        }
        const getDeviceCode = (type) => { getSceneNameInfo().then(res => {
        res.getMe.length && setSceneList(res.getMe)
        })
        }
        //获取设备编码
        const getDeviceCode = () => {
        setLoading(false) setLoading(false)
        getEquipmentInfo(type).then(respone => { let obj = form.getFieldsValue();
        const divProps = []; getEquipmentInfo(obj.DeviceType).then(respone => {
        respone.getMe[0].DeviceList.map((item) => { respone.getMe.length && respone.getMe[0].DeviceList.length && setDeviceCode(respone.getMe[0].DeviceList)
        divProps.push({ disabled: false, value: item.Code, pid: item.PointAddressID }) if (deviceList.length) {
        }) let arr = [...deviceList]
        console.log('respone', divProps); arr.map((item, index) => {
        respone.getMe[0].DeviceList.length && setDeviceCode(divProps) arr[index].code = respone.getMe.length ? respone.getMe[0].DeviceList : []
        form.setFieldsValue({ arr[index].indexStr = ''
        deviceType: deviceType[0].DeviceType form.setFieldsValue({
        }); [`deviceCode${index}`]: '',
        [`indextr${index}`]: '',
        [`max${index}`]: '',
        [`min${index}`]: ''
        })
        })
        setDeviceList(arr)
        }
        setLoading(false) setLoading(false)
        }) })
        } }
        const layout = { const layout = {
        layout: 'horizontal', layout: 'horizontal',
        labelCol: { labelCol: {
        span: 4, span: 6,
        }, },
        wrapperCol: { wrapperCol: {
        span: 16, span: 16,
        ...@@ -113,24 +173,82 @@ const AddModal = props => { ...@@ -113,24 +173,82 @@ const AddModal = props => {
        }; };
        //选择设备类型 //选择设备类型
        const handleDeviceType = (value) => { const handleDeviceType = (value) => {
        getDeviceCode(value) getDeviceCode()
        } }
        const handleIntervalType = (value) => { const handleIntervalType = (value) => {
        setIntervalType(value) setIntervalType(value)
        } }
        const handleChange = (value) => { //选择设备编码
        console.log(value, 'value'); const handleChange = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].DeviceCode = value
        setCard(cardList)
        let obj = form.getFieldsValue();
        getQutaList({ accountName: obj.DeviceType, AddrSchemeID: option.pointid }).then(res => {
        if (res.getMe && res.getMe.length) {
        let arr = [...deviceList]
        arr[+option.index].indexStr = res.getMe
        setDeviceList(arr)
        }
        })
        }
        //选择设备指标
        const handleChangeIndex = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].PointAddress = value
        setCard(cardList)
        }
        //最大值
        const inputMax = (e, option) => {
        e.persist();
        let cardList = [...card]
        cardList[option].MaxValue = e.target.value
        setCard(cardList)
        }
        //最小值
        const inputMin = (e, option) => {
        e.persist();
        let cardList = [...card]
        cardList[option].MinValue = e.target.value
        setCard(cardList)
        }
        const add = () => {
        let obj = form.getFieldsValue();
        if (!obj.DeviceType) {
        notification.error({
        message: '提示',
        duration: 3,
        description: '请选择设备类型',
        });
        } else {
        let cardList = [...card]
        let arr = [...deviceList]
        cardList.push({})
        setCard(cardList)
        arr.push({ code: deviceCodes })
        setDeviceList(arr)
        }
        }
        //删除卡片
        const deleteDevice = (index) => {
        let cardList = [...card]
        let arr = [...deviceList]
        let newCardList = cardList.splice(0, 1)
        let newArr = arr.splice(0, 1)
        setCard(index == 0 ? [] : newCardList)
        setDeviceList(index == 0 ? [] : newArr)
        } }
        const handleChangeIndex = (value) => { //选择小时,分,天
        console.log(value, 'value'); const selectCycleValue = (e) => {
        setCycleValue(e.target.value)
        } }
        return ( return (
        <Modal <Modal
        title={`${type === 'add' ? '预测方案新增' : '编辑'}`} title={`${type === 'add' ? '预测方案新增' : '编辑'}`}
        bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
        style={{ top: '150px' }} style={{ top: '150px' }}
        width="700px" width="800px"
        destroyOnClose destroyOnClose
        maskClosable={false} maskClosable={false}
        cancelText="取消" cancelText="取消"
        ...@@ -146,71 +264,32 @@ const AddModal = props => { ...@@ -146,71 +264,32 @@ const AddModal = props => {
        <Form form={form} {...layout} onFinish={onFinish}> <Form form={form} {...layout} onFinish={onFinish}>
        <Item <Item
        label="方案名称" label="方案名称"
        name="TaskName" name="PredictName"
        rules={[{ required: true, message: '请输入方案名称' }]} rules={[{ required: true, message: '请输入方案名称' }]}
        > >
        <Input placeholder="请输入任务名称" allowClear /> <Input placeholder="请输入任务名称" allowClear />
        </Item> </Item>
        <Item <Item
        label="算法名称" label="场景名称"
        name="TaskName" name="SceneName"
        rules={[{ required: true, message: '请输入算法名称' }]} rules={[{ required: true, message: '请输入算法名称' }]}
        > >
        <Select > <Select >
        {sceneList.length ? sceneList.map((item, index) => { return <Select.Option key={index} value={item.scenename}>{item.scenename}</Select.Option> }) : ''}
        </Select> </Select>
        </Item> </Item>
        <Item <Item
        label="设备类型" label="设备类型"
        name="deviceType" name="DeviceType"
        rules={[{ required: true, message: '请输入设备类型' }]} rules={[{ required: true, message: '请输入设备类型' }]}
        > >
        <Select onChange={handleDeviceType} > <Select onChange={handleDeviceType} >
        {deviceType.length ? deviceType.map((item, index) => { return <Select.Option key={index} value={item.DeviceType}>{item.DeviceType}</Select.Option> }) : ''} {deviceType.length ? deviceType.map((item, index) => { return <Select.Option key={index} value={item.DeviceType}>{item.DeviceType}</Select.Option> }) : ''}
        </Select> </Select>
        </Item> </Item>
        <Item
        label="设备编码"
        rules={[{ required: true, message: '请选择设备编码' }]}
        >
        <Select
        mode="multiple"
        style={{ width: '100%' }}
        placeholder="请选择设备编码"
        options={deviceCodes}
        defaultValue={[]}
        onChange={handleChange}
        />
        </Item>
        <Item
        label="指标名称"
        rules={[{ required: true, message: '请选择指标名称' }]}
        >
        <Select
        mode="multiple"
        style={{ width: '100%' }}
        placeholder="请选择指标"
        options={deviceCodes}
        defaultValue={[]}
        onChange={handleChangeIndex}
        />
        </Item>
        {/* <Item
        label="间隔(Cron)"
        name="Interval"
        rules={[{ required: true, message: '请输入间隔' }]}
        >
        <div className={styles.predict}>
        <Input placeholder="请输入间隔" allowClear />
        <a className={styles.corn} target="view_window" href="https://cron.qqe2.com/">cron在线生成</a>
        </div>
        </Item> */}
        <Item <Item
        label="首次执行时间" label="首次执行时间"
        name="Date" name="time"
        rules={[{ required: true, message: '请选择首次执行时间' }]} rules={[{ required: true, message: '请选择首次执行时间' }]}
        > >
        ...@@ -222,7 +301,7 @@ const AddModal = props => { ...@@ -222,7 +301,7 @@ const AddModal = props => {
        rules={[{ required: true, message: '请输入预测间隔' }]} rules={[{ required: true, message: '请输入预测间隔' }]}
        > >
        <div className={styles.predict}></div> <div className={styles.predict}></div>
        <Input style={{ width: '70%' }} placeholder="请输入预测间隔" allowClear /> <Input style={{ width: '70%' }} placeholder="请输入预测间隔" value={CycleValue} onChange={(value) => selectCycleValue(value)} allowClear />
        <Select style={{ marginLeft: '0.5rem', width: '28%' }} onChange={handleIntervalType} value={intervalType}> <Select style={{ marginLeft: '0.5rem', width: '28%' }} onChange={handleIntervalType} value={intervalType}>
        {timeType.length ? timeType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''} {timeType.length ? timeType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''}
        </Select> </Select>
        ...@@ -230,10 +309,74 @@ const AddModal = props => { ...@@ -230,10 +309,74 @@ const AddModal = props => {
        <Item <Item
        label="描述" label="描述"
        name="dec" name="Remarks"
        > >
        <TextArea placeholder="可输入描述信息" rows={4} allowClear /> <TextArea placeholder="可输入描述信息" rows={4} allowClear />
        </Item> </Item>
        <Button size="small" onClick={() => { add() }}>
        新增
        </Button>
        <div className={styles.deviceList}>
        {deviceList.length ? deviceList.map((item, index) => {
        return <Card key={index} style={{ marginTop: '0.5rem' }}>
        <Row gutter='36' >
        <Col span={12}>
        <Item
        label="设备编码"
        name={'deviceCode' + index}
        rules={[{ required: true, message: '请选择设备编码' }]}
        >
        <Select
        placeholder="请选择设备编码"
        onChange={(value, option) => handleChange(value, option)}
        >
        {item.code.length ? item.code.map((item, codeIndex) => { return <Select.Option index={index} key={codeIndex} value={item.Code} pointid={item.PointAddressID}>{item.Code}</Select.Option> }) : ''}
        </Select>
        </Item>
        </Col>
        <Col span={12}>
        <Item
        label="指标名称"
        name={'indextr' + index}
        rules={[{ required: true, message: '请选择指标名称' }]}
        >
        <Select
        placeholder="请选择指标"
        onChange={(value, option) => handleChangeIndex(value, option)}
        >
        {item.indexStr && item.indexStr.length ? item.indexStr.map((item, zindex) => { return <Select.Option key={zindex} index={index} value={item.Name}>{item.Name}</Select.Option> }) : ''}
        </Select>
        </Item>
        </Col>
        </Row>
        <Row gutter='24' >
        <Col span={12}>
        <Item
        label="最大值"
        name={'max' + index}
        rules={[{ required: true, message: '请输入最大值' }]}
        >
        <Input style={{width:'98%'}} placeholder="请输入最大值" onChange={(value) => inputMax(value, index)} index={index} allowClear />
        </Item>
        </Col>
        <Col span={12}>
        <Item
        label="最小值"
        name={'min' + index}
        rules={[{ required: true, message: '请输入最小值' }]}
        >
        <Input placeholder="请输入最小值" onChange={(value) => inputMin(value, index)} index={index} allowClear />
        </Item>
        </Col>
        </Row>
        <DeleteOutlined
        className={styles.deleteItem}
        onClick={() => deleteDevice(index)}
        style={{ fontSize: '16px', color: '#e86060' }}
        />
        </Card>
        }) : ''}
        </div>
        </Form> </Form>
        )} )}
        </Spin> </Spin>
        ......
        src/pages/artificial/policiesIssued/predictionConfig/predictionConfig.jsx
        View file @ 528d33ac
        import { Space, Table, Button, Popconfirm, notification } from 'antd'; import { Space, Table, Button, Popconfirm, notification, Spin } from 'antd';
        import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
        import styles from '../policiesIssued.less' import styles from '../policiesIssued.less'
        import { import {
        deleteTaskOptions, taskOptionsList, getIotDeviceType, algorithmList, getEquipmentInfo getIotDeviceType, getPredictInfo, deletePredictOptions
        } from '@/services/intelligence/api'; } from '@/services/intelligence/api';
        import AddModal from './AddModal' import AddModal from './AddModal'
        const VectorData = props => { const VectorData = props => {
        ...@@ -18,56 +18,51 @@ const VectorData = props => { ...@@ -18,56 +18,51 @@ const VectorData = props => {
        const columns = [ const columns = [
        { {
        title: '序号', title: '序号',
        dataIndex: 'serviceName', align: 'center',
        key: 'serviceName', render: (text, record, index) => (
        align: 'center' <Space>
        <span>{(index + 1)}</span>
        </Space>
        )
        }, },
        { {
        title: '方案名称', title: '方案名称',
        dataIndex: 'GISServerIP', dataIndex: 'PredictName',
        key: 'GISServerIP', key: 'PredictName',
        align: 'center' align: 'center'
        }, },
        { {
        title: '算法名称', title: '场景名称',
        dataIndex: 'GISServerPort', dataIndex: 'SceneName',
        key: 'GISServerPort', key: 'SceneName',
        align: 'center' align: 'center'
        }, },
        { {
        title: '设备类型', title: '设备类型',
        dataIndex: 'GISServerProjectName', dataIndex: 'DeviceType',
        key: 'GISServerProjectName', key: 'DeviceType',
        align: 'center'
        },
        {
        title: '设备编码',
        dataIndex: 'publishTime',
        key: 'publishTime',
        align: 'center'
        },
        {
        title: '指标名称',
        dataIndex: 'publishTime',
        key: 'publishTime',
        align: 'center' align: 'center'
        }, },
        { {
        title: '预测间隔', title: '预测间隔',
        dataIndex: 'publishTime', align: 'center',
        key: 'publishTime', render: (record) => (
        align: 'center' <Space>
        {record.CycleValue + record.Cycle}
        </Space>
        )
        }, },
        { {
        title: '首次执行时间', title: '首次执行时间',
        dataIndex: 'publishTime', dataIndex: 'DateFrom',
        key: 'publishTime', key: 'DateFrom',
        align: 'center' align: 'center'
        }, },
        { {
        title: '描述', title: '描述',
        dataIndex: 'publishTime', dataIndex: 'Remarks',
        key: 'publishTime', key: 'Remarks',
        align: 'center' align: 'center'
        }, },
        { {
        ...@@ -75,10 +70,18 @@ const VectorData = props => { ...@@ -75,10 +70,18 @@ const VectorData = props => {
        align: 'center', align: 'center',
        render: (text, record, index) => ( render: (text, record, index) => (
        <Space> <Space>
        <Button
        type="primary"
        size="small"
        onClick={() => {
        changeRecord(record);
        }}
        >
        编辑
        </Button>
        <div onClick={e => e.stopPropagation()}> <div onClick={e => e.stopPropagation()}>
        <Popconfirm <Popconfirm
        title="是否删除该矢量数据？" title="是否删除该方案？"
        okText="确认" okText="确认"
        cancelText="取消" cancelText="取消"
        onConfirm={() => { onConfirm={() => {
        ...@@ -97,16 +100,33 @@ const VectorData = props => { ...@@ -97,16 +100,33 @@ const VectorData = props => {
        ]; ];
        const onSubmit = prop => { const onSubmit = prop => {
        setVisible(false); setVisible(false);
        setFlag(flag+1) setFlag(flag + 1)
        }; };
        const delConfirm = (record) => { const delConfirm = (record) => {
        deletePredictOptions(record.ID).then(res => {
        if (res.errMsg === '') {
        setFlag(flag + 1)
        notification.success({
        message: '提示',
        duration: 3,
        description: '删除成功',
        });
        } else {
        notification.error({
        message: '提示',
        duration: 3,
        description: res.errMsg,
        });
        };
        })
        } }
        const handleAdd = () => { const handleAdd = () => {
        setFormObj({});
        setType('add'); setType('add');
        setVisible(true); setVisible(true);
        } }
        ...@@ -115,51 +135,59 @@ const VectorData = props => { ...@@ -115,51 +135,59 @@ const VectorData = props => {
        }, [flag]); }, [flag]);
        // 获取瓦片数据配置数据 // 获取瓦片数据配置数据
        const renderTile = () => { const renderTile = () => {
        setTreeLoading(true)
        const getIotDevice = getIotDeviceType() const getIotDevice = getIotDeviceType()
        const algorithm = algorithmList() const getPredictList = getPredictInfo()
        const taskOption = taskOptionsList() Promise.all([getIotDevice, getPredictList]).then(res => {
        Promise.all([getIotDevice, algorithm, taskOption]).then(res => {
        res[0].getMe && res[0].getMe.length && setDeviceType(res[0].getMe) res[0].getMe && res[0].getMe.length && setDeviceType(res[0].getMe)
        res[2].getMe && res[2].getMe.length && setTileData(res[2].getMe) res[1].getMe && res[1].getMe.length && setTileData(res[1].getMe)
        setTreeLoading(false) setTreeLoading(false)
        }).catch(err => { }).catch(err => {
        setTreeLoading(false) setTreeLoading(false)
        }) })
        }; };
        const changeRecord = (record) => {
        setType('edit');
        setFormObj(record);
        setVisible(true);
        }
        return ( return (
        <> <>
        <div className={styles.tileBtn}> <Spin tip="loading..." spinning={treeLoading}>
        <Button type="primary" onClick={() => { <div className={styles.tileBtn}>
        handleAdd(); <Button type="primary" onClick={() => {
        }} > handleAdd();
        新增 }} >
        新增
        </Button> </Button>
        </div> </div>
        <Table <Table
        columns={columns} columns={columns}
        dataSource={tileData} dataSource={tileData}
        bordered bordered
        rowKey="createTime" rowKey="ID"
        scroll={{ y: 400 }} scroll={{ y: 700 }}
        pagination={{ pagination={{
        showTotal: (total, range) => pageSize: '10',
        `第${range[0]}-${range[1]} 条/共 ${total} 条` showTotal: (total, range) =>
        `第${range[0]}-${range[1]} 条/共 ${total} 条`
        }} }}
        > >
        </Table> </Table>
        <AddModal <AddModal
        visible={visible} visible={visible}
        onCancel={() => setVisible(false)} onCancel={() => setVisible(false)}
        callBackSubmit={onSubmit} callBackSubmit={onSubmit}
        type={type} type={type}
        deviceType={deviceType} deviceType={deviceType}
        formObj={formObj} formObj={formObj}
        /> />
        </Spin>
        </> </>
        ) )
        } }
        export default VectorData export default VectorData
        \ No newline at end of file
        src/pages/artificial/policiesIssued/strategyConfig/AddModal.jsx
        View file @ 528d33ac
        import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
        import { Form, Modal, Input, Select, notification, DatePicker, Spin } from 'antd'; import { Form, Modal, Input, Select, notification, DatePicker, Spin, Button, Card, Row, Col } from 'antd';
        import styles from '../policiesIssued.less' import styles from '../policiesIssued.less'
        // import moment from 'moment'; // import moment from 'moment';
        // import locale from 'antd/es/date-picker/locale/zh_CN'; // import locale from 'antd/es/date-picker/locale/zh_CN';
        ...@@ -10,19 +10,22 @@ import locale from 'antd/lib/date-picker/locale/zh_CN' ...@@ -10,19 +10,22 @@ import locale from 'antd/lib/date-picker/locale/zh_CN'
        import 'moment/locale/zh-cn' import 'moment/locale/zh-cn'
        moment.locale('zh-cn') moment.locale('zh-cn')
        import { import {
        getEquipmentInfo getEquipmentInfo, getQutaList, getSceneNameInfo, addStrategyOptions, editStrategyOptions, getPredictDevice, getPredictDevicePoint
        } from '@/services/intelligence/api'; } from '@/services/intelligence/api';
        import { DeleteOutlined } from '@ant-design/icons';
        const { RangePicker } = DatePicker;
        const { TextArea } = Input; const { TextArea } = Input;
        const AddModal = props => { const AddModal = props => {
        const { callBackSubmit = () => { }, type, formObj, visible, deviceType } = props; const { callBackSubmit = () => { }, type, formObj, visible, deviceType } = props;
        const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
        const [isloading, setIsLoading] = useState(false); const [isloading, setIsLoading] = useState(false);
        const [deviceCodes, setDeviceCode] = useState([]); //设备编码列表 const [deviceCodes, setDeviceCode] = useState([]); //设备编码列表
        const [timeType, setTimeType] = useState(['分钟', '小时', '天']); const [predictCode, setPredictCode] = useState([]); //预测编码列表
        const [intervalType, setIntervalType] = useState('分钟') const [deviceList, setDeviceList] = useState([]); //设备列表
        const [card, setCard] = useState([]); //卡片列表值
        const [sceneList, setSceneList] = useState([])
        const [form] = Form.useForm(); const [form] = Form.useForm();
        const { Item } = Form; const { Item } = Form;
        // 提交 // 提交
        ...@@ -30,78 +33,136 @@ const AddModal = props => { ...@@ -30,78 +33,136 @@ const AddModal = props => {
        form.validateFields().then(validate => { form.validateFields().then(validate => {
        if (validate) { if (validate) {
        let obj = form.getFieldsValue(); let obj = form.getFieldsValue();
        let DateFrom = moment(obj.Date[0]).format('YYYY-MM-DD') let api = addStrategyOptions
        let DateTo = moment(obj.Date[1]).format('YYYY-MM-DD') let query = {
        setLoading(true); DeviceType: obj.DeviceType,
        StrategyDes: obj.StrategyDes,
        if (type === 'add') { StrategyName: obj.StrategyName,
        StrategyType: obj.StrategyType,
        } else if (type === 'edit') { DetailInfos: card,
        handleEdit(); CreateTime: moment(obj.time).format('YYYY-MM-DD HH:mm:ss')
        } }
        type === 'edit' ? (query.ID = formObj.ID) && (api = editStrategyOptions) : delete query.ID && (api = addStrategyOptions)
        setLoading(true);
        api(query).then(res => {
        setLoading(false);
        if (res.errMsg === '') {
        form.resetFields();
        callBackSubmit();
        prompt('success', `${type === 'add' ? "增加成功" : res.errMsg}`)
        } else {
        prompt('fail', `${type === 'add' ? "增加失败" : res.errMsg}`)
        }
        }).catch(e => {
        setLoading(false);
        })
        } }
        }); });
        }; };
        const prompt = (type, content) => {
        const handleEdit = () => { if (type == 'success') {
        // SetServiceConfig({ notification.success({
        // servicename: serviceName, message: '提示',
        // terminalType: 'base', duration: 3,
        // isBaseMap: true, description: content,
        // jsonCfg: JSON.stringify(query) });
        // }) }
        // .then(res => { else {
        // setLoading(false); notification.error({
        // if (res.success) { message: '提示',
        // form.resetFields(); duration: 3,
        // callBackSubmit(); description: content,
        // notification.success({ });
        // message: '提示', }
        // duration: 3, }
        // description: res.message || '编辑成功',
        // });
        // } else {
        // notification.error({
        // message: '提示',
        // duration: 3,
        // description: res.message || '编辑失败',
        // });
        // }
        // })
        // .catch(err => setLoading(false));
        };
        const onFinish = value => { }; const onFinish = value => { };
        useEffect(() => { useEffect(() => {
        switch (type) { switch (type) {
        case 'add': case 'add':
        deviceType.length && getDeviceCode(deviceType[0].DeviceType) initData()
        break; break;
        case 'edit': case 'edit':
        form.setFieldsValue({ ...formObj }); initData()
        break; break;
        default: default:
        break; break;
        } }
        }, [visible]); }, [visible]);
        //页面初始化
        const initData = () => {
        if (type === 'add') {
        form.resetFields();
        setCard([])
        setDeviceList([])
        }
        else {
        form.setFieldsValue({ time: moment(formObj.CreateTime, "YYYYMMDDHHmmss"), ...formObj });
        if (formObj.DetailInfos.length) {
        let req1 = getEquipmentInfo(formObj.DeviceType)
        let req2 = getPredictDevice(formObj.DeviceType)
        Promise.all([req1, req2]).then(respone => {
        console.log('respone', respone);
        respone[0].getMe.length && respone[0].getMe[0].DeviceList.length && setDeviceCode(respone[0].getMe[0].DeviceList)
        respone[1].getMe.length && setPredictCode(respone[1].getMe)
        let arr = []
        formObj.DetailInfos.map((item, index) => {
        console.log(1);
        arr[index] = {}
        arr[index].code = respone[0].getMe.length ? respone[0].getMe[0].DeviceList : []
        arr[index].predictCode = respone[1].getMe.length ? respone[1].getMe : []
        form.setFieldsValue({
        [`deviceCode${index}`]: item.ControlCode,
        [`indextr${index}`]: item.ControlPoint,
        [`max${index}`]: item.PredictCode,
        [`min${index}`]: item.PredictPoint
        })
        })
        setCard(formObj.DetailInfos)
        setDeviceList(arr)
        setLoading(false)
        })
        }
        }
        const getDeviceCode = (type) => { getSceneNameInfo().then(res => {
        res.getMe.length && setSceneList(res.getMe)
        })
        }
        //获取设备编码
        const getDeviceCode = () => {
        setLoading(false) setLoading(false)
        getEquipmentInfo(type).then(respone => { let obj = form.getFieldsValue();
        respone.getMe[0].DeviceList.length && setDeviceCode(respone.getMe[0].DeviceList) let req1 = getEquipmentInfo(obj.DeviceType)
        form.setFieldsValue({ let req2 = getPredictDevice(obj.DeviceType)
        deviceType: deviceType[0].DeviceType, Promise.all([req1, req2]).then(respone => {
        deviceCode: respone.getMe[0].DeviceList[0].Code respone[0].getMe.length && respone[0].getMe[0].DeviceList.length && setDeviceCode(respone[0].getMe[0].DeviceList)
        }); respone[1].getMe.length && setPredictCode(respone[1].getMe)
        if (deviceList.length) {
        let arr = [...deviceList]
        arr.map((item, index) => {
        arr[index].code = respone[0].getMe.length ? respone[0].getMe[0].DeviceList : []
        arr[index].predictCode = respone[1].getMe.length ? respone[1].getMe : []
        arr[index].indexStr = ''
        arr[index].predictStr = ''
        form.setFieldsValue({
        [`deviceCode${index}`]: '',
        [`indextr${index}`]: '',
        [`max${index}`]: '',
        [`min${index}`]: ''
        })
        })
        setDeviceList(arr)
        }
        setLoading(false) setLoading(false)
        }) })
        } }
        const layout = { const layout = {
        layout: 'horizontal', layout: 'horizontal',
        labelCol: { labelCol: {
        span: 4, span: 6,
        }, },
        wrapperCol: { wrapperCol: {
        span: 16, span: 16,
        ...@@ -109,19 +170,97 @@ const AddModal = props => { ...@@ -109,19 +170,97 @@ const AddModal = props => {
        }; };
        //选择设备类型 //选择设备类型
        const handleDeviceType = (value) => { const handleDeviceType = (value) => {
        getDeviceCode(value) getDeviceCode()
        }
        //选择设备编码
        const handleChange = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].ControlCode = value
        setCard(cardList)
        let obj = form.getFieldsValue();
        getQutaList({ accountName: obj.DeviceType, AddrSchemeID: option.pointid }).then(res => {
        if (res.getMe && res.getMe.length) {
        let arr = [...deviceList]
        arr[+option.index].indexStr = res.getMe
        setDeviceList(arr)
        }
        })
        }
        //选择预测编码
        const handleChange1 = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].PredictCode = value
        setCard(cardList)
        let obj = form.getFieldsValue();
        getPredictDevicePoint({ deviceType: obj.DeviceType, DeviceCode: value }).then(res => {
        console.log('res', res);
        if (res.getMe && res.getMe.length) {
        let arr = [...deviceList]
        arr[+option.index].predictStr = res.getMe
        setDeviceList(arr)
        }
        })
        }
        //选择设备指标
        const handleChangeIndex = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].ControlPoint = value
        setCard(cardList)
        }
        //选择预测指标
        const handleChangeIndex1 = (value, option) => {
        let cardList = [...card]
        cardList[+option.index].PredictPoint = value
        setCard(cardList)
        } }
        const handleIntervalType = (value) => { //最大值
        setIntervalType(value) const inputMax = (e, option) => {
        e.persist();
        let cardList = [...card]
        cardList[option].MaxValue = e.target.value
        setCard(cardList)
        }
        //最小值
        const inputMin = (e, option) => {
        e.persist();
        let cardList = [...card]
        cardList[option].MinValue = e.target.value
        setCard(cardList)
        }
        const add = () => {
        let obj = form.getFieldsValue();
        if (!obj.DeviceType) {
        notification.error({
        message: '提示',
        duration: 3,
        description: '请选择设备类型',
        });
        } else {
        let cardList = [...card]
        let arr = [...deviceList]
        cardList.push({})
        setCard(cardList)
        arr.push({ code: deviceCodes, predictCode })
        setDeviceList(arr)
        }
        }
        //删除卡片
        const deleteDevice = (index) => {
        let cardList = [...card]
        let arr = [...deviceList]
        let newCardList = cardList.splice(0, 1)
        let newArr = arr.splice(0, 1)
        setCard(index == 0 ? [] : newCardList)
        setDeviceList(index == 0 ? [] : newArr)
        } }
        return ( return (
        <Modal <Modal
        title={`${type === 'add' ? '元数据发布' : '编辑'}`} title={`${type === 'add' ? '预测方案新增' : '编辑'}`}
        bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
        style={{ top: '150px' }} style={{ top: '150px' }}
        width="700px" width="800px"
        destroyOnClose destroyOnClose
        maskClosable={false} maskClosable={false}
        cancelText="取消" cancelText="取消"
        ...@@ -136,96 +275,124 @@ const AddModal = props => { ...@@ -136,96 +275,124 @@ const AddModal = props => {
        {visible && ( {visible && (
        <Form form={form} {...layout} onFinish={onFinish}> <Form form={form} {...layout} onFinish={onFinish}>
        <Item <Item
        label="任务名称" label="策略名称"
        name="TaskName" name="StrategyName"
        rules={[{ required: true, message: '请输入任务名称' }]} rules={[{ required: true, message: '请输入方案名称' }]}
        > >
        <Input placeholder="请输入任务名称" allowClear /> <Input placeholder="请输入任务名称" allowClear />
        </Item> </Item>
        <Item <Item
        label="场景" label="策略类型"
        name="scene" name="StrategyType"
        rules={[{ required: true, message: '请选择场景' }]} rules={[{ required: true, message: '请输入算法名称' }]}
        > >
        <Select > <Select >
        {/* {workList.length ? workList.map((item, index) => { return <Option key={index} value={item.name}>{item.name}</Option> }) : ''} */} <Select.Option value='实时控制'>实时控制</Select.Option>
        </Select> <Select.Option value='时段控制'>时段控制</Select.Option>
        </Item>
        <Item
        label="策略名称"
        name="strategy"
        // rules={[{ required: true, message: '请选择策略名称' }]}
        >
        <Select >
        {/* {workList.length ? workList.map((item, index) => { return <Option key={index} value={item.name}>{item.name}</Option> }) : ''} */}
        </Select>
        </Item>
        <Item
        label="类型"
        name="type"
        rules={[{ required: true, message: '请选择类型' }]}
        >
        <Select>
        <Select.Option value='水龄预测'>水龄预测</Select.Option>
        <Select.Option value='二供泵房'>二供泵房</Select.Option>
        </Select> </Select>
        </Item> </Item>
        <Item <Item
        label="设备类型" label="设备类型"
        name="deviceType" name="DeviceType"
        rules={[{ required: true, message: '请输入设备类型' }]}
        > >
        <Select onChange={handleDeviceType} > <Select onChange={handleDeviceType} >
        {deviceType.length ? deviceType.map((item, index) => { return <Select.Option key={index} value={item.DeviceType}>{item.DeviceType}</Select.Option> }) : ''} {deviceType.length ? deviceType.map((item, index) => { return <Select.Option key={index} value={item.DeviceType}>{item.DeviceType}</Select.Option> }) : ''}
        </Select> </Select>
        </Item> </Item>
        <Item <Item
        label="设备编码" label="创建时间"
        name="deviceCode" name="time"
        rules={[{ required: true, message: '请选择设备编码' }]} rules={[{ required: true, message: '请选择创建时间' }]}
        >
        <Select>
        {deviceCodes.length ? deviceCodes.map((item, index) => { return <Select.Option key={index} value={item.PointAddressID}>{item.Code}</Select.Option> }) : ''}
        </Select>
        </Item>
        <Item
        label="间隔(Cron)"
        name="Interval"
        rules={[{ required: true, message: '请输入间隔' }]}
        >
        <div className={styles.predict}>
        <Input placeholder="请输入间隔" allowClear />
        <a className={styles.corn} target="view_window" href="https://cron.qqe2.com/">cron在线生成</a>
        </div>
        </Item>
        <Item
        label="首次预测时间"
        name="Date"
        rules={[{ required: true, message: '请选择首次预测时间' }]}
        > >
        <RangePicker locale={locale} <DatePicker locale={locale}
        showTime={{ format: 'HH:mm:ss' }}
        format="YYYY-MM-DD HH:mm:ss"
        style={{ width: '100%' }} /> style={{ width: '100%' }} />
        </Item> </Item>
        <Item
        label="预测间隔"
        rules={[{ required: true, message: '请输入预测间隔' }]}
        >
        <div className={styles.predict}></div>
        <Input style={{ width: '70%' }} placeholder="请输入预测间隔" allowClear />
        <Select style={{ marginLeft: '0.5rem', width: '28%' }} onChange={handleIntervalType} value={intervalType}>
        {timeType.length ? timeType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''}
        </Select>
        </Item>
        <Item <Item
        label="描述" label="描述"
        name="dec" name="StrategyDes"
        > >
        <TextArea placeholder="可输入描述信息" rows={4} allowClear /> <TextArea placeholder="可输入描述信息" rows={4} allowClear />
        </Item> </Item>
        <Button size="small" onClick={() => { add() }}>
        新增
        </Button>
        <div className={styles.deviceList}>
        {deviceList.length ? deviceList.map((item, index) => {
        return <Card key={index} style={{ marginTop: '0.5rem' }}>
        <Row gutter='36' justify='space-between'>
        <Col span={12}>
        <Item
        label="控制编码"
        name={'deviceCode' + index}
        rules={[{ required: true, message: '请选择设备编码' }]}
        >
        <Select
        placeholder="请选择控制编码"
        onChange={(value, option) => handleChange(value, option)}
        >
        {item.code.length ? item.code.map((item, codeIndex) => { return <Select.Option index={index} key={codeIndex} value={item.Code} pointid={item.PointAddressID}>{item.Code}</Select.Option> }) : ''}
        </Select>
        </Item>
        </Col>
        <Col span={12}>
        <Item
        label="控制指标"
        name={'indextr' + index}
        rules={[{ required: true, message: '请选择指标名称' }]}
        >
        <Select
        placeholder="请选择控制指标"
        onChange={(value, option) => handleChangeIndex(value, option)}
        >
        {item.indexStr && item.indexStr.length ? item.indexStr.map((item, zindex) => { return <Select.Option key={zindex} index={index} value={item.Name}>{item.Name}</Select.Option> }) : ''}
        </Select>
        </Item>
        </Col>
        </Row>
        <Row gutter='24' justify='space-between'>
        <Col span={12}>
        <Item
        label="预测编码"
        name={'max' + index}
        rules={[{ required: true, message: '请输入预测编码' }]}
        >
        <Select
        placeholder="请选择预测编码"
        onChange={(value, option) => handleChange1(value, option)}
        >
        {item.predictCode.length ? item.predictCode.map((item, codeIndex) => { return <Select.Option index={index} key={codeIndex} value={item} >{item}</Select.Option> }) : ''}
        </Select>
        {/* <Input placeholder="请输入最大值" onChange={(value) => inputMax(value, index)} index={index} allowClear /> */}
        </Item>
        </Col>
        <Col span={12}>
        <Item
        label="预测指标"
        name={'min' + index}
        rules={[{ required: true, message: '请输入预测指标' }]}
        >
        <Select
        placeholder="请选择预测指标"
        onChange={(value, option) => handleChangeIndex1(value, option)}
        >
        {item.predictStr && item.predictStr.length ? item.predictStr.map((item, zindex) => { return <Select.Option key={zindex} index={index} value={item}>{item}</Select.Option> }) : ''}
        </Select>
        </Item>
        </Col>
        </Row>
        <DeleteOutlined
        className={styles.deleteItem}
        onClick={() => deleteDevice(index)}
        style={{ fontSize: '16px', color: '#e86060' }}
        />
        </Card>
        }) : ''}
        </div>
        </Form> </Form>
        )} )}
        </Spin> </Spin>
        ......
        src/pages/artificial/policiesIssued/strategyConfig/strategyConfig.jsx
        View file @ 528d33ac
        import { Space, Table, Button, Popconfirm, notification } from 'antd'; import { Space, Table, Button, Popconfirm, notification ,Spin} from 'antd';
        import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
        import styles from '../policiesIssued.less' import styles from '../policiesIssued.less'
        import { import {
        GetVectorService, deleteVectorService, getSolutionList, updatePublishedMetaData taskOptionsList, getIotDeviceType, getStrategyInfo, deleteStrategyOptions
        } from '@/services/webConfig/api'; } from '@/services/intelligence/api';
        import AddModal from './AddModal' import AddModal from './AddModal'
        const VectorData = props => { const VectorData = props => {
        const [treeLoading, setTreeLoading] = useState(false);// 弹窗显示 const [treeLoading, setTreeLoading] = useState(false);// 弹窗显示
        const [tileData, setTileData] = useState([]); // table表格数据
        const [visible, setVisible] = useState(false); // 弹窗
        const [previewVisible, setPreviewVisible] = useState(false); // 预览弹窗
        const [flag, setFlag] = useState(0); // 更新list const [flag, setFlag] = useState(0); // 更新list
        const [loading, setLoading] = useState([]); // 更新状态 const [loading, setLoading] = useState([]); // 更新状态
        const [type, setType] = useState(''); // 弹窗类型 const [type, setType] = useState(''); // 弹窗类型
        const [solutionNames, setSolutionNames] = useState(''); const [solutionNames, setSolutionNames] = useState('');
        const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' }); const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' });
        const [currentMetaData,setCurrentMetaData] = useState(null) const [tileData, setTileData] = useState([]); // table表格数据
        const [visible, setVisible] = useState(false); // 弹窗
        const [deviceType, setDeviceType] = useState([]); //设备类型列表
        const columns = [ const columns = [
        { {
        title: '序号', title: '序号',
        dataIndex: 'serviceName', align: 'center',
        key: 'serviceName', render: (text, record, index) => (
        align: 'center' <Space>
        <span>{(index + 1)}</span>
        </Space>
        )
        }, },
        { {
        title: '方案名称', title: '策略名称',
        dataIndex: 'GISServerIP', dataIndex: 'StrategyName',
        key: 'GISServerIP', key: 'StrategyName',
        align: 'center' align: 'center'
        }, },
        { {
        title: '方案类型', title: '策略类型',
        dataIndex: 'GISServerPort', dataIndex: 'StrategyType',
        key: 'GISServerPort', key: 'StrategyType',
        align: 'center' align: 'center'
        }, },
        { {
        title: '任务名称', title: '创建时间',
        dataIndex: 'GISServerProjectName', dataIndex: 'CreateTime',
        key: 'GISServerProjectName', key: 'CreateTime',
        align: 'center' align: 'center'
        }, },
        { {
        title: '创建时间', title: '设备类型',
        dataIndex: 'publishTime', dataIndex: 'DeviceType',
        key: 'publishTime', key: 'DeviceType',
        align: 'center' align: 'center'
        }, },
        { {
        title: '描述', title: '描述',
        dataIndex: 'publishTime', dataIndex: 'StrategyDes',
        key: 'publishTime', key: 'StrategyDes',
        align: 'center' align: 'center'
        }, },
        { {
        ...@@ -58,10 +62,18 @@ const VectorData = props => { ...@@ -58,10 +62,18 @@ const VectorData = props => {
        align: 'center', align: 'center',
        render: (text, record, index) => ( render: (text, record, index) => (
        <Space> <Space>
        <Button
        type="primary"
        size="small"
        onClick={() => {
        changeRecord(record);
        }}
        >
        编辑
        </Button>
        <div onClick={e => e.stopPropagation()}> <div onClick={e => e.stopPropagation()}>
        <Popconfirm <Popconfirm
        title="是否删除该矢量数据？" title="是否删除该方案？"
        okText="确认" okText="确认"
        cancelText="取消" cancelText="取消"
        onConfirm={() => { onConfirm={() => {
        ...@@ -80,50 +92,63 @@ const VectorData = props => { ...@@ -80,50 +92,63 @@ const VectorData = props => {
        ]; ];
        const onSubmit = prop => { const onSubmit = prop => {
        setVisible(false); setVisible(false);
        setFlag(flag+1) setFlag(flag + 1)
        }; };
        const delConfirm = (record) => { const delConfirm = (record) => {
        let query = { deleteStrategyOptions(record.ID).then(res => {
        serviceName: record.serviceName, if (res.errMsg==='') {
        _version: 9999,
        solution: solutionNames
        }
        deleteVectorService(query).then(res => {
        if (res.success) {
        setFlag(flag + 1) setFlag(flag + 1)
        notification.success({ notification.success({
        message: '提示', message: '提示',
        duration: 3, duration: 3,
        description: '删除元数据成功', description: '删除成功',
        }); });
        } else { } else {
        notification.error({ notification.error({
        message: '提示', message: '提示',
        duration: 3, duration: 3,
        description: '删除元数据失败', description: res.errMsg,
        }); });
        }; };
        }) })
        } }
        const handleAdd = () => { const handleAdd = () => {
        // setType('add'); setFormObj({});
        // setVisible(true); setType('add');
        setVisible(true);
        } }
        useEffect(() => { useEffect(() => {
        renderTile(); renderTile();
        }, [flag]); }, [flag]);
        // 获取瓦片数据配置数据 // 获取瓦片数据配置数据
        const renderTile = () => { const renderTile = () => {
        setTreeLoading(true)
        const getIotDevice = getIotDeviceType()
        const getStrategy = getStrategyInfo()
        Promise.all([getIotDevice,getStrategy]).then(res => {
        console.log('res[3].getMe',res[1].getMe);
        res[0].getMe && res[0].getMe.length && setDeviceType(res[0].getMe)
        res[1].getMe && res[1].getMe.length && setTileData(res[1].getMe)
        setTreeLoading(false)
        }).catch(err => {
        setTreeLoading(false)
        })
        }; };
        const changeRecord =(record)=>{
        setType('edit');
        setFormObj(record);
        setVisible(true);
        }
        return ( return (
        <> <>
        <Spin tip="loading..." spinning={treeLoading}>
        <div className={styles.tileBtn}> <div className={styles.tileBtn}>
        <Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
        handleAdd(); handleAdd();
        ...@@ -135,9 +160,10 @@ const VectorData = props => { ...@@ -135,9 +160,10 @@ const VectorData = props => {
        columns={columns} columns={columns}
        dataSource={tileData} dataSource={tileData}
        bordered bordered
        rowKey="createTime" rowKey="ID"
        scroll={{ y: 400 }} scroll={{ y: 700 }}
        pagination={{ pagination={{
        pageSize: '10' ,
        showTotal: (total, range) => showTotal: (total, range) =>
        `第${range[0]}-${range[1]} 条/共 ${total} 条` `第${range[0]}-${range[1]} 条/共 ${total} 条`
        ...@@ -149,10 +175,12 @@ const VectorData = props => { ...@@ -149,10 +175,12 @@ const VectorData = props => {
        onCancel={() => setVisible(false)} onCancel={() => setVisible(false)}
        callBackSubmit={onSubmit} callBackSubmit={onSubmit}
        type={type} type={type}
        deviceType={deviceType}
        formObj={formObj} formObj={formObj}
        solutionNames={solutionNames}
        /> />
        </Spin>
        </> </>
        ) )
        } }
        export default VectorData export default VectorData
        \ No newline at end of file
        src/pages/artificial/taskScheduling/AddModal.jsx
        View file @ 528d33ac
        ...@@ -87,7 +87,9 @@ const AddModal = props => { ...@@ -87,7 +87,9 @@ const AddModal = props => {
        const handleTaskType =(value)=>{
        console.log(value,'value');
        }
        const layout = { const layout = {
        layout: 'horizontal', layout: 'horizontal',
        labelCol: { labelCol: {
        ...@@ -128,18 +130,19 @@ const AddModal = props => { ...@@ -128,18 +130,19 @@ const AddModal = props => {
        <Input placeholder="请输入任务名称" allowClear /> <Input placeholder="请输入任务名称" allowClear />
        </Item> </Item>
        <Item <Item
        label="方案类型" label="任务类型"
        name="type" name="TaskType"
        rules={[{ required: true, message: '请选择类型' }]} rules={[{ required: true, message: '请选择类型' }]}
        > >
        <Select> <Select onChange={handleTaskType}>
        <Select.Option value='水龄预测'>水龄预测</Select.Option> <Select.Option value='预测'>预测</Select.Option>
        <Select.Option value='二供泵房'>二供泵房</Select.Option> <Select.Option value='控制'>控制</Select.Option>
        <Select.Option value='http'>http</Select.Option>
        </Select> </Select>
        </Item> </Item>
        <Item <Item
        label="方案名称" label="方案名称"
        name="strategy" name="AlgorithmName"
        > >
        <Select > <Select >
        {/* {workList.length ? workList.map((item, index) => { return <Option key={index} value={item.name}>{item.name}</Option> }) : ''} */} {/* {workList.length ? workList.map((item, index) => { return <Option key={index} value={item.name}>{item.name}</Option> }) : ''} */}
        ...@@ -157,7 +160,7 @@ const AddModal = props => { ...@@ -157,7 +160,7 @@ const AddModal = props => {
        </Item> </Item>
        <Item <Item
        label="描述" label="描述"
        name="dec" name="Describe"
        > >
        <TextArea placeholder="可输入描述信息" rows={4} allowClear /> <TextArea placeholder="可输入描述信息" rows={4} allowClear />
        </Item> </Item>
        ......
        src/pages/artificial/taskScheduling/taskScheduling.jsx
        View file @ 528d33ac
        ...@@ -18,8 +18,12 @@ const VectorData = props => { ...@@ -18,8 +18,12 @@ const VectorData = props => {
        { {
        title: '序号', title: '序号',
        dataIndex: 'index', dataIndex: 'index',
        key: 'serviceName', align: 'center',
        align: 'center' render: (text, record, index) => (
        <Space>
        <span>{(index + 1)}</span>
        </Space>
        )
        }, },
        { {
        title: '场景名称', title: '场景名称',
        ...@@ -47,8 +51,8 @@ const VectorData = props => { ...@@ -47,8 +51,8 @@ const VectorData = props => {
        }, },
        { {
        title: '间隔', title: '间隔',
        dataIndex: 'publishTime', dataIndex: 'Interval',
        key: 'publishTime', key: 'Interval',
        align: 'center' align: 'center'
        }, },
        { {
        ...@@ -68,7 +72,15 @@ const VectorData = props => { ...@@ -68,7 +72,15 @@ const VectorData = props => {
        align: 'center', align: 'center',
        render: (text, record, index) => ( render: (text, record, index) => (
        <Space> <Space>
        <Button
        type="primary"
        size="small"
        onClick={() => {
        changeRecord(record);
        }}
        >
        编辑
        </Button>
        <div onClick={e => e.stopPropagation()}> <div onClick={e => e.stopPropagation()}>
        <Popconfirm <Popconfirm
        title="是否删除该矢量数据？" title="是否删除该矢量数据？"
        ...@@ -101,7 +113,7 @@ const VectorData = props => { ...@@ -101,7 +113,7 @@ const VectorData = props => {
        _version: 9999, _version: 9999,
        solution: solutionNames solution: solutionNames
        } }
        deleteVectorService(query).then(res => { deleteTaskOptions(query).then(res => {
        if (res.success) { if (res.success) {
        setFlag(flag + 1) setFlag(flag + 1)
        notification.success({ notification.success({
        ...@@ -118,6 +130,12 @@ const VectorData = props => { ...@@ -118,6 +130,12 @@ const VectorData = props => {
        }; };
        }) })
        } }
        //编辑任务调度
        const changeRecord = (record) => {
        setType('edit');
        setFormObj(record);
        setVisible(true);
        }
        const handleAdd = () => { const handleAdd = () => {
        setType('add'); setType('add');
        setVisible(true); setVisible(true);
        ...@@ -132,8 +150,9 @@ const VectorData = props => { ...@@ -132,8 +150,9 @@ const VectorData = props => {
        const algorithm = algorithmList() const algorithm = algorithmList()
        const taskOption = taskOptionsList() const taskOption = taskOptionsList()
        Promise.all([getIotDevice, algorithm, taskOption]).then(res => { Promise.all([getIotDevice, algorithm, taskOption]).then(res => {
        console.log('res', res);
        res[0].getMe && res[0].getMe.length && setDeviceType(res[0].getMe) res[0].getMe && res[0].getMe.length && setDeviceType(res[0].getMe)
        res[2].getMe && res[2].getMe.length && setDeviceType(res[2].getMe) res[2].getMe && res[2].getMe.length && setTileData(res[2].getMe)
        setTreeLoading(false) setTreeLoading(false)
        }).catch(err => { }).catch(err => {
        setTreeLoading(false) setTreeLoading(false)
        ...@@ -143,35 +162,38 @@ const VectorData = props => { ...@@ -143,35 +162,38 @@ const VectorData = props => {
        return ( return (
        <> <>
        <div className={styles.tileBtn}> <div className={styles.container}>
        <Button type="primary" onClick={() => { <div className={styles.tileBtn}>
        handleAdd(); <Button type="primary" onClick={() => {
        }} > handleAdd();
        新增 }} >
        新增
        </Button> </Button>
        </div>
        <Table
        columns={columns}
        dataSource={tileData}
        bordered
        rowKey="Id"
        scroll={{ y: 400 }}
        pagination={{
        showTotal: (total, range) =>
        `第${range[0]}-${range[1]} 条/共 ${total} 条`
        }}
        >
        </Table>
        <AddModal
        visible={visible}
        onCancel={() => setVisible(false)}
        callBackSubmit={onSubmit}
        type={type}
        deviceType={deviceType}
        formObj={formObj}
        solutionNames={solutionNames}
        />
        </div> </div>
        <Table
        columns={columns}
        dataSource={tileData}
        bordered
        rowKey="createTime"
        scroll={{ y: 400 }}
        pagination={{
        showTotal: (total, range) =>
        `第${range[0]}-${range[1]} 条/共 ${total} 条`
        }}
        >
        </Table>
        <AddModal
        visible={visible}
        onCancel={() => setVisible(false)}
        callBackSubmit={onSubmit}
        type={type}
        deviceType={deviceType}
        formObj={formObj}
        solutionNames={solutionNames}
        />
        </> </>
        ) )
        } }
        ......
        src/pages/artificial/taskScheduling/taskScheduling.less
        View file @ 528d33ac
        .container{
        width: 100%;
        height: 100%;
        background-color: #ffffff;
        }
        .predict{ .predict{
        display: flex; display: flex;
        align-items: flex-end; align-items: flex-end;
        ...@@ -8,7 +13,7 @@ ...@@ -8,7 +13,7 @@
        display: flex; display: flex;
        justify-content: flex-end; justify-content: flex-end;
        width: 100%; width: 100%;
        padding: 0 0 2rem padding: 2rem 1rem 2rem 0;
        } }
        .corn{ .corn{
        cursor: pointer; cursor: pointer;
        ......
        src/pages/platformCenter/schemeConfig/TileConfig/TileConfig.jsx
        View file @ 528d33ac
        ...@@ -114,7 +114,6 @@ const TileData = props => { ...@@ -114,7 +114,6 @@ const TileData = props => {
        }) })
        } }
        const handleAdd = () => { const handleAdd = () => {
        console.log('baseMap',baseMap);
        if(baseMap.length){ if(baseMap.length){
        setType('add'); setType('add');
        setVisible(true); setVisible(true);
        ......
        src/services/intelligence/api.js
        View file @ 528d33ac
        ...@@ -20,6 +20,13 @@ export const algorithmList = () => ...@@ -20,6 +20,13 @@ export const algorithmList = () =>
        export const getEquipmentInfo = (query) => export const getEquipmentInfo = (query) =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/AcrossTable/GetEquipmentInfo?equipType=${query}`); get(`${CITY_SERVICE}/IOTPlatform.svc/AcrossTable/GetEquipmentInfo?equipType=${query}`);
        //获取指标列表
        export const getQutaList = (query) =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/AcrossTable/GetQutaList?AcountName=${query.accountName}&&AddrSchemeID=${query.AddrSchemeID}`);
        //获取场景列表
        export const getSceneNameInfo = () =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/GetSceneNameInfo`);
        //任务添加 //任务添加
        export const addTaskOptions = (params) => export const addTaskOptions = (params) =>
        ...@@ -32,3 +39,44 @@ export const updateTaskOptions = (params) => ...@@ -32,3 +39,44 @@ export const updateTaskOptions = (params) =>
        //任务删除 //任务删除
        export const deleteTaskOptions = (params) => export const deleteTaskOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/DeleteTaskOptions`, params); post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/DeleteTaskOptions`, params);
        //预测列表
        export const getPredictInfo = () =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/GetPredictInfo`);
        //预测新增
        export const addPredictOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/AddPredictOptions`, params);
        //预测编辑
        export const editPredictOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/EditPredictOptions`, params);
        //预测删除
        export const deletePredictOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/DeletePredictOptions?PredictID=${params}`);
        //策略下发列表
        export const getStrategyInfo = () =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/GetStrategyInfo`);
        //策略下发增加
        export const addStrategyOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/AddStrategyOptions`, params);
        //策略下发编辑
        export const editStrategyOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/EditStrategyOptions`, params);
        //策略下发删除
        export const deleteStrategyOptions = (params) =>
        post(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/DeleteStrategyOptions?StrategyId=${params}`);
        //获取预测设备
        export const getPredictDevice = (params) =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/GetPredictDevice?DeviceType=${params}`);
        //获取预测指标
        export const getPredictDevicePoint = (params) =>
        get(`${CITY_SERVICE}/IOTPlatform.svc/WaterAge/GetPredictDevicePoint?DeviceType=${params.deviceType}&DeviceCode=${params.DeviceCode}`);
        \ No newline at end of file
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment