diff --git a/sub-government-affairs-service/src/apis/land.js b/sub-government-affairs-service/src/apis/land.js
index 242ed92..4fd94f8 100644
--- a/sub-government-affairs-service/src/apis/land.js
+++ b/sub-government-affairs-service/src/apis/land.js
@@ -223,3 +223,36 @@ export function exportlandInspection(params = {}) {
responseType: 'blob',
});
}
+
+/* ------ 土地违法处理 ------ */
+// #region
+
+/* 查询土地违法处理 */
+export function getLandIllegal(params = {}) {
+ return request('land-resource/landViolation/page', {
+ method: 'GET',
+ params,
+ });
+}
+/* 新增土地违法处理 */
+export function createLandIllegal(data = {}) {
+ return request('land-resource/landViolation/save', {
+ method: 'POST',
+ data,
+ });
+}
+
+/* 登记处理 */
+export function registerLandIllegal(data = {}) {
+ return request('land-resource/landViolation/registResult', {
+ method: 'PUT',
+ data,
+ });
+}
+/* 违法详情 */
+export function illegalInfo(id = '') {
+ return request('land-resource/landViolation/detail/' + id, {
+ method: 'GET',
+ });
+}
+// #endregion
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png
new file mode 100644
index 0000000..33aad5c
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png
new file mode 100644
index 0000000..d63d1ff
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png
new file mode 100644
index 0000000..41d0edc
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png
new file mode 100644
index 0000000..e527af4
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png
new file mode 100644
index 0000000..c8fac50
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png
new file mode 100644
index 0000000..561b373
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png
new file mode 100644
index 0000000..a982402
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png
new file mode 100644
index 0000000..443d673
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png
new file mode 100644
index 0000000..a4cd9bb
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png
new file mode 100644
index 0000000..4424682
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png
new file mode 100644
index 0000000..40a64e7
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png
new file mode 100644
index 0000000..9364571
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png differ
diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
index 3de517a..112dc62 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -18,7 +18,7 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/basicInfo',
name: 'basicInfo',
component: () => import('@/views/inputSuppliesManage/basicInfo/index.vue'),
- meta: { title: '物资', icon: 'Document' },
+ meta: { title: '物资管理', icon: 'Document' },
},
// {
// path: '/sub-government-affairs-service/productionDealer',
diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js
index 13d871c..f745b80 100644
--- a/sub-government-affairs-service/src/router/modules/trace.js
+++ b/sub-government-affairs-service/src/router/modules/trace.js
@@ -6,47 +6,53 @@ export default [
path: '/sub-government-affairs-service/trace',
name: 'trace',
component: Layout,
- redirect: '/sub-government-affairs-service/breeding',
+ redirect: '/sub-government-affairs-service/trace-home',
meta: { title: '溯源管理', icon: 'Document' },
children: [
{
- path: '/sub-government-affairs-service/planting',
- name: 'planting',
+ path: '/sub-government-affairs-service/trace-index',
+ name: 'trace-index',
+ component: () => import('@/views/trace/statistic/index.vue'),
+ meta: { title: '溯源首页', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/record',
+ name: 'record',
component: Views,
- meta: { title: '种植档案', icon: 'Document' },
- redirect: '/sub-government-affairs-service/planting-base',
+ meta: { title: '种养植档案', icon: 'Document' },
+ redirect: '/sub-government-affairs-service/record-base',
children: [
{
- path: '/sub-government-affairs-service/planting-base',
- component: () => import('@/views/trace/planting/base/index.vue'),
- name: 'planting-base',
+ path: '/sub-government-affairs-service/record-base',
+ component: () => import('@/views/trace/record/base/index.vue'),
+ name: 'record-base',
meta: { title: '基地档案', icon: 'Document' },
},
{
- path: '/sub-government-affairs-service/planting-seed',
- component: () => import('@/views/trace/planting/seed/index.vue'),
- name: 'planting-seed',
- meta: { title: '种子档案', icon: 'Document' },
+ path: '/sub-government-affairs-service/record-seed',
+ component: () => import('@/views/trace/record/seed/index.vue'),
+ name: 'record-seed',
+ meta: { title: '种源档案', icon: 'Document' },
},
],
},
{
- path: '/sub-government-affairs-service/breeding',
- name: 'breeding',
+ path: '/sub-government-affairs-service/agricultural',
+ name: 'agricultural',
component: Views,
meta: { title: '农事管理', icon: 'Document' },
- redirect: '/sub-government-affairs-service/breeding-coding',
+ redirect: '/sub-government-affairs-service/agricultural-coding',
children: [
{
- path: '/sub-government-affairs-service/breeding-coding',
- component: () => import('@/views/trace/breeding/coding/index.vue'),
- name: 'breeding-coding',
+ path: '/sub-government-affairs-service/agricultural-coding',
+ component: () => import('@/views/trace/agricultural/coding/index.vue'),
+ name: 'agricultural-coding',
meta: { title: '采收与赋码管理', icon: 'Document' },
},
{
- path: '/sub-government-affairs-service/breeding-quality',
- component: () => import('@/views/trace/breeding/quality/index.vue'),
- name: 'breeding-quality',
+ path: '/sub-government-affairs-service/agricultural-quality',
+ component: () => import('@/views/trace/agricultural/quality/index.vue'),
+ name: 'agricultural-quality',
meta: { title: '产品质检管理', icon: 'Document' },
},
],
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue
index 82e50d3..13e0854 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue
@@ -1,16 +1,19 @@
-
-
+
+
{{ item.label }}
-
+
+
diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue
index a9a1953..aeeacbb 100644
--- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue
@@ -18,10 +18,11 @@
diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue
index 0c4787d..b08216f 100644
--- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue
@@ -17,12 +17,13 @@
登记处理
-
-
+
@@ -30,22 +31,29 @@
diff --git a/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue b/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/breeding/coding/index.vue
rename to sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue
diff --git a/sub-government-affairs-service/src/views/trace/breeding/coding/info.vue b/sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/breeding/coding/info.vue
rename to sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue
diff --git a/sub-government-affairs-service/src/views/trace/breeding/quality/form.vue b/sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/breeding/quality/form.vue
rename to sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue
diff --git a/sub-government-affairs-service/src/views/trace/breeding/quality/index.vue b/sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/breeding/quality/index.vue
rename to sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue
diff --git a/sub-government-affairs-service/src/views/trace/planting/base/index.vue b/sub-government-affairs-service/src/views/trace/record/base/index.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/planting/base/index.vue
rename to sub-government-affairs-service/src/views/trace/record/base/index.vue
diff --git a/sub-government-affairs-service/src/views/trace/planting/seed/index.vue b/sub-government-affairs-service/src/views/trace/record/seed/index.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/trace/planting/seed/index.vue
rename to sub-government-affairs-service/src/views/trace/record/seed/index.vue
diff --git a/sub-government-affairs-service/src/views/trace/statistic/index.vue b/sub-government-affairs-service/src/views/trace/statistic/index.vue
new file mode 100644
index 0000000..a80e603
--- /dev/null
+++ b/sub-government-affairs-service/src/views/trace/statistic/index.vue
@@ -0,0 +1,384 @@
+
+
+
+
+
+
+ -
+
+ 发放溯源码
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+ 有效期内溯源码
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+ 追溯主体数
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+ 产品溯源次数
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测记录
+
+
+
+
+
+
+
+
+
+
+ 溯源主体统计
+
+ -
+
+
+ {{ item.num }}
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+