glj-代码提交
This commit is contained in:
parent
b370c7cc01
commit
0d8bc1921a
|
@ -82,3 +82,16 @@ export const deleteData = (id) => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改实体数据
|
||||||
|
* @param data
|
||||||
|
* @returns {Promise<AxiosResponse<any>>}
|
||||||
|
*/
|
||||||
|
export const updateEntityData = (data) => {
|
||||||
|
return request({
|
||||||
|
url: '/api/' + moduleName + '/ui/EntityData/updateEntityData',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<el-dialog title="upload" v-model="state.isShowDialog" width="700px">
|
<el-dialog title="upload" v-model="state.isShowDialog" width="500px">
|
||||||
<el-form :model="state.ruleForm" size="default" label-width="120px" :rules="rules" ref="adminAddFormRef">
|
<el-form :model="state.ruleForm" size="default" label-width="120px" :rules="rules" ref="adminAddFormRef" style="margin-left: 6%;">
|
||||||
<el-form-item label="upload picture" prop="img">
|
<el-form-item label="upload picture" prop="img">
|
||||||
<el-upload ref="upFileRef" class="upload-demo" drag accept="image/*" action="#" multiple :http-request="uploadPic"
|
<el-upload ref="upFileRef" class="upload-demo" drag accept="image/*" action="#" multiple :http-request="uploadPic"
|
||||||
:on-remove="removePic" :before-upload="beforeUpload">
|
:on-remove="removePic" :before-upload="beforeUpload">
|
||||||
|
@ -15,6 +15,10 @@
|
||||||
</template>
|
</template>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item prop="title" label="data title">
|
||||||
|
<el-input v-model="state.ruleForm.title" class="m-2" placeholder="please enter data title" :rows="3"
|
||||||
|
type="text" style="width:220px;" />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item prop="type" label="data type">
|
<el-form-item prop="type" label="data type">
|
||||||
<el-select v-model="state.ruleForm.type" class="m-2" placeholder="please select data type">
|
<el-select v-model="state.ruleForm.type" class="m-2" placeholder="please select data type">
|
||||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
|
@ -149,6 +153,7 @@ const onSubmit = () => {
|
||||||
state.dataForm.append('remark', state.ruleForm.remark);
|
state.dataForm.append('remark', state.ruleForm.remark);
|
||||||
state.dataForm.append('disasterId', state.disasterId);
|
state.dataForm.append('disasterId', state.disasterId);
|
||||||
state.dataForm.append('visualFlag', state.ruleForm.visualFlag);
|
state.dataForm.append('visualFlag', state.ruleForm.visualFlag);
|
||||||
|
state.dataForm.append('title', state.ruleForm.title);
|
||||||
for (let [a, b] of state.dataForm.entries()) {
|
for (let [a, b] of state.dataForm.entries()) {
|
||||||
console.log(a, b, '--------------');
|
console.log(a, b, '--------------');
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<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" v-loading="state.disasterData.loading" style="width: 100%"
|
<el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
|
||||||
highlight-current-row @row-click="tableClick">
|
highlight-current-row @row-click="tableClick">
|
||||||
<el-table-column prop="vordmId" label="ID" width="118" />
|
<el-table-column prop="vordmId" label="VoRDM ID" width="118" />
|
||||||
<el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
|
<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="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-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
|
||||||
|
@ -50,8 +50,14 @@
|
||||||
<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 prop="uploaderName" label="Uploader name" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="uploaderName" label="Uploader name" width="100" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
|
||||||
|
<el-table-column prop="isPublish" label="isPublish" width="100" show-overflow-tooltip>
|
||||||
|
<template #default=" scope ">
|
||||||
|
<el-tag type="warning" v-if=" scope.row.isPublish == 0 ">NO</el-tag>
|
||||||
|
<el-tag type="success" v-if=" scope.row.isPublish == 1 ">YES</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="title" label="Professional title" show-overflow-tooltip
|
<el-table-column prop="title" label="Professional title" show-overflow-tooltip
|
||||||
width="150"></el-table-column>
|
width="150"></el-table-column>
|
||||||
<el-table-column prop="size" label="Data size" show-overflow-tooltip>
|
<el-table-column prop="size" label="Data size" show-overflow-tooltip>
|
||||||
|
@ -63,6 +69,7 @@
|
||||||
<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="del(scope.row)">Delete</el-button>
|
<el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button>
|
||||||
|
<el-button v-if="scope.row.visualFlag == 1" size="small" text type="primary" @click="pub(scope.row)">Publish</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
@ -84,7 +91,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, updateEntityData } from '/@/api/data/otherData.js'
|
||||||
const activeName = ref('first');
|
const activeName = ref('first');
|
||||||
|
|
||||||
//复制内容
|
//复制内容
|
||||||
|
@ -237,6 +244,17 @@ const del = (row) => {
|
||||||
})
|
})
|
||||||
.catch(() => { });
|
.catch(() => { });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 删除其他数据
|
||||||
|
const pub = (row) => {
|
||||||
|
console.log(row, "发布信息");
|
||||||
|
updateEntityData().then(da => {
|
||||||
|
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
// 分页改变
|
// 分页改变
|
||||||
const onHandleDisasterSizeChange = (val) => {
|
const onHandleDisasterSizeChange = (val) => {
|
||||||
state.disasterData.param.pageSize = val;
|
state.disasterData.param.pageSize = val;
|
||||||
|
@ -280,6 +298,7 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.mt15 {
|
.mt15 {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: end;
|
justify-content: end;
|
||||||
|
|
|
@ -2,17 +2,8 @@
|
||||||
<el-dialog title="upload" v-model="state.isShowDialog" width="700px">
|
<el-dialog title="upload" v-model="state.isShowDialog" width="700px">
|
||||||
<el-form :model="state.ruleForm" size="default" label-width="150px" :rules="rules" ref="adminAddFormRef">
|
<el-form :model="state.ruleForm" size="default" label-width="150px" :rules="rules" ref="adminAddFormRef">
|
||||||
<el-form-item label="upload picture" prop="img">
|
<el-form-item label="upload picture" prop="img">
|
||||||
<el-upload
|
<el-upload ref="upFileRef" class="upload-demo" drag accept="image/*" action="#" multiple :http-request="uploadPic"
|
||||||
ref="upFileRef"
|
:on-remove="removePic" :before-upload="beforeUpload">
|
||||||
class="upload-demo"
|
|
||||||
drag
|
|
||||||
accept="image/*"
|
|
||||||
action="#"
|
|
||||||
multiple
|
|
||||||
:http-request="uploadPic"
|
|
||||||
:on-remove="removePic"
|
|
||||||
:before-upload="beforeUpload"
|
|
||||||
>
|
|
||||||
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
|
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
|
||||||
<div class="el-upload__text">
|
<div class="el-upload__text">
|
||||||
Drop file here or <em>click to upload</em>
|
Drop file here or <em>click to upload</em>
|
||||||
|
@ -24,16 +15,14 @@
|
||||||
</template>
|
</template>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item prop="title" label="data title">
|
||||||
|
<el-input v-model="state.ruleForm.title" class="m-2" placeholder="please enter data title" :rows="3" type="text"
|
||||||
|
style="width:220px;" />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="Home page show" prop="isMain">
|
<el-form-item label="Home page show" prop="isMain">
|
||||||
<el-select v-model="state.ruleForm.isMain" class="m-2" placeholder="please select home show">
|
<el-select v-model="state.ruleForm.isMain" class="m-2" placeholder="please select home show">
|
||||||
<el-option
|
<el-option label="show" value="1"></el-option>
|
||||||
label="show"
|
<el-option label="not show" value="0"></el-option>
|
||||||
value="1"
|
|
||||||
></el-option>
|
|
||||||
<el-option
|
|
||||||
label="not show"
|
|
||||||
value="0"
|
|
||||||
></el-option>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
@ -139,6 +128,7 @@ const onSubmit = () => {
|
||||||
})
|
})
|
||||||
state.dataForm.append('disasterId', state.disasterId);
|
state.dataForm.append('disasterId', state.disasterId);
|
||||||
state.dataForm.append('isMain', state.ruleForm.isMain);
|
state.dataForm.append('isMain', state.ruleForm.isMain);
|
||||||
|
state.dataForm.append('title', state.ruleForm.title);
|
||||||
for (let [a, b] of state.dataForm.entries()) {
|
for (let [a, b] of state.dataForm.entries()) {
|
||||||
console.log(a, b, '--------------');
|
console.log(a, b, '--------------');
|
||||||
}
|
}
|
||||||
|
@ -160,6 +150,4 @@ defineExpose({
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped></style>
|
||||||
|
|
||||||
</style>
|
|
|
@ -65,16 +65,6 @@
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column prop="size"
|
|
||||||
label="size"
|
|
||||||
show-overflow-tooltip>
|
|
||||||
<template #default="scope">
|
|
||||||
{{formatSizeUnits(scope.row.size)}}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="type"
|
|
||||||
label="type"
|
|
||||||
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="primary" @click="editData(scope.row)">Edit</el-button>
|
<el-button size="small" text type="primary" @click="editData(scope.row)">Edit</el-button>
|
||||||
|
@ -146,9 +136,7 @@ const handleSelectionChange = (val) => {
|
||||||
};
|
};
|
||||||
//格式化图片名称
|
//格式化图片名称
|
||||||
const formatName = (name) => {
|
const formatName = (name) => {
|
||||||
if (name) {
|
|
||||||
return name.substr(0, name.indexOf('.'));
|
|
||||||
}
|
|
||||||
return name;
|
return name;
|
||||||
};
|
};
|
||||||
const auditData = (row) => {
|
const auditData = (row) => {
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
|
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
|
||||||
<el-tab-pane label="Unapproved" name="first">
|
<el-tab-pane label="Unapproved" name="first">
|
||||||
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
|
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
|
||||||
<el-table-column type="index" label="ID" width="50" />
|
|
||||||
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="organization" label="Organization" 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>
|
<el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip>
|
||||||
|
@ -33,7 +32,8 @@
|
||||||
</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="onOpenEditRole('edit', scope.row)">Approve</el-button>
|
<el-button size="small" text type="primary"
|
||||||
|
@click="onOpenEditRole('edit', scope.row)">Approve</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="Approved | Rejected" name="second">
|
<el-tab-pane label="Approved | Rejected" name="second">
|
||||||
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
|
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
|
||||||
<el-table-column type="index" label="ID" width="50" />
|
|
||||||
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
|
||||||
<!-- <el-table-column prop="Administrator" label="Administrator" show-overflow-tooltip></el-table-column> -->
|
<!-- <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="organization" label="Organization" show-overflow-tooltip></el-table-column>
|
||||||
|
@ -86,20 +86,25 @@
|
||||||
</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="reviewTime" label="reviewTime" show-overflow-tooltip />
|
||||||
|
|
||||||
|
|
||||||
<!-- <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 width="170" prop="respondStatus" label="Response status" show-overflow-tooltip>
|
||||||
|
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tag type="info" v-if="scope.row.respondStatus === 2">Approved</el-tag>
|
<el-tag type="info" v-if="scope.row.respondStatus === 2">Approved</el-tag>
|
||||||
<el-tag type="info" v-if="scope.row.respondStatus === 1">Rejected</el-tag>
|
<el-tag type="info" v-if="scope.row.respondStatus === 1">Rejected</el-tag>
|
||||||
|
<el-tag type="success" v-if="scope.row.respondStatus === 3">Complete response</el-tag>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
|
<el-table-column width="200" prop="Operate" label="Operate" show-overflow-tooltip>
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button size="small" text type="primary" @click="onAllocation(scope.row)">Allocate</el-button>
|
<el-button size="small" text type="primary" @click="onAllocation(scope.row)">Allocation</el-button>
|
||||||
|
<el-button size="small" text type="danger" @click="responseEnded(scope.row)">Response ended</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
@ -111,7 +116,7 @@
|
||||||
</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="Approval" 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" 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>
|
||||||
|
@ -120,7 +125,8 @@
|
||||||
</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>
|
||||||
|
@ -151,7 +157,7 @@
|
||||||
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, responseEndedDisasterInfo } from '/@/api/disasterInfo/index';
|
||||||
import { getDictionary } from '/@/api/system/dictbiz';
|
import { getDictionary } from '/@/api/system/dictbiz';
|
||||||
import { useVariableStore } from '/@/stores/index.ts'
|
import { useVariableStore } from '/@/stores/index.ts'
|
||||||
//引入地图
|
//引入地图
|
||||||
|
@ -181,6 +187,24 @@ const MapPage = defineAsyncComponent({
|
||||||
const onAllocation = (row) => {
|
const onAllocation = (row) => {
|
||||||
select.value.openDialog(row)
|
select.value.openDialog(row)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const responseEnded = (row) => {
|
||||||
|
ElMessageBox.confirm(`Confirm completion of response?`, 'Prompt', {
|
||||||
|
confirmButtonText: 'Yes',
|
||||||
|
cancelButtonText: 'No',
|
||||||
|
type: 'warning',
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
responseEndedDisasterInfo(row.id).then((da) => {
|
||||||
|
getTableData();
|
||||||
|
ElMessage.success('Operation successful');
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.catch(() => { });
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
const dateFormat = (date) => {
|
const dateFormat = (date) => {
|
||||||
return useDateFormat(date, 'YYYY-MM-DD').value;
|
return useDateFormat(date, 'YYYY-MM-DD').value;
|
||||||
}
|
}
|
||||||
|
@ -214,7 +238,7 @@ const getTableData = () => {
|
||||||
if (state.selectName === 'first') {
|
if (state.selectName === 'first') {
|
||||||
state.tableData.param.respondStatus = 0;
|
state.tableData.param.respondStatus = 0;
|
||||||
} else {
|
} else {
|
||||||
state.tableData.param.respondStatus = 2;
|
state.tableData.param.respondStatus = 3;
|
||||||
}
|
}
|
||||||
getList(state.tableData.param).then((res) => {
|
getList(state.tableData.param).then((res) => {
|
||||||
state.tableData.data = res.records;
|
state.tableData.data = res.records;
|
||||||
|
@ -274,9 +298,9 @@ const ClearSubmit = () => {
|
||||||
}, 100)
|
}, 100)
|
||||||
}
|
}
|
||||||
const mapClick = (res) => {
|
const mapClick = (res) => {
|
||||||
mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
|
// mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
|
||||||
changelatlon(res);
|
changelatlon(res);
|
||||||
state.wktPoint_Poly=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)
|
// console.log(state.wktPoint_Poly)
|
||||||
}
|
}
|
||||||
const reviews = (index) => {
|
const reviews = (index) => {
|
||||||
|
@ -291,7 +315,7 @@ const reviews = (index) => {
|
||||||
if (index === 1) {
|
if (index === 1) {
|
||||||
state.edit.respondStatus = 1;
|
state.edit.respondStatus = 1;
|
||||||
} else {
|
} else {
|
||||||
state.edit.respondStatus = 2;
|
state.edit.respondStatus = 3;
|
||||||
}
|
}
|
||||||
state.edit.geometry = variableStore.layerGroupPoint === null ? variableStore.layerGroupPoly : variableStore.layerGroupPoint;
|
state.edit.geometry = variableStore.layerGroupPoint === null ? variableStore.layerGroupPoly : variableStore.layerGroupPoint;
|
||||||
//时间格式化
|
//时间格式化
|
||||||
|
@ -363,7 +387,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 +404,11 @@ const getValue = (key) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mt15 {
|
||||||
|
display: flex;
|
||||||
|
justify-content: end;
|
||||||
|
float: right;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -25,17 +25,15 @@
|
||||||
</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 prop="disasterType" label="DisasterType" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column type="index" label="ID" width="50" />
|
<el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="disasterType" label="DisasterType" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="disasterTime" label="disasterTime" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="managerName" label="ManagerName" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="disasterKeyword" label="DisasterKeyword" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="sponsorOrganization" label="SponsorOrganization" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="managerName" label="ManagerName" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="researchField" label="ResearchField" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="sponsorOrganization" label="SponsorOrganization" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="occupation" label="occupation" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="researchField" label="ResearchField" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="applyTime" label="applyTime" show-overflow-tooltip sortable></el-table-column>
|
||||||
<el-table-column prop="occupation" label="occupation" show-overflow-tooltip></el-table-column>
|
<el-table-column v-if="state.status == '1'" prop="reviewTime" label="reviewTime" show-overflow-tooltip sortable></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>
|
<el-table-column v-if="state.status == '0'" 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>-->
|
||||||
|
@ -113,6 +111,10 @@ const getTableData = () => {
|
||||||
state.tableData.loading = true;
|
state.tableData.loading = true;
|
||||||
getAdminManagerPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "managerName": state.searchName,"status": state.status}).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.data.forEach(item => {
|
||||||
|
let date = item.disasterTime.slice(0, 10);
|
||||||
|
item.disasterTime = date;
|
||||||
|
})
|
||||||
state.tableData.total = res.total;
|
state.tableData.total = res.total;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue