changed according to the third tour

This commit is contained in:
Spynder 2025-05-19 21:53:34 +03:00
parent 34423b73a3
commit 6eaa94778b
6 changed files with 19 additions and 20 deletions

View File

@ -358,11 +358,11 @@ export const LinkedItemsContents = <T extends { id: number; [key: string]: any }
: "default", : "default",
}} }}
onClick={() => { onClick={() => {
if (childResource === "article") { if (childResource === "article" && type==="edit") {
setArticleModalOpenAction(true); setArticleModalOpenAction(true);
setArticleIdAction(item.id); setArticleIdAction(item.id);
} }
if (childResource === "station") { if (childResource === "station" && type==="edit") {
setStationModalOpenAction(true); setStationModalOpenAction(true);
setStationIdAction(item.id); setStationIdAction(item.id);
setRouteIdAction(Number(parentId)); setRouteIdAction(Number(parentId));

View File

@ -19,7 +19,7 @@ export const CarrierEdit = observer(() => {
}); });
const { autocompleteProps: cityAutocompleteProps } = useAutocomplete({ const { autocompleteProps: cityAutocompleteProps } = useAutocomplete({
resource: "city", resource: `city`,
onSearch: (value) => [ onSearch: (value) => [
{ {
field: "name", field: "name",
@ -27,7 +27,7 @@ export const CarrierEdit = observer(() => {
value, value,
}, },
], ],
...META_LANGUAGE("ru") ...META_LANGUAGE(language)
}); });
const { autocompleteProps: mediaAutocompleteProps } = useAutocomplete({ const { autocompleteProps: mediaAutocompleteProps } = useAutocomplete({
@ -38,8 +38,7 @@ export const CarrierEdit = observer(() => {
operator: "contains", operator: "contains",
value, value,
}, },
], ]
...META_LANGUAGE("ru")
}); });

View File

@ -153,7 +153,7 @@ export const MediaEdit = observer(() => {
helperText={(errors as any)?.media_name?.message} helperText={(errors as any)?.media_name?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="text" type="text"
label="Название *" label="Название *"
name="media_name" name="media_name"

View File

@ -144,7 +144,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.route_number?.message} helperText={(errors as any)?.route_number?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="text" type="text"
label={"Номер маршрута"} label={"Номер маршрута"}
name="route_number" name="route_number"
@ -220,7 +220,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.path?.message} helperText={(errors as any)?.path?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="text" type="text"
label={"Координаты маршрута *"} label={"Координаты маршрута *"}
name="path" name="path"
@ -241,7 +241,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.route_sys_number?.message} helperText={(errors as any)?.route_sys_number?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Системный номер маршрута *"} label={"Системный номер маршрута *"}
name="route_sys_number" name="route_sys_number"
@ -299,7 +299,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.scale_min?.message} helperText={(errors as any)?.scale_min?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Масштаб (мин)"} label={"Масштаб (мин)"}
name="scale_min" name="scale_min"
@ -314,7 +314,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.scale_max?.message} helperText={(errors as any)?.scale_max?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Масштаб (макс)"} label={"Масштаб (макс)"}
name="scale_max" name="scale_max"
@ -329,7 +329,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.rotate?.message} helperText={(errors as any)?.rotate?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Поворот"} label={"Поворот"}
name="rotate" name="rotate"
@ -344,7 +344,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.center_latitude?.message} helperText={(errors as any)?.center_latitude?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Центр. широта"} label={"Центр. широта"}
name="center_latitude" name="center_latitude"
@ -359,7 +359,7 @@ export const RouteEdit = observer(() => {
helperText={(errors as any)?.center_longitude?.message} helperText={(errors as any)?.center_longitude?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="number" type="number"
label={"Центр. долгота"} label={"Центр. долгота"}
name="center_longitude" name="center_longitude"

View File

@ -385,15 +385,15 @@ export const SightEdit = observer(() => {
<Box component="form" sx={{ flex: 1, display: "flex", flexDirection: "column" }} autoComplete="off"> <Box component="form" sx={{ flex: 1, display: "flex", flexDirection: "column" }} autoComplete="off">
<TextField <TextField
{...register("name", { {...register("name", {
required: "Это поле является обязательным", //required: "Это поле является обязательным",
})} })}
error={!!(errors as any)?.name} error={!!(errors as any)?.name}
helperText={(errors as any)?.name?.message} helperText={(errors as any)?.name?.message}
margin="normal" margin="normal"
fullWidth fullWidth
InputLabelProps={{ shrink: true }} slotProps={{inputLabel: {shrink: true}}}
type="text" type="text"
label={"Название *"} label={"Название"}
name="name" name="name"
/> />

View File

@ -3,7 +3,7 @@ import dataProvider from "@refinedev/simple-rest";
import { TOKEN_KEY } from "@providers"; import { TOKEN_KEY } from "@providers";
import axios from "axios"; import axios from "axios";
import { languageStore } from "../store/LanguageStore"; import { languageStore } from "@stores";
export const axiosInstance = axios.create({ export const axiosInstance = axios.create({
baseURL: import.meta.env.VITE_KRBL_API, baseURL: import.meta.env.VITE_KRBL_API,
}); });
@ -17,7 +17,7 @@ axiosInstance.interceptors.request.use((config) => {
// Добавляем язык в кастомный заголовок // Добавляем язык в кастомный заголовок
config.headers["X-Language"] = languageStore.language; config.headers["X-Language"] = config.headers["Accept-Language"];
console.log("Request headers:", config.headers); console.log("Request headers:", config.headers);