xincheng 2 years ago
parent
commit
7f220d173f
  1. 12
      api/app/lib/controllers/patrolRecord/patrolRecord.js
  2. 2
      script/1.0.0/schema/2.create.project.sql
  3. 1
      weapp/app.js
  4. 42
      weapp/package/inspectionRecord/inspectionRecord.js
  5. 2
      weapp/package/inspectionRecord/inspectionRecord.wxml
  6. 144
      weapp/package/startInspection/startInspection.js
  7. 7
      weapp/package/startInspection/startInspection.wxml
  8. 4
      weapp/utils/getApiUrl.js
  9. 2
      web/client/src/sections/patrolManage/actions/index.js
  10. 17
      web/client/src/sections/patrolManage/actions/record.js
  11. 3
      web/client/src/sections/patrolManage/containers/index.js
  12. 204
      web/client/src/sections/patrolManage/containers/patrolRecord.js
  13. 3
      web/client/src/sections/patrolManage/nav-item.js
  14. 32
      web/client/src/sections/patrolManage/reducers/record.js
  15. 7
      web/client/src/sections/patrolManage/routes.js
  16. 3
      web/client/src/utils/webapi.js

12
api/app/lib/controllers/patrolRecord/patrolRecord.js

@ -1,6 +1,6 @@
'use strict';
async function findPatrolRecord (ctx, next) {
async function findPatrolRecord(ctx, next) {
let rslt = [];
let error = { name: 'FindError', message: '获取巡检记录失败' };
try {
@ -10,7 +10,7 @@ async function findPatrolRecord (ctx, next) {
if (patrolPlanId == 'all') {
/* 如果有startTime && endTime,查询所有符合条件的数据 */
if (startTime !== 'null' && endTime !== 'null') {
if (pointId) {
if (pointId !== 'null') {
if (alarm == 'null') {
rslt = await models.PatrolRecord.findAll({
where: { inspectionTime: { $between: [startTime, endTime] }, pointId: { $in: pointId.split(',') } },
@ -34,7 +34,7 @@ async function findPatrolRecord (ctx, next) {
} else {
/* 如果没有startTime && endTime,查询每个点位最新一条符合条件的数据 */
let a = []
if (pointId) {
if (pointId !== 'null') {
a = await models.PatrolRecord.findAll({
where: { pointId: { $in: pointId.split(',') } },
});
@ -45,7 +45,7 @@ async function findPatrolRecord (ctx, next) {
}
} else {
if (startTime !== 'null' && endTime !== 'null') {
if (pointId) {
if (pointId !== 'null') {
rslt = await models.PatrolRecord.findAll({
where: { patrolPlanId: { $in: patrolPlanId.split(',') }, alarm, inspectionTime: { $between: [startTime, endTime] }, pointId: { $in: pointId.split(',') } },
});
@ -58,7 +58,7 @@ async function findPatrolRecord (ctx, next) {
} else {
let a = []
/* 如果没有startTime && endTime,查询每个点位最新一条符合条件的数据 */
if (pointId) {
if (pointId !== 'null') {
a = await models.PatrolRecord.findAll({
where: { patrolPlanId: { $in: patrolPlanId.split(',') }, pointId: { $in: pointId.split(',') } },
});
@ -86,7 +86,7 @@ async function findPatrolRecord (ctx, next) {
}
}
async function addPatrolRecord (ctx, next) {
async function addPatrolRecord(ctx, next) {
let error = { name: 'addError', message: '新增巡检记录失败' };
try {
const models = ctx.fs.dc.models;

2
script/1.0.0/schema/2.create.project.sql

@ -19,7 +19,7 @@ create table point
constraint point_pk
primary key,
name varchar(255),
longitude intvarchar(255)eger,
longitude varchar(255),
latitude varchar(255),
describe varchar(255),
qr_code varchar,

1
weapp/app.js

@ -6,6 +6,7 @@ App({
baseUrl: 'http://10.8.16.221:4900', //api 本地环境
webUrl: "http://10.8.16.221:5900/", //web 本地环境
imgUrl: 'http://10.8.16.221:5900/_file-server/', //文件 本地环境
key: 'ODQBZ-3FZAU-6VIVL-2XXNM-F7CP7-WVFCY' //获取位置信息
},
onShow(e) {
// 检查是否有更新

42
weapp/package/inspectionRecord/inspectionRecord.js

@ -1,4 +1,8 @@
// package/inspectionRecord/inspectionRecord.js
import { getPatrolRecord } from "../../utils/getApiUrl";
import { Request } from "../../common";
const moment = require("../../utils/moment");
Page({
/**
@ -16,7 +20,7 @@ Page({
}
],
ResIndex: 0, //巡检结果
dataList: [1, 2, 3, 4, 5,],
dataList: [],
isPickerRender: false,
isPickerShow: false,
startTime: "开始日期", //开始日期
@ -72,11 +76,45 @@ Page({
})
},
// 查询
bindSearch() {
this.getPatrolRecord();
},
// 获取巡检记录
getPatrolRecord: function () {
let that = this;
let { endTime, startTime, ResList, ResIndex } = that.data;
let sevenYearAgo = moment().subtract(7, 'days').format('YYYY-MM-DD');
let currentData = moment().format('YYYY-MM-DD');
let alarm = ResList[ResIndex].text == '正常' ? false : true;
wx.showLoading({
title: '加载中'
})
Request.get(getPatrolRecord('all', startTime == '开始日期' ? sevenYearAgo : startTime, endTime == '结束日期' ? currentData : endTime, 'null', 'null')).then(res => {
console.log(res);
// dataList.points.map(e => {
// res.map(i => {
// wx.hideLoading();
// console.log(i, '------');
// if (i == null) {
// e.lastInspectionTime = moment().format('YYYY-MM-DD');
// e.inspectionTime = moment().format('YYYY-MM-DD');
// }
// })
// return e;
// })
// that.setData({
// dataList
// })
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
this.getPatrolRecord();
},
/**

2
weapp/package/inspectionRecord/inspectionRecord.wxml

@ -22,7 +22,7 @@
{{ResList[ResIndex].text}}
<image style="width:20rpx;height:20rpx;margin-left:10rpx;" src="../../images/down.svg" />
</picker>
<view style="padding:6rpx 64rpx;background:#1979ff;border-radius:6rpx;color:#fff;margin-left:70rpx;">查询</view>
<view style="padding:6rpx 64rpx;background:#1979ff;border-radius:6rpx;color:#fff;margin-left:70rpx;" bindtap="bindSearch">查询</view>
</view>
</view>

144
weapp/package/startInspection/startInspection.js

@ -16,6 +16,7 @@ Page({
itemData: '', //单条数据
changeTwo: '', //是否异常
changeThree: '', //严重等级
address: '', //当前位置
},
handleChangeTwo(e) {
@ -52,7 +53,8 @@ Page({
msgInp: '', //巡查详情
changeTwo: '', //是否异常
changeThree: '', //严重等级
imgs: []
imgs: [],
address: ''
})
},
@ -174,7 +176,7 @@ Page({
// 开始巡检录入
addPatrolRecord: function () {
let that = this;
let { itemData, imgs, msgInp, changeTwo, changeThree, dataList, imgUrl } = that.data;
let { itemData, imgs, msgInp, changeTwo, changeThree, dataList, imgUrl, address } = that.data;
let newImgs = imgs.map(i => {
i = i.replace(imgUrl, '');
return i;
@ -196,7 +198,8 @@ Page({
}
let data = {
patrolPlanId: dataList.id,
lastInspectionTime: moment().format('YYYY-MM-DD'),
pointId: itemData.id,
lastInspectionTime: itemData.lastInspectionTime,
inspectionTime: moment().format('YYYY-MM-DD'),
points: {
user: dataList.user,
@ -206,6 +209,7 @@ Page({
msgInp: msgInp,
changeThree: changeThree == 'slight' ? '轻微' : changeThree == 'moderate' ? '中度' : '严重',
imgs: newImgs,
address: address
},
alarm: true
}
@ -219,13 +223,15 @@ Page({
if (changeTwo == 'normal') {
let data = {
patrolPlanId: dataList.id,
lastInspectionTime: moment().format('YYYY-MM-DD'),
pointId: itemData.id,
lastInspectionTime: itemData.lastInspectionTime,
inspectionTime: moment().format('YYYY-MM-DD'),
points: {
user: dataList.user,
project: dataList.project,
frequency: dataList.frequency,
itemData: itemData,
address: address
},
alarm: false
}
@ -246,58 +252,90 @@ Page({
// 获取巡检记录
getPatrolRecord: function () {
Request.get(getPatrolRecord(this.data.dataList.id)).then(res => {
let that = this;
let { dataList } = that.data;
let pointId = dataList.points.map(i => {
return i.id;
})
wx.showLoading({
title: '加载中'
})
Request.get(getPatrolRecord(dataList.id, 'null', 'null', 'null', pointId)).then(res => {
console.log(res);
dataList.points.map(e => {
res.map(i => {
wx.hideLoading();
console.log(i, '------');
if (i == null) {
e.lastInspectionTime = moment().format('YYYY-MM-DD');
e.inspectionTime = moment().format('YYYY-MM-DD');
}
})
return e;
})
that.setData({
dataList
})
})
},
// selfLocation() {
// const self = this
// wx.showLoading({
// title: '定位中',
// mask: true,
// });
// wx.getLocation({
// type: 'gcj02',
// success: (res) => {
// let latitude, longitude;
// latitude = res.latitude.toString();
// longitude = res.longitude.toString();
// this.latitude = res.latitude
// this.longitude = res.longitude
// getGeocoder({ lat: latitude, long: longitude }).then(res => { // 获取详细信息的接口
// const data = res.data;
// self.userAddress.userAddressdetail = ''
// var params = {
// text: data.address
// }
// parseAddress(params).then(res => { // 粘贴详细信息的接口
// console.log(res)
// if (res.status == 200 && res.message == "success") {
// this.$forceUpdate(); // 定位后,界面没有反应,因此加上强制刷新
// this.userAddress.userAddressdetail = res.data.town + res.data.detail;
// this.$set(this.userAddress, 'selectAddress', parseInt(res.data.county_info.city_id));
// this.addressInfo[0] = res.data.province_info ? res.data.province_info : {};
// this.addressInfo[1] = res.data.city_info ? res.data.city_info : {};
// this.addressInfo[2] = res.data.county_info ? res.data.county_info : {};
// }
// }).catch(res => {
// console.log("没有地址信息")
// })
// wx.hideLoading();
// })
// },
// fail: (res) => {
// console.log(res)
// wx.hideLoading();
// wx.showToast({
// title: res.errMsg,
// icon: 'none',
// duration: 1000
// });
// }
// });
// },
// 解析经纬度
ToDegrees(val) {
if (typeof (val) == "undefined" || val == "") {
return "";
}
var i = val.indexOf('.');
var strDu = i < 0 ? val : val.substring(0, i);//获取度
var strFen = 0;
var strMiao = 0;
if (i > 0) {
var strFen = "0" + val.substring(i);
strFen = strFen * 60 + "";
i = strFen.indexOf('.');
if (i > 0) {
strMiao = "0" + strFen.substring(i);
strFen = strFen.substring(0, i);//获取分
strMiao = strMiao * 60 + "";
i = strMiao.indexOf('.');
strMiao = strMiao.substring(0, i + 4);//取到小数点后面三位
strMiao = parseFloat(strMiao).toFixed(2);//精确小数点后面两位
}
}
return strDu + "°" + strFen + "′" + strMiao + "″";
},
// 获取当前位置
selfLocation() {
const that = this
wx.showLoading({
title: '定位中',
mask: true,
});
wx.getLocation({
type: 'wgs84',
success: (res) => {
wx.request({
url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=${getApp().globalData.key}`,
success: function (res) {
wx.hideLoading();
//根据自己项目需求获取res内容
that.setData({
address: res.data.result.address
})
}
})
},
fail: (res) => {
console.log(res)
wx.hideLoading();
wx.showToast({
title: res.errMsg,
icon: 'none',
duration: 1000
});
}
});
},
/**
* 生命周期函数--监听页面加载
@ -312,7 +350,7 @@ Page({
dataList: data,
points
})
// that.getPatrolRecord()
that.getPatrolRecord();
},
/**

7
weapp/package/startInspection/startInspection.wxml

@ -44,7 +44,7 @@
</view>
<view class="txt" style="margin-bottom: 20rpx;">
<view style="float: left;font-weight: bold;">上次巡检日期</view>
<view style="float:left;width:55%;margin-left:40rpx;">2022-10-26</view>
<view style="float:left;width:55%;margin-left:40rpx;">{{item.lastInspectionTime}}</view>
</view>
<view class="txt" style="margin-bottom: 20rpx;">
<view style="float: left;font-weight: bold;">巡检人</view>
@ -52,7 +52,7 @@
</view>
<view class="txt" style="margin-bottom: 20rpx;">
<view style="float: left;font-weight: bold;">本次巡检日期</view>
<view style="float:left;width:55%;margin-left:40rpx;">2022-12-23</view>
<view style="float:left;width:55%;margin-left:40rpx;">{{item.inspectionTime}}</view>
</view>
</view>
</block>
@ -66,7 +66,8 @@
</view>
<view style="padding:20rpx 30rpx;overflow: hidden;">
<view style="float: left;">当前位置:</view>
<view style="float:left;width:480rpx;text-align: justify;">点位A</view>
<view style="float:left;width:480rpx;text-align: justify;" wx:if="{{address}}">{{address}}</view>
<view style="float:left;width:480rpx;text-align: justify;" bindtap="selfLocation" wx:if="{{!address}}">点击获取当前位置</view>
</view>
<radio-group style="padding:10px 15px;display:flex;justify-content: space-evenly;" bindchange="handleChangeTwo">
<radio style="color:#1979ff;" color="#1979ff" value="normal">正常</radio>

4
weapp/utils/getApiUrl.js

@ -24,6 +24,6 @@ exports.addPatrolRecord = () => {
}
// 获取巡检记录
exports.getPatrolRecord = (patrolPlanId, startTime, endTime, alarm) => {
return `/patrolRecord/${patrolPlanId}/${startTime}/${endTime}/${alarm}`
exports.getPatrolRecord = (patrolPlanId, startTime, endTime, alarm, pointId) => {
return `/patrolRecord/${patrolPlanId}/${startTime}/${endTime}/${alarm}/${pointId}`
}

2
web/client/src/sections/patrolManage/actions/index.js

@ -1,7 +1,9 @@
'use strict';
import * as plan from './plan'
import * as record from './record'
export default {
...plan,
...record,
}

17
web/client/src/sections/patrolManage/actions/record.js

@ -0,0 +1,17 @@
'use strict';
import { basicAction } from '@peace/utils'
export const GET_PATROL_RECORD_LIST = 'GET_PATROL_RECORD_LIST';
export const GET_PATROL_RECORD_LIST_SUCCESS = 'GET_PATROL_RECORD_LIST_SUCCESS';
export const GET_PATROL_RECORD_LIST_ERROR = 'GET_PATROL_RECORD_LIST_ERROR';
export function records(url) {
return (dispatch) => basicAction({
type: 'get',
dispatch,
actionType: GET_PATROL_RECORD_LIST,
url: url,
msg: { error: '获取巡检记录失败', },
reducer: { name: 'record' }
});
}

3
web/client/src/sections/patrolManage/containers/index.js

@ -1,5 +1,6 @@
'use strict';
import PatrolPlan from './patrolPlan';
import PatrolReocrd from './patrolRecord';
export { PatrolPlan };
export { PatrolPlan, PatrolReocrd };

204
web/client/src/sections/patrolManage/containers/patrolRecord.js

@ -0,0 +1,204 @@
'use strict'
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { Form, Input, Select, Button, Table, Modal, DatePicker, Checkbox, Row, Col } from 'antd';
import moment from "moment";
const PatrolRecord = (props) => {
const { dispatch, actions, } = props
const { patrolManage } = actions
const [tableList, settableList] = useState([])
const [showDetailModal, setShowDetail] = useState(false)
const [modelData, setModelData] = useState({})
const [query, setQuery] = useState({ limit: 10, page: 0 })
const [limits, setLimits] = useState()
const format = 'YYYY-MM-DD'
const [search, setSearch] = useState({ name: null, time: [moment().add(-7, 'd').format(format), moment().format(format)], state: 'null' })
useEffect(() => {
record(search)
}, [])
const record = (params) => {
dispatch(patrolManage.records(`patrolRecord/all/${params.time[0]}/${params.time[1]}/${params.state}/null`)).then(res => {
if (res.success) {
settableList(params.name != null ? res.payload.data?.filter(v =>
(v.points.user.name.indexOf(params.name) != -1 || v.points.project.name.indexOf(params.name) != -1))
.map(v => ({ ...v, key: v.id })) : res.payload.data?.map(v => ({ ...v, key: v.id })))
setLimits(res.payload.data?.length)
}
})
}
const columns = [{
title: '结构物名称',
dataIndex: 'name',
key: 'name',
render: (text, record, index) => {
return !record.points?.project ? '' : <div style={{ width: 100 }}>{record.points.project.name}</div>
}
}, {
title: '巡检人',
dataIndex: 'type',
key: 'type',
render: (text, record, index) => {
return !record.points?.user ? '' : <div style={{ width: 100 }}>{record.points.user.name}</div>
}
}, {
title: '巡检点位',
dataIndex: 'type',
key: 'type',
render: (text, record, index) => {
return !record.points?.user ? '' : <div style={{ width: 100 }}>{record.points.itemData.name}</div>
}
}, {
title: '巡检单位',
dataIndex: 'type',
key: 'type',
render: (text, record, index) => {
return !record.points?.user ? '' : <div style={{ width: 100 }}>{record.points.user.department.name}</div>
}
}, {
title: '巡检频次',
dataIndex: 'describe',
key: 'describe',
render: (text, record, index) => {
return !record.points ? '' : <div style={{ width: 100 }}>{record.points.frequency}</div>
}
}, {
title: '上次巡检日期',
dataIndex: 'describe',
key: 'describe',
render: (text, record, index) => moment(record.lastInspectionTime).format('YYYY-MM-DD HH:mm') || '--'
}, {
title: '本次巡检日期',
dataIndex: 'describe',
key: 'describe',
render: (text, record, index) => moment(record.inspectionTime).format('YYYY-MM-DD HH:mm') || '--'
}, {
title: '巡检结果',
dataIndex: 'describe',
key: 'describe',
render: (text, record, index) => !record.alarm ? '正常' : '异常'
}, {
title: '操作',
dataIndex: 'operation',
key: 'operation',
render: (text, record, index) => {
return (
<div style={{ width: 190 }}>
<Button type="link" onClick={() => {
setShowDetail(true)
setModelData(record)
}}>
查看详情</Button>
</div>
)
}
}
]
return (
<>
<div style={{ display: 'flex', justifyContent: 'space-between', padding: '0 10px' }}>
<Form
style={{ display: 'flex', }}
onFinish={r => {
record({
name: r.name,
time: [moment(r.time[0]).format(format), moment(r.time[1]).format(format)],
state: r.state
})
}}
>
<Form.Item
name="name"
style={{ marginRight: 16, minWidth: 250 }}
>
<Input placeholder="请输入结构物名称或巡检人" allowClear />
</Form.Item>
<Form.Item
name="time"
style={{ marginRight: 16, }}
initialValue={[moment(search.time[0], format), moment(search.time[1], format)]}
>
<DatePicker.RangePicker showTime style={{ marginRight: 16, }} />
</Form.Item>
<Form.Item
name="state"
style={{ marginRight: 16, }}
initialValue={'null'}
>
<Select allowClear
options={[
{ value: 'null', label: '全部' },
{ value: false, label: '正常' },
{ value: true, label: '异常' }]} />
</Form.Item>
<Form.Item wrapperCol={{}}>
<Button type="primary" htmlType="submit">
搜索
</Button>
</Form.Item>
</Form>
</div>
<Table
columns={columns}
dataSource={tableList}
pagination={{
current: query.page + 1,
total: limits,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: [10, 20, 50],
showTotal: (total) => {
return <span style={{ fontSize: 15 }}>{`${Math.ceil(total / query?.limit)}页,${total}`}</span>
},
onChange: (page, pageSize) => {
setQuery({ limit: pageSize, page: page - 1 });
record({ limit: pageSize, page: page - 1, ...search, companyId: companyID || search?.companyId })
}
}}
/>
<Modal
title='巡检记录详情'
open={showDetailModal}
onCancel={() => setShowDetail(false)}
footer={[<Button onClick={() => setShowDetail(false)}>关闭</Button>]}
>
<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
当前点位{modelData?.points?.itemData?.name}
</Row>
<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
当前位置{modelData?.points?.address}
</Row>
<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
巡检结果{modelData.alarm? '异常':'正常'}
</Row>
{ !modelData.alarm? '':
<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
巡检详情{modelData?.points?.msgInp}
</Row> }
{ !modelData.alarm? '':
<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
异常等级{modelData?.points?.changeThree}
</Row> }
{ !modelData.alarm? '':<Row align='middle' justify='center' style={{ marginBottom: 10 }}>
{ modelData?.points?.imgs?.map(rs => <img key={rs} src={`/_file-server/${rs}`} style={{ display: 'inline-block', width: 260, marginBottom: 10 }} />)}
</Row> }
</Modal>
</>
)
}
function mapStateToProps(state) {
const { auth, global } = state;
return {
user: auth.user,
actions: global.actions,
};
}
export default connect(mapStateToProps)(PatrolRecord);

3
web/client/src/sections/patrolManage/nav-item.js

@ -14,6 +14,9 @@ export function getNavItem(user, dispatch) {
<Menu.Item key="patrolPlan">
<Link to="/patrolManage/patrolPlan">巡检计划制定</Link>
</Menu.Item>
<Menu.Item key="patrolRecord">
<Link to="/patrolManage/patrolRecord">巡检记录</Link>
</Menu.Item>
</SubMenu>
);
}

32
web/client/src/sections/patrolManage/reducers/record.js

@ -0,0 +1,32 @@
'use strict';
import * as actionTypes from '../actions/record';
import Immutable from 'immutable';
const initState = {
data: {},
isRequesting: false,
error: null
};
function record(state = initState, action) {
const payload = action.payload;
switch (action.type){
case actionTypes.GET_PATROL_RECORD_LIST:
return Immutable.fromJS(state).set('data',
payload.data).toJS();
case actionTypes.GET_PATROL_RECORD_LIST_SUCCESS:
return Immutable.fromJS(state).merge({
isRequesting: false,
data: payload.data
}).toJS();
case actionTypes.GET_PATROL_RECORD_LIST_ERROR:
return Immutable.fromJS(state).merge({
isRequesting: false,
error: payload.error
}).toJS();
default:
return state;
}
}
export default record;

7
web/client/src/sections/patrolManage/routes.js

@ -1,5 +1,5 @@
'use strict';
import { PatrolPlan } from './containers';
import { PatrolPlan, PatrolReocrd } from './containers';
export default [{
type: 'inner',
@ -12,6 +12,11 @@ export default [{
key: 'patrolPlan',
component: PatrolPlan,
breadcrumb: '巡检计划制定',
},{
path: '/patrolRecord',
key: 'patrolRecord',
component: PatrolReocrd,
breadcrumb: '巡检记录',
}]
}
}];

3
web/client/src/utils/webapi.js

@ -23,6 +23,9 @@ export const ApiTable = {
patrolPlan: 'patrolPlan', // 增改查
delPatrolPlan: 'patrolPlan/{id}',
// 巡检记录
patrolRecord: 'patrolRecord/:patrolPlanId/:startTime/:endTime/:alarm/:pointId',
// 用户权限
getResource: 'resource',
getUserResource: 'user/resource',

Loading…
Cancel
Save