diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb index ce5a56c0d..2ba86ed90 100644 --- a/app/models/laboratory.rb +++ b/app/models/laboratory.rb @@ -50,7 +50,7 @@ class Laboratory < ApplicationRecord if main_site? not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{Laboratory.current.id}") Shixun.where.not(id: not_shixun_ids.pluck(:shixun_id)) - elsif sync_subject + elsif sync_shixun laboratory_shixun_ids = laboratory_shixuns.pluck(:shixun_id) school_shixun_ids = Shixun.joins("join user_extensions on shixuns.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id) shixun_ids = laboratory_shixun_ids + school_shixun_ids diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index b2cba2aca..73c882ab5 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -20,6 +20,7 @@ import Trialapplication from "../login/Trialapplication"; const $ = window.$; const versionNum = '0001'; +const timestamp = Date.parse(new Date()); // let _url_origin = getUrl() let _url_origin=''; if(window.location.port === "3007"){ @@ -35,14 +36,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?${timestamp}`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?${timestamp}`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?${timestamp}`)); // $('head').append($('') diff --git a/public/react/src/tpm/TPMIndexHOC.js b/public/react/src/tpm/TPMIndexHOC.js index 451344a56..9aa3d4bbc 100644 --- a/public/react/src/tpm/TPMIndexHOC.js +++ b/public/react/src/tpm/TPMIndexHOC.js @@ -20,6 +20,7 @@ import Trialapplication from "../login/Trialapplication"; const $ = window.$; const versionNum = '0001'; +const timestamp = Date.parse(new Date()); // let _url_origin = getUrl() let _url_origin=''; if(window.location.port === "3007"){ @@ -35,14 +36,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?${timestamp}`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?${timestamp}`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?${timestamp}`)); // $('head').append($('')