diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/src/router/index.js b/src/router/index.js index 223640d..a848e68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,14 @@ { path: '/', component: Layout, - redirect: 'dashboard', + // redirect: '', + // redirect: 'dashboard', name: 'Dashboard', hidden: true, children: [{ path: 'dashboard', name: 'Dashboard', + // component: () => import('@/views/test'), component: () => import('@/views/dashboard/index'), meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true } }] diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/src/router/index.js b/src/router/index.js index 223640d..a848e68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,14 @@ { path: '/', component: Layout, - redirect: 'dashboard', + // redirect: '', + // redirect: 'dashboard', name: 'Dashboard', hidden: true, children: [{ path: 'dashboard', name: 'Dashboard', + // component: () => import('@/views/test'), component: () => import('@/views/dashboard/index'), meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true } }] diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index b2c7eb3..68cde22 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -229,11 +229,10 @@ - +

- + + + + + + +

+ 经纬度:({{ mapInfo.lon}} , {{ mapInfo.lat}}) +

+ 确定 + 返回 - - +

@@ -397,12 +413,12 @@ import { getCustomerList } from "@/api/customer"; import { matchReverse } from "@/api/map"; import FMap from "@/components/fMap/components/fMap"; -import FDMap from "@/components/fdMap/index.vue"; +import FDSelectMap from "@/components/fdSelectMap/index.vue"; import SelectTree from "@/components/SelectTree/singleSelect"; import { toTreeList } from "@/utils/structure"; export default { name: "CreateCase", - components: { KnowledgeSearch, FMap, FDMap, SelectTree }, + components: { KnowledgeSearch, FMap, FDSelectMap, SelectTree }, data() { const validateAddress = function (rule, value, callback) { console.log(value); @@ -431,6 +447,7 @@ } }; return { + mapInfo:{}, // props: { // lazy: true, // lazyLoad(node, resolve) { @@ -727,6 +744,9 @@ this.fetchProcessWayList(); }, methods: { + getMapInfo(item){ + this.mapInfo = item; + }, // 选中下拉框内容 handleSelectChange(node) { this.form.type.eorc = node[0]; @@ -1114,7 +1134,7 @@ layer: "case", }); } - this.mapHeight = this.$refs.caseContainer.offsetHeight + "px"; + this.mapHeight = this.$refs.caseContainer.offsetHeight + 50 +"px"; }, // 查询兴趣点 queryPoi() { @@ -1126,24 +1146,48 @@ }, // 确定, 保存坐标并返回 confirmPos() { - this.form.lng = this.currentPosition.lng; - this.form.lat = this.currentPosition.lat; - if (this.currentPosition.lng != "0") { + // 添加飞渡地图 start + this.form.lng = this.mapInfo.lon + this.form.lat = this.mapInfo.lat + // end + // this.form.lng = this.currentPosition.lng; + // this.form.lat = this.currentPosition.lat; + if (this.form.lng != "0") { // 进行逆地址解析 - matchReverse(this.currentPosition.lng, this.currentPosition.lat) + const loading = this.$loading({ + lock: true, + text: '地址解析中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + matchReverse(this.form.lng, this.form.lat) .then((res) => { + loading.close(); if (res.data.length > 0) { this.form.address = { areaCode: res.data[0].politicalCode.substring(0, 6), // 区域ID streetCode: res.data[0].politicalCode.substring(0, 9), // 街道ID communityCode: res.data[0].politicalCode, // 社区ID gridId: "", // 网格ID - fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + // fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + fieldintro: res.data[0].standardAddressName.split('镇')[1], // 事件地址 }; + } else { + this.$message.warning("地址解析失败"); + // 不存在的时候 + this.form.address = { + // areaCode: '', // 区域ID + streetCode: '', // 街道ID + communityCode: '', // 社区ID + gridId: '', // 网格ID + fieldintro: '', // 事件地址 + } } }) .catch(() => { - console.log("逆地址解析失败"); + loading.close(); + console.log("进行逆地址解析解析失败"); + this.$message.warning("地址解析失败"); }); } this.showMap = false; @@ -1159,6 +1203,7 @@ // 返回到事件详情 backToForm() { if (this.showMap) { + this.showMap = false; this.clearMap(); } diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/src/router/index.js b/src/router/index.js index 223640d..a848e68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,14 @@ { path: '/', component: Layout, - redirect: 'dashboard', + // redirect: '', + // redirect: 'dashboard', name: 'Dashboard', hidden: true, children: [{ path: 'dashboard', name: 'Dashboard', + // component: () => import('@/views/test'), component: () => import('@/views/dashboard/index'), meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true } }] diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index b2c7eb3..68cde22 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -229,11 +229,10 @@ - +

- + + + + + + +

+ 经纬度:({{ mapInfo.lon}} , {{ mapInfo.lat}}) +

+ 确定 + 返回 - - +

@@ -397,12 +413,12 @@ import { getCustomerList } from "@/api/customer"; import { matchReverse } from "@/api/map"; import FMap from "@/components/fMap/components/fMap"; -import FDMap from "@/components/fdMap/index.vue"; +import FDSelectMap from "@/components/fdSelectMap/index.vue"; import SelectTree from "@/components/SelectTree/singleSelect"; import { toTreeList } from "@/utils/structure"; export default { name: "CreateCase", - components: { KnowledgeSearch, FMap, FDMap, SelectTree }, + components: { KnowledgeSearch, FMap, FDSelectMap, SelectTree }, data() { const validateAddress = function (rule, value, callback) { console.log(value); @@ -431,6 +447,7 @@ } }; return { + mapInfo:{}, // props: { // lazy: true, // lazyLoad(node, resolve) { @@ -727,6 +744,9 @@ this.fetchProcessWayList(); }, methods: { + getMapInfo(item){ + this.mapInfo = item; + }, // 选中下拉框内容 handleSelectChange(node) { this.form.type.eorc = node[0]; @@ -1114,7 +1134,7 @@ layer: "case", }); } - this.mapHeight = this.$refs.caseContainer.offsetHeight + "px"; + this.mapHeight = this.$refs.caseContainer.offsetHeight + 50 +"px"; }, // 查询兴趣点 queryPoi() { @@ -1126,24 +1146,48 @@ }, // 确定, 保存坐标并返回 confirmPos() { - this.form.lng = this.currentPosition.lng; - this.form.lat = this.currentPosition.lat; - if (this.currentPosition.lng != "0") { + // 添加飞渡地图 start + this.form.lng = this.mapInfo.lon + this.form.lat = this.mapInfo.lat + // end + // this.form.lng = this.currentPosition.lng; + // this.form.lat = this.currentPosition.lat; + if (this.form.lng != "0") { // 进行逆地址解析 - matchReverse(this.currentPosition.lng, this.currentPosition.lat) + const loading = this.$loading({ + lock: true, + text: '地址解析中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + matchReverse(this.form.lng, this.form.lat) .then((res) => { + loading.close(); if (res.data.length > 0) { this.form.address = { areaCode: res.data[0].politicalCode.substring(0, 6), // 区域ID streetCode: res.data[0].politicalCode.substring(0, 9), // 街道ID communityCode: res.data[0].politicalCode, // 社区ID gridId: "", // 网格ID - fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + // fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + fieldintro: res.data[0].standardAddressName.split('镇')[1], // 事件地址 }; + } else { + this.$message.warning("地址解析失败"); + // 不存在的时候 + this.form.address = { + // areaCode: '', // 区域ID + streetCode: '', // 街道ID + communityCode: '', // 社区ID + gridId: '', // 网格ID + fieldintro: '', // 事件地址 + } } }) .catch(() => { - console.log("逆地址解析失败"); + loading.close(); + console.log("进行逆地址解析解析失败"); + this.$message.warning("地址解析失败"); }); } this.showMap = false; @@ -1159,6 +1203,7 @@ // 返回到事件详情 backToForm() { if (this.showMap) { + this.showMap = false; this.clearMap(); } diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index c091388..52463e5 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -150,7 +150,7 @@ refresh: false // 是否需要刷新按钮 } }, // 表格属性 - showAddCase: false, + showAddCase: true, sound: { url: '', controlList: 'noDownload noSpeed onlyOnePlaying' diff --git a/index.html b/index.html index a105e74..28e062c 100644 --- a/index.html +++ b/index.html @@ -1,39 +1,52 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/src/router/index.js b/src/router/index.js index 223640d..a848e68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,14 @@ { path: '/', component: Layout, - redirect: 'dashboard', + // redirect: '', + // redirect: 'dashboard', name: 'Dashboard', hidden: true, children: [{ path: 'dashboard', name: 'Dashboard', + // component: () => import('@/views/test'), component: () => import('@/views/dashboard/index'), meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true } }] diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index b2c7eb3..68cde22 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -229,11 +229,10 @@ - +

- + + + + + + +

+ 经纬度:({{ mapInfo.lon}} , {{ mapInfo.lat}}) +

+ 确定 + 返回 - - +

@@ -397,12 +413,12 @@ import { getCustomerList } from "@/api/customer"; import { matchReverse } from "@/api/map"; import FMap from "@/components/fMap/components/fMap"; -import FDMap from "@/components/fdMap/index.vue"; +import FDSelectMap from "@/components/fdSelectMap/index.vue"; import SelectTree from "@/components/SelectTree/singleSelect"; import { toTreeList } from "@/utils/structure"; export default { name: "CreateCase", - components: { KnowledgeSearch, FMap, FDMap, SelectTree }, + components: { KnowledgeSearch, FMap, FDSelectMap, SelectTree }, data() { const validateAddress = function (rule, value, callback) { console.log(value); @@ -431,6 +447,7 @@ } }; return { + mapInfo:{}, // props: { // lazy: true, // lazyLoad(node, resolve) { @@ -727,6 +744,9 @@ this.fetchProcessWayList(); }, methods: { + getMapInfo(item){ + this.mapInfo = item; + }, // 选中下拉框内容 handleSelectChange(node) { this.form.type.eorc = node[0]; @@ -1114,7 +1134,7 @@ layer: "case", }); } - this.mapHeight = this.$refs.caseContainer.offsetHeight + "px"; + this.mapHeight = this.$refs.caseContainer.offsetHeight + 50 +"px"; }, // 查询兴趣点 queryPoi() { @@ -1126,24 +1146,48 @@ }, // 确定, 保存坐标并返回 confirmPos() { - this.form.lng = this.currentPosition.lng; - this.form.lat = this.currentPosition.lat; - if (this.currentPosition.lng != "0") { + // 添加飞渡地图 start + this.form.lng = this.mapInfo.lon + this.form.lat = this.mapInfo.lat + // end + // this.form.lng = this.currentPosition.lng; + // this.form.lat = this.currentPosition.lat; + if (this.form.lng != "0") { // 进行逆地址解析 - matchReverse(this.currentPosition.lng, this.currentPosition.lat) + const loading = this.$loading({ + lock: true, + text: '地址解析中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + matchReverse(this.form.lng, this.form.lat) .then((res) => { + loading.close(); if (res.data.length > 0) { this.form.address = { areaCode: res.data[0].politicalCode.substring(0, 6), // 区域ID streetCode: res.data[0].politicalCode.substring(0, 9), // 街道ID communityCode: res.data[0].politicalCode, // 社区ID gridId: "", // 网格ID - fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + // fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + fieldintro: res.data[0].standardAddressName.split('镇')[1], // 事件地址 }; + } else { + this.$message.warning("地址解析失败"); + // 不存在的时候 + this.form.address = { + // areaCode: '', // 区域ID + streetCode: '', // 街道ID + communityCode: '', // 社区ID + gridId: '', // 网格ID + fieldintro: '', // 事件地址 + } } }) .catch(() => { - console.log("逆地址解析失败"); + loading.close(); + console.log("进行逆地址解析解析失败"); + this.$message.warning("地址解析失败"); }); } this.showMap = false; @@ -1159,6 +1203,7 @@ // 返回到事件详情 backToForm() { if (this.showMap) { + this.showMap = false; this.clearMap(); } diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index c091388..52463e5 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -150,7 +150,7 @@ refresh: false // 是否需要刷新按钮 } }, // 表格属性 - showAddCase: false, + showAddCase: true, sound: { url: '', controlList: 'noDownload noSpeed onlyOnePlaying' diff --git a/src/views/test copy.vue b/src/views/test copy.vue new file mode 100644 index 0000000..71ede57 --- /dev/null +++ b/src/views/test copy.vue @@ -0,0 +1,39 @@ + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

@@ -41,7 +54,8 @@ sapoOcx.api.setDebugMode(); //连接服务器 console.log('连接服务器') - sapoOcx.api.connect('124.205.241.254',28081); + sapoOcx.api.connect('124.205.241.254', 28081); + - + diff --git a/package.json b/package.json index c325e45..34dfc58 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@supermap/iclient-leaflet": "^11.0.1", "animate.css": "^3.7.2", "axios": "0.18.0", "babel-polyfill": "^6.26.0", @@ -23,6 +24,7 @@ "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", + "leaflet": "^1.9.3", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", diff --git a/src/components/fdSelectMap/data.js b/src/components/fdSelectMap/data.js new file mode 100644 index 0000000..0b569d4 --- /dev/null +++ b/src/components/fdSelectMap/data.js @@ -0,0 +1,408 @@ +export default { + "type": "GeometryCollection", + "geometries": [ + { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.82727771820117, + 25.786379601991115 + ], + [ + 114.82866452104602, + 25.789702596409725 + ], + [ + 114.83335869255683, + 25.79238403648864 + ], + [ + 114.83787859110095, + 25.795224293254627 + ], + [ + 114.83874664726015, + 25.796489377505377 + ], + [ + 114.83874435663957, + 25.797914955134246 + ], + [ + 114.83717717250644, + 25.79855231774635 + ], + [ + 114.8323205726462, + 25.799567355499118 + ], + [ + 114.82825337853998, + 25.800277461563773 + ], + [ + 114.82567148888693, + 25.800955070758143 + ], + [ + 114.82342538796948, + 25.801278190137744 + ], + [ + 114.82081282054966, + 25.802710055357995 + ], + [ + 114.81959214624271, + 25.804296964710495 + ], + [ + 114.81802241697561, + 25.806518302465786 + ], + [ + 114.81680225169545, + 25.807788416789652 + ], + [ + 114.81401617484916, + 25.808903906154026 + ], + [ + 114.812796009569, + 25.81017402047789 + ], + [ + 114.81279397346181, + 25.811441200592437 + ], + [ + 114.81540272318063, + 25.812385298086955 + ], + [ + 114.82079729523232, + 25.812372303731415 + ], + [ + 114.82392911836459, + 25.812681553650386 + ], + [ + 114.82671239556349, + 25.813308436943515 + ], + [ + 114.83627501155175, + 25.818512500414258 + ], + [ + 114.84201253024204, + 25.821666617999572 + ], + [ + 114.84648576053405, + 25.823789983836047 + ], + [ + 114.86115099691534, + 25.823838074196512 + ], + [ + 114.86619931365428, + 25.822717135586267 + ], + [ + 114.87090035702685, + 25.821121842778577 + ], + [ + 114.87316412399991, + 25.820166008446797 + ], + [ + 114.87542636389254, + 25.82016055920093 + ], + [ + 114.87664245695832, + 25.82142480510616 + ], + [ + 114.87768325900383, + 25.823481457755744 + ], + [ + 114.87698362200311, + 25.825700699647236 + ], + [ + 114.87204700704874, + 25.83121472546547 + ], + [ + 114.87209287556692, + 25.833953351079085 + ], + [ + 114.87278374670524, + 25.836288870726875 + ], + [ + 114.87468294255684, + 25.837343646342433 + ], + [ + 114.87860044170971, + 25.83846699251721 + ], + [ + 114.88469468707076, + 25.838161388186084 + ], + [ + 114.88969097995196, + 25.833804895268294 + ], + [ + 114.89403801271267, + 25.827733568832063 + ], + [ + 114.89745551900472, + 25.82108003567267 + ], + [ + 114.90301535419461, + 25.815955453282488 + ], + [ + 114.90587812679937, + 25.814451953356055 + ], + [ + 114.90763250341945, + 25.812163136524546 + ], + [ + 114.90885266869961, + 25.810893022200684 + ], + [ + 114.91199721750182, + 25.803282396403734 + ], + [ + 114.91600498670867, + 25.799946407629587 + ], + [ + 114.91966013776776, + 25.799462412458684 + ], + [ + 114.92209461451989, + 25.800565326640285 + ], + [ + 114.92400652688539, + 25.8019862933688 + ], + [ + 114.92679005859769, + 25.802454779147606 + ], + [ + 114.92992544491753, + 25.800546463866116 + ], + [ + 114.93132090121796, + 25.798483942797905 + ], + [ + 114.93236959317882, + 25.795630272503622 + ], + [ + 114.93219837437294, + 25.793888319018876 + ], + [ + 114.93080851736728, + 25.792466094772088 + ], + [ + 114.9221185387794, + 25.785675960294363 + ], + [ + 114.91395392422555, + 25.776825400612218 + ], + [ + 114.91291286766666, + 25.77492714547695 + ], + [ + 114.915004906807, + 25.77254615268906 + ], + [ + 114.91709516435357, + 25.771273942501406 + ], + [ + 114.91709770948756, + 25.769689967358218 + ], + [ + 114.9157088705355, + 25.76763415305416 + ], + [ + 114.9129273749304, + 25.7658984871608 + ], + [ + 114.90614549100702, + 25.76290528212636 + ], + [ + 114.8979752771584, + 25.757539467759226 + ], + [ + 114.89258834050867, + 25.75280053668521 + ], + [ + 114.88668138460628, + 25.74679568301493 + ], + [ + 114.88477125383457, + 25.744265933686187 + ], + [ + 114.88217268465174, + 25.736985935618932 + ], + [ + 114.87505039922377, + 25.729241643500462 + ], + [ + 114.86357816149058, + 25.721191035672334 + ], + [ + 114.85158005069658, + 25.715517648077263 + ], + [ + 114.84079701491474, + 25.71174209644469 + ], + [ + 114.83731740938933, + 25.711275287356926 + ], + [ + 114.83522867892316, + 25.711597112458673 + ], + [ + 114.82982341730869, + 25.718262802415584 + ], + [ + 114.82842490684746, + 25.722226093655618 + ], + [ + 114.8292863456583, + 25.727609513278644 + ], + [ + 114.83119113164862, + 25.73346561040807 + ], + [ + 114.82978931251321, + 25.739488069334246 + ], + [ + 114.82804276514543, + 25.7434521989198 + ], + [ + 114.82663890990283, + 25.750741837960515 + ], + [ + 114.8245417804945, + 25.756290781034775 + ], + [ + 114.82297306928098, + 25.757878528732785 + ], + [ + 114.82036151991477, + 25.758676803895774 + ], + [ + 114.81026590449049, + 25.76028509105899 + ], + [ + 114.80434673194495, + 25.761883318075988 + ], + [ + 114.80068547256428, + 25.76616885359053 + ], + [ + 114.7996385621972, + 25.76791374128459 + ], + [ + 114.80050585481622, + 25.769654018078292 + ], + [ + 114.80485275296066, + 25.77186110395977 + ], + [ + 114.81041854381824, + 25.773590063088974 + ], + [ + 114.81615962569613, + 25.77452661547383 + ], + [ + 114.82103061530759, + 25.775465263722477 + ], + [ + 114.82415683914508, + 25.77925925895645 + ], + [ + 114.82537115061706, + 25.781632287461914 + ], + [ + 114.82727771820117, + 25.786379601991115 + ] + ] + ] + } + ] +} diff --git a/src/components/fdSelectMap/index.vue b/src/components/fdSelectMap/index.vue new file mode 100644 index 0000000..6434c65 --- /dev/null +++ b/src/components/fdSelectMap/index.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/main.js b/src/main.js index a853411..8a018b1 100644 --- a/src/main.js +++ b/src/main.js @@ -38,14 +38,14 @@ import animate from 'animate.css' import { hasPermission, isReceiver } from './utils/permission' - +// 引入全局标题 +import { getProject } from '@/utils/baseConfig' +// 引入v-charts +import VCharts from 'v-charts' Vue.prototype.hasPerm = hasPermission Vue.prototype.isReceiver = isReceiver // 引入Element-ui Vue.use(ElementUI, { locale }) - -// 引入全局标题 -import { getProject } from '@/utils/baseConfig' document.title = getProject().title // 引入高德地图 /* @@ -58,8 +58,7 @@ Vue.config.productionTip = false */ -// 引入v-charts -import VCharts from 'v-charts' + Vue.use(VCharts) // js禁止浏览器的回退快捷键 diff --git a/src/router/index.js b/src/router/index.js index 223640d..a848e68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,14 @@ { path: '/', component: Layout, - redirect: 'dashboard', + // redirect: '', + // redirect: 'dashboard', name: 'Dashboard', hidden: true, children: [{ path: 'dashboard', name: 'Dashboard', + // component: () => import('@/views/test'), component: () => import('@/views/dashboard/index'), meta: { title: '首页', icon: 'dashboard', noCache: false, keepAlive: true, affix: true } }] diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index b2c7eb3..68cde22 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -229,11 +229,10 @@ - +

- + + + + + + +

+ 经纬度:({{ mapInfo.lon}} , {{ mapInfo.lat}}) +

+ 确定 + 返回 - - +

@@ -397,12 +413,12 @@ import { getCustomerList } from "@/api/customer"; import { matchReverse } from "@/api/map"; import FMap from "@/components/fMap/components/fMap"; -import FDMap from "@/components/fdMap/index.vue"; +import FDSelectMap from "@/components/fdSelectMap/index.vue"; import SelectTree from "@/components/SelectTree/singleSelect"; import { toTreeList } from "@/utils/structure"; export default { name: "CreateCase", - components: { KnowledgeSearch, FMap, FDMap, SelectTree }, + components: { KnowledgeSearch, FMap, FDSelectMap, SelectTree }, data() { const validateAddress = function (rule, value, callback) { console.log(value); @@ -431,6 +447,7 @@ } }; return { + mapInfo:{}, // props: { // lazy: true, // lazyLoad(node, resolve) { @@ -727,6 +744,9 @@ this.fetchProcessWayList(); }, methods: { + getMapInfo(item){ + this.mapInfo = item; + }, // 选中下拉框内容 handleSelectChange(node) { this.form.type.eorc = node[0]; @@ -1114,7 +1134,7 @@ layer: "case", }); } - this.mapHeight = this.$refs.caseContainer.offsetHeight + "px"; + this.mapHeight = this.$refs.caseContainer.offsetHeight + 50 +"px"; }, // 查询兴趣点 queryPoi() { @@ -1126,24 +1146,48 @@ }, // 确定, 保存坐标并返回 confirmPos() { - this.form.lng = this.currentPosition.lng; - this.form.lat = this.currentPosition.lat; - if (this.currentPosition.lng != "0") { + // 添加飞渡地图 start + this.form.lng = this.mapInfo.lon + this.form.lat = this.mapInfo.lat + // end + // this.form.lng = this.currentPosition.lng; + // this.form.lat = this.currentPosition.lat; + if (this.form.lng != "0") { // 进行逆地址解析 - matchReverse(this.currentPosition.lng, this.currentPosition.lat) + const loading = this.$loading({ + lock: true, + text: '地址解析中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + matchReverse(this.form.lng, this.form.lat) .then((res) => { + loading.close(); if (res.data.length > 0) { this.form.address = { areaCode: res.data[0].politicalCode.substring(0, 6), // 区域ID streetCode: res.data[0].politicalCode.substring(0, 9), // 街道ID communityCode: res.data[0].politicalCode, // 社区ID gridId: "", // 网格ID - fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + // fieldintro: res.data[0].standardAddressName.substring(10), // 事件地址 + fieldintro: res.data[0].standardAddressName.split('镇')[1], // 事件地址 }; + } else { + this.$message.warning("地址解析失败"); + // 不存在的时候 + this.form.address = { + // areaCode: '', // 区域ID + streetCode: '', // 街道ID + communityCode: '', // 社区ID + gridId: '', // 网格ID + fieldintro: '', // 事件地址 + } } }) .catch(() => { - console.log("逆地址解析失败"); + loading.close(); + console.log("进行逆地址解析解析失败"); + this.$message.warning("地址解析失败"); }); } this.showMap = false; @@ -1159,6 +1203,7 @@ // 返回到事件详情 backToForm() { if (this.showMap) { + this.showMap = false; this.clearMap(); } diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index c091388..52463e5 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -150,7 +150,7 @@ refresh: false // 是否需要刷新按钮 } }, // 表格属性 - showAddCase: false, + showAddCase: true, sound: { url: '', controlList: 'noDownload noSpeed onlyOnePlaying' diff --git a/src/views/test copy.vue b/src/views/test copy.vue new file mode 100644 index 0000000..71ede57 --- /dev/null +++ b/src/views/test copy.vue @@ -0,0 +1,39 @@ + + + +