free-sun
/
OperationalService
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

dev
wenlele 2 years ago
parent
37fe74937f
commit
d245dd2bc5
6 changed files with 37 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      api/app/lib/controllers/alarm/app.js
  2. BIN
      web/client/assets/images/problem/export.png
  3. 12
      web/client/src/sections/problem/components/inspection.jsx
  4. 2
      web/client/src/sections/problem/components/sideSheet.jsx
  5. 29
      web/client/src/sections/problem/components/tableData.jsx
  6. 8
      web/client/src/sections/problem/containers/dataAlarm.jsx

17
api/app/lib/controllers/alarm/app.js
View File

@ -239,14 +239,17 @@ async function apiErrorList (ctx) {
}
}
if (errType) {
if (errType == 'element') {
findOption.where.screenshot = { $ne: null }
} else if (errType == 'timeout') {
// if (errType) {
// if (errType == 'element') {
// findOption.where.screenshot = { $ne: null }
// } else if (errType == 'timeout') {
} else if (errType == 'apiError') {
findOption.where.screenshot = null
}
// } else if (errType == 'apiError') {
// findOption.where.screenshot = null
// }
// }
if(errType){
findOption.where.type = errType
}
if (confirmState) {
if (confirmState == 'confirmd') {

BIN
web/client/assets/images/problem/export.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 983 B

After

Width:  |  Height:  |  Size: 1.3 KiB

12
web/client/src/sections/problem/components/inspection.jsx
View File

@ -92,12 +92,12 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
return (
<div style={{ width: '100%', backgroundColor: 'white', marginBottom: 20 }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', marginLeft: 10 }}>
<div style={{ width: 400, }}>
<span style={{ width: 3, height: 20, background: '#005ABD', display: 'inline-block', margin: "0 10px 0 20px" }}></span>
<span style={{ width: 3, height: 20, background: '#005ABD', display: 'inline-block', margin: "0 10px 0 0px" }}></span>
<span style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#101531', marginRight: 10 }}>{statistic[route]}</span>
<span style={{ fontSize: 12 }}>APPLY SEMI-AUTOMATIC INSPECTION</span>
<div style={{ fontSize: 12 }}>仅保留48小时内的图片数据,每小时覆盖执行一次 <span style={{ fontWeight: 500, color: '#005ABD', fontSize: 12 }}>03专项2期：已阅共{notRead}个</span></div>
<span style={{ fontSize: 12, color: 'rgb(150, 151, 153)' }}>APPLY SEMI-AUTOMATIC INSPECTION</span>
<div style={{ fontSize: 12, color: 'rgb(150, 151, 153)' }}>仅保留48小时内的图片数据,每小时覆盖执行一次 <span style={{ fontWeight: 500, color: '#005ABD', fontSize: 12 }}>未阅共{notRead}个</span></div>
</div>
<div style={{ flex: 1, position: 'relative' }}>
<Form
@ -176,7 +176,7 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
labelPosition="left"
field='noted'
key='noted'
style={{ width: 116, marginRight: 54, color: "#F9F9F9", marginBottom: 10 }}
style={{ width: 116, marginRight: 60, color: "#F9F9F9", marginBottom: 10 }}
placeholder="全部"
showClear
>
@ -188,7 +188,7 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
);
})}
</Form.Select>
<Button theme="solid" type="primary" htmlType='submit' style={{ width: 65, height: 30, borderRadius: 3, position: 'absolute', right: 2, bottom: 12 }}>查询</Button>
<Button theme="solid" type="primary" htmlType='submit' style={{ width: 65, height: 30, borderRadius: 3, position: 'absolute', right: 10, bottom: 12 }}>查询</Button>
</Form>
</div>
</div>

2
web/client/src/sections/problem/components/sideSheet.jsx
View File

@ -120,7 +120,7 @@ function SideSheets ({ dispatch, actions, close }) {
title: "产生时间",
dataIndex: "Time",
rowKey: 'Time',
render: (_, r, index) => moment(r.time).format("YYYY-MM-DD HH:mm:ss")
render: (_, r, index) => r.Time?moment(r.Time).format("YYYY-MM-DD HH:mm:ss"):""
},
]

29
web/client/src/sections/problem/components/tableData.jsx
View File

@ -24,6 +24,7 @@ const TableData = ({ route,dispatch, actions, collectData, setSetup, exhibition,
dispatch(problem.getAlarmLnspectionApi({})).then((res) => {
console.log(res.payload.data)
if (res.success) {
let typeData = { element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" }
setCount(res.payload.data?.count || 0)
let tableDatas = res.payload.data?.rows.map(v => ({
key: v.id,
@ -36,7 +37,7 @@ const TableData = ({ route,dispatch, actions, collectData, setSetup, exhibition,
confirmTime: v.confirmTime ? moment(v.confirmTime).format("YYYY-MM-DD HH:mm:ss") : "",
alarmContent: v.alarmContent,
screenshot: v.screenshot,
type: v.type,
type: v.type ? typeData[v.type] : "",
confirm: v.confirm,
}))
// console.log(tableDatas);
@ -173,23 +174,23 @@ const TableData = ({ route,dispatch, actions, collectData, setSetup, exhibition,
marginRight: 10
}}
>
<img title='导出' src="/assets/images/problem/export.png" style={{ width: 24, height: 24 }} />
<img title='设置' src="/assets/images/problem/setup.png" style={{ width: 24, height: 24 }} onClick={() => setSetup(true)} />
<img title='导出' src="/assets/images/problem/export.png" style={{ width: 20 }} />
<img title='设置' src="/assets/images/problem/setup.png" style={{ width: 20 }} onClick={() => setSetup(true)} />
<Button
theme="solid"
type="primary"
style={{ width: 65, height: 30, borderRadius: 3, }}
style={{ width: 80, height: 32, borderRadius: 3, }}
onClick={() => {
api.current.validate().then((v) => {
console.log(v);
console.log({
state: v.state,
keywordTarget: v.keywordTarget,
keyword: v.keyword,
groupUnitId: v.groupUnitId,
sustainTimeStart: v.time ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
sustainTimeEnd: v.time ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
});
// console.log(v);
// console.log({
// state: v.state,
// keywordTarget: v.keywordTarget,
// keyword: v.keyword,
// groupUnitId: v.groupUnitId,
// sustainTimeStart: v.time ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
// sustainTimeEnd: v.time ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
// });
setSearch({
state: v.state,
@ -266,7 +267,7 @@ const TableData = ({ route,dispatch, actions, collectData, setSetup, exhibition,
}
setCheckAll(!checkAll)
}}
style={{ width: 93, height: 24, borderRadius: '1px', border: '1px solid #0F7EFB', color: '#0F7EFB', fontWeight: 400, margin: '0 10px' }}>
style={{ width: 93, height: 24, borderRadius: '1px', border: '1px solid #0F7EFB', color: '#0F7EFB',background:"#FFFFFF", fontWeight: 400, margin: '0 10px' }}>
{checkAll ? '全选' : "取消全选"}
</Button>
<Button type='primary' theme='solid' onClick={() => (setIfBulk(true), setConfirm(true))} style={{ width: 93, height: 24, borderRadius: '1px', border: '1px solid #0F7EFB', color: '#FFFFFF', fontWeight: 400, }}>批量确认</Button>

8
web/client/src/sections/problem/containers/dataAlarm.jsx
View File

@ -145,7 +145,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
dataLnterrupt: ['index', 'projectName', 'StructureName', 'SourceName', 'AlarmGroupUnit', 'AlarmCodeName', 'createTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime',],
dataAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', 'type', 'alarmType', 'createTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime'],
strategyHit: ['index', 'projectName', 'StructureName', 'SourceName', 'Strategy', 'State', 'createTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime'],
videoAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', '19', '20', '21', '22', 'AlarmContent', 'AlarmCodeName', 'createTime', 'updateTime', 'confirm', 'confirmTime'],
videoAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', '19', '20', '21', '22', 'AlarmContent', '111', 'createTime', 'updateTime', 'confirm', 'confirmTime','56115'],
useAbnormal: ['index', 'projectName', 'appName', 'url', 'type', 'alarmContent', 'createTime', 'updateTime', 'confirm', 'confirmTime'],
deviceAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', '19', 'alarmContent', '21', 'AlarmContent', 'AlarmCodeName', 'createTime', 'updateTime', 'confirm', 'confirmTime'],
}
@ -250,9 +250,9 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
{ name: '接入方式', value: '22' },
{ name: '应用名称', value: 'appName' },
{ name: 'URL地址', value: 'url' },
{
name: '异常类型', value: 'type'
},
{name: '异常类型', value: 'type'},
{name: '解决方案', value: '111'},
{name: '在离线', value: '56115'},
]

Write Preview
Loading…
Cancel
Save