From d91f0dfcd2ef95fb3624d94ade24fe69a9169a58 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 二月 2024 15:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/P2022036_Web2

---
 src/views/datamanage/dataUpdata.vue | 2741 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1,444 insertions(+), 1,297 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 36ff6c5..9023154 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1,69 +1,40 @@
 <template>
-  <div
-    class="subpage_Box"
-    v-loading="loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-  >
+  <div class="subpage_Box" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)"
+    :element-loading-text="loadText">
     <My-bread :list="[
-        `${$t('dataManage.dataManage')}`,
-        `${$t('dataManage.dataUpdata')}`,
-      ]"></My-bread>
+      `${$t('dataManage.dataManage')}`,
+      `${$t('dataManage.dataUpdata')}`,
+    ]"></My-bread>
     <el-divider />
-    <el-tabs
-      v-model="activeTabName"
-      @tab-click="handleTabClick"
-    >
+    <el-tabs type="card" v-model="activeTabName" @tab-click="handleTabClick">
       <!-- 涓婁紶鏁版嵁 -->
-      <el-tab-pane
-        :label="$t('dataManage.dataUpObj.uploaddata')"
-        name="first"
-      >
-        <div class="subpage_Iquery subpage_Div">
-          <el-form
-            :inline="true"
-            :model="formInline"
-            class="demo-form-inline"
-          >
+      <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first">
+        <div class="inquire subpage_Div" ref="container">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
             <!-- 鍏ュ簱绫诲瀷 -->
-            <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%">
-              <el-select
-                :disabled="tableData.length == 0 ? false : true"
-                v-model="formInline.uploadType"
-                @change="uploadTypeChange"
-                :popper-append-to-body="false"
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in uploadOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
+            <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%" size="small">
+              <el-select :disabled="tableData.length == 0 ? false : true" v-model="formInline.uploadType"
+                @change="uploadTypeChange" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
+                <!--                <el-option
+                                  v-for="item in uploadOption"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value"
+                                ></el-option>-->
+
+                <el-option :label="$t('shuJuGuanLi.pselect.dFile')" value="v1" />
+                <el-option :label="$t('shuJuGuanLi.pselect.dFiles')" value="v2" />
+                <el-option :label="$t('shuJuGuanLi.pselect.dFfilest')" value="v3" />
               </el-select>
+
             </el-form-item>
             <!-- 瀛樺偍鐩綍 -->
-            <el-form-item
-            style="margin-right: 2%"
-              v-show="uploadFlag"
-              :label="$t('dataManage.dataUpObj.storageDirectory')"
-            >
-              <el-select
-                :popper-append-to-body="false"
-                v-model="formInline.dirName"
-                :disabled="tableData.length == 0 ? false : true"
-              >
-                <el-option
-                  :value="formInline.dirid"
-                  :label="formInline.dirName"
-                  style=" height:auto"
-                >
-                  <el-tree
-                    ref="tree"
-                    :data="catalogOption"
-                    node-key="id"
-                    :props="cascader"
-                    @node-click="catalogChange"
-                  />
+            <el-form-item style="margin-right: 2%" v-show="uploadFlag"
+              :label="$t('dataManage.dataUpObj.storageDirectory')" size="small">
+              <el-select ref="multiSelect" :popper-append-to-body="false" v-model="formInline.dirName"
+                :disabled="tableData.length == 0 ? false : true">
+                <el-option :value="formInline.dirid" :label="formInline.dirName" style=" height:auto">
+                  <el-tree ref="tree" :data="catalogOption" node-key="id" :props="cascader" @node-click="catalogChange" />
                 </el-option>
               </el-select>
               <!-- <el-cascader
@@ -76,280 +47,160 @@
               ></el-cascader>  -->
             </el-form-item>
             <!-- 椤圭洰鍚嶇О -->
-            <el-form-item
-            style="margin-right: 2%"
-              v-show="!uploadFlag"
-              :label="$t('dataManage.dataUpObj.entryName')"
-            >
-              <el-select
-                :popper-append-to-body="false"
-                :disabled="tableData.length == 0 ? false : true"
-                v-model="formInline.entryId"
-                @change="entryNameChange"
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in entryOption"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
+            <el-form-item style="margin-right: 2%" v-show="!uploadFlag" :label="$t('dataManage.dataUpObj.entryName')"
+              size="small">
+              <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true"
+                v-model="formInline.entryId" @change="entryNameChange" placeholder="璇烽�夋嫨">
+                <el-option v-for="item in entryOption" :key="item.id" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
             <!-- 鏁版嵁鐗堟湰 -->
-            <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%">
-              <el-select
-                :popper-append-to-body="false"
-                :disabled="tableData.length == 0 ? false : true"
-                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-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%" size="small">
+              <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true"
+                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 :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%">
-              <el-select
-                :popper-append-to-body="false"
-                :disabled="tableData.length == 0 ? false : true"
-                v-model="formInline.specialtyId"
-                :placeholder="$t('common.choose')"
-              >
-                <el-option
-                  v-for="item in specialtyOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
+            <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%" size="small">
+              <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true"
+                v-model="formInline.specialtyId" :placeholder="$t('common.choose')">
+                <!--                <el-option
+                                  v-for="item in specialtyOption"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>-->
+
+                <el-option :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')" value="娴嬮噺涓撲笟" />
+                <el-option :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')" value="鍕樺療涓撲笟" />
+                <el-option :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')" value="鍦扮伨涓撲笟" />
+                <el-option :label="$t('shuJuGuanLi.pselect.CavernSpecialty')" value="娲炲簱涓撲笟" />
+                <el-option :label="$t('shuJuGuanLi.pselect.LineDiscipline')" value='绾胯矾涓撲笟' />
               </el-select>
             </el-form-item>
             <!-- 鍧愭爣绯� -->
-            <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%">
-              <el-select
-                :popper-append-to-body="false"
-                :disabled="tableData.length == 0 ? false : true"
-                v-model="formInline.coordinateId"
-                :placeholder="$t('common.choose')"
-              >
-                <el-option
-                  v-for="item in coordinateOption"
-                  :key="item.epsgcode"
-                  :label="item.coordinate"
-                  :value="item.epsgcode"
-                >
+            <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%" size="small">
+              <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true"
+                v-model="formInline.coordinateId" :placeholder="$t('common.choose')">
+                <el-option v-for="item in coordinateOption" :key="item.epsgcode" :label="item.coordinate"
+                  :value="item.epsgcode">
                 </el-option>
               </el-select>
             </el-form-item>
+            <div class="flex_box">
+              <div style="margin-right: auto">
+                <!-- 绾胯矾绫诲埆 -->
+                <el-form-item size="small" :label="$t('dataManage.dataUpObj.labe11')"
+                  v-show="formInline.uploadType == 'v3'">
+                  <el-select v-model="formInline.tab" placeholder="璇烽�夋嫨">
+                    <el-option v-for="item in lineOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <!-- 绾胯矾绫诲埆 -->
+                <el-form-item :label="$t('dataManage.dataUpObj.labe12')" v-show="formInline.uploadType == 'v3'"
+                  size="small">
+                  <el-select v-model="formInline.medium" size="small" placeholder="璇烽�夋嫨">
+                    <el-option v-for="item in mediumOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <!-- 閫夋嫨鏁版嵁 -->
+                <el-form-item size="small">
+                  <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'"
+                    @click="setSelectFile" :underline="false" type="primary">{{ $t('dataManage.dataUpObj.selectData') }}
+                  </el-link>
+                  <el-link v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'" @click="restSelectFile" :underline="false"
+                    type="primary">{{ $t('common.reset') }}
+                  </el-link>
+                  <input size="small" id="selectDataFile" type="file" name="file" multiple="multiple"
+                    :accept="formInline.selectFileType" @change="handleSelectFileChange" style="display: none"></input>
+                </el-form-item>
+                <el-form-item size="small">
+                  <el-input :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" v-model="formInline.specialtyData"
+                    style="width:200px;" disabled>
+                  </el-input>
+                </el-form-item>
+                <!-- 閫夋嫨鍏冩暟鎹� -->
+                <el-form-item v-show="uploadFlag" v-if="formInline.uploadType == 'v1'" style="padding-left: 16px">
+                  <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'"
+                    @click="setMetaFile" :underline="false" type="primary">{{ $t('dataManage.dataUpObj.selectMetadata') }}
+                  </el-link>
+                  <el-link v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'" @click="restMetaFile" :underline="false"
+                    type="primary">{{ $t('common.reset') }}
+                  </el-link>
+                  <input id="metaDataFile" type="file" name="file" multiple="multiple" accept=".xls,.xlsx"
+                    style="display: none" @change="handleMetaFileChange"></input>
+                </el-form-item>
+                <el-form-item v-show="uploadFlag" v-if="formInline.uploadType == 'v1'" size="small">
+                  <el-input :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" v-model="formInline.metaData"
+                    style="width:200px;" disabled>
+                  </el-input>
+                </el-form-item>
+                <!-- 閫夋嫨WBS鏁版嵁 -->
+                <el-form-item v-show="!uploadFlag">
+                  <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
+                    @click="setWBSFile" :underline="false" type="primary">{{ $t('dataManage.dataUpObj.selectWBSData') }}
+                  </el-link>
+                  <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
+                    @click="restWBSFile" :underline="false" type="primary">{{ $t('common.reset') }}
+                  </el-link>
+                  <input id="wbsDataFile" type="file" name="file" multiple="multiple" accept=".xls,.xlsx"
+                    style="display: none" @change="handleWBSFileChange"></input>
+                </el-form-item>
+                <el-form-item v-show="!uploadFlag">
+                  <el-input placeholder="璇烽�夋嫨WBS鏁版嵁" v-model="formInline.wbsData" style="width:210px;" disabled>
+                  </el-input>
+                </el-form-item>
+              </div>
+              <div>
+                <el-form-item>
+                  <!-- 涓婁紶 -->
+                  <el-button v-if="menuStatus.upload" :disabled="tableData.length == 0 ? false : true"
+                    @click="setFileUpload" size="small" icon="el-icon-upload" type="success">{{
+                      $t('common.upload')
+                    }}
+                  </el-button>
+                  <!-- 鍒犻櫎 -->
+                  <el-button v-if="menuStatus.delete" :disabled="multipleSelection.length == 0 ? true : false"
+                    icon="el-icon-delete" size="small" @click="setFileDelete" type="danger">{{ $t('common.delete') }}
+                  </el-button>
+                  <!-- 鍏ュ簱 -->
+                  <el-button v-if="menuStatus.insert" @click="setFileWare" size="small"
+                    :disabled="tableData.length == 0 ? true : false" icon="el-icon-folder-add" type="warning">{{
+                      $t('common.Warehousin') }}
+                  </el-button>
+                  <!-- 璐ㄦ -->
+                  <el-button style="margin-right:-9px" v-if="menuStatus.insert"
+                    :disabled="multipleSelection.length == 0 ? true : false" type="info" size="small"
+                    icon="el-icon-folder-checked" @click="handleQuayTestClick()">{{ $t('common.quayTest') }}
+                  </el-button>
 
-            <!-- 閫夋嫨鏁版嵁 -->
-            <el-form-item>
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'"
-                @click="setSelectFile"
-                :underline="false"
-                type="primary"
-              >{{$t('dataManage.dataUpObj.selectData') }}</el-link>
-              <el-link
-                v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'"
-                @click="restSelectFile"
-                :underline="false"
-                type="primary"
-              >{{$t('common.reset') }}</el-link>
-              <input
-                id="selectDataFile"
-                type="file"
-                name="file"
-                multiple="multiple"
-                :accept="formInline.selectFileType"
-                @change="handleSelectFileChange"
-                style="display: none"
-              ></input>
-            </el-form-item>
-            <el-form-item>
-              <el-input
-                placeholder="璇疯緭鍏ュ唴瀹�"
-                v-model="formInline.specialtyData"
-                style="width:210px;"
-                disabled
-              >
-              </el-input>
-            </el-form-item>
-            <!-- 閫夋嫨鍏冩暟鎹� -->
-            <el-form-item v-show="uploadFlag">
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'"
-                @click="setMetaFile"
-                :underline="false"
-                type="primary"
-              >{{$t('dataManage.dataUpObj.selectMetadata') }}</el-link>
-              <el-link
-                v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'"
-                @click="restMetaFile"
-                :underline="false"
-                type="primary"
-              >{{$t('common.reset') }}</el-link>
-              <input
-                id="metaDataFile"
-                type="file"
-                name="file"
-                multiple="multiple"
-                accept=".xls,.xlsx"
-                style="display: none"
-                @change="handleMetaFileChange"
-              ></input>
-            </el-form-item>
-            <el-form-item v-show="uploadFlag" style="margin-left: 0.7%;">
-              <el-input
-                placeholder="璇疯緭鍏ュ唴瀹�"
-                v-model="formInline.metaData"
-                style="width:210px;"
-                disabled
-              >
-              </el-input>
-            </el-form-item>
-            <!-- 閫夋嫨WBS鏁版嵁 -->
-            <el-form-item v-show="!uploadFlag">
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
-                @click="setWBSFile"
-                :underline="false"
-                type="primary"
-              >{{$t('dataManage.dataUpObj.selectWBSData') }}</el-link>
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
-                @click="restWBSFile"
-                :underline="false"
-                type="primary"
-              >{{$t('common.reset') }}</el-link>
-              <input
-                id="wbsDataFile"
-                type="file"
-                name="file"
-                multiple="multiple"
-                accept=".xls,.xlsx"
-                style="display: none"
-                @change="handleWBSFileChange"
-              ></input>
-            </el-form-item>
-            <el-form-item v-show="!uploadFlag">
-              <el-input
-                placeholder="璇烽�夋嫨WBS鏁版嵁"
-                v-model="formInline.wbsData"
-                style="width:210px;"
-                disabled
-              >
-              </el-input>
-            </el-form-item>
-            <el-form-item style="float: right;">
-              <!-- 涓婁紶 -->
-              <el-button
-                v-if="menuStatus.upload"
-                :disabled="tableData.length == 0 ? false : true"
-                @click="setFileUpload"
-                size="small"
-                icon="el-icon-upload"
-                type="success"
-              >{{
-              $t('common.upload')
-            }}</el-button>
-              <!-- 鍒犻櫎 -->
-              <el-button
-                v-if="menuStatus.delete"
-                :disabled="multipleSelection.length == 0 ? true : false"
-                icon="el-icon-delete"
-                size="small"
-                @click="setFileDelete"
-                type="danger"
-              >{{ $t('common.delete') }}</el-button>
-              <!-- 鍏ュ簱 -->
-              <el-button
-                v-if="menuStatus.insert"
-                @click="setFileWare"
-                size="small"
-                :disabled="tableData.length == 0 ?  true: false"
-                icon="el-icon-folder-add"
-                type="warning"
-              >{{ $t('common.Warehousin') }}</el-button>
-              <!-- 璐ㄦ -->
-              <el-button
-              style="margin-right:-9px"
-                v-if="menuStatus.insert"
-                :disabled="multipleSelection.length == 0 ? true : false"
-                type="info"
-                size="small"
-                icon="el-icon-folder-checked"
-                @click="handleQuayTestClick()"
-              >{{$t('common.quayTest')}}
-              </el-button>
+                </el-form-item>
+              </div>
+            </div>
 
-            </el-form-item>
           </el-form>
-          </el-form>
+
         </div>
         <!-- 涓婁紶鏁版嵁鍒楄〃 -->
-        <div class="subpage_Content subpage_Div">
-          <el-table
-            style="min-height: 470px;"
-            :data="tableData"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="55"
-            />
+        <div class="dividing-line"></div>
+        <div class="table_box" :style="styleVar">
+          <el-table style="width:100%" border :data="tableData" @selection-change="handleSelectionChange"
+            height="calc(100% - 57px)">
+            <el-table-column type="selection" width="55" />
 
-            <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="sizes"
-              :label="$t('common.size')"
-              :formatter="changeSizeFile"
-            />
-            <el-table-column
-              align="center"
-              prop="status"
-              label="鐘舵��"
-            />
-            <el-table-column
-              align="center"
-              prop="code"
-              label="鐘舵��"
-              v-if="false"
-            />
-            <el-table-column
-              label="鎿嶄綔"
-              width="120"
-            >
+            <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="sizes" :label="$t('common.size')" :formatter="changeSizeFile" />
+            <el-table-column align="center" prop="status" label="鐘舵��" />
+            <el-table-column align="center" prop="code" label="鐘舵��" v-if="false" />
+            <el-table-column label="鎿嶄綔" width="120">
               <template slot-scope="scope">
-                <el-button
-                  v-if="menuStatus.download"
-                  v-show="scope.row.code != null"
-                  @click="handerLogClick(scope.row)"
-                  type="text"
-                  size="mini"
-                  style="font-size: 14px;"
-                > 鏃ュ織
+                <el-button v-if="menuStatus.download" v-show="scope.row.code != null" @click="handerLogClick(scope.row)"
+                  type="primary" size="mini" plain> 鏃ュ織
                 </el-button>
               </template>
             </el-table-column>
@@ -357,264 +208,140 @@
         </div>
       </el-tab-pane>
       <!-- 鍏ュ簱鏁版嵁娓呭崟 -->
-      <el-tab-pane
-        :label="$t('dataManage.dataUpObj.receiptdata')"
-        name="second"
-      >
-        <div class="subpage_Iquery subpage_Div">
-          <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="璇疯緭鍏ュ唴瀹�"
-                style="width: 200px;"
-              ></el-input>
-            </el-form-item>
-            <el-form-item style="float: right;">
-              <el-button
-                v-if="menuStatus.delete"
-                @click="setWarehouseDel"
-                icon="el-icon-folder-delete"
-                type="danger"
-                size="small"
-              >{{ $t('common.delete') }}</el-button>
-              <el-button
-                @click="setWarehouseSearch"
-                icon="el-icon-upload"
-                size="small"
-                class="primary"
-              >{{
-              $t('common.iquery')
-            }}</el-button>
-              <el-button
-                @click="setWarehouseReset"
-                icon="el-icon-folder-add"
-                size="small"
-                type="info"
-              >{{ $t('common.reset') }}</el-button>
-            </el-form-item>
-            <el-form-item style="float: right;">
-              <el-button
-                v-if="menuStatus.upload"
-                :disabled="multipleDelete.length == 0 ? true : false"
-                @click="setEnclosure"
-                icon="el-icon-folder-opened"
-                type="success"
-                size="small"
-              >{{ $t('common.enclosure') }}</el-button>
-            </el-form-item>
+      <el-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second">
+        <div class="inquire subpage_Div" ref="container1">
+          <el-form :inline="true" :model="formWarehousing" class="demo-form-inline">
+            <div class="flex_box">
+              <div style="margin-right: auto">
+                <el-form-item size="small" :label="$t('dataManage.dataUpObj.describe')">
+                  <el-input v-model="formWarehousing.name" :placeholder="$t('shuJuGuanLi.lable1')"
+                    style="width: 200px;"><i slot="suffix" class="el-icon-search" @click="setWarehouseSearch"
+                      style="padding-right: 8px"></i></el-input>
+                </el-form-item>
+              </div>
+              <div>
+                <el-form-item>
+                  <el-button v-if="menuStatus.upload" :disabled="multipleDelete.length == 0 ? true : false"
+                    @click="setEnclosure" icon="el-icon-folder-opened" type="success" size="small">{{
+                      $t('common.enclosure') }}
+                  </el-button>
+                  <el-button v-if="menuStatus.delete" @click="setWarehouseDel" icon="el-icon-folder-delete" type="danger"
+                    size="small">{{ $t('common.delete') }}
+                  </el-button>
+                  <!--                  <el-button
+                      @click="setWarehouseSearch"
+                      icon="el-icon-upload"
+                      size="small"
+                      class="primary"
+                  >{{
+                      $t('common.iquery')
+                    }}
+                  </el-button>-->
+                  <el-button @click="setWarehouseReset" icon="el-icon-folder-add" size="small" type="info">{{
+                    $t('common.reset') }}
+                  </el-button>
+                </el-form-item>
+              </div>
+            </div>
+
           </el-form>
         </div>
         <!-- 鍏ュ簱 -->
-        <div class="bottom">
-      <div class="rightTable subpage_Div">
-        <div class="table_box">
-          <el-table
-            ref="filterTable"
-            :data="waretableData"
-            style="width: 100%"
-            height="99%">
-            <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>
-              <el-table-column
-                align="center"
-                prop="name"
-                :label="$t('common.name')"
-                width="100"
-              />
-              <el-table-column
-                align="center"
-                prop="dirName"
-                :label="$t('dataManage.dataUpObj.catalogue')"
-                width="300"
-              />
-              <el-table-column
-                align="center"
-                prop="depName"
-                :label="$t('dataManage.dataUpObj.company')"
-                width="200"
-              />
-              <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
-                    class="scopeRowColor"
-                    @click="detail(scope.row)"
-                  >{{ scope.row.tab }}</a>
-                </template>
-              </el-table-column>
-              <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"
-                width="100"
-              />
-      </el-table>
+        <div class="dividing-line"></div>
+        <div class="table_box" :style="styleVar1">
+          <el-table ref="filterTable" :data="waretableData" style="width: 100%" border height="calc(100% - 57px)"
+            @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>
+            <el-table-column align="center" :label="$t('common.name')" width="120">
+              <template slot-scope="scope">
+                <span v-if="scope.row.ismeta > 0">
+                  <el-link style="color:#409eff" title="婧愭暟鎹煡璇�" @click="setQueryMetaData(scope.row)" target="_blank">{{
+                    scope.row.name }}</el-link>
+
+                </span>
+                <span v-else-if="scope.row.metaid > 0">
+                  <el-link style="color:#409eff" title="鍏冩暟鎹煡璇�" @click="setMetaDataQuery(scope.row)" target="_blank">{{
+                    scope.row.name }}</el-link>
+
+                </span>
+                <span v-else>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" />
+            <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" />
+            <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 class="scopeRowColor" @click="detail(scope.row)">{{ scope.row.tab }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="rows" :label="$t('common.lineNuber')" />
+            <el-table-column align="center" :label="$t('common.dataStatus')" :formatter="stateFormat">
+
+            </el-table-column>
+            <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" width="100" />
+          </el-table>
+          <div class="pagination_box" style="margin-top: 15px">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+              :current-page="listData.pageIndex" :page-sizes="[10, 50, 100, 200, 500]" :page-size="listData.pageSize"
+              layout="total, sizes, prev, pager, next, jumper" :total="count">
+            </el-pagination>
+          </div>
         </div>
-        <div
-          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>
-    </div>
+
       </el-tab-pane>
     </el-tabs>
     <!-- 璐ㄦ寮圭獥 -->
-    <el-dialog
-      title="鏁版嵁璐ㄦ"
-      :visible.sync="quayTestVisible"
-      width="70%"
-      top="10vh"
-      :modal="false"
-      :before-close="handleQuayTestCloseDown"
-    >
+    <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="quayTestVisible" width="70%" :modal="false"
+      :before-close="handleQuayTestCloseDown">
       <div class="dialogDiv">
-        <el-form
-          :inline="true"
-          :model="quayTestForms "
-          class="demo-form-inline"
-        >
+        <el-form :inline="true" :model="quayTestForms" class="demo-form-inline">
           <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
-            <el-input
-              disabled
-              v-model="quayTestForms.sjzy"
-            ></el-input>
+            <el-input disabled v-model="quayTestForms.sjzy"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.dataUpObj.storageDirectory')">
-            <el-input
-              disabled
-              style="width:400px"
-              v-model="quayTestForms.names"
-            ></el-input>
+            <el-input disabled style="width:400px" v-model="quayTestForms.names"></el-input>
           </el-form-item>
         </el-form>
         <el-divider />
         <div class="dialogContent">
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkAttrs"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkAttrs">
+            <el-checkbox checked disabled>灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkMath"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >鏁板鍩虹妫�鏌ワ細(.shp,.dlg)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkMath">
+            <el-checkbox checked disabled>鏁板鍩虹妫�鏌ワ細(.shp,.dlg)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkDecorate"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkDecorate">
+            <el-checkbox checked disabled>鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkXls"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkXls">
+            <el-checkbox checked disabled>琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkOrigin"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkOrigin">
+            <el-checkbox checked disabled>鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkMeta"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)</el-checkbox>
+          <div class="ContBox" v-show="quayTestShow.checkMeta">
+            <el-checkbox checked disabled>鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)
+            </el-checkbox>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkTopology"
-          >
-            <el-form
-              ref="quayForms"
-              :model="quayTestForms"
-              class="demo-form-inline"
-            >
+          <div class="ContBox" v-show="quayTestShow.checkTopology">
+            <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline">
               <el-form-item>
-                <el-checkbox
-                  checked
-                  disabled
-                >鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)</el-checkbox>
+                <el-checkbox checked disabled>鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -658,20 +385,11 @@
               </el-form-item>
             </el-form>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkDom"
-          >
-            <el-form
-              ref="quayForms"
-              :model="quayTestForms"
-              class="demo-form-inline"
-            >
+          <div class="ContBox" v-show="quayTestShow.checkDom">
+            <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline">
               <el-form-item>
-                <el-checkbox
-                  checked
-                  disabled
-                >鏍呮牸妫�鏌ワ細(.tif/.img)</el-checkbox>
+                <el-checkbox checked disabled>鏍呮牸妫�鏌ワ細(.tif/.img)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -691,20 +409,11 @@
               </el-form-item>
             </el-form>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkDem"
-          >
-            <el-form
-              ref="quayForms"
-              :model="quayTestForms"
-              class="demo-form-inline"
-            >
+          <div class="ContBox" v-show="quayTestShow.checkDem">
+            <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline">
               <el-form-item>
-                <el-checkbox
-                  checked
-                  disabled
-                >楂樼▼妫�鏌ワ細(.tif/.img)</el-checkbox>
+                <el-checkbox checked disabled>楂樼▼妫�鏌ワ細(.tif/.img)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -724,20 +433,11 @@
               </el-form-item>
             </el-form>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkLaz"
-          >
-            <el-form
-              ref="quayForms"
-              :model="quayTestForms"
-              class="demo-form-inline"
-            >
+          <div class="ContBox" v-show="quayTestShow.checkLaz">
+            <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline">
               <el-form-item>
-                <el-checkbox
-                  checked
-                  disabled
-                >鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)</el-checkbox>
+                <el-checkbox checked disabled>鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -749,20 +449,11 @@
               </el-form-item>
             </el-form>
           </div>
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkOsgb"
-          >
-            <el-form
-              ref="quayForms"
-              :model="quayTestForms"
-              class="demo-form-inline"
-            >
+          <div class="ContBox" v-show="quayTestShow.checkOsgb">
+            <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline">
               <el-form-item>
-                <el-checkbox
-                  checked
-                  disabled
-                >OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) </el-checkbox>
+                <el-checkbox checked disabled>OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -776,109 +467,48 @@
           </div>
         </div>
       </div>
-      <span
-        slot="footer"
-        class="dialog-footer"
-      >
-        <el-button
-          class="elBotton"
-          size="small"
-          @click="quayTestVisible = false"
-        >鍙� 娑�</el-button>
-        <el-button
-          class="elBotton"
-          size="small"
-          @click="commonQuayTest"
-        >纭� 瀹�</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="elBotton" size="small" @click="quayTestVisible = false">鍙� 娑�</el-button>
+        <el-button class="elBotton" size="small" @click="commonQuayTest">纭� 瀹�</el-button>
       </span>
     </el-dialog>
     <!-- 鏁翠綋鏂囦欢璐ㄦ寮圭獥 -->
-    <el-dialog
-      title="鏁版嵁璐ㄦ"
-      :visible.sync="testQuayVisible"
-      width="50%"
-      top="15vh"
-      :modal="false"
-      :before-close="handleTestQuayCloseDown"
-      label-width="80px"
-    >
-      <el-form :model="formCheckAll">
+    <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="testQuayVisible" :modal="false" :before-close="handleTestQuayCloseDown">
+      <el-form :model="formCheckAll" label-position="top">
         <el-form-item label="椤圭洰鍚嶇О">
-          <el-col :span="20">
-            <el-input
-              disabled
-              v-model="formCheckAll.xmmc"
-            ></el-input>
-          </el-col>
+
+          <el-input disabled v-model="formCheckAll.xmmc" style="width:85%"></el-input>
+
         </el-form-item>
         <el-form-item label="鎵�灞炰笓涓�">
 
-          <el-col :span="20">
-            <el-input
-              disabled
-              v-model="formCheckAll.sjzy"
-              width="100px"
-            ></el-input>
-          </el-col>
+          <el-input disabled v-model="formCheckAll.sjzy" style="width:85%"></el-input>
+
         </el-form-item>
-        <el-form-item
-          v-show="formCheckAll.isDiZai"
-          label="鎵�灞炰笓涓�"
-        >
-          <el-col :span="20">
-            <el-select
-              v-model="formCheckAll.diZaiType"
-              placeholder="璇烽�夋嫨"
-              style="width:100%"
-            >
-              <el-option
-                v-for="item in disOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
+        <el-form-item v-show="formCheckAll.isDiZai" label="鍦扮伨绫诲瀷">
+
+          <el-select v-model="formCheckAll.diZaiType" placeholder="璇烽�夋嫨" style="width:85%">
+            <el-option v-for="item in disOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
 
         </el-form-item>
       </el-form>
-      <span
-        slot="footer"
-        class="dialog-footer"
-      >
-        <el-button
-          class="elBotton"
-          size="small"
-          @click="testQuayVisible = false"
-        >鍙� 娑�</el-button>
-        <el-button
-          class="elBotton"
-          size="small"
-          @click="commonTestQuay"
-        >纭� 瀹�</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="elBotton" size="small" @click="testQuayVisible = false">鍙� 娑�</el-button>
+        <el-button class="elBotton" size="small" @click.stop="commonTestQuay()">纭� 瀹�</el-button>
       </span>
     </el-dialog>
     <!-- ifream涓嬭浇鏂囦欢鍦板潃 -->
-    <iframe
-      id="downFrame"
-      src=""
-      style="display: none; border: 0; padding: 0; height: 0; width: 0"
-    ></iframe>
+    <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe>
     <!-- 鏁版嵁鍖归厤 -->
-    <el-dialog
-      :title="$t('dataManage.datawarehousing')"
-      :visible.sync="dialogWarehousing"
-      width="70%"
-    >
+    <el-dialog :title="$t('dataManage.datawarehousing')" :visible.sync="dialogWarehousing" width="70%">
       <div class="dialogBox">
-        <div class="transFarBox subpage_Div">
+        <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;">
           <ul>
-            <li
-              @click="singleElection(item)"
-              v-for="(item, i) in tableWareOne"
-              :class="{ active: activeName == item.eventid }"
-            >{{item.tab}} ({{item.type}})</li>
+            <li @click="singleElection(item)" v-for="(item, i) in tableWareOne"
+              :class="{ active: activeName == item.eventid }">{{ item.tab }} ({{ item.type }})
+            </li>
           </ul>
         </div>
         <div class="tarnsbtton">
@@ -889,209 +519,255 @@
           </div>
 
         </div>
-        <div class="transFarBox subpage_Div">
+        <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;">
           <ul>
-            <li
-              @click="singleElection2(item)"
-              v-for="(item, i) in tableWareTwo"
-              :class="{ active: activeName2 == item.entity }"
-            >{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li>
+            <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>
+            <br />
             <div style="padding:2%">
-              <el-link><i
-                  @click="setWareTableChangeRight"
-                  class="el-icon-d-arrow-right"
-                ></i></el-link>
+              <el-link><i @click="setWareTableChangeRight" class="el-icon-d-arrow-right"></i></el-link>
             </div>
           </div>
         </div>
-        <div class="transFarBox subpage_Div">
+        <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;">
           <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>
+            <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
-          size="small"
-          @click="autoMatchWare"
-          type="primary"
-        >鑷姩鍖归厤</el-button>
-        <el-button
-          size="small"
-          type="info"
-          @click="setInsrtWareTableClose "
-        >鍙� 娑�</el-button>
-        <el-button
-          size="small"
-          type="primary"
-          @click="setInsrtWareTable"
-        >纭� 瀹�</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="autoMatchWare" type="primary">鑷姩鍖归厤</el-button>
+        <el-button size="small" type="info" @click="setInsrtWareTableClose">鍙� 娑�</el-button>
+        <el-button size="small" type="primary" @click="setInsrtWareTable">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      :title="$t('common.details')"
-      :visible.sync="dialogVisible"
-      width="70%"
-      top="10vh"
-    >
-      <div style="height:550px">
-        <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-dialog :title="$t('common.details')" :visible.sync="dialogVisible" width="70%">
+      <div style="height: 500px; overflow: auto">
+        <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"
-          >
+        <div style="margin-top: 15px" class="pagination_box">
+          <el-pagination @size-change="handleLoaderSizeChange" @current-change="handleLoaderCurrentChange"
+            :current-page="listLoader.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listLoader.pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="count1">
           </el-pagination>
         </div>
       </div>
 
     </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="涓婁紶杩涘害"
-      :visible.sync="jindudialogVisible"
-      width="30%"
-    >
+    <el-dialog :close-on-click-modal="false" :title="sc.label1" :visible.sync="jindudialogVisible" width="30%">
       <div>
         <div>
-          鏂囦欢浼犺緭杩涘害锛�
+          {{ sc.label2 }}
         </div>
         <div>
-          <el-progress
-            :percentage="jindutiao"
-            :format="format"
-          ></el-progress>
+          <el-progress :percentage="jindutiao" :format="format"></el-progress>
         </div>
       </div>
 
     </el-dialog>
-    <el-dialog
-      :title="$t('common.details')"
-      :visible.sync="enclosureVisible"
-      :show-close="false"
-    >
-      <span
-        style="font-size:20px"
-        class="scopeRowColor"
-      >{{enclosureTitle}}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
-      <span
-        slot="footer"
-        class="dialog-footer"
-      >
+    <el-dialog :title="$t('common.details')" :visible.sync="enclosureVisible" :show-close="false">
+      <span style="font-size:20px" class="scopeRowColor">{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
+      <span slot="footer" class="dialog-footer">
         <el-button @click="enclosureVisible = false">鍙� 娑�</el-button>
-        <el-button
-          type="primary"
-          @click="uploadAnFiles"
-        >缁х画</el-button>
+        <el-button type="primary" @click="uploadAnFiles">缁х画</el-button>
       </span>
     </el-dialog>
-    <input
-      name="file1"
-      :accept="'.zip'"
-      type="file"
-      id="editimageFile"
-      multiple="multiple"
-      style="display: none"
-      @change="uploadAnFilesChange"
-    />
+    <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag" width="70%">
+      <div style="height: 500px; overflow: auto;width:100%; ">
+        <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
+          <el-form-item>
+            <el-input size="small" v-model="fromQueryMeta.name" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+              suffix-icon="el-icon-edit"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" size="small" @click="setSearchMetaData()">鏌ヨ</el-button>
+            <el-button type="info" size="small" @click="setRestMetaData()">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table ref="filterTable" :data="metaDataTable" style="width: 100%" height="calc(100% - 130px)">
+
+          <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column>
+          <el-table-column align="center" prop="name" :label="$t('common.name')" width="120">
+
+          </el-table-column>
+          <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" />
+          <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" />
+          <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 class="scopeRowColor" @click="detail(scope.row)">{{ scope.row.tab }}</a>
+            </template>
+          </el-table-column>
+          <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>
+        <div style="margin-top: 15px" class="pagination_box">
+          <el-pagination @size-change="handleMetaSizeChange" @current-change="handMetaCurrentChange"
+            :current-page="listMetaData.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listMetaData.pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="listMetaData.count">
+          </el-pagination>
+        </div>
+      </div>
+
+    </el-dialog>
+    <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag1" width="70%">
+      <div style="height: 65vh; width: 100%">
+
+        <el-table ref="filterTable" :data="metaDataTable1" style="width: 100%" height="100%">
+          <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column>
+          <el-table-column align="center" prop="name" :label="$t('common.name')" width="120">
+          </el-table-column>
+          <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" />
+          <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" />
+          <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 class="scopeRowColor" @click="detail(scope.row)">{{
+                scope.row.tab
+              }}</a>
+            </template>
+          </el-table-column>
+          <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>
+
+      </div>
+    </el-dialog>
+    <el-dialog :title="fromQueryMeta.title" :visible.sync="warehouseDialog" width="70%" :close-on-click-modal="false"
+      :before-close="handleWarehouseClose">
+      <div style="height:65vh">
+        <el-table ref="wareTable" :data="wareData" style="width: 100%" height="calc(100% - 1px)">
+          <el-table-column align="center" prop="name" :label="$t('common.name')" />
+          <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" />
+          <el-table-column align="center" prop="type" :label="$t('common.type')" />
+          <el-table-column align="center" prop="msg" :label="$t('common.warehousResults')" />
+        </el-table>
+      </div>
+    </el-dialog>
+    <input name="file1" :accept="'.zip'" type="file" id="editimageFile" multiple="multiple" style="display: none"
+      @change="uploadAnFilesChange" />
+    <el-dialog :visible.sync="noteVisible">
+      <div class="nodeBox">
+        <div style="text-align: center;">
+          <h1>
+            鏁版嵁涓婁紶娉ㄦ剰浜嬮」
+          </h1>
+        </div>
+        <h3>
+          1銆侀」鐩暣浣撲笂浼�
+        </h3>
+
+        <h5>&nbsp; &nbsp; &nbsp;
+          &nbsp;鎸夌収椤圭洰鏍囧噯缁撴瀯缁勭粐鏁版嵁骞舵墦zip鍖咃紝鎸夎姹傜紪杈戝ソWBS鏂囦欢銆傞�夋嫨闇�瑕佷笂浼犲搴旂殑椤圭洰鍚嶇О锛岄�夋嫨zip鏁版嵁鍖呭拰WBS鏂囦欢锛屽畬鎴愭暣浣撻」鐩暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢鏍煎紡瀛樺偍鍦ㄩ鍏堢粍缁囩殑鐩綍缁撴瀯涓嬨��
+        </h5>
+        <h3>
+          2銆佸崟鏂囦欢涓婁紶
+        </h3>
+        <h5>&nbsp; &nbsp; &nbsp; &nbsp;涓婁紶鍗曚釜鏂囦欢锛岄�夋嫨闇�瑕佷笂浼犵殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙.xls銆�.xlsx銆乸df銆乴as绛夋牸寮忥級銆佸厓鏁版嵁绛夛紝瀹屾垚鍗曚釜鏂囦欢鏁版嵁涓婁紶锛�</h5>
+        <h5>&nbsp; &nbsp; &nbsp;
+          &nbsp;鎵归噺涓婁紶涓�涓渶灏忕洰褰曟枃浠跺す涓嬬殑鍚勭被鏁版嵁锛岄�夋嫨闇�瑕佷笂浼犳暟鎹殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙zip鏍煎紡锛夈�佸厓鏁版嵁绛夛紝瀹屾垚涓�涓枃浠跺す涓嬪悇绫绘暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢瀛樺偍鏁版嵁銆�
+        </h5>
+        <h5>&nbsp; &nbsp; &nbsp; &nbsp;鍗曟枃浠朵笂浼犱笉鏀寔澶氱骇鐩綍鏂囦欢澶逛互zip鍘嬬缉鍖呮柟寮忎笂浼犮��</h5>
+        <h3>
+          3銆佺壒瀹氭牸寮忓崟鏂囦欢涓婁紶瑕佹眰
+        </h3>
+        <h5>鈭�&nbsp; &nbsp;<span>DOM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>DEM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>OSGB鍊炬枩妯″瀷鏁版嵁涓婁紶锛�</span>闇�鍖呭惈Data鏂囦欢澶广�乵etadata.xml鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>Las銆丩az鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>CPT鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>MPT鍦烘櫙鏁版嵁涓婁紶锛�</span>闇�鍖呭惈.mIdx銆�.Strmi銆�.mpt鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>GDB鏍煎紡鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈gdb鍚勭被瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+        <h5>鈭�&nbsp; &nbsp;<span>SHP鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈.shp銆�.shx銆�.dbf銆乸rj瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import $ from 'jquery';
-import MyBread from '../../components/MyBread.vue';
-import { getToken } from '@/utils/auth';
+import $ from "jquery";
+import MyBread from "../../components/MyBread.vue";
+import { getToken } from "@/utils/auth";
 import {
-  dataUploadSelectPath,
-  selectdirTab,
-  dataUploadSelectVerByDirid,
-  dataUpload_selectByPageForUpload,
   dataUpload_deleteMetas,
-  dataUpload_selectCoords,
-  dataUpload_selectProject,
-  dataUploadSelectFiles,
-  dataUploadDeleteFiles,
-  dataUpload_uploadChecks,
-  dataUpload_selectTaskStatus,
-  dataUpload_selectMappers,
-  dataUpload_selectTabs,
   dataUpload_insertFiles,
-  dataUpload_selectFields,
+  dataUpload_selectByPageForUpload,
+  dataUpload_selectCoords,
   dataUpload_selectDbData,
-} from '../../api/api';
+  dataUpload_selectFields,
+  dataUpload_selectMappers,
+  dataUpload_selectPageAndCountByPid,
+  dataUpload_selectProject,
+  dataUpload_selectTabs,
+  dataUpload_selectTaskStatus,
+  dataUpload_uploadChecks,
+  dataUploadDeleteFiles,
+  dataUploadSelectFiles,
+  dataUploadSelectPath,
+  dataUploadSelectVerByDirid,
+  dataUpload_selectMetaById,
+  selectdirTab,
+  dataUpload_insertKml
+} from "../../api/api";
+
 export default {
-  name: 'dataUpdata',
+  name: "dataUpdata",
   components: {
     MyBread,
   },
   data() {
     return {
-
       coordinateOption: [],
-      disOptions: [{
-        name: '宕╁娌荤悊',
-        value: '宕╁娌荤悊',
-      }, {
-        name: '涓嶇ǔ瀹氭枩鍧℃不鐞�',
-        value: '涓嶇ǔ瀹氭枩鍧℃不鐞�',
-      }, {
-        name: '鍦伴潰濉岄櫡娌荤悊',
-        value: '鍦伴潰濉岄櫡娌荤悊',
-      }, {
-        name: '楂橀櫋杈瑰潯娌荤悊',
-        value: '楂橀櫋杈瑰潯娌荤悊',
-      }, {
-        name: '娉ョ煶娴佹不鐞�',
-        value: '娉ョ煶娴佹不鐞�',
-      }, {
-        name: '姘存瘉娌荤悊',
-        value: '姘存瘉娌荤悊',
-      }, {
-        name: '婊戝潯娌荤悊',
-        value: '婊戝潯娌荤悊',
-      }],
+      disOptions: [
+        {
+          name: "宕╁娌荤悊",
+          value: "宕╁娌荤悊",
+        },
+        {
+          name: "涓嶇ǔ瀹氭枩鍧℃不鐞�",
+          value: "涓嶇ǔ瀹氭枩鍧℃不鐞�",
+        },
+        {
+          name: "鍦伴潰濉岄櫡娌荤悊",
+          value: "鍦伴潰濉岄櫡娌荤悊",
+        },
+        {
+          name: "楂橀櫋杈瑰潯娌荤悊",
+          value: "楂橀櫋杈瑰潯娌荤悊",
+        },
+        {
+          name: "娉ョ煶娴佹不鐞�",
+          value: "娉ョ煶娴佹不鐞�",
+        },
+        {
+          name: "姘存瘉娌荤悊",
+          value: "姘存瘉娌荤悊",
+        },
+        {
+          name: "婊戝潯娌荤悊",
+          value: "婊戝潯娌荤悊",
+        },
+      ],
       testQuayVisible: false,
       formCheckAll: {
         names: null,
@@ -1104,17 +780,16 @@
         xmmc: null,
         names: null,
         sjzy: null,
-        tolerance: '0.001',
-        gcdOffset: '20',
-        rangeOffset: '200',
-        kzdOffset: '100',
-        xgMax: '0.005',
-        coordinateSystem: 'CGCS2000/degree',
-        imgResolution: '0.2',
-        demTolerance: '5',
-        demChangeRate: '200',
-        lazDensity: '1',
-        imgResolution: '0.2',
+        tolerance: "0.001",
+        gcdOffset: "20",
+        rangeOffset: "200",
+        kzdOffset: "100",
+        xgMax: "0.005",
+        coordinateSystem: "CGCS2000/degree",
+        imgResolution: "0.2",
+        demTolerance: "5",
+        demChangeRate: "200",
+        lazDensity: "1",
       },
       quayTestShow: {
         checkOsgb: false,
@@ -1139,7 +814,7 @@
         name: null,
       },
       count: 0,
-      formWarehousing: { name: '' },
+      formWarehousing: { name: "" },
       multipleSelection: [],
       tableData: [],
       entryOption: [],
@@ -1147,45 +822,116 @@
       verOption: [],
       catalogOption: [],
       activeTabName: "first",
-      uploadOption: [{
-        value: 'v1',
-        label: '鍗曟枃浠朵笂浼�'
-      }, {
-        value: 'v2',
-        label: '椤圭洰鏁翠綋涓婁紶'
-      }],
+      uploadOption: [
+        {
+          value: "v1",
+          label: "鍗曟枃浠朵笂浼�",
+        },
+        {
+          value: "v2",
+          label: "椤圭洰鏁翠綋涓婁紶",
+        },
+      ],
       formInline: {
-        uploadType: 'v1',
+        uploadType: "v1",
         dirid: null,
-        verid: null,
-        specialtyId: '娴嬮噺涓撲笟',
-        specialtyData: '璇烽�夋嫨鏁版嵁',
-        metaData: '璇烽�夋嫨鍏冩暟鎹�',
-        wbsData: '璇烽�夋嫨WBS鏁版嵁',
+        specialtyId: "娴嬮噺涓撲笟",
+        specialtyData: "璇烽�夋嫨鏁版嵁",
+        metaData: "璇烽�夋嫨鍏冩暟鎹�",
+        wbsData: "璇烽�夋嫨WBS鏁版嵁",
         entryId: null,
-        selectFileType: '*.*',
+        selectFileType: "*.*",
         coordinateId: null,
         path: null,
+        verid: null,
+        tab: "",
+        medium: "",
       },
       cascader: {
-        label: 'name',
-        value: 'id',
-        children: 'children',
+        label: "name",
+        value: "id",
+        children: "children",
         emitPath: false,
       },
-      specialtyOption: [{
-        value: '娴嬮噺涓撲笟',
-        label: '娴嬮噺涓撲笟'
-      }, {
-        value: '鍕樺療涓撲笟',
-        label: '鍕樺療涓撲笟'
-      }, {
-        value: '鍦扮伨涓撲笟',
-        label: '鍦扮伨涓撲笟'
-      }, {
-        value: '娲炲簱涓撲笟',
-        label: '娲炲簱涓撲笟'
-      }],
+      specialtyOption: [
+        {
+          value: "娴嬮噺涓撲笟",
+          label: "娴嬮噺涓撲笟",
+        },
+        {
+          value: "鍕樺療涓撲笟",
+          label: "鍕樺療涓撲笟",
+        },
+        {
+          value: "鍦扮伨涓撲笟",
+          label: "鍦扮伨涓撲笟",
+        },
+        {
+          value: "娲炲簱涓撲笟",
+          label: "娲炲簱涓撲笟",
+        },
+      ],
+      lineOptions: [
+        {
+          value: 'plpipelinef',
+          label: "鍙爺涓嚎",
+        },
+        {
+          value: 'plpipelineb',
+          label: "璁捐涓嚎",
+        },
+        {
+          value: 'plpipelined',
+          label: "鏂藉伐鍥句腑绾�",
+        },
+        {
+          value: 'plpipelinea',
+          label: "绔e伐鍥句腑绾�",
+        },
+      ],
+      mediumOptions: [
+        {
+          value: 'GS',
+          label: "澶╃劧姘�",
+        },
+        {
+          value: 'CO',
+          label: "鍘熸补",
+        },
+        {
+          value: 'RP',
+          label: "鎴愬搧娌�",
+        },
+        {
+          value: 'LN',
+          label: "娑插寲澶╃劧姘�",
+        },
+        {
+          value: 'SL',
+          label: "娑插寲鐭虫补姘�",
+        }, {
+          value: 'WA',
+          label: "鐭挎祮",
+        }, {
+          value: 'ST',
+          label: "钂告苯",
+        }, {
+          value: 'CD',
+          label: "浜屾哀鍖栫⒊",
+        }, {
+          value: 'HY',
+          label: "姘㈡皵",
+        }, {
+          value: 'QT',
+          label: "鍏朵粬",
+        }, {
+          value: '-1',
+          label: "鏈煡",
+        }, {
+          value: '0',
+          label: "鏈皟鏌�",
+        },
+      ],
       fileType: [],
       pathBak: null,
       progress: 0,
@@ -1197,17 +943,18 @@
       tableWareThree: [],
       wareSelectOne: null,
       wareSelectTwo: null,
-      activeName: '',
-      activeName2: '',
-      activeName3: '',
+      activeName: "",
+      activeName2: "",
+      activeName3: "",
       wareTableFlag: null,
       insertWareList: null,
       loading: false,
+      loadText: '',
       dbTableData: [],
       dialogVisible: false,
       listLoader: {
-        id: null,
-        pageSize: 1,
+        dirid: null,
+        pageIndex: 1,
         pageSize: 10,
       },
       count1: 0,
@@ -1218,20 +965,50 @@
         update: false,
         upload: false,
         download: false,
-
       },
       jindutiao: 0,
       jindudialogVisible: false,
       jindutiaoname: [],
       enclosureData: [],
       enclosureVisible: false,
-      enclosureTitle: '',
-    }
+      enclosureTitle: "",
+      tableHeight: 0,
+      timer: 0,
+      styleVar: {
+        height: "calc(100% - 109px)",
+      },
+      styleVar1: {
+        height: "calc(100% - 109px)",
+      },
+      metaFileData: [],
+      listMetaData: {
+        metaid: 0,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+      },
+      queryMetaFlag: false,
+      fromQueryMeta: {
+        title: "",
+        name: "",
+      },
+      metaDataTable: [],
+      queryMetaFlag1: false,
+      metaDataTable1: [],
+      getCheckedKeys: null,
+      sc: {
+        label1: '涓婁紶',
+        label2: '鏂囦欢涓婁紶杩涘害锛�'
+      },
+      warehouseDialog: false,
+      wareData: [],
+      noteVisible: false,
+    };
   },
 
   mounted() {
-    //鑾峰彇鐩綍
-    this.getSelectdirTab();
+    this.noteVisible = true;
     //鑾峰彇鍧愭爣绯�
     this.setCoordinateSystem();
     //鑾峰彇椤圭洰鍚嶇О
@@ -1240,92 +1017,200 @@
     this.getFilePath();
     //鏉冮檺鑾峰彇
     this.getPerms();
+    window.addEventListener("resize", this.onResize);
+    this.calHeight();
+    //鑾峰彇鐩綍
+    this.getSelectdirTab();
   },
-  watch: {
-
+  beforeDestroy() {
+    this.timer && clearTimeout(this.timer);
+    window.removeEventListener("resize", this.onResize);
   },
+  watch: {},
   methods: {
+    stateFormat(row, column) {
+      var val = ['shp', 'gdb', 'xls', 'xlsx']
+      if (val.indexOf(row.type) > -1 && row.rows > 0) {
+        return '宸蹭笂浼�,宸插叆搴�'
+      } else if (val.indexOf(row.type) > -1 && row.rows == 0) {
+        return '宸蹭笂浼�,鏈叆搴�'
+      } else {
+        return '宸蹭笂浼�'
+      }
+    },
+    setRestMetaData() {
+      this.fromQueryMeta.name = "";
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
+      this.startQueryMetaData();
+    },
+    setSearchMetaData() {
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
+      this.startQueryMetaData();
+    },
+    //鍏冩暟鎹〉闈㈠垏鎹�
+    handleMetaSizeChange(val) {
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = val;
+      this.startQueryMetaData();
+    },
+    //鍏冩暟鎹〉闈㈠垏鎹�
+    handMetaCurrentChange(val) {
+      this.listMetaData.pageIndex = val;
+      this.startQueryMetaData();
+    },
+
+    //鍏冩暟鎹煡璇�
+    async setMetaDataQuery(row) {
+      this.fromQueryMeta.title = row.name;
+      this.listMetaData = {
+        id: row.metaid,
+      };
+      const data = await dataUpload_selectMetaById(this.listMetaData);
+      if (data.code != 200) {
+        return;
+      }
+      this.queryMetaFlag1 = true;
+      this.metaDataTable1 = [data.result];
+    },
+
+
+    //鍏冩暟鎹煡璇�
+    setQueryMetaData(row) {
+      this.fromQueryMeta.title = row.name;
+      this.listMetaData = {
+        metaid: row.id,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+      };
+      this.startQueryMetaData();
+      this.queryMetaFlag = true;
+    },
+    async startQueryMetaData() {
+      const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
+      if (data.code != 200) {
+        return;
+      }
+      this.metaDataTable = data.result;
+      this.listMetaData.count = data.count;
+    },
+
+    onResize() {
+      this.timer && clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.calHeight();
+      }, 500);
+    },
+    calHeight() {
+      this.$nextTick(() => {
+        const rect = this.$refs.container.getBoundingClientRect();
+        const rect1 = this.$refs.container1.getBoundingClientRect();
+
+        this.tableHeight = `${rect.height + 40}px`;
+        this.styleVar["height"] = `calc(100% - ${rect.height + 28}px)`;
+        this.styleVar1["height"] = `calc(100% - ${rect1.height + 28}px)`;
+      });
+    },
+    editFromDataClose() {
+      this.updateFormdialog = false;
+      this.$nextTick(() => {
+        this.editForm = JSON.parse(this.initialForm);
+      });
+    },
     //闄勪欢鍙樺寲
     uploadAnFilesChange() {
       var formData = new FormData();
       var fs = document.getElementById("editimageFile");
       if (fs.files.length == 0) {
-        this.$message.error('璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢');
+        this.$message.error("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢");
         return;
       }
       for (var i = 0, c = fs.files.length; i < c; i++) {
         formData.append("file", fs.files[i]); // fs.files[i].name,file
       }
       for (var i in this.enclosureData) {
-        formData.append('ids', this.enclosureData[i])
+        formData.append("ids", this.enclosureData[i]);
       }
-    const that = this
-      that.jindudialogVisible = true
-      that.$set(this, 'jindutiaoname', "闄勪欢涓婁紶")
-      that.$set(this, 'jindutiao', 0)
+      const that = this;
+      this.sc = {
+        label1: '涓婁紶',
+        label2: '鏂囦欢涓婁紶杩涘害锛�'
+      }
+      that.jindudialogVisible = true;
+      that.$set(this, "jindutiaoname", "闄勪欢涓婁紶");
+      that.$set(this, "jindutiao", 0);
+
       this.loading = true;
-      $.ajax(BASE_URL + "/dataUpload/uploadXlsAnnex?token=" + getToken() + "&path=" + this.formInline.path, {
-        type: "post",
-        data: formData,
-        async: true,
-        cache: false,
-        processData: false,
-        contentType: false,
-        success: (rs) => {
-          this.loading = false;
-          if (rs.code != 200) {
-            return this.$message.error('闄勪欢涓婁紶澶辫触');
-          }
-    
-          this.$set(this, 'jindutiao', 100)
-          this.$message({
-            message: '闄勪欢涓婁紶鎴愬姛',
-            type: 'success'
-          });
-          
-        },
-        error: (rs) => {
-          this.loading = false;
-          this.$message.error('闄勪欢涓婁紶澶辫触');
-        },
-        xhr: function () {
-          var myXhr = $.ajaxSettings.xhr();
-          if (myXhr.upload) { //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
-            myXhr.upload.addEventListener('progress', that.progressHandlingFunction, false); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
-          }
-          return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+      $.ajax(
+        BASE_URL +
+        "/dataUpload/uploadXlsAnnex?token=" +
+        getToken() +
+        "&path=" +
+        this.formInline.path,
+        {
+          type: "post",
+          data: formData,
+          async: true,
+          cache: false,
+          processData: false,
+          contentType: false,
+          success: (rs) => {
+            this.loading = false;
+            if (rs.code != 200) {
+              return this.$message.error("闄勪欢涓婁紶澶辫触");
+            }
+
+            this.$set(this, "jindutiao", 100);
+            this.$message({
+              message: "闄勪欢涓婁紶鎴愬姛",
+              type: "success",
+            });
+          },
+          error: (rs) => {
+            this.loading = false;
+            this.$message.error("闄勪欢涓婁紶澶辫触");
+          },
+          xhr: function () {
+            var myXhr = $.ajaxSettings.xhr();
+            if (myXhr.upload) {
+              //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+              myXhr.upload.addEventListener(
+                "progress",
+                that.progressHandlingFunction,
+                false
+              ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+            }
+            return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+          },
         }
-      });
-
-
-
-
-
-
-
- 
-
+      );
     },
     //閫夋嫨涓婁紶闄勪欢鐨勬枃浠�
     uploadAnFiles() {
-      $('#editimageFile').click();
+      $("#editimageFile").click();
     },
     //涓婁紶闄勪欢
     uploadAnnex() {
-
     },
     //闄勪欢涓婁紶
     setEnclosure() {
       var enclosureData = [
-        'bd.b_pac_hydrogeology',
-        'bd.b_pac_frozensoil',
-        'bd.b_pac_geologic_hazard',
-        'bd.b_pac_marine_meteorological',
-        'bd.b_pac_meteorological',
-        'bs.m_equipment_nameplate',
-        'bs.m_hydraulic_protection',
-        'bs.m_marker',
-        'bs.s_borehole'
+        "bd.b_pac_hydrogeology",
+        "bd.b_pac_frozensoil",
+        "bd.b_pac_geologic_hazard",
+        "bd.b_pac_marine_meteorological",
+        "bd.b_pac_meteorological",
+        "bs.m_equipment_nameplate",
+        "bs.m_hydraulic_protection",
+        "bs.m_marker",
+        "bs.s_explorationpoint",
       ];
       var std = [];
       this.enclosureData = [];
@@ -1334,14 +1219,13 @@
         var row = this.multipleDelete[i];
 
         if (row.tab && row.rows && enclosureData.indexOf(row.tab) > -1) {
-
-          this.enclosureData.push(row.id)
+          this.enclosureData.push(row.id);
         } else {
-          std.push(row.name)
+          std.push(row.name);
         }
       }
       if (std.length != 0) {
-        this.enclosureTitle = std.toString()
+        this.enclosureTitle = std.toString();
         this.enclosureVisible = true;
       } else {
         this.uploadAnFiles();
@@ -1349,21 +1233,20 @@
     },
     //鏉冮檺閰嶇疆
     showPermsMenu(res) {
-
       switch (res.tag) {
-        case '/delete':
+        case "/delete":
           this.menuStatus.delete = true;
           break;
-        case '/insert':
+        case "/insert":
           this.menuStatus.insert = true;
           break;
-        case '/update':
+        case "/update":
           this.menuStatus.update = true;
           break;
-        case '/upload':
+        case "/upload":
           this.menuStatus.upload = true;
           break;
-        case '/download':
+        case "/download":
           this.menuStatus.download = true;
           break;
       }
@@ -1380,7 +1263,6 @@
       }
       for (var i = 0; i < permsEntity.length; i++) {
         if (val === permsEntity[i].perms) {
-
           this.showPermsMenu(permsEntity[i]);
         }
       }
@@ -1399,16 +1281,16 @@
       var val = res.tab.split(".");
       const data = await dataUpload_selectFields({
         ns: val[0],
-        tab: val[1]
-      })
+        tab: val[1],
+      });
       if (data.code != 200) {
-        this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
-        return
+        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', '')
+        if (val_data[i].alias.indexOf("ID") != -1) {
+          val_data[i].alias = val_data[i].alias.replace("ID", "");
         }
       }
       this.dialogVisible = true;
@@ -1418,15 +1300,16 @@
         id: res.id,
         pageIndex: 1,
         pageSize: 10,
-      }
+      };
       this.getDataLoaderSelectDbData();
     },
     async getDataLoaderSelectDbData() {
       const data1 = await dataUpload_selectDbData(this.listLoader);
       if (data1.code != 200) {
-        this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
-        return
+        this.$message.error("瀛楁鍒楄〃璋冪敤澶辫触");
+        return;
       }
+
       var val = data1.result;
       for (var i in val) {
         val[i].createuser = val[i].createName;
@@ -1435,21 +1318,44 @@
         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)
+          val[i].createtime = this.changetimeLayer(val[i].createtime);
         }
         if (val[i].updatetime != null) {
-          val[i].updatetime = this.changetimeLayer(val[i].updatetime)
+          val[i].updatetime = this.changetimeLayer(val[i].updatetime);
         }
       }
       this.dbTableData = data1.result;
       this.count1 = data1.count;
     },
+
+    changetimeLayer(res) {
+      var time = new Date(res);
+      var y = time.getFullYear();
+      var m = time.getMonth() + 1;
+      var d = time.getDate();
+      var h = time.getHours();
+      var mm = time.getMinutes();
+      var s = time.getSeconds();
+      return (
+        y +
+        '-' +
+        this.add0(m) +
+        '-' +
+        this.add0(d) +
+        ' ' +
+        h +
+        ':' +
+        mm +
+        ':' +
+        s
+      );
+    },
     //鑷姩鍖归厤鍙栨秷
     setInsrtWareTableClose() {
       this.dialogWarehousing = false;
-      this.activeName = '';
-      this.activeName2 = '';
-      this.activeName3 = '';
+      this.activeName = "";
+      this.activeName2 = "";
+      this.activeName3 = "";
       this.tableWareThree = [];
       this.tableWareTwo = [];
       this.tableWareOne = [];
@@ -1458,6 +1364,9 @@
     },
     //鑷姩鍖归厤纭
     async setInsrtWareTable() {
+      this.loading = true;
+      this.dialogWarehousing = false;
+      this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..."
       if (this.tableWareThree.length != 0) {
         for (var i in this.tableWareThree) {
           var tabs = this.tableWareThree[i].tabs;
@@ -1468,19 +1377,40 @@
           }
         }
       }
+      for (var i in this.metaFileData) {
+        this.insertWareList.filter((res) => {
+          if (res.name == this.metaFileData[i]) {
+            res.isMeta = true;
+          }
+        });
+      }
 
-      this.loading = true;
-      const res = await dataUpload_insertFiles(JSON.stringify(this.insertWareList));
-      this.loading = false
+
+      const res = await dataUpload_insertFiles(
+        JSON.stringify(this.insertWareList)
+      );
+
       if (res.code != 200) {
-        this.$message.error('鏁版嵁鍏ュ簱澶辫触');
+        this.$message.error("鏁版嵁鍏ュ簱澶辫触");
         return;
       }
+
       this.$message({
-        message: '鏁版嵁鍏ュ簱鎴愬姛',
-        type: 'success'
+        message: "鏁版嵁鍏ュ簱鎴愬姛",
+        type: "success",
       });
+      this.loading = false;
+      this.loadText = ""
+      if (res.result.length > 0) {
+        this.warehouseDialog = true;
+        this.wareData = res.result;
+      }
+
       this.setInsrtWareTableClose();
+    },
+    handleWarehouseClose() {
+      this.warehouseDialog = false;
+      this.wareData = [];
     },
     //鑷姩鍖归厤
     autoMatchWare() {
@@ -1488,10 +1418,11 @@
       var val2 = this.tableWareTwo;
       var std = [];
       for (var i = 0; i < val1.length; i++) {
-        const stdTab = this.setSplitWare(val1[i].tab)
+        const stdTab = this.setSplitWare(val1[i].tab);
         for (var j = 0; j < val2.length; j++) {
-          if (val2[j].tab == stdTab) {
-            std.push(val1[i].tab)
+          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;
             val1[i].tabs = val2[j].tab;
@@ -1500,8 +1431,10 @@
           }
         }
       }
-      std.forEach(item => {
-        this.tableWareOne = this.tableWareOne.filter(items => items.tab !== item);
+      std.forEach((item) => {
+        this.tableWareOne = this.tableWareOne.filter(
+          (items) => items.tab !== item
+        );
       });
     },
     setSplitWare(res) {
@@ -1524,36 +1457,36 @@
       if (this.tableWareOne.indexOf(value1) != -1) {
       } else {
         this.tableWareOne.push(value1);
-        this.tableWareThree.splice(res, 1)
-        this.activeName = '';
-        this.activeName2 = '';
-        this.activeName3 = '';
+        this.tableWareThree.splice(res, 1);
+        this.activeName = "";
+        this.activeName2 = "";
+        this.activeName3 = "";
       }
     },
     //鏁版嵁鍖归厤鍚戝彸
     setWareTableChangeRight() {
       this.wareSelectOne.entity = this.wareSelectTwo.entity;
       this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
-      this.wareSelectOne.tabs = this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
+      this.wareSelectOne.tabs =
+        this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
       if (this.tableWareThree.indexOf(this.wareSelectOne) != -1) {
-
       } else {
-        this.tableWareThree.push(this.wareSelectOne)
+        this.tableWareThree.push(this.wareSelectOne);
         this.tableWareOne.forEach((value, index, array) => {
           if (value.tab == this.wareSelectOne.tab) {
-            this.tableWareOne.splice(index, 1)
+            this.tableWareOne.splice(index, 1);
           }
-        })
-        this.activeName = '';
-        this.activeName2 = '';
-        this.activeName3 = '';
+        });
+        this.activeName = "";
+        this.activeName2 = "";
+        this.activeName3 = "";
       }
     },
     //鏌ヨ鎵�鏈夌殑琛�
     async getDataLoaderSelectTabs() {
       const res = await dataUpload_selectTabs();
       if (res.code != 200) {
-        this.$message.error('鏁版嵁璇锋眰澶辫触');
+        this.$message.error("鏁版嵁璇锋眰澶辫触");
         return;
       }
       this.tableWareTwo = res.result;
@@ -1561,12 +1494,12 @@
     //鏁版嵁鍖归厤宸︿晶鐐瑰嚮浜嬩欢
     singleElection(row) {
       this.wareSelectOne = row;
-      this.activeName = row.eventid
+      this.activeName = row.eventid;
     },
     //鏁版嵁鍖归厤宸︿晶涓棿鐐瑰嚮浜嬩欢
     singleElection2(row) {
       this.wareSelectTwo = row;
-      this.activeName2 = row.entity
+      this.activeName2 = row.entity;
     },
     //鏁版嵁鍖归厤宸︿晶鍙充晶鐐瑰嚮浜嬩欢
     singleElection3(res) {
@@ -1575,147 +1508,236 @@
     },
     //寮�鍚暟鎹尮閰�
     showWareHousing() {
-      this.getDataLoaderSelectTabs()
+      this.getDataLoaderSelectTabs();
       this.dialogWarehousing = true;
-
     },
-    //鏁版嵁鍏ュ簱
-    async setFileWare() {
-      if (this.pathBak != null) {//鏄惁鏈夎川妫�鏂规
-        if (this.formInline.uploadType == 'v1') {//鍗曟枃浠朵笂浼�
-          var std = [];
-          for (var i in this.tableData) {
-            if (this.tableData[i].name.indexOf('.zip') != -1) {
-              if (this.tableData[i].code != null) {
-                std.push(this.tableData[i].name);
-              }
-            }
-          }
-          if (std.length != 0) {
-            return this.$message.error(std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱");
-          }
-        } else if (this.formInline.uploadType == 'v2') {//鏁翠綋椤圭洰涓婁紶
-
-          if (this.tableData.length != 2) {
-            return this.$message.error("璇蜂繚鐣欎竴涓獄ip鏁版嵁,涓�涓猈BS鏁版嵁杩涜鍏ュ簱");
-          }
-          var std = [];
-          for (var i in this.tableData) {
-            if (this.tableData[i].code != null) {
-              std.push(this.tableData[i].name);
-            }
-          }
-          if (std.length != 0) {
-            return this.$message.error(std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱");
-          }
-
-        }
-
-      }
+    //kml鏂囦欢鍏ュ簱
+    async setKMlWare() {
+      this.loading = true;
       var obj = {
         dirid: this.formInline.dirid,
         epsgCode: this.formInline.coordinateId,
         path: this.formInline.path,
         verid: this.formInline.verid,
-      }
-      //鏌ヨ鏄犲皠
-      const data = await dataUpload_selectMappers(obj)
+        entity: this.formInline.tab,
+        medium: this.formInline.medium,
+      };
+      this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..."
+      const data = await dataUpload_selectMappers(obj);
       if (data.code != 200) {
         return this.$message.error("鏁版嵁鏄犲皠澶辫触");
       }
-      var std = [];
-      var result = data.result;
-      this.insertWareList = data.result;
-      for (var i in result) {
-        if (result[i].type == "shp" || result[i].type == "gdb") {
-          std.push(result[i])
-        }
-      }
-      if (std.length != 0) {
-        this.tableWareOne = std;
-        this.showWareHousing()
-      } else {
-        this.setInsrtWareTable();
+
+      var std = data.result.filter((res) => {
+        res.entity = obj.entity
+        res.medium = obj.medium
+        return res;
+      })
+
+      this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..."
+      const res = await dataUpload_insertKml(
+        JSON.stringify(std)
+      );
+      if (res.code != 200) {
+        this.$message.error("鏁版嵁鍏ュ簱澶辫触");
+        return;
       }
 
+      this.$message({
+        message: "鏁版嵁鍏ュ簱鎴愬姛",
+        type: "success",
+      });
+      this.loading = false;
+      this.loadText = ""
+      if (res.result.length > 0) {
+        this.warehouseDialog = true;
+        this.wareData = res.result;
+      }
+
+      this.setInsrtWareTableClose();
+    },
+    //鏁版嵁鍏ュ簱
+    async setFileWare() {
+      if (this.formInline.uploadType == "v3") {
+        this.setKMlWare()
+      } else {
+        if (this.pathBak != null) {
+          //鏄惁鏈夎川妫�鏂规
+          if (this.formInline.uploadType == "v1") {
+            //鍗曟枃浠朵笂浼�
+            var std = [];
+            for (var i in this.tableData) {
+              if (this.tableData[i].name.indexOf(".zip") != -1) {
+                if (this.tableData[i].code != null) {
+                  std.push(this.tableData[i].name);
+                }
+              }
+            }
+            if (std.length != 0) {
+              return this.$message.error(
+                std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
+              );
+            }
+          } else if (this.formInline.uploadType == "v2") {
+            //鏁翠綋椤圭洰涓婁紶
+            if (this.tableData.length != 2) {
+              return this.$message.error("璇蜂繚鐣欎竴涓獄ip鏁版嵁,涓�涓猈BS鏁版嵁杩涜鍏ュ簱");
+            }
+            var std = [];
+            for (var i in this.tableData) {
+              if (this.tableData[i].code != null) {
+                std.push(this.tableData[i].name);
+              }
+            }
+            if (std.length != 0) {
+              return this.$message.error(
+                std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
+              );
+            }
+          }
+        }
+        this.loading = true;
+        var obj = {
+          dirid: this.formInline.dirid,
+          epsgCode: this.formInline.coordinateId,
+          path: this.formInline.path,
+          verid: this.formInline.verid,
+        };
+        this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..."
+        //鏌ヨ鏄犲皠
+        const data = await dataUpload_selectMappers(obj);
+        if (data.code != 200) {
+          return this.$message.error("鏁版嵁鏄犲皠澶辫触");
+        }
+        this.loading = false;
+        this.loadText = " "
+        var std = [];
+        var result = data.result;
+        this.insertWareList = data.result;
+        for (var i in result) {
+          if (result[i].type == "shp" || result[i].type == "gdb") {
+            std.push(result[i]);
+          }
+        }
+        if (std.length != 0) {
+          this.tableWareOne = std;
+          this.showWareHousing();
+        } else {
+          this.setInsrtWareTable();
+        }
+      }
     },
     //涓嬭浇鏃ュ織
     handerLogClick(res) {
-
       for (var i in res.code) {
-        var url = BASE_URL + '/dataUpload/downloadResult?token=' + getToken() + "&id=" + res.code[i];
+        var url =
+          BASE_URL +
+          "/dataUpload/downloadResult?token=" +
+          getToken() +
+          "&id=" +
+          res.code[i];
         $("#downFrame").attr("src", url).click();
       }
-
     },
     //鏁翠綋鏂囦欢璐ㄦ鎻愪氦
     commonTestQuay() {
       this.testQuayVisible = false;
-      if (this.formCheckAll.diZaiType != "NO") {
-        this.formCheckAll.isDiZai = "YES"
+      // if (this.formCheckAll.diZaiType != "NO") {
+      //   this.formCheckAll.isDiZai = "YES";
+      // }
+      this.sc = {
+        label1: '璐ㄦ',
+        label2: '鏂囦欢璐ㄦ杩涘害锛�'
       }
-      this.loading = true;
+      this.jindudialogVisible = true;
+      this.loading = false;
+      this.$set(this, "jindutiao", 0);
       this.getStartTestQuayTaskStatus();
     },
     //鏁翠綋鏂囦欢澶氭潯鏁版嵁璐ㄦ
     async getStartTestQuayTaskStatus() {
-      if (this.multipleSelection == 0 || this.taskStatus == this.multipleSelection.length) {
+      if (
+        this.multipleSelection == 0 ||
+        this.taskStatus == this.multipleSelection.length
+      ) {
+        this.jindudialogVisible = false;
         this.loading = false;
         return;
       }
+
       for (var i in this.multipleSelection) {
         var name = this.multipleSelection[i].name;
         var path = this.multipleSelection[i].path;
         if (name.indexOf(".zip") != -1) {
-          this.formCheckAll.zipPath = path
+          this.formCheckAll.zipPath = path;
         } else if (name.indexOf(".xls") != -1) {
-          this.formCheckAll.wbsPath = path
+          this.formCheckAll.wbsPath = path;
         } else if (name.indexOf(".xlsx") != -1) {
-          this.formCheckAll.wbsPath = path
+          this.formCheckAll.wbsPath = path;
         }
       }
+
+      this.formCheckAll.sjfl = '鏁板瓧鍖栨垚鏋�'
       const data = await dataUpload_uploadChecks(this.formCheckAll);
       if (data.code != 200) {
-        this.$message.error('鏁版嵁璐ㄦ鎻愪氦澶辫触');
+        this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
         this.taskStatus++;
-        this.getStartTestQuayTaskStatus();
+        this.jindudialogVisible = false;
+        this.loading = false;
         return;
       }
       var reset = data.result;
       this.progress = 0;
       this.setIntel = setInterval(() => {
-        this.sendTaskStatus(reset)
-      }, 5000)
-
+        this.sendTaskStatus(reset);
+      }, 5000);
     },
 
     //鍗曟枃浠舵暟鎹川妫�鎻愪氦
     async commonQuayTest() {
-      this.loading = true;
+      // this.loading = true;
       this.quayTestVisible = false;
       this.taskStatus = 0;
       this.getStartTaskStatus();
+      this.sc = {
+        label1: '璐ㄦ',
+        label2: '鏂囦欢璐ㄦ杩涘害锛�'
+      }
+      this.jindudialogVisible = true;
+
+      this.$set(this, "jindutiao", 0);
     },
     //鍗曟枃浠跺鏉℃暟鎹川妫�
     async getStartTaskStatus() {
-      if (this.multipleSelection == 0 || this.taskStatus == this.multipleSelection.length) {
+      const that = this;
+      if (
+        this.multipleSelection == 0 ||
+        this.taskStatus == this.multipleSelection.length
+      ) {
         this.loading = false;
+        that.jindudialogVisible = false;
         return;
       }
+
+
       this.quayTestForms.zipPath = this.multipleSelection[this.taskStatus].path;
+      // this.quayTestForms.wbsPath = this.multipleSelection[this.taskStatus].path;
       if (this.quayTestForms.zipPath.indexOf(".zip") == -1) {
         this.taskStatus++;
         this.getStartTaskStatus();
       } else {
-        this.quayTestForms.names = this.pathBak;
-        var value = this.$refs['selectcascader'].getCheckedNodes();
-        var bak = value[0].data.fullName.split("\\");
+        this.quayTestForms.names = this.pathBak
+        var value = this.getCheckedKeys
+        var bak = value.data.fullName.split("\\");
         this.quayTestForms.xmmc = bak[this.taskStatus];
         this.quayTestForms.sjzy = this.formInline.specialtyId;
-        this.quayTestForms.zipPath = this.multipleSelection[this.taskStatus].path;
+        this.quayTestForms.zipPath =
+          this.multipleSelection[this.taskStatus].path;
+        // this.quayTestForms.wbsPath = this.multipleSelection[this.taskStatus].path;
+        this.quayTestForms.sjfl = '鏁板瓧鍖栨垚鏋�'
         const data = await dataUpload_uploadChecks(this.quayTestForms);
         if (data.code != 200) {
-          this.$message.error('鏁版嵁璐ㄦ鎻愪氦澶辫触');
+          this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
           this.taskStatus++;
           this.getStartTaskStatus();
           return;
@@ -1723,36 +1745,43 @@
         var reset = data.result;
         this.progress = 0;
         this.setIntel = setInterval(() => {
-          this.getselectTaskStatus(reset)
-        }, 5000)
+          this.getselectTaskStatus(reset);
+        }, 5000);
       }
-
     },
     async getselectTaskStatus(res) {
       var std = 0;
       for (var i = 0; i < res.length; i++) {
-        const data = await dataUpload_selectTaskStatus({ id: res[i] })
+        const data = await dataUpload_selectTaskStatus({ id: res[i] });
 
-        std += data.progress
+        std += data.progress;
 
         if (data.status == 5) {
-
         } else {
-          if (data.status == 1 && data.resultFile == null) {//璐ㄦ鎴愬姛
+          if (data.status == 1 && data.resultFile == null) {
+            //璐ㄦ鎴愬姛
             for (var i in this.tableData) {
-              if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) {
+              if (
+                this.tableData[i].path ==
+                this.multipleSelection[this.taskStatus].path
+              ) {
                 this.tableData[i].status = "璐ㄦ鎴愬姛";
+
               }
             }
-            if (this.progress == 1) {
-              clearInterval(this.setIntel)
-              this.setIntel = null;
-              this.taskStatus++;
-              this.getStartTaskStatus()
-            }
-          } else {//浠诲姟澶辫触
+            // if (this.progress == 1) {
+            clearInterval(this.setIntel);
+            this.setIntel = null;
+            this.taskStatus++;
+            this.getStartTaskStatus();
+            // }
+          } else {
+            //浠诲姟澶辫触
             for (var i in this.tableData) {
-              if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) {
+              if (
+                this.tableData[i].path ==
+                this.multipleSelection[this.taskStatus].path
+              ) {
                 this.tableData[i].status = "璐ㄦ澶辫触";
               }
             }
@@ -1763,16 +1792,23 @@
                 }
               }
             }
-            clearInterval(this.setIntel)
+            clearInterval(this.setIntel);
             this.setIntel = null;
             this.taskStatus++;
-            this.getStartTaskStatus()
+            this.getStartTaskStatus();
           }
         }
       }
       this.progress = std / (res.length * 100);
       for (var i in this.tableData) {
-        if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) {
+        if (!this.multipleSelection[this.taskStatus]) {
+          break;
+        }
+        if (
+
+          this.tableData[i].path == this.multipleSelection[this.taskStatus].path
+        ) {
+          this.$set(this, "jindutiao", parseInt(this.progress * 100));
           this.tableData[i].status = parseInt(this.progress * 100) + "%";
         }
       }
@@ -1780,12 +1816,13 @@
     async sendTaskStatus(res) {
       var std = 0;
       for (var i = 0; i < res.length; i++) {
-        const data = await dataUpload_selectTaskStatus({ id: res[i] })
+        const data = await dataUpload_selectTaskStatus({ id: res[i] });
         std += data.progress;
 
         if (data.status == 5) {
         } else {
-          if (data.status == 1 && data.resultFile == null) {//璐ㄦ鎴愬姛
+          if (data.status == 1 && data.resultFile == null) {
+            //璐ㄦ鎴愬姛
             for (var i in this.tableData) {
               for (var j in this.multipleSelection) {
                 if (this.tableData[i].path == this.multipleSelection[j].path) {
@@ -1793,12 +1830,13 @@
                 }
               }
             }
-            if (this.progress == 1) {
-              clearInterval(this.setIntel)
-              this.setIntel = null;
-              this.loading = false;
-            }
-          } else {//浠诲姟澶辫触
+            // if (this.progress == 1) {
+            clearInterval(this.setIntel);
+            this.setIntel = null;
+            this.loading = false;
+            // }
+          } else {
+            //浠诲姟澶辫触
             for (var i in this.tableData) {
               for (var j in this.multipleSelection) {
                 if (this.tableData[i].path == this.multipleSelection[j].path) {
@@ -1814,7 +1852,7 @@
               }
             }
 
-            clearInterval(this.setIntel)
+            clearInterval(this.setIntel);
             this.setIntel = null;
             this.loading = false;
             // this.taskStatus++;
@@ -1823,11 +1861,14 @@
         }
       }
       this.progress = std / (res.length * 100);
+
+
       // for (var i in this.tableData) {
       //   if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) {
       //     this.tableData[i].status = parseInt(this.progress * 100) + "%";
       //   }
       // }
+      this.$set(this, "jindutiao", parseInt(this.progress * 100));
       for (var i in this.tableData) {
         for (var j in this.multipleSelection) {
           if (this.tableData[i].path == this.multipleSelection[j].path) {
@@ -1876,16 +1917,13 @@
       //   }
       //   clearInterval(this.setIntel)
       //   this.setIntel = null;
-
-
-
     },
     //鍒犻櫎涓婁紶鐨勬枃浠�
     async setFileDelete() {
       var data = JSON.stringify(this.multipleSelection);
       const res = await dataUploadDeleteFiles(data);
       if (res.code != 200) {
-        this.$message.error('鍒犻櫎澶辫触');
+        this.$message.error("鍒犻櫎澶辫触");
         return;
       }
       this.getFileLength();
@@ -1893,17 +1931,24 @@
     //娓呴櫎鎵�鏈塱nput File;
     clearFileSelect() {
       this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
-      document.getElementById("selectDataFile").value = "";
+      if (document.getElementById("selectDataFile")) {
+        document.getElementById("selectDataFile").value = "";
+      }
       this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
-      document.getElementById("metaDataFile").value = "";
+      if (document.getElementById("metaDataFile")) {
+        document.getElementById("metaDataFile").value = ""
+      }
       this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
-      document.getElementById("wbsDataFile").value = "";
+
+      if (document.getElementById("wbsDataFile")) {
+        document.getElementById("wbsDataFile").value = "";
+      }
     },
     //鑾峰彇涓婁紶鏂囦欢鏁伴噺
     async getFileLength() {
       const res = await dataUploadSelectFiles(this.formInline.path);
       if (res.code != 200) {
-        this.$message.error('鏂囦欢涓婁紶鏁版嵁鑾峰彇澶辫触');
+        this.$message.error("鏂囦欢涓婁紶鏁版嵁鑾峰彇澶辫触");
         return;
       }
       if (res.result == null) {
@@ -1913,9 +1958,8 @@
           res.result[i].status = "--";
           res.result[i].code = null;
         }
-        this.tableData = res.result
+        this.tableData = res.result;
       }
-
     },
     //涓婁紶鏂囦欢
     setFileUpload() {
@@ -1923,117 +1967,141 @@
       var formData = new FormData();
       var fs1 = document.getElementById("selectDataFile");
       if (fs1.files.length == 0) {
-        return this.$message.error('璇烽�夋嫨闇�瑕佷笂浼犵殑鏁版嵁鏂囦欢');
+        return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑鏁版嵁鏂囦欢");
       }
       var fs2 = null;
-      if (this.formInline.uploadType == 'v1') {//鍗曟枃浠堕」鐩笂浼�
+      if (this.formInline.uploadType == "v1") {
+        //鍗曟枃浠堕」鐩笂浼�
         fs2 = document.getElementById("metaDataFile");
         if (this.pathBak != null && this.pathBak.indexOf("checkMain") > -1) {
           if (fs2.files.length == 0) {
-            return this.$message.error('璇烽�夋嫨闇�瑕佷笂浼犵殑鍏冩暟鎹枃浠�');
+            return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑鍏冩暟鎹枃浠�");
           }
         }
-      } else if (this.formInline.uploadType == 'v2') {//鏁翠綋椤圭洰涓婁紶
+      } else if (this.formInline.uploadType == "v2") {
+        //鏁翠綋椤圭洰涓婁紶
         fs2 = document.getElementById("wbsDataFile");
         if (fs2.files.length == 0) {
-          return this.$message.error('璇烽�夋嫨闇�瑕佷笂浼犵殑WBS鏁版嵁鏂囦欢');
+          return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑WBS鏁版嵁鏂囦欢");
         }
+      } else if (this.formInline.uploadType == "v3") {
+
       }
       for (var i = 0, c = fs1.files.length; i < c; i++) {
         formData.append(fs1.files[i].name, fs1.files[i]);
-        this.fileType.push({ name: fs1.files[i].name, type: "selectData" })
+        this.fileType.push({ name: fs1.files[i].name, type: "selectData" });
       }
       if (fs2 != null) {
         for (var i = 0, c = fs2.files.length; i < c; i++) {
           formData.append(fs2.files[i].name, fs2.files[i]);
-          if (this.formInline.uploadType == 'v1') {
-            this.fileType.push({ name: fs2.files[i].name, type: "metaData" })
-          } else if (this.formInline.uploadType == 'v2') {
-            this.fileType.push({ name: fs2.files[i].name, type: "wbsData" })
+          if (this.formInline.uploadType == "v1") {
+            this.fileType.push({ name: fs2.files[i].name, type: "metaData" });
+          } else if (this.formInline.uploadType == "v2") {
+            this.fileType.push({ name: fs2.files[i].name, type: "wbsData" });
           }
         }
       }
-      const that = this
-      that.jindudialogVisible = true
-      let listval = []
+      const that = this;
+      that.jindudialogVisible = true;
+      let listval = [];
       formData.forEach((key, val) => {
         listval.push({
-          name: val
-        })
-      })
-      that.$set(this, 'jindutiaoname', listval)
-      that.$set(this, 'jindutiao', 0)
-      this.loading = true;
-      $.ajax(BASE_URL + "/dataUpload/uploadFiles?token=" + token + "&path=" + this.formInline.path, {
-        type: "post",
-        data: formData,
-        async: true,
-        cache: false,
-        processData: false,
-        contentType: false,
-        success: (rs) => {
-          this.loading = false;
-          if (rs.code != 200) {
-            return this.$message.error('鏁版嵁涓婁紶澶辫触');
-          }
-          this.getFileLength();
-          this.$set(this, 'jindutiao', 100)
-          this.$message({
-            message: '涓婁紶鎴愬姛',
-            type: 'success'
-          });
-          this.clearFileSelect();
-        },
-        error: (rs) => {
-          this.loading = false;
-          this.$message.error('鏁版嵁涓婁紶澶辫触');
-        },
-        xhr: function () {
-          var myXhr = $.ajaxSettings.xhr();
-          
-          if (myXhr.upload) { //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
-            myXhr.upload.addEventListener('progress', that.progressHandlingFunction, false); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
-          }
-          return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
-        }
+          name: val,
+        });
       });
+      that.$set(this, "jindutiaoname", listval);
+      that.$set(this, "jindutiao", 0);
+      // this.loading = true;
+      $.ajax(
+        BASE_URL +
+        "/dataUpload/uploadFiles?token=" +
+        token +
+        "&path=" +
+        this.formInline.path,
+        {
+          type: "post",
+          data: formData,
+          async: true,
+          cache: false,
+          processData: false,
+          contentType: false,
+          success: (rs) => {
+            this.loading = false;
+            if (rs.code != 200) {
+              return this.$message.error("鏁版嵁涓婁紶澶辫触");
+            }
+            this.getFileLength();
+            this.$set(this, "jindutiao", 100);
+            this.$message({
+              message: "涓婁紶鎴愬姛",
+              type: "success",
+            });
+            this.clearFileSelect();
+          },
+          error: (rs) => {
+            this.loading = false;
+            this.$message.error("鏁版嵁涓婁紶澶辫触");
+          },
+          xhr: function () {
+            var myXhr = $.ajaxSettings.xhr();
+
+            if (myXhr.upload) {
+              //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+              myXhr.upload.addEventListener(
+                "progress",
+                that.progressHandlingFunction,
+                false
+              ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+            }
+            return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+          },
+        }
+      );
     },
     progressHandlingFunction(event) {
-      var loaded = event.loaded;//宸蹭笂浼�
+      var loaded = event.loaded; //宸蹭笂浼�
       var loaded = Math.floor(100 * (event.loaded / event.total) - 1); //璁$畻宸茬粡涓婁紶鐨勭櫨鍒嗘瘮
       $("#prog").html(loaded + "%"); //搴旂敤鍒版樉绀篣I锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀�
-      this.jindutiao = loaded
-      this.$set(this, 'jindutiao', loaded)
+      this.jindutiao = loaded;
+      this.$set(this, "jindutiao", loaded);
     },
     format(percentage) {
-      return percentage === 100 ? '涓婁紶瀹屾瘯' : `${percentage}%`;
+
+      // return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`;
+      var label;
+      if (this.sc.label1 == "涓婁紶") {
+        label = "涓婁紶瀹屾瘯"
+      } else {
+        label = `${percentage}%`
+      }
+      return percentage === 100 ? label : `${percentage}%`;
     },
     //鑾峰彇鏂囦欢涓婁紶璺緞
     async getFilePath() {
       const res = await dataUploadSelectPath();
       if (res.code != 200) {
-        this.$message.error('鏂囦欢涓婁紶璺緞鑾峰彇澶辫触');
+        this.$message.error("鏂囦欢涓婁紶璺緞鑾峰彇澶辫触");
         return;
       }
       this.formInline.path = res.result;
     },
     //椤圭洰鍚嶇О鍒囨崲
     entryNameChange(res) {
-      var val = this.entryOption.filter(rs => {
+      var val = this.entryOption.filter((rs) => {
         if (rs.name == res) {
           return rs;
         }
       });
-      this.pathBak = val[0].bak;
-      this.formInline.dirid = val[0].id
+      this.pathBak = val[0].checks;
+      this.formInline.dirid = val[0].id;
       this.getselectVerByDirid();
     },
     //鑾峰彇椤圭洰鍚嶇О
     async setProjectName() {
-      const data = await dataUpload_selectProject()
+      const data = await dataUpload_selectProject();
       if (data.code != 200) {
-        this.$message.error('椤圭洰鍒楄〃鑾峰彇澶辫触');
-        return
+        this.$message.error("椤圭洰鍒楄〃鑾峰彇澶辫触");
+        return;
       }
       this.entryOption = data.result;
       this.formInline.entryId = this.entryOption[0].name;
@@ -2043,10 +2111,10 @@
     },
     //鑾峰彇鎵�鏈夊潗鏍囩郴
     async setCoordinateSystem() {
-      const data = await dataUpload_selectCoords()
+      const data = await dataUpload_selectCoords();
       if (data.code != 200) {
-        this.$message.error('鍧愭爣绯诲垪琛ㄨ幏鍙栧け璐�');
-        return
+        this.$message.error("鍧愭爣绯诲垪琛ㄨ幏鍙栧け璐�");
+        return;
       }
       this.coordinateOption = data.result;
       this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
@@ -2057,7 +2125,7 @@
     },
     //閲嶇疆WPS閫夋嫨
     restWBSFile() {
-      this.formInline.wbsData = '璇烽�夋嫨WBS鏁版嵁';
+      this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
       document.getElementById("wbsDataFile").value = "";
     },
     //WBS鏁版嵁Change浜嬩欢
@@ -2066,28 +2134,30 @@
       var len = event.currentTarget.files.length;
       for (var i = 0; i < len; i++) {
         var f = event.currentTarget.files[i];
-        std.push(f.name)
+        std.push(f.name);
       }
       this.formInline.wbsData = std.toString();
     },
     //鏁版嵁璐ㄦ寮圭獥鍏抽棴--椤圭洰鏁翠綋
     handleTestQuayCloseDown() {
-      this.$confirm('纭鍏抽棴锛�')
-        .then(_ => {
-          this.closeTestQuayCloseDialog()
+      this.$confirm("纭鍏抽棴锛�")
+        .then((_) => {
+          this.closeTestQuayCloseDialog();
         })
-        .catch(_ => { });
+        .catch((_) => {
+        });
     },
     closeTestQuayCloseDialog() {
       this.testQuayVisible = false;
     },
     //鏁版嵁璐ㄦ寮圭獥鍏抽棴--鍗曟枃浠�
     handleQuayTestCloseDown() {
-      this.$confirm('纭鍏抽棴锛�')
-        .then(_ => {
-          this.closeQuayTestCloseDialog()
+      this.$confirm("纭鍏抽棴锛�")
+        .then((_) => {
+          this.closeQuayTestCloseDialog();
         })
-        .catch(_ => { });
+        .catch((_) => {
+        });
     },
     closeQuayTestCloseDialog() {
       this.quayTestVisible = false;
@@ -2095,52 +2165,53 @@
     //鏁版嵁璐ㄦ鐐瑰嚮浜嬩欢
     handleQuayTestClick() {
       if (this.pathBak == null) {
-        return this.$message('鏃犺川妫�鏂规');
+        return this.$message("鏃犺川妫�鏂规");
       }
       if (this.multipleSelection.length == 0) {
-        return this.$message('璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�');
+        return this.$message("璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�");
       }
       if (this.formInline.uploadType == "v1") {
-        var value = this.$refs['selectcascader'].getCheckedNodes();
-        var fileType = value[0].data.fullName;
+
+        var value = this.getCheckedKeys
+        var fileType = value.data.fullName;
         this.quayTestForms.names = fileType;
         this.quayTestForms.sjzy = this.formInline.specialtyId;
         this.quayTestVisible = true;
-
       } else if (this.formInline.uploadType == "v2") {
         var fileZip = [];
         var fileExcel = [];
         for (var i in this.multipleSelection) {
-          if (this.multipleSelection[i].name.indexOf('.zip') != -1) {
+          if (this.multipleSelection[i].name.indexOf(".zip") != -1) {
             fileZip.push(this.multipleSelection[i].name);
-          } else if (this.multipleSelection[i].name.indexOf('.xls') != -1) {
+          } else if (this.multipleSelection[i].name.indexOf(".xls") != -1) {
             fileExcel.push(this.multipleSelection[i].name);
-          } else if (this.multipleSelection[i].name.indexOf('.xlsx') != -1) {
+          } else if (this.multipleSelection[i].name.indexOf(".xlsx") != -1) {
             fileExcel.push(this.multipleSelection[i].name);
           }
         }
 
         if (fileZip.length != 1) {
-          return this.$message('璇烽�夋嫨涓�涓暣浣撻」鐩枃浠�');
+          return this.$message("璇烽�夋嫨涓�涓暣浣撻」鐩枃浠�");
         }
         if (fileExcel.length != 1) {
-          return this.$message('璇烽�夋嫨涓�涓猈BS鏂囦欢');
+          return this.$message("璇烽�夋嫨涓�涓猈BS鏂囦欢");
         }
-        this.formCheckAll.names = this.pathBak;
-        var val = this.entryOption.filter(res => {
+
+        this.formCheckAll.names = JSON.parse(this.pathBak).toString();
+        var val = this.entryOption.filter((res) => {
           if (res.id == this.formInline.dirid) {
             return res;
           }
-        })
+        });
 
-        this.formCheckAll.xmmc = val[0].name
-        this.formCheckAll.sjzy = this.formInline.specialtyId
+        this.formCheckAll.xmmc = val[0].name;
+        this.formCheckAll.sjzy = this.formInline.specialtyId;
         if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) {
-          this.formCheckAll.isDiZai = true;
-          this.formCheckAll.diZaiType = this.disOptions[0].value
+          this.formCheckAll.isDiZai = "YES";
+          this.formCheckAll.diZaiType = this.disOptions[0].value;
         } else {
-          this.formCheckAll.isDiZai = false;
-          this.formCheckAll.diZaiType = "NO"
+          this.formCheckAll.isDiZai = "NO";
+          this.formCheckAll.diZaiType = "NO";
         }
         this.testQuayVisible = true;
       }
@@ -2153,14 +2224,14 @@
         std.push(this.multipleDelete[i].id);
       }
 
-      const res = await dataUpload_deleteMetas({ ids: std.toString() })
+      const res = await dataUpload_deleteMetas({ ids: std.toString() });
       this.loading = false;
       if (res.code != 200) {
-        this.$message.error('鍒犻櫎澶辫触');
+        this.$message.error("鍒犻櫎澶辫触");
       } else {
         this.$message({
-          message: '鍒犻櫎鎴愬姛',
-          type: 'success'
+          message: "鍒犻櫎鎴愬姛",
+          type: "success",
         });
         this.setStartWareTable();
       }
@@ -2171,17 +2242,17 @@
         pageIndex: 1,
         pageSize: 10,
         name: this.formWarehousing.name,
-      }
+      };
       this.getAllWareTable();
     },
     //涓婁紶鏁版嵁鍒楄〃閲嶇疆
     setWarehouseReset() {
-      this.formWarehousing.name = '';
+      this.formWarehousing.name = "";
       this.listData = {
         pageIndex: 1,
         pageSize: 10,
         name: null,
-      }
+      };
       this.getAllWareTable();
     },
     //鏍煎紡鍖栨椂闂�
@@ -2195,28 +2266,28 @@
       var s = time.getSeconds();
       return (
         y +
-        '-' +
+        "-" +
         this.add0(m) +
-        '-' +
+        "-" +
         this.add0(d) +
-        ' ' +
+        " " +
         h +
-        ':' +
+        ":" +
         mm +
-        ':' +
+        ":" +
         s
       );
     },
     //鏍煎紡鍖栨椂闂�
     add0(m) {
-      return m < 10 ? '0' + m : m;
+      return m < 10 ? "0" + m : m;
     },
     //澶у皬鍊兼敼鍙�
     changeSizeFile(row, column, cellValue, index) {
       if (cellValue >= 1024) {
-        return parseFloat(cellValue / 1204).toFixed(3) + "GB"
+        return parseFloat(cellValue / 1204).toFixed(3) + "GB";
       } else {
-        return cellValue + "MB"
+        return cellValue + "MB";
       }
     },
     //涓婁紶鏁版嵁鍒楄〃娓呭崟閫夋嫨
@@ -2225,18 +2296,20 @@
     },
     //涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
     setStartWareTable() {
-      this.listData = {
-        pageIndex: 1,
-        pageSize: 10,
-        name: null,
-      }
+      // this.listData = {
+      //   pageIndex: 1,
+      //   pageSize: 10,
+      //   name: null,
+      // };
+      this.listData.pageIndex = 1;
+      this.listData.name = null;
       this.getAllWareTable();
     },
     //鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
     async getAllWareTable() {
       const res = await dataUpload_selectByPageForUpload(this.listData);
       if (res.code != 200) {
-        this.$message.error('鍒楄〃鏁版嵁鑾峰彇澶辫触');
+        this.$message.error("鍒楄〃鏁版嵁鑾峰彇澶辫触");
         return;
       }
       this.count = res.count;
@@ -2248,7 +2321,6 @@
       this.listData.pageSize = val;
       this.getAllWareTable();
     },
-
 
     //鏁版嵁涓婁紶鍒楄〃娓呭崟page鍒囨崲
     handleCurrentChange(val) {
@@ -2266,7 +2338,7 @@
       var len = event.currentTarget.files.length;
       for (var i = 0; i < len; i++) {
         var f = event.currentTarget.files[i];
-        std.push(f.name)
+        std.push(f.name);
       }
       this.formInline.specialtyData = std.toString();
     },
@@ -2276,7 +2348,7 @@
     },
     //閲嶇疆鍏冩暟鎹�
     restMetaFile() {
-      this.formInline.metaData = '璇烽�夋嫨鍏冩暟鎹�';
+      this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
       document.getElementById("metaDataFile").value = "";
     },
     //閫夋嫨鍏冩暟鎹枃浠跺垏鎹�
@@ -2285,20 +2357,23 @@
       var len = event.currentTarget.files.length;
       for (var i = 0; i < len; i++) {
         var f = event.currentTarget.files[i];
-        std.push(f.name)
+        std.push(f.name);
       }
       this.formInline.metaData = std.toString();
+      this.metaFileData = std;
     },
 
     //From琛ㄥ崟鍒濆鍖�
     setFromStart() {
-      this.formInline.verid = null
-      this.formInline.specialtyId = '娴嬮噺涓撲笟'
-      this.formInline.specialtyData = '璇烽�夋嫨鏁版嵁'
-      this.formInline.metaData = '璇烽�夋嫨鍏冩暟鎹�'
-      this.formInline.entryId = null
-      this.formInline.selectFileType = '*.*'
+      this.formInline.verid = null;
+      this.formInline.specialtyId = "娴嬮噺涓撲笟";
+      this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
+      this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
+      this.formInline.entryId = null;
+      this.formInline.selectFileType = "*.*";
       this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
+      this.formInline.medium = "";
+      this.formInline.tab = "";
     },
     //閫夋嫨鏁版嵁
     setSelectFile() {
@@ -2306,34 +2381,44 @@
     },
     //閲嶇疆鏁版嵁
     restSelectFile() {
-      this.formInline.specialtyData = '璇烽�夋嫨鏁版嵁';
+      this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
       document.getElementById("selectDataFile").value = "";
-
     },
     //鍏ュ簱绫诲瀷鍒囨崲
     uploadTypeChange(res) {
       this.setFromStart();
       if (res == "v2") {
-        this.uploadFlag = false
-        this.formInline.selectFileType = '.zip'
-        this.formInline.entryId = this.entryOption[0].name
+        this.uploadFlag = false;
+        this.formInline.selectFileType = ".zip";
+        this.formInline.entryId = this.entryOption[0].name;
         this.formInline.dirid = this.entryOption[0].id;
         this.getselectVerByDirid();
-        this.pathBak = this.entryOption[0].bak;
-      } else {
-        this.getStartDirChecked(this.catalogOption);
+        this.pathBak = this.entryOption[0].checks;
+      } else if (res == "v3") {
+        this.formInline.selectFileType = ".kml";
+        this.getSelectdirTab();
         this.getselectVerByDirid();
-        this.uploadFlag = true
+        this.formInline.specialtyId = "绾胯矾涓撲笟";
+        this.uploadFlag = true;
+        this.formInline.tab = this.lineOptions[0].value;
+        this.formInline.medium = this.mediumOptions[0].value
+      } else {
+        this.getSelectdirTab();
+        this.getselectVerByDirid();
+        this.uploadFlag = true;
       }
       this.formInline.uploadType = res;
     },
     //鐗堟湰鍙疯幏鍙�
     async getselectVerByDirid() {
       this.verOption = [];
-      this.formInline.verid = "";
-      const res = await dataUploadSelectVerByDirid({ dirid: this.formInline.dirid });
+
+      const res = await dataUploadSelectVerByDirid({
+        dirid: this.formInline.dirid,
+      });
+
       if (res.code != 200) {
-        this.$message.error('鐗堟湰鍒楄〃鑾峰彇澶辫触');
+        this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
         return;
       }
       this.verOption = res.result;
@@ -2343,40 +2428,42 @@
     async getSelectdirTab() {
       const res = await selectdirTab();
       if (res.code != 200) {
-        this.$message.error('鐩綍鍒楄〃鑾峰彇澶辫触');
+        this.$message.error("鐩綍鍒楄〃鑾峰彇澶辫触");
         return;
       }
+
       this.catalogOption = this.treeData(res.result);
-      this.formInline.dirName = this.catalogOption[0].name
-      this.getStartDirChecked(this.catalogOption);
-      this.getselectVerByDirid()
+      this.formInline.dirName = this.catalogOption[0].name;
+      this.formInline.dirid = this.catalogOption[0].id;
+      // this.getStartDirChecked(this.catalogOption);
+      this.getselectVerByDirid();
     },
 
     getStartDirChecked(res) {
       if (res.length != 0) {
         if (res[0].children == null || res[0].children == undefined) {
-          this.formInline.dirid = res[0].id
+          this.formInline.dirid = res[0].id;
         } else {
-          this.getStartDirChecked(res[0].children)
+          this.getStartDirChecked(res[0].children);
         }
       }
     },
     //鍗曟枃浠惰川妫�寮圭獥鍒濆鍖�
     startQuayTestForms() {
-      this.quayTestForms = {
-        tolerance: '0.001',
-        gcdOffset: '20',
-        rangeOffset: '200',
-        kzdOffset: '100',
-        xgMax: '0.005',
-        coordinateSystem: 'CGCS2000/degree',
-        imgResolution: '0.2',
-        demTolerance: '5',
-        demChangeRate: '200',
-        lazDensity: '1',
-        imgResolution: '0.2',
-      },
-        this.quayTestShow = {
+      (this.quayTestForms = {
+        tolerance: "0.001",
+        gcdOffset: "20",
+        rangeOffset: "200",
+        kzdOffset: "100",
+        xgMax: "0.005",
+        coordinateSystem: "CGCS2000/degree",
+        imgResolution: "0.2",
+        demTolerance: "5",
+        demChangeRate: "200",
+        lazDensity: "1",
+        imgResolution: "0.2",
+      }),
+        (this.quayTestShow = {
           checkOsgb: false,
           checkXls: false,
           checkLaz: false,
@@ -2389,7 +2476,7 @@
           checkMath: false,
           checkMeta: false,
           checkMain: false,
-        }
+        });
     },
     //鐩綍鍒囨崲
     catalogChange(data, node, nodeData) {
@@ -2397,7 +2484,8 @@
       // this.$refs['selectcascader'].dropDownVisible = false
       // var value = this.$refs['selectcascader'].getCheckedNodes();
 
-      var bak = node.data.bak;
+      var bak = node.data.checks;
+      this.getCheckedKeys = node
       this.pathBak = bak;
       if (bak != null) {
         for (var key in this.quayTestShow) {
@@ -2406,20 +2494,26 @@
           }
         }
       }
-      var fileType = node.data.code;
+      var fileType = node.data.exts;
       if (fileType == null) {
-        fileType = "*.*"
+        fileType = "*.*";
       }
       this.formInline.selectFileType = fileType;
       this.formInline.dirid = node.data.id;
-      this.formInline.dirName = node.data.name
+      this.formInline.dirName = node.data.name;
       this.getselectVerByDirid();
+      setTimeout(() => {
+        this.$refs.multiSelect.blur()
+      }, 100)
     },
     //Tabsq鍒囨崲
     handleTabClick(tab, event) {
       if (tab.name == "second") {
         this.setStartWareTable();
+      } else {
+        this.noteVisible = true
       }
+      this.calHeight();
     },
     //鏍戝垪琛ㄧ敓鎴�
     treeData(source) {
@@ -2427,35 +2521,88 @@
       return cloneData.filter((father) => {
         // 寰幆鎵�鏈夐」
         let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
-        branchArr.length > 0 ? (father.children = branchArr) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+        branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
         return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
       });
     },
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
-  .bottom {
-    width: 100%;
-    margin-top: 1%;
-    // height: 74%;
-    height: 570px;
-    display: flex;
-    justify-content: space-between;
+.bottom {
+  width: 100%;
+  margin-top: 0.5%;
+  // height: 74%;
+  height: 570px;
+  display: flex;
+  justify-content: space-between;
 
-    .rightTable {
-      width: 98%;
-      height: 92%;
+  .rightTable {
+    width: 98%;
+    height: 92%;
 
-      border-radius: 5px;
-      padding: 1%;
-      .table_box {
-        width: 100%;
-        height: 93%;
-        margin: 0 auto;
-        overflow: auto;
-      }
+    border-radius: 5px;
+    padding: 1%;
+
+    .table_box {
+      width: 100%;
+      height: 93%;
+      margin: 0 auto;
+      overflow: auto;
     }
   }
- 
-</style>
\ No newline at end of file
+
+  /deeep/ .el-loading-mask {
+    z-index: 9999;
+  }
+}
+
+.nodeBox {
+  h5 {
+    line-height: 26px;
+    font-size: 14px;
+
+    span {
+      font-weight: bolder;
+    }
+  }
+
+  h3 {
+    line-height: 40px;
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+  h1 {
+    font-weight: bold;
+  }
+}
+
+.inquire {
+  padding: 8px;
+  //margin-top: 20px;
+
+  border-radius: 5px;
+
+  //margin-bottom: 20px;
+  .el-form-item {
+    margin: 5px;
+  }
+}
+
+.el-tabs {
+  height: calc(100% - 18px);
+}
+
+/deep/ .el-tabs__content {
+  height: calc(100% - 49px);
+}
+
+/deep/ .el-tab-pane {
+  height: 100%;
+}
+
+.text-center {
+  text-align: center;
+}
+</style>

--
Gitblit v1.9.3