diff --git a/src/views/business/export/index.vue b/src/views/business/export/index.vue
index 9e6801f..626a98d 100644
--- a/src/views/business/export/index.vue
+++ b/src/views/business/export/index.vue
@@ -51,8 +51,6 @@
删除
- -->
-
导入
@@ -62,6 +60,7 @@
打印
+ -->
@@ -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..342eef4 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -56,8 +56,6 @@
删除
- -->
-
导入
@@ -67,6 +65,7 @@
打印
+ -->
@@ -136,6 +135,8 @@
是否更新已经存在的导入任务
1、仅允许导入xls、xlsx格式文件；
+ 2、覆盖导入：指先将所选区划当前在库数据删除，然后按新数据包解析导入；
+ 3、增量导入：指按新数据包解析并追加导入；
下载模板
@@ -174,7 +175,13 @@
-
+
+
+ 导入方式
+
+
+
+
@@ -346,9 +353,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 +379,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;
diff --git a/src/views/index.vue b/src/views/index.vue
index 2a08729..a3a9579 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,38 +2,75 @@
-
-
-
总用户数
+
总地块数
12,345
↑ 12% 同比
-
本月销售额
+
已调查数
+
¥ 456,789
+
↑ 8% 环比
+
+
+
+
+
+
待调查数
+
8,642
+
↓ 3% 环比
+
+
+
承包总金额
¥ 456,789
↑ 8% 环比
+
+
+
-
活跃用户
+
兑现总额
8,642
↓ 3% 环比
+
+
尚欠总额
+
¥ 456,789
+
↑ 8% 环比
+
+
+
+
+
+
年总收益
+
8,642
+
↓ 3% 环比
+
+
+
经营总面积
+
¥ 456,789
+
↑ 8% 环比
+
+
+
+
+
+
年总收益
+
8,642
+
↓ 3% 环比
+
+
+
经营总面积
+
¥ 456,789
+
↑ 8% 环比
+
@@ -46,8 +83,7 @@
name: 'Dashboard',
mounted() {
this.initLineChart();
- this.initBarChart();
- this.initPieChart();
+
},
methods: {
initLineChart() {
@@ -57,7 +93,7 @@
trigger: 'axis'
},
legend: {
- data: ['新增用户', '活跃用户', '付费用户']
+ data: ['已调查', '待调查']
},
grid: {
left: '3%',
@@ -68,27 +104,14 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
+ data: ['A市', 'B市', 'C市', 'D市', 'E市', 'F市', 'G市']
},
yAxis: {
type: 'value'
},
series: [
{
- name: '新增用户',
- type: 'line',
- data: [120, 132, 101, 134, 90, 230, 210],
- smooth: true,
- lineStyle: {
- width: 3,
- color: '#5470C6'
- },
- itemStyle: {
- color: '#5470C6'
- }
- },
- {
- name: '活跃用户',
+ name: '已调查',
type: 'line',
data: [220, 182, 191, 234, 290, 330, 310],
smooth: true,
@@ -101,7 +124,7 @@
}
},
{
- name: '付费用户',
+ name: '待调查',
type: 'line',
data: [150, 232, 201, 154, 190, 330, 410],
smooth: true,
@@ -120,107 +143,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();
- });
- }
}
};
diff --git a/src/views/index_v2.vue b/src/views/index_v2.vue
new file mode 100644
index 0000000..2a08729
--- /dev/null
+++ b/src/views/index_v2.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
+
总用户数
+
12,345
+
↑ 12% 同比
+
+
+
本月销售额
+
¥ 456,789
+
↑ 8% 环比
+
+
+
活跃用户
+
8,642
+
↓ 3% 环比
+
+
+
+