free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

增加异常上报\道路巡检两个模块 web+小程序 60%

dev
巴林闲侠 2 years ago
parent
19b4055f19
commit
46046f7ed6
26 changed files with 879 additions and 464 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 4
      api/.vscode/launch.json
  3. 14
      api/app/lib/controllers/report/index.js
  4. 9
      api/app/lib/models/report.js
  5. 15
      api/log/development.log
  6. 4
      scripts/1.2.1/schema/1update_report.sql
  7. 7
      weapp/project.config.json
  8. 6
      weapp/project.private.config.json
  9. 4
      weapp/src/config.js
  10. 199
      weapp/src/packages/patrol/index.jsx
  11. 58
      weapp/src/packages/patrolView/index.jsx
  12. 2
      weapp/src/packages/patrolView/index.scss
  13. 36
      weapp/src/pages/home/index.jsx
  14. 10
      weapp/src/pages/home/index.scss
  15. 26
      weapp/src/pages/user/index.jsx
  16. 49
      weapp/src/static/img/home/fill-anomaly.svg
  17. 252
      weapp/src/static/img/home/fill-bg.svg
  18. 49
      weapp/src/static/img/home/fill-road.svg
  19. 11
      web/client/src/layout/containers/layout/index.js
  20. 17
      web/client/src/sections/fillion/actions/patrol.js
  21. 219
      web/client/src/sections/fillion/components/patrolTable.js
  22. 55
      web/client/src/sections/fillion/containers/patrol.js
  23. 8
      web/client/src/sections/fillion/nav-item.js
  24. 12
      web/client/src/sections/fillion/routes.js
  25. 258
      web/package-lock.json
  26. 2
      web/package.json

1
.gitignore
View File

@ -142,3 +142,4 @@ dist
web/client/assets/color.less web/client/assets/color.less
package-lock.json package-lock.json
development.text development.text
web/package-lock.json

4
api/.vscode/launch.json
View File

@ -13,8 +13,8 @@
"NODE_ENV": "development" "NODE_ENV": "development"
}, },
"args": [ "args": [
"-p 14000", "-p 13400",
"-f http://localhost:14000", "-f http://localhost:13400",
"-g postgres://postgres:123@10.8.30.32:5432/highways4good", "-g postgres://postgres:123@10.8.30.32:5432/highways4good",
"--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5",
"--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa",

14
api/app/lib/controllers/report/index.js
View File

@ -9,12 +9,12 @@ async function reportList (ctx) {
where: { where: {
}, },
attributes: ['id', 'road', 'time', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'reportType', 'content', 'longitude', 'latitude'], attributes: ['id', 'road', 'time', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'reportType', 'content', 'longitude', 'latitude', 'projectName'],
include: [{ include: [{
model: models.User, model: models.User,
attributes: ['name'] attributes: ['name']
}], }],
order: [['time', asc ? 'ASC': 'DESC']], order: [['time', asc ? 'ASC' : 'DESC']],
} }
if (limit) { if (limit) {
findOption.limit = limit findOption.limit = limit
@ -30,8 +30,14 @@ async function reportList (ctx) {
} }
} }
if (keyword) { if (keyword) {
findOption.where.road = { if (reportType == 'road') {
'$like': `%${keyword}%` findOption.where.projectName = {
'$like': `%${keyword}%`
}
} else {
findOption.where.road = {
'$like': `%${keyword}%`
}
} }
} }
if (userId) { if (userId) {

9
api/app/lib/models/report.js
View File

@ -166,6 +166,15 @@ module.exports = dc => {
field: "address", field: "address",
autoIncrement: false autoIncrement: false
}, },
projectName: {
type: DataTypes.STRING,
allowNull: true,
defaultValue: null,
comment: "工程名称",
primaryKey: false,
field: "project_name",
autoIncrement: false
},
}, { }, {
tableName: "report", tableName: "report",
comment: "", comment: "",

15
api/log/development.log
View File

@ -11203,3 +11203,18 @@ headers: {}
2022-09-05 15:40:10.680 - debug: [FS-LOGGER] Init. 2022-09-05 15:40:10.680 - debug: [FS-LOGGER] Init.
2022-09-05 15:40:11.273 - info: [FS-ATTACHMENT] Inject attachment mw into router. 2022-09-05 15:40:11.273 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-09-05 15:40:11.273 - info: [FS-AUTH] Inject auth and api mv into router. 2022-09-05 15:40:11.273 - info: [FS-AUTH] Inject auth and api mv into router.
2023-06-27 15:28:45.497 - debug: [FS-LOGGER] Init.
2023-06-27 15:28:46.411 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2023-06-27 15:28:46.411 - info: [FS-AUTH] Inject auth and api mv into router.
2023-06-27 15:56:55.756 - debug: [FS-LOGGER] Init.
2023-06-27 15:56:56.357 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2023-06-27 15:56:56.358 - info: [FS-AUTH] Inject auth and api mv into router.
2023-06-27 16:32:17.216 - debug: [FS-LOGGER] Init.
2023-06-27 16:32:17.767 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2023-06-27 16:32:17.768 - info: [FS-AUTH] Inject auth and api mv into router.
2023-06-27 18:48:13.296 - debug: [FS-LOGGER] Init.
2023-06-27 18:48:13.664 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2023-06-27 18:48:13.664 - info: [FS-AUTH] Inject auth and api mv into router.
2023-06-27 20:02:06.352 - debug: [FS-LOGGER] Init.
2023-06-27 20:02:06.794 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2023-06-27 20:02:06.795 - info: [FS-AUTH] Inject auth and api mv into router.

4
scripts/1.2.1/schema/1update_report.sql
View File

@ -0,0 +1,4 @@
alter table report
add project_name varchar(512);
alter table report alter column project_type drop not null;

7
weapp/project.config.json
View File

@ -2,7 +2,7 @@
"miniprogramRoot": "dist/", "miniprogramRoot": "dist/",
"projectname": "四好公路", "projectname": "四好公路",
"description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"appid": "wx3c0c46dcf49a85be", "appid": "wx79ff58f03d17f24d",
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": false, "es6": false,
@ -14,7 +14,7 @@
"autoAudits": false, "autoAudits": false,
"uglifyFileName": false, "uglifyFileName": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"enhance": true, "enhance": false,
"showShadowRootInWxmlPanel": true, "showShadowRootInWxmlPanel": true,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
@ -29,7 +29,8 @@
}, },
"disableUseStrict": false, "disableUseStrict": false,
"useCompilerPlugins": false, "useCompilerPlugins": false,
"minifyWXML": true "minifyWXML": true,
"condition": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.25.1", "libVersion": "2.25.1",

6
weapp/project.private.config.json
View File

@ -1,7 +1,9 @@
{ {
"projectname": "%E5%9B%9B%E5%A5%BD%E5%85%AC%E8%B7%AF", "projectname": "%E5%9B%9B%E5%A5%BD%E5%85%AC%E8%B7%AF",
"setting": { "setting": {
"compileHotReLoad": true "compileHotReLoad": true,
"bigPackageSizeSupport": true
}, },
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html" "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"libVersion": "2.32.2"
} }

4
weapp/src/config.js
View File

@ -1,5 +1,5 @@
let DEV = false; let DEV = false;
// DEV = true; //使用测试环境 DEV = true; //使用测试环境
const baseConfig = { const baseConfig = {
errorHandle: false, //是否启用全局异常处理‌‍‍‌‍​‌‌‍​‌‌‌‌‌​‌‌‍‌​‍‌‌‌‌​‍‍‍‍‌​‌‍‍‌‍​‌‌‍​‍‍‍‌‌​‍‌‌‌‌​‍‌‍‌​‍‌‌‌O errorHandle: false, //是否启用全局异常处理‌‍‍‌‍​‌‌‍​‌‌‌‌‌​‌‌‍‌​‍‌‌‌‌​‍‍‍‍‌​‌‍‍‌‍​‌‌‍​‍‍‍‌‌​‍‌‌‌‌​‍‌‍‌​‍‌‌‌O
@ -8,7 +8,7 @@ const baseConfig = {
}; };
const development = { const development = {
baseUrl: 'http://221.230.55.29:31919', baseUrl: 'http://10.8.30.112:13400',
// baseUrl: 'https://d763-117-90-37-10.ap.ngrok.io', // baseUrl: 'https://d763-117-90-37-10.ap.ngrok.io',
// webUrl: 'https://smartwater.anxinyun.cn', // webUrl: 'https://smartwater.anxinyun.cn',
// pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c', // pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',

199
weapp/src/packages/patrol/index.jsx
View File

@ -17,11 +17,16 @@ const Index = () => {
const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
const router = useRouter() const router = useRouter()
const { params: { type } } = router const { params: { type, kind } } = router
const isView = type === 'view' ? true : false const isView = type === 'view' ? true : false
const isPatrol = kind === 'patrol' ? true : false
const isRoad = kind === 'road' ? true : false
const isAnomaly = kind === 'anomaly' ? true : false
const [reportType, setReportType] = useState('patrol') // 上报类型 const [reportType, setReportType] = useState('patrol') // 上报类型
const [projectType, setProjectType] = useState('') // 工程类型 const [projectType, setProjectType] = useState('') // 工程类型
const [projectName, setProjectName] = useState('') // 项目名称
const [road, setRoad] = useState('') // 所在道路 const [road, setRoad] = useState('') // 所在道路
const [roadSectionStart, setRoadSectionStart] = useState('') // 路段 Start const [roadSectionStart, setRoadSectionStart] = useState('') // 路段 Start
const [roadSectionEnd, setRoadSectionEnd] = useState('') // 路段 End const [roadSectionEnd, setRoadSectionEnd] = useState('') // 路段 End
@ -84,6 +89,7 @@ const Index = () => {
} }
setReportType(data.reportType) setReportType(data.reportType)
setProjectType(showPrjType || data.projectType) setProjectType(showPrjType || data.projectType)
setProjectName(data.projectName)
setRoad(data.road) setRoad(data.road)
setRoadSectionStart(data.roadSectionStart) setRoadSectionStart(data.roadSectionStart)
setRoadSectionEnd(data.roadSectionEnd) setRoadSectionEnd(data.roadSectionEnd)
@ -161,13 +167,17 @@ const Index = () => {
]) ])
}, [reportType]) }, [reportType])
function report() { function report () {
if (!canReport) { return } if (!canReport) { return }
if (!projectType || !road) { if (
(isPatrol && (!projectType || !road))
|| (isAnomaly && !road)
) {
Taro.showToast({ title: '请完善必填信息', icon: 'none' }) Taro.showToast({ title: '请完善必填信息', icon: 'none' })
return return
} }
if (prjTypeSelector.indexOf(projectType) === -1) {
if (isPatrol && prjTypeSelector.indexOf(projectType) === -1) {
Taro.showToast({ title: '工程类型错误', icon: 'none' }) Taro.showToast({ title: '工程类型错误', icon: 'none' })
return return
} }
@ -175,10 +185,14 @@ const Index = () => {
Taro.showToast({ title: '内容字数不能超过50', icon: 'none' }) Taro.showToast({ title: '内容字数不能超过50', icon: 'none' })
return return
} }
const reportProjectType = prjType[prjTypeSelector.indexOf(projectType)].value if (isRoad && !projectName) {
Taro.showToast({ title: '请完善项目名称', icon: 'none' })
return
}
const reportProjectType = prjType[prjTypeSelector.indexOf(projectType)]?.value || ''
let data = { let data = {
reportType, reportType: isPatrol ? reportType : kind,
projectType: reportProjectType, projectType: reportProjectType,
road, road,
roadSectionStart, roadSectionStart,
@ -186,7 +200,8 @@ const Index = () => {
address, address,
content, content,
longitude, longitude,
latitude latitude,
projectName,
} }
if (reportType === 'patrol') { if (reportType === 'patrol') {
data['scenePic'] = sceneImg data['scenePic'] = sceneImg
@ -226,7 +241,7 @@ const Index = () => {
}) })
} }
function deleteReport() { function deleteReport () {
Taro.showModal({ Taro.showModal({
title: '提示', title: '提示',
content: '确定删除吗？', content: '确定删除吗？',
@ -253,7 +268,7 @@ const Index = () => {
}) })
} }
function handleInput({ detail: { value } }, type) { function handleInput ({ detail: { value } }, type) {
switch (type) { switch (type) {
case 'roadSectionStart': case 'roadSectionStart':
setRoadSectionStart(value) setRoadSectionStart(value)
@ -276,20 +291,24 @@ const Index = () => {
break; break;
case 'content': case 'content':
setContent(value) setContent(value)
break;
case "projectName":
setProjectName(value)
break;
default: default:
break; break;
} }
} }
function handleTypeChange(e) { function handleTypeChange (e) {
setReportType(e.detail.value) setReportType(e.detail.value)
} }
function handleImgChange(files, operationType, index, type) { function handleImgChange (files, operationType, index, type) {
if (operationType === 'remove') { if (operationType === 'remove') {
setImg(false) setImg(false)
} }
function setImg(isAdd, url) { function setImg (isAdd, url) {
switch (type) { switch (type) {
case 'scenePic': case 'scenePic':
let nextImg = sceneImg let nextImg = sceneImg
@ -376,7 +395,7 @@ const Index = () => {
} }
} }
function handleImgClick(index, file) { function handleImgClick (index, file) {
Taro.previewImage({ Taro.previewImage({
urls: [file.url] // 需要预览的图片http链接列表 urls: [file.url] // 需要预览的图片http链接列表
}) })
@ -385,7 +404,9 @@ const Index = () => {
return ( return (
<View className='patrol'> <View className='patrol'>
{ {
(!isSuperAdmin || isView) && (!isSuperAdmin || isView)
&& !isRoad && !isAnomaly
&&
<View className='report-type'> <View className='report-type'>
<View className='text'>上报类型</View> <View className='text'>上报类型</View>
<RadioGroup onChange={handleTypeChange}> <RadioGroup onChange={handleTypeChange}>
@ -408,66 +429,92 @@ const Index = () => {
</RadioGroup> </RadioGroup>
</View> </View>
} }
<InputPicker
title='工程类型：'
placeholder='请选择工程类型'
value={projectType}
onInput={setProjectType}
selector={prjTypeSelector}
isView={isView}
/>
<InputPicker
key={sourceRoadSel} // 添加key保证selector更新重新渲染
title='所在道路：'
placeholder='请选择或输入您所在的道路'
value={road}
onInput={setRoad}
selector={sourceRoadSel}
isView={isView}
/>
<View className='road-section'> {
<View className='title'>所属路段：</View> isPatrol ?
<Input <InputPicker
className='input' title='工程类型：'
type='text' placeholder='请选择工程类型'
placeholder={isView ? '' : '路段名称'} value={projectType}
border={false} onInput={setProjectType}
value={roadSectionStart} selector={prjTypeSelector}
onInput={e => handleInput(e, 'roadSectionStart')} isView={isView}
disabled={isView} /> : ''
/> }
{
!isView && {
<Picker isRoad ?
mode='selector' <View className='address'>
range={roadStartSel} <View className='title'>项目名称：</View>
onChange={e => setRoadSectionStart(roadStartSel[e.detail.value])} <Input
> className='input'
<Image src={arrowIcon} className='img-l' /> type='text'
</Picker> placeholder={isView ? '' : '请输入项目名称'}
} value={projectName}
<View>至&nbsp;</View> onInput={e => handleInput(e, 'projectName')}
<Input disabled={isView}
className='input' />
type='text' </View> : ''
placeholder={isView ? '' : '路段名称'} }
border={false}
value={roadSectionEnd} {
onInput={e => handleInput(e, 'roadSectionEnd')} isPatrol || isAnomaly ?
disabled={isView} <InputPicker
/> key={sourceRoadSel} // 添加key保证selector更新重新渲染
{ title='所在道路：'
!isView && placeholder='请选择或输入您所在的道路'
<Picker value={road}
mode='selector' onInput={setRoad}
range={roadEndSel} selector={sourceRoadSel}
onChange={e => setRoadSectionEnd(roadEndSel[e.detail.value])} isView={isView}
> /> : ''
<Image src={arrowIcon} className='img-r' /> }
</Picker>
} {
</View> isPatrol || isAnomaly ?
<View className='road-section'>
<View className='title'>所属路段：</View>
<Input
className='input'
type='text'
placeholder={isView ? '' : '路段名称'}
border={false}
value={roadSectionStart}
onInput={e => handleInput(e, 'roadSectionStart')}
disabled={isView}
/>
{
!isView &&
<Picker
mode='selector'
range={roadStartSel}
onChange={e => setRoadSectionStart(roadStartSel[e.detail.value])}
>
<Image src={arrowIcon} className='img-l' />
</Picker>
}
<View>至&nbsp;</View>
<Input
className='input'
type='text'
placeholder={isView ? '' : '路段名称'}
border={false}
value={roadSectionEnd}
onInput={e => handleInput(e, 'roadSectionEnd')}
disabled={isView}
/>
{
!isView &&
<Picker
mode='selector'
range={roadEndSel}
onChange={e => setRoadSectionEnd(roadEndSel[e.detail.value])}
>
<Image src={arrowIcon} className='img-r' />
</Picker>
}
</View> : ''
}
<View className='address'> <View className='address'>
<View className='title'>具体位置：</View> <View className='title'>具体位置：</View>
@ -490,7 +537,7 @@ const Index = () => {
maxLength={50} maxLength={50}
/> />
{ {
reportType === 'patrol' ? reportType === 'patrol' || isRoad || isAnomaly ?
<View className='patrol-img'> <View className='patrol-img'>
现场图片： 现场图片：
{ {
@ -577,7 +624,9 @@ const Index = () => {
} }
{ {
isView ? isView ?
isSuperAdmin && <AtButton type='primary' className='del-btn' onClick={deleteReport}>删除</AtButton> : isSuperAdmin &&
<AtButton type='primary' className='del-btn' onClick={deleteReport}>删除</AtButton>
:
<AtButton type='primary' className='sub-btn' onClick={report}>上报</AtButton> <AtButton type='primary' className='sub-btn' onClick={report}>上报</AtButton>
} }
</View> </View>

58
weapp/src/packages/patrolView/index.jsx
View File

@ -14,12 +14,16 @@ import patrolActiveIcon from '../../static/img/patrolView/patrol-active.svg'
import conserveIcon from '../../static/img/patrolView/conserve.svg' import conserveIcon from '../../static/img/patrolView/conserve.svg'
import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg' import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg'
function Index() { function Index () {
const userInfo = Taro.getStorageSync('userInfo') || {}; const userInfo = Taro.getStorageSync('userInfo') || {};
const router = useRouter() const router = useRouter()
const { params: { filter } } = router const { params: { filter, kind } } = router
const [isPatrol, setIsPatrol] = useState(true) const isPatrol = kind === 'patrol' ? true : false
const isRoad = kind === 'road' ? true : false
const isAnomaly = kind === 'anomaly' ? true : false
const [reportType, setReportType] = useState(kind || 'patrol')
const [datePicker, setDatePicker] = useState('') const [datePicker, setDatePicker] = useState('')
const [listData, setListData] = useState([]) const [listData, setListData] = useState([])
const [filterText, setFilterText] = useState('') const [filterText, setFilterText] = useState('')
@ -32,13 +36,13 @@ function Index() {
useEffect(() => { useEffect(() => {
setPage(0) setPage(0)
setNum(Math.random()) setNum(Math.random())
}, [isPatrol, datePicker]) }, [reportType, datePicker])
useEffect(() => { useEffect(() => {
getList(page == 0 ? true : false) getList(page == 0 ? true : false)
}, [num]) }, [num])
function dealError(error) { function dealError (error) {
Taro.showToast({ Taro.showToast({
title: error, title: error,
icon: 'none', icon: 'none',
@ -54,7 +58,7 @@ function Index() {
startTime: datePicker ? datePicker + ' 00:00:00' : '', startTime: datePicker ? datePicker + ' 00:00:00' : '',
endTime: datePicker ? datePicker + ' 23:59:59' : '', endTime: datePicker ? datePicker + ' 23:59:59' : '',
keyword: filterText, keyword: filterText,
reportType: isPatrol ? 'patrol' : 'conserve', reportType: reportType,
userId: filter === 'my' ? userInfo.id : '', userId: filter === 'my' ? userInfo.id : '',
} }
request.get(getReportList(), data).then(res => { request.get(getReportList(), data).then(res => {
@ -99,10 +103,6 @@ function Index() {
}); });
}) })
const onTypeChange = bool => {
setIsPatrol(bool)
}
const onDateChange = e => { const onDateChange = e => {
setDatePicker(e.detail.value); setDatePicker(e.detail.value);
} }
@ -121,23 +121,28 @@ function Index() {
} }
const handleDetail = index => { const handleDetail = index => {
Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${listData[index].id}` }) Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${listData[index].id}&kind=${kind}` })
} }
return ( return (
<View> <View>
<View className='type-box'> {
<View className='item' onClick={() => onTypeChange(true)}> isPatrol ?
<Image className='type-img' src={isPatrol ? patrolActiveIcon : patrolIcon} /> <View className='type-box'>
<View style={{ color: isPatrol ? '#346FC2' : '#999999' }}>巡查</View> <View className='item' onClick={() => setReportType('patrol')}>
</View> <Image className='type-img' src={reportType == 'patrol' ? patrolActiveIcon : patrolIcon} />
<View className='line'></View> <View style={{ color: reportType == 'patrol' ? '#346FC2' : '#999999' }}>巡查</View>
<View className='item' onClick={() => onTypeChange(false)}> </View>
<Image className='type-img' src={isPatrol ? conserveIcon : conserveActiveIcon} /> <View className='line'></View>
<View style={{ color: isPatrol ? '#999999' : '#346FC2' }}>养护</View> <View className='item' onClick={() => setReportType('conserve')}>
</View> <Image className='type-img' src={reportType == 'conserve' ? conserveActiveIcon : conserveIcon} />
</View> <View style={{ color: reportType == 'conserve' ? '#346FC2' : '#999999' }}>养护</View>
<View className='filter-box'> </View>
</View>
: ""
}
<View className='filter-box' style={{ top: isPatrol ? "40px" : '0' }}>
<View className='filter-item'> <View className='filter-item'>
<View style={{ float: 'left', marginLeft: '20rpx', color: '#333' }}>日期：</View> <View style={{ float: 'left', marginLeft: '20rpx', color: '#333' }}>日期：</View>
<Picker <Picker
@ -154,11 +159,12 @@ function Index() {
</View> </View>
<View class='head-search'> <View class='head-search'>
<Image className='search-img' src={searchIcon} /> <Image className='search-img' src={searchIcon} />
<Input class='heard-search-input' value={filterText} placeholder='请输入道路名称' onConfirm={handleConfirm} onInput={handleInput} /> <Input class='heard-search-input' value={filterText} placeholder={
isRoad ? '请输入项目名称' : '请输入道路名称'} onConfirm={handleConfirm} onInput={handleInput} />
</View> </View>
</View> </View>
<View style={{ marginTop: '110px' }}> <View style={{ marginTop: isPatrol ? '110px' : "80px" }}>
{ {
listData && listData.length > 0 ? listData && listData.map((e, index) => { listData && listData.length > 0 ? listData && listData.map((e, index) => {
return ( return (
@ -166,7 +172,7 @@ function Index() {
<View className='card-item' > <View className='card-item' >
<Image className='card-bg' src={cardImg} /> <Image className='card-bg' src={cardImg} />
<View className='card-position'> <View className='card-position'>
<View className='card-title'>{e.road}</View> <View className='card-title'>{e.road || e.projectName}</View>
<View style={{ float: 'left', width: '100%', fontSize: '28rpx', marginTop: '16rpx' }}> <View style={{ float: 'left', width: '100%', fontSize: '28rpx', marginTop: '16rpx' }}>
<View style={{ float: 'left' }}>填报人：</View> <View style={{ float: 'left' }}>填报人：</View>
<View style={{ float: 'left' }}>{e.user && e.user.name}</View> <View style={{ float: 'left' }}>{e.user && e.user.name}</View>

2
weapp/src/packages/patrolView/index.scss
View File

@ -34,7 +34,7 @@ page {
.filter-box { .filter-box {
position: fixed; position: fixed;
top: 80px; // top: 80px;
display: flex; display: flex;
width: 100%; width: 100%;
z-index: 100; z-index: 100;

36
weapp/src/pages/home/index.jsx
View File

@ -26,18 +26,18 @@ const Index = () => {
} }
}, []) }, [])
function toPatrol() { function toPatrol (kind) {
Taro.navigateTo({ Taro.navigateTo({
url: '/packages/patrol/index?type=edit' url: `/packages/patrol/index?type=edit&kind=${kind}`
}) })
} }
function toPatrolView() { function toPatrolView (kind) {
Taro.navigateTo({ Taro.navigateTo({
url: '/packages/patrolView/index' url: `/packages/patrolView/index?kind=${kind}`
}) })
} }
function toVideo() { function toVideo () {
Taro.navigateTo({ Taro.navigateTo({
url: '/packages/video/index' url: '/packages/video/index'
}) })
@ -47,7 +47,31 @@ const Index = () => {
<View className='page'> <View className='page'>
<View className='card fill'> <View className='card fill'>
<View className='title'>巡 查 养 护</View> <View className='title'>巡 查 养 护</View>
<View className='btn' onClick={isSuperAdmin ? toPatrolView : toPatrol}> <View className='btn' onClick={
isSuperAdmin ?
() => toPatrolView('patrol')
: () => toPatrol('patrol')
}>
{isSuperAdmin ? '查看' : '填报'}
</View>
</View>
<View className='card fill_road'>
<View className='title'>在 建 道 路</View>
<View className='btn' onClick={
isSuperAdmin ?
() => toPatrolView('road')
: () => toPatrol('road')
}>
{isSuperAdmin ? '查看' : '填报'}
</View>
</View>
<View className='card fill_anomaly'>
<View className='title'>异 常 反 馈</View>
<View className='btn' onClick={
isSuperAdmin ?
() => toPatrolView('anomaly')
: () => toPatrol('anomaly')
}>
{isSuperAdmin ? '查看' : '填报'} {isSuperAdmin ? '查看' : '填报'}
</View> </View>
</View> </View>

10
weapp/src/pages/home/index.scss
View File

@ -7,13 +7,21 @@
margin-top: 30px; margin-top: 30px;
padding: 10px; padding: 10px;
width: 94%; width: 94%;
height: 360px; height: 280px;
} }
.fill { .fill {
background: url('../../static/img/home/fill-bg.svg') no-repeat; background: url('../../static/img/home/fill-bg.svg') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.fill_road {
background: url('../../static/img/home/fill-road.svg') no-repeat;
background-size: 100% 100%;
}
.fill_anomaly {
background: url('../../static/img/home/fill-anomaly.svg') no-repeat;
background-size: 100% 100%;
}
.video { .video {
background: url('../../static/img/home/video-bg.svg') no-repeat; background: url('../../static/img/home/video-bg.svg') no-repeat;

26
weapp/src/pages/user/index.jsx
View File

@ -23,15 +23,15 @@ const Index = ({ ...props }) => {
Taro.navigateTo({ url: '/packages/changePassword/index' }) Taro.navigateTo({ url: '/packages/changePassword/index' })
} }
const toMyReport = () => { const toMyReport = (kind) => {
Taro.navigateTo({ Taro.navigateTo({
url: '/packages/patrolView/index?filter=my' url: `/packages/patrolView/index?filter=my&kind=${kind}`
}) })
} }
const toPatrolReport = () => { const toPatrolReport = (kind) => {
Taro.navigateTo({ Taro.navigateTo({
url: '/packages/patrol/index?type=edit' url: `/packages/patrol/index?type=edit&kind=${kind}`
}) })
} }
@ -64,7 +64,7 @@ const Index = ({ ...props }) => {
</View> </View>
</View> </View>
<View className='box' onClick={isSuperAdmin ? toPatrolReport : toMyReport}> <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('patrol') : () => toMyReport('patrol')}>
<Image className='box-img' src={reportImg} /> <Image className='box-img' src={reportImg} />
<View className='box-txt'> <View className='box-txt'>
{isSuperAdmin ? '巡查上报' : '我的上报'} {isSuperAdmin ? '巡查上报' : '我的上报'}
@ -72,6 +72,22 @@ const Index = ({ ...props }) => {
<Image className='img' src={moreImg} /> <Image className='img' src={moreImg} />
</View> </View>
<View className='box' onClick={isSuperAdmin ? () => toPatrolReport('road') : () => toMyReport('road')}>
<Image className='box-img' src={reportImg} />
<View className='box-txt'>
{isSuperAdmin ? '在建道路上报' : '在建道路'}
</View>
<Image className='img' src={moreImg} />
</View>
<View className='box' onClick={isSuperAdmin ? () => toPatrolReport('anomaly') : () => toMyReport('anomaly')}>
<Image className='box-img' src={reportImg} />
<View className='box-txt'>
{isSuperAdmin ? '异常反馈上报' : '异常反馈'}
</View>
<Image className='img' src={moreImg} />
</View>
<View className='box' onClick={changePassword} style={{ marginTop: '2rpx' }}> <View className='box' onClick={changePassword} style={{ marginTop: '2rpx' }}>
<Image className='box-img' src={pswdImg} /> <Image className='box-img' src={pswdImg} />
<View className='box-txt'>修改密码</View> <View className='box-txt'>修改密码</View>

49
weapp/src/static/img/home/fill-anomaly.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

252
weapp/src/static/img/home/fill-bg.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 38 KiB

49
weapp/src/static/img/home/fill-road.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

11
web/client/src/layout/containers/layout/index.js
View File

@ -46,10 +46,11 @@ const LayoutContainer = props => {
)); ));
} }
useEffect(() => { useEffect(() => {
dispatch(getDepMessage()).then((res) => { if (user && user.authorized)
setDepMessage(res) dispatch(getDepMessage()).then((res) => {
}) setDepMessage(res)
}, [true]) })
}, [user])
useEffect(() => { useEffect(() => {
scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true }); scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true });
}, []) }, [])
@ -132,7 +133,7 @@ const LayoutContainer = props => {
) )
} }
function mapStateToProps(state) { function mapStateToProps (state) {
const { global, auth, ajaxResponse } = state; const { global, auth, ajaxResponse } = state;
return { return {
title: global.title, title: global.title,

17
web/client/src/sections/fillion/actions/patrol.js
View File

@ -2,7 +2,7 @@ import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils' import { ApiTable } from '$utils'
export function getReportList(query) { export function getReportList (query) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
@ -14,7 +14,7 @@ export function getReportList(query) {
}); });
} }
export function getReportDetail(reportId) { export function getReportDetail (reportId) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
@ -25,7 +25,7 @@ export function getReportDetail(reportId) {
}); });
} }
export function getUserList(query) { export function getUserList (query) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
@ -36,3 +36,14 @@ export function getUserList(query) {
reducer: { name: 'userList' } reducer: { name: 'userList' }
}); });
} }
export function handleReport (data) {
return dispatch => basicAction({
type: 'post',
dispatch: dispatch,
actionType: 'HANDLE_REPORT',
url: ApiTable.handleReport,
data: data,
msg: { option: '获取巡查数据失败' },
});
}

219
web/client/src/sections/fillion/components/patrolTable.js
View File

@ -12,12 +12,15 @@ import styles from './protable.less';
import moment from 'moment'; import moment from 'moment';
const DetailForm = (props) => { const DetailForm = (props) => {
const { visible, data, handleClose, loading } = props; const { visible, data, handleClose, loading, isAnomaly, isRoad, isPatrol } = props;
const [qndmn] = useState(localStorage.getItem('qndmn')); const [qndmn] = useState(localStorage.getItem('qndmn'));
const keyList = [ const keyList = [
// { key: '编号', name: 'id' }, // { key: '编号', name: 'id' },
{ key: '工程类型', name: 'projectType' }, { key: '工程类型', name: 'projectType', skip: !isPatrol },
{ key: '所在路段', name: 'road' }, { key: '工程名称', name: 'projectName', skip: !isRoad },
{ key: '所在路段', name: 'road', skip: isRoad },
{ key: '具体位置', name: 'address' }, { key: '具体位置', name: 'address' },
{ key: '巡查内容', name: 'content' }, { key: '巡查内容', name: 'content' },
{ key: '现场照片', name: 'scenePic' }, { key: '现场照片', name: 'scenePic' },
@ -29,24 +32,27 @@ const DetailForm = (props) => {
// }) // })
return keyList.map(obj => { return keyList.map(obj => {
return <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}> return (
<span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span> obj.skip ? null :
{ <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}>
obj.name != 'scenePic' ? <span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span>
<Input style={{ width: '70%' }} value={obj.name == 'id' ? moment(data.time).format("YYYYMMDD") * 10000 + data.id : data[obj.name]} disabled /> {
: obj.name != 'scenePic' ?
<div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}> <Input style={{ width: '70%' }} value={obj.name == 'id' ? moment(data.time).format("YYYYMMDD") * 10000 + data.id : data[obj.name]} disabled />
{ :
data.scenePic && data.scenePic instanceof Array ? data.scenePic.map(imgSrc => { <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}>
return <div style={{ width: '44%', margin: 6 }}> {
<Image src={qndmn + '/' + imgSrc} width={'100%'} style={{ marginBottom: 4 }} /> data.scenePic && data.scenePic instanceof Array ? data.scenePic.map(imgSrc => {
</div> return <div style={{ width: '44%', margin: 6 }}>
}) : '暂无图片' <Image src={qndmn + '/' + imgSrc} width={'100%'} style={{ marginBottom: 4 }} />
} </div>
</div> }) : '暂无图片'
}
</div>
} }
</div> </div>
)
}) })
} else { } else {
return '暂无数据' return '暂无数据'
@ -58,7 +64,11 @@ const DetailForm = (props) => {
visible={visible} visible={visible}
footer={null} footer={null}
onCancel={handleClose} onCancel={handleClose}
title={'巡查管理详情'} title={
isPatrol ?
'巡查管理详情' :
isRoad ? '建设上报详情' : '异常反馈详情'
}
> >
<Spin spinning={loading}> <Spin spinning={loading}>
{renderContent(data)} {renderContent(data)}
@ -68,9 +78,13 @@ const DetailForm = (props) => {
} }
const DetailList = (props) => { const DetailList = (props) => {
const { reportList, loading, dispatch, handleOpen, handelRefresh } = props; const { reportList, loading, dispatch, handleOpen, handelRefresh, isAnomaly, isRoad, isPatrol } = props;
const [visible, setVisible] = useState(false) const [visible, setVisible] = useState(false)
const [selectRecord, setSelectRecord] = useState(); const [selectRecord, setSelectRecord] = useState();
const [noProcessingPopVisible, setNoProcessingPopVisible] = useState(false);
const [noProcessingSelectRecord, setNoProcessingSelectRecord] = useState();
const checkDetail = (record) => { const checkDetail = (record) => {
dispatch(getReportDetail(record.id)) dispatch(getReportDetail(record.id))
} }
@ -95,54 +109,65 @@ const DetailList = (props) => {
let counter = 0; let counter = 0;
const columns = [ const columns = [
{ isPatrol ? {
title: '编号', title: '编号',
key: 'id', key: 'id',
dataIndex: 'id', dataIndex: 'id',
align: 'center', align: 'center',
render: (text, record) => { render: (text, record) => {
let day = moment(record.time).format("YYYYMMDD") let day = moment(record.time).format("YYYYMMDD")
if(!basicDate){ if (!basicDate) {
basicDate = day; basicDate = day;
counter +=1;
} else if(basicDate == day){
counter += 1; counter += 1;
} else if(basicDate != day){ } else if (basicDate == day) {
counter += 1;
} else if (basicDate != day) {
basicDate = day; basicDate = day;
counter = 1; counter = 1;
} }
return moment(record.time).format("YYYYMMDD") * 10000 + counter; return moment(record.time).format("YYYYMMDD") * 10000 + counter;
} }
}, } : '',
{ isPatrol ?
title: '工程类型', {
key: 'projectType', title: '工程类型',
dataIndex: 'projectType', key: 'projectType',
align: 'center', dataIndex: 'projectType',
render: (text, record) => { align: 'center',
switch (text) { render: (text, record) => {
case 'road': return '道路'; switch (text) {
case 'bridge': return '桥梁'; case 'road': return '道路';
case 'culvert': return '涵洞'; case 'bridge': return '桥梁';
case 'other': return '其他'; case 'culvert': return '涵洞';
default: return text; case 'other': return '其他';
default: return text;
}
} }
} } : '',
}, isRoad ?
{ {
title: '所属道路', title: '工程名称',
key: 'road', key: 'projectName',
dataIndex: 'road', dataIndex: 'projectName',
align: 'center' align: 'center',
}, { } : '',
title: '所在路段', isPatrol || isAnomaly ?
key: 'address', {
dataIndex: 'address', title: '所属道路',
align: 'center', key: 'road',
render: (text, record) => { dataIndex: 'road',
return `${record.roadSectionStart || ''}-${record.roadSectionEnd || ''}` align: 'center'
} } : '',
}, isPatrol || isAnomaly ?
{
title: '所在路段',
key: 'address',
dataIndex: 'address',
align: 'center',
render: (text, record) => {
return `${record.roadSectionStart || ''}-${record.roadSectionEnd || ''}`
}
} : '',
{ {
title: '具体内容', title: '具体内容',
key: 'content', key: 'content',
@ -150,7 +175,7 @@ const DetailList = (props) => {
align: 'center' align: 'center'
}, },
{ {
title: '巡查人', title: isRoad ? '上报人' : '巡查人',
width: 100, width: 100,
key: 'userName', key: 'userName',
dataIndex: 'userName', dataIndex: 'userName',
@ -175,6 +200,23 @@ const DetailList = (props) => {
<Button <Button
onClick={() => { checkDetail(record); handleOpen(); }} onClick={() => { checkDetail(record); handleOpen(); }}
style={{ marginRight: 10 }}>查看</Button>, style={{ marginRight: 10 }}>查看</Button>,
isAnomaly ? <Button>指派</Button> : null,
isAnomaly ?
<Popover
content={[
<div style={{ width: '100%', height: 30 }}>
<Button onClick={() => setNoProcessingPopVisible(false)} style={{ float: "right" }} >否</Button>
<Button type="primary" onClick={() => handleRemove(record)} style={{ marginRight: 8, float: "right" }} >是</Button>
</div>
]}
visible={noProcessingSelectRecord == record.id && noProcessingPopVisible}
trigger="click"
onClick={() => setNoProcessingSelectRecord(record.id)}
title="是否删除该记录？"
onVisibleChange={(newVisible) => setNoProcessingPopVisible(newVisible)}
>
<Button>不处理</Button>
</Popover> : null,
<Popover <Popover
content={[ content={[
<div style={{ width: '100%', height: 30 }}> <div style={{ width: '100%', height: 30 }}>
@ -193,7 +235,7 @@ const DetailList = (props) => {
] ]
} }
}, },
]; ].filter(s => s);
return ( return (
<ProTable <ProTable
columns={columns} columns={columns}
@ -221,13 +263,13 @@ const PatrolNameList = (props) => {
useEffect(() => { useEffect(() => {
if (userList && userList instanceof Array && userList.length) { if (userList && userList instanceof Array && userList.length) {
setSelectRoad(userList[0].id) setSelectRoad(userList[0].id)
// onChange(userList[0]); // onChange(userList[0]);
} }
if(activeTabKey1 == 'tab2'){ if (activeTabKey1 == 'tab2') {
setSelectRoad(null) setSelectRoad(null)
} }
}, [userList, activeTabKey1]) }, [userList, activeTabKey1])
@ -281,8 +323,8 @@ const PatrolNameList = (props) => {
onClick: () => { onClick: () => {
if (record) { if (record) {
// console.log('record:', record) // console.log('record:', record)
let id = record.id let id = record.id
if(selectRoad == record.id){ if (selectRoad == record.id) {
id = null id = null
} }
setSelectRoad(id); setSelectRoad(id);
@ -299,7 +341,7 @@ const PatrolNameList = (props) => {
const PatrolTable = (props) => { const PatrolTable = (props) => {
const { userList, reportList, dispatch, reportListLoading, reportDetail, reportDetailLoading, userLoading, exports } = props; const { userList, reportList, dispatch, reportListLoading, reportDetail, reportDetailLoading, userLoading, exports, pathname } = props;
const [record, setRecord] = useState(); const [record, setRecord] = useState();
const [dateRange, setDateRange] = useState(); const [dateRange, setDateRange] = useState();
const [detailVisible, setDetailVisible] = useState(false) const [detailVisible, setDetailVisible] = useState(false)
@ -307,6 +349,11 @@ const PatrolTable = (props) => {
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const isRoad = pathname.includes('road')
const isAnomaly = pathname.includes('anomaly')
const isPatrol = !isRoad && !isAnomaly
const reportType = isRoad ? 'road' : isAnomaly ? 'anomaly' : 'patrol';
console.log(isRoad, pathname, isPatrol);
useEffect(() => { useEffect(() => {
if (userList && userList instanceof Array) { if (userList && userList instanceof Array) {
setRecord(userList[0]); setRecord(userList[0]);
@ -320,7 +367,7 @@ const PatrolTable = (props) => {
}, [record, dateRange]) }, [record, dateRange])
const queryData = () => { const queryData = () => {
let query = { userId: record.id, reportType: 'patrol', asc: true } let query = { userId: record.id, reportType: reportType, asc: true }
if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) { if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss') query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss') query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
@ -337,7 +384,7 @@ const PatrolTable = (props) => {
}, [activeTabKey1]) }, [activeTabKey1])
const handelRefresh = () => { const handelRefresh = () => {
let query = { userId: record.id, reportType: 'patrol', asc: true } let query = { userId: record.id, reportType: reportType, asc: true }
dispatch(getReportList(query)); dispatch(getReportList(query));
} }
@ -358,11 +405,16 @@ const PatrolTable = (props) => {
}, },
]; ];
const contentList = { const contentList = {
tab1: [<div> tab1: [
<Card style={{ flex: 1 }}> <div>
<DetailList reportList={reportList} record={record} loading={reportListLoading} dispatch={dispatch} handleOpen={handleOpen} handelRefresh={handelRefresh} /> <Card style={{ flex: 1 }}>
</Card> <DetailList
</div>], reportList={reportList} record={record} loading={reportListLoading} dispatch={dispatch} handleOpen={handleOpen} handelRefresh={handelRefresh}
isPatrol={isPatrol} isRoad={isRoad} isAnomaly={isAnomaly}
/>
</Card>
</div>
],
tab2: <PatrolGis userId={(record || {}).id} dispatch={dispatch} reportList={reportList} /> tab2: <PatrolGis userId={(record || {}).id} dispatch={dispatch} reportList={reportList} />
}; };
const onTab1Change = (key) => { const onTab1Change = (key) => {
@ -396,25 +448,28 @@ const PatrolTable = (props) => {
</Card> </Card>
<Card <Card
style={{ flex: 1 }} style={{ flex: 1 }}
tabList={tabList} tabList={isPatrol ? tabList : undefined}
activeTabKey={activeTabKey1} activeTabKey={activeTabKey1}
onTabChange={(key) => { onTabChange={(key) => {
onTab1Change(key); onTab1Change(key);
}} }}
> >
{ {
activeTabKey1 == 'tab1' ? <div style={{ marginBottom: 20 }}> activeTabKey1 == 'tab1' ?
<RangePicker onChange={(date, dateString) => { setDateRange(dateString) }} /> <div style={{ marginBottom: 20 }}>
<Button style={{ marginLeft: 20 }}>查询</Button> <RangePicker onChange={(date, dateString) => { setDateRange(dateString) }} />
<Button style={{ marginLeft: 20 }} onClick={handleExport} >导出</Button> <Button style={{ marginLeft: 20 }}>查询</Button>
</div> : '' <Button style={{ marginLeft: 20 }} onClick={handleExport} >导出</Button>
</div> : ''
} }
{contentList[activeTabKey1]} {contentList[activeTabKey1]}
<DetailForm <DetailForm
visible={detailVisible} visible={detailVisible}
handleClose={handleClose} handleClose={handleClose}
data={reportDetail} data={reportDetail}
loading={reportDetailLoading} /> loading={reportDetailLoading}
isPatrol={isPatrol} isRoad={isRoad} isAnomaly={isAnomaly}
/>
</Card> </Card>
</div> </div>

55
web/client/src/sections/fillion/containers/patrol.js
View File

@ -4,36 +4,37 @@ import '../style.less';
import { getDepMessage, getReportStatistic } from "../actions/infor" import { getDepMessage, getReportStatistic } from "../actions/infor"
import { getUserList } from '../actions/patrol'; import { getUserList } from '../actions/patrol';
import PatrolTable from '../components/patrolTable'; import PatrolTable from '../components/patrolTable';
const superagent = require('superagent');
const patrol = (props) => { const patrol = (props) => {
const { dispatch, user } = props const { dispatch, user, location: { pathname } } = props
const [data, setData] = useState()
useEffect(() => {
// dispatch(getDepMessage())
setData(props) const [data, setData] = useState()
}, []); useEffect(() => {
setData(props)
}, []);
useEffect(() => { useEffect(() => {
dispatch(getUserList()) dispatch(getUserList())
}, [true]) }, [true])
//批量导出 //批量导出
const exports = (ids, counts) => { const exports = (ids, counts) => {
// console.log(user); // console.log(user);
let reportIds = ids.toString(); let reportIds = ids.toString();
window.open( window.open(
'/_api/' + '/_api/' +
`data/export?exp=patrol&ids=${reportIds}&token=${user.token}`) `data/export?exp=patrol&ids=${reportIds}&token=${user.token}`)
} }
return ( return (
<> <PatrolTable data={data} exports={exports} /> <>
</> <PatrolTable data={data} exports={exports} pathname={pathname} />
) </>
)
} }
function mapStateToProps(state) {
const { auth } = state function mapStateToProps (state) {
return { const { auth } = state
user: auth.user, return {
} user: auth.user,
}
} }
export default connect(mapStateToProps)(patrol); export default connect(mapStateToProps)(patrol);

8
web/client/src/sections/fillion/nav-item.js
View File

@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
import { Menu } from 'antd'; import { Menu } from 'antd';
import { ReadOutlined } from '@ant-design/icons'; import { ReadOutlined } from '@ant-design/icons';
const SubMenu = Menu.SubMenu; const SubMenu = Menu.SubMenu;
export function getNavItem(user, dispatch) { export function getNavItem (user, dispatch) {
return ( return (
<SubMenu key="fillion" icon={<ReadOutlined />} title={'数据管理'}> <SubMenu key="fillion" icon={<ReadOutlined />} title={'数据管理'}>
<Menu.Item key="fillioninfor"> <Menu.Item key="fillioninfor">
@ -47,6 +47,12 @@ export function getNavItem(user, dispatch) {
<Menu.Item key="fillionpromotional"> <Menu.Item key="fillionpromotional">
<Link to="/fillion/promotional">宣传视频</Link> <Link to="/fillion/promotional">宣传视频</Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="fillionpatrolanomaly">
<Link to="/fillion/patrol_anomaly">异常反馈</Link>
</Menu.Item>
<Menu.Item key="fillionpatrolroad">
<Link to="/fillion/patrol_road">建设上报</Link>
</Menu.Item>
</SubMenu> </SubMenu>
); );
} }

12
web/client/src/sections/fillion/routes.js
View File

@ -77,6 +77,18 @@ export default [{
menuSelectKeys: ['fillionpatrol'], menuSelectKeys: ['fillionpatrol'],
component: Patrol, component: Patrol,
breadcrumb: '巡查管理', breadcrumb: '巡查管理',
}, {
path: '/patrol_anomaly',
key: 'fillionpatrolanomaly',
menuSelectKeys: ['fillionpatrolanomaly'],
component: Patrol,
breadcrumb: '异常反馈',
}, {
path: '/patrol_road',
key: 'fillionpatrolroad',
menuSelectKeys: ['fillionpatrolroad'],
component: Patrol,
breadcrumb: '建设上报',
}, { }, {
path: '/public', path: '/public',
key: 'fillionpublic', key: 'fillionpublic',

258
web/package-lock.json
View File

@ -2579,18 +2579,21 @@
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "3.2.1", "version": "3.2.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
"requires": { "requires": {
"color-convert": "^1.9.0" "color-convert": "^1.9.0"
} }
}, },
"asap": { "asap": {
"version": "2.0.6", "version": "2.0.6",
"resolved": false "resolved": "http://10.8.30.22:7000/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
}, },
"asn1": { "asn1": {
"version": "0.2.4", "version": "0.2.4",
"resolved": false, "resolved": "http://10.8.30.22:7000/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
"optional": true, "optional": true,
"requires": { "requires": {
"safer-buffer": "~2.1.0" "safer-buffer": "~2.1.0"
@ -2598,31 +2601,37 @@
}, },
"assert-plus": { "assert-plus": {
"version": "1.0.0", "version": "1.0.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"optional": true "optional": true
}, },
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"optional": true "optional": true
}, },
"aws-sign2": { "aws-sign2": {
"version": "0.7.0", "version": "0.7.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/aws-sign2/-/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
"optional": true "optional": true
}, },
"aws4": { "aws4": {
"version": "1.8.0", "version": "1.8.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
"optional": true "optional": true
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"resolved": false "resolved": "http://10.8.30.22:7000/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.2", "version": "1.0.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"optional": true, "optional": true,
"requires": { "requires": {
"tweetnacl": "^0.14.3" "tweetnacl": "^0.14.3"
@ -2630,7 +2639,8 @@
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": false, "resolved": "http://10.8.30.22:7000/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -2638,12 +2648,14 @@
}, },
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"optional": true "optional": true
}, },
"chalk": { "chalk": {
"version": "2.4.1", "version": "2.4.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/chalk/-/chalk-2.4.1.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"requires": { "requires": {
"ansi-styles": "^3.2.1", "ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5", "escape-string-regexp": "^1.0.5",
@ -2652,22 +2664,26 @@
}, },
"clone": { "clone": {
"version": "2.1.2", "version": "2.1.2",
"resolved": false "resolved": "http://10.8.30.22:7000/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
}, },
"color-convert": { "color-convert": {
"version": "1.9.2", "version": "1.9.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/color-convert/-/color-convert-1.9.2.tgz",
"integrity": "sha1-SYgbj7pn3xKpa98/VsCqueeRMUc=",
"requires": { "requires": {
"color-name": "1.1.1" "color-name": "1.1.1"
} }
}, },
"color-name": { "color-name": {
"version": "1.1.1", "version": "1.1.1",
"resolved": false "resolved": "http://10.8.30.22:7000/color-name/-/color-name-1.1.1.tgz",
"integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
}, },
"combined-stream": { "combined-stream": {
"version": "1.0.7", "version": "1.0.7",
"resolved": false, "resolved": "http://10.8.30.22:7000/combined-stream/-/combined-stream-1.0.7.tgz",
"integrity": "sha1-LR0kMXr7ir6V1tLAsHtXgTU52Cg=",
"optional": true, "optional": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
@ -2675,16 +2691,19 @@
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"resolved": false "resolved": "http://10.8.30.22:7000/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"optional": true "optional": true
}, },
"dashdash": { "dashdash": {
"version": "1.14.1", "version": "1.14.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"optional": true, "optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
@ -2692,12 +2711,14 @@
}, },
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"optional": true "optional": true
}, },
"ecc-jsbn": { "ecc-jsbn": {
"version": "0.1.2", "version": "0.1.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"optional": true, "optional": true,
"requires": { "requires": {
"jsbn": "~0.1.0", "jsbn": "~0.1.0",
@ -2706,7 +2727,8 @@
}, },
"errno": { "errno": {
"version": "0.1.7", "version": "0.1.7",
"resolved": false, "resolved": "http://10.8.30.22:7000/errno/-/errno-0.1.7.tgz",
"integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
"optional": true, "optional": true,
"requires": { "requires": {
"prr": "~1.0.1" "prr": "~1.0.1"
@ -2714,31 +2736,37 @@
}, },
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.5", "version": "1.0.5",
"resolved": false "resolved": "http://10.8.30.22:7000/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
}, },
"extend": { "extend": {
"version": "3.0.2", "version": "3.0.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/extend/-/extend-3.0.2.tgz",
"integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
"optional": true "optional": true
}, },
"extsprintf": { "extsprintf": {
"version": "1.3.0", "version": "1.3.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
"optional": true "optional": true
}, },
"fast-json-stable-stringify": { "fast-json-stable-stringify": {
"version": "2.0.0", "version": "2.0.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
"optional": true "optional": true
}, },
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"optional": true "optional": true
}, },
"form-data": { "form-data": {
"version": "2.3.3", "version": "2.3.3",
"resolved": false, "resolved": "http://10.8.30.22:7000/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
"optional": true, "optional": true,
"requires": { "requires": {
"asynckit": "^0.4.0", "asynckit": "^0.4.0",
@ -2748,11 +2776,13 @@
}, },
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": false "resolved": "http://10.8.30.22:7000/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
}, },
"getpass": { "getpass": {
"version": "0.1.7", "version": "0.1.7",
"resolved": false, "resolved": "http://10.8.30.22:7000/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"optional": true, "optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
@ -2760,7 +2790,8 @@
}, },
"glob": { "glob": {
"version": "7.1.3", "version": "7.1.3",
"resolved": false, "resolved": "http://10.8.30.22:7000/glob/-/glob-7.1.3.tgz",
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "^1.0.0",
"inflight": "^1.0.4", "inflight": "^1.0.4",
@ -2772,17 +2803,20 @@
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.15", "version": "4.1.15",
"resolved": false, "resolved": "http://10.8.30.22:7000/graceful-fs/-/graceful-fs-4.1.15.tgz",
"integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=",
"optional": true "optional": true
}, },
"har-schema": { "har-schema": {
"version": "2.0.0", "version": "2.0.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
"optional": true "optional": true
}, },
"har-validator": { "har-validator": {
"version": "5.1.3", "version": "5.1.3",
"resolved": false, "resolved": "http://10.8.30.22:7000/har-validator/-/har-validator-5.1.3.tgz",
"integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=",
"optional": true, "optional": true,
"requires": { "requires": {
"ajv": "^6.5.5", "ajv": "^6.5.5",
@ -2791,7 +2825,8 @@
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.6.2", "version": "6.6.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/ajv/-/ajv-6.6.2.tgz",
"integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=",
"optional": true, "optional": true,
"requires": { "requires": {
"fast-deep-equal": "^2.0.1", "fast-deep-equal": "^2.0.1",
@ -2802,18 +2837,21 @@
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "2.0.1", "version": "2.0.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
"optional": true "optional": true
} }
} }
}, },
"has-flag": { "has-flag": {
"version": "3.0.0", "version": "3.0.0",
"resolved": false "resolved": "http://10.8.30.22:7000/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
}, },
"hash.js": { "hash.js": {
"version": "1.1.7", "version": "1.1.7",
"resolved": false, "resolved": "http://10.8.30.22:7000/hash.js/-/hash.js-1.1.7.tgz",
"integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=",
"requires": { "requires": {
"inherits": "^2.0.3", "inherits": "^2.0.3",
"minimalistic-assert": "^1.0.1" "minimalistic-assert": "^1.0.1"
@ -2821,7 +2859,8 @@
}, },
"http-signature": { "http-signature": {
"version": "1.2.0", "version": "1.2.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"optional": true, "optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
@ -2831,12 +2870,14 @@
}, },
"image-size": { "image-size": {
"version": "0.5.5", "version": "0.5.5",
"resolved": false, "resolved": "http://10.8.30.22:7000/image-size/-/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"optional": true "optional": true
}, },
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": false, "resolved": "http://10.8.30.22:7000/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": { "requires": {
"once": "^1.3.0", "once": "^1.3.0",
"wrappy": "1" "wrappy": "1"
@ -2844,45 +2885,54 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"resolved": false "resolved": "http://10.8.30.22:7000/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
}, },
"is-regexp": { "is-regexp": {
"version": "2.1.0", "version": "2.1.0",
"resolved": false "resolved": "http://10.8.30.22:7000/is-regexp/-/is-regexp-2.1.0.tgz",
"integrity": "sha1-zXNKVoZOI7lWv058ZsOWpMCyLC0="
}, },
"is-typedarray": { "is-typedarray": {
"version": "1.0.0", "version": "1.0.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"optional": true "optional": true
}, },
"isstream": { "isstream": {
"version": "0.1.2", "version": "0.1.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"optional": true "optional": true
}, },
"jsbn": { "jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"optional": true "optional": true
}, },
"json-schema": { "json-schema": {
"version": "0.2.3", "version": "0.2.3",
"resolved": false, "resolved": "http://10.8.30.22:7000/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
"optional": true "optional": true
}, },
"json-schema-traverse": { "json-schema-traverse": {
"version": "0.4.1", "version": "0.4.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
"optional": true "optional": true
}, },
"json-stringify-safe": { "json-stringify-safe": {
"version": "5.0.1", "version": "5.0.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"optional": true "optional": true
}, },
"jsprim": { "jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"optional": true, "optional": true,
"requires": { "requires": {
"assert-plus": "1.0.0", "assert-plus": "1.0.0",
@ -2893,7 +2943,8 @@
}, },
"less": { "less": {
"version": "3.9.0", "version": "3.9.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/less/-/less-3.9.0.tgz",
"integrity": "sha1-t1EcQ/N89X3Iff/ZiD7BISibFHQ=",
"requires": { "requires": {
"clone": "^2.1.2", "clone": "^2.1.2",
"errno": "^0.1.1", "errno": "^0.1.1",
@ -2908,7 +2959,8 @@
}, },
"less-plugin-npm-import": { "less-plugin-npm-import": {
"version": "2.1.0", "version": "2.1.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz",
"integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=",
"requires": { "requires": {
"promise": "~7.0.1", "promise": "~7.0.1",
"resolve": "~1.1.6" "resolve": "~1.1.6"
@ -2916,30 +2968,35 @@
"dependencies": { "dependencies": {
"promise": { "promise": {
"version": "7.0.4", "version": "7.0.4",
"resolved": false, "resolved": "http://10.8.30.22:7000/promise/-/promise-7.0.4.tgz",
"integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=",
"requires": { "requires": {
"asap": "~2.0.3" "asap": "~2.0.3"
} }
}, },
"resolve": { "resolve": {
"version": "1.1.7", "version": "1.1.7",
"resolved": false "resolved": "http://10.8.30.22:7000/resolve/-/resolve-1.1.7.tgz",
"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
} }
} }
}, },
"mime": { "mime": {
"version": "1.6.0", "version": "1.6.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/mime/-/mime-1.6.0.tgz",
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
"optional": true "optional": true
}, },
"mime-db": { "mime-db": {
"version": "1.37.0", "version": "1.37.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/mime-db/-/mime-db-1.37.0.tgz",
"integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=",
"optional": true "optional": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.21", "version": "2.1.21",
"resolved": false, "resolved": "http://10.8.30.22:7000/mime-types/-/mime-types-2.1.21.tgz",
"integrity": "sha1-KJlaoey3cHQv5q5+WPkYHHRLP5Y=",
"optional": true, "optional": true,
"requires": { "requires": {
"mime-db": "~1.37.0" "mime-db": "~1.37.0"
@ -2947,23 +3004,27 @@
}, },
"minimalistic-assert": { "minimalistic-assert": {
"version": "1.0.1", "version": "1.0.1",
"resolved": false "resolved": "http://10.8.30.22:7000/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
"integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc="
}, },
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"resolved": false, "resolved": "http://10.8.30.22:7000/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
"resolved": false, "resolved": "http://10.8.30.22:7000/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
"optional": true "optional": true
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.5", "version": "0.5.5",
"resolved": false, "resolved": "http://10.8.30.22:7000/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8=",
"optional": true, "optional": true,
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
@ -2971,28 +3032,33 @@
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.9.0", "version": "0.9.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
"optional": true "optional": true
}, },
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
"resolved": false "resolved": "http://10.8.30.22:7000/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
}, },
"performance-now": { "performance-now": {
"version": "2.1.0", "version": "2.1.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"optional": true "optional": true
}, },
"postcss": { "postcss": {
"version": "6.0.23", "version": "6.0.23",
"resolved": false, "resolved": "http://10.8.30.22:7000/postcss/-/postcss-6.0.23.tgz",
"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",
"source-map": "^0.6.1", "source-map": "^0.6.1",
@ -3001,7 +3067,8 @@
}, },
"promise": { "promise": {
"version": "7.3.1", "version": "7.3.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/promise/-/promise-7.3.1.tgz",
"integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
"optional": true, "optional": true,
"requires": { "requires": {
"asap": "~2.0.3" "asap": "~2.0.3"
@ -3009,27 +3076,32 @@
}, },
"prr": { "prr": {
"version": "1.0.1", "version": "1.0.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/prr/-/prr-1.0.1.tgz",
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
"optional": true "optional": true
}, },
"psl": { "psl": {
"version": "1.1.31", "version": "1.1.31",
"resolved": false, "resolved": "http://10.8.30.22:7000/psl/-/psl-1.1.31.tgz",
"integrity": "sha1-6aqG0BAbWxBcvpOsa3hM1UcnYYQ=",
"optional": true "optional": true
}, },
"punycode": { "punycode": {
"version": "2.1.1", "version": "2.1.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
"optional": true "optional": true
}, },
"qs": { "qs": {
"version": "6.5.2", "version": "6.5.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
"optional": true "optional": true
}, },
"request": { "request": {
"version": "2.88.0", "version": "2.88.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/request/-/request-2.88.0.tgz",
"integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=",
"optional": true, "optional": true,
"requires": { "requires": {
"aws-sign2": "~0.7.0", "aws-sign2": "~0.7.0",
@ -3056,21 +3128,25 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
"optional": true "optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
"optional": true "optional": true
}, },
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": false "resolved": "http://10.8.30.22:7000/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
}, },
"sshpk": { "sshpk": {
"version": "1.15.2", "version": "1.15.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/sshpk/-/sshpk-1.15.2.tgz",
"integrity": "sha1-yUbWvZsaOdDoY1dj9SQtbtbctik=",
"optional": true, "optional": true,
"requires": { "requires": {
"asn1": "~0.2.3", "asn1": "~0.2.3",
@ -3086,21 +3162,24 @@
}, },
"strip-css-comments": { "strip-css-comments": {
"version": "4.1.0", "version": "4.1.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/strip-css-comments/-/strip-css-comments-4.1.0.tgz",
"integrity": "sha512-azjRwrqk7nK21LU7QuL7DpDyPjvRROQvqPrNyyz6emdzbOh6fsNTvkSvUiThBLzC6+MN90rFu296VbPb/KV+3A==",
"requires": { "requires": {
"is-regexp": "^2.1.0" "is-regexp": "^2.1.0"
} }
}, },
"supports-color": { "supports-color": {
"version": "5.4.0", "version": "5.4.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q=",
"requires": { "requires": {
"has-flag": "^3.0.0" "has-flag": "^3.0.0"
} }
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.4.3", "version": "2.4.3",
"resolved": false, "resolved": "http://10.8.30.22:7000/tough-cookie/-/tough-cookie-2.4.3.tgz",
"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
"optional": true, "optional": true,
"requires": { "requires": {
"psl": "^1.1.24", "psl": "^1.1.24",
@ -3109,14 +3188,16 @@
"dependencies": { "dependencies": {
"punycode": { "punycode": {
"version": "1.4.1", "version": "1.4.1",
"resolved": false, "resolved": "http://10.8.30.22:7000/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"optional": true "optional": true
} }
} }
}, },
"tunnel-agent": { "tunnel-agent": {
"version": "0.6.0", "version": "0.6.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"optional": true, "optional": true,
"requires": { "requires": {
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
@ -3124,12 +3205,14 @@
}, },
"tweetnacl": { "tweetnacl": {
"version": "0.14.5", "version": "0.14.5",
"resolved": false, "resolved": "http://10.8.30.22:7000/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
"optional": true "optional": true
}, },
"uri-js": { "uri-js": {
"version": "4.2.2", "version": "4.2.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/uri-js/-/uri-js-4.2.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"optional": true, "optional": true,
"requires": { "requires": {
"punycode": "^2.1.0" "punycode": "^2.1.0"
@ -3137,12 +3220,14 @@
}, },
"uuid": { "uuid": {
"version": "3.3.2", "version": "3.3.2",
"resolved": false, "resolved": "http://10.8.30.22:7000/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
"optional": true "optional": true
}, },
"verror": { "verror": {
"version": "1.10.0", "version": "1.10.0",
"resolved": false, "resolved": "http://10.8.30.22:7000/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"optional": true, "optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
@ -3152,7 +3237,8 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"resolved": false "resolved": "http://10.8.30.22:7000/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
} }
} }
}, },

2
web/package.json
View File

@ -6,7 +6,7 @@
"scripts": { "scripts": {
"test": "mocha", "test": "mocha",
"start": "cross-env NODE_ENV=development npm run start-params", "start": "cross-env NODE_ENV=development npm run start-params",
"start-params": "node server -p 5000 -u http://localhost:14000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com", "start-params": "node server -p 5000 -u http://localhost:13400 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
"deploy": "export NODE_ENV=production&&npm run color && npm run build && node server", "deploy": "export NODE_ENV=production&&npm run color && npm run build && node server",
"build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js", "build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js",
"build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js", "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",

Write Preview
Loading…
Cancel
Save