diff --git a/api/app/lib/schedule/workOrder.js b/api/app/lib/schedule/workOrder.js index dd2a6c1..27fdb4e 100644 --- a/api/app/lib/schedule/workOrder.js +++ b/api/app/lib/schedule/workOrder.js @@ -3,7 +3,7 @@ const schedule = require('node-schedule'); const moment = require('moment') const request = require('superagent'); -let isDev = true +let isDev = false module.exports = function (app, opts,ctx) { const workOrder = app.fs.scheduleInit( diff --git a/web/client/src/sections/projectGroup/containers/bigscreen.jsx b/web/client/src/sections/projectGroup/containers/bigscreen.jsx index f320dbb..464e32e 100644 --- a/web/client/src/sections/projectGroup/containers/bigscreen.jsx +++ b/web/client/src/sections/projectGroup/containers/bigscreen.jsx @@ -36,6 +36,7 @@ const Bigscreen = (props) => { useEffect(() => { + let groupIdLocal = JSON.parse(localStorage.getItem('project_group'))?.find(v => user?.id == v.userId)?.projectGroupId let search = restProps?.location?.search || ''; @@ -154,7 +155,7 @@ const Bigscreen = (props) => { }) dispatch(actions.projectGroup.getWorkOrdersRepairRank({projectIds:query})).then(res=>{ if(res.success){ - setGroupProject(res.payload.data?.slice(0, 10).map(v => ({name:v.formname,duration:moment(v?.endTime).add(8, 'hours').diff(v?.startTime,'hours') })) || []) + setGroupProject(res.payload.data?.slice(0, 10).map(v => ({name:v.formname,startTime:moment(v.startTime).add(8, 'hours').format('YYYY-MM-DD HH'),duration:moment(v?.endTime).add(8, 'hours').diff(v?.startTime,'hours') })) || []) } }) @@ -229,6 +230,7 @@ const Bigscreen = (props) => { }, [proportion]); return (
+
@@ -326,7 +328,7 @@ const Bigscreen = (props) => {
NO.{index + 1}
- {c.name}
+ {c.name}({s.startTime})
{c.duration}h
: <> @@ -489,7 +491,7 @@ const Bigscreen = (props) => { return
{c.name}
{title}
-
{c.offnum + '/' + c.totnum+`(${(c.offnum/c.totnum).toFixed(4)*100}%)`}
+
{c.offnum + '/' + c.totnum+`(${((c.offnum/c.totnum)*100).toFixed(2)}%)`}
})} } containerStyle={{ position: "relative", height: "85%", }} divHeight={"100%"} divId={"interruptchart"}/> @@ -504,11 +506,9 @@ const Bigscreen = (props) => { ) } - function mapStateToProps (state) { const { auth, global, groupStatisticOnline,pomsProjectBasicAll } = state; - console.log('global1',global) return { user: auth.user, actions: global.actions,