From da2e178dd32d7128987ac94530f78af264dbaf5e Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 5 Sep 2023 14:22:15 +0800 Subject: [PATCH] up --- src/views/component/imports.vue | 2 + src/views/jsc/components/echartsMap.vue | 35 +- src/views/jsc/components/jtmap.json | 678 +++++++++--------- .../viewrecords/components/addViewRecord.vue | 3 +- 4 files changed, 371 insertions(+), 347 deletions(-) diff --git a/src/views/component/imports.vue b/src/views/component/imports.vue index d681f00..43611a7 100644 --- a/src/views/component/imports.vue +++ b/src/views/component/imports.vue @@ -110,10 +110,12 @@ export default { // tab:1,2 1是新增，2是台账 let paths = this.$route.path; let isBook = paths.split("_")[0] + let year = new Date().getFullYear() console.log(isBook) if(isBook=='/book'){ for(var k of this.tableList){ k.isBook = true + k.year = k.year?k.year:year } } // return diff --git a/src/views/jsc/components/echartsMap.vue b/src/views/jsc/components/echartsMap.vue index 5fc4bdb..a64d726 100644 --- a/src/views/jsc/components/echartsMap.vue +++ b/src/views/jsc/components/echartsMap.vue @@ -24,13 +24,16 @@ hookToolTip: {}, streetlist:[], streetNameList:[{ - name:'开发区', - coord:[119.59,31.77] + name:'东城街道', + coord:[119.62,31.74] },{ name:'指前镇', coord:[119.45,31.62] },{ - name:'尧塘镇', + name:'尧塘街道', + coord:[119.59,31.77] + },{ + name:'西城街道', coord:[119.62,31.69] },{ name:'儒林镇', @@ -161,7 +164,7 @@ regions: [ //对不同的区块进行着色 { - name: "开发区", + name: "东城街道", itemStyle: { normal: { areaColor: "#75bedc", @@ -170,6 +173,17 @@ areaColor: "#75bedc", }, }, + }, + { + name: "尧塘街道", + itemStyle: { + normal: { + areaColor:'#00ffff', + }, + emphasis: { + areaColor:'#00ffff', + }, + }, }, { name: "指前镇", @@ -236,18 +250,7 @@ areaColor:'#c968e1', }, }, - }, - { - name: "尧塘镇", - itemStyle: { - normal: { - areaColor:'#00ffff', - }, - emphasis: { - areaColor:'#00ffff', - }, - }, - }, + } ] }, diff --git a/src/views/jsc/components/jtmap.json b/src/views/jsc/components/jtmap.json index 5a00c02..f672287 100644 --- a/src/views/jsc/components/jtmap.json +++ b/src/views/jsc/components/jtmap.json @@ -7,11 +7,356 @@ "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, - "features": [{ + "features": [ + { + "type": "Feature", + "properties": { + "id": "8968", + "name": "尧塘街道", + "site": "www.poi86.com" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [119.598014, 31.723871], + [119.596236, 31.723807], + [119.595308, 31.716997], + [119.585326, 31.716479], + [119.584857, 31.716455], + [119.584576, 31.722295], + [119.584607, 31.728292], + [119.580457, 31.731618], + [119.580457, 31.732161], + [119.58419, 31.732734], + [119.584965, 31.745107], + [119.585137, 31.748417], + [119.584809, 31.749191], + [119.584284, 31.749993], + [119.582376, 31.752607], + [119.585841, 31.754474], + [119.585041, 31.756088], + [119.584059, 31.756974], + [119.583123, 31.75747], + [119.581122, 31.758081], + [119.580857, 31.758178], + [119.580592, 31.758276], + [119.582561, 31.762562], + [119.584158, 31.766035], + [119.584141, 31.766109], + [119.583491, 31.768893], + [119.578694, 31.77759], + [119.578047, 31.779308], + [119.578026, 31.779363], + [119.582052, 31.784223], + [119.582885, 31.785501], + [119.585147, 31.788969], + [119.588382, 31.793982], + [119.592898, 31.801014], + [119.598322, 31.809107], + [119.599023, 31.809687], + [119.599247, 31.809565], + [119.600116, 31.809142], + [119.600285, 31.808932], + [119.600545, 31.807212], + [119.603075, 31.807452], + [119.603885, 31.807632], + [119.604095, 31.807422], + [119.604125, 31.807172], + [119.603905, 31.806892], + [119.603755, 31.805412], + [119.604065, 31.805292], + [119.604295, 31.805112], + [119.604495, 31.804622], + [119.605035, 31.803982], + [119.605255, 31.803832], + [119.605315, 31.803522], + [119.605335, 31.803052], + [119.605105, 31.802402], + [119.604655, 31.801752], + [119.604575, 31.801012], + [119.604445, 31.800732], + [119.604485, 31.800612], + [119.605325, 31.800502], + [119.605555, 31.800642], + [119.606025, 31.800752], + [119.606625, 31.800772], + [119.607355, 31.800542], + [119.608245, 31.799712], + [119.608665, 31.799952], + [119.608875, 31.799982], + [119.613615, 31.800032], + [119.614875, 31.799902], + [119.616115, 31.799662], + [119.619555, 31.798852], + [119.620165, 31.799092], + [119.620338, 31.799244], + [119.621475, 31.801512], + [119.621475, 31.801922], + [119.621595, 31.802142], + [119.622245, 31.802242], + [119.623255, 31.802042], + [119.623295, 31.802132], + [119.623145, 31.803632], + [119.623165, 31.805322], + [119.623296, 31.805392], + [119.623725, 31.805372], + [119.625535, 31.805132], + [119.628415, 31.804472], + [119.629146, 31.804422], + [119.629245, 31.804002], + [119.629095, 31.803842], + [119.629395, 31.803412], + [119.629676, 31.803552], + [119.629366, 31.804032], + [119.629615, 31.804092], + [119.629975, 31.803362], + [119.629316, 31.803092], + [119.629415, 31.802852], + [119.628396, 31.802402], + [119.628615, 31.802272], + [119.628445, 31.801922], + [119.628585, 31.801862], + [119.628755, 31.802082], + [119.629615, 31.802102], + [119.629595, 31.801631], + [119.629705, 31.801512], + [119.629775, 31.801662], + [119.629906, 31.801632], + [119.629815, 31.800922], + [119.630275, 31.800792], + [119.630934, 31.799664], + [119.631825, 31.800212], + [119.632035, 31.800052], + [119.631316, 31.799372], + [119.631431, 31.799304], + [119.631646, 31.799602], + [119.631955, 31.799502], + [119.632045, 31.799662], + [119.632415, 31.799492], + [119.632215, 31.799242], + [119.632576, 31.799062], + [119.632345, 31.798762], + [119.632095, 31.798952], + [119.631855, 31.798702], + [119.632145, 31.798511], + [119.631925, 31.797902], + [119.632135, 31.797772], + [119.632686, 31.798402], + [119.632865, 31.798342], + [119.632865, 31.798192], + [119.632995, 31.797952], + [119.632895, 31.797692], + [119.632726, 31.797552], + [119.632735, 31.797432], + [119.633005, 31.797261], + [119.633555, 31.797522], + [119.633545, 31.797712], + [119.633705, 31.797692], + [119.633825, 31.797462], + [119.633925, 31.797462], + [119.633945, 31.797782], + [119.634119, 31.79781], + [119.634215, 31.797802], + [119.633915, 31.798131], + [119.634096, 31.798192], + [119.634295, 31.798032], + [119.634795, 31.798152], + [119.634655, 31.798342], + [119.634755, 31.798391], + [119.634985, 31.798342], + [119.634965, 31.798511], + [119.635275, 31.798562], + [119.635255, 31.798812], + [119.635565, 31.798822], + [119.635595, 31.799101], + [119.636474, 31.799032], + [119.636845, 31.798932], + [119.636865, 31.799069], + [119.637105, 31.799002], + [119.637245, 31.799242], + [119.636665, 31.799622], + [119.636755, 31.799702], + [119.637515, 31.799251], + [119.637635, 31.799361], + [119.637755, 31.799282], + [119.637776, 31.799182], + [119.638105, 31.799062], + [119.638285, 31.799552], + [119.638455, 31.799702], + [119.639205, 31.800182], + [119.6393, 31.800116], + [119.639335, 31.800092], + [119.640885, 31.798441], + [119.643745, 31.795982], + [119.643196, 31.795383], + [119.643075, 31.795452], + [119.642746, 31.795312], + [119.642745, 31.795012], + [119.640855, 31.794302], + [119.641355, 31.792991], + [119.641135, 31.792912], + [119.641065, 31.793062], + [119.640495, 31.792862], + [119.640375, 31.793142], + [119.640185, 31.793102], + [119.640335, 31.792863], + [119.640195, 31.792751], + [119.640515, 31.791961], + [119.641815, 31.791052], + [119.641735, 31.790912], + [119.641175, 31.790652], + [119.641275, 31.790261], + [119.641025, 31.790012], + [119.641025, 31.789881], + [119.641135, 31.789722], + [119.641245, 31.789742], + [119.641495, 31.790012], + [119.641915, 31.789502], + [119.641755, 31.788542], + [119.641455, 31.788581], + [119.641375, 31.788262], + [119.641766, 31.788201], + [119.641725, 31.787872], + [119.643025, 31.784532], + [119.643685, 31.784371], + [119.643675, 31.784252], + [119.644255, 31.783972], + [119.644255, 31.783812], + [119.644445, 31.783841], + [119.644825, 31.783761], + [119.645125, 31.783601], + [119.645365, 31.783342], + [119.645725, 31.783492], + [119.645845, 31.783321], + [119.645585, 31.783191], + [119.646005, 31.782741], + [119.646315, 31.782112], + [119.646665, 31.782391], + [119.646785, 31.782361], + [119.646875, 31.782212], + [119.646685, 31.782031], + [119.646365, 31.781951], + [119.646655, 31.781371], + [119.646835, 31.781322], + [119.647055, 31.780821], + [119.647145, 31.780161], + [119.646815, 31.779951], + [119.646735, 31.779604], + [119.646955, 31.779242], + [119.647245, 31.779151], + [119.647475, 31.778761], + [119.647375, 31.778651], + [119.647665, 31.778471], + [119.647665, 31.778381], + [119.647565, 31.778302], + [119.647955, 31.778081], + [119.648305, 31.778401], + [119.648805, 31.778091], + [119.648715, 31.777782], + [119.649145, 31.777361], + [119.649225, 31.777151], + [119.649365, 31.777051], + [119.649905, 31.777241], + [119.650375, 31.776541], + [119.650485, 31.775692], + [119.650745, 31.775701], + [119.651295, 31.776062], + [119.651835, 31.776292], + [119.652265, 31.776071], + [119.652765, 31.775591], + [119.652765, 31.775011], + [119.652895, 31.774802], + [119.652725, 31.774512], + [119.652775, 31.774391], + [119.653265, 31.774441], + [119.653635, 31.774621], + [119.653715, 31.774701], + [119.653665, 31.775331], + [119.653755, 31.775361], + [119.653855, 31.775301], + [119.654375, 31.775361], + [119.654585, 31.775302], + [119.655005, 31.775022], + [119.655905, 31.775042], + [119.655845, 31.774641], + [119.656365, 31.774592], + [119.656105, 31.775061], + [119.656415, 31.775211], + [119.656225, 31.775571], + [119.656325, 31.775751], + [119.657015, 31.775971], + [119.657645, 31.774911], + [119.658395, 31.775641], + [119.658845, 31.775871], + [119.659175, 31.775941], + [119.658845, 31.776591], + [119.659045, 31.776701], + [119.659105, 31.776551], + [119.659325, 31.776411], + [119.659395, 31.776251], + [119.660015, 31.776231], + [119.660189, 31.776042], + [119.660325, 31.775841], + [119.661185, 31.776221], + [119.661275, 31.776121], + [119.660845, 31.775832], + [119.660845, 31.775771], + [119.660915, 31.775691], + [119.661085, 31.775741], + [119.661225, 31.775531], + [119.661255, 31.775462], + [119.661145, 31.775371], + [119.661095, 31.775191], + [119.661435, 31.774681], + [119.660685, 31.773772], + [119.661045, 31.773581], + [119.661545, 31.774161], + [119.661815, 31.773971], + [119.661605, 31.773741], + [119.661905, 31.773521], + [119.661735, 31.773451], + [119.662025, 31.773281], + [119.662175, 31.773401], + [119.662345, 31.773261], + [119.662985, 31.773931], + [119.664105, 31.773151], + [119.664825, 31.773411], + [119.664325, 31.773851], + [119.664285, 31.774561], + [119.664485, 31.774691], + [119.664635, 31.774691], + [119.664647, 31.774562], + [119.664885, 31.774631], + [119.664855, 31.774781], + [119.665735, 31.775081], + [119.665765, 31.774971], + [119.666015, 31.775021], + [119.666025, 31.775111], + [119.666285, 31.775181], + [119.666385, 31.774911], + [119.664555, 31.774291], + [119.664585, 31.774091], + [119.666015, 31.774551], + [119.666155, 31.774401], + [119.666175, 31.773901], + [119.667137, 31.773974], + [119.667075, 31.774821], + [119.667465, 31.774811], + [119.667475, 31.775051], + [119.667785, 31.775061], + [119.667795, 31.774951], + [119.667965, 31.774961] + ] + ] + ] + } + },{ "type": "Feature", "properties": { "id": "8969", - "name": "开发区", + "name": "东城街道", "site": "www.poi86.com" }, "geometry": { @@ -19,334 +364,7 @@ "coordinates": [ [ [ - [119.598014, 31.723871], - [119.596236, 31.723807], - [119.595308, 31.716997], - [119.585326, 31.716479], - [119.584857, 31.716455], - [119.584576, 31.722295], - [119.584607, 31.728292], - [119.580457, 31.731618], - [119.580457, 31.732161], - [119.58419, 31.732734], - [119.584965, 31.745107], - [119.585137, 31.748417], - [119.584809, 31.749191], - [119.584284, 31.749993], - [119.582376, 31.752607], - [119.585841, 31.754474], - [119.585041, 31.756088], - [119.584059, 31.756974], - [119.583123, 31.75747], - [119.581122, 31.758081], - [119.580857, 31.758178], - [119.580592, 31.758276], - [119.582561, 31.762562], - [119.584158, 31.766035], - [119.584141, 31.766109], - [119.583491, 31.768893], - [119.578694, 31.77759], - [119.578047, 31.779308], - [119.578026, 31.779363], - [119.582052, 31.784223], - [119.582885, 31.785501], - [119.585147, 31.788969], - [119.588382, 31.793982], - [119.592898, 31.801014], - [119.598322, 31.809107], - [119.599023, 31.809687], - [119.599247, 31.809565], - [119.600116, 31.809142], - [119.600285, 31.808932], - [119.600545, 31.807212], - [119.603075, 31.807452], - [119.603885, 31.807632], - [119.604095, 31.807422], - [119.604125, 31.807172], - [119.603905, 31.806892], - [119.603755, 31.805412], - [119.604065, 31.805292], - [119.604295, 31.805112], - [119.604495, 31.804622], - [119.605035, 31.803982], - [119.605255, 31.803832], - [119.605315, 31.803522], - [119.605335, 31.803052], - [119.605105, 31.802402], - [119.604655, 31.801752], - [119.604575, 31.801012], - [119.604445, 31.800732], - [119.604485, 31.800612], - [119.605325, 31.800502], - [119.605555, 31.800642], - [119.606025, 31.800752], - [119.606625, 31.800772], - [119.607355, 31.800542], - [119.608245, 31.799712], - [119.608665, 31.799952], - [119.608875, 31.799982], - [119.613615, 31.800032], - [119.614875, 31.799902], - [119.616115, 31.799662], - [119.619555, 31.798852], - [119.620165, 31.799092], - [119.620338, 31.799244], - [119.621475, 31.801512], - [119.621475, 31.801922], - [119.621595, 31.802142], - [119.622245, 31.802242], - [119.623255, 31.802042], - [119.623295, 31.802132], - [119.623145, 31.803632], - [119.623165, 31.805322], - [119.623296, 31.805392], - [119.623725, 31.805372], - [119.625535, 31.805132], - [119.628415, 31.804472], - [119.629146, 31.804422], - [119.629245, 31.804002], - [119.629095, 31.803842], - [119.629395, 31.803412], - [119.629676, 31.803552], - [119.629366, 31.804032], - [119.629615, 31.804092], - [119.629975, 31.803362], - [119.629316, 31.803092], - [119.629415, 31.802852], - [119.628396, 31.802402], - [119.628615, 31.802272], - [119.628445, 31.801922], - [119.628585, 31.801862], - [119.628755, 31.802082], - [119.629615, 31.802102], - [119.629595, 31.801631], - [119.629705, 31.801512], - [119.629775, 31.801662], - [119.629906, 31.801632], - [119.629815, 31.800922], - [119.630275, 31.800792], - [119.630934, 31.799664], - [119.631825, 31.800212], - [119.632035, 31.800052], - [119.631316, 31.799372], - [119.631431, 31.799304], - [119.631646, 31.799602], - [119.631955, 31.799502], - [119.632045, 31.799662], - [119.632415, 31.799492], - [119.632215, 31.799242], - [119.632576, 31.799062], - [119.632345, 31.798762], - [119.632095, 31.798952], - [119.631855, 31.798702], - [119.632145, 31.798511], - [119.631925, 31.797902], - [119.632135, 31.797772], - [119.632686, 31.798402], - [119.632865, 31.798342], - [119.632865, 31.798192], - [119.632995, 31.797952], - [119.632895, 31.797692], - [119.632726, 31.797552], - [119.632735, 31.797432], - [119.633005, 31.797261], - [119.633555, 31.797522], - [119.633545, 31.797712], - [119.633705, 31.797692], - [119.633825, 31.797462], - [119.633925, 31.797462], - [119.633945, 31.797782], - [119.634119, 31.79781], - [119.634215, 31.797802], - [119.633915, 31.798131], - [119.634096, 31.798192], - [119.634295, 31.798032], - [119.634795, 31.798152], - [119.634655, 31.798342], - [119.634755, 31.798391], - [119.634985, 31.798342], - [119.634965, 31.798511], - [119.635275, 31.798562], - [119.635255, 31.798812], - [119.635565, 31.798822], - [119.635595, 31.799101], - [119.636474, 31.799032], - [119.636845, 31.798932], - [119.636865, 31.799069], - [119.637105, 31.799002], - [119.637245, 31.799242], - [119.636665, 31.799622], - [119.636755, 31.799702], - [119.637515, 31.799251], - [119.637635, 31.799361], - [119.637755, 31.799282], - [119.637776, 31.799182], - [119.638105, 31.799062], - [119.638285, 31.799552], - [119.638455, 31.799702], - [119.639205, 31.800182], - [119.6393, 31.800116], - [119.639335, 31.800092], - [119.640885, 31.798441], - [119.643745, 31.795982], - [119.643196, 31.795383], - [119.643075, 31.795452], - [119.642746, 31.795312], - [119.642745, 31.795012], - [119.640855, 31.794302], - [119.641355, 31.792991], - [119.641135, 31.792912], - [119.641065, 31.793062], - [119.640495, 31.792862], - [119.640375, 31.793142], - [119.640185, 31.793102], - [119.640335, 31.792863], - [119.640195, 31.792751], - [119.640515, 31.791961], - [119.641815, 31.791052], - [119.641735, 31.790912], - [119.641175, 31.790652], - [119.641275, 31.790261], - [119.641025, 31.790012], - [119.641025, 31.789881], - [119.641135, 31.789722], - [119.641245, 31.789742], - [119.641495, 31.790012], - [119.641915, 31.789502], - [119.641755, 31.788542], - [119.641455, 31.788581], - [119.641375, 31.788262], - [119.641766, 31.788201], - [119.641725, 31.787872], - [119.643025, 31.784532], - [119.643685, 31.784371], - [119.643675, 31.784252], - [119.644255, 31.783972], - [119.644255, 31.783812], - [119.644445, 31.783841], - [119.644825, 31.783761], - [119.645125, 31.783601], - [119.645365, 31.783342], - [119.645725, 31.783492], - [119.645845, 31.783321], - [119.645585, 31.783191], - [119.646005, 31.782741], - [119.646315, 31.782112], - [119.646665, 31.782391], - [119.646785, 31.782361], - [119.646875, 31.782212], - [119.646685, 31.782031], - [119.646365, 31.781951], - [119.646655, 31.781371], - [119.646835, 31.781322], - [119.647055, 31.780821], - [119.647145, 31.780161], - [119.646815, 31.779951], - [119.646735, 31.779604], - [119.646955, 31.779242], - [119.647245, 31.779151], - [119.647475, 31.778761], - [119.647375, 31.778651], - [119.647665, 31.778471], - [119.647665, 31.778381], - [119.647565, 31.778302], - [119.647955, 31.778081], - [119.648305, 31.778401], - [119.648805, 31.778091], - [119.648715, 31.777782], - [119.649145, 31.777361], - [119.649225, 31.777151], - [119.649365, 31.777051], - [119.649905, 31.777241], - [119.650375, 31.776541], - [119.650485, 31.775692], - [119.650745, 31.775701], - [119.651295, 31.776062], - [119.651835, 31.776292], - [119.652265, 31.776071], - [119.652765, 31.775591], - [119.652765, 31.775011], - [119.652895, 31.774802], - [119.652725, 31.774512], - [119.652775, 31.774391], - [119.653265, 31.774441], - [119.653635, 31.774621], - [119.653715, 31.774701], - [119.653665, 31.775331], - [119.653755, 31.775361], - [119.653855, 31.775301], - [119.654375, 31.775361], - [119.654585, 31.775302], - [119.655005, 31.775022], - [119.655905, 31.775042], - [119.655845, 31.774641], - [119.656365, 31.774592], - [119.656105, 31.775061], - [119.656415, 31.775211], - [119.656225, 31.775571], - [119.656325, 31.775751], - [119.657015, 31.775971], - [119.657645, 31.774911], - [119.658395, 31.775641], - [119.658845, 31.775871], - [119.659175, 31.775941], - [119.658845, 31.776591], - [119.659045, 31.776701], - [119.659105, 31.776551], - [119.659325, 31.776411], - [119.659395, 31.776251], - [119.660015, 31.776231], - [119.660189, 31.776042], - [119.660325, 31.775841], - [119.661185, 31.776221], - [119.661275, 31.776121], - [119.660845, 31.775832], - [119.660845, 31.775771], - [119.660915, 31.775691], - [119.661085, 31.775741], - [119.661225, 31.775531], - [119.661255, 31.775462], - [119.661145, 31.775371], - [119.661095, 31.775191], - [119.661435, 31.774681], - [119.660685, 31.773772], - [119.661045, 31.773581], - [119.661545, 31.774161], - [119.661815, 31.773971], - [119.661605, 31.773741], - [119.661905, 31.773521], - [119.661735, 31.773451], - [119.662025, 31.773281], - [119.662175, 31.773401], - [119.662345, 31.773261], - [119.662985, 31.773931], - [119.664105, 31.773151], - [119.664825, 31.773411], - [119.664325, 31.773851], - [119.664285, 31.774561], - [119.664485, 31.774691], - [119.664635, 31.774691], - [119.664647, 31.774562], - [119.664885, 31.774631], - [119.664855, 31.774781], - [119.665735, 31.775081], - [119.665765, 31.774971], - [119.666015, 31.775021], - [119.666025, 31.775111], - [119.666285, 31.775181], - [119.666385, 31.774911], - [119.664555, 31.774291], - [119.664585, 31.774091], - [119.666015, 31.774551], - [119.666155, 31.774401], - [119.666175, 31.773901], - [119.667137, 31.773974], - [119.667075, 31.774821], - [119.667465, 31.774811], - [119.667475, 31.775051], - [119.667785, 31.775061], - [119.667795, 31.774951], - [119.667965, 31.774961], + [119.667945, 31.775491], [119.668555, 31.775491], [119.668585, 31.775211], diff --git a/src/views/viewrecords/components/addViewRecord.vue b/src/views/viewrecords/components/addViewRecord.vue index eb23402..8ad7f3a 100644 --- a/src/views/viewrecords/components/addViewRecord.vue +++ b/src/views/viewrecords/components/addViewRecord.vue @@ -582,7 +582,8 @@ viewtext: '', viewtime: "", viewscene: "", - viewstatus: '', + viewstatus: '', + uploads:'', infotext: '', jiedao:res?.jiedao, name: res?.name,