diff --git a/src/api/earlywarning/index.ts b/src/api/earlywarning/index.ts
index b7efdf7..19a9917 100644
--- a/src/api/earlywarning/index.ts
+++ b/src/api/earlywarning/index.ts
@@ -3,7 +3,9 @@ enum Api {
TimeoutWarning = '/api/DroneSsny/TimeoutWarning',
TimeOutAlarmList = '/api/DroneSsny/TimeOutAlarmList',
TimeoutWarningExport = '/api/DroneSsny/TimeoutWarningExport',
- TimeoutAlarmExport = '/api/DroneSsny/TimeoutAlarmExport'
+ TimeoutAlarmExport = '/api/DroneSsny/TimeoutAlarmExport',
+ HistoryProject = '/api/DroneSsny/HistoryProject',
+ HistoryProjectExport = '/api/DroneSsny/HistoryProjectExport',
}
export function TimeoutWarning(params) {
@@ -27,4 +29,14 @@ export function TimeoutAlarmExport(params) {
params,
responseType: 'blob',
});
+}
+export function HistoryProject(params) {
+ return defHttp.get({ url: Api.HistoryProject, params });
+}
+export function HistoryProjectExport(params) {
+ return defHttp.get({
+ url: Api.HistoryProjectExport,
+ params,
+ responseType: 'blob',
+ });
}
\ No newline at end of file
diff --git a/src/components/FormViewer/cardGourp.vue b/src/components/FormViewer/cardGourp.vue
index 015f3b5..5248ccb 100644
--- a/src/components/FormViewer/cardGourp.vue
+++ b/src/components/FormViewer/cardGourp.vue
@@ -248,7 +248,7 @@
let result = {};
Object.keys(data).forEach((key) => {
if (key.indexOf('_select') !== -1 || key.indexOf('_upload') !== -1 || key.indexOf('_date_picker') !== -1) {
- if(oldDefaultGroupData[key] != data[key]){
+ if(oldDefaultGroupData[key] != data[key] && data[key]){
result[key] = data[key];
}
}
diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index b4dc145..3956c3a 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -3,7 +3,7 @@
-
+
();
const cardGroupData = ref([]);
const cardGourpFormData = ref({});
+ const tabsFormRefs = ref([])
subTableDataStore.clearGoupData();
const nowTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
const userName = localStorage.getItem('fireUserLoginName');
@@ -483,79 +484,21 @@
}
let resultObj = {};
let values;
- switch (activeTabsKey.value) {
- case 0:
- resultObj = proxy.$refs.tabsFormRef0[0].getFieldsValue();
- proxy.$refs.tabsFormRef0[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef0[0].validate();
- values = proxy.$refs.tabsFormRef0[0].getFieldsValue();
- break;
- case 1:
- resultObj = proxy.$refs.tabsFormRef1[0].getFieldsValue();
- proxy.$refs.tabsFormRef1[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef1[0].validate();
- values = proxy.$refs.tabsFormRef1[0].getFieldsValue();
- console.log('resultValue111', JSON.parse(JSON.stringify(values)));
- break;
- case 2:
- resultObj = proxy.$refs.tabsFormRef2[0].getFieldsValue();
- proxy.$refs.tabsFormRef2[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef2[0].validate();
- values = proxy.$refs.tabsFormRef2[0].getFieldsValue();
- break;
- case 3:
- resultObj = proxy.$refs.tabsFormRef3[0].getFieldsValue();
- proxy.$refs.tabsFormRef3[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef3[0].validate();
- values = proxy.$refs.tabsFormRef3[0].getFieldsValue();
- break;
- case 4:
- resultObj = proxy.$refs.tabsFormRef4[0].getFieldsValue();
- proxy.$refs.tabsFormRef4[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef4[0].validate();
- values = proxy.$refs.tabsFormRef4[0].getFieldsValue();
- break;
- case 5:
- resultObj = proxy.$refs.tabsFormRef5[0].getFieldsValue();
- proxy.$refs.tabsFormRef5[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef5[0].validate();
- values = proxy.$refs.tabsFormRef5[0].getFieldsValue();
- break;
- case 6:
- resultObj = proxy.$refs.tabsFormRef6[0].getFieldsValue();
- proxy.$refs.tabsFormRef6[0].setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- await proxy.$refs.tabsFormRef6[0].validate();
- values = proxy.$refs.tabsFormRef6[0].getFieldsValue();
- break;
- default:
- resultObj = getFieldsValue();
- setFieldsValue({
- ...resultObj,
- ...subTableDataStore.getGroupData,
- });
- values = await validate();
- break;
+ if(tabsColumns.length > 1){
+ resultObj = tabsFormRefs[activeTabsKey.value].getFieldsValue();
+ tabsFormRefs[activeTabsKey.value].setFieldsValue({
+ ...resultObj,
+ ...subTableDataStore.getGroupData,
+ });
+ await tabsFormRefs[activeTabsKey.value].validate();
+ values = tabsFormRefs[activeTabsKey.value].getFieldsValue();
+ }else{
+ resultObj = getFieldsValue();
+ setFieldsValue({
+ ...resultObj,
+ ...subTableDataStore.getGroupData,
+ });
+ values = await validate();
}
for (const key in values) {
for (const fieKey in FieldsValue.value) {
diff --git a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
index 06477b5..efa4fcc 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
@@ -25,6 +25,13 @@
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
diff --git a/src/views/demo/historyproject/utils.ts b/src/views/demo/historyproject/utils.ts
new file mode 100644
index 0000000..b3653b4
--- /dev/null
+++ b/src/views/demo/historyproject/utils.ts
@@ -0,0 +1,76 @@
+import { BasicColumn, FormSchema } from '@/components/Table';
+import { getChildrenTree } from '@/api/demo/system';
+
+export const columns: BasicColumn[] = [
+ {
+ title: '项目编号',
+ dataIndex: 'xiangmu_no',
+ },
+ {
+ title: '项目名称',
+ dataIndex: 'xiangmu_name',
+ width: 200,
+ },
+ {
+ title: '行政区划',
+ dataIndex: 'xingzhengquhua',
+ },
+ {
+ title: '备案编号',
+ dataIndex: 'beian_no',
+ },
+ {
+ title: '项目开始时间',
+ dataIndex: 'start_time',
+ width: 200,
+ },
+ {
+ title: '项目结束时间',
+ dataIndex: 'end_time',
+ },
+ {
+ title: '项目当前用途',
+ dataIndex: 'xiangmu_yt',
+ width: 110,
+ },
+ {
+ title: '设施农业申请用地面积(公顷)',
+ dataIndex: 'shenqing_area',
+ width: 200,
+ },
+ {
+ title: '生产设施用地(公顷)',
+ dataIndex: 'shengchan_area',
+ width: 200,
+ },
+ {
+ title: '辅助设施用地(公顷)',
+ dataIndex: 'fuzhu_area',
+ width: 200,
+ },
+];
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ field: 'xiangmumc',
+ component: 'Input',
+ colProps: { span: 5 },
+ label: '项目名称',
+ },
+ {
+ field: 'streetid',
+ label: '乡镇',
+ component: 'ApiSelect',
+ colProps: { span: 4 },
+ componentProps: ({ formModel }) => {
+ return {
+ api: getChildrenTree,
+ params: { parentId: 371324 },
+ // 接口参数
+ resultField: 'result',
+ labelField: 'name',
+ valueField: 'id',
+ };
+ },
+ },
+];