web側も新型サーバーに最適化
This commit is contained in:
@@ -50,8 +50,8 @@ export const injectJavascriptData: InjectJavascriptData = (
|
||||
let trainDataList = [];
|
||||
const DatalistUpdate = () =>{
|
||||
try{
|
||||
fetch("https://n8n.haruk.in/webhook/jr-shikoku-position-custom-datalist").then((response) => response.json())
|
||||
.then((data) => data[0].data)
|
||||
fetch("https://jr-shikoku-backend-api-v1.haruk.in/train-data").then((response) => response.json())
|
||||
.then((data) => data.data)
|
||||
.then((data) => {
|
||||
if(!_.isEqual(data, trainDataList)) {
|
||||
trainDataList = data;
|
||||
@@ -788,9 +788,8 @@ export const injectJavascriptData: InjectJavascriptData = (
|
||||
}
|
||||
}
|
||||
getThrew(列番データ);
|
||||
if(trainDataList.find(e => e.id === 列番データ) !== undefined){
|
||||
const data = trainDataList.find(e => e.id === 列番データ);
|
||||
//{id,trainName,viaData,ToData,TrainNumber,TrainNumberOverride,type,infoUrl,trainNumDistance,info,infogram,isEdit}
|
||||
if(trainDataList.find(e => e.train_id === 列番データ) !== undefined){
|
||||
const data = trainDataList.find(e => e.train_id === 列番データ);
|
||||
|
||||
switch(data.type){
|
||||
case "Normal":
|
||||
@@ -872,25 +871,25 @@ export const injectJavascriptData: InjectJavascriptData = (
|
||||
default:
|
||||
break;
|
||||
}
|
||||
isEdit = data.isEdit;
|
||||
isSeason = data.isSeason;
|
||||
if(data.trainName != ""){
|
||||
trainName = data.trainName;
|
||||
if(data.trainNumDistance != null){
|
||||
trainName += parseInt(列番データ.replace("M", "").replace("D", "")) - data.trainNumDistance+"号";
|
||||
isEdit = data.priority == 400;
|
||||
isSeason = data.priority == 300;
|
||||
if(data.train_name != ""){
|
||||
trainName = data.train_name;
|
||||
if(data.train_num_distance != ""){
|
||||
trainName += (parseInt(列番データ.replace("M", "").replace("D", "")) - parseInt(data.train_num_distance))+"号";
|
||||
}
|
||||
}
|
||||
if(data.viaData != ""){
|
||||
viaData = data.viaData;
|
||||
if(data.via_data != ""){
|
||||
viaData = data.via_data;
|
||||
}
|
||||
if(data.ToData != ""){
|
||||
ToData = data.ToData;
|
||||
if(data.to_data != ""){
|
||||
ToData = data.to_data;
|
||||
}
|
||||
if(data.TrainNumberOverride){
|
||||
TrainNumberOverride = data.TrainNumberOverride;
|
||||
if(data.train_number_override){
|
||||
TrainNumberOverride = data.train_number_override;
|
||||
}
|
||||
if(data.optionalText){
|
||||
optionalText = data.optionalText;
|
||||
if(data.optional_text){
|
||||
optionalText = data.optional_text;
|
||||
}
|
||||
}
|
||||
//列番付与
|
||||
@@ -956,8 +955,8 @@ export const injectJavascriptData: InjectJavascriptData = (
|
||||
|
||||
const setNewTrainItem = (element,hasProblem,type)=>{
|
||||
var 列番データ = element.getAttribute('offclick').split('"')[1];
|
||||
if(trainDataList.find(e => e.id === 列番データ) !== undefined){
|
||||
const data = trainDataList.find(e => e.id === 列番データ);
|
||||
if(trainDataList.find(e => e.train_id === 列番データ) !== undefined){
|
||||
const data = trainDataList.find(e => e.train_id === 列番データ);
|
||||
switch (data.type) {
|
||||
case "Normal":
|
||||
element.style.borderColor = "black";
|
||||
@@ -1183,8 +1182,8 @@ const setStrings = () =>{
|
||||
setTrainMenuDialog(element)
|
||||
|
||||
${iconSetting == "true" ? `
|
||||
if(trainDataList.find(e => e.id === 列番データ) !== undefined){
|
||||
const trainIconUrl = trainDataList.find(e => e.id === 列番データ).img;
|
||||
if(trainDataList.find(e => e.train_id === 列番データ) !== undefined){
|
||||
const trainIconUrl = trainDataList.find(e => e.train_id === 列番データ).train_info_img;
|
||||
if(!!trainIconUrl){
|
||||
setStationIcon(element.querySelector("img"),trainIconUrl,hasProblem);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user