ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена ошибка перехода с сообщений на мониторинг

Browse Source
This commit is contained in:
goodmice 2022-12-28 11:37:04 +05:00
parent 3b0182216e
commit 4b0adeeb7b
No known key found for this signature in database
GPG Key ID: EA4AA16454AC96C8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -40,7 +40,7 @@ npx openapi -i http://{IP_ADDRESS}:{PORT}/swagger/v1/swagger.json -o src/service
|:-------------------------|:--------|:------------------------------------|
| 127.0.0.1:5000 | oul | Локальный адрес вашей машины |
| 192.168.1.113:5000 | oud | Локальный адрес development-сервера |
| 46.146.207.184:89 | oug_dev | Внешний адрес development-сервера |
| 46.146.207.184:80 | oug_dev | Внешний адрес development-сервера |
| cloud.digitaldrilling.ru | oug | Внешний адрес production-сервера |
## 3. Компиляция production-версии приложения

6
package.json
View File

@ -24,11 +24,11 @@
"dev": "webpack-dev-server --env=\"ENV=dev\" --open --hot",
"oul": "npx openapi -i http://127.0.0.1:5000/swagger/v1/swagger.json -o src/services/api",
"oud": "npx openapi -i http://192.168.1.113:5000/swagger/v1/swagger.json -o src/services/api",
"oud": "npx openapi -i http://192.168.1.10:5000/swagger/v1/swagger.json -o src/services/api",
"oug": "npx openapi -i https://cloud.digitaldrilling.ru/swagger/v1/swagger.json -o src/services/api",
"oug_dev": "npx openapi -i http://46.146.207.184:89/swagger/v1/swagger.json -o src/services/api"
"oug_dev": "npx openapi -i http://46.146.207.184/swagger/v1/swagger.json -o src/services/api"
},
"proxy": "http://46.146.207.184:89",
"proxy": "http://46.146.207.184",
"eslintConfig": {
"extends": [
"react-app",

2
src/pages/Well/Telemetry/Messages.jsx
View File

@ -33,7 +33,7 @@ export const makeMessageColumns = (idWell) => [
<Tooltip title={'Нажмите для перехода в архив'}>
<Link
style={{ color: 'inherit'}}
to={`/well/${idWell}/telemetry/monitoring?range=1800&start=${moment(item?.date).subtract(3, 'minute').local().toISOString()}`}
to={`/well/${idWell}/telemetry/monitoring?range=1800&end=${moment(item?.date).add(27, 'minute').local().toISOString()}`}
>
<LinkOutlined />
&nbsp;

1
src/pages/Well/Telemetry/TelemetryView/LimitingParameterStatistics/index.jsx
View File

@ -108,7 +108,6 @@ export const LimitingParameterStatistics = memo(() => {
const radius = useMemo(() => Math.min(width, height) / 2, [width, height])
useEffect(() => console.log(radius), [radius])
useEffect(update, [])
useEffect(() => {

5
src/pages/Well/index.jsx
View File

@ -95,10 +95,11 @@ const Well = memo(() => {
<Route path={'*'} element={<NoAccessComponent />} />
<Route path={'telemetry/*'} element={<Telemetry />}>
<Route index element={<Navigate to={'telemetry'} replace />} />
<Route index element={<Navigate to={'monitoring'} replace />} />
<Route path={'*'} element={<NoAccessComponent />} />
<Route path={'telemetry'} element={<Navigate to={'../monitoring'} replace />} /> {/* TODO: Remove in next release */}
<Route path={'telemetry'} element={<TelemetryView />} />
<Route path={'monitoring'} element={<TelemetryView />} />
<Route path={'messages'} element={<Messages />} />
<Route path={'dashboard_nnb/*'} element={<DashboardNNB />} />
<Route path={'operations'} element={<Operations />} />