This commit is contained in:
yyhouc 2023-04-23 17:17:45 +08:00
commit dc2dda607f
29 changed files with 3956 additions and 1614 deletions

1217
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,6 +13,7 @@
"@element-plus/icons-vue": "^2.1.0", "@element-plus/icons-vue": "^2.1.0",
"@geoman-io/leaflet-geoman-free": "^2.14.2", "@geoman-io/leaflet-geoman-free": "^2.14.2",
"@mapbox/leaflet-omnivore": "^0.3.4", "@mapbox/leaflet-omnivore": "^0.3.4",
"@turf/turf": "^6.5.0",
"@vueup/vue-quill": "^1.0.0-alpha.40", "@vueup/vue-quill": "^1.0.0-alpha.40",
"axios": "^1.3.4", "axios": "^1.3.4",
"echarts": "^5.4.2", "echarts": "^5.4.2",

View File

@ -1,68 +1,68 @@
import request, {crawlModule ,moduleName } from '/@/utils/request'; import request, { crawlModule, moduleName } from '/@/utils/request';
export const geoserve = (vordm_id, link, disaster_id, name) => {
return request({
url: '/api/' + crawlModule + '/geoserve/pushing',
method: 'post',
data: {
vordm_id,
link,
disaster_id,
name,
},
});
};
export const news = (disaster_id, keywords, page, isBaidu, id) => {
return request({
url: '/api/' + crawlModule + '/news/' + (isBaidu ? 'baidu' : 'bing'),
method: 'post',
data: {
disaster_id,
keywords,
page,
id,
},
});
};
export const rs = (stime, etime, disaster_id, ranges, type = 1) => {
let method = 'sentinel';
if (type == 1) {
method = 'sentinel';
} else if (type == 2) {
method = 'landsat';
} else {
method = 'searchone';
}
return request({
export const geoserve = (vordm_id , link , disaster_id, name) =>{ url: '/api/' + crawlModule + '/rs/' + method,
return request({ method: 'post',
url: '/api/' + crawlModule + '/geoserve/pushing', data: {
method: 'post', stime,
data: { etime,
vordm_id, disaster_id,
link, ranges,
disaster_id, },
name });
} };
});
}
export const news = (disaster_id, keywords, page,isBaidu,id) =>{
return request({
url: '/api/' + crawlModule + '/news/'+(isBaidu?"baidu":"bing"),
method: 'post',
data: {
disaster_id,
keywords,
page,
id
}
});
}
export const rs = (stime, etime, disaster_id,ranges ,type =1) =>{
let method = 'sentinel';
if(type == 1){
method = 'sentinel';
}else if(type == 2){
method = 'landsat';
}else {
method = 'searchone';
}
return request({
url: '/api/' + crawlModule + '/news/'+method,
method: 'post',
data: {
stime, etime, disaster_id,ranges
}
});
}
export const submit = (row) => { export const submit = (row) => {
return request({ return request({
url: '/api/'+moduleName+'/ui/crawlInfo/submit', url: '/api/' + moduleName + '/ui/crawlInfo/submit',
method: 'post', method: 'post',
data: row data: row,
}) });
} };
export const getList = (current, size, param) => { export const getList = (current, size, param) => {
let params = { let params = {
current, current,
size, size,
}; };
if(param){ if (param) {
params = Object.assign(params, param); params = Object.assign(params, param);
} }
return request({ return request({
url: '/api/'+moduleName+'/ui/crawlInfo/list', url: '/api/' + moduleName + '/ui/crawlInfo/list',
method: 'get', method: 'get',
params: params params: params,
}); });
};
}

View File

@ -2,8 +2,8 @@
<div ref="map" <div ref="map"
class="container"></div> class="container"></div>
</template> </template>
<script setup> <script setup>
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import WKT from 'terraformer-wkt-parser' import WKT from 'terraformer-wkt-parser'
@ -11,8 +11,8 @@ import L from 'leaflet'
import 'leaflet/dist/leaflet.css' import 'leaflet/dist/leaflet.css'
import 'leaflet-draw/dist/leaflet.draw' import 'leaflet-draw/dist/leaflet.draw'
import 'leaflet-draw/dist/leaflet.draw.css' import 'leaflet-draw/dist/leaflet.draw.css'
import '@geoman-io/leaflet-geoman-free'; import '@geoman-io/leaflet-geoman-free';
import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css'; import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
import 'Leaflet-ImageOverlay-Rotated' import 'Leaflet-ImageOverlay-Rotated'
import { useVariableStore } from '/@/stores/index.ts' import { useVariableStore } from '/@/stores/index.ts'
import * as omnivore from '@mapbox/leaflet-omnivore' import * as omnivore from '@mapbox/leaflet-omnivore'
@ -22,6 +22,7 @@ let homeMap = null
let text = null let text = null
let featureLayerG_area = null let featureLayerG_area = null
let featureLayerG_point = null let featureLayerG_point = null
let layerRectangle = null
onMounted(() => { onMounted(() => {
homeMap = L.map(map.value, { homeMap = L.map(map.value, {
@ -143,12 +144,12 @@ const mapOperations = {
wktParseToMap: (res) => { wktParseToMap: (res) => {
return omnivore.wkt.parse(res).addTo(featureLayerG_point) return omnivore.wkt.parse(res).addTo(featureLayerG_point)
// if(omnivore.wkt.parse(res) instanceof L.Marker){ // if(omnivore.wkt.parse(res) instanceof L.Marker){
// } // }
// else{ // else{
// return omnivore.wkt.parse(res).addTo(featureLayerG_area ) // return omnivore.wkt.parse(res).addTo(featureLayerG_area )
// } // }
}, },
/** /**
* Object param 参数集合 * Object param 参数集合
@ -419,10 +420,29 @@ const mapOperations = {
text.enable() text.enable()
}) })
}, },
drawRectangle: () => {
if (layerRectangle != null) {
homeMap.removeLayer(layerRectangle)
layerRectangle = null
}
homeMap.pm.enableDraw('Rectangle', {
snappable: true,
snapDistance: 20,
});
homeMap.on('pm:create', (e) => {
L.PM.reInitLayer(e.layer);
layerRectangle = e.layer
});
},
deleteRectangle: () => {
homeMap.removeLayer(layerRectangle)
}
} }
//omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap); //omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
defineExpose({ defineExpose({
mapOperations, mapOperations,
}) })
</script> </script>

View File

@ -53,7 +53,6 @@ service.interceptors.response.use(
return Promise.reject(service.interceptors.response); return Promise.reject(service.interceptors.response);
} else { } else {
return res.data || res; return res.data || res;
} }
}, },
(error) => { (error) => {

View File

@ -1,7 +1,7 @@
<template> <template>
<el-dialog title="Collection robot" v-model="state.isShowDialog" width="1100px"> <el-dialog title="Collection robot" v-model="state.isShowDialog" width="1100px">
<el-row> <el-row>
<el-col :span="5" style="text-align:center ;"> <el-col :span="3" style="text-align:center ;">
<el-image style="height:40px ; width:100px!" src="/baidu.jpg"></el-image> <el-image style="height:40px ; width:100px!" src="/baidu.jpg"></el-image>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -30,7 +30,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5" style="text-align:center ;"> <el-col :span="3" style="text-align:center ;">
<el-image style="height:40px ; width:100px!" src="/bing.webp"></el-image> <el-image style="height:40px ; width:100px!" src="/bing.webp"></el-image>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12" >

View File

@ -23,9 +23,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange" <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
class="mt15" :pager-count="5" :page-sizes="[10, 20, 30]" class="mt15" :pager-count="2" :page-sizes="[10, 20, 30]"
v-model:current-page="state.disasterData.param.pageNum" background v-model:current-page="state.disasterData.param.pageNum" background
v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next, jumper" v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
:total="state.disasterData.total"> :total="state.disasterData.total">
</el-pagination> </el-pagination>
</div> </div>
@ -34,53 +34,54 @@
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;"> <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-form-item label="type" label-width="100px"> <el-form-item label="type" label-width="100px">
<el-select v-model="state.searchName" placeholder="Please select data type" style="max-width: 200px" <el-select v-model="state.searchName" placeholder="Please select data type" style="max-width: 200px"
size="default" clearable @change="getTableData();state.queryTitle=''"> size="default" clearable @change="getTableData(); state.queryTitle = ''">
<el-option value="1" label="news"></el-option> <el-option value="1" label="news"></el-option>
<el-option value="2" label="socialMedia"></el-option> <el-option value="2" label="socialMedia"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="stateus" label-width="100px"> <el-form-item label="stateus" label-width="100px">
<el-select v-model="state.srarchType" placeholder="Please select data type" style="max-width: 200px" <el-select v-model=" state.srarchType " placeholder="Please select data type" style="max-width: 200px"
size="default" clearable> size="default" clearable>
<el-option value="0" label="No review"></el-option> <el-option value="0" label="No review"></el-option>
<el-option value="1" label="reserve"></el-option> <el-option value="1" label="reserve"></el-option>
<el-option value="2" label="not retain"></el-option> <el-option value="2" label="not retain"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="title" label-width="100px" v-if = "state.searchName=='1'"> <el-form-item label="title" label-width="100px" v-if=" state.searchName == '1' ">
<el-input v-model="state.queryTitle" placeholder="Please enter a title"></el-input> <el-input v-model=" state.queryTitle " placeholder="Please enter a title"></el-input>
</el-form-item> </el-form-item>
<el-button size="default" type="primary" class="ml10" @click="getTableData"> <el-button size="default" type="primary" class="ml10" @click=" getTableData ">
<el-icon> <el-icon>
<ele-Search /> <ele-Search />
</el-icon> </el-icon>
search search
</el-button> </el-button>
<el-button size="default" type="success" class="ml10" @click="openDialog"> <el-button size="default" type="success" class="ml10" @click=" openDialog ">
<el-icon> <el-icon>
<ele-Upload /> <ele-Upload />
</el-icon> </el-icon>
review review
</el-button> </el-button>
</div> </div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" <el-table :data=" state.tableData.data " v-loading=" state.tableData.loading "
@selection-change="handleSelectionChange" style="width: 100%"> @selection-change=" handleSelectionChange " style="width: 100%">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column type="index" label="ID" width="50" /> <el-table-column type="index" label="ID" width="50" />
<el-table-column v-if = "state.searchName=='1'" prop="title" label="title" show-overflow-tooltip></el-table-column> <el-table-column v-if=" state.searchName == '1' " prop="title" label="title"
show-overflow-tooltip></el-table-column>
<el-table-column prop="content" label="content" show-overflow-tooltip></el-table-column> <el-table-column prop="content" label="content" show-overflow-tooltip></el-table-column>
<el-table-column prop="type" label="type" show-overflow-tooltip > <el-table-column prop="type" label="type" show-overflow-tooltip>
<template #default="scope"> <template #default=" scope ">
<el-tag type="info" v-if="state.searchName=='1' && scope.row.type == 0">baidu(中文)</el-tag> <el-tag type="info" v-if=" state.searchName == '1' && scope.row.type == 0 ">baidu(中文)</el-tag>
<el-tag type="info" v-if="state.searchName=='1' && scope.row.type == 1">bing</el-tag> <el-tag type="info" v-if=" state.searchName == '1' && scope.row.type == 1 ">bing</el-tag>
<el-tag type="info" v-if="state.searchName=='2' && scope.row.type == 0">twitter</el-tag> <el-tag type="info" v-if=" state.searchName == '2' && scope.row.type == 0 ">twitter</el-tag>
<el-tag type="info" v-if="state.searchName=='2' && scope.row.type == 1">weibo</el-tag> <el-tag type="info" v-if=" state.searchName == '2' && scope.row.type == 1 ">weibo</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="link" show-overflow-tooltip> <el-table-column prop="content" label="link" show-overflow-tooltip>
<template #default="scope"> <template #default=" scope ">
<a :href="scope.row.link" target="_blank">goto link</a> <a :href=" scope.row.link " target="_blank">goto link</a>
</template> </template>
</el-table-column> </el-table-column>
@ -93,22 +94,25 @@
</el-table-column> </el-table-column>
<el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column> --> <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip> <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope"> <template #default=" scope ">
<el-button size="small" text type="info" v-if="scope.row.status == 0" @click="openDialog(scope.row,true)">review</el-button> <el-button size="small" text type="info" v-if=" scope.row.status == 0 "
<el-button size="small" text type="success" v-if="scope.row.status == 1" @click="openDialog(scope.row,false)">review</el-button> @click=" openDialog(scope.row, true) ">review</el-button>
<el-button size="small" text type="danger" v-if="scope.row.status == 2" @click="openDialog(scope.row,false)">review</el-button> <el-button size="small" text type="success" v-if=" scope.row.status == 1 "
@click=" openDialog(scope.row, false) ">review</el-button>
<el-button size="small" text type="danger" v-if=" scope.row.status == 2 "
@click=" openDialog(scope.row, false) ">review</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" <el-pagination style="margin-left: 20px;" @size-change=" onHandleSizeChange " @current-change=" onHandleCurrentChange " class="mt15"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background :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" v-model:page-size=" state.tableData.param.pageSize " layout="total, sizes, prev, pager, next"
:total="state.tableData.total"> :total=" state.tableData.total" >
</el-pagination> </el-pagination>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-dialog v-model="state.dialogVisible" title="Review" width="30%" > <el-dialog v-model=" state.dialogVisible " title="Review" width="30%">
<!-- <el-form-item label="status"> <!-- <el-form-item label="status">
<el-select v-model="state.edit.status" placeholder="please select data type" style="max-width: 200px" <el-select v-model="state.edit.status" placeholder="please select data type" style="max-width: 200px"
size="default" clearable> size="default" clearable>
@ -120,18 +124,18 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="state.dialogVisible = false">Cancel</el-button> <el-button @click=" state.dialogVisible = false ">Cancel</el-button>
<el-button type=" primary" @click="reviews(1)"> <el-button type=" primary" @click=" reviews(1) ">
reserve reserve
</el-button> </el-button>
<el-button type="danger" @click="reviews(2)"> <el-button type="danger" @click=" reviews(2) ">
not retain not retain
</el-button> </el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</el-config-provider> </el-config-provider>
<boot ref="bootRef" @callback="getTableData" /> <boot ref="bootRef" @callback=" getTableData " />
</div> </div>
</template> </template>
@ -164,11 +168,11 @@ const state = reactive({
multipleSelection: [], multipleSelection: [],
searchName: '1', searchName: '1',
disasterId: null, disasterId: null,
queryTitle:"", queryTitle: "",
edit: { edit: {
status: 0, status: 0,
}, },
srarchType:"0", srarchType: "0",
disasterData: { disasterData: {
data: [], data: [],
total: 0, total: 0,
@ -190,12 +194,12 @@ const state = reactive({
pageSize: 10, pageSize: 10,
}, },
}, },
selectList :[], selectList: [],
}); });
const openDialog = async (row,bool) => { const openDialog = async (row, bool) => {
if(bool){ if (bool) {
state.selectList = [row] state.selectList = [row]
}else{ } else {
state.selectList = state.multipleSelection state.selectList = state.multipleSelection
} }
state.dialogVisible = true; state.dialogVisible = true;
@ -204,7 +208,7 @@ const reviews = async (status) => {
let ids = state.selectList.map((item) => item.id); let ids = state.selectList.map((item) => item.id);
//ids 使 //ids 使
ids = ids.join(','); ids = ids.join(',');
let res = await review(ids,status,state.searchName=='1'?true:false); let res = await review(ids, status, state.searchName == '1' ? true : false);
if (res) { if (res) {
state.dialogVisible = false; state.dialogVisible = false;
ElMessage.success('success'); ElMessage.success('success');
@ -276,7 +280,7 @@ const getDisasterData = () => {
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
getNewsList(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "isDeleted": 0,status :state.srarchType ,title:state.queryTitle}, state.searchName == '1' ? true : false).then(res => { getNewsList(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "isDeleted": 0, status: state.srarchType, title: state.queryTitle }, state.searchName == '1' ? true : false).then(res => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
@ -287,9 +291,9 @@ const getTableData = () => {
}, 500); }, 500);
}; };
// //
const startBot = (row:any) => { const startBot = (row: any) => {
bootRef.value.openDialog(row); bootRef.value.openDialog(row);
}; };
// //
const onOpenEditRole = (type, row) => { const onOpenEditRole = (type, row) => {
@ -370,10 +374,13 @@ onMounted(() => {
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table { .el-table {
flex: 1; flex: 1;
} }
} }
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -1,120 +1,83 @@
<template> <template>
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="10"> <el-col :span="10">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-table :data="state.disasterData.data" <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
v-loading="state.disasterData.loading" highlight-current-row @row-click="tableClick">
style="width: 100%" <el-table-column type="index" label="ID" width="50" />
highlight-current-row <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
@row-click="tableClick"> <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
<el-table-column type="index" <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
label="ID" </el-table>
width="50" /> <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
<el-table-column prop="disasterType" class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
label="Disaster type" v-model:current-page="state.disasterData.param.pageNum" background
show-overflow-tooltip></el-table-column> v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
<el-table-column prop="disasterCountry" :total="state.disasterData.total">
label="disaster country" </el-pagination>
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterTime"
label="disaster time"
show-overflow-tooltip></el-table-column>
</el-table>
<el-pagination @size-change="onHandleDisasterSizeChange"
@current-change="onHandleDisasterCurrentChange"
class="mt15"
:pager-count="5"
:page-sizes="[10, 20, 30]"
v-model:current-page="state.disasterData.param.pageNum"
background
v-model:page-size="state.disasterData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="state.disasterData.total">
</el-pagination>
</div>
</el-col>
<el-col :span="14">
<div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-select v-model="state.searchName" placeholder="please select data type" style="max-width: 200px" size="default" clearable>
<el-option value="1" label="basic data"></el-option>
<el-option value="2" label="responded report"></el-option>
<el-option value="3" label="cartographic product"></el-option>
</el-select>
<el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-icon>
<ele-Search/>
</el-icon>
search
</el-button>
<el-button size="default" type="success" class="ml10" @click="uploadData">
<el-icon>
<ele-Upload/>
</el-icon>
upload
</el-button>
<el-button size="default" type="danger" class="ml10" @click="batchDel">
<el-icon>
<ele-Delete/>
</el-icon>
batch delete
</el-button>
</div> </div>
<el-table :data="state.tableData.data" </el-col>
v-loading="state.tableData.loading" <el-col :span="14">
@selection-change="handleSelectionChange" <div class="system-role-padding layout-padding-auto layout-padding-view">
style="width: 100%"> <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-table-column type="selection" width="55" /> <el-select v-model="state.searchName" placeholder="please select data type" style="max-width: 200px"
<el-table-column type="index" size="default" clearable>
label="ID" <el-option value="0" label="basic data"></el-option>
width="50" /> <el-option value="1" label="responded report"></el-option>
<el-table-column prop="uploaderName" <el-option value="2" label="cartographic product"></el-option>
label="uploader Name" </el-select>
show-overflow-tooltip></el-table-column> <el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-table-column prop="sourceOrganization" <el-icon>
label="Organization" <ele-Search />
show-overflow-tooltip></el-table-column> </el-icon>
<el-table-column prop="title" search
label="Professional title" </el-button>
show-overflow-tooltip width="150"></el-table-column> <el-button size="default" type="success" class="ml10" @click="uploadData">
<el-table-column prop="size" <el-icon>
label="Data size" <ele-Upload />
show-overflow-tooltip> </el-icon>
<template #default="scope"> upload
{{formatSizeUnits(scope.row.size)}} </el-button>
</template> <el-button size="default" type="danger" class="ml10" @click="batchDel">
</el-table-column> <el-icon>
<el-table-column prop="uploadTime" <ele-Delete />
label="Upload time" </el-icon>
show-overflow-tooltip></el-table-column> batch delete
<el-table-column prop="Operate" </el-button>
label="Operate" </div>
show-overflow-tooltip> <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
<template #default="scope"> @selection-change="handleSelectionChange" style="width: 100%">
<el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button> <el-table-column type="selection" width="55" />
</template> <el-table-column type="index" label="ID" width="50" />
</el-table-column> <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
</el-table> <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
<el-pagination @size-change="onHandleSizeChange" <el-table-column prop="title" label="Professional title" show-overflow-tooltip
@current-change="onHandleCurrentChange" width="150"></el-table-column>
class="mt15" <el-table-column prop="size" label="Data size" show-overflow-tooltip>
:pager-count="5" <template #default="scope">
:page-sizes="[10, 20, 30]" {{ formatSizeUnits(scope.row.size) }}
v-model:current-page="state.tableData.param.pageNum" </template>
background </el-table-column>
v-model:page-size="state.tableData.param.pageSize" <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column>
layout="total, sizes, prev, pager, next, jumper" <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
:total="state.tableData.total"> <template #default="scope">
</el-pagination> <el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button>
</div> </template>
</el-col> </el-table-column>
</el-row> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
: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"
:total="state.tableData.total">
</el-pagination>
</div>
</el-col>
</el-row>
</el-config-provider> </el-config-provider>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" /> <Upload ref="uploadRef" @callback="getTableData" />
<Upload ref="uploadRef" @callback="getTableData"/>
</div> </div>
</template> </template>
@ -122,7 +85,7 @@
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import type { TabsPaneContext } from 'element-plus'; import type { TabsPaneContext } from 'element-plus';
import Upload from './component/upload.vue'; import Upload from './component/upload.vue';
import {getOtherDataPage,getDisasterPage,deleteData} from '/@/api/data/otherData.js' import { getOtherDataPage, getDisasterPage, deleteData } from '/@/api/data/otherData.js'
const activeName = ref('first'); const activeName = ref('first');
// //
@ -135,9 +98,9 @@ const uploadRef = ref();
// //
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
multipleSelection:[], multipleSelection: [],
searchName:'', searchName: '',
disasterId:null, disasterId: null,
disasterData: { disasterData: {
data: [], data: [],
total: 0, total: 0,
@ -164,7 +127,7 @@ const handleSelectionChange = (val) => {
} }
const auditData = (row) => { const auditData = (row) => {
let id = row.id let id = row.id
auditRef.value.openDialog([{"id":id}]); auditRef.value.openDialog([{ "id": id }]);
} }
// //
const formatSize = (size) => { const formatSize = (size) => {
@ -189,8 +152,8 @@ const formatSize = (size) => {
const formatSizeUnits = (size) => { const formatSizeUnits = (size) => {
if (size === 0) return '0 B'; if (size === 0) return '0 B';
var k = 1000, // or 1024 var k = 1000, // or 1024
sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
i = Math.floor(Math.log(size) / Math.log(k)); 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];
} }
@ -202,7 +165,7 @@ const tableClick = (row, column, event) => {
// //
const getDisasterData = () => { const getDisasterData = () => {
state.disasterData.loading = true; 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.data = res.records;
state.disasterData.total = res.total; state.disasterData.total = res.total;
state.disasterData.loading = false; state.disasterData.loading = false;
@ -212,7 +175,9 @@ const getDisasterData = () => {
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
getOtherDataPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId":state.disasterId,"type":state.searchName,"isDeleted":0}).then(res=>{ getOtherDataPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "type": state.searchName, "isDeleted": 0 }).then(res => {
console.log(res);
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
@ -224,7 +189,7 @@ const getTableData = () => {
}; };
// //
const uploadData = () => { const uploadData = () => {
if(state.disasterId == null){ if (state.disasterId == null) {
ElMessage.warning("Please select the disaster first") ElMessage.warning("Please select the disaster first")
return false; return false;
} }
@ -236,23 +201,23 @@ const onOpenEditRole = (type, row) => {
}; };
// //
const batchDel = () => { const batchDel = () => {
if(state.multipleSelection.length == 0){ if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first"); ElMessage.warning("Select the data to be operated first");
return false; return false;
} }
ElMessageBox.confirm(`This action batch deletes the other dataWhether to continue?`, 'tip', { ElMessageBox.confirm(`This action batch deletes the other dataWhether to continue?`, 'tip', {
confirmButtonText: 'confirm', confirmButtonText: 'confirm',
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
let id = state.multipleSelection.map(item=>item.id) let id = state.multipleSelection.map(item => item.id)
deleteData(id.join()).then(res=>{ deleteData(id.join()).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
} }
// //
const del = (row) => { const del = (row) => {
@ -261,13 +226,13 @@ const del = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
deleteData(row.id).then(res=>{ deleteData(row.id).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
}; };
// //
const onHandleDisasterSizeChange = (val) => { const onHandleDisasterSizeChange = (val) => {
@ -296,7 +261,7 @@ onMounted(() => {
}); });
</script> </script>
<style> <style>
.demo-tabs > .el-tabs__content { .demo-tabs>.el-tabs__content {
padding: 32px; padding: 32px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
@ -306,9 +271,14 @@ onMounted(() => {
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table { .el-table {
flex: 1; flex: 1;
} }
} }
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -4,41 +4,24 @@
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="10"> <el-col :span="10">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-table :data="state.disasterData.data" <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
v-loading="state.disasterData.loading" highlight-current-row @row-click="tableClick">
style="width: 100%" <el-table-column type="index" label="ID" width="50" />
highlight-current-row <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
@row-click="tableClick"> <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
<el-table-column type="index" <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
label="ID"
width="50" />
<el-table-column prop="disasterType"
label="Disaster type"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterCountry"
label="disaster country"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterTime"
label="disaster time"
show-overflow-tooltip></el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleDisasterSizeChange" <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
@current-change="onHandleDisasterCurrentChange" class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
class="mt15" v-model:current-page="state.disasterData.param.pageNum" background
:pager-count="5" v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[10, 20, 30]" :total="state.disasterData.total">
v-model:current-page="state.disasterData.param.pageNum"
background
v-model:page-size="state.disasterData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="state.disasterData.total">
</el-pagination> </el-pagination>
</div> </div>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15" <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
style="display: flex;margin-left: 10px;margin-top: 10px;">
<!-- <el-input size="default" placeholder="please enter username" style="max-width: 180px" v-model="state.searchName" <!-- <el-input size="default" placeholder="please enter username" style="max-width: 180px" v-model="state.searchName"
clearable></el-input> clearable></el-input>
<el-button size="default" type="primary" class="ml10" @click="getTableData"> <el-button size="default" type="primary" class="ml10" @click="getTableData">
@ -47,19 +30,13 @@
</el-icon> </el-icon>
search search
</el-button>--> </el-button>-->
<el-button size="default" <el-button size="default" type="success" class="ml10" @click="uploadData">
type="success"
class="ml10"
@click="uploadData">
<el-icon> <el-icon>
<ele-Upload /> <ele-Upload />
</el-icon> </el-icon>
upload upload
</el-button> </el-button>
<el-button size="default" <el-button size="default" type="danger" class="ml10" @click="batchDel">
type="danger"
class="ml10"
@click="batchDel">
<el-icon> <el-icon>
<ele-Delete /> <ele-Delete />
</el-icon> </el-icon>
@ -67,40 +44,24 @@
</el-button> </el-button>
</div> </div>
<el-table :data="state.tableData.data" <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
v-loading="state.tableData.loading" @selection-change="handleSelectionChange" style="width: 100%">
@selection-change="handleSelectionChange" <el-table-column type="selection" width="55" />
style="width: 100%"> <el-table-column type="index" label="ID" width="50" />
<el-table-column type="selection" <el-table-column prop="name" label="name" show-overflow-tooltip>
width="55" />
<el-table-column type="index"
label="ID"
width="50" />
<el-table-column prop="name"
label="name"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
{{formatName(scope.row.name)}} {{ formatName(scope.row.name) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="link" <el-table-column prop="link" label="image" show-overflow-tooltip>
label="image"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-popover trigger="hover" <el-popover trigger="hover" placement="right" popper-class="max-h-300px overflow-auto" :width="330">
placement="right"
popper-class="max-h-300px overflow-auto"
:width="330">
<!-- table中原本显示的图片 --> <!-- table中原本显示的图片 -->
<template #reference> <template #reference>
<img :src="scope.row.link" <img :src="scope.row.link" :alt="scope.row.link" style="max-height: 130px;max-width: 130px">
:alt="scope.row.link"
style="max-height: 130px;max-width: 130px">
</template> </template>
<!-- 鼠标移入时弹出的图片 --> <!-- 鼠标移入时弹出的图片 -->
<img :src="scope.row.link" <img :src="scope.row.link" alt="" style="height: 150px;width: 300px">
alt=""
style="height: 150px;width: 300px">
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -114,42 +75,26 @@
<el-table-column prop="type" <el-table-column prop="type"
label="type" label="type"
show-overflow-tooltip></el-table-column>--> show-overflow-tooltip></el-table-column>-->
<el-table-column prop="Operate" <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
label="Operate"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-button size="small" <el-button size="small" text type="primary" @click="editData(scope.row)">Edit</el-button>
text <el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button>
type="primary"
@click="editData(scope.row)">Edit</el-button>
<el-button size="small"
text
type="primary"
@click="del(scope.row)">Delete</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
@current-change="onHandleCurrentChange" :pager-count="3" :page-sizes="[10, 20, 30]"
class="mt15" v-model:current-page="state.tableData.param.pageNum" background
:pager-count="5" v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[10, 20, 30]" :total="state.tableData.total">
v-model:current-page="state.tableData.param.pageNum"
background
v-model:page-size="state.tableData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="state.tableData.total">
</el-pagination> </el-pagination>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-config-provider> </el-config-provider>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" /> <Upload ref="uploadRef" @callback="getTableData" />
<Upload ref="uploadRef" <EditPicture ref="editUploadRef" @callback="getTableData" />
@callback="getTableData" />
<EditPicture ref="editUploadRef"
@callback="getTableData" />
</div> </div>
</template> </template>
@ -172,198 +117,205 @@ const editUploadRef = ref();
// //
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
multipleSelection: [], multipleSelection: [],
tabVal: 'first', tabVal: 'first',
disasterId: null, disasterId: null,
disasterData: { disasterData: {
data: [], data: [],
total: 0, total: 0,
loading: false, loading: false,
param: { param: {
search: '', search: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
}, },
tableData: { tableData: {
data: [], data: [],
total: 0, total: 0,
loading: false, loading: false,
param: { param: {
search: '', search: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
}, },
}); });
const handleSelectionChange = (val) => { const handleSelectionChange = (val) => {
state.multipleSelection = val; state.multipleSelection = val;
}; };
// //
const formatName = (name) => { const formatName = (name) => {
if (name) { if (name) {
return name.substr(0, name.indexOf('.')); return name.substr(0, name.indexOf('.'));
} }
return name; return name;
}; };
const auditData = (row) => { const auditData = (row) => {
let id = row.id; let id = row.id;
auditRef.value.openDialog([{ id: id }]); auditRef.value.openDialog([{ id: id }]);
}; };
// //
const formatSize = (size) => { const formatSize = (size) => {
var data = ''; var data = '';
if (size < 0.1 * 1024) { if (size < 0.1 * 1024) {
//0.1KBB //0.1KBB
data = size.toFixed(2) + 'B'; data = size.toFixed(2) + 'B';
} else if (size < 0.1 * 1024 * 1024) { } else if (size < 0.1 * 1024 * 1024) {
//0.1MBKB //0.1MBKB
data = (size / 1024).toFixed(2) + 'KB'; data = (size / 1024).toFixed(2) + 'KB';
} else if (size < 0.1 * 1024 * 1024 * 1024) { } else if (size < 0.1 * 1024 * 1024 * 1024) {
//0.1GBMB //0.1GBMB
data = (size / (1024 * 1024)).toFixed(2) + 'MB'; data = (size / (1024 * 1024)).toFixed(2) + 'MB';
} else { } else {
//GB //GB
data = (size / (1024 * 1024 * 1024)).toFixed(2) + 'GB'; data = (size / (1024 * 1024 * 1024)).toFixed(2) + 'GB';
} }
var sizestr = data + ''; var sizestr = data + '';
var len = sizestr.indexOf('.'); var len = sizestr.indexOf('.');
var dec = sizestr.substr(len + 1, 2); var dec = sizestr.substr(len + 1, 2);
if (dec == '00') { if (dec == '00') {
//00 //00
return sizestr.substring(0, len) + sizestr.substr(len + 3, 2); return sizestr.substring(0, len) + sizestr.substr(len + 3, 2);
} }
return sizestr; return sizestr;
}; };
const formatSizeUnits = (size) => { const formatSizeUnits = (size) => {
if (size === 0 || size === -1) return '0 B'; if (size === 0 || size === -1) return '0 B';
var k = 1000, // or 1024 var k = 1000, // or 1024
sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
i = Math.floor(Math.log(size) / Math.log(k)); 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) => { const tableClick = (row, column, event) => {
state.disasterId = row.disasterId; state.disasterId = row.disasterId;
getTableData(); getTableData();
}; };
// //
const getDisasterData = () => { const getDisasterData = () => {
state.disasterData.loading = true; 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.data = res.records;
state.disasterData.total = res.total; state.disasterData.total = res.total;
state.disasterData.loading = false; state.disasterData.loading = false;
}); });
}; };
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
getPicturePage(state.tableData.param.pageNum, state.tableData.param.pageSize, { disasterId_equal: state.disasterId, isDeleted_equal: 0 }).then( getPicturePage(state.tableData.param.pageNum, state.tableData.param.pageSize, { disasterId_equal: state.disasterId, isDeleted_equal: 0 }).then(
(res) => { (res) => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
} }
); );
setTimeout(() => { setTimeout(() => {
state.tableData.loading = false; state.tableData.loading = false;
}, 500); }, 500);
}; };
// //
const uploadData = () => { const uploadData = () => {
if (state.disasterId == null) { if (state.disasterId == null) {
ElMessage.warning('Please select the disaster first'); ElMessage.warning('Please select the disaster first');
return false; return false;
} }
uploadRef.value.openDialog(state.disasterId); uploadRef.value.openDialog(state.disasterId);
}; };
// //
const editData = (row) => { const editData = (row) => {
editUploadRef.value.openDialog(row); editUploadRef.value.openDialog(row);
}; };
// //
const batchDel = () => { const batchDel = () => {
if (state.multipleSelection.length == 0) { if (state.multipleSelection.length == 0) {
ElMessage.warning('Select the data to be operated first'); ElMessage.warning('Select the data to be operated first');
return false; return false;
} }
ElMessageBox.confirm(`This action batch deletes the picture dataWhether to continue?`, 'tip', { ElMessageBox.confirm(`This action batch deletes the picture dataWhether to continue?`, 'tip', {
confirmButtonText: 'confirm', confirmButtonText: 'confirm',
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
let id = state.multipleSelection.map((item) => item.id); let id = state.multipleSelection.map((item) => item.id);
delPicture(id.join()).then((res) => { delPicture(id.join()).then((res) => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
}); });
}) })
.catch(() => {}); .catch(() => { });
}; };
// //
const del = (row) => { const del = (row) => {
ElMessageBox.confirm(`This action will delete the picture${row.name}Whether to continue?`, 'tip', { ElMessageBox.confirm(`This action will delete the picture${row.name}Whether to continue?`, 'tip', {
confirmButtonText: 'confirm', confirmButtonText: 'confirm',
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
delPicture(row.id).then((res) => { delPicture(row.id).then((res) => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
}); });
}) })
.catch(() => {}); .catch(() => { });
}; };
// //
const onHandleDisasterSizeChange = (val) => { const onHandleDisasterSizeChange = (val) => {
state.disasterData.param.pageSize = val; state.disasterData.param.pageSize = val;
getDisasterData(); getDisasterData();
}; };
// //
const onHandleDisasterCurrentChange = (val) => { const onHandleDisasterCurrentChange = (val) => {
state.disasterData.param.pageNum = val; state.disasterData.param.pageNum = val;
getDisasterData(); getDisasterData();
}; };
// //
const onHandleSizeChange = (val) => { const onHandleSizeChange = (val) => {
state.tableData.param.pageSize = val; state.tableData.param.pageSize = val;
getTableData(); getTableData();
}; };
// //
const onHandleCurrentChange = (val) => { const onHandleCurrentChange = (val) => {
state.tableData.param.pageNum = val; state.tableData.param.pageNum = val;
getTableData(); getTableData();
}; };
// //
onMounted(() => { onMounted(() => {
getDisasterData(); getDisasterData();
//getTableData(); //getTableData();
}); });
</script> </script>
<style> <style>
.demo-tabs > .el-tabs__content { .mt15 {
padding: 32px; display: flex;
color: #6b778c; justify-content: end;
font-size: 32px; }
font-weight: 600;
.demo-tabs>.el-tabs__content {
padding: 32px;
color: #6b778c;
font-size: 32px;
font-weight: 600;
} }
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table {
flex: 1; .el-table {
} flex: 1;
} }
}
} }
.demo-tabs > .el-tabs__content {
padding: 32px; .demo-tabs>.el-tabs__content {
color: #6b778c; padding: 32px;
font-size: 32px; color: #6b778c;
font-weight: 600; font-size: 32px;
font-weight: 600;
} }
</style> </style>

View File

@ -25,12 +25,12 @@
<el-pagination @size-change="onHandleDisasterSizeChange" <el-pagination @size-change="onHandleDisasterSizeChange"
@current-change="onHandleDisasterCurrentChange" @current-change="onHandleDisasterCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.disasterData.param.pageNum" v-model:current-page="state.disasterData.param.pageNum"
background background
v-model:page-size="state.disasterData.param.pageSize" v-model:page-size="state.disasterData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next"
:total="state.disasterData.total"> :total="state.disasterData.total">
</el-pagination> </el-pagination>
</div> </div>
@ -96,7 +96,7 @@
clearable clearable
placeholder="Select resolution" /> placeholder="Select resolution" />
</el-col> </el-col>
<el-col :span="5"> <el-col :span="3">
<el-button size="default" <el-button size="default"
type="primary" type="primary"
class="ml10" class="ml10"
@ -188,12 +188,12 @@
<el-pagination @size-change="onHandleSizeChange" <el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
background background
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
v-model:page-size="state.tableData.param.pageSize" 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"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</div> </div>
@ -640,4 +640,8 @@ const searchDisasterDate = () => {
.el-pagination { .el-pagination {
padding-left: 1%; padding-left: 1%;
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -15,7 +15,8 @@
v-model="state.startTime" v-model="state.startTime"
type="datetime" type="datetime"
placeholder="Select start time" placeholder="Select start time"
:shortcuts="shortcuts" /> value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="state.shortcuts" />
</el-col> </el-col>
</el-row> </el-row>
<el-row class="block"> <el-row class="block">
@ -27,7 +28,8 @@
v-model="state.endTime" v-model="state.endTime"
type="datetime" type="datetime"
placeholder="Select end time" placeholder="Select end time"
:shortcuts="shortcuts" /> value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="state.shortcuts" />
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
@ -43,8 +45,8 @@
<el-col :span="1"></el-col> <el-col :span="1"></el-col>
<el-col :span="19"> <el-col :span="19">
<span style="font-size:14px;width: 100%;">{{ <span style="font-size:14px;width: 100%;">{{
'Lat:&emsp;' + parseFloat(coordinate.Lat).toFixed(4) + ',&emsp;&emsp;Lng:&emsp;' + parseFloat(coordinate.Lng).toFixed(4) 'Lat:&emsp;' + parseFloat(coordinate.Lat).toFixed(4) + ',&emsp;&emsp;Lng:&emsp;' + parseFloat(coordinate.Lng).toFixed(4)
}}</span> }}</span>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<el-button class="el-icon" <el-button class="el-icon"
@ -82,7 +84,7 @@
<span>Select satellite type</span> <span>Select satellite type</span>
<el-tree-select class="satelliteSelect" <el-tree-select class="satelliteSelect"
v-model="state.satelliteSelected" v-model="state.satelliteSelected"
:data="sensor" :data="state.sensor"
multiple multiple
collapse-tags collapse-tags
collapse-tags-tooltip collapse-tags-tooltip
@ -98,7 +100,7 @@
v-model="state.selectID" v-model="state.selectID"
clearable clearable
placeholder="Select VoRDM ID"> placeholder="Select VoRDM ID">
<el-option v-for="item in idOptions" <el-option v-for="item in state.idOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" /> :value="item.value" />
@ -118,160 +120,24 @@
</div> </div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<Map id="map"></Map> <Map id="map"
ref="map">
</Map>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<script setup> <script setup>
import Map from "/@/components/Map.vue"; import Map from "/@/components/Map.vue";
import { ref, reactive } from 'vue'; import { ref, reactive, watch } from 'vue';
import { rs, submit } from '/@/api/crawl/index';
// import { useUserInfo } from '/@/stores/userInfo';
const sensor = ref([ const userInfo = useUserInfo();
{
value: 'landsat',
label: 'landsat',
// children: [{
// value: 1 - 1,
// label: 'LANDSAT_8_C1'
// },
// {
// value: 1 - 2,
// label: 'LANDSAT_ETM_C1'
// },
// {
// value: 1 - 3,
// label: 'LANDSAT_TM_C1'
// }
// ]
},
{
value: 'Sentinel',
label: 'Sentinel',
// children: [{
// value: 2 - 1,
// label: 'Sentinel - 2',
// children: [{
// value: 2 - 1 - 1,
// label: 'S2MSI2A'
// }]
// },
// {
// value: 2 - 2,
// label: 'Sentinel - 1',
// children: [{
// value: 2 - 2 - 1,
// label: 'SLC'
// }]
// }
// ]
},
{
value: '国产系列卫星',
label: '国产系列卫星',
children: [
{
value: 'GF - 1',
label: 'GF - 1',
},
{
value: 'GF - 2',
label: 'GF - 2',
},
{
value: 'GF - 3',
label: 'GF - 3',
},
{
value: 'GF - 4',
label: 'GF - 4',
},
{
value: 'GF - 6',
label: 'GF - 6',
},
{
value: 'ZY - 3',
label: 'ZY - 3',
},
{
value: 'ZY - 302',
label: 'ZY - 302',
},
{
value: 'ZY - 02C',
label: 'ZY - 02C',
},
],
},
{
value: '欧比特珠海一号系列卫星',
label: '欧比特珠海一号系列卫星',
children: [
{
value: 'OVS - 2A',
label: 'OVS - 2A',
},
{
value: 'OVS - 3A',
label: 'OVS - 3A',
},
{
value: 'OVS - 1A',
label: 'OVS - 1A',
},
{
value: 'OVS - 1B',
label: 'OVS - 1B',
},
{
value: 'OHS - 2A',
label: 'OHS - 2A',
},
{
value: 'OHS - 2B',
label: 'OHS - 2B',
},
{
value: 'OHS - 2C',
label: 'OHS - 2C',
},
{
value: 'OHS - 2D',
label: 'OHS - 2D',
},
],
}
])
// VoRDM ID
const idOptions = [
{
value: '2023001001',
label: '2023001001',
},
{
value: '2023001002',
label: '2023001002',
},
{
value: '2023001003',
label: '2023001003',
},
{
value: '2023001004',
label: '2023001004',
},
{
value: '2023001005',
label: '2023001005',
},
]
// //
const map = ref()
const state = reactive({ const state = reactive({
startTime: '', startTime: '',
endTime: '', endTime: '',
@ -279,68 +145,304 @@ const state = reactive({
satelliteSelected: [], satelliteSelected: [],
coordinateList: [], coordinateList: [],
selectID: '', selectID: '',
sensor: [
{
value: 'landsat',
label: 'landsat',
// children: [{
// value: 1 - 1,
// label: 'LANDSAT_8_C1'
// },
// {
// value: 1 - 2,
// label: 'LANDSAT_ETM_C1'
// },
// {
// value: 1 - 3,
// label: 'LANDSAT_TM_C1'
// }
// ]
},
{
value: 'Sentinel',
label: 'Sentinel',
// children: [{
// value: 2 - 1,
// label: 'Sentinel - 2',
// children: [{
// value: 2 - 1 - 1,
// label: 'S2MSI2A'
// }]
// },
// {
// value: 2 - 2,
// label: 'Sentinel - 1',
// children: [{
// value: 2 - 2 - 1,
// label: 'SLC'
// }]
// }
// ]
},
{
value: '国产系列卫星',
label: '国产系列卫星',
children: [
{
value: 'GF - 1',
label: 'GF - 1',
},
{
value: 'GF - 2',
label: 'GF - 2',
},
{
value: 'GF - 3',
label: 'GF - 3',
},
{
value: 'GF - 4',
label: 'GF - 4',
},
{
value: 'GF - 6',
label: 'GF - 6',
},
{
value: 'ZY - 3',
label: 'ZY - 3',
},
{
value: 'ZY - 302',
label: 'ZY - 302',
},
{
value: 'ZY - 02C',
label: 'ZY - 02C',
},
],
},
{
value: '欧比特珠海一号系列卫星',
label: '欧比特珠海一号系列卫星',
children: [
{
value: 'OVS - 2A',
label: 'OVS - 2A',
},
{
value: 'OVS - 3A',
label: 'OVS - 3A',
},
{
value: 'OVS - 1A',
label: 'OVS - 1A',
},
{
value: 'OVS - 1B',
label: 'OVS - 1B',
},
{
value: 'OHS - 2A',
label: 'OHS - 2A',
},
{
value: 'OHS - 2B',
label: 'OHS - 2B',
},
{
value: 'OHS - 2C',
label: 'OHS - 2C',
},
{
value: 'OHS - 2D',
label: 'OHS - 2D',
},
],
}
],
shortcuts: [
{
text: '1 month ago',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24 * 30)
return date
},
},
{
text: '3 months ago',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24 * 90)
return date
},
},
{
text: '6 months ago',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24 * 180)
return date
},
},
],
idOptions: [{
value: '1',
label: '1',
},
{
value: '2',
label: '2',
},
{
value: '3',
label: '3',
},
{
value: '4',
label: '4',
},
{
value: '5',
label: '5',
}],
layerInfo: null,
lat: '',
lon: '',
disLat: '',
disLon: '',
}) })
const shortcuts = [ const onMapClick = (e) => {
{ state.lat = e.latlng.lat.toFixed(3);
text: '1 month ago', state.lon = e.latlng.lng.toFixed(3);
value: () => { state.coordinateList.push({
const date = new Date() Lat: state.lat,
date.setTime(date.getTime() - 3600 * 1000 * 24 * 30) Lng: state.lon
return date })
}, // changeLatLon(e)
}, }
{
text: '3 months ago', const changeLatLon = (e) => {
value: () => { state.disLat = e.latlng.lat.toFixed(3);
const date = new Date() state.disLon = e.latlng.lng.toFixed(3);
date.setTime(date.getTime() - 3600 * 1000 * 24 * 90) // state.lon = state.lon % 360;
return date // if (state.lon < 0) {
}, // state.lon = state.lon + 360;
}, // }
{ // state.lon = state.lon.toFixed(3);
text: '6 months ago', if (state.disLat < 0) {
value: () => { state.disLat = String(Math.abs(state.disLat)) + "°S"
const date = new Date() }
date.setTime(date.getTime() - 3600 * 1000 * 24 * 180) else {
return date state.disLat = String(state.disLat) + "°N"
}, }
},
] if (state.disLon <= 180 && state.disLon >= 0) {
state.disLon = String(Math.abs(state.disLon)) + "°E"
}
else if (state.disLon > 180 && state.disLon <= 360) {
state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
}
else if (state.disLon < 0) {
let n = Math.floor(state.disLon / 360)
state.disLon = (state.disLon - n * 360).toFixed(3)
if (state.disLon <= 180 && state.disLon >= 0) {
state.disLon = String(Math.abs(state.disLon)) + "°E"
}
else if (state.disLon > 180 && state.disLon <= 360) {
state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
}
}
else if (state.disLon > 360) {
let n = Math.floor(state.disLon / 360)
state.disLon = (state.disLon - n * 360).toFixed(3)
if (state.disLon <= 180 && state.disLon >= 0) {
state.disLon = String(Math.abs(state.disLon)) + "°E"
}
else if (state.disLon > 180 && state.disLon <= 360) {
state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
}
}
}
// //
const addCoordinate = () => { const addCoordinate = () => {
state.addCoord = !state.addCoord; state.addCoord = !state.addCoord;
state.coordinateList = [ if (state.addCoord && state.coordinateList.length <= 2) {
{ map.value.mapOperations.drawRectangle()
Lat: '43.538' map.value.mapOperations.on("click", onMapClick)
, document.getElementsByClassName('coordinateBtn')[0].innerText = 'Stop';
Lng: '111.530' }
}, else {
{ map.value.mapOperations.off("click", onMapClick)
Lat: '36.195' document.getElementsByClassName('coordinateBtn')[0].innerText = 'Add coordinates';
, }
Lng: '120.761'
}
]
} }
// //
const clearCoordinate = () => { const clearCoordinate = () => {
state.coordinateList = []; state.coordinateList = [];
state.startTime = ''; state.startTime = '';
state.endTime = ''; state.endTime = '';
state.addCoord = false
map.value.mapOperations.deleteRectangle()
map.value.mapOperations.off("click", onMapClick)
document.getElementsByClassName('coordinateBtn')[0].innerText = 'Add coordinates';
} }
// //
const editCoordinate = () => { const editCoordinate = () => {
} }
// //
const startCrawl = () => { const startCrawl = () => {
console.log("start time:", state.startTime) var ranges = state.coordinateList[0].Lat + ' ' + state.coordinateList[0].Lng + ',' + state.coordinateList[1].Lat + ' ' + state.coordinateList[1].Lng
console.log("end time:", state.endTime) var type = null
console.log("addCoord:", state.addCoord) if (state.satelliteSelected[0] == 'landsat') {
console.log("satelliteSelected:", state.satelliteSelected) type = '5'
} else if (state.satelliteSelected[0] == 'Sentinel') {
type = '6'
} else if (state.satelliteSelected[0] == '') {
type = '7'
}
var id = 2
var param = {
"stime": state.startTime,
"etime": state.endTime,
"disaster_id": state.selectID * 1,
"ranges": ranges,
"id": id
}
console.log(param);
submit(
{
type: type,
manageId: userInfo.userInfos.id,
status: 0,
disasterId: state.selectID,
id: (id ? id : null)
}
).then(ret => {
if (ret == 1042) {
ElMessage.error("error")
} else {
rs(param).then(res => {
console.log(res);
// getData();
ElMessage({
message: 'Success, Start crawling.',
type: 'success',
})
})
}
})
} }
// //
@ -352,9 +454,19 @@ const ClearCondition = () => {
state.coordinateList = [] state.coordinateList = []
state.selectID = '' state.selectID = ''
} }
</script>
<style scoped lang="scss"> //
watch(
() => state.coordinateList.length,
(newValue, oldValue) => {
if (newValue > 1) {
map.value.mapOperations.off("click", onMapClick)
}
},
{ immediate: true })
</script>
<style scoped lang="scss">
.rsSelect { .rsSelect {
border: 1px solid #040728; border: 1px solid #040728;
height: 52rem; height: 52rem;

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="container"> <div class="container">
<el-tabs v-model="state.activeName" <el-tabs v-model="state.activeName">
@tab-click="handleClick">
<el-tab-pane label="Search condition" <el-tab-pane label="Search condition"
name="first"> name="first">
<search-condition></search-condition> <search-condition></search-condition>

View File

@ -1,44 +1,28 @@
<template> <template>
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="10"> <el-col :span="10">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-table :data="state.disasterData.data" <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
v-loading="state.disasterData.loading" highlight-current-row @row-click="tableClick">
style="width: 100%" <el-table-column type="index" label="ID" width="50" />
highlight-current-row <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
@row-click="tableClick"> <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
<el-table-column type="index" <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
label="ID" </el-table>
width="50" /> <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
<el-table-column prop="disasterType" class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
label="Disaster type" v-model:current-page="state.disasterData.param.pageNum" background
show-overflow-tooltip></el-table-column> v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
<el-table-column prop="disasterCountry" :total="state.disasterData.total">
label="disaster country" </el-pagination>
show-overflow-tooltip></el-table-column> </div>
<el-table-column prop="disasterTime" </el-col>
label="disaster time" <el-col :span="14">
show-overflow-tooltip></el-table-column> <div class="system-role-padding layout-padding-auto layout-padding-view">
</el-table> <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-pagination @size-change="onHandleDisasterSizeChange" <!-- <el-input size="default" placeholder="please enter username" style="max-width: 180px" v-model="state.searchName"
@current-change="onHandleDisasterCurrentChange"
class="mt15"
:pager-count="5"
:page-sizes="[10, 20, 30]"
v-model:current-page="state.disasterData.param.pageNum"
background
v-model:page-size="state.disasterData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="state.disasterData.total">
</el-pagination>
</div>
</el-col>
<el-col :span="14">
<div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<!-- <el-input size="default" placeholder="please enter username" style="max-width: 180px" v-model="state.searchName"
clearable></el-input> clearable></el-input>
<el-button size="default" type="primary" class="ml10" @click="getTableData"> <el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-icon> <el-icon>
@ -46,109 +30,72 @@
</el-icon> </el-icon>
search search
</el-button>--> </el-button>-->
<el-button size="default" type="success" class="ml10" @click="uploadData"> <el-button size="default" type="success" class="ml10" @click="uploadData">
<el-icon> <el-icon>
<ele-Upload/> <ele-Upload />
</el-icon> </el-icon>
upload upload
</el-button> </el-button>
<el-button size="default" type="danger" class="ml10" @click="batchDel"> <el-button size="default" type="danger" class="ml10" @click="batchDel">
<el-icon> <el-icon>
<ele-Delete/> <ele-Delete />
</el-icon> </el-icon>
batch delete batch delete
</el-button> </el-button>
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick" type="card">
<el-tab-pane label="wordclouds" name="first">
<el-table :data="state.tableData.data" v-loading="state.tableData.loading"
@selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="ID" width="50" />
<el-table-column prop="date" label="date" show-overflow-tooltip></el-table-column>
<el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
<el-table-column prop="word" label="word" show-overflow-tooltip></el-table-column>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary" @click="editWordCloud(scope.row)">Edit</el-button>
<el-button size="small" text type="primary" @click="delWordCloud(scope.row)">Delete</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
: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" :total="state.tableData.total">
</el-pagination>
</el-tab-pane>
<el-tab-pane label="hotspot" name="second">
<el-table :data="state.tableData.data" v-loading="state.tableData.loading"
@selection-change="handleSelectionHotspotChange" style="width: 100%">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="ID" width="50" />
<el-table-column prop="areaCn" label="area cn" show-overflow-tooltip></el-table-column>
<el-table-column prop="areaEn" label="area en" show-overflow-tooltip></el-table-column>
<el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary" @click="editHotspot(scope.row)">Edit</el-button>
<el-button size="small" text type="primary" @click="delHotspot(scope.row)">Delete</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
: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" :total="state.tableData.total">
</el-pagination>
</el-tab-pane>
</el-tabs>
</div> </div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick" type="card"> </el-col>
<el-tab-pane label="wordclouds" name="first"> </el-row>
<el-table :data="state.tableData.data"
v-loading="state.tableData.loading"
@selection-change="handleSelectionChange"
style="width: 100%">
<el-table-column type="selection" width="55" />
<el-table-column type="index"
label="ID"
width="50" />
<el-table-column prop="time"
label="time"
show-overflow-tooltip></el-table-column>
<el-table-column prop="frequency"
label="frequency"
show-overflow-tooltip></el-table-column>
<el-table-column prop="word"
label="word"
show-overflow-tooltip></el-table-column>
<el-table-column prop="Operate"
label="Operate"
show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary" @click="editWordCloud(scope.row)">Edit</el-button>
<el-button size="small" text type="primary" @click="delWordCloud(scope.row)">Delete</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="5"
: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"
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
<el-tab-pane label="hotspot" name="second">
<el-table :data="state.tableData.data"
v-loading="state.tableData.loading"
@selection-change="handleSelectionHotspotChange"
style="width: 100%">
<el-table-column type="selection" width="55" />
<el-table-column type="index"
label="ID"
width="50" />
<el-table-column prop="areaCn"
label="area cn"
show-overflow-tooltip></el-table-column>
<el-table-column prop="areaEn"
label="area en"
show-overflow-tooltip></el-table-column>
<el-table-column prop="frequency"
label="frequency"
show-overflow-tooltip></el-table-column>
<el-table-column prop="Operate"
label="Operate"
show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary" @click="editHotspot(scope.row)">Edit</el-button>
<el-button size="small" text type="primary" @click="delHotspot(scope.row)">Delete</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="5"
: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"
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
</el-tabs>
</div>
</el-col>
</el-row>
</el-config-provider> </el-config-provider>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" /> <HotspotForm ref="hotspotRef" @callback="getTableData" />
<HotspotForm ref="hotspotRef" @callback="getTableData"/> <WordClouds ref="wordCloudsRef" @callback="getTableData" />
<WordClouds ref="wordCloudsRef" @callback="getTableData"/> <EditHotspotForm ref="editHotspotRef" @callback="getTableData" />
<EditHotspotForm ref="editHotspotRef" @callback="getTableData"/> <EditWordCloudsForm ref="editWordCloudsRef" @callback="getTableData" />
<EditWordCloudsForm ref="editWordCloudsRef" @callback="getTableData"/>
</div> </div>
</template> </template>
@ -158,7 +105,7 @@ import HotspotForm from './component/hotspotForm.vue';
import WordClouds from './component/wordCloudForm.vue'; import WordClouds from './component/wordCloudForm.vue';
import EditHotspotForm from './component/editHotspotForm.vue'; import EditHotspotForm from './component/editHotspotForm.vue';
import EditWordCloudsForm from './component/editWordCloudForm.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' import en from 'element-plus/dist/locale/en.mjs'
const activeName = ref('first'); const activeName = ref('first');
const hotspotRef = ref(); const hotspotRef = ref();
@ -176,10 +123,10 @@ const uploadRef = ref();
// //
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
multipleWord:[], multipleWord: [],
multipleHotspot:[], multipleHotspot: [],
tabVal:'first', tabVal: 'first',
disasterId:null, disasterId: null,
disasterData: { disasterData: {
data: [], data: [],
total: 0, total: 0,
@ -211,7 +158,7 @@ const handleSelectionHotspotChange = (val) => {
} }
const handleClick = (tab) => { const handleClick = (tab) => {
state.tabVal = tab; state.tabVal = tab;
state. tableData={ state.tableData = {
data: [], data: [],
total: 0, total: 0,
loading: false, loading: false,
@ -225,7 +172,7 @@ const handleClick = (tab) => {
}; };
const auditData = (row) => { const auditData = (row) => {
let id = row.id let id = row.id
auditRef.value.openDialog([{"id":id}]); auditRef.value.openDialog([{ "id": id }]);
} }
// //
const formatSize = (size) => { const formatSize = (size) => {
@ -250,8 +197,8 @@ const formatSize = (size) => {
const formatSizeUnits = (size) => { const formatSizeUnits = (size) => {
if (size === 0) return '0 B'; if (size === 0) return '0 B';
var k = 1000, // or 1024 var k = 1000, // or 1024
sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
i = Math.floor(Math.log(size) / Math.log(k)); 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];
} }
@ -263,7 +210,7 @@ const tableClick = (row, column, event) => {
// //
const getDisasterData = () => { const getDisasterData = () => {
state.disasterData.loading = true; 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.data = res.records;
state.disasterData.total = res.total; state.disasterData.total = res.total;
state.disasterData.loading = false; state.disasterData.loading = false;
@ -273,13 +220,13 @@ const getDisasterData = () => {
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
if(state.tabVal == 'first'){ if (state.tabVal == 'first') {
getWordClouds(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId_equal":state.disasterId,"isDeleted_equal":0}).then(res=>{ 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.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
}else { } else {
getHotspot(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId_equal":state.disasterId,"isDeleted_equal":0}).then(res=>{ 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.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
@ -290,7 +237,7 @@ const getTableData = () => {
}; };
// //
const uploadData = () => { const uploadData = () => {
if(state.disasterId == null){ if (state.disasterId == null) {
ElMessage.warning("Please select the disaster first") ElMessage.warning("Please select the disaster first")
return false; return false;
} }
@ -306,11 +253,11 @@ const editWordCloud = (row) => {
}; };
// //
const batchDel = () => { 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"); ElMessage.warning("Select the data to be operated first");
return false; 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"); ElMessage.warning("Select the data to be operated first");
return false; return false;
} }
@ -319,24 +266,24 @@ const batchDel = () => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
if(state.tabVal == 'first'){ if (state.tabVal == 'first') {
// //
let id = state.multipleWord.map(item=>item.id) let id = state.multipleWord.map(item => item.id)
delData(id.join(),1).then(res=>{ delData(id.join(), 1).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
}) })
}else{ } else {
// //
let id = state.multipleHotspot.map(item=>item.id) let id = state.multipleHotspot.map(item => item.id)
delData(id.join(),2).then(res=>{ delData(id.join(), 2).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
}) })
} }
}) })
.catch(() => {}); .catch(() => { });
} }
// //
const delWordCloud = (row) => { const delWordCloud = (row) => {
@ -345,13 +292,13 @@ const delWordCloud = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
delData(row.id,1).then(res=>{ delData(row.id, 1).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
}; };
// //
@ -361,13 +308,13 @@ const delHotspot = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
delData(row.id,2).then(res=>{ delData(row.id, 2).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
}; };
// //
const onHandleDisasterSizeChange = (val) => { const onHandleDisasterSizeChange = (val) => {
@ -396,7 +343,7 @@ onMounted(() => {
}); });
</script> </script>
<style> <style>
.demo-tabs > .el-tabs__content { .demo-tabs>.el-tabs__content {
padding: 32px; padding: 32px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
@ -406,15 +353,21 @@ onMounted(() => {
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table { .el-table {
flex: 1; flex: 1;
} }
} }
} }
.demo-tabs > .el-tabs__content {
padding: 32px; .demo-tabs>.el-tabs__content {
padding: 10px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
font-weight: 600; font-weight: 600;
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -90,12 +90,12 @@
@size-change="onHandleSizeChange" @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
background background
v-model:page-size="state.tableData.param.pageSize" 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" :total="state.tableData.total"
> >
</el-pagination> --> </el-pagination> -->

View File

@ -90,12 +90,12 @@
@size-change="onHandleSizeChange" @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
background background
v-model:page-size="state.tableData.param.pageSize" 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" :total="state.tableData.total"
> >
</el-pagination> --> </el-pagination> -->

View File

@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item class="login-animation3" v-if="state.captchaMode"> <el-form-item class="login-animation3" v-if="state.captchaMode">
<el-col :span="15"> <el-col :span="15">
<el-input text maxlength="5" placeholder="Please input validate code" v-model="state.ruleForm.code" clearable autocomplete="off"> <el-input text maxlength="3" placeholder="Please input validate code" v-model="state.ruleForm.code" clearable autocomplete="off">
<template #prefix> <template #prefix>
<el-icon class="el-input__icon"><ele-Position /></el-icon> <el-icon class="el-input__icon"><ele-Position /></el-icon>
</template> </template>

View File

@ -1,22 +1,23 @@
<template> <template>
<div class="system-user-container" style="width:calc(100% - 10px) !important ;"> <div class="system-user-container" style="width:calc(100% - 10px) !important ;">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-card shadow="hover"> <el-card shadow="hover">
<div class="system-user-search mb15"> <div class="system-user-search mb15">
<el-form> <el-form>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="UserName"><el-input size="default" style="max-width: 180px" <el-form-item label="UserName"><el-input size="default" style="max-width: 180px"
v-model="state.query.userName" clearable placeholder="Please enter the UserName"> v-model="state.query.userName" clearable
</el-input> placeholder="Please enter the UserName">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="checked"> <el-form-item label="checked" style="margin-left: 10px;">
<el-select size="default" v-model="state.query.status" clearable <el-select size="default" v-model="state.query.status" clearable
placeholder="Replied"> style="max-width: 180px" placeholder="Replied">
<el-option label="UnReplied" :value="0"></el-option> <el-option label="UnReplied" :value="0"></el-option>
<el-option label="Replied" :value="1"></el-option> <el-option label="Replied" :value="1"></el-option>
<el-option label="Observed" :value="2"></el-option> <el-option label="Observed" :value="2"></el-option>
@ -36,66 +37,64 @@
</div> </div>
<el-table :data="state.tableData.data" style="width: 100%" v-loading="state.tableData.loading" <el-table :data="state.tableData.data" style="width: 100%" v-loading="state.tableData.loading"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column prop="userName" label="userName"> </el-table-column> <el-table-column prop="userName" label="userName"> </el-table-column>
<el-table-column prop="email" label="email"> </el-table-column> <el-table-column prop="email" label="email"> </el-table-column>
<el-table-column prop="organization" label="organization"> </el-table-column> <el-table-column prop="organization" label="organization"> </el-table-column>
<el-table-column prop="message" label="message"> </el-table-column> <el-table-column prop="message" label="message"> </el-table-column>
<el-table-column label="Operate" width="180"> <el-table-column label="Operate" width="180">
<template #default="scope"> <template #default="scope">
<el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status != 2 " text type="primary" <el-button :disabled="scope.row.userName === 'admin'" size="small"
@click="onObserved(scope.row)">Observed</el-button> v-if="scope.row.status != 2" text type="primary"
<el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status != 1 " text type="primary" @click="onObserved(scope.row)">Observed</el-button>
@click="onOpenEdit(scope.row)">Reply e-mail</el-button> <el-button :disabled="scope.row.userName === 'admin'" size="small"
<el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status == 1 " text type="primary" v-if="scope.row.status != 1" text type="primary"
@click="onOpenEdit(scope.row)">Reply Info</el-button> @click="onOpenEdit(scope.row)">Reply e-mail</el-button>
<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" <el-button :disabled="scope.row.userName === 'admin'" size="small"
@click="onRowDel(scope.row)">Delete</el-button> v-if="scope.row.status == 1" text type="primary"
</template> @click="onOpenEdit(scope.row)">Reply Info</el-button>
</el-table-column> <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
</el-table> @click="onRowDel(scope.row)">Delete</el-button>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" </template>
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" </el-table-column>
background v-model:page-size="state.tableData.param.pageSize" </el-table>
layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total"> <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange"
</el-pagination> class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
</el-card> v-model:current-page="state.tableData.param.pageNum" background
</el-col> v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
</el-row> :total="state.tableData.total">
<el-dialog v-model="state.dialogVisible" title="Send Email" width="60%" :before-close="handleClose"> </el-pagination>
<el-form-item label="Subject:" > </el-card>
<el-input v-model="state.email.subject" placeholder="Please enter the Subject"></el-input> </el-col>
</el-form-item> </el-row>
<!-- <el-form-item label="Content:" > --> <el-dialog v-model="state.dialogVisible" title="Send Email" width="60%" :before-close="handleClose">
<el-form-item label="Subject:">
<QuillEditor ref="myQuillEditor" <el-input v-model="state.email.subject" placeholder="Please enter the Subject"></el-input>
theme="snow" </el-form-item>
v-model:content="state.email.text" <!-- <el-form-item label="Content:" > -->
:options="state.options"
contentType="html" <QuillEditor ref="myQuillEditor" theme="snow" v-model:content="state.email.text" :options="state.options"
@update:content="setValue()" contentType="html" @update:content="setValue()" style="height:500px ;" />
style="height:500px ;" <!-- </el-form-item> -->
/> <template #footer>
<!-- </el-form-item> --> <span class="dialog-footer">
<template #footer> <el-button @click="state.dialogVisible = false">Cancel</el-button>
<span class="dialog-footer"> <el-button type="primary" @click="send()" v-if="state.email.status != 1">
<el-button @click="state.dialogVisible = false">Cancel</el-button> Send
<el-button type="primary" @click="send()" v-if="state.email.status != 1"> </el-button>
Send </span>
</el-button> </template>
</span> </el-dialog>
</template> </el-config-provider>
</el-dialog>
</el-config-provider>
</div> </div>
</template> </template>
<script setup name="contact"> <script setup name="contact">
import { getList, remove,emailSend } from '/@/api/contact/index' import { getList, remove, emailSend } from '/@/api/contact/index'
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { ref, reactive, onMounted, nextTick,toRaw } from 'vue'; import { ref, reactive, onMounted, nextTick, toRaw } from 'vue';
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import { QuillEditor } from '@vueup/vue-quill' import { QuillEditor } from '@vueup/vue-quill'
import '@vueup/vue-quill/dist/vue-quill.snow.css' import '@vueup/vue-quill/dist/vue-quill.snow.css'
@ -116,7 +115,7 @@ const state = reactive({
}, },
selected: [], selected: [],
dialogVisible: false, dialogVisible: false,
options:{ options: {
modules: { modules: {
toolbar: [ toolbar: [
['bold', 'italic', 'underline', 'strike'], ['bold', 'italic', 'underline', 'strike'],
@ -133,20 +132,20 @@ const state = reactive({
}, },
placeholder: '请输入内容...' placeholder: '请输入内容...'
}, },
email:{ email: {
subject:'Thank You for Your Support', subject: 'Thank You for Your Support',
text:'Dear Rising Sun,'+ text: 'Dear Rising Sun,' +
'I would like to express my heartfelt gratitude to you for your kind support and assistance during my recent project. I appreciate the time and effort you have dedicated to helping me with technical and news-related issues.'+ 'I would like to express my heartfelt gratitude to you for your kind support and assistance during my recent project. I appreciate the time and effort you have dedicated to helping me with technical and news-related issues.' +
'It has been a pleasure working with such a knowledgeable and professional individual like you. Your expertise and guidance have proven to be invaluable to me, and I am truly grateful for your assistance throughout the process.'+ 'It has been a pleasure working with such a knowledgeable and professional individual like you. Your expertise and guidance have proven to be invaluable to me, and I am truly grateful for your assistance throughout the process.' +
'Once again, thank you so much for your help and cooperation. I look forward to collaborating with you again in the future.'+ 'Once again, thank you so much for your help and cooperation. I look forward to collaborating with you again in the future.' +
' Best regards,'+ ' Best regards,' +
' yyhouc' ' yyhouc'
} , },
// //
}); });
const setValue = () => { const setValue = () => {
const text = toRaw(myQuillEditor.value).getHTML() const text = toRaw(myQuillEditor.value).getHTML()
console.log(text) console.log(text)
} }
// //
const initTableData = () => { const initTableData = () => {
@ -174,12 +173,12 @@ const onOpenEdit = (row) => {
}; };
const send = () => { const send = () => {
state.email.email="792163605@qq.com" state.email.email = "792163605@qq.com"
emailSend(state.email).then(res => { emailSend(state.email).then(res => {
ElMessage.success('发送成功'); ElMessage.success('发送成功');
state.dialogVisible = false; state.dialogVisible = false;
}) })
}; };
// //
const onRowDel = (row) => { const onRowDel = (row) => {
@ -217,3 +216,9 @@ onMounted(() => {
}); });
</script> </script>
<style>
.mt15 {
display: flex;
justify-content: end;
}
</style>

View File

@ -1,115 +1,76 @@
<template> <template>
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="10"> <el-col :span="10">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-table :data="state.disasterData.data" <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
v-loading="state.disasterData.loading" highlight-current-row @row-click="tableClick">
style="width: 100%" <el-table-column type="index" label="ID" width="50" />
highlight-current-row <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
@row-click="tableClick"> <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
<el-table-column type="index" <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
label="ID" </el-table>
width="50" /> <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
<el-table-column prop="disasterType" class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
label="Disaster type" v-model:current-page="state.disasterData.param.pageNum" background
show-overflow-tooltip></el-table-column> v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
<el-table-column prop="disasterCountry" :total="state.disasterData.total">
label="disaster country" </el-pagination>
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterTime"
label="disaster time"
show-overflow-tooltip></el-table-column>
</el-table>
<el-pagination @size-change="onHandleDisasterSizeChange"
@current-change="onHandleDisasterCurrentChange"
class="mt15"
:pager-count="5"
:page-sizes="[10, 20, 30]"
v-model:current-page="state.disasterData.param.pageNum"
background
v-model:page-size="state.disasterData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="state.disasterData.total">
</el-pagination>
</div>
</el-col>
<el-col :span="14">
<div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-button size="default" type="primary" class="ml10" @click="batchAudit">
<el-icon>
<ele-EditPen/>
</el-icon>
batch audit
</el-button>
</div> </div>
<el-table :data="state.tableData.data" </el-col>
v-loading="state.tableData.loading" <el-col :span="14">
@selection-change="handleSelectionChange" <div class="system-role-padding layout-padding-auto layout-padding-view">
style="width: 100%"> <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-table-column type="selection" width="55" /> <el-button size="default" type="primary" class="ml10" @click="batchAudit">
<el-table-column type="index" <el-icon>
label="ID" <ele-EditPen />
width="50" /> </el-icon>
<el-table-column prop="uploaderName" batch audit
label="uploader Name" </el-button>
show-overflow-tooltip></el-table-column> </div>
<el-table-column prop="sourceOrganization" <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
label="Organization" @selection-change="handleSelectionChange" style="width: 100%">
show-overflow-tooltip></el-table-column> <el-table-column type="selection" width="55" />
<el-table-column prop="title" <el-table-column type="index" label="ID" width="50" />
label="Professional title" <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
show-overflow-tooltip <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
width="150"></el-table-column> <el-table-column prop="title" label="Professional title" show-overflow-tooltip
<el-table-column prop="size" width="150"></el-table-column>
label="Data size" <el-table-column prop="size" label="Data size" show-overflow-tooltip>
show-overflow-tooltip> <template #default="scope">
<template #default="scope"> {{ formatSizeUnits(scope.row.size) }}
{{formatSizeUnits(scope.row.size)}} </template>
</template> </el-table-column>
</el-table-column> <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column>
<el-table-column prop="uploadTime" <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
label="Upload time" <template #default="scope">
show-overflow-tooltip></el-table-column> <el-button size="small" text type="primary" @click="auditData(scope.row)">Audit</el-button>
<el-table-column prop="Operate" </template>
label="Operate" </el-table-column>
show-overflow-tooltip> </el-table>
<template #default="scope"> <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
<el-button size="small" text type="primary" @click="auditData(scope.row)">Audit</el-button> :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
</template> v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
</el-table-column> :total="state.tableData.total">
</el-table> </el-pagination>
<el-pagination @size-change="onHandleSizeChange" </div>
@current-change="onHandleCurrentChange" </el-col>
class="mt15" </el-row>
:pager-count="5"
: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"
:total="state.tableData.total">
</el-pagination>
</div>
</el-col>
</el-row>
</el-config-provider> </el-config-provider>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" /> <Audit ref="auditRef" @callback="getTableData" />
<Audit ref="auditRef" @callback="getTableData"/>
</div> </div>
</template> </template>
<script lang="ts" setup name="systemRole"> <script lang="ts" setup name="systemRole">
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import type { TabsPaneContext } from 'element-plus'; import type { TabsPaneContext } from 'element-plus';
import {getDataUploadPage,getDisasterPage} from '/@/api/response/dataUpload.js' import { getDataUploadPage, getDisasterPage } from '/@/api/response/dataUpload.js'
const activeName = ref('first'); const activeName = ref('first');
const handleClick = (tab: TabsPaneContext, event: Event) => { const handleClick = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event); console.log(tab, event);
}; };
// //
@ -122,8 +83,8 @@ const auditRef = ref();
// //
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
multipleSelection:[], multipleSelection: [],
disasterId:null, disasterId: null,
disasterData: { disasterData: {
data: [], data: [],
total: 0, total: 0,
@ -134,23 +95,23 @@ const state = reactive({
pageSize: 10, pageSize: 10,
}, },
}, },
tableData: { tableData: {
data: [], data: [],
total: 0, total: 0,
loading: false, loading: false,
param: { param: {
search: '', search: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
}, },
}); });
const handleSelectionChange = (val) => { const handleSelectionChange = (val) => {
state.multipleSelection = val state.multipleSelection = val
} }
// //
const batchAudit = () => { const batchAudit = () => {
if(state.multipleSelection.length == 0){ if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first"); ElMessage.warning("Select the data to be operated first");
return false; return false;
} }
@ -158,7 +119,7 @@ const batchAudit = () => {
} }
const auditData = (row) => { const auditData = (row) => {
let id = row.id let id = row.id
auditRef.value.openDialog([{"id":id}]); auditRef.value.openDialog([{ "id": id }]);
} }
// //
const formatSize = (size) => { const formatSize = (size) => {
@ -183,8 +144,8 @@ const formatSize = (size) => {
const formatSizeUnits = (size) => { const formatSizeUnits = (size) => {
if (size === 0) return '0 B'; if (size === 0) return '0 B';
var k = 1000, // or 1024 var k = 1000, // or 1024
sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
i = Math.floor(Math.log(size) / Math.log(k)); 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];
} }
@ -196,7 +157,7 @@ const tableClick = (row, column, event) => {
// //
const getDisasterData = () => { const getDisasterData = () => {
state.disasterData.loading = true; 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.data = res.records;
state.disasterData.total = res.total; state.disasterData.total = res.total;
state.disasterData.loading = false; state.disasterData.loading = false;
@ -205,37 +166,37 @@ const getDisasterData = () => {
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
getDataUploadPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"disasterId":state.disasterId}).then(res=>{ getDataUploadPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId }).then(res => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
/* state.tableData.data = data; /* state.tableData.data = data;
state.tableData.total = state.tableData.data.length;*/ state.tableData.total = state.tableData.data.length;*/
setTimeout(() => { setTimeout(() => {
state.tableData.loading = false; state.tableData.loading = false;
}, 500); }, 500);
}; };
// //
const onOpenAddRole = (type) => { const onOpenAddRole = (type) => {
roleDialogRef.value.openDialog(type); roleDialogRef.value.openDialog(type);
}; };
// //
const onOpenEditRole = (type, row) => { const onOpenEditRole = (type, row) => {
roleDialogRef.value.openDialog(type, row); roleDialogRef.value.openDialog(type, row);
}; };
// //
const onRowDel = (row) => { const onRowDel = (row) => {
ElMessageBox.confirm(`此操作将永久删除角色名称:“${row.roleName}”,是否继续?`, '提示', { ElMessageBox.confirm(`此操作将永久删除角色名称:“${row.roleName}”,是否继续?`, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
getTableData(); getTableData();
ElMessage.success('删除成功'); ElMessage.success('删除成功');
}) })
.catch(() => {}); .catch(() => { });
}; };
// //
const onHandleDisasterSizeChange = (val) => { const onHandleDisasterSizeChange = (val) => {
@ -249,34 +210,39 @@ const onHandleDisasterCurrentChange = (val) => {
}; };
// //
const onHandleSizeChange = (val) => { const onHandleSizeChange = (val) => {
state.tableData.param.pageSize = val; state.tableData.param.pageSize = val;
getTableData(); getTableData();
}; };
// //
const onHandleCurrentChange = (val) => { const onHandleCurrentChange = (val) => {
state.tableData.param.pageNum = val; state.tableData.param.pageNum = val;
getTableData(); getTableData();
}; };
// //
onMounted(() => { onMounted(() => {
getDisasterData(); getDisasterData();
getTableData(); getTableData();
}); });
</script> </script>
<style> <style scoped lang="scss">
.demo-tabs > .el-tabs__content { .demo-tabs>.el-tabs__content {
padding: 32px; padding: 32px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
font-weight: 600; font-weight: 600;
} }
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table {
flex: 1; .el-table {
} flex: 1;
} }
}
}
.mt15 {
display: flex;
justify-content: end;
} }
</style> </style>

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="system-user-container" style="width:calc(100% - 10px) !important ;">
<div class="system-user-container" style="width:calc(100% - 10px) !important ;"> <el-config-provider :locale="en">
<el-config-provider :locale="en">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-card shadow="hover"> <el-card shadow="hover">
@ -14,7 +13,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="checked"> <el-form-item label="checked" style="margin-left: 10px;">
<el-select size="default" v-model="state.query.checked" clearable <el-select size="default" v-model="state.query.checked" clearable
placeholder="Please select"> placeholder="Please select">
<el-option label="checked" value="0"></el-option> <el-option label="checked" value="0"></el-option>
@ -54,30 +53,29 @@
<el-table-column prop="reviewTime" label="Review Time"></el-table-column> <el-table-column prop="reviewTime" label="Review Time"></el-table-column>
<el-table-column label="Operate" width="140"> <el-table-column label="Operate" width="140">
<template #default="scope"> <template #default="scope">
<el-button :style='scope.row.reviewTime?"display:none;":"" ' size="small" text type="primary" <el-button :style='scope.row.reviewTime ? "display:none;" : ""' size="small" text
@click="onOpenEdit(scope.row)">Review</el-button> type="primary" @click="onOpenEdit(scope.row)">Review</el-button>
<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
@click="onRowDel(scope.row)">Delete</el-button> @click="onRowDel(scope.row)">Delete</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange"
class="mt15" :pager-count="5" :page-sizes="[10, 20, 30]" class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" background v-model:current-page="state.tableData.param.pageNum" background
v-model:page-size="state.tableData.param.pageSize" v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
</el-config-provider> </el-config-provider>
</div> </div>
</template> </template>
<script setup name="systemUser"> <script setup name="systemUser">
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import { getList, remove ,review } from '/@/api/tool/index' import { getList, remove, review } from '/@/api/tool/index'
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { reactive, ref, onMounted, nextTick } from 'vue'; import { reactive, ref, onMounted, nextTick } from 'vue';
const AddRef = ref(); const AddRef = ref();
@ -126,13 +124,13 @@ const onOpenEdit = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
review({id:row.id}).then(res => { review({ id: row.id }).then(res => {
ElMessage.success('success'); ElMessage.success('success');
initTableData(); initTableData();
})
}) })
}) .catch(() => { });
.catch(() => { });
}; };
// //
@ -171,3 +169,9 @@ onMounted(() => {
}); });
</script> </script>
<style>
.mt15 {
display: flex;
justify-content: end;
}
</style>

View File

@ -5,27 +5,28 @@
<div class="system-user-search mb15"> <div class="system-user-search mb15">
<el-input size="default" placeholder="Name" style="max-width: 180px" <el-input size="default" placeholder="Name" style="max-width: 180px"
v-model="state.tableData.query.name"> </el-input> v-model="state.tableData.query.name"> </el-input>
<el-button size="default" type="primary" class="ml10" @click="getTableData" > <el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-icon> <el-icon>
<ele-Search /> <ele-Search />
</el-icon> </el-icon>
search search
</el-button> </el-button>
</div> </div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%" @selection-change = "selectionChange"> <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%"
@selection-change="selectionChange">
<el-table-column type="selection" width="60" @select="selectRow" /> <el-table-column type="selection" width="60" @select="selectRow" />
<el-table-column prop="name" label="Name" show-overflow-tooltip></el-table-column> <el-table-column prop="name" label="Name" show-overflow-tooltip></el-table-column>
<el-table-column prop="email" label="E-mail" show-overflow-tooltip></el-table-column> <el-table-column prop="email" label="E-mail" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" :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" background v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-card> </el-card>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="state.isShowDialog = false" >Cancel</el-button> <el-button @click="state.isShowDialog = false">Cancel</el-button>
<el-button type="success" @click="save()"> <el-button type="success" @click="save()">
Save Save
</el-button> </el-button>
@ -37,14 +38,14 @@
<script setup> <script setup>
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { getUserList,submit } from '/@/api/disasterInfo/index'; import { getUserList, submit } from '/@/api/disasterInfo/index';
import { ref, reactive, onMounted } from 'vue'; import { ref, reactive, onMounted } from 'vue';
const formRef = ref(); const formRef = ref();
const state = reactive({ const state = reactive({
isShowDialog: false, isShowDialog: false,
title: 'allocation', title: 'allocation',
rowData: {}, rowData: {},
tableData: { tableData: {
query: { query: {
name: "" name: ""
@ -81,9 +82,9 @@ const save = async () => {
return; return;
} }
let params = { let params = {
id:state.rowData.id, id: state.rowData.id,
chiefId:state.selectData[0].id, chiefId: state.selectData[0].id,
chiefName:state.selectData[0].name, chiefName: state.selectData[0].name,
}; };
let res = await submit(params); let res = await submit(params);
emit('callback'); emit('callback');
@ -131,3 +132,9 @@ defineExpose({
openDialog, openDialog,
}); });
</script> </script>
<style>
.mt15 {
display: flex;
justify-content: end;
}
</style>

View File

@ -1,45 +1,72 @@
<template> <template>
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px"> <el-tabs v-model="activeName"
<el-tab-pane label="unchecked" name="first"> class="demo-tabs"
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%"> @tab-click="handleClick"
<el-table-column type="index" label="ID" width="50" /> style="margin-left: 20px">
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column> <el-tab-pane label="unchecked"
<el-table-column prop="organization" label="Organization" show-overflow-tooltip></el-table-column> name="first">
<el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip> <el-table :data="state.tableData.data"
<!-- 在disasterType中获取dictKey 对应的dictValue --> v-loading="state.tableData.loading"
<template #default="scope"> style="width: 100%">
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag> <el-table-column type="index"
</template> label="ID"
</el-table-column> width="50" />
<el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column> <el-table-column prop="username"
<!-- <el-table-column prop="affectedCountry" label="Affected country" show-overflow-tooltip></el-table-column> --> label="User name"
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column prop="organization"
label="Organization"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterType"
label="Disaster type"
show-overflow-tooltip>
<!-- 在disasterType中获取dictKey 对应的dictValue -->
<template #default="scope">
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="disasterKeyword"
label="Disaster keyword"
show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="affectedCountry" label="Affected country" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
<el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> --> <el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip> <el-table-column prop="disasterTime"
<template #default="scope"> label="Disaster time"
<!-- 格式化去除时分秒 --> show-overflow-tooltip>
{{ dateFormat(scope.row.disasterTime) }} <template #default="scope">
</template> <!-- 格式化去除时分秒 -->
</el-table-column> {{ dateFormat(scope.row.disasterTime) }}
<!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> --> </template>
<el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip> </el-table-column>
<template #default="scope"> <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
<el-tag type="info" v-if="scope.row.respondStatus === 0">Not reviewed</el-tag> <el-table-column prop="respondStatus"
<el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag> label="Response status"
</template> show-overflow-tooltip>
</el-table-column> <template #default="scope">
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip> <el-tag type="info"
<template #default="scope"> v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
<el-button size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)">Review</el-button> <el-tag type="info"
</template> v-if="scope.row.respondStatus === 1">Failed</el-tag>
</el-table-column> </template>
</el-table-column>
<el-table-column prop="Operate"
label="Operate"
show-overflow-tooltip>
<template #default="scope">
<el-button size="small"
text
type="primary"
@click="onOpenEditRole('edit', scope.row)">Review</el-button>
</template>
</el-table-column>
<!-- <el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column> <!-- <el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> --> <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="status" label="角色状态" show-overflow-tooltip> <!-- <el-table-column prop="status" label="角色状态" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-tag type="success" v-if="scope.row.status">启用</el-tag> <el-tag type="success" v-if="scope.row.status">启用</el-tag>
<el-tag type="info" v-else>禁用</el-tag> <el-tag type="info" v-else>禁用</el-tag>
@ -55,125 +82,172 @@
> >
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" <el-pagination @size-change="onHandleSizeChange"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background @current-change="onHandleCurrentChange"
v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper" class="mt15"
:total="state.tableData.total"> :pager-count="3"
</el-pagination> :page-sizes="[10, 20, 30]"
</el-tab-pane> v-model:current-page="state.tableData.param.current"
<el-tab-pane label="checked" name="second"> background
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%"> v-model:page-size="state.tableData.param.size"
<el-table-column type="index" label="ID" width="50" /> layout="total, sizes, prev, pager, next"
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column> :total="state.tableData.total">
<!-- <el-table-column prop="Administrator" label="Administrator" show-overflow-tooltip></el-table-column> --> </el-pagination>
<el-table-column prop="organization" label="Organization" show-overflow-tooltip></el-table-column> </el-tab-pane>
<el-table-column prop="email" label="Email" show-overflow-tooltip></el-table-column> <el-tab-pane label="checked"
<el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip> name="second">
<!-- 在disasterType中获取dictKey 对应的dictValue --> <el-table :data="state.tableData.data"
<template #default="scope"> v-loading="state.tableData.loading"
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag> style="width: 100%">
</template> <el-table-column type="index"
</el-table-column> label="ID"
<el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column> width="50" />
<!-- <el-table-column prop="Affected country" label="Affected country" show-overflow-tooltip></el-table-column> --> <el-table-column prop="username"
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column> label="User name"
<el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> --> show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip> <!-- <el-table-column prop="Administrator" label="Administrator" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="organization"
label="Organization"
show-overflow-tooltip></el-table-column>
<el-table-column prop="email"
label="Email"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterType"
label="Disaster type"
show-overflow-tooltip>
<!-- 在disasterType中获取dictKey 对应的dictValue -->
<template #default="scope">
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="disasterKeyword"
label="Disaster keyword"
show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="Affected country" label="Affected country" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
<el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="disasterTime"
label="Disaster time"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<!-- 格式化去除时分秒 --> <!-- 格式化去除时分秒 -->
{{ dateFormat(scope.row.disasterTime) }} {{ dateFormat(scope.row.disasterTime) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="chiefName" label="Answer" show-overflow-tooltip></el-table-column> <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> --> <!-- <el-table-column prop="Operate" label="Operate" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Operate" label="Operate" show-overflow-tooltip></el-table-column> --> <el-table-column prop="respondStatus"
<el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip> label="Response status"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-tag type="info" v-if="scope.row.respondStatus === 2">Reviewed</el-tag> <el-tag type="info"
<el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag> v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
</template> <el-tag type="info"
v-if="scope.row.respondStatus === 1">Failed</el-tag>
</template>
</el-table-column> </el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="3"
:page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.current"
background
v-model:page-size="state.tableData.param.size"
layout="total, sizes, prev, pager, next"
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
</el-tabs>
</div>
<el-dialog v-model="state.dialogVisible"
title="Review"
width="30%"
:before-close="handleClose">
<el-container style="margin-top: -2%;margin-bottom: 2%;">
<el-radio v-model="state.radio"
label='1'
@click="mapEvents('1')">Point</el-radio>
<el-radio v-model="state.radio"
label='2'
@click="mapEvents('2')">Area</el-radio>
<el-button type="primary"
style="margin-left: 5%;"
@click="ClearSubmit">Clear</el-button>
</el-container>
<el-container style="margin-top: 2%;margin-bottom: 2%;"
v-if="state.radio === '1' ? true : false">
<span style="line-height: 35px;"> Latitude</span>
<el-input placeholder="请输入内容"
style="height:35px;margin-right: 1%;"
v-model="state.dislat"></el-input>
<span style="line-height: 35px;">Longitude</span>
<el-input placeholder="请输入内容"
style="height:35px;"></el-input>
</el-container>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip> <<<<<<< HEAD
<template #default="scope"> <MapPage
<el-button size="small" text type="primary" @click="onAllocation(scope.row)">Allocation</el-button> style="height:350px ; width:100% ;margin-bottom: 10px;"
</template> ref="mapRef">
</el-table-column> </MapPage>
</el-table> =======
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background ref="mapRef"></MapPage>
v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper" >>>>>>> zqq
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
</el-tabs>
</div>
<el-dialog v-model="state.dialogVisible" title="Review" width="30%">
<el-container style="margin-top: -2%;margin-bottom: 2%;">
<el-radio v-model="state.radio" label='1' @click="mapEvents('1')">Point</el-radio>
<el-radio v-model="state.radio" label='2' @click="mapEvents('2')">Area</el-radio>
<el-button type="primary" style="margin-left: 5%;" @click="ClearSubmit">Clear</el-button>
</el-container>
<el-container style="margin-top: 2%;margin-bottom: 2%;" v-if="state.radio==='1'?true:false">
<span style="line-height: 35px;"> Latitude</span>
<el-input placeholder="wait……" style="height:35px;margin-right: 1%;" v-model="state.dislat" readonly="readonly"> </el-input>
<span style="line-height: 35px;">Longitude</span>
<el-input placeholder="wait……" style="height:35px;" v-model="state.dislon" readonly="readonly"></el-input>
</el-container>
<MapPage style="height:350px ; width:100% ;margin-bottom: 10px;" ref="mapRef"></MapPage>
<el-form-item label="Disaster Time">
<el-date-picker v-model="state.edit.disasterTime" type="date" value-format="YYYY-MM-DD"
placeholder="Select date and time" />
</el-form-item>
<template #footer> <el-form-item label="Disaster Time">
<span class="dialog-footer"> <el-date-picker v-model="state.edit.disasterTime"
<el-button @click="dialogVisible = false">Cancel</el-button> type="date"
<el-button type="danger" @click="reviews(1)"> value-format="YYYY-MM-DD"
Not Review placeholder="Select date and time" />
</el-button> </el-form-item>
<el-button type="primary" @click="reviews(2)">
Review <template #footer>
</el-button> <span class="dialog-footer">
</span> <el-button @click="dialogVisible = false">Cancel</el-button>
</template> <el-button type="danger"
</el-dialog> @click="reviews(1)">
<selectUser ref ="select" @callback="getTableData"></selectUser> Not Review
</el-button>
<el-button type="primary"
@click="reviews(2)">
Review
</el-button>
</span>
</template>
</el-dialog>
</el-config-provider> </el-config-provider>
</div> </div>
</template> </template>
<script setup name="userResponse"> <script setup name="userResponse">
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import { reactive, onMounted, ref, nextTick,watchEffect,defineAsyncComponent } from 'vue'; import { reactive, onMounted, ref, nextTick, watchEffect, defineAsyncComponent } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { getList, review } from '/@/api/disasterInfo/index'; import { getList, review } from '/@/api/disasterInfo/index';
import { getDictionary } from '/@/api/system/dictbiz'; import { getDictionary } from '/@/api/system/dictbiz';
import { useVariableStore } from '/@/stores/index.ts'
// //
import Map from '/@/components/Map.vue';
import { useDateFormat } from '@vueuse/shared'; import { useDateFormat } from '@vueuse/shared';
import selectUser from './component/selectUser.vue';
import L from "leaflet"; import L from "leaflet";
import '@geoman-io/leaflet-geoman-free'; import '@geoman-io/leaflet-geoman-free';
import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css'; import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
import "leaflet/dist/leaflet.css"; import "leaflet/dist/leaflet.css";
import 'leaflet-draw/dist/leaflet.draw' import 'leaflet-draw/dist/leaflet.draw'
import 'leaflet-draw/dist/leaflet.draw.css' import 'leaflet-draw/dist/leaflet.draw.css'
import { map } from 'lodash'; const map = ref();
const variableStore = useVariableStore();
const mapRef = ref();
const activeName = ref('first'); const activeName = ref('first');
const select = ref();
const handleClick = (tab, event) => { const handleClick = (tab, event) => {
state.selectName = tab.props.name; state.selectName = tab.props.name;
getTableData(); getTableData();
}; };
const MapPage = defineAsyncComponent({ const MapPage = defineAsyncComponent({
loader:() =>import('/@/components/Map.vue'), loader: () => import('/@/components/Map.vue'),
delay: 200, delay: 200,
}) })
const onAllocation = (row) => { const onAllocation = (row) => {
@ -200,10 +274,9 @@ const state = reactive({
disasterTypeList: [], disasterTypeList: [],
selectName: 'first', selectName: 'first',
edit: {}, edit: {},
radio:null, radio: null,
dislat:'', dislat: '',
dislon:'', dislon: ''
wktPoint:undefined
}); });
// //
const getTableData = () => { const getTableData = () => {
@ -214,6 +287,7 @@ const getTableData = () => {
} else { } else {
state.tableData.param.respondStatus = 2; state.tableData.param.respondStatus = 2;
} }
console.log(activeName.value);
getList(state.tableData.param).then((res) => { getList(state.tableData.param).then((res) => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
@ -225,34 +299,39 @@ const onHandleSizeChange = (val) => {
getTableData(); getTableData();
}; };
const onOpenEditRole = (type, row) => { const onOpenEditRole = (type, row) => {
// //
state.edit = JSON.parse(JSON.stringify(row)); state.edit = JSON.parse(JSON.stringify(row));
nextTick(() => {
//
//TODO
map.mapOperations.wktParseToMap(row.geometry)
});
state.dialogVisible = true; state.dialogVisible = true;
setTimeout(() => { setTimeout(() => {
state.radio = "1" state.radio = "1"
// mapRef.value.mapOperations.removeAll() // mapRef.value.mapOperations.removeAll()
// //
if(state.wktPoint){ if (state.wktPoint) {
mapRef.value.mapOperations.removeLayer(state.wktPoint) mapRef.value.mapOperations.removeLayer(state.wktPoint)
} }
state.wktPoint= mapRef.value.mapOperations.wktParseToMap(row.geometry) state.wktPoint = mapRef.value.mapOperations.wktParseToMap(row.geometry)
// mapRef.value.mapOperations.on("click", (res)=>{ // mapRef.value.mapOperations.on("click", (res)=>{
// mapRef.value.mapOperations.clearPolygon() // mapRef.value.mapOperations.clearPolygon()
// mapRef.value.mapOperations.removeLayer( state.wktPoint) // mapRef.value.mapOperations.removeLayer( state.wktPoint)
// mapRef.value.mapOperations.addInteractMarker(res.latlng.lat, res.latlng.lng) // mapRef.value.mapOperations.addInteractMarker(res.latlng.lat, res.latlng.lng)
// }) // })
mapEvents('1') mapEvents('1')
},100); }, 100);
}; };
const mapEvents = (ev)=>{ const mapEvents = (ev) => {
if(ev == '1'){ if (ev == '1') {
mapRef.value.mapOperations.clearPolygon() mapRef.value.mapOperations.clearPolygon()
// mapRef.value.mapOperations.on("click", mapClick) // mapRef.value.mapOperations.on("click", mapClick)
mapRef.value.mapOperations.on("mousemove", changelatlon) mapRef.value.mapOperations.on("mousemove", changelatlon)
variableStore.polygoncontrol = "option1" variableStore.polygoncontrol = "option1"
}else{ } else {
mapRef.value.mapOperations.off("click",mapClick); mapRef.value.mapOperations.off("click", mapClick);
// mapRef.value.mapOperations.drawPolygon() // mapRef.value.mapOperations.drawPolygon()
// mapRef.value.mapOperations.drawCreated() // mapRef.value.mapOperations.drawCreated()
variableStore.polygoncontrol = "option2" variableStore.polygoncontrol = "option2"
@ -264,26 +343,23 @@ const ClearSubmit = () => {
variableStore.wktdata = null variableStore.wktdata = null
}, 100) }, 100)
} }
const mapClick=(res)=>{ const mapClick = (res) => {
mapRef.value.mapOperations.removeLayer( state.wktPoint) mapRef.value.mapOperations.removeLayer(state.wktPoint)
changelatlon(res); changelatlon(res);
mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3)) mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3), res.latlng.lng.toFixed(3))
} }
const reviews = (index) => { const reviews = (index) => {
//state.edit.geometry //state.edit.geometry
//TODO //TODO
//state.edit.geometry = map.mapOperations.getWkt(); //state.edit.geometry = map.mapOperations.getWkt();
//index //index
if (index === 1) { if (index === 1) {
state.edit.respondStatus = 1; state.edit.respondStatus = 1;
} else { } else {
state.edit.respondStatus = 2; state.edit.respondStatus = 2;
} }
state.edit.geometry = variableStore.layerGroupPoint === null ? variableStore.layerGroupPoly : variableStore.layerGroupPoint;
// //
state.edit.disasterTime = useDateFormat(state.edit.disasterTime, 'YYYY-MM-DD').value + " 00:00:00"; state.edit.disasterTime = useDateFormat(state.edit.disasterTime, 'YYYY-MM-DD').value + " 00:00:00";
review(state.edit).then((res) => { review(state.edit).then((res) => {
@ -294,50 +370,57 @@ const reviews = (index) => {
} }
// //
const onHandleCurrentChange = (val) => { const onHandleCurrentChange = (val) => {
console.log(val);
state.tableData.param.pageNum = val; state.tableData.param.pageNum = val;
getTableData(); getTableData();
}; };
const onMapClick = (e) => {
state.lat = e.latlng.lat.toFixed(3);
state.lon = e.latlng.lng.toFixed(3);
map.value.mapOperations.addInteractMarker(state.lat, state.lon)
}
const changelatlon = (e) => { const changelatlon = (e) => {
//e
state.dislat = e.latlng.lat.toFixed(3);
state.dislon= e.latlng.lng.toFixed(3);
// if (state.lon < 0) {
// state.lon = state.lon + 360;
// }
// state.lon = state.lon.toFixed(3);
if (state.dislat < 0) {
state.dislat = String(Math.abs(state.dislat)) + "°S"
}
else {
state.dislat = String(state.dislat) + "°N"
}
if (state.dislon <= 180 && state.dislon >= 0) { state.dislat = e.latlng.lat.toFixed(3);
state.dislon = String(Math.abs(state.dislon)) + "°E" state.dislon = e.latlng.lng.toFixed(3);
} // state.lon = state.lon % 360;
else if (state.dislon > 180 && state.dislon <= 360) { // if (state.lon < 0) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W" // state.lon = state.lon + 360;
} // }
else if (state.dislon < 0) { // state.lon = state.lon.toFixed(3);
let n = Math.floor(state.dislon / 360) if (state.dislat < 0) {
state.dislon = (state.dislon - n * 360).toFixed(3) state.dislat = String(Math.abs(state.dislat)) + "°S"
}
else {
state.dislat = String(state.dislat) + "°N"
}
if (state.dislon <= 180 && state.dislon >= 0) { if (state.dislon <= 180 && state.dislon >= 0) {
state.dislon = String(Math.abs(state.dislon)) + "°E" state.dislon = String(Math.abs(state.dislon)) + "°E"
} }
else if (state.dislon > 180 && state.dislon <= 360) { else if (state.dislon > 180 && state.dislon <= 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W" state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
} }
} else if (state.dislon < 0) {
else if (state.dislon > 360) { let n = Math.floor(state.dislon / 360)
let n = Math.floor(state.dislon / 360) state.dislon = (state.dislon - n * 360).toFixed(3)
state.dislon = (state.dislon - n * 360).toFixed(3) if (state.dislon <= 180 && state.dislon >= 0) {
if (state.dislon <= 180 && state.dislon >= 0) { state.dislon = String(Math.abs(state.dislon)) + "°E"
state.dislon = String(Math.abs(state.dislon)) + "°E" }
else if (state.dislon > 180 && state.dislon <= 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
}
} }
else if (state.dislon > 180 && state.dislon <= 360) { else if (state.dislon > 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W" let n = Math.floor(state.dislon / 360)
state.dislon = (state.dislon - n * 360).toFixed(3)
if (state.dislon <= 180 && state.dislon >= 0) {
state.dislon = String(Math.abs(state.dislon)) + "°E"
}
else if (state.dislon > 180 && state.dislon <= 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
}
} }
}
} }
// //
@ -347,14 +430,14 @@ onMounted(() => {
state.disasterTypeList = res; state.disasterTypeList = res;
}); });
watchEffect(() => { watchEffect(() => {
if (state.radio== "1") { if (state.radio == "1") {
// mapRef.value.mapOperations.on("click", onMapClick) // map.value.mapOperations.on("click", onMapClick)
// map.value.mapOperations.clearPolygon() // map.value.mapOperations.clearPolygon()
// map.value.mapOperations.on("mousemove", changelatlon) // map.value.mapOperations.on("mousemove", changelatlon)
// variableStore.polygoncontrol = "option1" // variableStore.polygoncontrol = "option1"
} }
else { else {
// mapRef.value.mapOperations.off("click", onMapClick) // map.value.mapOperations.off("click", onMapClick)
// map.value.mapOperations.drawPolygon() // map.value.mapOperations.drawPolygon()
// map.value.mapOperations.drawCreated() // map.value.mapOperations.drawCreated()
// variableStore.polygoncontrol = "option2" // variableStore.polygoncontrol = "option2"
@ -366,21 +449,27 @@ const getValue = (key) => {
return state.disasterTypeList.find((item) => item.dictKey === key)?.dictValue; return state.disasterTypeList.find((item) => item.dictKey === key)?.dictValue;
}; };
</script> </script>
<style> <style lang="scss">
.demo-tabs>.el-tabs__content { .demo-tabs > .el-tabs__content {
padding: 0px; padding: 0px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
font-weight: 600; font-weight: 600;
} }
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table { .el-table {
flex: 1; flex: 1;
} }
} }
}
.mt15 {
display: flex;
justify-content: end;
float: right;
margin-bottom: 15px;
} }
</style> </style>

View File

@ -38,12 +38,12 @@
@size-change="onHandleSizeChange" @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
background background
v-model:page-size="state.tableData.param.pageSize" 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" :total="state.tableData.total"
> >
</el-pagination> --> </el-pagination> -->

View File

@ -2,89 +2,50 @@
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15"> <div class="system-user-search mb15">
<el-input v-model="state.tableData.param.search" <el-input v-model="state.tableData.param.search" size="default" placeholder="请输入角色名称" style="max-width: 180px">
size="default" </el-input>
placeholder="请输入角色名称" <el-button size="default" type="primary" class="ml10">
style="max-width: 180px"> </el-input>
<el-button size="default"
type="primary"
class="ml10">
<el-icon> <el-icon>
<ele-Search /> <ele-Search />
</el-icon> </el-icon>
查询 查询
</el-button> </el-button>
<el-button size="default" <el-button size="default" type="success" class="ml10" @click="onOpenAddRole('add')">
type="success"
class="ml10"
@click="onOpenAddRole('add')">
<el-icon> <el-icon>
<ele-FolderAdd /> <ele-FolderAdd />
</el-icon> </el-icon>
新增角色 新增角色
</el-button> </el-button>
</div> </div>
<el-table :data="state.tableData.data" <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
v-loading="state.tableData.loading" <el-table-column type="index" label="序号" width="60" />
style="width: 100%"> <el-table-column prop="roleName" label="角色名称" show-overflow-tooltip></el-table-column>
<el-table-column type="index" <el-table-column prop="roleSign" label="角色标识" show-overflow-tooltip></el-table-column>
label="序号" <el-table-column prop="sort" label="排序" show-overflow-tooltip></el-table-column>
width="60" /> <el-table-column prop="status" label="角色状态" show-overflow-tooltip>
<el-table-column prop="roleName"
label="角色名称"
show-overflow-tooltip></el-table-column>
<el-table-column prop="roleSign"
label="角色标识"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sort"
label="排序"
show-overflow-tooltip></el-table-column>
<el-table-column prop="status"
label="角色状态"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-tag type="success" <el-tag type="success" v-if="scope.row.status">启用</el-tag>
v-if="scope.row.status">启用</el-tag> <el-tag type="info" v-else>禁用</el-tag>
<el-tag type="info"
v-else>禁用</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="describe" <el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
label="角色描述" <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column label="操作" width="100">
<el-table-column prop="createTime"
label="创建时间"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作"
width="100">
<template #default="scope"> <template #default="scope">
<el-button :disabled="scope.row.roleName === '超级管理员'" <el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary"
size="small" @click="onOpenEditRole('edit', scope.row)">修改</el-button>
text <el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary"
type="primary" @click="onRowDel(scope.row)">删除</el-button>
@click="onOpenEditRole('edit', scope.row)">修改</el-button>
<el-button :disabled="scope.row.roleName === '超级管理员'"
size="small"
text
type="primary"
@click="onRowDel(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
@current-change="onHandleCurrentChange" :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
class="mt15" v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
:pager-count="5" :total="state.tableData.total">
: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"
:total="state.tableData.total">
</el-pagination> </el-pagination>
</div> </div>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" />
</div> </div>
</template> </template>
@ -168,11 +129,17 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table {
flex: 1; .el-table {
} flex: 1;
} }
}
}
.mt15 {
display: flex;
justify-content: end;
} }
</style> </style>

View File

@ -42,8 +42,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background :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" v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
:total="state.tableData.total"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-card> </el-card>
@ -148,4 +148,8 @@ onMounted(() => {
} }
} }
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -2,83 +2,63 @@
<div class="system-role-container layout-padding"> <div class="system-role-container layout-padding">
<div class="system-role-padding layout-padding-auto layout-padding-view"> <div class="system-role-padding layout-padding-auto layout-padding-view">
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;"> <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
<el-input size="default" placeholder="please enter manager name" style="max-width: 200px" v-model="state.searchName" <el-input size="default" placeholder="please enter manager name" style="max-width: 200px"
clearable></el-input> v-model="state.searchName" clearable></el-input>
<el-button size="default" type="primary" class="ml10" @click="getTableData"> <el-select v-model="state.status" placeholder="please select data type" style="max-width: 200px"
<el-icon> size="default" clearable>
<ele-Search/> <el-option value= "0" label="Unclaimed"></el-option>
</el-icon> <el-option value= "1" label="Claimed"></el-option>
search </el-select>
</el-button> <el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-button size="default" type="primary" class="ml10" @click="batchAudit"> <el-icon>
<el-icon> <ele-Search />
<ele-EditPen/> </el-icon>
</el-icon> search
batch audit </el-button>
</el-button> <el-button size="default" type="primary" class="ml10" @click="batchAudit">
</div> <el-icon>
<el-table :data="state.tableData.data" <ele-EditPen />
v-loading="state.tableData.loading" </el-icon>
@selection-change="handleSelectionChange" batch audit
style="width: 100%"> </el-button>
<el-table-column type="selection" width="55" /> </div>
<el-table-column type="index" <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
label="ID" @selection-change="handleSelectionChange" style="width: 100%">
width="50" /> <el-table-column type="selection" width="55" />
<el-table-column prop="disasterType" <el-table-column type="index" label="ID" width="50" />
label="DisasterType" <el-table-column prop="disasterType" label="DisasterType" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterCountry" <el-table-column prop="disasterKeyword" label="DisasterKeyword" show-overflow-tooltip></el-table-column>
label="DisasterCountry" <el-table-column prop="managerName" label="ManagerName" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column prop="sponsorOrganization" label="SponsorOrganization" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterKeyword" <el-table-column prop="researchField" label="ResearchField" show-overflow-tooltip></el-table-column>
label="DisasterKeyword" <el-table-column prop="occupation" label="occupation" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column prop="applyTime" label="applyTime" show-overflow-tooltip></el-table-column>
<el-table-column prop="managerName" <el-table-column v-if="state.status == '1'" prop="reviewTime" label="reviewTime" show-overflow-tooltip></el-table-column>
label="ManagerName" <el-table-column v-if="state.status == '0'" prop="Operate" label="Operate" show-overflow-tooltip>
show-overflow-tooltip></el-table-column> <template #default="scope">
<el-table-column prop="sponsorOrganization" <!-- <el-button link type="primary" size="small" @click="handleClick">Detail</el-button>-->
label="SponsorOrganization" <el-button link type="primary" size="small" @click="auditManager(scope.row)">Audit</el-button>
show-overflow-tooltip></el-table-column> </template>
<el-table-column prop="researchField" </el-table-column>
label="ResearchField" </el-table>
show-overflow-tooltip></el-table-column> <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
<el-table-column prop="occupation" :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
label="occupation" v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
show-overflow-tooltip></el-table-column> :total="state.tableData.total">
<el-table-column prop="Operate" </el-pagination>
label="Operate"
show-overflow-tooltip>
<template #default="scope">
<!-- <el-button link type="primary" size="small" @click="handleClick">Detail</el-button>-->
<el-button link type="primary" size="small" @click="auditManager(scope.row)">Audit</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="5"
: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"
:total="state.tableData.total">
</el-pagination>
</el-config-provider> </el-config-provider>
</div> </div>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" /> <Audit ref="auditRef" @callback="getTableData" />
<Audit ref="auditRef" @callback="getTableData"/>
</div> </div>
</template> </template>
<script lang="ts" setup name="systemRole"> <script lang="ts" setup name="systemRole">
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import type { TabsPaneContext } from 'element-plus'; import type { TabsPaneContext } from 'element-plus';
import {getAdminManagerPage,auditData} from '/@/api/response/adminManager.js'; import { getAdminManagerPage, auditData } from '/@/api/response/adminManager.js';
import Audit from './component/audit.vue'; import Audit from './component/audit.vue';
const activeName = ref('first'); const activeName = ref('first');
const auditRef = ref(); const auditRef = ref();
@ -95,8 +75,9 @@ const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialo
// //
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
multipleSelection:[], status:"0",
searchName:'', multipleSelection: [],
searchName: '',
tableData: { tableData: {
data: [], data: [],
total: 0, total: 0,
@ -113,7 +94,7 @@ const handleSelectionChange = (val) => {
} }
// //
const auditManager = (row) => { const auditManager = (row) => {
auditRef.value.openDialog([{...row}]); auditRef.value.openDialog([{ ...row }]);
/*ElMessageBox.confirm(`This operation will audit the disaster data${row.disasterType}Whether to continue?`, 'tip', { /*ElMessageBox.confirm(`This operation will audit the disaster data${row.disasterType}Whether to continue?`, 'tip', {
confirmButtonText: 'confirm', confirmButtonText: 'confirm',
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
@ -130,7 +111,7 @@ const auditManager = (row) => {
// //
const getTableData = () => { const getTableData = () => {
state.tableData.loading = true; state.tableData.loading = true;
getAdminManagerPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"managerName":state.searchName}).then(res=>{ getAdminManagerPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "managerName": state.searchName,"status": state.status}).then(res => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
@ -149,7 +130,7 @@ const onOpenEditRole = (type, row) => {
}; };
// //
const batchAudit = () => { const batchAudit = () => {
if(state.multipleSelection.length == 0){ if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first"); ElMessage.warning("Select the data to be operated first");
return false; return false;
} }
@ -162,13 +143,13 @@ const deleteUser = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
/* remove(row.id).then(res=>{ /* remove(row.id).then(res=>{
getTableData(); getTableData();
ElMessage.success('Deleted successfully'); ElMessage.success('Deleted successfully');
})*/ })*/
}) })
.catch(() => {}); .catch(() => { });
}; };
// //
const onHandleSizeChange = (val) => { const onHandleSizeChange = (val) => {
@ -185,8 +166,13 @@ onMounted(() => {
getTableData(); getTableData();
}); });
</script> </script>
<style> <style scoped lang="scss">
.demo-tabs > .el-tabs__content { .mt15 {
display: flex;
justify-content: end;
}
.demo-tabs>.el-tabs__content {
padding: 32px; padding: 32px;
color: #6b778c; color: #6b778c;
font-size: 32px; font-size: 32px;
@ -194,11 +180,12 @@ onMounted(() => {
} }
.system-role-container { .system-role-container {
.system-role-padding { .system-role-padding {
padding: 15px; padding: 15px;
.el-table {
flex: 1; .el-table {
} flex: 1;
} }
}
} }
</style> </style>

View File

@ -22,12 +22,12 @@
<el-pagination @size-change="onHandleSizeChange" <el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
background background
v-model:page-size="state.tableData.param.pageSize" 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"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-config-provider> </el-config-provider>
@ -125,5 +125,8 @@ defineExpose({
</script> </script>
<style scoped> <style scoped>
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -1,75 +1,62 @@
<template> <template>
<el-config-provider :locale="en"> <el-config-provider :locale="en">
<el-drawer <el-drawer v-model="state.table" title="Management Disaster" direction="rtl" size="50%">
v-model="state.table" <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
title="Management Disaster" <el-input size="default" placeholder="please enter disaster type" style="max-width: 190px"
direction="rtl" v-model="state.searchName" clearable></el-input>
size="50%" <el-button size="default" type="primary" class="ml10" @click="getTableData">
> <el-icon>
<div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;"> <ele-Search />
<el-input size="default" placeholder="please enter disaster type" style="max-width: 190px" v-model="state.searchName" </el-icon>
clearable></el-input> search
<el-button size="default" type="primary" class="ml10" @click="getTableData"> </el-button>
<el-icon> <el-button size="default" type="success" class="ml10" @click="addDisaster">
<ele-Search/> <el-icon>
</el-icon> <ele-FolderAdd />
search </el-icon>
</el-button> add
<el-button size="default" type="success" class="ml10" @click="addDisaster"> </el-button>
<el-icon> <el-button size="default" type="danger" class="ml10" @click="batchDelete">
<ele-FolderAdd/> <el-icon>
</el-icon> <ele-Delete />
add </el-icon>
</el-button> batch delete
<el-button size="default" type="danger" class="ml10" @click="batchDelete"> </el-button>
<el-icon> </div>
<ele-Delete/> <el-table :data="state.tableData.data" @selection-change="handleSelectionChange">
</el-icon> <el-table-column type="selection" width="55" />
batch delete <el-table-column property="dictValue" label="DisasterType" width="150" />
</el-button> <el-table-column property="disasterCountry" label="DisasterCountry" width="200" />
</div> <el-table-column property="disasterTime" label="DisasterTime" />
<el-table :data="state.tableData.data" @selection-change="handleSelectionChange"> <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<el-table-column type="selection" width="55" /> <template #default="scope">
<el-table-column property="dictValue" label="DisasterType" width="150" /> <el-button link type="primary" size="small" @click="deleteDisaster(scope.row)">Delete</el-button>
<el-table-column property="disasterCountry" label="DisasterCountry" width="200" /> </template>
<el-table-column property="disasterTime" label="DisasterTime" /> </el-table-column>
<el-table-column prop="Operate" </el-table>
label="Operate" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
show-overflow-tooltip> :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
<template #default="scope"> v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
<el-button link type="primary" size="small" @click="deleteDisaster(scope.row)">Delete</el-button> :total="state.tableData.total">
</template> </el-pagination>
</el-table-column> <DisasterInfo ref="disasterInfoRef" @callback="getTableData" />
</el-table> </el-drawer>
<el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="5"
: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"
:total="state.tableData.total">
</el-pagination>
<DisasterInfo ref="disasterInfoRef" @callback="getTableData"/>
</el-drawer>
</el-config-provider> </el-config-provider>
</template> </template>
<script setup> <script setup>
import en from 'element-plus/dist/locale/en.mjs' import en from 'element-plus/dist/locale/en.mjs'
import {reactive, ref} from "vue"; import { reactive, ref } from "vue";
import DisasterInfo from './disasterInfo.vue'; import DisasterInfo from './disasterInfo.vue';
import {getPage,removeManage} from '/@/api/disasterInfo/index.js'; import { getPage, removeManage } from '/@/api/disasterInfo/index.js';
import {ElMessage, ElMessageBox} from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
const disasterInfoRef = ref(); const disasterInfoRef = ref();
const state = reactive({ const state = reactive({
table:false, table: false,
loading:false, loading: false,
userId:null, userId: null,
multipleSelection:[], multipleSelection: [],
searchName:'', searchName: '',
tableData: { tableData: {
data: [], data: [],
total: 0, total: 0,
@ -89,7 +76,7 @@ const addDisaster = () => {
} }
//chief //chief
const batchDelete = () => { const batchDelete = () => {
if(state.multipleSelection.length == 0){ if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first"); ElMessage.warning("Select the data to be operated first");
return false; return false;
} }
@ -98,14 +85,14 @@ const batchDelete = () => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
let id = state.multipleSelection.map(item=>({id:item.id,chiefId:null})) let id = state.multipleSelection.map(item => ({ id: item.id, chiefId: null }))
removeManage(id).then(res=>{ removeManage(id).then(res => {
getTableData(); getTableData();
ElMessage.success('delete successfully'); ElMessage.success('delete successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
} }
const deleteDisaster = (row) => { const deleteDisaster = (row) => {
ElMessageBox.confirm(`This operation will delete the disaster${row.dictValue}Whether to continue?`, 'tip', { ElMessageBox.confirm(`This operation will delete the disaster${row.dictValue}Whether to continue?`, 'tip', {
@ -113,14 +100,14 @@ const deleteDisaster = (row) => {
cancelButtonText: 'cancel', cancelButtonText: 'cancel',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
let delData = [{"id":row.id,"cheif":null}] let delData = [{ "id": row.id, "cheif": null }]
removeManage(delData).then(res=>{ removeManage(delData).then(res => {
getTableData(); getTableData();
ElMessage.success('Deleted successfully'); ElMessage.success('Deleted successfully');
})
}) })
.catch(() => {}); })
.catch(() => { });
} }
// //
const openDialog = (userId) => { const openDialog = (userId) => {
@ -130,7 +117,7 @@ const openDialog = (userId) => {
}; };
// //
const getTableData = () => { const getTableData = () => {
getPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"chiefIdEquals":state.userId,"disasterType":state.searchName}).then(res=>{ getPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "chiefIdEquals": state.userId, "disasterType": state.searchName }).then(res => {
state.tableData.data = res.records; state.tableData.data = res.records;
state.tableData.total = res.total; state.tableData.total = res.total;
}) })
@ -154,5 +141,8 @@ defineExpose({
</script> </script>
<style scoped> <style scoped>
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

View File

@ -60,12 +60,12 @@
<el-pagination @size-change="onHandleSizeChange" <el-pagination @size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange" @current-change="onHandleCurrentChange"
class="mt15" class="mt15"
:pager-count="5" :pager-count="3"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.pageNum" v-model:current-page="state.tableData.param.pageNum"
background background
v-model:page-size="state.tableData.param.pageSize" 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"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-config-provider> </el-config-provider>
@ -234,4 +234,8 @@ onMounted(() => {
} }
} }
} }
.mt15 {
display: flex;
justify-content: end;
}
</style> </style>

1120
yarn.lock

File diff suppressed because it is too large Load Diff