diff --git a/src/views/dataService/multimediaData/component/boot.vue b/src/views/dataService/multimediaData/component/boot.vue index 52a460a..fd1e93d 100644 --- a/src/views/dataService/multimediaData/component/boot.vue +++ b/src/views/dataService/multimediaData/component/boot.vue @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index ee46835..632ec59 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -23,9 +23,9 @@ @@ -34,53 +34,54 @@ - - - - + + + + - - - - - + + + + + - - + + - + search - + review - + - + - - - baidu(中文) - bing - twitter - weibo + + + baidu(中文) + bing + twitter + weibo - - goto link + + goto link @@ -93,22 +94,25 @@ --> - - review - review - review + + review + review + review - + - + - + upload - + @@ -67,40 +44,24 @@ - - - - + + + + - {{formatName(scope.row.name)}} + {{ formatName(scope.row.name) }} - + - + - + - + @@ -114,42 +75,26 @@ --> - + - Edit - Delete + Edit + Delete - + - - - + + + @@ -172,198 +117,205 @@ const editUploadRef = ref(); // 定义变量内容 const roleDialogRef = ref(); const state = reactive({ - multipleSelection: [], - tabVal: 'first', - disasterId: null, - disasterData: { - data: [], - total: 0, - loading: false, - param: { - search: '', - pageNum: 1, - pageSize: 10, - }, - }, - tableData: { - data: [], - total: 0, - loading: false, - param: { - search: '', - pageNum: 1, - pageSize: 10, - }, - }, + multipleSelection: [], + tabVal: 'first', + disasterId: null, + disasterData: { + data: [], + total: 0, + loading: false, + param: { + search: '', + pageNum: 1, + pageSize: 10, + }, + }, + tableData: { + data: [], + total: 0, + loading: false, + param: { + search: '', + pageNum: 1, + pageSize: 10, + }, + }, }); const handleSelectionChange = (val) => { - state.multipleSelection = val; + state.multipleSelection = val; }; //格式化图片名称 const formatName = (name) => { - if (name) { - return name.substr(0, name.indexOf('.')); - } - return name; + if (name) { + return name.substr(0, name.indexOf('.')); + } + return name; }; const auditData = (row) => { - let id = row.id; - auditRef.value.openDialog([{ id: id }]); + let id = row.id; + auditRef.value.openDialog([{ id: id }]); }; //格式化字节 const formatSize = (size) => { - var data = ''; - if (size < 0.1 * 1024) { - //如果小于0.1KB转化成B - data = size.toFixed(2) + 'B'; - } else if (size < 0.1 * 1024 * 1024) { - //如果小于0.1MB转化成KB - data = (size / 1024).toFixed(2) + 'KB'; - } else if (size < 0.1 * 1024 * 1024 * 1024) { - //如果小于0.1GB转化成MB - data = (size / (1024 * 1024)).toFixed(2) + 'MB'; - } else { - //其他转化成GB - data = (size / (1024 * 1024 * 1024)).toFixed(2) + 'GB'; - } - var sizestr = data + ''; - var len = sizestr.indexOf('.'); - var dec = sizestr.substr(len + 1, 2); - if (dec == '00') { - //当小数点后为00时 去掉小数部分 - return sizestr.substring(0, len) + sizestr.substr(len + 3, 2); - } - return sizestr; + var data = ''; + if (size < 0.1 * 1024) { + //如果小于0.1KB转化成B + data = size.toFixed(2) + 'B'; + } else if (size < 0.1 * 1024 * 1024) { + //如果小于0.1MB转化成KB + data = (size / 1024).toFixed(2) + 'KB'; + } else if (size < 0.1 * 1024 * 1024 * 1024) { + //如果小于0.1GB转化成MB + data = (size / (1024 * 1024)).toFixed(2) + 'MB'; + } else { + //其他转化成GB + data = (size / (1024 * 1024 * 1024)).toFixed(2) + 'GB'; + } + var sizestr = data + ''; + var len = sizestr.indexOf('.'); + var dec = sizestr.substr(len + 1, 2); + if (dec == '00') { + //当小数点后为00时 去掉小数部分 + return sizestr.substring(0, len) + sizestr.substr(len + 3, 2); + } + return sizestr; }; const formatSizeUnits = (size) => { - if (size === 0 || size === -1) return '0 B'; - var k = 1000, // or 1024 - sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], - i = Math.floor(Math.log(size) / Math.log(k)); + if (size === 0 || size === -1) return '0 B'; + var k = 1000, // or 1024 + sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], + i = Math.floor(Math.log(size) / Math.log(k)); - return (size / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]; + return (size / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]; }; //灾害表格点击事件 const tableClick = (row, column, event) => { - state.disasterId = row.disasterId; - getTableData(); + state.disasterId = row.disasterId; + getTableData(); }; // 初始化灾害表格数据 const getDisasterData = () => { - state.disasterData.loading = true; - getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then((res) => { - state.disasterData.data = res.records; - state.disasterData.total = res.total; - state.disasterData.loading = false; - }); + state.disasterData.loading = true; + getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then((res) => { + state.disasterData.data = res.records; + state.disasterData.total = res.total; + state.disasterData.loading = false; + }); }; // 初始化表格数据 const getTableData = () => { - state.tableData.loading = true; - getPicturePage(state.tableData.param.pageNum, state.tableData.param.pageSize, { disasterId_equal: state.disasterId, isDeleted_equal: 0 }).then( - (res) => { - state.tableData.data = res.records; - state.tableData.total = res.total; - } - ); - setTimeout(() => { - state.tableData.loading = false; - }, 500); + state.tableData.loading = true; + getPicturePage(state.tableData.param.pageNum, state.tableData.param.pageSize, { disasterId_equal: state.disasterId, isDeleted_equal: 0 }).then( + (res) => { + state.tableData.data = res.records; + state.tableData.total = res.total; + } + ); + setTimeout(() => { + state.tableData.loading = false; + }, 500); }; // 打开上传弹窗 const uploadData = () => { - if (state.disasterId == null) { - ElMessage.warning('Please select the disaster first'); - return false; - } - uploadRef.value.openDialog(state.disasterId); + if (state.disasterId == null) { + ElMessage.warning('Please select the disaster first'); + return false; + } + uploadRef.value.openDialog(state.disasterId); }; // 打开修改角色弹窗 const editData = (row) => { - editUploadRef.value.openDialog(row); + editUploadRef.value.openDialog(row); }; //批量删除图片数据 const batchDel = () => { - if (state.multipleSelection.length == 0) { - ElMessage.warning('Select the data to be operated first'); - return false; - } - ElMessageBox.confirm(`This action batch deletes the picture data,Whether to continue?`, 'tip', { - confirmButtonText: 'confirm', - cancelButtonText: 'cancel', - type: 'warning', - }) - .then(() => { - let id = state.multipleSelection.map((item) => item.id); - delPicture(id.join()).then((res) => { - getTableData(); - ElMessage.success('delete successfully'); - }); - }) - .catch(() => {}); + if (state.multipleSelection.length == 0) { + ElMessage.warning('Select the data to be operated first'); + return false; + } + ElMessageBox.confirm(`This action batch deletes the picture data,Whether to continue?`, 'tip', { + confirmButtonText: 'confirm', + cancelButtonText: 'cancel', + type: 'warning', + }) + .then(() => { + let id = state.multipleSelection.map((item) => item.id); + delPicture(id.join()).then((res) => { + getTableData(); + ElMessage.success('delete successfully'); + }); + }) + .catch(() => { }); }; // 删除图片信息 const del = (row) => { - ElMessageBox.confirm(`This action will delete the picture:“${row.name}”,,Whether to continue?`, 'tip', { - confirmButtonText: 'confirm', - cancelButtonText: 'cancel', - type: 'warning', - }) - .then(() => { - delPicture(row.id).then((res) => { - getTableData(); - ElMessage.success('delete successfully'); - }); - }) - .catch(() => {}); + ElMessageBox.confirm(`This action will delete the picture:“${row.name}”,,Whether to continue?`, 'tip', { + confirmButtonText: 'confirm', + cancelButtonText: 'cancel', + type: 'warning', + }) + .then(() => { + delPicture(row.id).then((res) => { + getTableData(); + ElMessage.success('delete successfully'); + }); + }) + .catch(() => { }); }; // 分页改变 const onHandleDisasterSizeChange = (val) => { - state.disasterData.param.pageSize = val; - getDisasterData(); + state.disasterData.param.pageSize = val; + getDisasterData(); }; // 分页改变 const onHandleDisasterCurrentChange = (val) => { - state.disasterData.param.pageNum = val; - getDisasterData(); + state.disasterData.param.pageNum = val; + getDisasterData(); }; // 分页改变 const onHandleSizeChange = (val) => { - state.tableData.param.pageSize = val; - getTableData(); + state.tableData.param.pageSize = val; + getTableData(); }; // 分页改变 const onHandleCurrentChange = (val) => { - state.tableData.param.pageNum = val; - getTableData(); + state.tableData.param.pageNum = val; + getTableData(); }; // 页面加载时 onMounted(() => { - getDisasterData(); - //getTableData(); + getDisasterData(); + //getTableData(); }); diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue index a091222..cca3d07 100644 --- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue +++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue @@ -25,12 +25,12 @@ @@ -96,7 +96,7 @@ clearable placeholder="Select resolution" /> - + @@ -640,4 +640,8 @@ const searchDisasterDate = () => { .el-pagination { padding-left: 1%; } +.mt15 { + float: right; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/src/views/dataService/remoteSensingData/components/searchCondition.vue b/src/views/dataService/remoteSensingData/components/searchCondition.vue index 72b9bda..2d7fbae 100644 --- a/src/views/dataService/remoteSensingData/components/searchCondition.vue +++ b/src/views/dataService/remoteSensingData/components/searchCondition.vue @@ -7,7 +7,7 @@ Select time range - + Start time @@ -19,7 +19,7 @@ - + End time diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue index 4c97f1c..d21517d 100644 --- a/src/views/dataService/visualData/index.vue +++ b/src/views/dataService/visualData/index.vue @@ -1,44 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - upload - - - - - - batch delete - + + + + + upload + + + + + + batch delete + + + + + + + + + + + + + Edit + Delete + + + + + + + + + + + + + + + + Edit + Delete + + + + + + + - - - - - - - - - - - Edit - Delete - - - - - - - - - - - - - - - - Edit - Delete - - - - - - - - - - + + - - - - - + + + + + @@ -158,7 +105,7 @@ import HotspotForm from './component/hotspotForm.vue'; import WordClouds from './component/wordCloudForm.vue'; import EditHotspotForm from './component/editHotspotForm.vue'; import EditWordCloudsForm from './component/editWordCloudForm.vue'; -import {getWordClouds,getHotspot,getDisasterPage,delData} from '/@/api/data/visualData.js'; +import { getWordClouds, getHotspot, getDisasterPage, delData } from '/@/api/data/visualData.js'; import en from 'element-plus/dist/locale/en.mjs' const activeName = ref('first'); const hotspotRef = ref(); @@ -176,10 +123,10 @@ const uploadRef = ref(); // 定义变量内容 const roleDialogRef = ref(); const state = reactive({ - multipleWord:[], - multipleHotspot:[], - tabVal:'first', - disasterId:null, + multipleWord: [], + multipleHotspot: [], + tabVal: 'first', + disasterId: null, disasterData: { data: [], total: 0, @@ -211,7 +158,7 @@ const handleSelectionHotspotChange = (val) => { } const handleClick = (tab) => { state.tabVal = tab; - state. tableData={ + state.tableData = { data: [], total: 0, loading: false, @@ -225,7 +172,7 @@ const handleClick = (tab) => { }; const auditData = (row) => { let id = row.id - auditRef.value.openDialog([{"id":id}]); + auditRef.value.openDialog([{ "id": id }]); } //格式化字节 const formatSize = (size) => { @@ -250,8 +197,8 @@ const formatSize = (size) => { const formatSizeUnits = (size) => { if (size === 0) return '0 B'; var k = 1000, // or 1024 - sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], - i = Math.floor(Math.log(size) / Math.log(k)); + sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], + i = Math.floor(Math.log(size) / Math.log(k)); return (size / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]; } @@ -263,7 +210,7 @@ const tableClick = (row, column, event) => { // 初始化灾害表格数据 const getDisasterData = () => { state.disasterData.loading = true; - getDisasterPage(state.disasterData.param.pageNum,state.disasterData.param.pageSize,{}).then(res=>{ + getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then(res => { state.disasterData.data = res.records; state.disasterData.total = res.total; state.disasterData.loading = false; @@ -273,13 +220,13 @@ const getDisasterData = () => { // 初始化表格数据 const getTableData = () => { state.tableData.loading = true; - if(state.tabVal == 'first'){ - getWordClouds(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId_equal":state.disasterId,"isDeleted_equal":0}).then(res=>{ + if (state.tabVal == 'first') { + getWordClouds(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId_equal": state.disasterId, "isDeleted_equal": 0 }).then(res => { state.tableData.data = res.records; state.tableData.total = res.total; }) - }else { - getHotspot(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId_equal":state.disasterId,"isDeleted_equal":0}).then(res=>{ + } else { + getHotspot(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId_equal": state.disasterId, "isDeleted_equal": 0 }).then(res => { state.tableData.data = res.records; state.tableData.total = res.total; }) @@ -290,7 +237,7 @@ const getTableData = () => { }; // 打开上传弹窗 const uploadData = () => { - if(state.disasterId == null){ + if (state.disasterId == null) { ElMessage.warning("Please select the disaster first") return false; } @@ -306,11 +253,11 @@ const editWordCloud = (row) => { }; //批量删除词云或者热点数据 const batchDel = () => { - if(state.tabVal == 'first' && state.multipleWord.length == 0){ + if (state.tabVal == 'first' && state.multipleWord.length == 0) { ElMessage.warning("Select the data to be operated first"); return false; } - if(state.tabVal == 'second' && state.multipleHotspot.length == 0){ + if (state.tabVal == 'second' && state.multipleHotspot.length == 0) { ElMessage.warning("Select the data to be operated first"); return false; } @@ -319,24 +266,24 @@ const batchDel = () => { cancelButtonText: 'cancel', type: 'warning', }) - .then(() => { - if(state.tabVal == 'first'){ - //删除词云 - let id = state.multipleWord.map(item=>item.id) - delData(id.join(),1).then(res=>{ - getTableData(); - ElMessage.success('delete successfully'); - }) - }else{ - //删除热点 - let id = state.multipleHotspot.map(item=>item.id) - delData(id.join(),2).then(res=>{ - getTableData(); - ElMessage.success('delete successfully'); - }) - } - }) - .catch(() => {}); + .then(() => { + if (state.tabVal == 'first') { + //删除词云 + let id = state.multipleWord.map(item => item.id) + delData(id.join(), 1).then(res => { + getTableData(); + ElMessage.success('delete successfully'); + }) + } else { + //删除热点 + let id = state.multipleHotspot.map(item => item.id) + delData(id.join(), 2).then(res => { + getTableData(); + ElMessage.success('delete successfully'); + }) + } + }) + .catch(() => { }); } // 删除词云 const delWordCloud = (row) => { @@ -345,13 +292,13 @@ const delWordCloud = (row) => { cancelButtonText: 'cancel', type: 'warning', }) - .then(() => { - delData(row.id,1).then(res=>{ - getTableData(); - ElMessage.success('delete successfully'); - }) + .then(() => { + delData(row.id, 1).then(res => { + getTableData(); + ElMessage.success('delete successfully'); }) - .catch(() => {}); + }) + .catch(() => { }); }; // 删除热点 @@ -361,13 +308,13 @@ const delHotspot = (row) => { cancelButtonText: 'cancel', type: 'warning', }) - .then(() => { - delData(row.id,2).then(res=>{ - getTableData(); - ElMessage.success('delete successfully'); - }) + .then(() => { + delData(row.id, 2).then(res => { + getTableData(); + ElMessage.success('delete successfully'); }) - .catch(() => {}); + }) + .catch(() => { }); }; // 分页改变 const onHandleDisasterSizeChange = (val) => { @@ -396,7 +343,7 @@ onMounted(() => { }); diff --git a/src/views/dataUploadAndRetrieval/dataRetrieval/index.vue b/src/views/dataUploadAndRetrieval/dataRetrieval/index.vue index 19a2608..6c9c624 100644 --- a/src/views/dataUploadAndRetrieval/dataRetrieval/index.vue +++ b/src/views/dataUploadAndRetrieval/dataRetrieval/index.vue @@ -90,12 +90,12 @@ @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" - :pager-count="5" + :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background v-model:page-size="state.tableData.param.pageSize" - layout="total, sizes, prev, pager, next, jumper" + layout="total, sizes, prev, pager, next" :total="state.tableData.total" > --> diff --git a/src/views/dataUploadAndRetrieval/dataUpload/index.vue b/src/views/dataUploadAndRetrieval/dataUpload/index.vue index 0443ea4..dd14be8 100644 --- a/src/views/dataUploadAndRetrieval/dataUpload/index.vue +++ b/src/views/dataUploadAndRetrieval/dataUpload/index.vue @@ -90,12 +90,12 @@ @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" - :pager-count="5" + :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background v-model:page-size="state.tableData.param.pageSize" - layout="total, sizes, prev, pager, next, jumper" + layout="total, sizes, prev, pager, next" :total="state.tableData.total" > --> diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 3171e20..1a4d878 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -24,7 +24,7 @@ - + diff --git a/src/views/responseManagement/contact/index.vue b/src/views/responseManagement/contact/index.vue index 14248a7..ac9e866 100644 --- a/src/views/responseManagement/contact/index.vue +++ b/src/views/responseManagement/contact/index.vue @@ -57,9 +57,9 @@ + layout="total, sizes, prev, pager, next" :total="state.tableData.total"> @@ -217,3 +217,10 @@ onMounted(() => { }); + diff --git a/src/views/responseManagement/dataUpload/index.vue b/src/views/responseManagement/dataUpload/index.vue index 26e130e..842c47e 100644 --- a/src/views/responseManagement/dataUpload/index.vue +++ b/src/views/responseManagement/dataUpload/index.vue @@ -12,9 +12,9 @@ @@ -50,8 +50,8 @@ @@ -241,4 +241,8 @@ onMounted(() => { } } } +.mt15 { + float: right; + margin-bottom: 15px; +} diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue index 1d6781a..873e22e 100644 --- a/src/views/responseManagement/tool/index.vue +++ b/src/views/responseManagement/tool/index.vue @@ -62,10 +62,10 @@ + layout="total, sizes, prev, pager, next" :total="state.tableData.total"> @@ -171,3 +171,10 @@ onMounted(() => { }); + \ No newline at end of file diff --git a/src/views/responseManagement/userResponse/component/selectUser.vue b/src/views/responseManagement/userResponse/component/selectUser.vue index 8ac07f5..832f27f 100644 --- a/src/views/responseManagement/userResponse/component/selectUser.vue +++ b/src/views/responseManagement/userResponse/component/selectUser.vue @@ -18,9 +18,9 @@ + layout="total, sizes, prev, pager, next" :total="state.tableData.total"> @@ -131,3 +131,9 @@ defineExpose({ openDialog, }); + \ No newline at end of file diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index b6c4dfb..9ea5a13 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -1,45 +1,46 @@ - - - - - - - - - - - {{ getValue(scope.row.disasterType) }} - - - - - + + {{ getValue(scope.row.disasterType) }} + + + + + - - - - {{ dateFormat(scope.row.disasterTime) }} - - - - - - Not reviewed - Failed - - - - - Review - - + + + + {{ dateFormat(scope.row.disasterTime) }} + + + + + + Not reviewed + Failed + + + + + Review + + - - - - - - - - - - - - - - - - - {{ getValue(scope.row.disasterType) }} - - - - - + + + + + + {{ getValue(scope.row.disasterType) }} + + + + + - - - - {{ dateFormat(scope.row.disasterTime) }} - - - - - + + + + {{ dateFormat(scope.row.disasterTime) }} + + + + + - - Reviewed - Failed - + + Reviewed + Failed + - - - - - - - - - - Point - Area - Clear - - - Latitude: - - Longitude: - - - - + + + + + + + + + + Point + Area + Clear + + + Latitude: + + Longitude: + + - + - - - + - - - Cancel - - Not Review - - - Review - - - - + + + + + + + Cancel + + Not Review + + + Review + + + + \ No newline at end of file diff --git a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue index 4d05ad2..0fa702b 100644 --- a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue +++ b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue @@ -44,12 +44,12 @@ @@ -154,5 +154,8 @@ defineExpose({ \ No newline at end of file diff --git a/src/views/systemManagement/chiefAdministrator/index.vue b/src/views/systemManagement/chiefAdministrator/index.vue index 951e476..fd4658a 100644 --- a/src/views/systemManagement/chiefAdministrator/index.vue +++ b/src/views/systemManagement/chiefAdministrator/index.vue @@ -60,12 +60,12 @@ @@ -234,4 +234,8 @@ onMounted(() => { } } } +.mt15 { + float: right; + margin-bottom: 15px; +}