From 8e0c684fdea5e6e49c7e029461d682a9920f7c77 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 20:42:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/user/Informationinput.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 4e75487..3cfebbe 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -80,25 +80,25 @@
                 编辑
               </span>
             </template>
-          </el-table-column>
-          <el-table-column label="照片" width="60">
-            <template slot-scope="scope">
-              <!--              <img :src="scope.row.imagePath">-->
-              <el-image
-                v-if="scope.row.imagePath && scope.row.imagePath != ''"
-                style="width: 30px; height: 30px"
-                :src="scope.row.imagePath"
-                fit="cover"
-              />
+          </el-table-column>-->
+          <!--          <el-table-column label="照片" width="60">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              &lt;!&ndash;              <img :src="scope.row.imagePath">&ndash;&gt;-->
+          <!--              <el-image-->
+          <!--                v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
+          <!--                style="width: 30px; height: 30px"-->
+          <!--                :src="scope.row.imagePath"-->
+          <!--                fit="cover"-->
+          <!--              />-->
 
-              <el-image
-                v-else
-                style="width: 30px; height: 30px"
-                :src="defaultImg"
-                fit="cover"
-              />
-            </template>
-          </el-table-column>
+          <!--              <el-image-->
+          <!--                v-else-->
+          <!--                style="width: 30px; height: 30px"-->
+          <!--                :src="defaultImg"-->
+          <!--                fit="cover"-->
+          <!--              />-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
           <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
           <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />

--
Gitblit v1.8.0