yaowang
/
vordm-admin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq

This commit is contained in:
刘旋 2023-04-23 17:36:58 +08:00
parent cf31fe552c 4c817a82ce
commit 73493ba319
18 changed files with 439 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -342,6 +342,11 @@
"fastq": "^1.6.0" "fastq": "^1.6.0"
} }
}, },
"@popperjs/core": {
"version": "npm:@sxzz/popperjs-es@2.11.7",
"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
},
"@rollup/pluginutils": { "@rollup/pluginutils": {
"version": "4.2.1", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
@ -2326,13 +2331,6 @@
"lodash-unified": "^1.0.2", "lodash-unified": "^1.0.2",
"memoize-one": "^6.0.0", "memoize-one": "^6.0.0",
"normalize-wheel-es": "^1.2.0" "normalize-wheel-es": "^1.2.0"
},
"dependencies": {
"@popperjs/core": {
"version": "npm:@sxzz/popperjs-es@2.11.7",
"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
}
} }
}, },
"esbuild": { "esbuild": {

2
src/utils/request.js
View File

@ -4,7 +4,7 @@ import qs from 'qs';
import { Session } from '/@/utils/storage'; import { Session } from '/@/utils/storage';
// export const moduleName = 'zqq-biz-vordm'; // export const moduleName = 'zqq-biz-vordm';
export const moduleName = 'glj-biz-vordm'; export const moduleName = 'biz-vordm';
export const crawlModule = 'vordm-crawl'; export const crawlModule = 'vordm-crawl';
// 配置新建一个 axios 实例 // 配置新建一个 axios 实例
const service = axios.create({ const service = axios.create({

4
src/views/dataService/multimediaData/index.vue
View File

@ -380,7 +380,7 @@ onMounted(() => {
} }
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

4
src/views/dataService/otherData/index.vue
View File

@ -278,7 +278,7 @@ onMounted(() => {
} }
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

4
src/views/dataService/pictureInfo/index.vue
View File

@ -291,8 +291,8 @@ onMounted(() => {
</script> </script>
<style> <style>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
.demo-tabs>.el-tabs__content { .demo-tabs>.el-tabs__content {

4
src/views/dataService/remoteSensingData/components/retrievalCondition.vue
View File

@ -641,7 +641,7 @@ const searchDisasterDate = () => {
padding-left: 1%; padding-left: 1%;
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

6
src/views/dataService/visualData/index.vue
View File

@ -49,7 +49,7 @@
@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 prop="time" label="time" show-overflow-tooltip></el-table-column> <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="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="word" label="word" 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>
@ -367,7 +367,7 @@ onMounted(() => {
font-weight: 600; font-weight: 600;
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

9
src/views/responseManagement/contact/index.vue
View File

@ -15,8 +15,8 @@
</el-col> </el-col>
<!-- <el-col :span="4"> <!-- <el-col :span="4">
<el-form-item label="checked" style="margin-left: 10px;"> <el-form-item label="checked" style="margin-left: 10px;">
<el-select size="default" v-model="state.query.status" clearable style="max-width: 180px" <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>
@ -218,9 +218,8 @@ onMounted(() => {
}); });
</script> </script>
<style> <style>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

6
src/views/responseManagement/dataUpload/index.vue
View File

@ -224,7 +224,7 @@ onMounted(() => {
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;
@ -242,7 +242,7 @@ onMounted(() => {
} }
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

15
src/views/responseManagement/tool/index.vue
View File

@ -1,5 +1,4 @@
<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">
@ -54,8 +53,8 @@
<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>
@ -64,15 +63,14 @@
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange"
class="mt15" :pager-count="3" :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" :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">
@ -172,9 +170,8 @@ onMounted(() => {
}); });
</script> </script>
<style> <style>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

11
src/views/responseManagement/userResponse/component/selectUser.vue
View File

@ -12,15 +12,16 @@
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="3" :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" :total="state.tableData.total"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-card> </el-card>
<template #footer> <template #footer>
@ -133,7 +134,7 @@ defineExpose({
</script> </script>
<style> <style>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

96
src/views/responseManagement/userResponse/index.vue
View File

@ -79,70 +79,112 @@
<!-- <el-table-column prop="Affected country" label="Affected country" 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="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"
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="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" label="Response status" show-overflow-tooltip> <el-table-column prop="respondStatus"
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>
<el-tag type="info"
v-if="scope.row.respondStatus === 1">Failed</el-tag>
</template> </template>
</el-table-column> </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="primary" @click="onAllocation(scope.row)">Allocation</el-button> <el-button size="small"
text
type="primary"
@click="onAllocation(scope.row)">Allocation</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 @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"
:pager-count="5"
: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, jumper"
:total="state.tableData.total"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<el-dialog v-model="state.dialogVisible" title="Review" width="30%"> <el-dialog v-model="state.dialogVisible"
title="Review"
width="30%">
<el-container style="margin-top: -2%;margin-bottom: 2%;"> <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"
<el-radio v-model="state.radio" label='2' @click="mapEvents('2')">Area</el-radio> label='1'
<el-radio v-model="state.radio" label='3' @click="mapEvents('3')">Edit</el-radio> @click="mapEvents('1')">Point</el-radio>
<el-button type="primary" style="margin-left: 5%;" @click="ClearSubmit">Clear</el-button> <el-radio v-model="state.radio"
label='2'
@click="mapEvents('2')">Area</el-radio>
<el-radio v-model="state.radio"
label='3'
@click="mapEvents('3')">Edit</el-radio>
<el-button type="primary"
style="margin-left: 5%;"
@click="ClearSubmit">Clear</el-button>
</el-container> </el-container>
<el-container style="margin-top: 2%;margin-bottom: 2%;" v-if="state.radio==='1'?true:false"> <el-container style="margin-top: 2%;margin-bottom: 2%;"
v-if="state.radio==='1'?true:false">
<span style="line-height: 35px;"> Latitude：</span> <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> <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> <span style="line-height: 35px;">Longitude：</span>
<el-input placeholder="wait……" style="height:35px;" v-model="state.dislon" readonly="readonly"></el-input> <el-input placeholder="wait……"
style="height:35px;"
v-model="state.dislon"
readonly="readonly"></el-input>
</el-container> </el-container>
<MapPage style="height:350px ; width:100% ;margin-bottom: 10px;" ref="mapRef"></MapPage> <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;"
ref="mapRef"></MapPage>
<el-form-item label="Disaster Time"> <el-form-item label="Disaster Time">
<el-date-picker v-model="state.edit.disasterTime" type="date" value-format="YYYY-MM-DD" <el-date-picker v-model="state.edit.disasterTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="Select date and time" /> placeholder="Select date and time" />
</el-form-item> </el-form-item>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogVisible = false">Cancel</el-button> <el-button @click="dialogVisible = false">Cancel</el-button>
<el-button type="danger" @click="reviews(1)"> <el-button type="danger"
@click="reviews(1)">
Not Review Not Review
</el-button> </el-button>
<el-button type="primary" @click="reviews(2)"> <el-button type="primary"
@click="reviews(2)">
Review Review
</el-button> </el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<selectUser ref ="select" @callback="getTableData"></selectUser> <selectUser ref="select"
@callback="getTableData"></selectUser>
</el-config-provider> </el-config-provider>
</div> </div>
</template> </template>
@ -363,7 +405,7 @@ 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;
@ -380,4 +422,10 @@ const getValue = (key) => {
} }
} }
} }
.mt15 {
display: flex;
justify-content: end;
float: right;
margin-bottom: 15px;
}
</style> </style>

87
src/views/system/role/index.vue
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"
text
type="primary"
@click="onOpenEditRole('edit', scope.row)">修改</el-button> @click="onOpenEditRole('edit', scope.row)">修改</el-button>
<el-button :disabled="scope.row.roleName === '超级管理员'" <el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary"
size="small"
text
type="primary"
@click="onRowDel(scope.row)">删除</el-button> @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="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"> :total="state.tableData.total">
</el-pagination> </el-pagination>
</div> </div>
<RoleDialog ref="roleDialogRef" <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
@refresh="getTableData()" />
</div> </div>
</template> </template>
@ -170,13 +131,15 @@ 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 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

4
src/views/system/user/index.vue
View File

@ -149,7 +149,7 @@ onMounted(() => {
} }
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

83
src/views/systemManagement/administrator/index.vue
View File

@ -3,8 +3,13 @@
<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-select v-model="state.status" placeholder="please select data type" style="max-width: 200px"
size="default" clearable>
<el-option value= "0" label="Unclaimed"></el-option>
<el-option value= "1" label="Claimed"></el-option>
</el-select>
<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 />
@ -18,59 +23,34 @@
batch audit batch audit
</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"
style="width: 100%">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column type="index" <el-table-column type="index" label="ID" width="50" />
label="ID" <el-table-column prop="disasterType" label="DisasterType" show-overflow-tooltip></el-table-column>
width="50" /> <el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterType" <el-table-column prop="disasterKeyword" label="DisasterKeyword" show-overflow-tooltip></el-table-column>
label="DisasterType" <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="disasterCountry" <el-table-column prop="researchField" label="ResearchField" show-overflow-tooltip></el-table-column>
label="DisasterCountry" <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="disasterKeyword" <el-table-column v-if="state.status == '1'" prop="reviewTime" label="reviewTime" show-overflow-tooltip></el-table-column>
label="DisasterKeyword" <el-table-column v-if="state.status == '0'" prop="Operate" label="Operate" show-overflow-tooltip>
show-overflow-tooltip></el-table-column>
<el-table-column prop="managerName"
label="ManagerName"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sponsorOrganization"
label="SponsorOrganization"
show-overflow-tooltip></el-table-column>
<el-table-column prop="researchField"
label="ResearchField"
show-overflow-tooltip></el-table-column>
<el-table-column prop="occupation"
label="occupation"
show-overflow-tooltip></el-table-column>
<el-table-column prop="Operate"
label="Operate"
show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<!-- <el-button link type="primary" size="small" @click="handleClick">Detail</el-button>--> <!-- <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> <el-button link type="primary" size="small" @click="auditManager(scope.row)">Audit</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="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"> :total="state.tableData.total">
</el-pagination> </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>
@ -95,6 +75,7 @@ const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialo
// 定义变量内容 // 定义变量内容
const roleDialogRef = ref(); const roleDialogRef = ref();
const state = reactive({ const state = reactive({
status:"0",
multipleSelection: [], multipleSelection: [],
searchName: '', searchName: '',
tableData: { tableData: {
@ -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;
}) })
@ -185,7 +166,12 @@ onMounted(() => {
getTableData(); getTableData();
}); });
</script> </script>
<style> <style scoped lang="scss">
.mt15 {
display: flex;
justify-content: end;
}
.demo-tabs>.el-tabs__content { .demo-tabs>.el-tabs__content {
padding: 32px; padding: 32px;
color: #6b778c; color: #6b778c;
@ -196,13 +182,10 @@ 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 {
float: right;
margin-bottom: 15px;
}
</style> </style>

4
src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue
View File

@ -126,7 +126,7 @@ defineExpose({
<style scoped> <style scoped>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

31
src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue
View File

@ -1,14 +1,9 @@
<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"
title="Management Disaster"
direction="rtl"
size="50%"
>
<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 disaster type" style="max-width: 190px" v-model="state.searchName" <el-input size="default" placeholder="please enter disaster type" style="max-width: 190px"
clearable></el-input> v-model="state.searchName" 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>
<ele-Search /> <ele-Search />
@ -33,23 +28,15 @@
<el-table-column property="dictValue" label="DisasterType" width="150" /> <el-table-column property="dictValue" label="DisasterType" width="150" />
<el-table-column property="disasterCountry" label="DisasterCountry" width="200" /> <el-table-column property="disasterCountry" label="DisasterCountry" width="200" />
<el-table-column property="disasterTime" label="DisasterTime" /> <el-table-column property="disasterTime" label="DisasterTime" />
<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 link type="primary" size="small" @click="deleteDisaster(scope.row)">Delete</el-button> <el-button link type="primary" size="small" @click="deleteDisaster(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]" 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="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"> :total="state.tableData.total">
</el-pagination> </el-pagination>
<DisasterInfo ref="disasterInfoRef" @callback="getTableData" /> <DisasterInfo ref="disasterInfoRef" @callback="getTableData" />
@ -155,7 +142,7 @@ defineExpose({
<style scoped> <style scoped>
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>

4
src/views/systemManagement/chiefAdministrator/index.vue
View File

@ -235,7 +235,7 @@ onMounted(() => {
} }
} }
.mt15 { .mt15 {
float: right; display: flex;
margin-bottom: 15px; justify-content: end;
} }
</style> </style>