diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
index f2158d3..23d50c9 100644
--- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
@@ -19,16 +19,23 @@
-
+
-
+
+
+
+
+
+
@@ -57,11 +64,11 @@
show-overflow-tooltip sortable>
-
+
-
+
@@ -114,6 +121,25 @@ const state = reactive({
// value_disasterDate: '',
// options_disasterCountry: [],
// value_disasterCountry: [],
+ //0-爬虫获取,1-未审核,2-,已审核,上传源数据未补充下载 链接,3-已审核上传源数据已补充下载链接
+ options_status: [
+ {
+ label: 'Crawler acquisition',
+ value: '0'
+ },
+ {
+ label: 'Unapproved',
+ value: '1'
+ },
+ {
+ label: 'Approved',
+ value: '2'
+ },
+ {
+ label: 'Finish',
+ value: '3'
+ },
+ ],
options_resolution: [{
label: '<0.8m',
value: '<0.8m'
@@ -263,21 +289,23 @@ const searchRemoteSensingSourceData = () => {
dataNew = {
disasterId: state.disasterId,
satelliteCodeList: state.satelliteCodeList.join(","),
- productResolutionVos: state.listData
+ productResolutionVos: state.listData,
+ status: state.status
}
} else {
dataNew = {
disasterId: state.disasterId,
- productResolutionVos: state.listData
+ productResolutionVos: state.listData,
+ status: state.status
}
}
getDataByCondition(state.tableData.param.pageNum, state.tableData.param.pageSize, dataNew)
}
-const reviseDownload = (row) =>{
+const reviseDownload = (row) => {
- console.log(row,"rowrowrow");
+ console.log(row, "rowrowrow");
}
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 6bd5ad5..39fd4dc 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -1,324 +1,171 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
{{ getValue(scope.row.disasterType) }}
-
-
+
+
{{ dateFormat(scope.row.disasterTime) }}
-
+
- Awaiting approval
- Rejected
+ Awaiting approval
+ Rejected
-
+
- Approve
+ Approve
-
+
-
-
-
-
-
+
+
+
+
+
{{ getValue(scope.row.disasterType) }}
-
-
+
+
{{ dateFormat(scope.row.disasterTime) }}
-
+
-
-
+
+
-
-
-
-
+
+
+
+
{{ getValue(scope.row.disasterType) }}
-
-
+
+
{{ dateFormat(scope.row.disasterTime) }}
-
-
-
+
+
+
- Approved
- Rejected
- Complete response
+ Approved
+ Rejected
+ Complete response
-
+
- Allocation
- Response ended
+ Allocation
+ Response ended
-
+
-
-
-
-
-
-
+
+
+
+
+
+
{{ getValue(scope.row.disasterType) }}
-
-
+
+
{{ dateFormat(scope.row.disasterTime) }}
-
+
{{ dateFormat(scope.row.respondedTime) }}
-
+
-
+
- Point
- Area
- Edit
- Clear
+ Point
+ Area
+ Edit
+ Clear
-
+
Latitude:
-
+
Longitude:
-
+
-
+
Latitude:
-
+
@@ -326,56 +173,53 @@
Longitude:
-
+
-
+
{{ state.popupLat }} , {{ state.popupLon }}
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -724,35 +568,42 @@ const getValue = (key) => {
};
diff --git a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue
index 31f38f5..9663d19 100644
--- a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue
+++ b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue
@@ -86,7 +86,7 @@ const batchDelete = () => {
type: 'warning',
})
.then(() => {
- let id = state.multipleSelection.map(item => ({ id: item.id, chiefId: null }))
+ let id = state.multipleSelection.map(item => ({ id: item.disasterId, chiefId: null }))
removeManage(id).then(res => {
getTableData();
ElMessage.success('delete successfully');
@@ -101,7 +101,7 @@ const deleteDisaster = (row) => {
type: 'warning',
})
.then(() => {
- let delData = [{ "id": row.id, "cheif": null }]
+ let delData = [{ "id": row.disasterId, "cheif": null }]
removeManage(delData).then(res => {
getTableData();
ElMessage.success('Deleted successfully');