diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c7fdd18..5808f59 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c7fdd18..5808f59 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index b1453b9..2dd5681 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -699,51 +699,55 @@
const imgUrl = process.env.BASE_API + '/static/'
- // 向后台再查询一次
- const id = feature.attributes.id
- request({
- url: 'case/detail/' + id,
- method: 'get'
- }).then(response => {
- if (response.code === 200) {
- const caseDetail = response.data[0]
+ // 如果点中的是案卷的图标,向后台再查询一次
+ if (feature.layer.id.indexOf('Case') > 0) {
+ const id = feature.attributes.id
+ if (id !== null && id !== '' && id !== 'undefined') {
+ request({
+ url: 'case/detail/' + id,
+ method: 'get'
+ }).then(response => {
+ if (response.code === 200) {
+ const caseDetail = response.data[0]
- let detailTableHtml = ''
- detailTableHtml += '' + '案卷状态:' + caseDetail.caseStateName + ' |
'
- detailTableHtml += '' + '案卷类别:' + caseDetail.eorcName + '/' + caseDetail.casetypeName + '/' + caseDetail.casetypeDetailName + ' |
'
- detailTableHtml += '' + '上报时间:' + caseDetail.createTime + ' |
'
- detailTableHtml += '' + '案卷地点:' + caseDetail.fieldintro + ' |
'
- detailTableHtml += '' + '案卷情况:' + caseDetail.description + ' |
'
- if (caseDetail.fileIdVerify !== '') {
- const verify = caseDetail.fileIdVerify.split(',')
- detailTableHtml += '上报图片 |
'
- detailTableHtml += ' | '
- if (verify[1] !== '') {
- detailTableHtml += ' |
'
- } else {
- detailTableHtml += ' | '
- }
- }
- if (caseDetail.fileIdProcess !== '') {
- const process = caseDetail.fileIdProcess.split(',')
- detailTableHtml += '处置图片 |
'
- detailTableHtml += ' | '
- if (process[1] !== '') {
- detailTableHtml += ' |
'
- } else {
- detailTableHtml += ' | '
- }
- }
- detailTableHtml += '
'
+ let detailTableHtml = ''
+ detailTableHtml += '' + '案卷状态:' + caseDetail.caseStateName + ' |
'
+ detailTableHtml += '' + '案卷类别:' + caseDetail.eorcName + '/' + caseDetail.casetypeName + '/' + caseDetail.casetypeDetailName + ' |
'
+ detailTableHtml += '' + '上报时间:' + caseDetail.createTime + ' |
'
+ detailTableHtml += '' + '案卷地点:' + caseDetail.fieldintro + ' |
'
+ detailTableHtml += '' + '案卷情况:' + caseDetail.description + ' |
'
+ if (caseDetail.fileIdVerify !== '') {
+ const verify = caseDetail.fileIdVerify.split(',')
+ detailTableHtml += '上报图片 |
'
+ detailTableHtml += ' | '
+ if (verify[1] !== '') {
+ detailTableHtml += ' |
'
+ } else {
+ detailTableHtml += ' | '
+ }
+ }
+ if (caseDetail.fileIdProcess !== '') {
+ const process = caseDetail.fileIdProcess.split(',')
+ detailTableHtml += '处置图片 |
'
+ detailTableHtml += ' | '
+ if (process[1] !== '') {
+ detailTableHtml += ' |
'
+ } else {
+ detailTableHtml += ' | '
+ }
+ }
+ detailTableHtml += '
'
- // 2弹出气泡
- that.view.popup.open({
- title: caseDetail.caseid,
- content: detailTableHtml,
- location: event.mapPoint
+ // 2弹出气泡
+ that.view.popup.open({
+ title: caseDetail.caseid,
+ content: detailTableHtml,
+ location: event.mapPoint
+ })
+ }
})
}
- })
+ }
})
}
})