diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/src/assets/case/status_toHandle.png b/src/assets/case/status_toHandle.png new file mode 100644 index 0000000..fea9fe9 --- /dev/null +++ b/src/assets/case/status_toHandle.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/src/assets/case/status_toHandle.png b/src/assets/case/status_toHandle.png new file mode 100644 index 0000000..fea9fe9 --- /dev/null +++ b/src/assets/case/status_toHandle.png Binary files differ diff --git a/src/assets/case/status_toVerify.png b/src/assets/case/status_toVerify.png new file mode 100644 index 0000000..f553650 --- /dev/null +++ b/src/assets/case/status_toVerify.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/src/assets/case/status_toHandle.png b/src/assets/case/status_toHandle.png new file mode 100644 index 0000000..fea9fe9 --- /dev/null +++ b/src/assets/case/status_toHandle.png Binary files differ diff --git a/src/assets/case/status_toVerify.png b/src/assets/case/status_toVerify.png new file mode 100644 index 0000000..f553650 --- /dev/null +++ b/src/assets/case/status_toVerify.png Binary files differ diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 2dd1a60..931a024 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -4,7 +4,7 @@
案卷详情
- 查看地图 + 查看地图
@@ -352,7 +352,8 @@ title="位置详情" > - + + @@ -366,12 +367,13 @@ import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' import TianDiTuMapRead from '@/components/Map/tiandiMapRead' import ArcGisMapRead from '@/components/Map/arcgisMapRead' +import LeafletMapRead from '@/components/Map/leafletMapRead' import { radioMap } from './radioMap' import CaseFile from '@/components/caseCommon/caseFile' export default { name: 'CaseDetail', - components: { TianDiTuMapRead, ArcGisMapRead, CaseFile }, + components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead }, data() { const validateEmptyString = (rule, value, callback) => { if (!value.trim()) { @@ -880,6 +882,11 @@ this.$message.error('请选择部门') return false } + const checkDept = _.find(this.processCompObj.deptList, ['id', this.processCompObj.dispatchDeptId]) + if (!checkDept) { + this.$message.error('部门必须为处置单位') + return false + } this.processForm.dispatchDeptId = this.processCompObj.dispatchDeptId } else if (radioConfig.passBack === 'onedeptid') { this.processForm.dispatchDeptId = this.caseDetail.onedeptid diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/src/assets/case/status_toHandle.png b/src/assets/case/status_toHandle.png new file mode 100644 index 0000000..fea9fe9 --- /dev/null +++ b/src/assets/case/status_toHandle.png Binary files differ diff --git a/src/assets/case/status_toVerify.png b/src/assets/case/status_toVerify.png new file mode 100644 index 0000000..f553650 --- /dev/null +++ b/src/assets/case/status_toVerify.png Binary files differ diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 2dd1a60..931a024 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -4,7 +4,7 @@
案卷详情
- 查看地图 + 查看地图
@@ -352,7 +352,8 @@ title="位置详情" > - + + @@ -366,12 +367,13 @@ import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' import TianDiTuMapRead from '@/components/Map/tiandiMapRead' import ArcGisMapRead from '@/components/Map/arcgisMapRead' +import LeafletMapRead from '@/components/Map/leafletMapRead' import { radioMap } from './radioMap' import CaseFile from '@/components/caseCommon/caseFile' export default { name: 'CaseDetail', - components: { TianDiTuMapRead, ArcGisMapRead, CaseFile }, + components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead }, data() { const validateEmptyString = (rule, value, callback) => { if (!value.trim()) { @@ -880,6 +882,11 @@ this.$message.error('请选择部门') return false } + const checkDept = _.find(this.processCompObj.deptList, ['id', this.processCompObj.dispatchDeptId]) + if (!checkDept) { + this.$message.error('部门必须为处置单位') + return false + } this.processForm.dispatchDeptId = this.processCompObj.dispatchDeptId } else if (radioConfig.passBack === 'onedeptid') { this.processForm.dispatchDeptId = this.caseDetail.onedeptid diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 6f163ce..f8440a7 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -163,7 +163,8 @@ :append-to-body="true" title="位置详情" > - + + @@ -172,10 +173,11 @@ import 'element-ui/lib/theme-chalk/index.css' import { getCaseDetail } from '@/api/coorBusiness/case' import ArcGisMapRead from '@/components/Map/arcgisMapRead' +import LeafletMapRead from '@/components/Map/leafletMapRead' export default { name: 'CaseDetail', - components: { ArcGisMapRead }, + components: { ArcGisMapRead, LeafletMapRead }, props: { id: { type: String, diff --git a/config/dev.env.js b/config/dev.env.js index 2b11678..a5995ae 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,6 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://192.168.0.102:11414"' - // BASE_API: '"http://127.0.0.1:11414"' + // BASE_API: '"http://192.168.0.102:11414"' + BASE_API: '"http://127.0.0.1:11414"' }) diff --git a/config/index.js b/config/index.js index 15838f5..4396685 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/coorBusiness/process.js b/src/api/coorBusiness/process.js index 4cdabe2..44b5db5 100644 --- a/src/api/coorBusiness/process.js +++ b/src/api/coorBusiness/process.js @@ -28,3 +28,12 @@ params }) } + +export function cancelTask(params) { + console.log(params) + return request({ + url: '/process/cancelTask', + method: 'get', + params + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 02a38d0..3b67ef5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -93,3 +93,12 @@ } }) } + +// 在线用户查询 +export function getUserOnLine(params) { + return request({ + url: '/userDevice/userDeviceOnLine', + method: 'get', + params + }) +} diff --git a/src/assets/case/offline.png b/src/assets/case/offline.png new file mode 100644 index 0000000..d0a290f --- /dev/null +++ b/src/assets/case/offline.png Binary files differ diff --git a/src/assets/case/online.png b/src/assets/case/online.png new file mode 100644 index 0000000..767bcc5 --- /dev/null +++ b/src/assets/case/online.png Binary files differ diff --git a/src/assets/case/status_overTime.png b/src/assets/case/status_overTime.png new file mode 100644 index 0000000..9b3ecb8 --- /dev/null +++ b/src/assets/case/status_overTime.png Binary files differ diff --git a/src/assets/case/status_toCheck.png b/src/assets/case/status_toCheck.png new file mode 100644 index 0000000..19a8d89 --- /dev/null +++ b/src/assets/case/status_toCheck.png Binary files differ diff --git a/src/assets/case/status_toHandle.png b/src/assets/case/status_toHandle.png new file mode 100644 index 0000000..fea9fe9 --- /dev/null +++ b/src/assets/case/status_toHandle.png Binary files differ diff --git a/src/assets/case/status_toVerify.png b/src/assets/case/status_toVerify.png new file mode 100644 index 0000000..f553650 --- /dev/null +++ b/src/assets/case/status_toVerify.png Binary files differ diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 2dd1a60..931a024 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -4,7 +4,7 @@
案卷详情
- 查看地图 + 查看地图
@@ -352,7 +352,8 @@ title="位置详情" > - + + @@ -366,12 +367,13 @@ import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' import TianDiTuMapRead from '@/components/Map/tiandiMapRead' import ArcGisMapRead from '@/components/Map/arcgisMapRead' +import LeafletMapRead from '@/components/Map/leafletMapRead' import { radioMap } from './radioMap' import CaseFile from '@/components/caseCommon/caseFile' export default { name: 'CaseDetail', - components: { TianDiTuMapRead, ArcGisMapRead, CaseFile }, + components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead }, data() { const validateEmptyString = (rule, value, callback) => { if (!value.trim()) { @@ -880,6 +882,11 @@ this.$message.error('请选择部门') return false } + const checkDept = _.find(this.processCompObj.deptList, ['id', this.processCompObj.dispatchDeptId]) + if (!checkDept) { + this.$message.error('部门必须为处置单位') + return false + } this.processForm.dispatchDeptId = this.processCompObj.dispatchDeptId } else if (radioConfig.passBack === 'onedeptid') { this.processForm.dispatchDeptId = this.caseDetail.onedeptid diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 6f163ce..f8440a7 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -163,7 +163,8 @@ :append-to-body="true" title="位置详情" > - + + @@ -172,10 +173,11 @@ import 'element-ui/lib/theme-chalk/index.css' import { getCaseDetail } from '@/api/coorBusiness/case' import ArcGisMapRead from '@/components/Map/arcgisMapRead' +import LeafletMapRead from '@/components/Map/leafletMapRead' export default { name: 'CaseDetail', - components: { ArcGisMapRead }, + components: { ArcGisMapRead, LeafletMapRead }, props: { id: { type: String, diff --git a/src/components/CaseCommon/caseList.vue b/src/components/CaseCommon/caseList.vue index 92b33a4..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -1,11 +1,12 @@