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/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/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/Map/leafletMap.vue b/src/components/Map/leafletMap.vue new file mode 100644 index 0000000..c8b0b6f --- /dev/null +++ b/src/components/Map/leafletMap.vue @@ -0,0 +1,329 @@ + + + + + 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/Map/leafletMap.vue b/src/components/Map/leafletMap.vue new file mode 100644 index 0000000..c8b0b6f --- /dev/null +++ b/src/components/Map/leafletMap.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue new file mode 100644 index 0000000..dd22198 --- /dev/null +++ b/src/components/Map/leafletMapRead.vue @@ -0,0 +1,107 @@ + + + + + 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/Map/leafletMap.vue b/src/components/Map/leafletMap.vue new file mode 100644 index 0000000..c8b0b6f --- /dev/null +++ b/src/components/Map/leafletMap.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue new file mode 100644 index 0000000..dd22198 --- /dev/null +++ b/src/components/Map/leafletMapRead.vue @@ -0,0 +1,107 @@ + + + + + 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 }