Commit 69c4f0a8 authored by 皮倩雯's avatar 皮倩雯

fix: '修改web配置'

parent 86f1afb0
Pipeline #49164 passed with stages
in 4 minutes 40 seconds
...@@ -504,12 +504,12 @@ const AddModal = props => { ...@@ -504,12 +504,12 @@ const AddModal = props => {
<Form form={form} {...layout} onFinish={onFinish}> <Form form={form} {...layout} onFinish={onFinish}>
<Item label="类型" name="type" rules={[{ required: true, message: '请选择服务名' }]}> <Item label="类型" name="type" rules={[{ required: true, message: '请选择服务名' }]}>
<Select onChange={handleChange}> <Select onChange={handleChange}>
<Option value="amap-v">amap-v(高德地形</Option> <Option value="amap-v">高德地形(amap-v</Option>
<Option value="amap-i">amap-i(高德影像</Option> <Option value="amap-i">高德影像(amap-i</Option>
<Option value="tianditu-v-va">tianditu-v-va(天地图地形</Option> <Option value="tianditu-v-va">天地图地形(tianditu-v-va</Option>
<Option value="tianditu-i-ia">tianditu-i-ia(天地图影像</Option> <Option value="tianditu-i-ia">天地图影像(tianditu-i-ia</Option>
<Option value="pipenet-tile">pipenet-tile(矢量底图切片</Option> <Option value="pipenet-tile">矢量底图切片(pipenet-tile</Option>
<Option value="google-user">google-user(自定义底图</Option> <Option value="google-user">自定义底图(google-user</Option>
</Select> </Select>
</Item> </Item>
<Item <Item
......
...@@ -63,6 +63,7 @@ const NewEditModal = props => { ...@@ -63,6 +63,7 @@ const NewEditModal = props => {
if (validate) { if (validate) {
let obj = form.getFieldsValue(); let obj = form.getFieldsValue();
let arr = {}; let arr = {};
console.log(mapType);
if (mapType == 1) { if (mapType == 1) {
arr = { arr = {
servicename: obj.servicename, servicename: obj.servicename,
...@@ -101,20 +102,20 @@ const NewEditModal = props => { ...@@ -101,20 +102,20 @@ const NewEditModal = props => {
url: obj.url, url: obj.url,
icon: obj.icon, icon: obj.icon,
type: obj.type, type: obj.type,
extent: '', // extent: '',
baseLayer: '', // baseLayer: '',
proxyUrl: '', // proxyUrl: '',
levelStart: '', // levelStart: '',
origin: '', // origin: '',
resolution: '', // resolution: '',
tileMatrix: '', // tileMatrix: '',
levelEnd: '', // levelEnd: '',
levelEndEnlarge: '', // levelEndEnlarge: '',
m_Ip: '', // m_Ip: '',
m_Port: '', // m_Port: '',
m_User: '', // m_User: '',
m_Pwd: '', // m_Pwd: '',
gsAppName: '', // gsAppName: '',
}), }),
}; };
} }
...@@ -156,7 +157,7 @@ const NewEditModal = props => { ...@@ -156,7 +157,7 @@ const NewEditModal = props => {
console.log(aa); console.log(aa);
} }
console.log(formObj.baseLayer); console.log(formObj.baseLayer);
if (formObj.baseLayer) { if (formObj.type == 'pipenet-tile' || formObj.type == 'google-user') {
setMapType(1); setMapType(1);
} else { } else {
setMapType(0); setMapType(0);
...@@ -467,12 +468,12 @@ const NewEditModal = props => { ...@@ -467,12 +468,12 @@ const NewEditModal = props => {
<Form form={form} {...layout} onFinish={onFinish}> <Form form={form} {...layout} onFinish={onFinish}>
<Item label="类型" name="type" rules={[{ required: true, message: '请选择服务名' }]}> <Item label="类型" name="type" rules={[{ required: true, message: '请选择服务名' }]}>
<Select onChange={handleChange}> <Select onChange={handleChange}>
<Option value="amap-v">amap-v(高德地形</Option> <Option value="amap-v">高德地形(amap-v</Option>
<Option value="amap-i">amap-i(高德影像</Option> <Option value="amap-i">高德影像(amap-i</Option>
<Option value="tianditu-v-va">tianditu-v-va(天地图地形</Option> <Option value="tianditu-v-va">天地图地形(tianditu-v-va</Option>
<Option value="tianditu-i-ia">tianditu-i-ia(天地图影像</Option> <Option value="tianditu-i-ia">天地图影像(tianditu-i-ia</Option>
<Option value="pipenet-tile">pipenet-tile(矢量底图切片</Option> <Option value="pipenet-tile">矢量底图切片(pipenet-tile</Option>
<Option value="google-user">google-user(自定义底图</Option> <Option value="google-user">自定义底图(google-user</Option>
</Select> </Select>
</Item> </Item>
<Item <Item
......
...@@ -40,6 +40,7 @@ const TileData = props => { ...@@ -40,6 +40,7 @@ const TileData = props => {
dataIndex: 'alpha', dataIndex: 'alpha',
key: 'alpha', key: 'alpha',
align: 'center', align: 'center',
render: (text, record) => <span>{`${(text * 100).toFixed()}%`}</span>,
}, },
{ {
title: '编辑', title: '编辑',
......
...@@ -20,8 +20,8 @@ import WebConfigForm from './webConfigForm'; ...@@ -20,8 +20,8 @@ import WebConfigForm from './webConfigForm';
import Upload from '@/components/Upload'; import Upload from '@/components/Upload';
import styles from './siteConfigDrawer.less'; import styles from './siteConfigDrawer.less';
const { Option } = Select; const { Option } = Select;
const plainOptions = ['搜索', '首页', '反馈', '消息']; const plainOptions = ['搜索', '首页', '反馈', '消息', '常用'];
const defaultCheckedList = ['搜索', '首页', '反馈', '消息']; const defaultCheckedList = ['搜索', '首页', '反馈', '消息', '常用'];
export default props => { export default props => {
const { visible, onClose, config, hasIntegerate, isEdit, onOk, submitting, productList } = props; const { visible, onClose, config, hasIntegerate, isEdit, onOk, submitting, productList } = props;
......
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