diff --git a/src/utils/global.ts b/src/utils/global.ts index e647262f..c0a5ef84 100644 --- a/src/utils/global.ts +++ b/src/utils/global.ts @@ -47,6 +47,14 @@ export const measureOptions = [ { label: '拆除复耕', value: 0 }, { label: '补办手续', value: 1 }, ]; +export const keyIssuesIMeasureOptions = [ + { label: '拆除', value: 1 }, + { label: '拆除复耕', value: 2 }, +] +export const keyIssuesIIMeasureOptions = [ + { label: '拆除', value: 1 }, + { label: '没收', value: 2 }, +] export const mapStatusOptions = [ { label: '待接收', value: '待接收' }, { label: '待填报', value: '待填报' }, diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue index a31f15b5..568cdc10 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue @@ -256,7 +256,7 @@ --> - + @@ -300,7 +300,7 @@ import { mapTypeOptions, illegalTypeOptions, - measureOptions, + keyIssuesIMeasureOptions, mapStatusOptions, markTypeOptions, illegalTypeList, @@ -554,7 +554,7 @@ result = illegalTypeList; break; case 'measure_name': - result = measureOptions; + result = keyIssuesIMeasureOptions; break; case 'result_name': result = resultOptions; diff --git a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts index 4f5c5251..5711c97f 100644 --- a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts +++ b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts @@ -82,10 +82,10 @@ export const columns: BasicColumn[] = [ title: '实际用途', dataIndex: 'actualuseto', }, - { - title: '违法类型', - dataIndex: 'weifaleixing', - }, + // { + // title: '违法类型', + // dataIndex: 'weifaleixing', + // }, { title: '整改措施', dataIndex: 'measurename', diff --git a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/ShowInfoModal/index.vue index 9cc46868..e5403457 100644 --- a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/ShowInfoModal/index.vue @@ -241,7 +241,7 @@ --> - + @@ -283,9 +283,9 @@ const { VITE_GLOB_INFO_IMAGE_URL } = getAppEnvConfig(); import { - mapTypeOptions, + keyIssuesIIMapTypeOptions, illegalTypeOptions, - measureOptions, + keyIssuesIIMeasureOptions, mapStatusOptions, markTypeOptions, illegalTypeList, @@ -537,16 +537,13 @@ let label = ''; switch (type) { case 'is_illegal': - result = mapTypeOptions; + result = keyIssuesIIMapTypeOptions; break; case 'weifaleixing': result = illegalTypeList; break; case 'measure_name': - result = [ - { label: '拆除', value: '1'}, - { label: '没收', value: '2'}, - ] + result = keyIssuesIIMeasureOptions break; case 'result_name': result = resultOptions; diff --git a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts index fea6a948..c85e9ece 100644 --- a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts +++ b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts @@ -82,10 +82,10 @@ export const columns: BasicColumn[] = [ title: '实际用途', dataIndex: 'actualuseto', }, - { - title: '违法类型', - dataIndex: 'weifaleixing', - }, + // { + // title: '违法类型', + // dataIndex: 'weifaleixing', + // }, { title: '整改措施', dataIndex: 'measurename',