From fac1297d73a36a0768cc573aaf92cfb92cd1bf19 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 5 Sep 2023 11:25:44 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/DisasterTable.vue         |  2 +-
 .../navBars/breadcrumb/updatePassword.vue      |  2 +-
 src/router/route.js                            |  4 ++--
 src/views/home/index.vue                       | 17 ++++++++++++-----
 src/views/login/component/forgotPassword.vue   |  2 +-
 .../responseManagement/userResponse/index.vue  | 10 +++++-----
 .../systemManagement/administrator/index.vue   | 18 +++++++++---------
 .../chiefAdministrator/index.vue               |  2 +-
 8 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/components/table/DisasterTable.vue b/src/components/table/DisasterTable.vue
index 114d64d..bbd161c 100644
--- a/src/components/table/DisasterTable.vue
+++ b/src/components/table/DisasterTable.vue
@@ -22,7 +22,7 @@
   <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
     highlight-current-row @row-click="tableClick">
     <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="disasterTime" label="Disaster time" show-overflow-tooltip sortable width="145"></el-table-column>
     <slot></slot>
diff --git a/src/layout/navBars/breadcrumb/updatePassword.vue b/src/layout/navBars/breadcrumb/updatePassword.vue
index f68bc64..6440300 100644
--- a/src/layout/navBars/breadcrumb/updatePassword.vue
+++ b/src/layout/navBars/breadcrumb/updatePassword.vue
@@ -7,7 +7,7 @@
     >
         <el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm">
 		<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>
 					<el-icon class="el-input__icon"><ele-User /></el-icon>
 				</template>
diff --git a/src/router/route.js b/src/router/route.js
index 84b66f2..5ee1f1d 100644
--- a/src/router/route.js
+++ b/src/router/route.js
@@ -229,7 +229,7 @@ export const dynamicRoutes = [
 						name: 'disasterPartners',
 						component: () => import('/@/views/dataService/disasterPartners/index.vue'),
 						meta: {
-							title: 'Disaster Website',
+							title: 'Disaster website',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
@@ -264,7 +264,7 @@ export const dynamicRoutes = [
 						name: 'chief-administrator-management',
 						component: () => import('/@/views/systemManagement/chiefAdministrator/index.vue'),
 						meta: {
-							title: 'Chief Administrator',
+							title: 'Chief administrator',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 864fa86..7918dfa 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -107,7 +107,7 @@
                <div style="height: 100%;width: 42%;overflow-y: auto;">
             <el-table :data="state.typeTable" style="width: 100%">
               <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>
           </div>
@@ -188,7 +188,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'Actual times of disaster response',
+      num3: 'Actual Times of Disaster Response',
       num4: 'iconfont',
       color1: '#6690F9',
       color2: '--next-color-success-lighter',
@@ -206,7 +206,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'Data downloads',
+      num3: 'Data Downloads',
       num4: 'iconfont',
       color1: '#FF6462',
       color2: '--next-color-danger-lighter',
@@ -232,7 +232,7 @@ const initLineChart = (xData,data1, data2) => {
   const option = {
     backgroundColor: state.charts.bgColor,
     title: {
-      text: 'Annual user response application statistics',
+      text: 'Annual User Response Application Statistics',
       x: 'left',
       textStyle: { fontSize: '15', color: state.charts.color },
     },
@@ -301,7 +301,7 @@ const initLineVandDChart = (xData,data1, data2) => {
   const option = {
     backgroundColor: state.charts.bgColor,
     title: {
-      text: 'Annual disaster type visits and downloads statistics',
+      text: 'Annual Disaster Type Visits and Downloads Statistics',
       x: 'left',
       textStyle: { fontSize: '15', color: state.charts.color },
     },
@@ -664,6 +664,10 @@ const setAdministratorsChart = (data) => {
     xData.push(item.name)
     yData.push(item.val)
   })
+  if (yData) {
+    xData.push('');
+    yData.push(0);
+  }
   initAdministratorsChart(xData,yData);
 }
 /**
@@ -677,6 +681,9 @@ const setAdministratorsChart = (data) => {
     xData.push(item.name)
     yData.push(item.val)
   })
+  if (yData) {
+    yData.push(0)
+  }
   initChiefChart(xData,yData);
 }
 /**
diff --git a/src/views/login/component/forgotPassword.vue b/src/views/login/component/forgotPassword.vue
index d253ff5..64802a7 100644
--- a/src/views/login/component/forgotPassword.vue
+++ b/src/views/login/component/forgotPassword.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-form size="large" class="login-content-form" :rules="rules" :model="state.ruleForm">
 		<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>
 					<el-icon class="el-input__icon"><ele-User /></el-icon>
 				</template>
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 0f12ab4..6444f59 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -21,7 +21,7 @@
                                show-overflow-tooltip
                                sortable></el-table-column>
               <el-table-column prop="disasterType"
-                               label="Disaster type"
+                               label="Disaster Type"
                                show-overflow-tooltip
                                sortable>
                 <!-- 在disasterType中获取dictKey 对应的dictValue -->
@@ -92,7 +92,7 @@
                                show-overflow-tooltip
                                sortable></el-table-column>
               <el-table-column prop="disasterType"
-                               label="Disaster type"
+                               label="Disaster Type"
                                show-overflow-tooltip
                                sortable>
                 <!-- 在disasterType中获取dictKey 对应的dictValue -->
@@ -161,7 +161,7 @@
                                show-overflow-tooltip
                                sortable></el-table-column>
               <el-table-column prop="disasterType"
-                               label="Disaster type"
+                               label="Disaster Type"
                                show-overflow-tooltip
                                sortable
                                width="160">
@@ -257,7 +257,7 @@
                                show-overflow-tooltip
                                sortable></el-table-column>
               <el-table-column prop="disasterType"
-                               label="Disaster type"
+                               label="Disaster Type"
                                show-overflow-tooltip
                                sortable>
                 <!-- 在disasterType中获取dictKey 对应的dictValue -->
@@ -388,7 +388,7 @@
                             placeholder="Select date and time" />
           </el-form-item>
 
-          <el-form-item label="Disaster type">
+          <el-form-item label="Disaster Type">
             <el-select style="width: 200px; height: 40px;"
                        class="form-select"
                        size="default"
diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue
index 2732e91..b62077a 100644
--- a/src/views/systemManagement/administrator/index.vue
+++ b/src/views/systemManagement/administrator/index.vue
@@ -25,15 +25,15 @@
         </div>
         <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
           @selection-change="handleSelectionChange" style="width: 100%">
-          <el-table-column prop="disasterType" label="DisasterType" 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="disasterTime" label="disasterTime" 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="sponsorOrganization" label="SponsorOrganization" 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="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 v-if="state.status == '1'" prop="reviewTime" label="reviewTime" 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="Disaster country" 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="Manager" 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="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="applyTime" label="Apply time" 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>
             <template #default="scope">
               <!--            <el-button link type="primary" size="small" @click="handleClick">Detail</el-button>-->
diff --git a/src/views/systemManagement/chiefAdministrator/index.vue b/src/views/systemManagement/chiefAdministrator/index.vue
index 408b8d0..a5451c9 100644
--- a/src/views/systemManagement/chiefAdministrator/index.vue
+++ b/src/views/systemManagement/chiefAdministrator/index.vue
@@ -36,7 +36,7 @@
                          label="User name"
                          show-overflow-tooltip></el-table-column>
         <el-table-column prop="account"
-                         label="account"
+                         label="Account"
                          show-overflow-tooltip></el-table-column>
         <el-table-column prop="email"
                          label="Email"