diff --git a/package.json b/package.json index 5977fe67a..420d28535 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,9 @@ "et:list": "gulp themes" }, "dependencies": { + "@antv/l7": "^2.9.14", + "@antv/l7-draw": "^3.0.5", + "@antv/l7-maps": "^2.9.14", "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^3.2.8", "async-validator": "^4.2.5", diff --git a/src/assets/img/shuju/grid/pos-green.png b/src/assets/img/shuju/grid/pos-green.png new file mode 100644 index 000000000..a4bf392e0 Binary files /dev/null and b/src/assets/img/shuju/grid/pos-green.png differ diff --git a/src/assets/img/shuju/grid/pos-green2.png b/src/assets/img/shuju/grid/pos-green2.png new file mode 100644 index 000000000..7162005f5 Binary files /dev/null and b/src/assets/img/shuju/grid/pos-green2.png differ diff --git a/src/assets/img/shuju/grid/pos-red.png b/src/assets/img/shuju/grid/pos-red.png new file mode 100644 index 000000000..f0ab35472 Binary files /dev/null and b/src/assets/img/shuju/grid/pos-red.png differ diff --git a/src/assets/img/shuju/grid/pos-red2.png b/src/assets/img/shuju/grid/pos-red2.png new file mode 100644 index 000000000..1f2faa80d Binary files /dev/null and b/src/assets/img/shuju/grid/pos-red2.png differ diff --git a/src/assets/img/shuju/grid/pos-yellow.png b/src/assets/img/shuju/grid/pos-yellow.png new file mode 100644 index 000000000..91ff243b0 Binary files /dev/null and b/src/assets/img/shuju/grid/pos-yellow.png differ diff --git a/src/assets/img/shuju/grid/pos-yellow2.png b/src/assets/img/shuju/grid/pos-yellow2.png new file mode 100644 index 000000000..7050f2604 Binary files /dev/null and b/src/assets/img/shuju/grid/pos-yellow2.png differ diff --git a/src/utils/index.js b/src/utils/index.js index 1e6b6e6fa..c129bea9d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -145,4 +145,13 @@ export function computedCard(idCard) { sex = '1'; return {age , sex, birth} } +// 将数组分成小块数组的集合 +export function spliceIntoChunks(arr, chunkSize) { + const res = []; + while (arr.length > 0) { + const chunk = arr.splice(0, chunkSize); + res.push(chunk); + } + return res; +} diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue index 921f93f3d..fe4ecbd6e 100644 --- a/src/views/modules/plugins/change/changewelfare.vue +++ b/src/views/modules/plugins/change/changewelfare.vue @@ -54,8 +54,11 @@ + + +
- {{ $t('add') }} + {{ $t('export') }}
@@ -145,7 +148,8 @@ export default { getDataListURL: '/epmetuser/changeWelfare/page', getDataListIsPage: true, deleteURL: '/epmetuser/changeWelfare', - deleteIsBatch: true + deleteIsBatch: true, + exportURL: '/epmetuser/changeWelfare/export' }, dataForm: { id: '' @@ -178,6 +182,34 @@ export default { } }, methods: { + exportHandle () { + const url = this.mixinViewModuleOptions.exportURL + this.$http({ + method: 'GET', + url, + responseType: 'blob', + params: this.dataForm + }).then(res => { + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) + var url = window.URL.createObjectURL(blob) + var aLink = document.createElement('a') + aLink.style.display = 'none' + aLink.href = url + aLink.setAttribute('download', fileName) + document.body.appendChild(aLink) + aLink.click() + document.body.removeChild(aLink) //下载完成移除元素 + window.URL.revokeObjectURL(url) //释放掉blob对象 + } else this.$message.error('下载失败') + }).catch(err => { + console.log('err', err) + return this.$message.error('网络错误') + }) + }, resetForm(formName) { for(const n in this.dataForm) { this.dataForm[n] = '' diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index d33f449a2..ed8684a6f 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -320,20 +320,20 @@ export default { this.afterTime = null; return false; } - if (hour_0 == 12) { - if (minute_0 == 0 && second_0 == 0) { - this.$message.error("请选择12:01-23:59时间段的时间"); - this.afterTime = null; - return false; - } - } - if (hour_1 == 12) { - if (minute_1 == 0 && second_1 == 0) { - this.$message.error("请选择12:01-23:59时间段的时间"); - this.afterTime = null; - return false; - } - } + // if (hour_0 == 12) { + // if (minute_0 == 0 && second_0 == 0) { + // this.$message.error("请选择12:01-23:59时间段的时间"); + // this.afterTime = null; + // return false; + // } + // } + // if (hour_1 == 12) { + // if (minute_1 == 0 && second_1 == 0) { + // this.$message.error("请选择12:01-23:59时间段的时间"); + // this.afterTime = null; + // return false; + // } + // } this.dataForm.afStartTime = this.afterTime[0]; this.dataForm.afEndTime = this.afterTime[1]; } diff --git a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue new file mode 100644 index 000000000..c57aaef37 --- /dev/null +++ b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue @@ -0,0 +1,1017 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index c57aaef37..3a0e2ccee 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -1,271 +1,171 @@ - + - \ No newline at end of file + diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue new file mode 100644 index 000000000..b830be4c8 --- /dev/null +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -0,0 +1,371 @@ + + + + + diff --git a/src/views/modules/visual/test/l7.vue b/src/views/modules/visual/test/l7.vue new file mode 100644 index 000000000..951fd7b71 --- /dev/null +++ b/src/views/modules/visual/test/l7.vue @@ -0,0 +1,547 @@ + + + + +