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

glj-代码提交

This commit is contained in:
glj 2023-09-05 11:25:44 +08:00
parent 8ddaad2138
commit fac1297d73
8 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/table/DisasterTable.vue
View File

@ -22,7 +22,7 @@
<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="VoRDM ID" width="124" sortable/> <el-table-column prop="vordmId" label="VoRDM ID" width="124" sortable/>
<el-table-column prop="dictValue" label="Disaster type" show-overflow-tooltip sortable width="148"></el-table-column> <el-table-column prop="dictValue" label="Disaster Type" show-overflow-tooltip sortable width="148"></el-table-column>
<el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip sortable width="167"></el-table-column> <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip sortable width="167"></el-table-column>
<el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip sortable width="145"></el-table-column> <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip sortable width="145"></el-table-column>
<slot></slot> <slot></slot>

2
src/layout/navBars/breadcrumb/updatePassword.vue
View File

@ -7,7 +7,7 @@
> >
<el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm"> <el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm">
<el-form-item class="login-animation1" prop="userName" > <el-form-item class="login-animation1" prop="userName" >
<el-input text placeholder="Please input email," v-model="state.ruleForm.userName" clearable autocomplete="off"> <el-input text placeholder="Please input email" v-model="state.ruleForm.userName" clearable autocomplete="off">
<template #prefix> <template #prefix>
<el-icon class="el-input__icon"><ele-User /></el-icon> <el-icon class="el-input__icon"><ele-User /></el-icon>
</template> </template>

4
src/router/route.js
View File

@ -229,7 +229,7 @@ export const dynamicRoutes = [
name: 'disasterPartners', name: 'disasterPartners',
component: () => import('/@/views/dataService/disasterPartners/index.vue'), component: () => import('/@/views/dataService/disasterPartners/index.vue'),
meta: { meta: {
title: 'Disaster Website', title: 'Disaster website',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
@ -264,7 +264,7 @@ export const dynamicRoutes = [
name: 'chief-administrator-management', name: 'chief-administrator-management',
component: () => import('/@/views/systemManagement/chiefAdministrator/index.vue'), component: () => import('/@/views/systemManagement/chiefAdministrator/index.vue'),
meta: { meta: {
title: 'Chief Administrator', title: 'Chief administrator',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,

17
src/views/home/index.vue
View File

@ -107,7 +107,7 @@
<div style="height: 100%;width: 42%;overflow-y: auto;"> <div style="height: 100%;width: 42%;overflow-y: auto;">
<el-table :data="state.typeTable" style="width: 100%"> <el-table :data="state.typeTable" style="width: 100%">
<el-table-column type="index" label="TOP" width="100" align="center"/> <el-table-column type="index" label="TOP" width="100" align="center"/>
<el-table-column prop="name" label="Disaster type" show-overflow-tooltip align="center"></el-table-column> <el-table-column prop="name" label="Disaster Type" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="value" label="Number" show-overflow-tooltip align="center"></el-table-column> <el-table-column prop="value" label="Number" show-overflow-tooltip align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
@ -188,7 +188,7 @@ const state = reactive({
{ {
num1: '', num1: '',
num2: '', num2: '',
num3: 'Actual times of disaster response', num3: 'Actual Times of Disaster Response',
num4: 'iconfont', num4: 'iconfont',
color1: '#6690F9', color1: '#6690F9',
color2: '--next-color-success-lighter', color2: '--next-color-success-lighter',
@ -206,7 +206,7 @@ const state = reactive({
{ {
num1: '', num1: '',
num2: '', num2: '',
num3: 'Data downloads', num3: 'Data Downloads',
num4: 'iconfont', num4: 'iconfont',
color1: '#FF6462', color1: '#FF6462',
color2: '--next-color-danger-lighter', color2: '--next-color-danger-lighter',
@ -232,7 +232,7 @@ const initLineChart = (xData,data1, data2) => {
const option = { const option = {
backgroundColor: state.charts.bgColor, backgroundColor: state.charts.bgColor,
title: { title: {
text: 'Annual user response application statistics', text: 'Annual User Response Application Statistics',
x: 'left', x: 'left',
textStyle: { fontSize: '15', color: state.charts.color }, textStyle: { fontSize: '15', color: state.charts.color },
}, },
@ -301,7 +301,7 @@ const initLineVandDChart = (xData,data1, data2) => {
const option = { const option = {
backgroundColor: state.charts.bgColor, backgroundColor: state.charts.bgColor,
title: { title: {
text: 'Annual disaster type visits and downloads statistics', text: 'Annual Disaster Type Visits and Downloads Statistics',
x: 'left', x: 'left',
textStyle: { fontSize: '15', color: state.charts.color }, textStyle: { fontSize: '15', color: state.charts.color },
}, },
@ -664,6 +664,10 @@ const setAdministratorsChart = (data) => {
xData.push(item.name) xData.push(item.name)
yData.push(item.val) yData.push(item.val)
}) })
if (yData) {
xData.push('');
yData.push(0);
}
initAdministratorsChart(xData,yData); initAdministratorsChart(xData,yData);
} }
/** /**
@ -677,6 +681,9 @@ const setAdministratorsChart = (data) => {
xData.push(item.name) xData.push(item.name)
yData.push(item.val) yData.push(item.val)
}) })
if (yData) {
yData.push(0)
}
initChiefChart(xData,yData); initChiefChart(xData,yData);
} }
/** /**

2
src/views/login/component/forgotPassword.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm"> <el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm">
<el-form-item class="login-animation1" prop="userName" > <el-form-item class="login-animation1" prop="userName" >
<el-input text placeholder="Please input email," v-model="state.ruleForm.userName" clearable autocomplete="off"> <el-input text placeholder="Please input email" v-model="state.ruleForm.userName" clearable autocomplete="off">
<template #prefix> <template #prefix>
<el-icon class="el-input__icon"><ele-User /></el-icon> <el-icon class="el-input__icon"><ele-User /></el-icon>
</template> </template>

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

@ -21,7 +21,7 @@
show-overflow-tooltip show-overflow-tooltip
sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="disasterType" <el-table-column prop="disasterType"
label="Disaster type" label="Disaster Type"
show-overflow-tooltip show-overflow-tooltip
sortable> sortable>
<!-- 在disasterType中获取dictKey 对应的dictValue --> <!-- 在disasterType中获取dictKey 对应的dictValue -->
@ -92,7 +92,7 @@
show-overflow-tooltip show-overflow-tooltip
sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="disasterType" <el-table-column prop="disasterType"
label="Disaster type" label="Disaster Type"
show-overflow-tooltip show-overflow-tooltip
sortable> sortable>
<!-- 在disasterType中获取dictKey 对应的dictValue --> <!-- 在disasterType中获取dictKey 对应的dictValue -->
@ -161,7 +161,7 @@
show-overflow-tooltip show-overflow-tooltip
sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="disasterType" <el-table-column prop="disasterType"
label="Disaster type" label="Disaster Type"
show-overflow-tooltip show-overflow-tooltip
sortable sortable
width="160"> width="160">
@ -257,7 +257,7 @@
show-overflow-tooltip show-overflow-tooltip
sortable></el-table-column> sortable></el-table-column>
<el-table-column prop="disasterType" <el-table-column prop="disasterType"
label="Disaster type" label="Disaster Type"
show-overflow-tooltip show-overflow-tooltip
sortable> sortable>
<!-- 在disasterType中获取dictKey 对应的dictValue --> <!-- 在disasterType中获取dictKey 对应的dictValue -->
@ -388,7 +388,7 @@
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 style="width: 200px; height: 40px;" <el-select style="width: 200px; height: 40px;"
class="form-select" class="form-select"
size="default" size="default"

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

@ -25,15 +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 prop="disasterType" label="DisasterType" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="disasterCountry" label="DisasterCountry" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="disasterTime" label="disasterTime" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="managerName" label="ManagerName" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="managerName" label="Manager" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="sponsorOrganization" label="SponsorOrganization" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="sponsorOrganization" label="Sponsor organization" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="researchField" label="ResearchField" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="researchField" label="Research field" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="occupation" label="occupation" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="occupation" label="Occupation" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="applyTime" label="applyTime" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="applyTime" label="Apply time" show-overflow-tooltip sortable></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 v-if="state.status == '1'" prop="reviewTime" label="Review time" show-overflow-tooltip sortable></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>-->

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

@ -36,7 +36,7 @@
label="User name" label="User name"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column prop="account" <el-table-column prop="account"
label="account" label="Account"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column prop="email" <el-table-column prop="email"
label="Email" label="Email"