popovspiridon99/universal_is
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added TCBParameter tables; MapToolbar: add edit, remove test;

Browse Source
This commit is contained in:
cracklesparkle
2024-12-19 17:40:11 +09:00
parent b54c2f0e20
commit b1df6ca398
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/components/map/MapToolbar/MapToolbar.tsx
View File

@ -1,5 +1,5 @@
import { ActionIcon, useMantineColorScheme } from '@mantine/core' import { ActionIcon, useMantineColorScheme } from '@mantine/core'
import { IconApi, IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler } from '@tabler/icons-react' import { IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler, IconTransformPoint } from '@tabler/icons-react'
import { setCurrentTool, useMapStore } from '../../../store/map'; import { setCurrentTool, useMapStore } from '../../../store/map';
interface IToolbarProps { interface IToolbarProps {
@ -16,12 +16,6 @@ const MapToolbar = ({
return ( return (
<ActionIcon.Group orientation='vertical' pos='absolute' top='8px' right='8px' style={{ zIndex: 1, backdropFilter: 'blur(8px)', backgroundColor: colorScheme === 'light' ? '#FFFFFFAA' : '#000000AA', borderRadius: '4px' }}> <ActionIcon.Group orientation='vertical' pos='absolute' top='8px' right='8px' style={{ zIndex: 1, backdropFilter: 'blur(8px)', backgroundColor: colorScheme === 'light' ? '#FFFFFFAA' : '#000000AA', borderRadius: '4px' }}>
<ActionIcon size='lg' variant='transparent' onClick={() => {
fetch(`${import.meta.env.VITE_API_EMS_URL}/hello`, { method: 'GET' }).then(res => console.log(res))
}}>
<IconApi />
</ActionIcon>
<ActionIcon size='lg' variant='transparent' onClick={onSave}> <ActionIcon size='lg' variant='transparent' onClick={onSave}>
<IconExclamationCircle /> <IconExclamationCircle />
</ActionIcon> </ActionIcon>
@ -30,6 +24,15 @@ const MapToolbar = ({
<IconArrowBackUp /> <IconArrowBackUp />
</ActionIcon> </ActionIcon>
<ActionIcon
size='lg'
variant={mapState.currentTool === 'Edit' ? 'filled' : 'transparent'}
onClick={() => {
setCurrentTool('Edit')
}}>
<IconTransformPoint />
</ActionIcon>
<ActionIcon <ActionIcon
size='lg' size='lg'
variant={mapState.currentTool === 'Point' ? 'filled' : 'transparent'} variant={mapState.currentTool === 'Point' ? 'filled' : 'transparent'}

34
client/src/components/map/TCBParameter.tsx
View File

@ -5,10 +5,10 @@ import { Text } from '@mantine/core'
import TableValue from './TableValue' import TableValue from './TableValue'
interface ITCBParameterProps { interface ITCBParameterProps {
value: string, value: string;
vtable: string, vtable: string;
inactive?: boolean, inactive?: boolean;
name: string name: string;
} }
const TCBParameter = ({ const TCBParameter = ({
@ -28,26 +28,52 @@ const TCBParameter = ({
) )
const tables = [ const tables = [
'PipesTypes',
'vAddRepairEvent',
'vBoilers', 'vBoilers',
'vBoilersAppointment',
'vBoilersBalance',
'vBoilersCondition',
'vBoilersFuels',
'vBoilersHotWater',
'vBoilersPerimeter',
'vBoilersPeriods',
'vBoilersScheme',
'vBoilersState',
'vBoilersTypes',
'vBuildingManagement',
'vBuildingOwner',
'vCanalization', 'vCanalization',
'vColdWaterTypes', 'vColdWaterTypes',
'vConditionEquipment',
'vCovering', 'vCovering',
'vDryer',
'vElectroSupplyTypes', 'vElectroSupplyTypes',
'vEquipmentsTypes',
'vFoundation', 'vFoundation',
'vFuelsFeed',
'vGasSupplyTypes', 'vGasSupplyTypes',
'vHeatingTypes', 'vHeatingTypes',
'vHeatTransfer',
'vHotWaterTypes', 'vHotWaterTypes',
'vMaterialsWall', 'vMaterialsWall',
'vNormative',
'vPipeDiameters', 'vPipeDiameters',
'vPipeOutDiameters', 'vPipeOutDiameters',
'vPipesBearingType',
'vPipesCovering',
'vPipesGround', 'vPipesGround',
'vPipesIsolation', 'vPipesIsolation',
'vPipesLayer', 'vPipesLayer',
'vPipesMaterial', 'vPipesMaterial',
'vRepairEvent', 'vRepairEvent',
'vRoof', 'vRoof',
'vRPSType',
'vStreets', 'vStreets',
'vTechStatus', 'vTechStatus',
'vTrash',
'vVentilation',
'vWallingEquipment',
'tTypes', 'tTypes',
] ]