Commit eda77640 authored by 郭铭瑶's avatar 郭铭瑶 🤘

修改

parent c617ac31
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
<title>Dataview Project</title> <title>新江湾城街道智联平台</title>
<style> <style>
html { html {
font-size: 16vh; font-size: 16vh;
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
<!-- <script src="./static/SMap.min.js"></script> --> <script src="./static/SMap.min.js"></script>
<script src="./static/Plugins.min.js"></script> <script src="./static/Plugins.min.js"></script>
</html> </html>
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
// import 'https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js' // import 'https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js'
// import 'http://www.962121.net/gis_system/smimap/mapdebug/ShsmiGis.Bridge.js' // import 'http://www.962121.net/gis_system/smimap/mapdebug/ShsmiGis.Bridge.js'
// const {SMap, Plugins} = window const {SMap, Plugins} = window
const {Plugins} = window // const {Plugins} = window
import SMap from '../../../../static/esm/SMap' // import SMap from '../../../../static/esm/SMap'
export default { export default {
name: 'MonitorMap', name: 'MonitorMap',
props: { props: {
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
return data.map(item => { return data.map(item => {
const result = { const result = {
icon: new SMap.Icon({ icon: new SMap.Icon({
size: new SMap.Size(size, size), size: Array.isArray(size) ? new SMap.Size(size[0], size[1]) : new SMap.Size(size, size),
image: require(`@/assets/images/${item.icon || icon}`), image: require(`@/assets/images/${item.icon || icon}`),
}), }),
attributes: {key, ...item}, attributes: {key, ...item},
......
...@@ -827,12 +827,13 @@ export default { ...@@ -827,12 +827,13 @@ export default {
const boundary = { const boundary = {
boundaryType: 'jd_boundary', boundaryType: 'jd_boundary',
boundaryDefinition: 'name like \'%新江湾城%\'', boundaryDefinition: 'name like \'%新江湾城%\'',
boundarydistance: 50, boundarydistance: 10,
bounarycount: 10, bounarycount: 10,
boundaryColor: 'rgba(51,145,255,.6)', boundaryColor: 'rgba(51,145,255,.6)',
maskColor: [184, 217, 255, 0], maskColor: [184, 217, 255, 0],
} }
const mockPoints = { const mockPoints = {
size: [14, 16],
data: [ data: [
{ {
x: 2594.9960327148437, x: 2594.9960327148437,
...@@ -883,7 +884,7 @@ export default { ...@@ -883,7 +884,7 @@ export default {
}, },
], ],
} }
map.focus(3489.0714111328125, 10384.431030273437, 5) map.focus(3489.0714111328125, 10384.431030273437, 4.5)
map.addPolygon({paths: xinjiangwanPaths, fillColor: 'rgba(51,145,255,.3)'}) map.addPolygon({paths: xinjiangwanPaths, fillColor: 'rgba(51,145,255,.3)'})
map.addBoundary(boundary) map.addBoundary(boundary)
map.addPoint(mockPoints) map.addPoint(mockPoints)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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