diff --git a/src/layout/footer/index.vue b/src/layout/footer/index.vue index b10d0d4..079ee42 100644 --- a/src/layout/footer/index.vue +++ b/src/layout/footer/index.vue @@ -1,8 +1,7 @@ diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index 278421f..63e54a5 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -3,31 +3,16 @@ - - - - - - - {{ getValue(scope.row.disasterType) }} - - - - - + + + + start - - - + @@ -104,10 +89,11 @@ - + :total=" state.tableData.total "> @@ -150,6 +136,7 @@ import { getDictionary } from '/@/api/system/dictbiz'; import { defineAsyncComponent, reactive, onMounted, ref } from 'vue'; import { ElMessageBox, ElMessage } from 'element-plus'; import boot from "./component/boot.vue"; +import disasterTable from "/@/components/table/DisasterTable.vue"; // 引入组件 const auditRef = ref(); const bootRef = ref(); @@ -250,8 +237,8 @@ const formatSizeUnits = (size) => { return (size / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]; } //灾害表格点击事件 -const tableClick = (row, column, event) => { - state.disasterId = row.disasterId; +const tableClick = (i) => { + state.disasterId = i.disasterId; getTableData(); } // 初始化灾害表格数据 @@ -271,8 +258,8 @@ const getDisasterData = () => { } getList(param).then(res => { state.disasterData.data = res.records; - state.disasterData.data.forEach(item=>{ - let date = item.disasterTime.slice(0,10); + state.disasterData.data.forEach(item => { + let date = item.disasterTime.slice(0, 10); item.disasterTime = date; }) state.disasterData.total = res.total; @@ -377,11 +364,13 @@ onMounted(() => { .system-role-container { .system-role-padding { padding: 15px; + .el-table { flex: 1; } } } + .mt15 { display: flex; justify-content: end; diff --git a/src/views/dataService/otherData/component/upload.vue b/src/views/dataService/otherData/component/upload.vue index 29c6afa..74d3526 100644 --- a/src/views/dataService/otherData/component/upload.vue +++ b/src/views/dataService/otherData/component/upload.vue @@ -19,6 +19,10 @@ + + + @@ -27,7 +31,7 @@ - + @@ -154,6 +158,7 @@ const onSubmit = () => { state.dataForm.append('disasterId', state.disasterId); state.dataForm.append('visualFlag', state.ruleForm.visualFlag); state.dataForm.append('title', state.ruleForm.title); + state.dataForm.append('sourceOrganization', state.ruleForm.sourceOrganization); for (let [a, b] of state.dataForm.entries()) { console.log(a, b, '--------------'); } diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue index fee7c2e..bbf09bf 100644 --- a/src/views/dataService/otherData/index.vue +++ b/src/views/dataService/otherData/index.vue @@ -46,7 +46,7 @@ YES - @@ -252,6 +252,10 @@ const pub = (row) => { name:row.title } pushing(da).then(data => { + console.log(data,"datadatadatadata"); + if(data.code == 1500){ + ElMessage.error(data.msg); + } let daNew = { id: row.id, isPublish: 1 diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue index 7b6daac..286015f 100644 --- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue +++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue @@ -3,25 +3,15 @@ - Disaster Info - - - - - + + + start - - - + @@ -154,6 +144,8 @@ import { ref, reactive, onMounted } from 'vue'; import { getRemoteSensingSourceData, getRemoteSensingSourceDataByCondition, getPagesRemoteSensingSourceData } from "/@/api/remoteSensingSourceData/remoteSensingSourceData.js"; import { getDisasterPage } from '/@/api/data/otherData.js' +import disasterTable from "/@/components/table/DisasterTable.vue"; + // import { getList as getDisasterPage } from '/@/api/disasterInfo/index'; const state = reactive({ @@ -239,8 +231,8 @@ const getDisasterData = () => { } // 灾害表格点击事件 -const tableClick = (row) => { - state.disasterId = row.disasterId; +const tableClick = (i) => { + state.disasterId = i.disasterId; getData() } diff --git a/src/views/dataService/remoteSensingData/index.vue b/src/views/dataService/remoteSensingData/index.vue index d9afb1c..51eef66 100644 --- a/src/views/dataService/remoteSensingData/index.vue +++ b/src/views/dataService/remoteSensingData/index.vue @@ -1,17 +1,5 @@ - - diff --git a/src/views/systemManagement/index.vue b/src/views/systemManagement/index.vue deleted file mode 100644 index e69de29..0000000