glj-代码提交

This commit is contained in:
glj 2023-05-05 09:28:06 +08:00
parent c81befc92e
commit 129b6cd5ac
3 changed files with 29 additions and 24 deletions

View File

@ -52,7 +52,8 @@ const props = defineProps({
const state = reactive({ const state = reactive({
// //
search: { search: {
respondStatus: props.status respondStatus: props.status,
disasterStatus:"3"
}, },
// //
dictList: [], dictList: [],

View File

@ -72,10 +72,10 @@
<el-table-column prop="createTime" label="Create Time" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="createTime" label="Create Time" show-overflow-tooltip sortable></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 " <el-button size="small" text type="primary" v-if=" scope.row.status == 0 "
@click=" openDialog(scope.row, true) ">Awaiting approval</el-button> @click=" openDialog(scope.row, true)" >Awaiting approval</el-button>
<el-button size="small" text type="success" v-if=" scope.row.status == 1 " <el-button size="small" text type="success" v-if=" scope.row.status == 1 "
@click=" openDialog(scope.row, false) ">Approved</el-button> @click=" openDialog(scope.row, false) " >Approved</el-button>
<el-button size="small" text type="danger" v-if=" scope.row.status == 2 " <el-button size="small" text type="danger" v-if=" scope.row.status == 2 "
@click=" openDialog(scope.row, false) ">Rejected</el-button> @click=" openDialog(scope.row, false) ">Rejected</el-button>
</template> </template>
@ -95,7 +95,7 @@
<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) ">

View File

@ -145,7 +145,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<el-dialog v-model="state.dialogVisible" title="Approval" width="35%"> <el-dialog v-model="state.dialogVisible" title="Approval" width="45%">
<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" 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='2' @click="mapEvents('2')">Area</el-radio>
@ -161,23 +161,27 @@
</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 :inline="true" :model="formInline" class="demo-form-inline">
<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 style="width: 200px;" 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>
<el-form-item label="Disaster type"> <el-form-item label="Disaster type">
<el-select class="form-select" size="default" clearable placeholder="Disaster Type" <el-select style="width: 200px; height: 40px;" class="form-select" size="default" clearable placeholder="Disaster Type"
v-model="state.edit.disasterType"> v-model="state.edit.disasterType">
<el-option v-for="(item, index) in state.dictList" :value="item.dictKey" :key="index" <el-option v-for="(item, index) in state.dictList" :value="item.dictKey" :key="index"
:label="item.dictValue" /> :label="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="Disaster country"> <el-form-item label="Disaster country">
<el-input v-model="state.edit.disasterCountry" placeholder="please Disaster country" clearable></el-input> <el-input style="width: 200px;" v-model="state.edit.disasterCountry" placeholder="please Disaster country" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="Theme keywords"> <el-form-item label="Theme keywords">
<el-input v-model="state.edit.disasterKeyword" placeholder="please Theme keywords" clearable></el-input> <el-input style="width: 200px;" v-model="state.edit.disasterKeyword" placeholder="please Theme keywords" clearable></el-input>
</el-form-item> </el-form-item>
</el-form>
<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>
@ -200,7 +204,7 @@ 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, responseEndedDisasterInfo } from '/@/api/disasterInfo/index'; import { getList, review, responseEndedDisasterInfo } from '/@/api/disasterInfo/index';
import { getDictionary,getList as getListNew } from '/@/api/system/dictbiz'; import { getDictionary, getList as getListNew } from '/@/api/system/dictbiz';
import { useVariableStore } from '/@/stores/index.ts' import { useVariableStore } from '/@/stores/index.ts'
// //
import Map from '/@/components/Map.vue'; import Map from '/@/components/Map.vue';