Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/api/minerals/model/index.ts

@@ -1,7 +1,7 @@
 export interface tubanListParams {
   page?: number;
   limit?: number;
-  syear_base?: number;
+  syear_base?: string;
   type_base?: string;
   tubanlaiyuan?: string;
   startTime?: string;

src/views/demo/minerals/miningstatistics/index.vue

@@ -74,7 +74,7 @@
   const showInfoOpen = ref(false);
   const searchParams = ref({
     page: 1,
-    limit: 20,
+    limit: 15,
   });
   const areaParams = ref({
     tubanArea1: null,
@@ -87,11 +87,11 @@
   const tableData = ref([]);
   const tablePaginationRight = ref({
     current: 1,
-    pageSize: 20,
+    pageSize: 15,
     size: 'small',
-    defaultPageSize: 20,
+    defaultPageSize: 15,
     showSizeChanger: true,
-    pageSizeOptions: ['20', '50', '80', '100'],
+    pageSizeOptions: ['15', '50', '80', '100'],
     showQuickJumper: true,
     total: 0,
   });
@@ -191,7 +191,7 @@
   function handleReset() {
     searchParams.value = {
       page: 1,
-      limit: 10,
+      limit: 15,
     };
     areaParams.value = {
       tubanArea1: null,

src/views/demo/minerals/miningstatistics/miningstatistics.data.ts

@@ -12,6 +12,7 @@ export const columns: BasicColumn[] = [
   {
     title: '编号',
     dataIndex: 'tubannum_base',
+    width: 200,
   },
   {
     title: '线索来源',

src/views/demo/minerals/patchsummary/patchsummary.data.ts

@@ -9,7 +9,6 @@ import {
   getOptions,
 } from '@/utils/global';
 
-
 export const columns: BasicColumn[] = [
   {
     title: '年度',
@@ -56,41 +55,35 @@ export const columns: BasicColumn[] = [
   {
     title: '所在国家自热保护区名称',
     dataIndex: 'ziranbaohuname_base',
+    width: 200,
   },
   {
     title: '图斑面积',
     dataIndex: 'weifaarea_base',
-    width: 110,
   },
   {
     title: '耕地面积',
-    dataIndex: 'jbntarea_base',
-    width: 110,
+    dataIndex: 'gengdi_area',
   },
   {
     title: '违法开采面积',
     dataIndex: 'kaicaiarea_kcfill',
-    width: 80,
   },
   {
     title: '违法占地面积',
     dataIndex: 'weifaarea_punish',
-    width: 80,
   },
   {
     title: '是否持续违法',
     dataIndex: 'handlestatusname',
-    width: 80,
   },
   {
     title: '当前状态',
     dataIndex: 'status_base',
-    width: 80,
   },
   {
     title: '判定结果',
     dataIndex: 'hefapanding_fill',
-    width: 80,
   },
   {
     title: '下发时间',
@@ -117,10 +110,10 @@ export const columns: BasicColumn[] = [
     dataIndex: 'chulishixian_base',
   },
   // 表里没有备注
-  {
-    title: '备注',
-    dataIndex: 'measurename',
-  },
+  // {
+  //   title: '备注',
+  //   dataIndex: 'measurename',
+  // },
 ];
 
 export const searchFormSchema: FormSchema[] = [
@@ -252,9 +245,9 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       options: [
-        { label: '全部', value: '-1' },
-        { label: '是', value: '1' },
-        { label: '否', value: '0' },
+        { label: '全部', value: '' },
+        { label: '是', value: '是' },
+        { label: '否', value: '否' },
       ],
     },
   },

src/views/demo/minerals/processingstatistics/index.vue

@@ -74,7 +74,7 @@
   const showInfoOpen = ref(false);
   const searchParams = ref({
     page: 1,
-    limit: 10,
+    limit: 15,
   });
   const areaParams = ref({
     tubanArea1: null,
@@ -87,11 +87,11 @@
   const tableData = ref([]);
   const tablePaginationRight = ref({
     current: 1,
-    pageSize: 10,
+    pageSize: 15,
     size: 'small',
-    defaultPageSize: 10,
+    defaultPageSize: 15,
     showSizeChanger: true,
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['15', '50', '80', '100'],
     showQuickJumper: true,
     total: 0,
   });
@@ -190,7 +190,7 @@
   function handleReset() {
     searchParams.value = {
       page: 1,
-      limit: 10,
+      limit: 15,
     };
     areaParams.value = {
       tubanArea1: null,

src/views/demo/minerals/processingstatistics/processingstatistics.data.ts

@@ -12,6 +12,7 @@ export const columns: BasicColumn[] = [
   {
     title: '编号',
     dataIndex: 'tubannum_base',
+    width: 200,
   },
   {
     title: '线索来源',