Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

a6fe6639 · mayongxin · 8e33932e · c4fcc608 · a6fe6639 · a6fe6639
Commit a6fe6639 authored May 13, 2021 by mayongxin
14 changed files
--- a/src/pages/artificial/policiesIssued/predictionConfig/AddModal.jsx
+++ b/src/pages/artificial/policiesIssued/predictionConfig/AddModal.jsx
 import React, { useState, useEffect } from 'react';
-import { Form, Modal, Input, Select, notification, DatePicker, Spin, Button, Card, Row, Col } from 'antd';
+import { Form, Modal, Input, Select, notification, Spin, Button, Card, Row, Col } from 'antd';
 import styles from '../policiesIssued.less'
-// import moment from 'moment';
-// import locale from 'antd/es/date-picker/locale/zh_CN';
-// import 'moment/locale/zh-cn';
-
-import moment from 'moment'
-import locale from 'antd/lib/date-picker/locale/zh_CN'
-import 'moment/locale/zh-cn'
-moment.locale('zh-cn')
 import {
  getEquipmentInfo, getQutaList, addPredictOptions, getSceneNameInfo, editPredictOptions
 } from '@/services/intelligence/api';
 import { DeleteOutlined } from '@ant-design/icons';

-
-const { RangePicker } = DatePicker;
 const { TextArea } = Input;
 const AddModal = props => {
  const { callBackSubmit = () => { }, type, formObj, visible, deviceType } = props;
@@ -25,6 +15,9 @@ const AddModal = props => {
  const [deviceList, setDeviceList] = useState([]); //设备列表
  const [card, setCard] = useState([]); //卡片列表值
  const [timeType, setTimeType] = useState(['分钟', '小时', '天']);
+  const [PredictType, setPredictType] = useState(['日', '周', '月']);
+  const [showTime, setShowTime] = useState(true);
+  const [commonType, setCommonType] = useState(['自定义', '同周日', '同月日']);
  const [intervalType, setIntervalType] = useState('分钟')
  const [CycleValue, setCycleValue] = useState('')
  const [sceneList, setSceneList] = useState([])
@@ -35,23 +28,21 @@ const AddModal = props => {
    form.validateFields().then(validate => {
      if (validate) {
        let obj = form.getFieldsValue();
-        let DateFrom = moment(obj.time[0]).format('YYYY-MM-DD')
-        let DateTo = moment(obj.time[1]).format('YYYY-MM-DD')
-        let PredictDateFrom = moment(obj.PredictTime[0]).format('YYYY-MM-DD')
-        let PredictDateTo = moment(obj.PredictTime[1]).format('YYYY-MM-DD')
+
        let api = addPredictOptions
        let query = {
          SceneName: obj.SceneName,
          Cycle: intervalType,
          CycleValue: CycleValue,
-          DateFrom: DateFrom,
-          DateTo: DateTo,
          DeviceType: obj.DeviceType,
-          PredictDateFrom,
-          PredictDateTo,
          PredictName: obj.PredictName,
          Remarks: obj.Remarks,
-          DeviceDetails: card
+          DeviceDetails: card,
+          PredictCycle: obj.PredictCycle ? obj.PredictCycle : '',
+          PredictCycleValue: obj.PredictCycleValue,
+          StatisticCycle: obj.StatisticCycle,
+          PredictType: obj.PredictType,
+          StatisticCycleValue: obj.StatisticCycleValue
        }
        // card.length ? query.DeviceDetails = card : delete query.DeviceDetails
        type === 'edit' ? (query.ID = formObj.ID) && (api = editPredictOptions) : delete query.ID && (api = addPredictOptions)
@@ -110,7 +101,8 @@ const AddModal = props => {
    }
    else {
      setDeviceList([])
-      form.setFieldsValue({ time: [moment(formObj.DateFrom, "YYYYMMDD"), moment(formObj.DateTo, "YYYYMMDD")], PredictTime: [moment(formObj.PredictDateFrom, "YYYYMMDD"), moment(formObj.PredictDateTo, "YYYYMMDD")], ...formObj });
+      formObj.PredictType === '日' ? setShowTime(true) : setShowTime(false)
+      form.setFieldsValue({ ...formObj });
      setCycleValue(formObj.CycleValue);
      setIntervalType(formObj.Cycle);
      if (formObj.DeviceDetails.length) {
@@ -239,11 +231,14 @@ const AddModal = props => {
  const clearInput = (index) => {
    form.setFieldsValue({
      [`deviceCode${index}`]: undefined,
-      [`indextr${index}`]:undefined,
-      [`max${index}`]:undefined,
-      [`min${index}`]:undefined
+      [`indextr${index}`]: undefined,
+      [`max${index}`]: undefined,
+      [`min${index}`]: undefined
    })
  }
+  const selectPredictType = (value) => {
+    value === '日' ? setShowTime(true) : setShowTime(false)
+  }
  //选择小时,分,天
  const selectCycleValue = (e) => {
    setCycleValue(e.target.value)
@@ -292,23 +287,48 @@ const AddModal = props => {
                {deviceType.length ? deviceType.map((item, index) => { return <Select.Option key={index} value={item.DeviceType}>{item.DeviceType}</Select.Option> }) : ''}
              </Select>
            </Item>
+
            <Item
-              label="首次执行时间"
-              name="time"
-              rules={[{ required: true, message: '请选择首次执行时间' }]}
+              label="预测维度"
+              name="PredictType"
+              rules={[{ required: true, message: '请选择预测维度' }]}
            >
+              <Select onChange={selectPredictType} >
+                {PredictType.length ? PredictType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''}
+              </Select>
+            </Item>
+            {showTime ? <Item
+              label="维度类别"
+              name="PredictCycle"
+              rules={[{ required: true, message: '请选择维度类别' }]}
+            >
+              <Select >
+                {commonType.length ? commonType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''}
+              </Select>
+            </Item> : ''}

-              <RangePicker locale={locale}
-                style={{ width: '100%' }} />
+            <Item
+              label="预测维度值"
+              name="PredictCycleValue"
+              rules={[{ required: true, message: '请输入预测维度值' }]}
+            >
+              <Input placeholder="请输入任务名称" allowClear />
            </Item>
            <Item
-              label="首次计算时间"
-              name="PredictTime"
-              rules={[{ required: true, message: '请选择首次执行时间' }]}
+              label="统计维度"
+              name="StatisticCycle"
+              rules={[{ required: true, message: '请选择预测维度' }]}
            >
-
-              <RangePicker locale={locale}
-                style={{ width: '100%' }} />
+              <Select>
+                {PredictType.length ? PredictType.map((item, index) => { return <Select.Option key={index} value={item}>{item}</Select.Option> }) : ''}
+              </Select>
+            </Item>
+            <Item
+              label="统计维度值"
+              name="StatisticCycleValue"
+              rules={[{ required: true, message: '请选择维度类别' }]}
+            >
+              <Input placeholder="请输入任务名称" allowClear />
            </Item>
            <Item
              label="预测间隔"
@@ -372,7 +392,7 @@ const AddModal = props => {
                        label="最小值"
                        name={'min' + index}
                      >
-                        <Input placeholder="请输入最小值" style={{width:'98%'}} onChange={(value) => inputMin(value, index)} index={index} allowClear />
+                        <Input placeholder="请输入最小值" style={{ width: '98%' }} onChange={(value) => inputMin(value, index)} index={index} allowClear />
                      </Item>
                    </Col>
                    <Col span={12}>
@@ -380,7 +400,7 @@ const AddModal = props => {
                        label="最大值"
                        name={'max' + index}
                      >
-                        <Input style={{ width: '98%' ,marginLeft:'0.4rem'}} placeholder="请输入最大值" onChange={(value) => inputMax(value, index)} index={index} allowClear />
+                        <Input style={{ width: '98%', marginLeft: '0.4rem' }} placeholder="请输入最大值" onChange={(value) => inputMax(value, index)} index={index} allowClear />
                      </Item>
                    </Col>
                  </Row>

--- a/src/pages/artificial/policiesIssued/predictionConfig/predictionConfig.jsx
+++ b/src/pages/artificial/policiesIssued/predictionConfig/predictionConfig.jsx
@@ -51,18 +51,6 @@ const VectorData = props => {
                </Space>
            )
        },
-        {
-            title: '首次执行时间',
-            dataIndex: 'DateFrom',
-            key: 'DateFrom',
-            align: 'center'
-        },
-        {
-            title: '首次计算时间',
-            dataIndex: 'PredictDateFrom',
-            key: 'PredictDateFrom',
-            align: 'center'
-        },
        {
            title: '描述',
            dataIndex: 'Remarks',

--- a/src/pages/platformCenter/bsmanager/tablemanager/components/Field/index.jsx
+++ b/src/pages/platformCenter/bsmanager/tablemanager/components/Field/index.jsx
-import React, { useState, useEffect } from 'react'
-import {CM_Table_ReloadFields} from '@/services/platform/bs'
-
-const FieldEdit = () => {
-    return (
-        <div>
-            
-        </div>
-    )
-}
-export default FieldEdit
\ No newline at end of file
+import React, { useState, useEffect } from 'react';
+import { Form, Modal, Input, Select, AutoComplete, Button, notification } from 'antd';
+
+import {
+  SetServiceConfig, GetAllConfig
+} from '@/services/webConfig/api';
+
+
+const { Option } = Select;
+const AddModal = props => {
+  const { callBackSubmit = () => { }, type, formObj, visible, listData } = props;
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const { Item } = Form;
+  // 提交
+  const onSubmit = () => {
+    form.validateFields().then(validate => {
+      if (validate) {
+        setLoading(true);
+        let obj = form.getFieldsValue();
+        SetServiceConfig({
+          schemename: obj.schemename,
+          terminalType: type === 'add' ? 'web' : 'phone',
+          isBaseMap: 'false',
+          jsonCfg: type === 'add' ? JSON.stringify({ type: 'dynamic' }) : JSON.stringify({ isDefault: false })
+        })
+          .then(res => {
+            setLoading(false);
+            if (res.msg === "Ok") {
+              form.resetFields();
+              callBackSubmit();
+              notification.success({
+                message: '提示',
+                duration: 3,
+                description: '新增成功',
+              });
+
+            } else {
+              notification.error({
+                message: '提示',
+                duration: 3,
+                description: '新增失败',
+              });
+            }
+          })
+          .catch(err => {
+            notification.error({
+              message: '提示',
+              duration: 3,
+              description: '新增失败',
+            });
+            setLoading(false);
+          });
+
+      }
+    });
+  };
+
+
+  const onFinish = value => { };
+  useEffect(() => {
+    if(type!=''){
+      form.setFieldsValue({ schemename: listData[0] });
+    }
+
+  }, [visible]);
+
+
+  const layout = {
+    layout: 'horizontal',
+    labelCol: {
+      span: 4,
+    },
+    wrapperCol: {
+      span: 16,
+    },
+  };
+
+  const handleChange = (value) => {
+    form.setFieldsValue({ schemename: value});
+  }
+
+  return (
+    <Modal
+      title={`${type === 'add' ? '元数据发布' : '编辑'}`}
+      bodyStyle={{ width: '100%', minHeight: '100px' }}
+      style={{ top: '150px' }}
+      width="700px"
+      destroyOnClose
+      maskClosable={false}
+      cancelText="取消"
+      okText="确认"
+      {...props}
+      onOk={() => onSubmit()}
+      confirmLoading={loading}
+      forceRender={true}
+      getContainer={false}
+    >
+      {visible && (
+        <Form form={form} {...layout} onFinish={onFinish}>
+          <Item
+            label="方案名"
+            name="schemename"
+            rules={[{ required: true, message: '请选择服务名' }]}
+          >
+            <Select onChange={handleChange}>
+              {listData.map((item, index) => { return <Option value={item} key={index}>{item}</Option> }) }
+            </Select>
+          </Item>
+        </Form>
+      )}
+    </Modal>
+  );
+};
+export default AddModal;
--- a/src/pages/platformCenter/bsmanager/tablemanager/index.jsx
+++ b/src/pages/platformCenter/bsmanager/tablemanager/index.jsx
@@ -7,20 +7,23 @@ import {
    Input,
    Button,
    Select,
-    Popconfirm,
-    message
+    Popconfirm
 } from 'antd';
 import { PlusCircleOutlined } from '@ant-design/icons';
 import PageContainer from '@/components/BasePageContainer';
 import { CM_Table_LoadTable } from '@/services/platform/bs'
 import styles from './index.less'
+import AddModal from './components/Field/index'
 const { Search } = Input;
 const { Option } = Select;
 const placeholder = "请输入表名"

 const TableManager = () => {

-
+    const [visible, setVisible] = useState(false); // 弹窗
+    const [type, setType] = useState(''); // 弹窗类型
+    const [formObj, setFormObj] = useState({});
+    const [flag, setFlag] = useState(0); // 弹窗类型

    const columns = [
        {
@@ -98,8 +101,6 @@ const TableManager = () => {
        },
        {
            title: '操作',
-            dataIndex: 'action',
-            key: 'action',
            width: 250,
            ellipsis: true,
            render: (text, record) => (
@@ -143,14 +144,18 @@ const TableManager = () => {
    ];
    const [tableData, setTableData] = useState([])

-    useEffect(() => {
+    useEffect((record) => {
        loadTable()
        
    }, [])
+    //修改表名
    const changeDesc = () => {

    }
-
+    const onSubmit = prop => {
+        setVisible(false);
+        setFlag(flag + 1)
+    };
    const AddTable = () => {

    }
@@ -195,10 +200,18 @@ const TableManager = () => {
                        dataSource={tableData}
                        pagination={{pageSize:20}}
                        scroll={{ y: 700 }}
-                        size="small"
+                        size="small"             
+                        rowKey={(record, index) => `complete${record.tableID}${index}`}
                    />
                </div>
            </div>
+            <AddModal
+                visible={visible}
+                onCancel={() => setVisible(false)}
+                callBackSubmit={onSubmit}
+                type={type}
+                formObj={formObj}
+            />
        </PageContainer>
    )


--- a/src/pages/platformCenter/schemeConfig/TileConfig/AddModal.jsx
+++ b/src/pages/platformCenter/schemeConfig/TileConfig/AddModal.jsx
@@ -39,7 +39,7 @@ const AddModal = props => {
        SetServiceConfig(arr)
          .then(res => {
            setLoading(false);
-            if (res.IsSuccess) {
+            if (res.msg === "Ok") {
              form.resetFields();
              callBackSubmit();
              notification.success({

--- a/src/pages/platformCenter/schemeConfig/TileConfig/TileConfig.jsx
+++ b/src/pages/platformCenter/schemeConfig/TileConfig/TileConfig.jsx
-import { Space, Table, Button, Popconfirm, notification,Spin } from 'antd';
+import { Space, Table, Button, Popconfirm, notification, Spin } from 'antd';
 import React, { useState, useEffect } from 'react';
 import styles from '../SchemeConfig.less'
 import {
-    GetAllConfig,
+    GettMaplayer,
    deleteConfig
 } from '@/services/webConfig/api';
 import AddModal from './AddModal'
@@ -92,8 +92,7 @@ const TileData = props => {
        }).then(res => {
            setFlag(flag + 1)
            setTreeLoading(false);
-            console.log('res', res)
-            if (res.IsSuccess) {
+            if (res.msg === 'Ok') {
                // form.resetFields();
                // callBackSubmit();
                notification.success({
@@ -114,18 +113,18 @@ const TileData = props => {
        })
    }
    const handleAdd = () => {
-        if(baseMap.length){
+        if (baseMap.length) {
            setType('add');
            setVisible(true);
        }
-        else{
+        else {
            notification.warning({
                message: '提示',
                duration: 3,
                description: '地图类型已都存在,可编辑修改',
-            }); 
+            });
        }
-      
+
    }
    useEffect(() => {
        renderTile();
@@ -134,18 +133,18 @@ const TileData = props => {
    const renderTile = () => {
        setTreeLoading(true);
        const baseMapData = ['高德地形', '高德影像', '天地图地形', '天地图影像']
-        GetAllConfig({
+        GettMaplayer({
            terminalType: 'base',
            isBaseMap: true
        }).then(
            res => {
-                if (res.IsSuccess) {
+                if (res.msg === "Ok") {
                    setTreeLoading(false);
-                    setTileData(res.Result);
-                    res.Result.map( (item) =>{
+                    setTileData(res.data.general.baseMap.layers);
+                    res.data.general.baseMap.layers.map((item) => {
                        let index = baseMapData.indexOf(item.servicename);
                        if (index != -1) {
-                           baseMapData.splice(index, 1);  
+                            baseMapData.splice(index, 1);
                        }
                    })
                    setBaseMap(baseMapData)
@@ -162,35 +161,35 @@ const TileData = props => {

    return (
        <>
-          <Spin tip="loading..." spinning={treeLoading}>
-            <div className={styles.tileBtn}>
-                <Button type="primary" onClick={() => {
-                    handleAdd();
-                }} >
-                    新增
+            <Spin tip="loading..." spinning={treeLoading}>
+                <div className={styles.tileBtn}>
+                    <Button type="primary" onClick={() => {
+                        handleAdd();
+                    }} >
+                        新增
                </Button>
-            </div>
-            <Table
-                columns={columns}
-                dataSource={tileData}
-                bordered
-                rowKey="type"
-                scroll={{ y: 400 }}
-                pagination={{
-                    showTotal: (total, range) =>
-                        `第${range[0]}-${range[1]} 条/共 ${total} 条`
+                </div>
+                <Table
+                    columns={columns}
+                    dataSource={tileData}
+                    bordered
+                    rowKey="type"
+                    scroll={{ y: 400 }}
+                    pagination={{
+                        showTotal: (total, range) =>
+                            `第${range[0]}-${range[1]} 条/共 ${total} 条`

-                }}
-            >
-            </Table>
-            <AddModal
-                visible={visible}
-                onCancel={() => setVisible(false)}
-                callBackSubmit={onSubmit}
-                type={type}
-                formObj={formObj}
-                baseMap = {baseMap}
-            />
+                    }}
+                >
+                </Table>
+                <AddModal
+                    visible={visible}
+                    onCancel={() => setVisible(false)}
+                    callBackSubmit={onSubmit}
+                    type={type}
+                    formObj={formObj}
+                    baseMap={baseMap}
+                />
            </Spin>
        </>
    )

--- a/src/pages/platformCenter/schemeConfig/VectorData/AddModal.jsx
+++ b/src/pages/platformCenter/schemeConfig/VectorData/AddModal.jsx
@@ -68,40 +68,12 @@ const AddModal = props => {
              });
              setLoading(false);
            });
-        } else if (type === 'edit') {
-          handleEdit();
        }
      }
    });
  };

-  const handleEdit = () => {
-    // SetServiceConfig({
-    //   servicename: serviceName,
-    //   terminalType: 'base',
-    //   isBaseMap: true,
-    //   jsonCfg: JSON.stringify(query)
-    // })
-    //   .then(res => {
-    //     setLoading(false);
-    //     if (res.success) {
-    //       form.resetFields();
-    //       callBackSubmit();
-    //       notification.success({
-    //         message: '提示',
-    //         duration: 3,
-    //         description: res.message || '编辑成功',
-    //       });
-    //     } else {
-    //       notification.error({
-    //         message: '提示',
-    //         duration: 3,
-    //         description: res.message || '编辑失败',
-    //       });
-    //     }
-    //   })
-    //   .catch(err => setLoading(false));
-  };
+

  const onFinish = value => { };
  useEffect(() => {
@@ -167,8 +139,6 @@ const AddModal = props => {
    },
  };

-  const handleChange = () => { }
-

  //选择工作空间
  const selectWorkspace = () => {

--- a/src/pages/platformCenter/schemeConfig/VectorData/VectorData.jsx
+++ b/src/pages/platformCenter/schemeConfig/VectorData/VectorData.jsx
-import { Space, Table, Button, Popconfirm, notification,Spin } from 'antd';
+import { Space, Table, Button, Popconfirm, notification, Spin } from 'antd';
 import React, { useState, useEffect } from 'react';
 import styles from '../SchemeConfig.less'
 import {
@@ -16,12 +16,12 @@ const VectorData = props => {
    const [type, setType] = useState(''); // 弹窗类型
    const [solutionNames, setSolutionNames] = useState('');
    const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' });
-    const [currentMetaData,setCurrentMetaData] = useState(null)
+    const [currentMetaData, setCurrentMetaData] = useState(null)
    const columns = [
        {
            title: '服务名',
-            dataIndex: 'serviceName',
-            key: 'serviceName',
+            dataIndex: 'ServiceName',
+            key: 'ServiceName',
            align: 'center'
        },
        {
@@ -84,7 +84,7 @@ const VectorData = props => {
        newLoadings[index] = true
        setLoading(newLoadings)
        let query = {
-            serviceName: record.serviceName,
+            serviceName: record.ServiceName,
            _version: 9999,
            solution: solutionNames
        }
@@ -133,15 +133,17 @@ const VectorData = props => {
    }
    const onSubmit = prop => {
        setVisible(false);
-        setFlag(flag+1)
+        setFlag(flag + 1)
    };
    const delConfirm = (record) => {
+        console.log(' record.ServiceName', record.ServiceName.split("."));
        let query = {
-            serviceName: record.serviceName,
+            serviceName: record.ServiceName.split(".")[0],
            _version: 9999,
            solution: solutionNames
        }
        deleteVectorService(query).then(res => {
+            console.log('res',res);
            if (res.success) {
                setFlag(flag + 1)
                notification.success({
@@ -171,14 +173,14 @@ const VectorData = props => {
        solutionName();
        GetVectorService().then(
            res => {
-                if (res && res.length > 0) {
+                if (res.msg==='Ok') {
                    let arr = []
-                    res.map(item => {
+                    res.data.VectorList.map(item => {
                        arr.push(false)
                    })
                    setLoading(arr)
                    setTreeLoading(false);
-                    setTileData(res);
+                    setTileData(res.data.VectorList);
                } else {
                    setTreeLoading(false);
                    notification.error({
@@ -194,40 +196,40 @@ const VectorData = props => {

    return (
        <>
-          <Spin tip="loading..." spinning={treeLoading}>
-            <div className={styles.tileBtn}>
-                <Button type="primary" onClick={() => {
-                    handleAdd();
-                }} >
-                    新增
+            <Spin tip="loading..." spinning={treeLoading}>
+                <div className={styles.tileBtn}>
+                    <Button type="primary" onClick={() => {
+                        handleAdd();
+                    }} >
+                        新增
                </Button>
-            </div>
-            <Table
-                columns={columns}
-                dataSource={tileData}
-                bordered
-                rowKey="createTime"
-                scroll={{ y: 400 }}
-                pagination={{
-                    showTotal: (total, range) =>
-                        `第${range[0]}-${range[1]} 条/共 ${total} 条`
+                </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}
-                formObj={formObj}
-                solutionNames={solutionNames}
-            />
-            <PreviewModal
-                visible={previewVisible}
-                onCancel={() => setPreviewVisible(false)}
-                metaData={currentMetaData}
-            />
+                    }}
+                >
+                </Table>
+                <AddModal
+                    visible={visible}
+                    onCancel={() => setVisible(false)}
+                    callBackSubmit={onSubmit}
+                    type={type}
+                    formObj={formObj}
+                    solutionNames={solutionNames}
+                />
+                <PreviewModal
+                    visible={previewVisible}
+                    onCancel={() => setPreviewVisible(false)}
+                    metaData={currentMetaData}
+                />
            </Spin>
        </>
    )

--- a/src/pages/platformCenter/schemeConfig/projectMessage/AddModal.jsx
+++ b/src/pages/platformCenter/schemeConfig/projectMessage/AddModal.jsx
 import React, { useState, useEffect } from 'react';
 import { Form, Modal, Input, Select, notification } from 'antd';
 import {
-  GetAllConfig,
+  GettMaplayer,
  GetVectorService,
  SetServiceConfig,
  bindSchemeBaseMap
 } from '@/services/webConfig/api';
-import { number } from 'prop-types';
 const { Item } = Form;
 const { Option } = Select;
 const AddModal = props => {
-  const { callBackSubmit = () => { }, type, formObj, visible,serviceList } = props;
+  const { callBackSubmit = () => { }, type, formObj, visible, serviceList } = props;
  const [loading, setLoading] = useState(false);
-  const [mapType, setMapType] = useState(0);
-  const [ImgIndex, setImgIndex] = useState('');
  const [baseMap, setBaseMap] = useState([]);
  const [pipeArr, setPipeArr] = useState([]);

@@ -31,7 +28,7 @@ const AddModal = props => {
            basemapName: obj.serverName
          }).then(res => {
            setLoading(false);
-            if (res.code===0) {
+            if (res.code === 0) {
              form.resetFields();
              callBackSubmit();
              prompt('success', '瓦片新增成功')
@@ -79,7 +76,7 @@ const AddModal = props => {
    SetServiceConfig(query)
      .then(res => {
        setLoading(false);
-        if (res.IsSuccess) {
+        if (res.msg === "Ok") {
          form.resetFields();
          callBackSubmit();
          prompt('success', '方案新增成功')
@@ -117,20 +114,22 @@ const AddModal = props => {
  //获取管网及默认底图
  const pipeNetwork = () => {
    form.resetFields();
-    let req1 = GetAllConfig({ terminalType: 'base', isBaseMap: true })
+    let req1 = GettMaplayer({ terminalType: 'base', isBaseMap: true })
    let req2 = GetVectorService()
    let pipeArr = [], baseMap = [];
    Promise.all([req1, req2]).then(res => {
-      if (res[0].Result && res[0].Result.length) {
-        res[0].Result.map(item => {
+      if (res[0].msg === 'Ok') {
+        (res[0].data.general.baseMap.layers || []).map(item => {
          baseMap.push(item.servicename)
        })
      }
-      if (res[1] && res[1].length) {
-        res[1].map(item => {
-          pipeArr.push(item.serviceName)
+      if (res[1].msg === 'Ok') {
+        (res[1].data.VectorList || []).map(item => {
+          pipeArr.push(item.ServiceName.split(".")[0])
        })
      }
+      console.log('pipeArr', pipeArr);
+      console.log('baseMap', baseMap);
      setPipeArr(pipeArr)
      setBaseMap(baseMap)
      form.setFieldsValue({

--- a/src/pages/platformCenter/schemeConfig/projectMessage/components/card.jsx
+++ b/src/pages/platformCenter/schemeConfig/projectMessage/components/card.jsx
@@ -3,7 +3,7 @@ import classnames from 'classnames'
 import styles from '../../SchemeConfig.less'
 import { Popconfirm, notification, Card, Button, message } from 'antd';
 import {
-    unbindSchemeBaseMap, GetAllConfig, SetServiceConfig,deleteConfig
+    unbindSchemeBaseMap, GettMaplayer, SetServiceConfig,deleteConfig
 } from '@/services/webConfig/api';
 import {
    CloseOutlined, PlusOutlined
@@ -47,7 +47,7 @@ const CardData = props => {
            terminalType: 'scheme',
            isBaseMap: false
        }).then(res => {
-            if (res.code===0) {
+            if (res.msg === "Ok") {
                notification.success({
                    message: '提示',
                    duration: 3,
@@ -73,9 +73,9 @@ const CardData = props => {
        let serverList = []
        setFormObj(value);
        if (JSON.stringify(value) != "{}") {
-            GetAllConfig({ terminalType: 'base', isBaseMap: true }).then(res => {
-                if (res.Result && res.Result.length) {
-                    res.Result.map(item => {
+            GettMaplayer({ terminalType: 'base', isBaseMap: true }).then(res => {
+                if (res.msg==='Ok') {
+                    res.data.general.baseMap.layers.map(item => {
                        if (value.baseMap.indexOf(item.servicename) == -1) {
                            serverList.push(item.servicename)
                        }
@@ -116,7 +116,7 @@ const CardData = props => {
            }
        ).then(
            res => {
-                if (res.IsSuccess == true) {
+                if (res.msg === "Ok") {
                    setMapScopeVisible(true)
                    message.info("范围设置成功")
                }

--- a/src/pages/platformCenter/schemeConfig/projectMessage/projectMessage.jsx
+++ b/src/pages/platformCenter/schemeConfig/projectMessage/projectMessage.jsx
@@ -2,7 +2,7 @@ import { Button,Spin } from 'antd';
 import React, { useState, useEffect } from 'react';
 import styles from '../SchemeConfig.less'
 import {
-    GetAllConfig
+    GetMaplayerByTerminalType
 } from '@/services/webConfig/api';
 import AddModal from './AddModal'
 import Cards from './components/card'
@@ -31,14 +31,15 @@ const VectorData = props => {
    // 获取瓦片数据配置数据
    const renderTile = () => {
        setTreeLoading(true);
-        GetAllConfig({
+        GetMaplayerByTerminalType({
            terminalType: 'scheme',
            isBaseMap: false
        }).then(
            res => {
-                if (res && res.Result.length > 0) {
+                console.log('res',res);
+                if (res.msg ==='Ok') {
                    setTreeLoading(false);
-                    setTileData(res.Result);
+                    setTileData(res.data.scheme.optionalLayer.layers);
                } else {
                    setTreeLoading(false);


--- a/src/pages/platformCenter/schemeConfig/solutionConfig/AddModal.jsx
+++ b/src/pages/platformCenter/schemeConfig/solutionConfig/AddModal.jsx
 import React, { useState, useEffect } from 'react';
 import { Form, Modal, Input, Select, AutoComplete, Button, notification } from 'antd';
-import styles from '../SchemeConfig.less'
-
 import {
-  SetServiceConfig, GetAllConfig
+  SetServiceConfig
 } from '@/services/webConfig/api';


@@ -27,7 +25,7 @@ const AddModal = props => {
        })
          .then(res => {
            setLoading(false);
-            if (res.IsSuccess) {
+            if (res.msg === "Ok") {
              form.resetFields();
              callBackSubmit();
              notification.success({

--- a/src/pages/platformCenter/schemeConfig/solutionConfig/solutionConfig.jsx
+++ b/src/pages/platformCenter/schemeConfig/solutionConfig/solutionConfig.jsx
@@ -6,7 +6,7 @@ import {
    PlusOutlined
 } from '@ant-design/icons';
 import {
-    deleteConfig, GetAllConfig, setServiceType, SetServiceConfig,getUserRelationList
+    deleteConfig, setServiceType, SetServiceConfig,GetMaplayerByTerminalType
 } from '@/services/webConfig/api';
 import {
    UserAddOutlined
@@ -161,7 +161,7 @@ const VectorData = props => {
                })
            }
            SetServiceConfig(query).then(res => {
-                if (res.IsSuccess) {
+                if (res.msg === "Ok") {
                    prompt('success', '关联角色成功')
                    setFlag(flag + 1)
                }
@@ -257,7 +257,7 @@ const VectorData = props => {
        if (!newLoadings[index]) {
            SetServiceConfig(query).then(res => {
                setCheckLoading(false)
-                if (res.IsSuccess) {
+                if (res.msg === "Ok") {
                    const changehandData = [...handData];
                    changehandData[index].isDefault = false
                    setHandData(changehandData)
@@ -279,7 +279,7 @@ const VectorData = props => {
            })
        }).then(res => {
            setCheckLoading(false)
-            if (res.IsSuccess) {
+            if (res.msg === "Ok") {
                const changehandData = [...handData];
                changehandData[index].isDefault = true
                setHandData(changehandData)
@@ -333,7 +333,7 @@ const VectorData = props => {
            terminalType: 'web',
            isBaseMap: false
        }).then(res => {
-            if (res.IsSuccess) {
+            if (res.msg === "Ok") {
                prompt('success', '删除成功')
                setFlag(flag + 1)

@@ -349,7 +349,7 @@ const VectorData = props => {
            terminalType: 'phone',
            isBaseMap: false
        }).then(res => {
-            if (res.IsSuccess) {
+            if (res.msg === "Ok") {
                prompt('success', '删除成功')
                setFlag(flag + 1)

@@ -365,17 +365,17 @@ const VectorData = props => {
        type == 'add' ? listData = webData : listData = handData
        let webSchemenameArr = [], schemeArr = []
        setTreeLoading(true);
-        GetAllConfig({
+        GetMaplayerByTerminalType({
            terminalType: 'scheme',
            isBaseMap: false
        }).then(
            res => {
-                if (res && res.Result.length > 0) {
+                if (res.data.scheme && res.data.scheme.optionalLayer.layers.length) {
                    setTreeLoading(false);
                    listData.map(item => {
                        webSchemenameArr.push(item.schemename)
                    })
-                    res.Result.map(item => {
+                    res.data.scheme.optionalLayer.layers.map(item => {
                        if (!webSchemenameArr.includes(item.schemename))
                            schemeArr.push(item.schemename)
                    })
@@ -410,19 +410,20 @@ const VectorData = props => {
    const renderTile = () => {
        setCheckLoading(true)
        //查询手持方案
-        var schemeConfigQueryRequest = GetAllConfig({
+        var schemeConfigQueryRequest = GetMaplayerByTerminalType({
            terminalType: 'phone',
            isBaseMap: false
        })
        //查询web方案
-        var webSchemeQueryRequest = GetAllConfig({
+        var webSchemeQueryRequest = GetMaplayerByTerminalType({
            terminalType: 'web',
            isBaseMap: false
        })
        Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]).then(res => {
-            if (res[0].IsSuccess) {
+            console.log('res',res);
+            if (res[0].msg==="Ok" && res[0].data.phone) {
                let arr = []
-                res[0].Result.map((item, index) => {
+                res[0].data.phone.optionalLayer.layers.map((item, index) => {
                    if (item.isDefault) {
                        arr.push(true)
                    } else {
@@ -432,13 +433,13 @@ const VectorData = props => {
                    item.isStatus = 'phone'
                    return item
                })
-                setHandData(res[0].Result)
+                setHandData(res[0].data.phone.optionalLayer.layers)
                setHandStatus(arr)

            }
-            if (res[1].IsSuccess) {
+            if (res[1].msg==="Ok" && res[1].data.web) {
                let arr = []
-                res[1].Result.map((item, index) => {
+                res[1].data.web.optionalLayer.layers.map((item, index) => {
                    if (item.type === "pipenet") {
                        arr.push(true)
                    } else {
@@ -447,7 +448,7 @@ const VectorData = props => {
                    item.isStatus = 'web'
                    return item
                })
-                setWebData(res[1].Result)
+                setWebData(res[1].data.web.optionalLayer.layers)
                setWebStatus(arr)
            }
            setCheckLoading(false)

--- a/src/services/webConfig/api.js
+++ b/src/services/webConfig/api.js
@@ -157,32 +157,22 @@ export const editWebsite = params => {
 export const omsDeleteWebsite = client =>
  get(`${PUBLISH_SERVICE}/WebSite/DeleteWebsite`, { client });

-//获取gis底图列表
-export const GetAllConfig = query =>
-  get(`${CITY_SERVICE}/OMS.svc/GetAllConfig`, query);
+// 获取全部
+export const GetMaplayerByTerminalType = query =>
+  get(`${PUBLISH_SERVICE}/Maplayer/GetMaplayerByTerminalType`, query);

+  // 获取全部
+export const GettMaplayer = query =>
+get(`${PUBLISH_SERVICE}/Maplayer/GettMaplayer`, query);

-//获取gis底图列表
-// export const GetAllConfig = query =>
-// get(`${PUBLISH_SERVICE}/Maplayer/GetMaplayerByTerminalType`, query);

 //设置底图数据
 export const SetServiceConfig = query =>
-  get(`${CITY_SERVICE}/OMS.svc/SetServiceConfig`, query);
-
-  
-// //设置底图数据
-// export const SetServiceConfig = query =>
-// get(`${PUBLISH_SERVICE}/Maplayer/SetServiceConfig`, query);
+get(`${PUBLISH_SERVICE}/Maplayer/SetServiceConfig`, query);

 // 获取方矢量数据列表
 export const GetVectorService = () =>
-  get(`${CITY_SERVICE}/OMS.svc/D_GetVectorService`, { _version: 9999 });
-
-
-  //获取方矢量数据列表
-// export const GetVectorService = () =>
-// get(`${PUBLISH_SERVICE}/Maplayer/GetVectorService`, { _version: 9999 });
+  get(`${PUBLISH_SERVICE}/Maplayer/GetVectorService`, { _version: 9999 });

 //获取元数据的工作空间列表
 export const GetGISServerMapList = query =>
@@ -190,52 +180,43 @@ export const GetGISServerMapList = query =>


 //发布原数据
-export const publisService = (query,timeout) =>
-get(`${CITY_SERVICE}/OMS.svc/D_Publish_GS_Service`, query,timeout);
+export const publisService = (query, timeout) =>
+  get(`${CITY_SERVICE}/OMS.svc/D_Publish_GS_Service`, query, timeout);

 //解决方案名称
 export const getSolutionList = (query) =>
-get(`${CITY_SERVICE}/OMS.svc/W4_GetSolutionList`, query );
+  get(`${CITY_SERVICE}/OMS.svc/W4_GetSolutionList`, query);

 //删除元数据
 export const deleteVectorService = (query) =>
-get(`${CITY_SERVICE}/OMS.svc/D_DeleteVectorService`, query );
+  get(`${CITY_SERVICE}/OMS.svc/D_DeleteVectorService`, query);

 //更新元数据
 export const updatePublishedMetaData = (query) =>
-get(`${CITY_SERVICE}/OMS.svc/D_UpdatePublishedMetaData`, query );
+  get(`${CITY_SERVICE}/OMS.svc/D_UpdatePublishedMetaData`, query);

-//删除配置
-// export const deleteConfig = (query) =>
-// get(`${CITY_SERVICE}/OMS.svc/DeleteConfig`, query );

 //删除配置
 export const deleteConfig = (query) =>
-get(`${PUBLISH_SERVICE}/Maplayer/DeletMaplayer`, query );
+  get(`${PUBLISH_SERVICE}/Maplayer/DeletMaplayer`, query);

-//增加瓦片
-// export const bindSchemeBaseMap = (query) =>
-// get(`${CITY_SERVICE}/OMS.svc/BindSchemeBaseMap`, query );

 //增加瓦片
 export const bindSchemeBaseMap = (query) =>
-get(`${PUBLISH_SERVICE}/Maplayer/BindSchemeBaseMap`, query );
+  get(`${PUBLISH_SERVICE}/Maplayer/BindSchemeBaseMap`, query);

-//删除瓦片
-// export const unbindSchemeBaseMap = (query) =>
-// get(`${CITY_SERVICE}/OMS.svc/UnbindSchemeBaseMap`, query );

 //删除瓦片
 export const unbindSchemeBaseMap = (query) =>
-get(`${PUBLISH_SERVICE}/Maplayer/UnBindSchemeBaseMap`, query );
+  get(`${PUBLISH_SERVICE}/Maplayer/UnBindSchemeBaseMap`, query);

 //设置web状态
 export const setServiceType = (query) =>
-get(`${CITY_SERVICE}/OMS.svc/SetServiceType`, query );
+  get(`${CITY_SERVICE}/OMS.svc/SetServiceType`, query);

 //获取角色
 export const getUserRelationList = (query) =>
-get(`${CITY_SERVICE}/OMS.svc/WebGIS_GetUserRelationList`, query );
+  get(`${CITY_SERVICE}/OMS.svc/WebGIS_GetUserRelationList`, query);