ordo
/
surveyor_indonesia_frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update conflict

pull/2/head
bnu 2 years ago
parent
616808369e
commit
f0fea72556
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/SimproV2/Gantt/index.js

4
src/views/SimproV2/Gantt/index.js
Unescape View File

@ -1,7 +1,7 @@
import React, { useEffect, useMemo, useState } from 'react'; import React, { useEffect, useMemo, useState } from 'react';
import Timeline from 'react-calendar-timeline' import Timeline from 'react-calendar-timeline'
import 'react-calendar-timeline/lib/Timeline.css' import 'react-calendar-timeline/lib/Timeline.css'
import { USER_VERSION_GANTT_SEARCH, BASE_SIMPRO_LUMEN } from '../../../const/ApiConst'; import { USER_VERSION_GANTT_SEARCH, BASE_SIMPRO_LUMEN, BASE_URL_GANTT } from '../../../const/ApiConst';
import axios from "../../../const/interceptorApi" import axios from "../../../const/interceptorApi"
const token = localStorage.getItem("token") const token = localStorage.getItem("token")
@ -77,7 +77,7 @@ const Gantt = (props) => {
const RenderGantt = () => ( const RenderGantt = () => (
<iframe <iframe
id="frame-gantt" id="frame-gantt"
src={`https://ospro-gantt.ospro.id/src/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${localStorage.getItem('token')}&ro=${ro}`} src={`https://${BASE_URL_GANTT}?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${localStorage.getItem('token')}&ro=${ro}`}
style={{ style={{
width: '100%', width: '100%',
height: '75vh', height: '75vh',

Write Preview
Loading…
Cancel
Save