From 7baef94d3c50761b558b4807c1fb4d34da918cb4 Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Mon, 17 Apr 2023 13:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E6=99=AE=E9=80=9A=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pictureInfo/component/editPicture.vue            |  2 +-
 src/views/dataService/pictureInfo/index.vue          |  4 ++--
 src/views/systemManagement/administrator/index.vue   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/dataService/pictureInfo/component/editPicture.vue b/src/views/dataService/pictureInfo/component/editPicture.vue
index 082d0c9..136da9c 100644
--- a/src/views/dataService/pictureInfo/component/editPicture.vue
+++ b/src/views/dataService/pictureInfo/component/editPicture.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="edit picture" v-model="state.isShowDialog" width="700px" close-on-click-modal="false">
+  <el-dialog title="edit picture" v-model="state.isShowDialog" width="700px" :close-on-click-modal="false" @close="closeDialog">
     <el-form :model="state.ruleForm" size="default" label-width="150px" :rules="rules" ref="adminAddFormRef">
       <el-form-item label="upload picture" prop="img">
         <el-upload
diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue
index 11f6bdb..bffe4af 100644
--- a/src/views/dataService/pictureInfo/index.vue
+++ b/src/views/dataService/pictureInfo/index.vue
@@ -89,7 +89,7 @@
                   </el-popover>
                 </template>
               </el-table-column>
-              <el-table-column prop="size"
+<!--              <el-table-column prop="size"
                                label="size"
                                show-overflow-tooltip>
                 <template #default="scope">
@@ -98,7 +98,7 @@
               </el-table-column>
               <el-table-column prop="type"
                                label="type"
-                               show-overflow-tooltip></el-table-column>
+                               show-overflow-tooltip></el-table-column>-->
               <el-table-column prop="Operate"
                                label="Operate"
                                show-overflow-tooltip>
diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue
index 4242fe0..e173019 100644
--- a/src/views/systemManagement/administrator/index.vue
+++ b/src/views/systemManagement/administrator/index.vue
@@ -35,18 +35,18 @@
         <el-table-column prop="disasterKeyword"
                          label="DisasterKeyword"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="disasterLevel"
-                         label="DisasterLevel"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="disasterTime"
-                         label="DisasterTime"
-                         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>