x

src/page/List/GeoList.tsx

@@ -32,6 +32,8 @@ export default function GeoList({ className }: any) {
     break;
   }
 
+  let coord = coorstr.split(',').length > 1 ? coorstr.split(',') : []
+
   return (
     <div className={className}>
       {Element}
@@ -40,7 +42,7 @@ export default function GeoList({ className }: any) {
         <div>
           输入目录：<input value={dir} placeholder="输入对应文件夹" onChange={ev => setDir(ev.target.value)} />
         </div>
-        <Upload api={'/vector/uploadMult/' + dir + '/'} body={{ coord: coorstr.split(',') }} upHandle={referData} multiple />
+        <Upload api={'/vector/uploadMult/' + dir + '/'} body={{ coord }} upHandle={referData} multiple />
       </div>
     </div>
   )

src/page/List/ResterList.tsx

@@ -55,12 +55,14 @@ export default function ModelList({ className }: any) {
     break;
   }
 
+  let coord = coorstr.split(',').length > 1 ? coorstr.split(',') : []
+
   return (
     <div className={className}>
       {Element}
       <div className={styles.uplayer + ' ' + styles.inuplayer} >
         <Coor coor={coorstr} onChange={(val: string) => setCoor(val)} />
-        <Upload className={styles.uplayer} api='/raster/upload' body={{ coord: coorstr.split(',') }} check='/raster/check/' upHandle={referData} />
+        <Upload className={styles.uplayer} api='/raster/upload' body={{ coord }} check='/raster/check/' upHandle={referData} />
       </div>
     </div>
   )

src/page/StyleEdit/index.tsx

@@ -19,6 +19,7 @@ function StyleEdit(props: RouteComponentProps) {
     updateLayerAction(dispatch, layer, { ...style, [attr]: ev.target.value })
   }
   const saveHandle = () => { saveLayersAction(style, params.id) }
+  const verctorInfo = style && { ...style, url: style.getUrl }
 
   return (
     <div>
@@ -33,7 +34,7 @@ function StyleEdit(props: RouteComponentProps) {
           <button onClick={saveHandle}>保存</button>
         </Fragment>
       )}
-      {style && <VectorShow {...style} height={2500} />}
+      {style && <VectorShow {...verctorInfo} height={2500} />}
     </div>
   )
 }

src/page/StyleEdit/reducer.ts

@@ -1,5 +1,6 @@
 import http from '../../http'
 import { LayerStyle } from '../components/VectorShow'
+import path from 'path'
 
 export const ADDLAYER = Symbol('add_layer')
 export const UPDATELAYER = Symbol('update_layer')
@@ -9,6 +10,7 @@ export const LOADLAYERS = Symbol('load_layers')
 export interface Item extends LayerStyle {
   show: boolean,
   url: string,
+  getUrl: string,
   checked: boolean,
   lat: number,
   lng: number
@@ -37,6 +39,7 @@ export const defaultLayerStyle = (): Item => ({
   show: false,
   checked: false,
   url: '',
+  getUrl: '',
   lat: 0,
   lng: 0
 })
@@ -97,9 +100,9 @@ export const getLayersAction = async (dispatch: Dispatch, id: number) => {
     ...layer,
     lat: Number(data.latitude),
     lng: Number(data.longitude),
-    url: layer.url
+    url: layer.url,
+    getUrl: path.join('/test/a', layer.url, '/{z}/{x}/{y}.pbf')
   }
-  // url: "../data/mvt/wuyi/{z}/{x}/{y}.pbf",
 
   addLayerAction(dispatch, layer.name, style)
 }

src/page/components/Upload/index.tsx

@@ -28,6 +28,7 @@ async function uploadFile({ url, file, body, cb, check }: { url: string, file: A
       }
     }
 
+
     let res = await http({
       url: url,
       method: 'POST',
@@ -90,7 +91,7 @@ interface UploadProps {
   className?: string,
   api: string,
   upHandle: Function,
-  body?: Object,
+  body?: Object | null,
   check?: string
 }
 

src/setupProxy.js

@@ -15,7 +15,7 @@ module.exports = app => {
   app.use(
     proxy('/test', {
       // target: 'http://192.168.0.10:8082',
-      target: 'http://192.168.0.41:8087',
+      target: 'http://map.4dage.com',
       changeOrigin: true,
       pathRewrite: {
         "^/test": "/"