HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

dianlixunjian
刘妍 2024-09-12 13:50:11 +08:00
parent 5b0b51b199 d8249be273
commit 30fdd3e0f7
10 changed files with 197 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/global.ts
View File

@ -33,6 +33,12 @@ export const mapTypeOptions = [
{ label: '违法', value: 1 },
{ label: '其他', value: 2 },
];
export const keyIssuesIIMapTypeOptions = [
{ label: '合法', value: 0 },
{ label: '违法', value: 1 },
{ label: '其他', value: 2 },
{ label: '自建自用', value: 3 },
];
export const illegalTypeOptions = [
{ label: '非农化', value: 0 },
{ label: '非粮化', value: 1 },
@ -48,6 +54,12 @@ export const mapStatusOptions = [
{ label: '市级驳回', value: '市级驳回' },
{ label: '县级驳回', value: '县级驳回' },
];
export const keyProblemMapStatusOptions = [
{ label: '待接收', value: '待接收' },
{ label: '待填报', value: '待填报' },
{ label: '市级驳回', value: '市级驳回' },
{ label: '县级驳回', value: '县级驳回' },
];
export const auditMapStatusOptions = [
{ label: '市级驳回', value: '市级驳回' },
{ label: '县级驳回', value: '县级驳回' },

31
src/views/demo/degraining/patchsummary/patchsummary.data.ts
View File

@ -1,5 +1,6 @@
import { BasicColumn, FormSchema } from '@/components/Table';
import { getChildrenTree } from '@/api/demo/system';
import { getLoad } from '@/api/sys/sysDataItemDetail';
import {
patchSourceOptions,
yearOptions,
@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'tubanlaiyuan',
label: '图斑来源',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: patchSourceOptions,
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'gdflhtbly' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -122,14 +130,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'typename',
label: '图斑类型',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '农用地', value: '农用地' },
{ label: '建设用地', value: '建设用地' },
{ label: '推堆土', value: '推堆土' },
],
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'gdflhtblx' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{

35
src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts
View File

@ -1,5 +1,6 @@
import { BasicColumn, FormSchema } from '@/components/Table';
import { getChildrenTree } from '@/api/demo/system';
import { getLoad } from '@/api/sys/sysDataItemDetail';
import {
patchSourceOptions,
yearOptions,
@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'tubanlaiyuan',
label: '图斑来源',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: patchSourceOptions,
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'xcsjtbly' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -122,14 +130,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'typename',
label: '图斑类型',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '农用地', value: '农用地' },
{ label: '建设用地', value: '建设用地' },
{ label: '推堆土', value: '推堆土' },
],
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'xcsjtblx' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -243,7 +254,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'originalcaseno',
label: '标识号',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 3 },
},
{
field: '[startTime, endTime]',
@ -259,6 +270,6 @@ export const searchFormSchema: FormSchema[] = [
field: 'caseNo',
label: '图斑编号',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 5 },
},
];

4
src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue
View File

@ -130,7 +130,7 @@
v-model:value="props.infoScreenData.mapStatus"
@change="(value) => emits('mapListScreenChange',value,'mapStatus')"
style="width: 100%"
:options="mapStatusOptions"></a-checkbox-group>
:options="keyProblemMapStatusOptions"></a-checkbox-group>
</div>
</div>
<!-- <div style="display:flex;">
@ -298,7 +298,7 @@ import {
mapTypeOptions,
illegalTypeOptions,
measureOptions,
mapStatusOptions,
keyProblemMapStatusOptions,
markTypeOptions,
patchSourceOptions,
isOverdueOptions,

4
src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue
View File

@ -13,7 +13,7 @@
showArrow
mode="multiple"
v-model:value="nowStatus"
:options="nowStatusOptions"
:options="keyProblemMapStatusOptions"
:max-tag-count="1"
placeholder="请选择"
@change="changeStatus"
@ -108,7 +108,7 @@
import { BasicForm, useForm } from '@/components/Form';
import { PageWrapper } from '@/components/Page';
import dayjs from 'dayjs';
import { nowStatusOptions } from '@/utils/global';
import { keyProblemMapStatusOptions } from '@/utils/global';
import { message } from 'ant-design-vue';
const { VITE_GLOB_API_URL } = getAppEnvConfig();

122
src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
View File

@ -1,10 +1,11 @@
import { BasicColumn, FormSchema } from '@/components/Table';
import { getChildrenTree } from '@/api/demo/system';
import { getLoad } from '@/api/sys/sysDataItemDetail';
import {
patchSourceOptions,
yearOptions,
markTypeOptions,
nowStatusOptions,
keyProblemMapStatusOptions,
mapTypeOptions,
} from '@/utils/global';
@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'tubanlaiyuan',
label: '图斑来源',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: patchSourceOptions,
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'zd1tbly' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -119,27 +127,21 @@ export const searchFormSchema: FormSchema[] = [
options: [],
},
},
{
field: '[startTime, endTime]',
label: '下发时间',
component: 'RangePicker',
colProps: { span: 8 },
componentProps: {
format: 'YYYY-MM-DD',
placeholder: ['开始日期', '结束日期'],
},
},
{
field: 'typename',
label: '图斑类型',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '农用地', value: '农用地' },
{ label: '建设用地', value: '建设用地' },
{ label: '推堆土', value: '推堆土' },
],
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'zd1tblx' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -166,7 +168,6 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
onChange: () => {
formModel.streetid = '';
formModel.communityid = '';
},
};
},
@ -184,34 +185,31 @@ export const searchFormSchema: FormSchema[] = [
resultField: 'result',
labelField: 'name',
valueField: 'id',
onChange: () => {
formModel.communityid = '';
},
};
},
},
{
field: 'communityid',
label: '村',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: formModel.countyid && formModel.streetid && getChildrenTree,
params: { parentId: formModel.streetid },
// 接口参数
resultField: 'result',
labelField: 'name',
valueField: 'id',
};
},
},
// {
// field: 'communityid',
// label: '村',
// component: 'ApiSelect',
// colProps: { span: 4 },
// componentProps: ({ formModel }) => {
// return {
// api: formModel.countyid && formModel.streetid && getChildrenTree,
// params: { parentId: formModel.streetid },
// // 接口参数
// resultField: 'result',
// labelField: 'name',
// valueField: 'id',
// };
// },
// },
{
field: 'nowStatus',
label: '当前状态',
component: 'Select',
componentProps: {
options: nowStatusOptions,
options: keyProblemMapStatusOptions,
},
colProps: { span: 4 },
slot: 'dangqianzhuangtai',
@ -225,18 +223,18 @@ export const searchFormSchema: FormSchema[] = [
options: mapTypeOptions,
},
},
{
field: 'weifaleixing',
label: '违法类型',
component: 'Select',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '非农化违法用地', value: '0' },
{ label: '非粮化违法用地', value: '1' },
],
},
},
// {
// field: 'weifaleixing',
// label: '违法类型',
// component: 'Select',
// colProps: { span: 4 },
// componentProps: {
// options: [
// { label: '非农化违法用地', value: '0' },
// { label: '非粮化违法用地', value: '1' },
// ],
// },
// },
{
field: 'measureName',
label: '整改措施',
@ -244,8 +242,8 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
componentProps: {
options: [
{ label: '拆除复耕', value: '0' },
{ label: '补办手续', value: '1' },
{ label: '拆除', value: '1' },
{ label: '拆除复耕', value: '2' },
],
},
},
@ -275,10 +273,20 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
colProps: { span: 4 },
},
{
field: '[startTime, endTime]',
label: '下发时间',
component: 'RangePicker',
colProps: { span: 5 },
componentProps: {
format: 'YYYY-MM-DD',
placeholder: ['开始日期', '结束日期'],
},
},
{
field: 'caseNo',
label: '图斑编号',
component: 'Input',
colProps: { span: 20 },
colProps: { span: 6 },
},
];

4
src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/index.vue
View File

@ -130,7 +130,7 @@
v-model:value="props.infoScreenData.mapStatus"
@change="(value) => emits('mapListScreenChange',value,'mapStatus')"
style="width: 100%"
:options="mapStatusOptions"></a-checkbox-group>
:options="keyProblemMapStatusOptions"></a-checkbox-group>
</div>
</div>
<!-- <div style="display:flex;">
@ -298,7 +298,7 @@ import {
mapTypeOptions,
illegalTypeOptions,
measureOptions,
mapStatusOptions,
keyProblemMapStatusOptions,
markTypeOptions,
patchSourceOptions,
isOverdueOptions,

4
src/views/demo/keyproblem/keyissuesII/patchsummary/index.vue
View File

@ -13,7 +13,7 @@
showArrow
mode="multiple"
v-model:value="nowStatus"
:options="nowStatusOptions"
:options="keyProblemMapStatusOptions"
:max-tag-count="1"
placeholder="请选择"
@change="changeStatus"
@ -108,7 +108,7 @@
import { BasicForm, useForm } from '@/components/Form';
import { PageWrapper } from '@/components/Page';
import dayjs from 'dayjs';
import { nowStatusOptions } from '@/utils/global';
import { keyProblemMapStatusOptions } from '@/utils/global';
import { message } from 'ant-design-vue';
const { VITE_GLOB_API_URL } = getAppEnvConfig();

126
src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
View File

@ -1,11 +1,12 @@
import { BasicColumn, FormSchema } from '@/components/Table';
import { getChildrenTree } from '@/api/demo/system';
import { getLoad } from '@/api/sys/sysDataItemDetail';
import {
patchSourceOptions,
yearOptions,
markTypeOptions,
nowStatusOptions,
mapTypeOptions,
keyProblemMapStatusOptions,
keyIssuesIIMapTypeOptions,
} from '@/utils/global';
export const columns: BasicColumn[] = [
@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'tubanlaiyuan',
label: '图斑来源',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: patchSourceOptions,
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'zd2tbly' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -119,27 +127,21 @@ export const searchFormSchema: FormSchema[] = [
options: [],
},
},
{
field: '[startTime, endTime]',
label: '下发时间',
component: 'RangePicker',
colProps: { span: 8 },
componentProps: {
format: 'YYYY-MM-DD',
placeholder: ['开始日期', '结束日期'],
},
},
{
field: 'typename',
label: '图斑类型',
component: 'Select',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '农用地', value: '农用地' },
{ label: '建设用地', value: '建设用地' },
{ label: '推堆土', value: '推堆土' },
],
componentProps: ({ formModel }) => {
return {
api: getLoad,
params: { code: 'zd2tblx' },
// 接口参数
resultField: 'result',
labelField: 'itemName',
valueField: 'itemValue',
};
},
},
{
@ -166,7 +168,6 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
onChange: () => {
formModel.streetid = '';
formModel.communityid = '';
},
};
},
@ -184,34 +185,31 @@ export const searchFormSchema: FormSchema[] = [
resultField: 'result',
labelField: 'name',
valueField: 'id',
onChange: () => {
formModel.communityid = '';
},
};
},
},
{
field: 'communityid',
label: '村',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: formModel.countyid && formModel.streetid && getChildrenTree,
params: { parentId: formModel.streetid },
// 接口参数
resultField: 'result',
labelField: 'name',
valueField: 'id',
};
},
},
// {
// field: 'communityid',
// label: '村',
// component: 'ApiSelect',
// colProps: { span: 4 },
// componentProps: ({ formModel }) => {
// return {
// api: formModel.countyid && formModel.streetid && getChildrenTree,
// params: { parentId: formModel.streetid },
// // 接口参数
// resultField: 'result',
// labelField: 'name',
// valueField: 'id',
// };
// },
// },
{
field: 'nowStatus',
label: '当前状态',
component: 'Select',
componentProps: {
options: nowStatusOptions,
options: [],
},
colProps: { span: 4 },
slot: 'dangqianzhuangtai',
@ -222,21 +220,21 @@ export const searchFormSchema: FormSchema[] = [
component: 'Select',
colProps: { span: 4 },
componentProps: {
options: mapTypeOptions,
},
},
{
field: 'weifaleixing',
label: '违法类型',
component: 'Select',
colProps: { span: 4 },
componentProps: {
options: [
{ label: '非农化违法用地', value: '0' },
{ label: '非粮化违法用地', value: '1' },
],
options: keyIssuesIIMapTypeOptions,
},
},
// {
// field: 'weifaleixing',
// label: '违法类型',
// component: 'Select',
// colProps: { span: 4 },
// componentProps: {
// options: [
// { label: '非农化违法用地', value: '0' },
// { label: '非粮化违法用地', value: '1' },
// ],
// },
// },
{
field: 'measureName',
label: '整改措施',
@ -244,8 +242,8 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
componentProps: {
options: [
{ label: '拆除复耕', value: '0' },
{ label: '补办手续', value: '1' },
{ label: '拆除', value: '1' },
{ label: '没收', value: '2' },
],
},
},
@ -275,10 +273,20 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
colProps: { span: 4 },
},
{
field: '[startTime, endTime]',
label: '下发时间',
component: 'RangePicker',
colProps: { span: 5 },
componentProps: {
format: 'YYYY-MM-DD',
placeholder: ['开始日期', '结束日期'],
},
},
{
field: 'caseNo',
label: '图斑编号',
component: 'Input',
colProps: { span: 20 },
colProps: { span: 6 },
},
];

1
src/views/demo/workflow/task/index.vue
View File

@ -5,6 +5,7 @@
:tabBarStyle="tabBarStyle"
v-model:activeKey="componentCode"
@change="changeKey"
:destroyInactiveTabPane="true"
>
<template v-for="item in settingList" :key="item.key">
<TabPane :tab="item.name">