From 1ad25f012d969dea57fc4c7de5bd94c8ca086c07 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 22 Aug 2023 12:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/boy.png | Bin 0 -> 6870 bytes src/assets/female.png | Bin 0 -> 4383 bytes src/assets/girl.png | Bin 0 -> 5058 bytes src/assets/grandfather.png | Bin 0 -> 7464 bytes src/assets/grandmother.png | Bin 0 -> 5701 bytes src/assets/male.png | Bin 0 -> 7941 bytes src/views/jsc/components/echartsMap.vue | 111 ++++++--- src/views/jsc/components/echartsMap1.vue | 300 +++++++++++++++++++---- src/views/jsc/index.vue | 6 +- src/views/record/map.vue | 28 ++- src/views/record/personinfo.vue | 78 +++++- 11 files changed, 433 insertions(+), 90 deletions(-) create mode 100644 src/assets/boy.png create mode 100644 src/assets/female.png create mode 100644 src/assets/girl.png create mode 100644 src/assets/grandfather.png create mode 100644 src/assets/grandmother.png create mode 100644 src/assets/male.png diff --git a/src/assets/boy.png b/src/assets/boy.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca72f830284fdea2737c548750a8b8043371e58 GIT binary patch literal 6870 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 QW&i*H07*qoM6N<$f-r-@g#Z8m literal 0 HcmV?d00001 diff --git a/src/assets/female.png b/src/assets/female.png new file mode 100644 index 0000000000000000000000000000000000000000..4959eecdafb754ab88b294db9ed0619d68ec0712 GIT binary patch literal 4383 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 NOHE(3^nq>2{{dgeTtEN- literal 0 HcmV?d00001 diff --git a/src/assets/girl.png b/src/assets/girl.png new file mode 100644 index 0000000000000000000000000000000000000000..a08736cb7322eed442499dac07b002117f738463 GIT binary patch literal 5058 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 literal 0 HcmV?d00001 diff --git a/src/assets/grandfather.png b/src/assets/grandfather.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b474db71af666e3c54598dc01b932441bbc164 GIT binary patch literal 7464 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 TnJKqBpm$I(ZD^I6dFcNE0Rj{} literal 0 HcmV?d00001 diff --git a/src/assets/grandmother.png b/src/assets/grandmother.png new file mode 100644 index 0000000000000000000000000000000000000000..87669b9642bfba08fd2613420c580a53e0c634ac GIT binary patch literal 5701 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 literal 0 HcmV?d00001 diff --git a/src/views/jsc/components/echartsMap.vue b/src/views/jsc/components/echartsMap.vue index f46c691..5fc4bdb 100644 --- a/src/views/jsc/components/echartsMap.vue +++ b/src/views/jsc/components/echartsMap.vue @@ -12,12 +12,42 @@ mapData: { type: Array, default: [] + }, + streetList:{ + type: Array, + default: [] } }, data() { return { myChart: null, - hookToolTip: {}, + hookToolTip: {}, + streetlist:[], + streetNameList:[{ + name:'开发区', + coord:[119.59,31.77] + },{ + name:'指前镇', + coord:[119.45,31.62] + },{ + name:'尧塘镇', + coord:[119.62,31.69] + },{ + name:'儒林镇', + coord:[119.58,31.61] + },{ + name:'金城镇', + coord:[119.5,31.75] + },{ + name:'薛埠镇', + coord:[119.32,31.77] + },{ + name:'直溪镇', + coord:[119.44,31.84] + },{ + name:'朱林镇', + coord:[119.42,31.72] + }] // mapData:[] } }, @@ -30,13 +60,14 @@ }, watch: { hookToolTip: { - handler(newVal, oldVal) { - let tooltipButton = document.querySelector(".mapsshow" + newVal.data.id) - let that = this - tooltipButton.addEventListener('click', function() { - that.showInfo(newVal.data.id) + handler(newVal, oldVal) { + let name = newVal.name==='尧塘镇'?'西城街道':newVal.name + this.$router.push({ + path: "/record/map", + query: { + street: name + } }) - } }, }, @@ -53,13 +84,35 @@ this.myChart.resize() }, drawChart() { - let that = this - this.mapData.forEach((m, index) => { - if (!m.coord) { - m.coord = ['', ''] - } - }) - // 基于准备好的dom,初始化echarts实例 + let that = this + // console.log("this.mapData",this.mapData) + // this.mapData.forEach((m, index) => { + // if (!m.coord) { + // m.coord = ['', ''] + // } + // }) + let _streetlist = [] + this.streetNameList.map(item=>{ + this.streetList.map(item1=>{ + if(item.name===item1.name){ + _streetlist.push({ + name:item1.name, + value:item1.value, + coord:item.coord + }) + } + if(item1.name==='西城街道' && item.name==='尧塘镇'){ + _streetlist.push({ + name:item1.name, + value:item1.value, + coord:item.coord + }) + } + }) + }) + this.streetlist = _streetlist + // 基于准备好的dom,初始化echarts实例 + console.log("streetList",this.streetList) this.myChart = echarts.init(document.getElementById('chart')) echarts.registerMap('GX', jtmap); // 绘制图表 @@ -72,11 +125,11 @@ triggerOn: 'click', formatter: function(val) { that.hookToolTip = val; - if (!val.data) { - return - } - return '

' + val.data.name + - '

查看详情

' + // if (!val.data) { + // return + // } + // return '

' + val.data.name + + // '

查看详情

' } }, geo: { @@ -199,30 +252,30 @@ ] }, series: [{ - name: "一户一档", type: "map", mapType: "china", geoIndex: 0, markPoint: { - symbol: 'image://' + require('@/assets/logo-mini.png'), // 自定义图片路径 - symbolSize: [50, 40], // 图片大小 - symbolOffset: [0, -30], + // symbol: 'image://' + require('@/assets/logo-mini.png'), // 自定义图片路径 + symbol: '', // 自定义图片路径 + symbolSize: [10, 10], // 图片大小 + symbolOffset: [0, 0], label: { - position: 'bottom', + position: 'center', color: "#fff", textAlign: "center", - padding: [4, 7], - borderWidth: 2, // 图形描边的宽度。 + padding: [5, 10], + borderWidth: 1, // 图形描边的宽度。 borderColor: "#fff", // 边框颜色 backgroundColor: 'green', // 背景色 formatter(val) { - return val.name + return val.data.name+":"+val.data.value+"人" } }, - // coord数组存放地址坐标 - data: this.mapData + // data:this.streetList + data:this.streetlist } }], }) diff --git a/src/views/jsc/components/echartsMap1.vue b/src/views/jsc/components/echartsMap1.vue index 970bf8b..b20c87a 100644 --- a/src/views/jsc/components/echartsMap1.vue +++ b/src/views/jsc/components/echartsMap1.vue @@ -1,49 +1,255 @@ - - - - - diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue index 34a8ee7..2dda8e8 100644 --- a/src/views/jsc/index.vue +++ b/src/views/jsc/index.vue @@ -60,7 +60,7 @@
- +
@@ -350,6 +350,10 @@ } } this.mapList = _data + if(_nolng.length==0){ + this.showMap = true + return + } var geocoder = null let that = this AMap.plugin("AMap.Geocoder", function() { diff --git a/src/views/record/map.vue b/src/views/record/map.vue index f0c20d8..aea3b32 100644 --- a/src/views/record/map.vue +++ b/src/views/record/map.vue @@ -64,7 +64,8 @@ makerList: [], infoWindow: null, openData: [], - // markerList: [], + // markerList: [], + ispage:false, mapList: [], fullscreenLoading: false, streetList: [], @@ -112,8 +113,14 @@ this.$nextTick(function() { this.mapInit() }) + if (this.$route.query?.street) { + this.select.street = this.$route.query.street + this.openSearch = true + this.getindex() + }else{ + this.getindex() + } - this.getindex() }, methods: { // openFullScreen() { @@ -289,7 +296,8 @@ }) }, pageChange(e) { - this.select.page = e + this.select.page = e + this.ispage = true this.getindex() }, movetoperson(row, index) { @@ -304,7 +312,10 @@ } }, - async getindex() { + async getindex() { + if(!this.ispage){ + this.select.page = 1 + } this.fullscreenLoading = true; this.mapList = [] // this.map.remove(this.marker) @@ -332,6 +343,7 @@ }], }) this.select.total = res.total + this.ispage = false if(res.data.length<1){ Message({ @@ -369,10 +381,10 @@ // result中对应详细地理坐标信息 k.longitude = result.geocodes[0].location.lng k.latitude = result.geocodes[0].location.lat - save({ - table_name: that.select.table_name, - ...k - }) + // save({ + // table_name: that.select.table_name, + // ...k + // }) } if (index == _nolng.length - 1) { that.mapList.push(..._nolng) diff --git a/src/views/record/personinfo.vue b/src/views/record/personinfo.vue index 200a4ec..86c20de 100644 --- a/src/views/record/personinfo.vue +++ b/src/views/record/personinfo.vue @@ -51,7 +51,32 @@ recordId:"", viewRecordId:"", allTable:[], - formDialoger: [], + formDialoger: [], + imgs:[{ + type:'children', + sex:'男', + url:require('@/assets/boy.png') + },{ + type:'children', + sex:'女', + url:require('@/assets/girl.png') + },{ + type:'adult', + sex:'男', + url:require('@/assets/male.png') + },{ + type:'adult', + sex:'女', + url:require('@/assets/female.png') + },{ + type:'old', + sex:'男', + url:require('@/assets/grandfather.png') + },{ + type:'old', + sex:'女', + url:require('@/assets/grandmother.png') + }], urlList: { fuels: '/book_cars', reforms: '/book_reform', @@ -166,10 +191,26 @@ const res = await show({ id: id, table_name: 'records' + }) + + let age = this.getAge(res.idcard) + let sex = res.sex + let imgType = age<16?'children':(age>60?'old':'adult') + let imgUrl='' + + this.imgs.map(item=>{ + if(sex===item.sex){ + console.log(imgType==item.type,item.url) + if(imgType==item.type){ + imgUrl = item.url + } + + } }) - let names = `
${res.name}
` + let names = `
${res.name}
` let contents = - `

姓名:${res.name}

性别:${res.sex}

联系方式:${res.mobile}

残疾类别:${res.disabilitytype}

残疾等级:${res?.disabilitylevel}

现居住地:${res.reside}

` + `

姓名:${res.name}

性别:${res.sex}

年龄:${age}

联系方式:${res.mobile}

残疾类别:${res.disabilitytype}

残疾等级:${res?.disabilitylevel}

现居住地:${res.reside}

` + let views = '' let workflows = '' this.idcard = res.idcard @@ -265,6 +306,27 @@ const val2 = b[property]; return val1 - val2; } + }, + getAge(iden) { + let val = iden.length; + let myDate = new Date(); + let month = myDate.getMonth() + 1; + let day = myDate.getDate(); + let age = 0; + + if (val === 18) { + age = myDate.getFullYear() - iden.substring(6, 10) - 1; + + if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++; + + } + if (val === 15) { + age = myDate.getFullYear() - iden.substring(6, 8) - 1901; + + if (iden.substring(8, 10) < month || iden.substring(8, 10) == month && iden.substring(10, 12) <= day) age++; + } + + return age }, @@ -397,7 +459,13 @@ width: 150px; background: #ddd; border-radius: 100%; - line-height: 150px; - margin: 35px auto; + /* line-height: 150px; */ + margin: 35px auto; + text-align: center; + padding-top: 10px; + } + /deep/ .avue-flow__node-body .persons img{ + display:inline-block; + width:50% }