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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ @@ -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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ + 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ + diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index f5ad0ac..a2ee151 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -14,23 +14,40 @@ end-placeholder="结束日期"/> - + +
+ + + 列表模式 + + + + 图表模式 + + + + 考核规则 + 导出报表 +
- 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ + diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index f5ad0ac..a2ee151 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -14,23 +14,40 @@ end-placeholder="结束日期"/> - + +
+ + + 列表模式 + + + + 图表模式 + + + + 考核规则 + 导出报表 +
- diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index e9b31d4..6f471f5 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -237,7 +237,11 @@ append-to-body> - + + + + @@ -254,6 +258,7 @@ import { Uploadimg } from '@/api/common' import TianDiTuMap from '@/components/Map/tiandiMap' import ArcgisMapComp from '@/components/Map/arcGISMap' +import LeafletMap from '@/components/Map/leafletMap' import VideoUpload from './components/videoUpload' import AudioUpload from './components/audioUpload' @@ -263,7 +268,8 @@ TianDiTuMap: TianDiTuMap, ArcgisMapComp: ArcgisMapComp, VideoUpload: VideoUpload, - AudioUpload: AudioUpload + AudioUpload: AudioUpload, + LeafletMap: LeafletMap }, data() { const phoneValidator = (rule, value, callback) => { @@ -587,7 +593,7 @@ // 关闭地图查询对话框 closeMapQueryDialogByEvent: function(longitude, latitude, communityId, communityName, gridId) { this.mapDialogVisible = false - debugger + // debugger // 赋值 this.caseForm.eorc = '1' // 事件点返回时案卷类别自动选择为事件 this.caseForm.communityCode = communityId @@ -839,7 +845,6 @@ display: flex; } - /deep/ .el-input__count-inner, .el-input__count{ line-height: initial !important } 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ + diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index f5ad0ac..a2ee151 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -14,23 +14,40 @@ end-placeholder="结束日期"/> - + +
+ + + 列表模式 + + + + 图表模式 + + + + 考核规则 + 导出报表 +
- diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index e9b31d4..6f471f5 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -237,7 +237,11 @@ append-to-body> - + + + + @@ -254,6 +258,7 @@ import { Uploadimg } from '@/api/common' import TianDiTuMap from '@/components/Map/tiandiMap' import ArcgisMapComp from '@/components/Map/arcGISMap' +import LeafletMap from '@/components/Map/leafletMap' import VideoUpload from './components/videoUpload' import AudioUpload from './components/audioUpload' @@ -263,7 +268,8 @@ TianDiTuMap: TianDiTuMap, ArcgisMapComp: ArcgisMapComp, VideoUpload: VideoUpload, - AudioUpload: AudioUpload + AudioUpload: AudioUpload, + LeafletMap: LeafletMap }, data() { const phoneValidator = (rule, value, callback) => { @@ -587,7 +593,7 @@ // 关闭地图查询对话框 closeMapQueryDialogByEvent: function(longitude, latitude, communityId, communityName, gridId) { this.mapDialogVisible = false - debugger + // debugger // 赋值 this.caseForm.eorc = '1' // 事件点返回时案卷类别自动选择为事件 this.caseForm.communityCode = communityId @@ -839,7 +845,6 @@ display: flex; } - /deep/ .el-input__count-inner, .el-input__count{ line-height: initial !important } diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue index 87cd9a1..cd3198c 100644 --- a/src/views/coorBusiness/completed/index.vue +++ b/src/views/coorBusiness/completed/index.vue @@ -7,8 +7,10 @@ :total="total" :list-query="listQuery" :table-columns="tableColumns" + show-cancel @changeQuery="changeQuery" - @addDetail="addDetail"/> + @addDetail="addDetail" + @cancel="cancel"/> @@ -16,6 +18,7 @@ import CaseList from '@/components/CaseCommon/caseList' import SearchForm from '@/components/CaseCommon/searchForm' import { completedListPage } from '@/api/coorBusiness/case' +import { cancelTask } from '@/api/coorBusiness/process' export default { name: 'Index', @@ -92,8 +95,25 @@ showNeedVisit: true } }) + }, + cancel(row) { + this.$confirm('确定撤销申请吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // 确定 + const cancelForm = { + 'bizId': row.id, + 'processId': row.processId, + 'caseState': row.caseState + } + cancelTask(cancelForm).then(res => { + this.$message.success('请求成功') + this.fetchData() + }) + }) } } - } 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/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 617dd05..5a2d34b 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -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()) { 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 c574dcd..6706961 100644 --- a/src/components/CaseCommon/caseList.vue +++ b/src/components/CaseCommon/caseList.vue @@ -6,6 +6,7 @@ + diff --git a/src/views/assessRegion/assessOverview.vue b/src/views/assessRegion/assessOverview.vue index f5ad0ac..a2ee151 100644 --- a/src/views/assessRegion/assessOverview.vue +++ b/src/views/assessRegion/assessOverview.vue @@ -14,23 +14,40 @@ end-placeholder="结束日期"/> - + +
+ + + 列表模式 + + + + 图表模式 + + + + 考核规则 + 导出报表 +
- diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index e9b31d4..6f471f5 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -237,7 +237,11 @@ append-to-body> - + + + + @@ -254,6 +258,7 @@ import { Uploadimg } from '@/api/common' import TianDiTuMap from '@/components/Map/tiandiMap' import ArcgisMapComp from '@/components/Map/arcGISMap' +import LeafletMap from '@/components/Map/leafletMap' import VideoUpload from './components/videoUpload' import AudioUpload from './components/audioUpload' @@ -263,7 +268,8 @@ TianDiTuMap: TianDiTuMap, ArcgisMapComp: ArcgisMapComp, VideoUpload: VideoUpload, - AudioUpload: AudioUpload + AudioUpload: AudioUpload, + LeafletMap: LeafletMap }, data() { const phoneValidator = (rule, value, callback) => { @@ -587,7 +593,7 @@ // 关闭地图查询对话框 closeMapQueryDialogByEvent: function(longitude, latitude, communityId, communityName, gridId) { this.mapDialogVisible = false - debugger + // debugger // 赋值 this.caseForm.eorc = '1' // 事件点返回时案卷类别自动选择为事件 this.caseForm.communityCode = communityId @@ -839,7 +845,6 @@ display: flex; } - /deep/ .el-input__count-inner, .el-input__count{ line-height: initial !important } diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue index 87cd9a1..cd3198c 100644 --- a/src/views/coorBusiness/completed/index.vue +++ b/src/views/coorBusiness/completed/index.vue @@ -7,8 +7,10 @@ :total="total" :list-query="listQuery" :table-columns="tableColumns" + show-cancel @changeQuery="changeQuery" - @addDetail="addDetail"/> + @addDetail="addDetail" + @cancel="cancel"/> @@ -16,6 +18,7 @@ import CaseList from '@/components/CaseCommon/caseList' import SearchForm from '@/components/CaseCommon/searchForm' import { completedListPage } from '@/api/coorBusiness/case' +import { cancelTask } from '@/api/coorBusiness/process' export default { name: 'Index', @@ -92,8 +95,25 @@ showNeedVisit: true } }) + }, + cancel(row) { + this.$confirm('确定撤销申请吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // 确定 + const cancelForm = { + 'bizId': row.id, + 'processId': row.processId, + 'caseState': row.caseState + } + cancelTask(cancelForm).then(res => { + this.$message.success('请求成功') + this.fetchData() + }) + }) } } - } diff --git a/static/project.config.json b/static/project.config.json index b81dd3b..4d1d6a1 100644 --- a/static/project.config.json +++ b/static/project.config.json @@ -1,6 +1,6 @@ { "title": "智慧城管平台", - "baseUrl": "http://111.198.10.15:11409/", + "baseUrl": "http://localhost:11414/", "sameWindow": false, "city":"崇仁县", "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",