From 345127c68c6fb9c8abe606fb52d20ca5c5535f05 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Tue, 7 Mar 2023 09:00:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix=20=E6=95=B4=E6=88=90=E7=9A=84=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../troubleshooting/shootingForm/index.js | 18 +++++++++--------- .../troubleshooting/shootingForm/index.wxml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/weapp/package/troubleshooting/shootingForm/index.js b/weapp/package/troubleshooting/shootingForm/index.js index aa54940..cd18784 100644 --- a/weapp/package/troubleshooting/shootingForm/index.js +++ b/weapp/package/troubleshooting/shootingForm/index.js @@ -228,15 +228,15 @@ Page({ return; } wx.chooseMedia({ - count: 20, // 基础库2.25.0前，最多可支持9个文件，2.25.0及以后最多可支持20个文件 + count: 20, // 基础库2.25.0前,最多可支持9个文件,2.25.0及以后最多可支持20个文件 mediaType: ['image'], // 文件类型 - sizeType: ['original', 'compressed'], // original 原图，compressed 压缩图，默认二者都有 - sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有 + sizeType: ['original', 'compressed'], // original 原图,compressed 压缩图,默认二者都有 + sourceType: ['album', 'camera'], // album 从相册选图,camera 使用相机,默认二者都有 success: function (res) { const imgs = res.tempFiles; for (let i = 0; i < imgs.length; i++) { if (res.tempFiles[i].size > 15728640) { - wx.showToast({ title: '图片大于15M，不可上传', icon: 'none' }); + wx.showToast({ title: '图片大于15M,不可上传', icon: 'none' }); return; } const fileNameArr = res.tempFiles[i].tempFilePath.split('.'); @@ -273,7 +273,7 @@ Page({ success: (resp) => { wx.hideLoading(); success++; - let str = JSON.parse(resp.data) // 返回的结果，可能不同项目结果不一样 + let str = JSON.parse(resp.data) // 返回的结果,可能不同项目结果不一样 str = str.uploaded if (imgs.length >= 20) { return false; @@ -291,14 +291,14 @@ Page({ }, complete: () => { i++; - if (i == data.path.length) { // 当图片传完时，停止调用 + if (i == data.path.length) { // 当图片传完时,停止调用 console.log('执行完毕'); - console.log('成功：' + success + " 失败：" + fail); - } else { // 若图片还没有传完，则继续调用函数 + console.log('成功:' + success + " 失败:" + fail); + } else { // 若图片还没有传完,则继续调用函数 data.i = i; data.success = success; data.fail = fail; - that.uploadimg(data, itemName); // 递归，回调自己 + that.uploadimg(data, itemName); // 递归,回调自己 } } }); diff --git a/weapp/package/troubleshooting/shootingForm/index.wxml b/weapp/package/troubleshooting/shootingForm/index.wxml index a58ff4e..b11402e 100644 --- a/weapp/package/troubleshooting/shootingForm/index.wxml +++ b/weapp/package/troubleshooting/shootingForm/index.wxml @@ -14,7 +14,7 @@ - + From 0c0e01b9367e4d202c57841a25561cfd7ce0cf60 Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 7 Mar 2023 09:02:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=80=89=E5=85=B3=E6=B3=A8=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E7=89=A9=E7=9A=84=E5=B7=A1=E6=A3=80=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/patrolManage/components/planModal.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/client/src/sections/patrolManage/components/planModal.js b/web/client/src/sections/patrolManage/components/planModal.js index 8eaa551..d4a1168 100644 --- a/web/client/src/sections/patrolManage/components/planModal.js +++ b/web/client/src/sections/patrolManage/components/planModal.js @@ -33,7 +33,7 @@ const PlanModal = ({ visible, onCreate, onCancel, dispatch, userLoading, userLis useEffect(() => { if (userList.length) { - setUserOpt(userList.map(u => ({ label: u.name, value: u.id }))) + setUserOpt(userList?.filter(f => f.structure?.includes(curRecord?.project?.id))?.map(u => ({ label: u.name, value: u.id }))) } }, [userList]) @@ -104,13 +104,15 @@ const PlanModal = ({ visible, onCreate, onCancel, dispatch, userLoading, userLis { required: true, message: '请选择结构物' }, ]} > - { + dispatch(positionList({ projectId })).then(res => { if (res.success) { setPoints(res.payload.data?.rows) setPointOpt(res.payload.data?.rows[0]?.points?.map(p => ({ label: p.name, value: p.id }))) } }) + form.setFieldsValue({ userId: null }); + setUserOpt(userList?.filter(f => f.structure?.includes(projectId))?.map(u => ({ label: u.name, value: u.id }))) }} /> Date: Tue, 7 Mar 2023 09:58:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 3 +- .../lib/models/patrol_record_issue_handle.js | 27 +++ api/log/development.log | 126 +++++++++++ script/1.0.4/schema/3.updata_resource.sql | 2 + .../4.updata_patrol_record_issue__handle.sql | 3 + web/client/src/app.js | 2 +- .../src/sections/auth/containers/login.js | 41 +++- .../patrolManage/components/xiafagaojin.js | 93 ++++++++ .../sections/patrolManage/containers/index.js | 3 +- .../patrolManage/containers/yujingguanli.js | 213 ++++++++++++++++++ .../src/sections/patrolManage/nav-item.js | 3 + .../src/sections/patrolManage/routes.js | 11 +- 12 files changed, 520 insertions(+), 7 deletions(-) create mode 100644 script/1.0.4/schema/3.updata_resource.sql create mode 100644 script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql create mode 100644 web/client/src/sections/patrolManage/components/xiafagaojin.js create mode 100644 web/client/src/sections/patrolManage/containers/yujingguanli.js diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 0e5cef4..daf8ebb 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -15,7 +15,8 @@ "args": [ "-p 4900", // 研发 - "-g postgres://FashionAdmin:123456@10.8.30.39:5432/Inspection", + // "-g postgres://FashionAdmin:123456@10.8.30.39:5432/Inspection", + "-g postgres://postgres:123456@10.8.16.184:5432/XunJian", // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/inspection", // 测试 // "--apiEmisUrl http://10.8.30.161:1111", diff --git a/api/app/lib/models/patrol_record_issue_handle.js b/api/app/lib/models/patrol_record_issue_handle.js index 99bb99c..0993169 100644 --- a/api/app/lib/models/patrol_record_issue_handle.js +++ b/api/app/lib/models/patrol_record_issue_handle.js @@ -168,6 +168,33 @@ module.exports = dc => { field: "check_image", autoIncrement: false }, + yanshoushijian: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "yanshoushijian", + autoIncrement: false + }, + yanshoucishu: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "yanshoucishu", + autoIncrement: false + }, + yujingshijian: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "yujingshijian", + autoIncrement: false + }, }, { tableName: "patrol_record_issue_handle", comment: "", diff --git a/api/log/development.log b/api/log/development.log index 5394c5f..f052f00 100644 --- a/api/log/development.log +++ b/api/log/development.log @@ -4194,3 +4194,129 @@ notNull Violation: PatrolPlan.patrolCount cannot be null 2023-02-21 17:02:47.295 - error: path: /patrolTemplate, error: ReferenceError: createUser is not defined 2023-02-21 17:08:28.472 - error: path: /patrolTemplate, error: ReferenceError: createUser is not defined 2023-02-21 17:08:39.999 - error: path: /patrolTemplate, error: ReferenceError: createUser is not defined +2023-03-03 08:50:15.221 - debug: [FS-LOGGER] Init. +2023-03-03 08:50:16.170 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-03 08:50:16.171 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-03 08:50:16.171 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-03 08:52:27.130 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:27.133 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:27.133 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:27.134 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:27.134 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:27.135 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.235 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.236 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.237 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.238 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.238 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:52:48.239 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:53:09.296 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:53:09.296 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:53:09.296 - error: [FS-ERRHD] +{ + message: 'transaction is not defined', + stack: 'ReferenceError: transaction is not defined\n' + + ' at login (d:\\前端学习\\巡检\\Inspection\\api\\app\\lib\\controllers\\auth\\index.js:78:9)' +} +2023-03-03 08:55:19.376 - debug: [FS-LOGGER] Init. +2023-03-03 08:55:19.504 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-03 08:55:19.505 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-03 08:55:19.505 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-04 15:30:48.068 - debug: [FS-LOGGER] Init. +2023-03-04 15:30:49.010 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-04 15:30:49.011 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-04 15:30:49.011 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-04 17:42:25.123 - debug: [FS-LOGGER] Init. +2023-03-04 17:42:25.236 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-04 17:42:25.236 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-04 17:42:25.236 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-04 18:22:09.556 - debug: [FS-LOGGER] Init. +2023-03-04 18:22:09.675 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-04 18:22:09.676 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-04 18:22:09.676 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-06 08:51:30.658 - debug: [FS-LOGGER] Init. +2023-03-06 08:51:31.673 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-06 08:51:31.674 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-06 08:51:31.674 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-06 10:16:04.533 - debug: [FS-LOGGER] Init. +2023-03-06 10:16:04.663 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-06 10:16:04.663 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-06 10:16:04.663 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-06 14:30:39.123 - debug: [FS-LOGGER] Init. +2023-03-06 14:30:39.248 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-06 14:30:39.248 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-06 14:30:39.248 - info: [FS-AUTH] Inject auth and api mv into router. +2023-03-06 14:32:05.704 - debug: [FS-LOGGER] Init. +2023-03-06 14:32:05.817 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2023-03-06 14:32:05.817 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment) +2023-03-06 14:32:05.818 - info: [FS-AUTH] Inject auth and api mv into router. diff --git a/script/1.0.4/schema/3.updata_resource.sql b/script/1.0.4/schema/3.updata_resource.sql new file mode 100644 index 0000000..54bc14f --- /dev/null +++ b/script/1.0.4/schema/3.updata_resource.sql @@ -0,0 +1,2 @@ +DELETE FROM public.resource WHERE code = 'REPAIR_MANAGE'; +DELETE FROM public.resource WHERE parent_resource = 'REPAIR_MANAGE'; \ No newline at end of file diff --git a/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql b/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql new file mode 100644 index 0000000..9225fcb --- /dev/null +++ b/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql @@ -0,0 +1,3 @@ +ALTER TABLE patrol_record_issue_handle ADD yanshoushijian timestamp(6); +ALTER TABLE patrol_record_issue_handle ADD yanshoucishu integer; +ALTER TABLE patrol_record_issue_handle ADD yujingshijian timestamp(6); diff --git a/web/client/src/app.js b/web/client/src/app.js index 1597273..e737fac 100644 --- a/web/client/src/app.js +++ b/web/client/src/app.js @@ -8,7 +8,7 @@ import ProjectRegime from './sections/projectRegime'; import Organization from './sections/organization'; import PatrolManage from './sections/patrolManage'; import IssueHandle from './sections/issueHandle' - +import { Func } from '$utils'; const App = props => { const { projectName } = props diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js index dcba5df..5ca98ad 100644 --- a/web/client/src/sections/auth/containers/login.js +++ b/web/client/src/sections/auth/containers/login.js @@ -11,7 +11,7 @@ import { login, LOGIN_ERROR } from '../actions/auth'; import { ExclamationCircleOutlined } from '@ant-design/icons'; import { Uploads } from '$components' import { LockOutlined, UserOutlined } from '@ant-design/icons'; - +import { Func } from '$utils'; import '../style.less'; const FormItem = Form.Item; @@ -29,6 +29,43 @@ const Login = props => { const [codCountDown, setCodeCountDown] = useState(60) const codCountDownRef = useRef(0) const [form] = Form.useForm(); + + const tourl = () => { + if (Func.isAuthorized("STRU_INFO_CONFIG")) { + return '/projectRegime/information' + } + if (Func.isAuthorized("QR_CODE_CONFIG")) { + return '/projectRegime/qrCode' + } + if (Func.isAuthorized("USER_CONFIG")) { + return '/organization/user' + } + if (Func.isAuthorized("AUTH_CONFIG")) { + return '/organization/authority' + } + if (Func.isAuthorized("PATROL_PLAN_CONFIG")) { + return '/patrolManage/patrolPlan' + } + if (Func.isAuthorized("PATROL_RECORD_VIEW")) { + return '/patrolManage/patrolRecord' + } + if (Func.isAuthorized("CHECKREPORT")) { + return '/patrolManage/patrolReport' + } + if (Func.isAuthorized("CHECKITEMSET")) { + return '/patrolManage/checkItems' +} +if (Func.isAuthorized("CHECKMOULD")) { + return '/patrolManage/patrolTemplate' +} +if (Func.isAuthorized("WENTICHULI")) { + return '/issueHandle' +} + else { + return message.warn('没有任何模块的查看权限') + } + } + useEffect(() => { }, []) @@ -36,7 +73,7 @@ const Login = props => { useEffect(() => { if (user && user.authorized) { - dispatch(push('/projectRegime/information')); + dispatch(push(tourl())); } }, [user]) diff --git a/web/client/src/sections/patrolManage/components/xiafagaojin.js b/web/client/src/sections/patrolManage/components/xiafagaojin.js new file mode 100644 index 0000000..1d4b1cd --- /dev/null +++ b/web/client/src/sections/patrolManage/components/xiafagaojin.js @@ -0,0 +1,93 @@ +import { Button, Form, Input, Modal, Select, DatePicker,Checkbox } from 'antd'; +import React, { useState, useEffect } from 'react'; +import { connect } from 'react-redux'; +import { createPatrolTemplate, delPatrolTemplate, updatePatrolTemplate, getPatrolTemplate } from '../actions/template'; +import moment from 'moment'; + +const { RangePicker } = DatePicker; +const { TextArea } = Input; + +const PlanModal = ({ visible, onCancel, dispatch, type, curRecord, tableRef, checkItemsGroup }) => { + const [form] = Form.useForm(); + const shigutypes = [{value:1,label: '邮件告警'}, + {value:2,label:'短信告警'}] + return ( + { + form.resetFields(); + onCancel(); + }} + onOk={() => { + form + .validateFields() + .then((values) => { + + const params = { + ...values, + } + + if (type === 'create') { + dispatch(createPatrolTemplate(params)).then(res => { + if (res.success) { + tableRef.current.reload(); + form.resetFields(); + onCancel(); + } + }) + } else { + dispatch(updatePatrolTemplate({ + ...params, + id: curRecord.id + })).then(res => { + if (res.success) { + tableRef.current.reload(); + form.resetFields(); + onCancel(); + } + }) + } + }) + .catch((info) => { + console.log('Validate Failed:', info); + }); + }} + > +
c.id) + }} + labelCol={{ span: 5 }} wrapperCol={{ span: 19 }} offe + > + + + + + + +
+ + ); +}; + +function mapStateToProps (state) { + const { auth, checkItemsGroup } = state + return { + user: auth.user, + checkItemsGroup: checkItemsGroup.data || [] + } +} +export default connect(mapStateToProps)(PlanModal); \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/containers/index.js b/web/client/src/sections/patrolManage/containers/index.js index 8bcbd53..43a6ba5 100644 --- a/web/client/src/sections/patrolManage/containers/index.js +++ b/web/client/src/sections/patrolManage/containers/index.js @@ -5,5 +5,6 @@ import PatrolReocrd from './patrolRecord'; import PatrolReport from './patrolReport'; import CheckItems from './checkItems'; import PlanTemplate from './patrolTemplate'; +import YujingGuanli from './yujingguanli'; -export { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate }; \ No newline at end of file +export { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate,YujingGuanli }; \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/containers/yujingguanli.js b/web/client/src/sections/patrolManage/containers/yujingguanli.js new file mode 100644 index 0000000..97e9774 --- /dev/null +++ b/web/client/src/sections/patrolManage/containers/yujingguanli.js @@ -0,0 +1,213 @@ +import React, { useState, useRef, useEffect } from 'react'; +import { connect } from 'react-redux'; +import { Button, Popconfirm, Tag,Tabs } from 'antd'; +import ProTable from '@ant-design/pro-table'; +import Xiafagaojin from '../components/xiafagaojin'; +import { createPatrolTemplate, delPatrolTemplate, updatePatrolTemplate, getPatrolTemplate } from '../actions/template'; +import { getCheckItemsGroup } from '../actions/checkItems'; +import moment from 'moment'; +function YujingGuanli (props) { + const { dispatch, user,actions } = props; + const tableRef = useRef(); + const format = 'YYYY-MM-DD HH:mm:ss' + const { patrolManage } = actions + const [dataSource, setDataSource] = useState([{}]); + const [visible, setVisible] = useState(false); + const [type, setType] = useState(); + const [curRecord, setCurRecord] = useState(); + const [data,setdata]= useState([]) + const [tableList, settableList] = useState([]) + const [name, setName] = useState(''); + const [curState, setCurState] = useState('全部'); + const times = [moment().subtract(70, 'years').format(format), moment().format(format)] + const [search, setSearch] = useState({ name: null, time: [times[0], times[1]], state: 'null' }) + const STATE_TEXT = { 1: '待制定计划', 2: '待审核', 3: '计划驳回', 4: '待维修', 5: '待验收', 6: '验收通过', 7: '验收不通过', } + const onChange = (key) => { + console.log(key); + }; + const renderOptionText = (currentState) => { + let text = '待制定计划' + + return STATE_TEXT[currentState] || text + } + const queryData = () => { + dispatch(patrolManage.records(`patrolRecord/all/${times[0]}/${times[1]}/true/null`)).then(res => { + if (res.success) { + console.log(res,'水平') + let obj = {} + res?.payload?.data?.map(i=>{ + if(obj[i?.points?.project?.id]){ + // if(obj[i?.points?.project?.id.toString()][i.pointId.toString()]){ + // obj[i?.points?.project?.id.toString()][i.pointId.toString()].ponintname=i.points?.itemData?.name + // obj[i?.points?.project?.id.toString()][i.pointId.toString()].num=obj[i?.points?.project?.id.toString()][i.pointId.toString()].num+i?.patrolRecordIssueHandles[0]?.state==6?1:0 + + // }else{ + // obj[i?.points?.project?.id.toString()][i.pointId.toString()].ponintname=i.points?.itemData?.name + // obj[i?.points?.project?.id.toString()][i.pointId.toString()].num=i?.patrolRecordIssueHandles[0]?.state==6?1:0 + // } + obj[i?.points?.project?.id].push({pointId:i.pointId,pointname:i.points.itemData.name}) + // i?patrolRecordIssueHandles[0]?.state==6 + obj[i?.points?.project?.id].num= obj[i?.points?.project?.id].num + i?.patrolRecordIssueHandles[0]?.state==6 ?1:0 + }else{ + obj[i?.points?.project?.id]={name:i?.points?.project?.name,num:i?.patrolRecordIssueHandles[0]?.state==6 ?1:0 } + + } + console.log(obj,'obj') + }) + + } + }) + } + useEffect(() => { + // dispatch(patrolManage.records(`patrolRecord/all/null/null/true/null`)).then(res=>{ + // let obj = {} + // res?.payload?.data?.map(i=>{ + // if(obj[i?.points?.project?.id]){ + // obj[i?.points?.project?.id].name=i?.points?.project?.name; + // obj[i?.points?.project?.id].num=obj[i?.points?.project?.id].num +1 + // }else{ + // obj[i?.points?.project?.id]={name:i?.points?.project?.name,num:1} + + // } + // }) + + // settableList(name != null ? res.payload.data?.filter(v => + // (v.points.user.name.indexOf(name) != -1 || v.points.project.name.indexOf(name) != -1)) + // .filter(x => curState == '全部' || curState == renderOptionText(x?.patrolRecordIssueHandles[0]?.state)) + // .map(v => ({ ...v, key: v.id })) : res.payload.data?.map(v => ({ ...v, key: v.id }))) + // const t1 = Object.keys(obj).map(i=>{ + // return {id:i,name:obj[i].name,num:obj[i].num} + // }) + // console.log(obj,'obj') + // console.log(res,'res') + // }) + + queryData() + dispatch(getCheckItemsGroup()) + }, []) +console.log(tableList,'tablist') + const columns = [{ + title: '结构物名称', + dataIndex: 'name', + key: 'name', + // search: false, + ellipsis: true, + }, { + title: '点位名称', + dataIndex: 'describe', + key: 'describe', + search: false, + ellipsis: true + }, { + title: '异常次数', + dataIndex: 'user.name', + key: 'user.name', + ellipsis: true, + search: false, + render: (t, r, i) => { + return r.user ? r.user.name : '-' + } + }, { + title: '产生时间', + dataIndex: 'checkItems', + key: 'checkItems', + ellipsis: true, + search: false, + render: (_, r) => { + return r?.checkItems ? r?.checkItems.map(c => {c.name}) : '-' + } + }, { + title: '更新时间', + dataIndex: 'checkItems', + key: 'checkItems', + search: false, + ellipsis: true, + render: (_, r) => { + return r?.checkItems ? r?.checkItems.map(c => {c.name}) : '-' + } + }, { + title: '操作', + dataIndex: 'action', + key: 'action', + search: false, + width: 200, + render: (_, record) => { + return <> + + + + }, + }]; + + return ( + <> + { + const res = await dispatch(getPatrolTemplate(params)); + setDataSource(res?.payload.data?.rows); + return { ...res }; + }} + + // toolBarRender={() => [ + // + // ]} + />, + }, + { + label: `已告警`, + key: '2', + children: `Content of Tab Pane 2`, + } + ]} + /> + { + visible ? + { + setVisible(false); + setCurRecord({}) + }} + tableRef={tableRef} + /> : null + } + + ) +} + +function mapStateToProps (state) { + const { auth, global } = state + return { + user: auth.user, + actions: global.actions, + } +} +export default connect(mapStateToProps)(YujingGuanli); diff --git a/web/client/src/sections/patrolManage/nav-item.js b/web/client/src/sections/patrolManage/nav-item.js index 4951534..8dc3592 100644 --- a/web/client/src/sections/patrolManage/nav-item.js +++ b/web/client/src/sections/patrolManage/nav-item.js @@ -26,6 +26,9 @@ export function getNavItem (user, dispatch) { {Func.isAuthorized('CHECKMOULD') && 巡检模板 } + { + 预警管理 + } ); } \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/routes.js b/web/client/src/sections/patrolManage/routes.js index fd8190f..6e4df65 100644 --- a/web/client/src/sections/patrolManage/routes.js +++ b/web/client/src/sections/patrolManage/routes.js @@ -1,5 +1,5 @@ 'use strict'; -import { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate } from './containers'; +import { PatrolPlan, PatrolReocrd, PatrolReport, CheckItems, PlanTemplate ,YujingGuanli} from './containers'; export default [{ type: 'inner', @@ -32,6 +32,13 @@ export default [{ key: 'patrolTemplate', component: PlanTemplate, breadcrumb: '巡检模板', - }] + }, + { + path: '/yujingguanli', + key: 'yujingguanli', + component: YujingGuanli, + breadcrumb: '预警管理', + } + ] } }]; \ No newline at end of file From 0c3124e2deefa202d1139f934c3969377444cef7 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Tue, 7 Mar 2023 10:03:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/issueHandle/components/isuue-handle-mdal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js index 09970eb..7d762a7 100644 --- a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js +++ b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js @@ -273,7 +273,7 @@ export default (props) => { {/*问题处理计划表单*/} { - ((editData?.patrolRecordIssueHandles[0].state == 1 && title != '查看详情') || editData?.patrolRecordIssueHandles[0].state > 1) && + ((editData?.patrolRecordIssueHandles[0]?.state == 1 && title != '查看详情') || editData?.patrolRecordIssueHandles[0]?.state > 1) && <>
{"维修计划信息"}
From 09fe9ff4d88cf2f0abbc4f4b7ad156cd063a5792 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Tue, 7 Mar 2023 10:21:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/patrolManage/nav-item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/patrolManage/nav-item.js b/web/client/src/sections/patrolManage/nav-item.js index 8dc3592..69580d9 100644 --- a/web/client/src/sections/patrolManage/nav-item.js +++ b/web/client/src/sections/patrolManage/nav-item.js @@ -26,9 +26,9 @@ export function getNavItem (user, dispatch) { {Func.isAuthorized('CHECKMOULD') && 巡检模板 } - { + {/* { 预警管理 - } + } */} ); } \ No newline at end of file From f4710a84454bba564f5dc07528fd0ccc085deeca Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Tue, 7 Mar 2023 13:36:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/models/patrol_record_issue_handle.js | 9 +++++++++ .../schema/4.updata_patrol_record_issue__handle.sql | 1 + 2 files changed, 10 insertions(+) diff --git a/api/app/lib/models/patrol_record_issue_handle.js b/api/app/lib/models/patrol_record_issue_handle.js index 0993169..c0a73ca 100644 --- a/api/app/lib/models/patrol_record_issue_handle.js +++ b/api/app/lib/models/patrol_record_issue_handle.js @@ -195,6 +195,15 @@ module.exports = dc => { field: "yujingshijian", autoIncrement: false }, + isgaojing: { + type: DataTypes.BOOLEAN, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "isgaojing", + autoIncrement: false + }, }, { tableName: "patrol_record_issue_handle", comment: "", diff --git a/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql b/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql index 9225fcb..d5ac8f5 100644 --- a/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql +++ b/script/1.0.4/schema/4.updata_patrol_record_issue__handle.sql @@ -1,3 +1,4 @@ ALTER TABLE patrol_record_issue_handle ADD yanshoushijian timestamp(6); ALTER TABLE patrol_record_issue_handle ADD yanshoucishu integer; ALTER TABLE patrol_record_issue_handle ADD yujingshijian timestamp(6); +ALTER TABLE patrol_record_issue_handle ADD isgaojing bool; From e17e2d3010c96e3310d6c398335db5e7dea4c38f Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 7 Mar 2023 14:37:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/patrolManage/containers/patrolReport.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/patrolManage/containers/patrolReport.js b/web/client/src/sections/patrolManage/containers/patrolReport.js index 7984c5d..04b3510 100644 --- a/web/client/src/sections/patrolManage/containers/patrolReport.js +++ b/web/client/src/sections/patrolManage/containers/patrolReport.js @@ -10,7 +10,7 @@ function patrolReport(props) { const { dispatch } = props; const tableRef = useRef(); const [selectOpts, setSelectOpts] = useState([]); - const [date, setDate] = useState([moment(), moment()]); + const [date, setDate] = useState([moment().subtract(1, 'days'), moment()]); const [dataSource, setDataSource] = useState([]); const qnDomain = localStorage.getItem('qnDomain'); @@ -103,7 +103,7 @@ function patrolReport(props) { total: res.payload.data.count ? res.payload.data.count : 0, }; }} - onReset={() => { setDate([moment(), moment()]) }} + onReset={() => { setDate([moment().subtract(1, 'days'), moment()]) }} /> )