Browse Source

feat:fix bugs

dev
zhaobing’ 1 year ago
parent
commit
1af527df5f
  1. 4
      api/app/lib/schedule/workOrder.js
  2. 5
      web/client/src/sections/projectGroup/containers/bigscreen.jsx

4
api/app/lib/schedule/workOrder.js

@ -3,7 +3,7 @@ const schedule = require('node-schedule');
const moment = require('moment') const moment = require('moment')
const request = require('superagent'); const request = require('superagent');
let isDev = true let isDev = false
module.exports = function (app, opts,ctx) { module.exports = function (app, opts,ctx) {
const workOrder = app.fs.scheduleInit( const workOrder = app.fs.scheduleInit(
@ -15,7 +15,7 @@ module.exports = function (app, opts,ctx) {
async()=>{ async()=>{
try{ try{
//前一次执行时间 //前一次执行时间
console.log('工单数据抽取开始') console.log('工单数据抽取开始',moment().format('YYYY-MM-DD HH:mm:ss'))
const username = "admin" const username = "admin"
const password = "fs-workflow" const password = "fs-workflow"
let lastExecutionTime = null; let lastExecutionTime = null;

5
web/client/src/sections/projectGroup/containers/bigscreen.jsx

@ -36,7 +36,6 @@ const Bigscreen = (props) => {
const [interruptData,setInterruptData]=useState([]) const [interruptData,setInterruptData]=useState([])
const [avgTmes,setAvgTimes]=useState([])// const [avgTmes,setAvgTimes]=useState([])//
// const [queryUserId, setQueryUserId] = useState('') // const [queryUserId, setQueryUserId] = useState('')
useEffect(() => { useEffect(() => {
@ -359,8 +358,8 @@ const Bigscreen = (props) => {
areaStyle: { areaStyle: {
color: '#0e9cff26', color: '#0e9cff26',
}, },
data: v.online?.map(f => [moment(f.collect_time).format('YYYY-MM-DD HH'), f.rate.toFixed(1)]) || [] data: v.online.sort((a,b)=>new Date(b.collect_time)-new Date(a.collect_time))?.map(f => [moment(f.collect_time).format('YYYY-MM-DD HH'), f.rate.toFixed(1)]) || []
})) || [] })) || []
}} }}
notMerge={true} notMerge={true}
lazyUpdate={true} lazyUpdate={true}

Loading…
Cancel
Save