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

src/pages/platformCenter/schemeConfig/SchemeConfig.less

 .container{
     width: 100%;
-    height: 100vh;
+    height: calc(100vh - 100px) ;
     background-color: #ffffff;
     display: flex;
     padding: 0.8rem;
@@ -8,6 +8,7 @@
         font-weight: 600;
         color: rgba(0, 0, 0, 0.85);
       }
+      overflow-y: scroll;
 }
 .imgList{
     display: flex;
@@ -77,3 +78,17 @@
     color: rgba(0, 0, 0, 0.25);
     z-index: 99;
 }
+.divider{
+    display: flex;
+    align-items: center;
+    line-height: 100%;
+    padding: 0.5rem;
+    .dividerIcon{
+        margin-left: 0.8rem;
+        color: #4699f4;   
+        cursor: pointer; 
+    }
+}
+.ant-table {
+    min-height: 15rem !important;
+  }

src/pages/platformCenter/schemeConfig/TileConfig/TileConfig.jsx

@@ -3,7 +3,7 @@ import React, { useState, useEffect, Modal } from 'react';
 import styles from '../SchemeConfig.less'
 import {
     GetAllConfig,
-    DeleteConfig
+    deleteConfig
 } from '@/services/webConfig/api';
 import AddModal from './AddModal'
 const TileData = props => {
@@ -85,7 +85,7 @@ const TileData = props => {
     const delConfirm = (record) => {
         const { servicename = '' } = record;
         setTreeLoading(true);
-        DeleteConfig({
+        deleteConfig({
             servicename: servicename,
             terminalType: 'base',
             isBaseMap: true

src/pages/platformCenter/schemeConfig/solutionConfig/AddModal.jsx

@@ -3,22 +3,14 @@ import { Form, Modal, Input, Select, AutoComplete, Button, notification } from '
 import styles from '../SchemeConfig.less'
 
 import {
-  GetGISServerMapList,
-  publisService
+  SetServiceConfig, GetAllConfig
 } from '@/services/webConfig/api';
 
 
 const { Option } = Select;
 const AddModal = props => {
-  const { callBackSubmit = () => { }, type, formObj, visible,solutionNames } = props;
+  const { callBackSubmit = () => { }, type, formObj, visible, listData } = props;
   const [loading, setLoading] = useState(false);
-  const [workSpace, setWorkSpace] = useState('');
-  const [serviceName, setServicename] = useState([{
-    value: 'geoserver',
-    item: 'geoserver'
-  }]);
-  const [workList, setWorkList] = useState([]);
-  const [gsIp, setGsIp] = useState([]);
   const [form] = Form.useForm();
   const { Item } = Form;
   // 提交
@@ -27,22 +19,15 @@ const AddModal = props => {
       if (validate) {
         setLoading(true);
         let obj = form.getFieldsValue();
-        if (type === 'add') {
-            let query = {
-              _version: 9999,
-              gsIP: obj.serviceadress,
-              gsPort:  obj.port,
-              gsAppName: obj.servicename,
-              gsUser:  obj.user,
-              gsWorkspaceName:  obj.workname,
-              gsPwd:  obj.password,
-              serviceName:  obj.name,
-              solution: solutionNames,
-            }
-          publisService(query,{timeout:120000})
+        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.success) {
+            if (res.IsSuccess) {
               form.resetFields();
               callBackSubmit();
               notification.success({
@@ -50,8 +35,7 @@ const AddModal = props => {
                 duration: 3,
                 description: '新增成功',
               });
-                setWorkList([])
-                handlelocalStorage('add',obj.serviceadress, obj.servicename)
+
             } else {
               notification.error({
                 message: '提示',
@@ -68,94 +52,17 @@ 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(() => {
-    switch (type) {
-      case 'add':
-        let gsIp = [];
-        let localStorageData = handlelocalStorage('get');
-        if (localStorageData) {
-          gsIp = localStorageData.map(item => ({
-            value: item.gsIp,
-            item: item.gsIp
-          }));
-        }
-        setGsIp(gsIp)
-        let localIps = ['192.168.12.7', '192.168.19.100']
-        let port = localIps.includes(gsIp) ? 8080 : 8088
-        form.setFieldsValue({ servicename: serviceName[0].value, port, ...formObj });
-        break;
-      case 'edit':
-        form.setFieldsValue({ ...formObj });
-        break;
-      default:
-        break;
-    }
+    form.setFieldsValue({ schemename: listData[0] });
   }, [visible]);
 
-  //存储到localstorage
-  const handlelocalStorage = (type, gsIp, gisAppName) => {
-    if (!localStorage) return null;
-    let result = JSON.parse(localStorage.getItem('metaData'))
-    if (type == 'get') {
-      return result;
-    }
-    if (!result || !result.find(item => item.gsIp == gsIp)) {
-      if (!result) result = [];
-      result.push({
-        gsIp,
-        gisAppName: [{
-          value: gisAppName,
-          item: gisAppName
-        }]
-      })
-      localStorage.setItem('metaData', JSON.stringify(result))
-      return
-    }
-    let data = result.find(item => item.gsIp == gsIp)
-    let isHasGisAppName = data.gisAppName.find(item => item.value == gisAppName);
-    if (isHasGisAppName) return;
-    data.gisAppName.push({
-      value: gisAppName,
-      item: gisAppName
-    })
-    localStorage.setItem('metaData', JSON.stringify(result))
-  };
 
   const layout = {
     layout: 'horizontal',
@@ -167,56 +74,10 @@ const AddModal = props => {
     },
   };
 
-  const handleChange = () => { }
-
-
-  //选择工作空间
-  const selectWorkspace = () => {
-    let obj = form.getFieldsValue();
-    form.validateFields(['serviceadress', 'port', 'servicename', 'user', 'password']).then(validate => {
-      if (validate) {
-        let query = {
-          GISServerIP: obj.serviceadress,
-          GISServerPort: obj.port,
-          gsAppName: obj.servicename,
-          gsUser: obj.user,
-          gsPwd: obj.password,
-          isGeoServer: true,
-          _version: 9999,
-        }
-        GetGISServerMapList(query).then(res => {
-          if (Array.isArray(res)) {
-            const defaultValue= res[0].name||''
-            form.setFieldsValue({ name:defaultValue,workname:defaultValue});
-            setWorkList(res)
-            setWorkSpace(defaultValue)
-          }
-          else {
-            notification.error({
-              message: '提示',
-              duration: 3,
-              description: '获取工作空间失败',
-            });
-          }
-        })
-      }
-    })
-
-  };
-  //选择工作空间
-  const handleWorkspace = (value) => {
-    form.setFieldsValue({
-      workname: value,
-      name:value
-    })
-    setWorkSpace(value)
+  const handleChange = (value) => {
+    form.setFieldsValue({ schemename: value});
   }
-  const selectIp = (value)=>{
-    let localIps = ['192.168.12.7', '192.168.19.100']
-    let port = localIps.includes(value) ? 8080 : 8088
-    form.setFieldsValue({ port,serviceadress:value });
 
-  }
   return (
     <Modal
       title={`${type === 'add' ? '元数据发布' : '编辑'}`}
@@ -236,66 +97,13 @@ const AddModal = props => {
       {visible && (
         <Form form={form} {...layout} onFinish={onFinish}>
           <Item
-            label="GIS服务器地址"
-            name="serviceadress"
+            label="方案名"
+            name="schemename"
             rules={[{ required: true, message: '请选择服务名' }]}
           >
-            <AutoComplete
-              placeholder="请输入GIS服务器地址"
-              options={gsIp}
-              onSelect={selectIp}
-            />
-          </Item>
-          <Item
-            label="GIS服务器端口"
-            name="port"
-            rules={[{ required: true, message: '请输入GIS服务器端口' }]}
-          >
-            <Input placeholder="请输入GIS服务器端口" allowClear />
-          </Item>
-
-          <Item
-            label="GIS服务器名"
-            name="servicename"
-            rules={[{ required: true, message: '请输入GIS服务器名' }]}
-          >
-            <AutoComplete
-              placeholder="Email"
-              options={serviceName}
-            />
-          </Item>
-          <Item
-            label="用户名称"
-            name="user"
-            rules={[{ required: true, message: '请输入用户名称' }]}
-          >
-            <Input placeholder="请输入用户名称" allowClear />
-          </Item>
-          <Item
-            label="用户密码"
-            name="password"
-            rules={[{ required: true, message: '请输入用户密码' }]}
-          >
-            <Input.Password placeholder="请输入用户密码" allowClear />
-          </Item>
-          <Item
-            label="工作空间名称"
-            name="workname"
-            rules={[{ required: true, message: '请选择工作空间名称' }]}
-          >
-            <div className={styles.imgList}>
-              <Select onChange={handleWorkspace} value ={workSpace}>
-                {workList.length ? workList.map((item, index) => { return <Option key={index} value={item.name}>{item.name}</Option> }) : ''}
+            <Select onChange={handleChange}>
+              {listData.map((item, index) => { return <Option value={item} key={index}>{item}</Option> }) }
             </Select>
-              <Button style={{ marginLeft: '0.5rem' }} onClick={() => { selectWorkspace() }}>选择工作空间</Button>
-            </div>
-          </Item>
-          <Item
-            label="服务名称"
-            name="name"
-            rules={[{ required: true, message: '请输入服务名称' }]}
-          >
-            <Input placeholder="请输入服务名称" allowClear />
           </Item>
         </Form>
       )}

src/services/webConfig/api.js

@@ -169,9 +169,6 @@ export const SetServiceConfig = query =>
 export const GetVectorService = () =>
   get(`${CITY_SERVICE}/OMS.svc/D_GetVectorService`, { _version: 9999 });
 
-//删除底图配置
-export const DeleteConfig = query =>
-  get(`${CITY_SERVICE}/OMS.svc/DeleteConfig`, query);
 
 //获取元数据的工作空间列表
 export const GetGISServerMapList = query =>
@@ -207,4 +204,10 @@ get(`${CITY_SERVICE}/OMS.svc/BindSchemeBaseMap`, query );
 export const unbindSchemeBaseMap = (query) =>
 get(`${CITY_SERVICE}/OMS.svc/UnbindSchemeBaseMap`, query );
 
+//设置web状态
+export const setServiceType = (query) =>
+get(`${CITY_SERVICE}/OMS.svc/SetServiceType`, query );
+
+
+