yaowang
/
vordm-admin
10
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"
}
},
"@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": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
@ -2326,13 +2331,6 @@
"lodash-unified": "^1.0.2",
"memoize-one": "^6.0.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": {

2
src/utils/request.js
View File

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

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

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

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

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

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

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

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

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

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

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

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

@ -15,8 +15,8 @@
</el-col>
<!-- <el-col :span="4">
<el-form-item label="checked" style="margin-left: 10px;">
<el-select size="default" v-model="state.query.status" clearable style="max-width: 180px"
placeholder="Replied">
<el-select size="default" v-model="state.query.status" clearable
style="max-width: 180px" placeholder="Replied">
<el-option label="UnReplied" :value="0"></el-option>
<el-option label="Replied" :value="1"></el-option>
<el-option label="Observed" :value="2"></el-option>
@ -93,9 +93,9 @@
</template>
<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 { 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 { QuillEditor } from '@vueup/vue-quill'
import '@vueup/vue-quill/dist/vue-quill.snow.css'
@ -116,7 +116,7 @@ const state = reactive({
},
selected: [],
dialogVisible: false,
options:{
options: {
modules: {
toolbar: [
['bold', 'italic', 'underline', 'strike'],
@ -133,15 +133,15 @@ const state = reactive({
},
placeholder: '请输入内容...'
},
email:{
subject:'Thank You for Your Support',
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.'+
'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.'+
' Best regards,'+
email: {
subject: 'Thank You for Your Support',
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.' +
'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.' +
' Best regards,' +
' yyhouc'
} ,
},
//字典数据
});
const setValue = () => {
@ -174,7 +174,7 @@ const onOpenEdit = (row) => {
};
const send = () => {
state.email.email="792163605@qq.com"
state.email.email = "792163605@qq.com"
emailSend(state.email).then(res => {
ElMessage.success('发送成功');
state.dialogVisible = false;
@ -218,9 +218,8 @@ onMounted(() => {
});
</script>
<style>
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

@ -224,7 +224,7 @@ onMounted(() => {
getTableData();
});
</script>
<style>
<style scoped lang="scss">
.demo-tabs>.el-tabs__content {
padding: 32px;
color: #6b778c;
@ -242,7 +242,7 @@ onMounted(() => {
}
}
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

@ -1,5 +1,4 @@
<template>
<div class="system-user-container" style="width:calc(100% - 10px) !important ;">
<el-config-provider :locale="en">
<el-row :gutter="10">
@ -54,8 +53,8 @@
<el-table-column prop="reviewTime" label="Review Time"></el-table-column>
<el-table-column label="Operate" width="140">
<template #default="scope">
<el-button :style='scope.row.reviewTime?"display:none;":"" ' size="small" text type="primary"
@click="onOpenEdit(scope.row)">Review</el-button>
<el-button :style='scope.row.reviewTime ? "display:none;" : ""' size="small" text
type="primary" @click="onOpenEdit(scope.row)">Review</el-button>
<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
@click="onRowDel(scope.row)">Delete</el-button>
</template>
@ -64,20 +63,19 @@
<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">
v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
:total="state.tableData.total">
</el-pagination>
</el-card>
</el-col>
</el-row>
</el-config-provider>
</div>
</template>
<script setup name="systemUser">
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 { reactive, ref, onMounted, nextTick } from 'vue';
const AddRef = ref();
@ -127,7 +125,7 @@ const onOpenEdit = (row) => {
type: 'warning',
})
.then(() => {
review({id:row.id}).then(res => {
review({ id: row.id }).then(res => {
ElMessage.success('success');
initTableData();
})
@ -172,9 +170,8 @@ onMounted(() => {
});
</script>
<style>
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

@ -5,27 +5,28 @@
<div class="system-user-search mb15">
<el-input size="default" placeholder="Name" style="max-width: 180px"
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>
<ele-Search />
</el-icon>
search
</el-button>
</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 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>
<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">
background v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
:total="state.tableData.total">
</el-pagination>
</el-card>
<template #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()">
Save
</el-button>
@ -37,7 +38,7 @@
<script setup>
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';
const formRef = ref();
@ -81,9 +82,9 @@ const save = async () => {
return;
}
let params = {
id:state.rowData.id,
chiefId:state.selectData[0].id,
chiefName:state.selectData[0].name,
id: state.rowData.id,
chiefId: state.selectData[0].id,
chiefName: state.selectData[0].name,
};
let res = await submit(params);
emit('callback');
@ -133,7 +134,7 @@ defineExpose({
</script>
<style>
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

@ -79,77 +79,119 @@
<!-- <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>
<el-table-column prop="disasterTime"
label="Disaster time"
show-overflow-tooltip>
<template #default="scope">
<!-- 格式化去除时分秒 -->
{{ dateFormat(scope.row.disasterTime) }}
</template>
</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="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">
<el-tag type="info" v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
<el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
<el-tag type="info"
v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
<el-tag type="info"
v-if="scope.row.respondStatus === 1">Failed</el-tag>
</template>
</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">
<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>
</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.current" background
v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper"
<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.current"
background
v-model:page-size="state.tableData.param.size"
layout="total, sizes, prev, pager, next, jumper"
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
</el-tabs>
</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-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-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-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-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 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>
<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>
<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>
<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-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" />
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">Cancel</el-button>
<el-button type="danger" @click="reviews(1)">
<el-button type="danger"
@click="reviews(1)">
Not Review
</el-button>
<el-button type="primary" @click="reviews(2)">
<el-button type="primary"
@click="reviews(2)">
Review
</el-button>
</span>
</template>
</el-dialog>
<selectUser ref ="select" @callback="getTableData"></selectUser>
<selectUser ref="select"
@callback="getTableData"></selectUser>
</el-config-provider>
</div>
</template>
<script setup name="userResponse">
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 { getList, review } from '/@/api/disasterInfo/index';
import { getDictionary } from '/@/api/system/dictbiz';
@ -175,7 +217,7 @@ const handleClick = (tab, event) => {
getTableData();
};
const MapPage = defineAsyncComponent({
loader:() =>import('/@/components/Map.vue'),
loader: () => import('/@/components/Map.vue'),
delay: 200,
})
const onAllocation = (row) => {
@ -202,10 +244,10 @@ const state = reactive({
disasterTypeList: [],
selectName: 'first',
edit: {},
radio:null,
dislat:'',
dislon:'',
wktPoint_Poly:undefined
radio: null,
dislat: '',
dislon: '',
wktPoint_Poly: undefined
});
// 初始化表格数据
const getTableData = () => {
@ -235,33 +277,33 @@ const onOpenEditRole = (type, row) => {
state.radio = "1"
// mapRef.value.mapOperations.removeAll()
//赋值地图范围，并且可以修改点或者区域
if(state.wktPoint_Poly){
if (state.wktPoint_Poly) {
mapRef.value.mapOperations.removeLayer(state.wktPoint_Poly)
}
state.wktPoint_Poly= mapRef.value.mapOperations.wktParseToMap(row.geometry)
state.wktPoint_Poly = mapRef.value.mapOperations.wktParseToMap(row.geometry)
// mapRef.value.mapOperations.on("click", (res)=>{
// mapRef.value.mapOperations.clearPolygon()
// mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly)
// mapRef.value.mapOperations.addInteractMarker(res.latlng.lat, res.latlng.lng)
// })
mapEvents('1')
},100);
}, 100);
};
const mapEvents = (ev)=>{
if(ev == '1'){
const mapEvents = (ev) => {
if (ev == '1') {
// mapRef.value.mapOperations.clearPolygon()
mapRef.value.mapOperations.on("click", mapClick)
mapRef.value.mapOperations.on("mousemove", changelatlon)
mapRef.value.mapOperations.clearPolygon()
}else if(ev == '2'){
mapRef.value.mapOperations.off("click",mapClick);
} else if (ev == '2') {
mapRef.value.mapOperations.off("click", mapClick);
mapRef.value.mapOperations.drawPolygon()
// mapRef.value.mapOperations.drawPolygon()
// mapRef.value.mapOperations.drawCreated()
}
else{
else {
mapRef.value.mapOperations.Edit()
}
};
@ -269,14 +311,14 @@ const ClearSubmit = () => {
setTimeout(() => {
mapRef.value.mapOperations.removeAll()
variableStore.wktdata = null
variableStore.layerGroupPoint=null;
layerGroupPoly=null;
variableStore.layerGroupPoint = null;
layerGroupPoly = null;
}, 100)
}
const mapClick=(res)=>{
const mapClick = (res) => {
// mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
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))
// console.log(state.wktPoint_Poly)
}
const reviews = (index) => {
@ -310,25 +352,25 @@ const onHandleCurrentChange = (val) => {
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.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 {
}
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"
}
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"
}
else if (state.dislon < 0) {
}
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) {
@ -337,8 +379,8 @@ else if (state.dislon < 0) {
else if (state.dislon > 180 && state.dislon <= 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
}
}
else if (state.dislon > 360) {
}
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) {
@ -347,7 +389,7 @@ else if (state.dislon > 360) {
else if (state.dislon > 180 && state.dislon <= 360) {
state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
}
}
}
}
// 页面加载时
@ -363,8 +405,8 @@ const getValue = (key) => {
return state.disasterTypeList.find((item) => item.dictKey === key)?.dictValue;
};
</script>
<style>
.demo-tabs>.el-tabs__content {
<style lang="scss">
.demo-tabs > .el-tabs__content {
padding: 0px;
color: #6b778c;
font-size: 32px;
@ -380,4 +422,10 @@ const getValue = (key) => {
}
}
}
.mt15 {
display: flex;
justify-content: end;
float: right;
margin-bottom: 15px;
}
</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-padding layout-padding-auto layout-padding-view">
<div class="system-user-search mb15">
<el-input v-model="state.tableData.param.search"
size="default"
placeholder="请输入角色名称"
style="max-width: 180px"> </el-input>
<el-button size="default"
type="primary"
class="ml10">
<el-input v-model="state.tableData.param.search" size="default" placeholder="请输入角色名称" style="max-width: 180px">
</el-input>
<el-button size="default" type="primary" class="ml10">
<el-icon>
<ele-Search />
</el-icon>
查询
</el-button>
<el-button size="default"
type="success"
class="ml10"
@click="onOpenAddRole('add')">
<el-button size="default" type="success" class="ml10" @click="onOpenAddRole('add')">
<el-icon>
<ele-FolderAdd />
</el-icon>
新增角色
</el-button>
</div>
<el-table :data="state.tableData.data"
v-loading="state.tableData.loading"
style="width: 100%">
<el-table-column type="index"
label="序号"
width="60" />
<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>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column type="index" label="序号" width="60" />
<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">
<el-tag type="success"
v-if="scope.row.status">启用</el-tag>
<el-tag type="info"
v-else>禁用</el-tag>
<el-tag type="success" v-if="scope.row.status">启用</el-tag>
<el-tag type="info" v-else>禁用</el-tag>
</template>
</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 label="操作"
width="100">
<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 label="操作" width="100">
<template #default="scope">
<el-button :disabled="scope.row.roleName === '超级管理员'"
size="small"
text
type="primary"
<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary"
@click="onOpenEditRole('edit', scope.row)">修改</el-button>
<el-button :disabled="scope.row.roleName === '超级管理员'"
size="small"
text
type="primary"
<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary"
@click="onRowDel(scope.row)">删除</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"
<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>
<RoleDialog ref="roleDialogRef"
@refresh="getTableData()" />
<RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
</div>
</template>
@ -170,13 +131,15 @@ onMounted(() => {
.system-role-container {
.system-role-padding {
padding: 15px;
.el-table {
flex: 1;
}
}
}
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

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

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

@ -3,82 +3,62 @@
<div class="system-role-padding layout-padding-auto layout-padding-view">
<el-config-provider :locale="en">
<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"
clearable></el-input>
<el-input size="default" placeholder="please enter manager name" style="max-width: 200px"
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-icon>
<ele-Search/>
<ele-Search />
</el-icon>
search
</el-button>
<el-button size="default" type="primary" class="ml10" @click="batchAudit">
<el-icon>
<ele-EditPen/>
<ele-EditPen />
</el-icon>
batch audit
</el-button>
</div>
<el-table :data="state.tableData.data"
v-loading="state.tableData.loading"
@selection-change="handleSelectionChange"
style="width: 100%">
<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="disasterType"
label="DisasterType"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterCountry"
label="DisasterCountry"
show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterKeyword"
label="DisasterKeyword"
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>
<el-table-column type="index" label="ID" width="50" />
<el-table-column prop="disasterType" label="DisasterType" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterKeyword" label="DisasterKeyword" 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="applyTime" label="applyTime" show-overflow-tooltip></el-table-column>
<el-table-column v-if="state.status == '1'" prop="reviewTime" label="reviewTime" show-overflow-tooltip></el-table-column>
<el-table-column v-if="state.status == '0'" prop="Operate" 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="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"
<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-config-provider>
</div>
<RoleDialog ref="roleDialogRef"
@refresh="getTableData()" />
<Audit ref="auditRef" @callback="getTableData"/>
<RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
<Audit ref="auditRef" @callback="getTableData" />
</div>
</template>
<script lang="ts" setup name="systemRole">
import en from 'element-plus/dist/locale/en.mjs'
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';
const activeName = ref('first');
const auditRef = ref();
@ -95,8 +75,9 @@ const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialo
// 定义变量内容
const roleDialogRef = ref();
const state = reactive({
multipleSelection:[],
searchName:'',
status:"0",
multipleSelection: [],
searchName: '',
tableData: {
data: [],
total: 0,
@ -113,7 +94,7 @@ const handleSelectionChange = (val) => {
}
//审核管理者可以管理这个灾害
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', {
confirmButtonText: 'confirm',
cancelButtonText: 'cancel',
@ -130,7 +111,7 @@ const auditManager = (row) => {
// 初始化表格数据
const getTableData = () => {
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.total = res.total;
})
@ -149,7 +130,7 @@ const onOpenEditRole = (type, row) => {
};
//批量审核普通管理员数据
const batchAudit = () => {
if(state.multipleSelection.length == 0){
if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first");
return false;
}
@ -168,7 +149,7 @@ const deleteUser = (row) => {
ElMessage.success('Deleted successfully');
})*/
})
.catch(() => {});
.catch(() => { });
};
// 分页改变
const onHandleSizeChange = (val) => {
@ -185,8 +166,13 @@ onMounted(() => {
getTableData();
});
</script>
<style>
.demo-tabs > .el-tabs__content {
<style scoped lang="scss">
.mt15 {
display: flex;
justify-content: end;
}
.demo-tabs>.el-tabs__content {
padding: 32px;
color: #6b778c;
font-size: 32px;
@ -194,15 +180,12 @@ onMounted(() => {
}
.system-role-container {
.system-role-padding {
.system-role-padding {
padding: 15px;
.el-table {
.el-table {
flex: 1;
}
}
}
.mt15 {
float: right;
margin-bottom: 15px;
}
}
}
</style>

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

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

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

@ -1,29 +1,24 @@
<template>
<el-config-provider :locale="en">
<el-drawer
v-model="state.table"
title="Management Disaster"
direction="rtl"
size="50%"
>
<el-drawer 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;">
<el-input size="default" placeholder="please enter disaster type" style="max-width: 190px" v-model="state.searchName"
clearable></el-input>
<el-input size="default" placeholder="please enter disaster type" style="max-width: 190px"
v-model="state.searchName" clearable></el-input>
<el-button size="default" type="primary" class="ml10" @click="getTableData">
<el-icon>
<ele-Search/>
<ele-Search />
</el-icon>
search
</el-button>
<el-button size="default" type="success" class="ml10" @click="addDisaster">
<el-icon>
<ele-FolderAdd/>
<ele-FolderAdd />
</el-icon>
add
</el-button>
<el-button size="default" type="danger" class="ml10" @click="batchDelete">
<el-icon>
<ele-Delete/>
<ele-Delete />
</el-icon>
batch delete
</el-button>
@ -33,43 +28,35 @@
<el-table-column property="dictValue" label="DisasterType" width="150" />
<el-table-column property="disasterCountry" label="DisasterCountry" width="200" />
<el-table-column property="disasterTime" label="DisasterTime" />
<el-table-column prop="Operate"
label="Operate"
show-overflow-tooltip>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope">
<el-button link type="primary" size="small" @click="deleteDisaster(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"
<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>
<DisasterInfo ref="disasterInfoRef" @callback="getTableData"/>
<DisasterInfo ref="disasterInfoRef" @callback="getTableData" />
</el-drawer>
</el-config-provider>
</template>
<script setup>
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 {getPage,removeManage} from '/@/api/disasterInfo/index.js';
import {ElMessage, ElMessageBox} from "element-plus";
import { getPage, removeManage } from '/@/api/disasterInfo/index.js';
import { ElMessage, ElMessageBox } from "element-plus";
const disasterInfoRef = ref();
const state = reactive({
table:false,
loading:false,
userId:null,
multipleSelection:[],
searchName:'',
table: false,
loading: false,
userId: null,
multipleSelection: [],
searchName: '',
tableData: {
data: [],
total: 0,
@ -89,7 +76,7 @@ const addDisaster = () => {
}
//批量删除chief管理员管理灾害数据
const batchDelete = () => {
if(state.multipleSelection.length == 0){
if (state.multipleSelection.length == 0) {
ElMessage.warning("Select the data to be operated first");
return false;
}
@ -99,13 +86,13 @@ const batchDelete = () => {
type: 'warning',
})
.then(() => {
let id = state.multipleSelection.map(item=>({id:item.id,chiefId:null}))
removeManage(id).then(res=>{
let id = state.multipleSelection.map(item => ({ id: item.id, chiefId: null }))
removeManage(id).then(res => {
getTableData();
ElMessage.success('delete successfully');
})
})
.catch(() => {});
.catch(() => { });
}
const deleteDisaster = (row) => {
ElMessageBox.confirm(`This operation will delete the disaster：“${row.dictValue}”，Whether to continue?`, 'tip', {
@ -114,13 +101,13 @@ const deleteDisaster = (row) => {
type: 'warning',
})
.then(() => {
let delData = [{"id":row.id,"cheif":null}]
removeManage(delData).then(res=>{
let delData = [{ "id": row.id, "cheif": null }]
removeManage(delData).then(res => {
getTableData();
ElMessage.success('Deleted successfully');
})
})
.catch(() => {});
.catch(() => { });
}
// 打开弹窗
const openDialog = (userId) => {
@ -130,7 +117,7 @@ const openDialog = (userId) => {
};
//分页查询已经管理的灾害数据
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.total = res.total;
})
@ -155,7 +142,7 @@ defineExpose({
<style scoped>
.mt15 {
float: right;
margin-bottom: 15px;
display: flex;
justify-content: end;
}
</style>

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

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