From d1d8b2df030a37af1c98e8a06551cdfcc5ae3cfc Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 09:15:59 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/export/index.vue | 11 +++++++----
src/views/business/import/index.vue | 13 ++++++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/business/export/index.vue b/src/views/business/export/index.vue
index 9e6801f..6428058 100644
--- a/src/views/business/export/index.vue
+++ b/src/views/business/export/index.vue
@@ -51,11 +51,10 @@
删除
- -->
-
导入
+ -->
导出
@@ -315,8 +314,8 @@ export default {
deptId: null,
deptName: null,
orgCode: null,
- fileType: null,
- coordinateSystem: null,
+ fileType: '1',
+ coordinateSystem: '2',
fileUrl: null,
taskStatus: '1',
}
@@ -340,6 +339,10 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
+ if(this.selectDeptName == null || this.selectDeptName == ''){
+ this.$modal.msgWarning("请先选择县级及以下行政区划！")
+ return
+ }
this.reset()
this.form.deptId = this.queryParams.deptId;
this.form.deptName = this.selectDeptName;
diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue
index 05514ac..29a5976 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -56,11 +56,10 @@
删除
- -->
-
导入
+ -->
导出
@@ -346,9 +345,9 @@ export default {
deptId: null,
deptName: null,
orgCode: null,
- fileType: null,
- importType: null,
- coordinateSystem: null,
+ fileType: '1',
+ importType: '1',
+ coordinateSystem: '1',
fileUrl: null,
taskStatus: '1',
}
@@ -372,6 +371,10 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
+ if(this.selectDeptName == null || this.selectDeptName == ''){
+ this.$modal.msgWarning("请先选择县级及以下行政区划！")
+ return
+ }
this.reset()
this.open = true
this.form.deptId = this.queryParams.deptId;
From ee1ce1ff8c75d19915e81dc40d428d5b32825c61 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 09:22:48 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/import/index.vue | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue
index 29a5976..35d512e 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -135,6 +135,8 @@
是否更新已经存在的导入任务
1、仅允许导入xls、xlsx格式文件；
+ 2、覆盖导入：指先将所选区划当前在库数据删除，然后按新数据包解析导入；
+ 3、增量导入：指按新数据包解析并追加导入；
下载模板
@@ -173,7 +175,13 @@
-
+
+
+ 导入方式
+
+
+
+
From 9e5f60870b010f48f0b8ab3f59cf09bf93ae61d3 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 09:32:27 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/export/index.vue | 2 +-
src/views/business/import/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/business/export/index.vue b/src/views/business/export/index.vue
index 6428058..d9ef854 100644
--- a/src/views/business/export/index.vue
+++ b/src/views/business/export/index.vue
@@ -54,10 +54,10 @@
导入
- -->
导出
+ -->
打印
diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue
index 35d512e..cc22d96 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -59,10 +59,10 @@
导入
- -->
导出
+ -->
打印
From fa9feff75a19a114d43b2c04bc2385aa361f0aeb Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 09:33:43 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/export/index.vue | 2 +-
src/views/business/import/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/business/export/index.vue b/src/views/business/export/index.vue
index d9ef854..626a98d 100644
--- a/src/views/business/export/index.vue
+++ b/src/views/business/export/index.vue
@@ -57,10 +57,10 @@
导出
- -->
打印
+ -->
diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue
index cc22d96..342eef4 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -62,10 +62,10 @@
导出
- -->
打印
+ -->
From 6f15c910b702aa305f101b3884e31fc276a9bb4d Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 14:51:12 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E5=B1=9E=E6=80=A7?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/resource/operation/index.vue | 127 +++++++++++++++++++------
1 file changed, 100 insertions(+), 27 deletions(-)
diff --git a/src/views/resource/operation/index.vue b/src/views/resource/operation/index.vue
index 7d4667a..51f4a53 100644
--- a/src/views/resource/operation/index.vue
+++ b/src/views/resource/operation/index.vue
@@ -18,20 +18,43 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
搜索
重置
@@ -65,25 +88,32 @@
-
-
+
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
@@ -182,32 +212,52 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
@@ -216,10 +266,19 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -229,6 +288,7 @@
{{dict.label}}
+
@@ -46,8 +70,7 @@
name: 'Dashboard',
mounted() {
this.initLineChart();
- this.initBarChart();
- this.initPieChart();
+
},
methods: {
initLineChart() {
@@ -107,107 +130,6 @@
chart.resize();
});
},
- initBarChart() {
- const chart = echarts.init(this.$refs.barChart);
- const option = {
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow'
- }
- },
- legend: {
- data: ['2022', '2023']
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- xAxis: {
- type: 'value'
- },
- yAxis: {
- type: 'category',
- data: ['产品A', '产品B', '产品C', '产品D', '产品E']
- },
- series: [
- {
- name: '2022',
- type: 'bar',
- data: [320, 302, 341, 374, 390],
- itemStyle: {
- color: '#91CC75'
- }
- },
- {
- name: '2023',
- type: 'bar',
- data: [420, 432, 401, 454, 590],
- itemStyle: {
- color: '#5470C6'
- }
- }
- ]
- };
- chart.setOption(option);
- window.addEventListener('resize', function() {
- chart.resize();
- });
- },
- initPieChart() {
- const chart = echarts.init(this.$refs.pieChart);
- const option = {
- tooltip: {
- trigger: 'item'
- },
- legend: {
- orient: 'vertical',
- right: 10,
- top: 'center'
- },
- series: [
- {
- name: '用户分布',
- type: 'pie',
- radius: ['40%', '70%'],
- avoidLabelOverlap: false,
- itemStyle: {
- borderRadius: 10,
- borderColor: '#fff',
- borderWidth: 2
- },
- label: {
- show: false,
- position: 'center'
- },
- emphasis: {
- label: {
- show: true,
- fontSize: '18',
- fontWeight: 'bold'
- }
- },
- labelLine: {
- show: false
- },
- data: [
- { value: 1048, name: '华北地区' },
- { value: 735, name: '华东地区' },
- { value: 580, name: '华南地区' },
- { value: 484, name: '西部地区' },
- { value: 300, name: '东北地区' }
- ],
- color: ['#5470C6', '#91CC75', '#EE6666', '#FAC858', '#73C0DE']
- }
- ]
- };
- chart.setOption(option);
- window.addEventListener('resize', function() {
- chart.resize();
- });
- }
}
};
From c5808bdbf2dca22f42ce62146352db664c94339e Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 9 Sep 2025 09:10:39 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/index.vue | 13 +++++++
src/views/resource/land/index.vue | 50 +++++++++++++-------------
src/views/resource/operation/index.vue | 39 ++++++++++----------
3 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index a783946..a3a9579 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -59,6 +59,19 @@
↑ 8% 环比
+
+
+
+
年总收益
+
8,642
+
↓ 3% 环比
+
+
+
经营总面积
+
¥ 456,789
+
↑ 8% 环比
+
+