From d3215f0051943a83f459009359d0039c3a0e1a4e Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 04 八月 2023 10:29:48 +0800
Subject: [PATCH] 信息管理

---
 src/views/datamanage/metadataManage.vue |   43 ++
 src/views/datamanage/dataLoader.vue     |  816 +++++++++++++++++++++++++++++------------------------
 src/views/datamanage/dataUpdata.vue     |    4 
 3 files changed, 489 insertions(+), 374 deletions(-)

diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index 903deb6..8fcd86b 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -1,357 +1,429 @@
 <template>
-  <div class="authorityManagement_box"    v-loading.fullscreen.lock="fullscreenLoading"
-                element-loading-spinner="el-icon-loading"
-                 element-loading-background="rgba(0, 0, 0, 0.8)">
-    <My-bread
-      :list="[
+  <div
+    class="authorityManagement_box"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+  >
+    <My-bread :list="[
         `${$t('dataManage.dataManage')}`,
         `${$t('dataManage.datawarehousing')}`,
-      ]"
-    ></My-bread>
+      ]"></My-bread>
     <el-divider />
     <div class="updateContent">
-       <el-tabs v-model="activeTabName" @tab-click="handleTabClick">
-    <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first">
+      <el-tabs
+        v-model="activeTabName"
+        @tab-click="handleTabClick"
+      >
+        <el-tab-pane
+          :label="$t('dataManage.dataUpObj.uploaddata')"
+          name="first"
+        >
 
-       <div class="contentIquery">
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
-          <el-form-item :label="$t('dataManage.dataUpObj.catalogue')">
-            <el-cascader
-              v-model="formInline.dirid"
-              :options="catalogOption"
-              @change="catalogChange"
-              :props="cascader"
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item :label="$t('dataManage.dataUpObj.company')">
-            <el-cascader
-              v-model="formInline.depid"
-              :options="companyOption"
-              @change="companyChange"
-              :props="cascader"
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item :label="$t('dataManage.dataUpObj.versionNo')">
-              <el-select v-model="formInline.verid" :placeholder="$t('common.choose')">
-              <el-option
-                v-for="item in verOption"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
-              </el-option>
-              </el-select>
-          </el-form-item>
-
-
-          <el-form-item>
-   <el-input
-              type="textarea"
-              v-model="formInline.fileName"
-
-              class="nm-skin-pretty"
-              show-word-limit
-              :rows="2"  resize='none'
-              style="width: 650px;"
-            ></el-input>
-          </el-form-item>
-            <el-form-item>
-            <input id="uploadfile" @change= "handleFileChange" type="file"  name="file" multiple="multiple" accept=".xls,.xlsx,.mdb,.shp.zip,.gdb.zip"  style="display: none"></input>
-
-   <el-button v-if="formInline.fileName == '鏈�夋嫨鏂囦欢'"
-              type="info"
-                @click="fileSelect">
-                   閫夋嫨鏂囦欢
-             </el-button>
-             <el-button
-               v-else
-                type="info"
-                @click="clearFileSelect"
+          <div class="contentIquery">
+            <el-form
+              :inline="true"
+              :model="formInline"
+              class="demo-form-inline"
+            >
+              <el-form-item :label="$t('dataManage.dataUpObj.catalogue')">
+                <el-cascader
+                  v-model="formInline.dirid"
+                  :options="catalogOption"
+                  @change="catalogChange"
+                  :props="cascader"
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item :label="$t('dataManage.dataUpObj.company')">
+                <el-cascader
+                  v-model="formInline.depid"
+                  :options="companyOption"
+                  @change="companyChange"
+                  :props="cascader"
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item :label="$t('dataManage.dataUpObj.versionNo')">
+                <el-select
+                  v-model="formInline.verid"
+                  :placeholder="$t('common.choose')"
                 >
-                    閲嶇疆
-             </el-button>
-          </el-form-item>
-          <br />
-          <el-form-item  >
-            <el-input
-              type="textarea"
-              v-model="formInline.descr"
-              maxlength="50"
-              class="nm-skin-pretty"
-              show-word-limit
-              :rows="2"  resize='none'
-              style="width: 460px"
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="el-icon-upload" @click="setFileUpload"
-             type="success">{{
+                  <el-option
+                    v-for="item in verOption"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item>
+                <el-input
+                  type="textarea"
+                  v-model="formInline.fileName"
+                  class="nm-skin-pretty"
+                  show-word-limit
+                  :rows="2"
+                  resize='none'
+                  style="width: 650px;"
+                ></el-input>
+              </el-form-item>
+              <el-form-item>
+                <input
+                  id="uploadfile"
+                  @change="handleFileChange"
+                  type="file"
+                  name="file"
+                  multiple="multiple"
+                  accept=".xls,.xlsx,.mdb,.shp.zip,.gdb.zip"
+                  style="display: none"
+                ></input>
+
+                <el-button
+                  v-if="formInline.fileName == '鏈�夋嫨鏂囦欢'"
+                  type="info"
+                  @click="fileSelect"
+                >
+                  閫夋嫨鏂囦欢
+                </el-button>
+                <el-button
+                  v-else
+                  type="info"
+                  @click="clearFileSelect"
+                >
+                  閲嶇疆
+                </el-button>
+              </el-form-item>
+              <br />
+              <el-form-item>
+                <el-input
+                  type="textarea"
+                  v-model="formInline.descr"
+                  maxlength="50"
+                  class="nm-skin-pretty"
+                  show-word-limit
+                  :rows="2"
+                  resize='none'
+                  style="width: 460px"
+                ></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  icon="el-icon-upload"
+                  @click="setFileUpload"
+                  type="success"
+                >{{
               $t('common.upload')
             }}</el-button>
 
-            <el-button
-              icon="el-icon-delete"
-              type="danger"
-              @click="setFileDelete"
-
-              :disabled="tableData.length == 0 ? true : false"
-              >{{ $t('common.delete') }}</el-button
+                <el-button
+                  icon="el-icon-delete"
+                  type="danger"
+                  @click="setFileDelete"
+                  :disabled="tableData.length == 0 ? true : false"
+                >{{ $t('common.delete') }}</el-button>
+                <el-button
+                  icon="el-icon-data-line"
+                  type="info"
+                  disabled
+                >{{ $t('common.quayTest') }}</el-button>
+                <el-button
+                  icon="el-icon-folder-add"
+                  type="warning"
+                  @click="setFileWare"
+                  :disabled="tableData.length == 0 ? true : false"
+                >{{ $t('common.Warehousin') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="contentTable">
+            <el-table
+              :data="tableData"
+              style="width: 100%"
+              height="99%"
+              @selection-change="handleSelectionChange"
             >
-             <el-button
-              icon="el-icon-data-line"
-              type="info"
-               disabled
-              >{{ $t('common.quayTest') }}</el-button
-            >
-            <el-button
-              icon="el-icon-folder-add"
-              type="warning"
-                @click="setFileWare"
-              :disabled="tableData.length == 0 ? true : false"
-              >{{ $t('common.Warehousin') }}</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="contentTable">
-         <el-table
-     :data="tableData"
-        style="width: 100%"
-        height="99%"
-        @selection-change="handleSelectionChange">
-       <el-table-column type="selection" width="55" />
-        <el-table-column
-          align="center"
-          type="index"
-          :label="$t('common.index')"
-          width="70px"
-          fixed
-        />
-          <el-table-column
-          align="center"
-          prop="name"
-          :label="$t('common.name')"
-          fixed
-        />
-    </el-table>
-      </div>
+              <el-table-column
+                type="selection"
+                width="55"
+              />
+              <el-table-column
+                align="center"
+                type="index"
+                :label="$t('common.index')"
+                width="70px"
+                fixed
+              />
+              <el-table-column
+                align="center"
+                prop="name"
+                :label="$t('common.name')"
+                fixed
+              />
+            </el-table>
+          </div>
         </el-tab-pane>
-       <el-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second">
-<div class="contentIquery" style="padding-bottom: 0% !important;">
-        <el-form :inline="true" :model="formWarehousing" class="demo-form-inline">
-          <el-form-item :label="$t('dataManage.dataUpObj.describe')">
-<el-input v-model="formWarehousing.name" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="el-icon-upload" @click="setWarehouseSearch"
-           class="primary">{{
+        <el-tab-pane
+          :label="$t('dataManage.dataUpObj.receiptdata')"
+          name="second"
+        >
+          <div
+            class="contentIquery"
+            style="padding-bottom: 0% !important;"
+          >
+            <el-form
+              :inline="true"
+              :model="formWarehousing"
+              class="demo-form-inline"
+            >
+              <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+                <el-input
+                  v-model="formWarehousing.name"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                ></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  icon="el-icon-upload"
+                  @click="setWarehouseSearch"
+                  class="primary"
+                >{{
               $t('common.iquery')
             }}</el-button>
-            <el-button @click="setWarehouseReset"
-              icon="el-icon-folder-add"
-              type="info"
-              >{{ $t('common.reset') }}</el-button
+                <el-button
+                  @click="setWarehouseReset"
+                  icon="el-icon-folder-add"
+                  type="info"
+                >{{ $t('common.reset') }}</el-button>
+                <el-button
+                  @click="setWarehouseDel"
+                  icon="el-icon-folder-delete"
+                  type="danger"
+                >{{ $t('common.delete') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div
+            class="contentTable"
+            style="height:500px"
+          >
+            <el-table
+              :data="waretableData"
+              style="width:99%"
+              height="92%"
+              @selection-change="handleDelteChange"
             >
-              <el-button @click="setWarehouseDel"
-              icon="el-icon-folder-delete"
-              type="danger"
-              >{{ $t('common.delete') }}</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-   <div class="contentTable" style="height:500px">
-   <el-table
-     :data="waretableData"
-
-        style="width:99%"
-        height="92%"
-         @selection-change="handleDelteChange"
- >
-   <el-table-column
-      type="selection"
-
-      width="55">
-    </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          :label="$t('common.index')"
-          width="70px"
-
-        />
-          <el-table-column
-          align="center"
-          prop="name"
-          :label="$t('common.name')"
-
-        />
-         <el-table-column
-          align="center"
-          prop="dirName"
-          :label="$t('dataManage.dataUpObj.catalogue')"
-
-
-        />
-         <el-table-column
-          align="center"
-          prop="depName"
-          :label="$t('dataManage.dataUpObj.company')"
-
-        />
-             <el-table-column
-          align="center"
-          prop="verName"
-          :label="$t('dataManage.dataUpObj.versionNo')"
-
-        />
-             <el-table-column
-          align="center"
-          prop="type"
-          :label="$t('common.type')"
-
-        />
-        <el-table-column
-          align="center"
-          prop="sizes"
-          :label="$t('common.size')"
-
-          :formatter="changeSizeFile"
-        />
-         <el-table-column
-          align="center"
-          :label="$t('dataManage.dataUpObj.tableName')"
-
-        >
-         <template slot-scope="scope">
-      <a @click="detail(scope.row)"  >{{
+              <el-table-column
+                type="selection"
+                width="55"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                type="index"
+                :label="$t('common.index')"
+                width="70px"
+              />
+              <el-table-column
+                align="center"
+                prop="name"
+                :label="$t('common.name')"
+              />
+              <el-table-column
+                align="center"
+                prop="dirName"
+                :label="$t('dataManage.dataUpObj.catalogue')"
+              />
+              <el-table-column
+                align="center"
+                prop="depName"
+                :label="$t('dataManage.dataUpObj.company')"
+              />
+              <el-table-column
+                align="center"
+                prop="verName"
+                :label="$t('dataManage.dataUpObj.versionNo')"
+              />
+              <el-table-column
+                align="center"
+                prop="type"
+                :label="$t('common.type')"
+              />
+              <el-table-column
+                align="center"
+                prop="sizes"
+                :label="$t('common.size')"
+                :formatter="changeSizeFile"
+              />
+              <el-table-column
+                align="center"
+                :label="$t('dataManage.dataUpObj.tableName')"
+              >
+                <template slot-scope="scope">
+                  <a @click="detail(scope.row)">{{
           scope.row.tab
         }}</a>
-    </template>
-        </el-table-column>
+                </template>
+              </el-table-column>
 
-         <el-table-column
-          align="center"
-          prop="rows"
-          :label="$t('common.lineNuber')"
+              <el-table-column
+                align="center"
+                prop="rows"
+                :label="$t('common.lineNuber')"
+              />
+              <el-table-column
+                align="center"
+                prop="desc"
+                :label="$t('dataManage.dataUpObj.describe')"
+              />
+              <el-table-column
+                align="center"
+                prop="uname"
+                :label="$t('dataManage.vmobj.createonuser')"
+              />
+              <el-table-column
+                align="center"
+                prop="createTime"
+                :label="$t('dataManage.vmobj.createontime')"
+                :formatter="changetimeFile"
+              />
+            </el-table>
 
-        />
-         <el-table-column
-          align="center"
-          prop="desc"
-          :label="$t('dataManage.dataUpObj.describe')"
+            <div
+              style="margin-top: 10px"
+              class="pagination_box"
+            >
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="listData.pageIndex"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="listData.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="count"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </el-tab-pane>
 
-        />
-        <el-table-column
-          align="center"
-          prop="uname"
-          :label="$t('dataManage.vmobj.createonuser')"
-
-        />
-         <el-table-column
-          align="center"
-          prop="createTime"
-          :label="$t('dataManage.vmobj.createontime')"
-          :formatter="changetimeFile"
-        />
-    </el-table>
-
-      <div style="margin-top: 10px" class="pagination_box">
-    <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="listData.pageIndex"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="listData.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="count"
-        >
-        </el-pagination>
-      </div>
-      </div>
-    </el-tab-pane>
-
-  </el-tabs>
-
+      </el-tabs>
 
     </div>
     <!--  -->
-   <el-dialog
-  :title="$t('dataManage.datawarehousing')"
-  :visible.sync="dialogWarehousing"
-  width="70%"
-  :before-close="handleWareClose"
-  >
-  <div  class="dialogBox">
-  <div class="transFarBox">
-    <ul>
-      <li @click="singleElection(item)" v-for="(item, i) in tableWareOne"  :class="{ active: activeName == item.tab }">{{item.tab}} ({{item.type}})</li>
-    </ul>
-  </div>
-  <div class="tarnsbtton">
-   <div><div style="padding:2%"> <el-link><i class="el-icon-plus"></i></el-link></div></div>
+    <el-dialog
+      :title="$t('dataManage.datawarehousing')"
+      :visible.sync="dialogWarehousing"
+      width="70%"
+      :before-close="handleWareClose"
+    >
+      <div class="dialogBox">
+        <div class="transFarBox">
+          <ul>
+            <li
+              @click="singleElection(item)"
+              v-for="(item, i) in tableWareOne"
+              :class="{ active: activeName == item.tab }"
+            >{{item.tab}} ({{item.type}})</li>
+          </ul>
+        </div>
+        <div class="tarnsbtton">
+          <div>
+            <div style="padding:2%"> <el-link><i class="el-icon-plus"></i></el-link></div>
+          </div>
 
-
-  </div>
-  <div class="transFarBox">
- <ul>
-      <li @click="singleElection2(item)" v-for="(item, i) in tableWareTwo"  :class="{ active: activeName2 == item.entity }">{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li>
-    </ul>
-  </div>
-   <div class="tarnsbtton">
-     <div><div style="padding:2%"> <el-link @click="setWareTableChangeLeft"  ><i class="el-icon-d-arrow-left"></i></el-link></div><br/> <div style="padding:2%">
-    <el-link><i class="el-icon-d-arrow-right" @click="setWareTableChangeRight"></i></el-link></div></div>
-   </div>
-   <div class="transFarBox">
-     <ul>
-      <li @click="singleElection3(i)" v-for="(item, i) in tableWareThree"  :class="{ active: activeName3 ==( item.tab+i)}">{{item.tab}} ( {{item.tabDesc}}  {{item.ns}}.{{item.tabs}} )</li>
-    </ul>
-   </div>
-  </div>
-  <span slot="footer" class="dialog-footer">
-        <el-button  class="primary" @click="autoMatchWare">鑷姩鍖归厤</el-button>
-    <el-button @click="setInsrtWareTableClose ">鍙� 娑�</el-button>
-    <el-button class="primary" @click="setInsrtWareTable">纭� 瀹�</el-button>
-  </span>
-</el-dialog>
-
-<el-dialog
-  :title="$t('common.details')"
-  :visible.sync="dialogVisible"
-   width="70%"
-   >
-   <div style="height:600px">
-     <el-table
-            ref="filterTable"
-            :data="dbTableData"
-            height="90%"
-            border
-          style="width: 100%"
-          >
-            <el-table-column width="60" type="index" :label="$t('common.index')" />
-            <el-table-column
-              v-for="(item, index) in attributeData"
-              :key="index"
-              :label="item.alias"
-              :prop="item.field"
-              show-overflow-tooltip
-              align="center"
-            ></el-table-column>
-          </el-table>
-            <div style="margin-top: 10px" class="pagination_box">
-    <el-pagination
-          @size-change="handleLoaderSizeChange"
-          @current-change="handleLoaderCurrentChange"
-          :current-page="listLoader.pageIndex"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="listLoader.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="count1"
-        >
-        </el-pagination>
+        </div>
+        <div class="transFarBox">
+          <ul>
+            <li
+              @click="singleElection2(item)"
+              v-for="(item, i) in tableWareTwo"
+              :class="{ active: activeName2 == item.entity }"
+            >{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li>
+          </ul>
+        </div>
+        <div class="tarnsbtton">
+          <div>
+            <div style="padding:2%"> <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link></div><br />
+            <div style="padding:2%">
+              <el-link><i
+                  class="el-icon-d-arrow-right"
+                  @click="setWareTableChangeRight"
+                ></i></el-link>
+            </div>
+          </div>
+        </div>
+        <div class="transFarBox">
+          <ul>
+            <li
+              @click="singleElection3(i)"
+              v-for="(item, i) in tableWareThree"
+              :class="{ active: activeName3 ==( item.tab+i)}"
+            >{{item.tab}} ( {{item.tabDesc}} {{item.ns}}.{{item.tabs}} )</li>
+          </ul>
+        </div>
       </div>
-   </div>
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button
+          class="primary"
+          @click="autoMatchWare"
+        >鑷姩鍖归厤</el-button>
+        <el-button @click="setInsrtWareTableClose ">鍙� 娑�</el-button>
+        <el-button
+          class="primary"
+          @click="setInsrtWareTable"
+        >纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
 
-</el-dialog>
+    <el-dialog
+      :title="$t('common.details')"
+      :visible.sync="dialogVisible"
+      width="70%"
+    >
+      <div style="height:600px">
+        <el-table
+          ref="filterTable"
+          :data="dbTableData"
+          height="90%"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            width="60"
+            type="index"
+            :label="$t('common.index')"
+          />
+          <el-table-column
+            v-for="(item, index) in attributeData"
+            :key="index"
+            :label="item.alias"
+            :prop="item.field"
+            show-overflow-tooltip
+            align="center"
+          ></el-table-column>
+        </el-table>
+        <div
+          style="margin-top: 10px"
+          class="pagination_box"
+        >
+          <el-pagination
+            @size-change="handleLoaderSizeChange"
+            @current-change="handleLoaderCurrentChange"
+            :current-page="listLoader.pageIndex"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="listLoader.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="count1"
+          >
+          </el-pagination>
+        </div>
+      </div>
+
+    </el-dialog>
 
   </div>
 </template>
@@ -396,7 +468,7 @@
       formInline: {
         verid: '',
         gather: '',
-          fileName:'鏈�夋嫨鏂囦欢'
+        fileName: '鏈�夋嫨鏂囦欢'
       },
       tableWareOne: [],
       tableWareTwo: [],
@@ -426,9 +498,9 @@
         checkStrictly: true,
         emitPath: false,
       },
-    
+
       listWare: [],
-        wareSelectOne: null,
+      wareSelectOne: null,
       wareSelectTwo: null,
       activeName: '',
       activeName2: '',
@@ -496,10 +568,10 @@
         this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
         return
       }
-      var val_data= data.result;
-      for(var i in val_data){
-        if(val_data[i].alias.indexOf('ID') != -1){
-         val_data[i].alias = val_data[i].alias.replace('ID','')
+      var val_data = data.result;
+      for (var i in val_data) {
+        if (val_data[i].alias.indexOf('ID') != -1) {
+          val_data[i].alias = val_data[i].alias.replace('ID', '')
         }
       }
       this.dialogVisible = true;
@@ -519,18 +591,18 @@
         return
       }
       var val = data1.result;
-      for(var i in val){
-       val[i].createuser = val[i].createName;
-       val[i].depid= val[i].depName;
-       val[i].dirid= val[i].dirName;
-       val[i].verid= val[i].verName;
-       val[i].updateuser= val[i].updateName;
-       if(val[i].createtime != null){
-          val[i].createtime= this.changetimeLayer(val[i].createtime )
-       }
-       if(val[i].updatetime != null){
-          val[i].updatetime= this.changetimeLayer(val[i].updatetime )
-       }
+      for (var i in val) {
+        val[i].createuser = val[i].createName;
+        val[i].depid = val[i].depName;
+        val[i].dirid = val[i].dirName;
+        val[i].verid = val[i].verName;
+        val[i].updateuser = val[i].updateName;
+        if (val[i].createtime != null) {
+          val[i].createtime = this.changetimeLayer(val[i].createtime)
+        }
+        if (val[i].updatetime != null) {
+          val[i].updatetime = this.changetimeLayer(val[i].updatetime)
+        }
       }
       this.dbTableData = data1.result;
       this.count1 = data1.count;
@@ -545,9 +617,9 @@
       this.getDataLoaderSelectDbData();
     },
 
-changetimeLayer(res){
-      var time = new Date(res );
-     var y = time.getFullYear();
+    changetimeLayer(res) {
+      var time = new Date(res);
+      var y = time.getFullYear();
       var m = time.getMonth() + 1;
       var d = time.getDate();
       var h = time.getHours();
@@ -566,10 +638,10 @@
         ':' +
         s
       );
-},
+    },
 
     changetimeFile(res) {
-     return this.changetimeLayer(res.createTime)
+      return this.changetimeLayer(res.createTime)
     },
     //鏍煎紡鍖栨椂闂�
     add0(m) {
@@ -594,7 +666,7 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(async () => {
-        const data =await dataLoader_deleteMetas({ ids: std.toString() })
+        const data = await dataLoader_deleteMetas({ ids: std.toString() })
         if (data.code == 200) {
           this.$message({
             message: "鍒犻櫎鎴愬姛锛�",
@@ -723,8 +795,8 @@
             std.push(val1[i].tab)
             val1[i].entity = val2[j].entity;
             val1[i].tabDesc = val2[j].tabDesc;
-              val1[i].tabs=val2[j].tab;
-               val1[i].ns=val2[j].ns;
+            val1[i].tabs = val2[j].tab;
+            val1[i].ns = val2[j].ns;
 
             this.tableWareThree.push(val1[i]);
           }
@@ -832,7 +904,7 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(async () => {
-        const data =await dataUploadDeleteFiles(data);
+        const data = await dataUploadDeleteFiles(data);
         if (data.code == 200) {
           this.$message({
             message: "鍒犻櫎鎴愬姛锛�",
@@ -926,24 +998,24 @@
         processData: false,
         contentType: false,
         success: (rs) => {
-this.fullscreenLoading = false;
-   this.$message({
+          this.fullscreenLoading = false;
+          this.$message({
             message: '鏁版嵁涓婁紶鎴愬姛',
             type: 'success'
           });
           this.getFileLength();
 
-       
-      this.clearFileSelect();
+
+          this.clearFileSelect();
         },
         error: (rs) => {
           this.fullscreenLoading = false;
           this.$message.error('鏁版嵁涓婁紶澶辫触');
-           this.clearFileSelect();
+          this.clearFileSelect();
         }
       });
 
- 
+
     },
     //鑾峰彇鏂囦欢涓婁紶鏁版嵁
     async getFileLength() {
@@ -992,20 +1064,20 @@
       $("#uploadfile").click();
     },
     handleFileChange(event) {
-      var std =[];
+      var std = [];
       var len = event.currentTarget.files.length;
-      for(var i = 0;i<len;i++){
-var f = event.currentTarget.files[i];
-std.push(f.name)
+      for (var i = 0; i < len; i++) {
+        var f = event.currentTarget.files[i];
+        std.push(f.name)
       }
 
-        this.formInline.fileName =std.toString() ;
+      this.formInline.fileName = std.toString();
 
 
     },
-    clearFileSelect(){
-   this.formInline.fileName="鏈�夋嫨鏂囦欢";
-    document.getElementById("uploadfile").value = "";
+    clearFileSelect() {
+      this.formInline.fileName = "鏈�夋嫨鏂囦欢";
+      document.getElementById("uploadfile").value = "";
     },
     //褰撳墠鏃堕棿鑾峰彇
     timeDefault() {
@@ -1031,7 +1103,7 @@
 
     //Loading鏄鹃殣
     handlerLoading(res) {
-     
+
     },
     //鐩綍鍒囨崲
     catalogChange(value) {
@@ -1271,7 +1343,7 @@
       justify-content: center;
     }
   }
-  
+
   /*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
   /deep/ .el-table {
     background-color: transparent;
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index b4921f3..444e5ed 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -2122,8 +2122,8 @@
       for (var i = 0; i < val1.length; i++) {
         const stdTab = this.setSplitWare(val1[i].tab);
         for (var j = 0; j < val2.length; j++) {
-
-          if (val2[j].tab.indexOf(stdTab) > -1) {
+          var tabs = stdTab.toLowerCase();
+          if (val2[j].tab.indexOf(tabs) > -1) {
             std.push(val1[i].tab);
             val1[i].entity = val2[j].entity;
             val1[i].tabDesc = val2[j].tabDesc;
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 7da6dd5..9a74259 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -932,6 +932,7 @@
         <el-table
           :data="gdbData"
           style="width: 100%"
+          max-height="38.54167vw"
         >
           <el-table-column
             type="selection"
@@ -1062,6 +1063,27 @@
       src=""
       style="display: none; border: 0; padding: 0; height: 0; width: 0"
     ></iframe>
+
+    <div
+      class="loadBox"
+      v-if="loadDialogVisible"
+    >
+      <div style="widht:100%; margin:20px; color:white">
+        <div style="margin-left:99%">
+          <!-- <el-link
+            @click="setloadDialogVisible()"
+            style="color:white"
+          > X</el-link> -->
+        </div>
+      </div>
+      <div
+        v-loading="true"
+        element-loading-background="rgba(0, 0, 0, 0.0) "
+        element-loading-text="鏁版嵁鍒犻櫎涓�"
+        style="margin: 0px 20px;widht:100%;height:calc(100% - 80px); "
+      >
+      </div>
+    </div>
   </div>
 </template>
 
@@ -1231,6 +1253,7 @@
       gdbData: [],
       gdbDialog: false,
       gdbGuid: null,
+      loadDialogVisible: false
     };
   },
   created() {
@@ -1709,6 +1732,9 @@
     },
     // 鍒犻櫎澶氭潯
     deleteMetaInfo() {
+      if (this.multipleSelection.length <= 0) {
+        return this.$message("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+      }
       this.$confirm("纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?", "鎻愮ず", {
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
@@ -1719,8 +1745,10 @@
           for (var i in this.multipleSelection) {
             std.push(this.multipleSelection[i].id);
           }
+          this.loadDialogVisible = true;
           deleteMeta({ ids: std.toString() }).then((res) => {
             if (res.code == 200) {
+              this.loadDialogVisible = false;
               this.$message({
                 type: "success",
                 message: "鍒犻櫎鎴愬姛!",
@@ -1728,9 +1756,12 @@
               this.multipleSelection = [];
               // this.listData.pageSize = 10
               this.listData.pageIndex = 1;
+
               this.getMetaData();
             } else {
+              this.loadDialogVisible = false;
               this.$message.error("鍒犻櫎澶辫触");
+
               this.multipleSelection = [];
             }
           });
@@ -2053,5 +2084,17 @@
     height: 740px;
     overflow-y: auto;
   }
+  .loadBox {
+    position: fixed;
+    z-index: 2002;
+    background: rgba(0, 0, 0, 0.2);
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    .el-loading-mask {
+      background: transparent !important;
+    }
+  }
 }
 </style>

--
Gitblit v1.9.3