From 4048df003192a1a2233493c23d366ccc465c8d54 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 26 Jul 2021 11:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9E=B6=E6=9E=84=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/Framework.vue | 20 ++++++++++----------
 src/views/user/User.vue      |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index af459fa..9c40f78 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -21,7 +21,7 @@
                 <el-card shadow="hover">
                     <el-form label-width="80px" class="flex-between mgb20">
                         <div class="flex-center">
-                            <el-form-item label="创建日期" style="margin: 0 20px 0 0">
+                            <el-form-item label="更新时间" style="margin: 0 20px 0 0">
                                 <el-date-picker v-model="updateTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="initData"></el-date-picker>
                             </el-form-item>
                             <el-input placeholder="请输入数据表名称" v-model="keyword" prefix-icon="el-icon-search" clearable></el-input>
@@ -41,7 +41,7 @@
                                 {{scope.row.dataSize}}M
                             </template>
                         </el-table-column>
-                        <el-table-column prop="updateTime" label="更新时间" align="center"></el-table-column>
+                        <el-table-column prop="createTime" label="更新时间" align="center"></el-table-column>
                         <el-table-column label="操作" width="220" align="center">
                             <template slot-scope="scope">
                                 <el-button type="text" @click="preview(scope.row)">预览</el-button>
@@ -68,7 +68,7 @@
                             <p class="hr_tag"></p>
                             <span>预览</span>
                         </div>
-                        <el-table :data="fieldData" stripe header-align="center">
+                        <el-table :data="fieldData" stripe header-align="center" v-if="fieldHead.length">
                             <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                             <el-table-column v-for="(item,index) in fieldHead" :prop="item.field" :key="index" :label="item.comment" align="center"></el-table-column>
                         </el-table>
@@ -304,10 +304,10 @@ export default {
                 })
                 
                 n.children = res.list
-                if(!i && !this.tableName){
-                    this.tableName = res.list[0].name
-                    this.curId = res.list[0].id
-                }
+                // if(!i && !this.tableName){
+                //     this.tableName = res.list[0].name
+                //     this.curId = res.list[0].id
+                // }
             }).catch(res => {})
         },
         batchImport(){
@@ -349,9 +349,9 @@ export default {
                     })
                     setTimeout(() => {
                         this.importTypeList = res
-                        this.defaultTypeActive = [res[0].id]
-                        if(res[0].children.length) this.defaultTypeActive.push(res[0].children[0].id)
-                        this.getFields()
+                        // this.defaultTypeActive = [res[0].id]
+                        // if(res[0].children.length) this.defaultTypeActive.push(res[0].children[0].id)
+                        // this.getFields()
                     },500)
                 }).catch(res => {})
                 
diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index 255c557..08e216a 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -104,7 +104,7 @@
                         </el-table-column>
                         <el-table-column prop="logInNumber" label="登录次数" align="center">
                         </el-table-column>
-                        <el-table-column label="操作" width="270" align="center">
+                        <el-table-column label="操作" width="300" align="center">
                             <template slot-scope="scope">
                                 <el-button type="text" @click="show(scope.row)">查看</el-button>
                                 <el-button type="text" @click="edit(scope.row)">编辑</el-button>
@@ -209,7 +209,7 @@ export default {
             }
         },
         'form.date': function(val){
-            if(val.length){
+            if(val && val.length){
                 this.form.startTime = val[0]
                 this.form.endTime = val[1]
             }else{