From 97277a2c41d80bbf375f88a47e242f1b17602b2b Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期三, 29 十一月 2023 16:53:10 +0800
Subject: [PATCH] 发布管理修改

---
 src/views/datamanage/dataUpdata.vue | 1993 +++++++++++++++++++++++++---------------------------------
 1 files changed, 866 insertions(+), 1,127 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index cd3692e..9023154 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1,43 +1,20 @@
 <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>
-    <el-divider/>
-    <el-tabs
-        type="card"
-        v-model="activeTabName"
-        @tab-click="handleTabClick"
-    >
+      `${$t('dataManage.dataManage')}`,
+      `${$t('dataManage.dataUpdata')}`,
+    ]"></My-bread>
+    <el-divider />
+    <el-tabs type="card" v-model="activeTabName" @tab-click="handleTabClick">
       <!-- 涓婁紶鏁版嵁 -->
-      <el-tab-pane
-          :label="$t('dataManage.dataUpObj.uploaddata')"
-          name="first"
-      >
+      <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 :inline="true" :model="formInline" class="demo-form-inline">
             <!-- 鍏ュ簱绫诲瀷 -->
-            <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-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"
@@ -45,42 +22,19 @@
                                   :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.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')"
-                size="small"
-            >
-              <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
@@ -93,60 +47,25 @@
               ></el-cascader>  -->
             </el-form-item>
             <!-- 椤圭洰鍚嶇О -->
-            <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-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%"
-                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-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%"
-                size="small"
-            >
-              <el-select
-                  :popper-append-to-body="false"
-                  :disabled="tableData.length == 0 ? false : true"
-                  v-model="formInline.specialtyId"
-                  :placeholder="$t('common.choose')"
-              >
+            <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"
@@ -154,212 +73,114 @@
                                   :value="item.value">
                                 </el-option>-->
 
-                <el-option
-                    :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
-                    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.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%"
-                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-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 :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 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>
+                  <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 :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" v-model="formInline.specialtyData"
+                    style="width:200px;" disabled>
                   </el-input>
                 </el-form-item>
                 <!-- 閫夋嫨鍏冩暟鎹� -->
-                <el-form-item v-show="uploadFlag" 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-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 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>
+                  <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"
-                    size="small"
-                >
-                  <el-input
-                      :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
-                      v-model="formInline.metaData"
-                      style="width:200px;"
-                      disabled
-                  >
+                <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 :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 :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>
+                  <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 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"
-                  >{{
+                  <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 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 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 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>
 
@@ -367,58 +188,19 @@
         <!-- 涓婁紶鏁版嵁鍒楄〃 -->
         <div class="dividing-line"></div>
         <div class="table_box" :style="styleVar">
-          <el-table
-              style="width:100%"
-              :data="tableData"
-              @selection-change="handleSelectionChange"
-              height="calc(100% - 57px)"
-          >
-            <el-table-column
-                type="selection"
-                width="55"
-            />
+          <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="primary"
-                    size="mini"
-                    plain
-                > 鏃ュ織
+                <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>
@@ -426,38 +208,27 @@
         </div>
       </el-tab-pane>
       <!-- 鍏ュ簱鏁版嵁娓呭崟 -->
-      <el-tab-pane
-          :label="$t('dataManage.dataUpObj.receiptdata')"
-          name="second"
-      >
+      <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"
-          >
+          <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.shuJuJianSuo.valueone')"
-                      style="width: 200px;"
-                      suffix-icon="el-icon-edit"
-                  ></el-input>
+                  <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.delete"
-                      @click="setWarehouseDel"
-                      icon="el-icon-folder-delete"
-                      type="danger"
-                      size="small"
-                  >{{ $t('common.delete') }}
+                  <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
+                  <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"
@@ -465,253 +236,111 @@
                   >{{
                       $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>
-                  <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 @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="dividing-line"></div>
         <div class="table_box" :style="styleVar1">
-          <el-table
-              ref="filterTable"
-              :data="waretableData"
-              style="width: 100%"
-              height="calc(100% - 57px)"
-              @selection-change="handleDelteChange"
-          >
-            <el-table-column
-                type="selection"
-                width="55"
-            >
+          <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"
-            >
+            <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-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')"
-            >
+            <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>
+                <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-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">
-            <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"
-            >
+          <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>
 
-
       </el-tab-pane>
     </el-tabs>
     <!-- 璐ㄦ寮圭獥 -->
-    <el-dialog
-        title="鏁版嵁璐ㄦ"
-        :visible.sync="quayTestVisible"
-        width="70%"
-        top="2vh"
-        :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/>
+        <el-divider />
         <div class="dialogContent">
-          <div
-              class="ContBox"
-              v-show="quayTestShow.checkAttrs"
-          >
-            <el-checkbox
-                checked
-                disabled
-            >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)
+          <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)
+          <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)
+          <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)
+          <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)
+          <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)
+          <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 checked disabled>鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)
                 </el-checkbox>
               </el-form-item>
               <el-form-item>
@@ -756,20 +385,10 @@
               </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 checked disabled>鏍呮牸妫�鏌ワ細(.tif/.img)
                 </el-checkbox>
               </el-form-item>
               <el-form-item>
@@ -790,20 +409,10 @@
               </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 checked disabled>楂樼▼妫�鏌ワ細(.tif/.img)
                 </el-checkbox>
               </el-form-item>
               <el-form-item>
@@ -824,20 +433,10 @@
               </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 checked disabled>鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)
                 </el-checkbox>
               </el-form-item>
               <el-form-item>
@@ -850,20 +449,10 @@
               </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 checked disabled>OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx)
                 </el-checkbox>
               </el-form-item>
               <el-form-item>
@@ -878,110 +467,47 @@
           </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"
-        top="2vh"
-        :modal="false"
-        :before-close="handleTestQuayCloseDown"
-
-    >
+    <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="testQuayVisible" :modal="false" :before-close="handleTestQuayCloseDown">
       <el-form :model="formCheckAll" label-position="top">
         <el-form-item label="椤圭洰鍚嶇О">
 
-          <el-input
-              disabled
-              v-model="formCheckAll.xmmc"
-              style="width:85%"
-          ></el-input>
+          <el-input disabled v-model="formCheckAll.xmmc" style="width:85%"></el-input>
 
         </el-form-item>
         <el-form-item label="鎵�灞炰笓涓�">
 
-
-          <el-input
-              disabled
-              v-model="formCheckAll.sjzy"
-              style="width:85%"
-          ></el-input>
+          <el-input disabled v-model="formCheckAll.sjzy" style="width:85%"></el-input>
 
         </el-form-item>
-        <el-form-item
-            v-show="formCheckAll.isDiZai"
-            label="鎵�灞炰笓涓�"
-        >
+        <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-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%"
-        top="2vh"
-    >
+    <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 @click="singleElection(item)" v-for="(item, i) in tableWareOne"
+              :class="{ active: activeName == item.eventid }">{{ item.tab }} ({{ item.type }})
             </li>
           </ul>
         </div>
@@ -993,13 +519,10 @@
           </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 @click="singleElection2(item)" v-for="(item, i) in tableWareTwo"
+              :class="{ active: activeName2 == item.entity }">{{ item.tabDesc }} ( {{ item.ns }}.{{ item.tab }})
             </li>
           </ul>
         </div>
@@ -1008,145 +531,67 @@
             <div style="padding:2%">
               <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link>
             </div>
-            <br/>
+            <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 @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="2vh"
-    >
+    <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 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%"
-        top="2vh"
-    >
+    <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"
-        top="2vh"
-    >
-      <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>
-    <el-dialog
-        :title="fromQueryMeta.title"
-        :visible.sync="queryMetaFlag"
-        width="70%"
-        top="2vh"
-    >
+    <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>
+              suffix-icon="el-icon-edit"></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -1154,116 +599,115 @@
             <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 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 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')"
-          >
+          <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>
+              <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="rows" :label="$t('common.lineNuber')" />
+          <el-table-column align="center" prop="desc" :label="$t('dataManage.dataUpObj.describe')" />
 
         </el-table>
-        <div
-
-            class="pagination_box"
-        >
-          <el-pagination
-              @size-change="handleMetaSizeChange"
-              @current-change="handMetaCurrentChange"
-              :current-page="listMetaData.pageIndex"
-              :page-sizes="[10, 20, 50, 100]"
-              :page-size="listMetaData.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="listMetaData.count"
-          >
+        <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>
-    <input
-        name="file1"
-        :accept="'.zip'"
-        type="file"
-        id="editimageFile"
-        multiple="multiple"
-        style="display: none"
-        @change="uploadAnFilesChange"
-    />
+    <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 { getToken } from "@/utils/auth";
 import {
   dataUpload_deleteMetas,
   dataUpload_insertFiles,
@@ -1281,7 +725,9 @@
   dataUploadSelectFiles,
   dataUploadSelectPath,
   dataUploadSelectVerByDirid,
+  dataUpload_selectMetaById,
   selectdirTab,
+  dataUpload_insertKml
 } from "../../api/api";
 
 export default {
@@ -1368,7 +814,7 @@
         name: null,
       },
       count: 0,
-      formWarehousing: {name: ""},
+      formWarehousing: { name: "" },
       multipleSelection: [],
       tableData: [],
       entryOption: [],
@@ -1397,6 +843,9 @@
         selectFileType: "*.*",
         coordinateId: null,
         path: null,
+        verid: null,
+        tab: "",
+        medium: "",
       },
       cascader: {
         label: "name",
@@ -1422,6 +871,67 @@
           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,
@@ -1439,6 +949,7 @@
       wareTableFlag: null,
       insertWareList: null,
       loading: false,
+      loadText: '',
       dbTableData: [],
       dialogVisible: false,
       listLoader: {
@@ -1483,12 +994,21 @@
         name: "",
       },
       metaDataTable: [],
+      queryMetaFlag1: false,
+      metaDataTable1: [],
+      getCheckedKeys: null,
+      sc: {
+        label1: '涓婁紶',
+        label2: '鏂囦欢涓婁紶杩涘害锛�'
+      },
+      warehouseDialog: false,
+      wareData: [],
+      noteVisible: false,
     };
   },
 
   mounted() {
-    //鑾峰彇鐩綍
-    this.getSelectdirTab();
+    this.noteVisible = true;
     //鑾峰彇鍧愭爣绯�
     this.setCoordinateSystem();
     //鑾峰彇椤圭洰鍚嶇О
@@ -1499,6 +1019,8 @@
     this.getPerms();
     window.addEventListener("resize", this.onResize);
     this.calHeight();
+    //鑾峰彇鐩綍
+    this.getSelectdirTab();
   },
   beforeDestroy() {
     this.timer && clearTimeout(this.timer);
@@ -1506,6 +1028,16 @@
   },
   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;
@@ -1532,6 +1064,22 @@
       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;
@@ -1566,8 +1114,8 @@
         const rect1 = this.$refs.container1.getBoundingClientRect();
 
         this.tableHeight = `${rect.height + 40}px`;
-        this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
-        this.styleVar1["height"] = `calc(100% - ${rect1.height + 40}px)`;
+        this.styleVar["height"] = `calc(100% - ${rect.height + 28}px)`;
+        this.styleVar1["height"] = `calc(100% - ${rect1.height + 28}px)`;
       });
     },
     editFromDataClose() {
@@ -1591,52 +1139,57 @@
         formData.append("ids", this.enclosureData[i]);
       }
       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("闄勪欢涓婁紶澶辫触");
-              }
+        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浣跨敤
-            },
-          }
+            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浣跨敤
+          },
+        }
       );
     },
     //閫夋嫨涓婁紶闄勪欢鐨勬枃浠�
@@ -1657,7 +1210,7 @@
         "bs.m_equipment_nameplate",
         "bs.m_hydraulic_protection",
         "bs.m_marker",
-        "bs.s_borehole",
+        "bs.s_explorationpoint",
       ];
       var std = [];
       this.enclosureData = [];
@@ -1756,6 +1309,7 @@
         this.$message.error("瀛楁鍒楄〃璋冪敤澶辫触");
         return;
       }
+
       var val = data1.result;
       for (var i in val) {
         val[i].createuser = val[i].createName;
@@ -1773,6 +1327,29 @@
       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;
@@ -1787,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;
@@ -1805,20 +1385,32 @@
         });
       }
 
-      this.loading = true;
+
       const res = await dataUpload_insertFiles(
-          JSON.stringify(this.insertWareList)
+        JSON.stringify(this.insertWareList)
       );
-      this.loading = false;
+
       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();
+    },
+    handleWarehouseClose() {
+      this.warehouseDialog = false;
+      this.wareData = [];
     },
     //鑷姩鍖归厤
     autoMatchWare() {
@@ -1828,7 +1420,8 @@
       for (var i = 0; i < val1.length; i++) {
         const stdTab = this.setSplitWare(val1[i].tab);
         for (var j = 0; j < val2.length; j++) {
-          if (val2[j].tab == stdTab) {
+          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;
@@ -1840,7 +1433,7 @@
       }
       std.forEach((item) => {
         this.tableWareOne = this.tableWareOne.filter(
-            (items) => items.tab !== item
+          (items) => items.tab !== item
         );
       });
     },
@@ -1875,7 +1468,7 @@
       this.wareSelectOne.entity = this.wareSelectTwo.entity;
       this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
       this.wareSelectOne.tabs =
-          this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
+        this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
       if (this.tableWareThree.indexOf(this.wareSelectOne) != -1) {
       } else {
         this.tableWareThree.push(this.wareSelectOne);
@@ -1918,101 +1511,160 @@
       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,
+        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]);
-        }
+
+      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;
       }
-      if (std.length != 0) {
-        this.tableWareOne = std;
-        this.showWareHousing();
+
+      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 {
-        this.setInsrtWareTable();
+        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];
+          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
+        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;
@@ -2024,11 +1676,14 @@
           this.formCheckAll.wbsPath = path;
         }
       }
+
+      this.formCheckAll.sjfl = '鏁板瓧鍖栨垚鏋�'
       const data = await dataUpload_uploadChecks(this.formCheckAll);
       if (data.code != 200) {
         this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
         this.taskStatus++;
-        this.getStartTestQuayTaskStatus();
+        this.jindudialogVisible = false;
+        this.loading = false;
         return;
       }
       var reset = data.result;
@@ -2040,32 +1695,46 @@
 
     //鍗曟枃浠舵暟鎹川妫�鎻愪氦
     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() {
+      const that = this;
       if (
-          this.multipleSelection == 0 ||
-          this.taskStatus == this.multipleSelection.length
+        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.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("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -2083,7 +1752,7 @@
     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;
 
@@ -2093,24 +1762,25 @@
             //璐ㄦ鎴愬姛
             for (var i in this.tableData) {
               if (
-                  this.tableData[i].path ==
-                  this.multipleSelection[this.taskStatus].path
+                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();
-            }
+            // 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
+                this.tableData[i].path ==
+                this.multipleSelection[this.taskStatus].path
               ) {
                 this.tableData[i].status = "璐ㄦ澶辫触";
               }
@@ -2131,9 +1801,14 @@
       }
       this.progress = std / (res.length * 100);
       for (var i in this.tableData) {
+        if (!this.multipleSelection[this.taskStatus]) {
+          break;
+        }
         if (
-            this.tableData[i].path == this.multipleSelection[this.taskStatus].path
+
+          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) + "%";
         }
       }
@@ -2141,7 +1816,7 @@
     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) {
@@ -2155,11 +1830,11 @@
                 }
               }
             }
-            if (this.progress == 1) {
-              clearInterval(this.setIntel);
-              this.setIntel = null;
-              this.loading = false;
-            }
+            // if (this.progress == 1) {
+            clearInterval(this.setIntel);
+            this.setIntel = null;
+            this.loading = false;
+            // }
           } else {
             //浠诲姟澶辫触
             for (var i in this.tableData) {
@@ -2186,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) {
@@ -2253,11 +1931,18 @@
     //娓呴櫎鎵�鏈塱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() {
@@ -2299,18 +1984,20 @@
         if (fs2.files.length == 0) {
           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"});
+            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"});
+            this.fileType.push({ name: fs2.files[i].name, type: "wbsData" });
           }
         }
       }
@@ -2324,51 +2011,51 @@
       });
       that.$set(this, "jindutiaoname", listval);
       that.$set(this, "jindutiao", 0);
-      this.loading = true;
+      // 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();
+        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浣跨敤
-            },
-          }
+            if (myXhr.upload) {
+              //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+              myXhr.upload.addEventListener(
+                "progress",
+                that.progressHandlingFunction,
+                false
+              ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+            }
+            return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+          },
+        }
       );
     },
     progressHandlingFunction(event) {
@@ -2379,7 +2066,15 @@
       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() {
@@ -2397,7 +2092,7 @@
           return rs;
         }
       });
-      this.pathBak = val[0].bak;
+      this.pathBak = val[0].checks;
       this.formInline.dirid = val[0].id;
       this.getselectVerByDirid();
     },
@@ -2446,11 +2141,11 @@
     //鏁版嵁璐ㄦ寮圭獥鍏抽棴--椤圭洰鏁翠綋
     handleTestQuayCloseDown() {
       this.$confirm("纭鍏抽棴锛�")
-          .then((_) => {
-            this.closeTestQuayCloseDialog();
-          })
-          .catch((_) => {
-          });
+        .then((_) => {
+          this.closeTestQuayCloseDialog();
+        })
+        .catch((_) => {
+        });
     },
     closeTestQuayCloseDialog() {
       this.testQuayVisible = false;
@@ -2458,11 +2153,11 @@
     //鏁版嵁璐ㄦ寮圭獥鍏抽棴--鍗曟枃浠�
     handleQuayTestCloseDown() {
       this.$confirm("纭鍏抽棴锛�")
-          .then((_) => {
-            this.closeQuayTestCloseDialog();
-          })
-          .catch((_) => {
-          });
+        .then((_) => {
+          this.closeQuayTestCloseDialog();
+        })
+        .catch((_) => {
+        });
     },
     closeQuayTestCloseDialog() {
       this.quayTestVisible = false;
@@ -2476,8 +2171,9 @@
         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;
@@ -2500,7 +2196,8 @@
         if (fileExcel.length != 1) {
           return this.$message("璇烽�夋嫨涓�涓猈BS鏂囦欢");
         }
-        this.formCheckAll.names = this.pathBak;
+
+        this.formCheckAll.names = JSON.parse(this.pathBak).toString();
         var val = this.entryOption.filter((res) => {
           if (res.id == this.formInline.dirid) {
             return res;
@@ -2510,10 +2207,10 @@
         this.formCheckAll.xmmc = val[0].name;
         this.formCheckAll.sjzy = this.formInline.specialtyId;
         if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) {
-          this.formCheckAll.isDiZai = true;
+          this.formCheckAll.isDiZai = "YES";
           this.formCheckAll.diZaiType = this.disOptions[0].value;
         } else {
-          this.formCheckAll.isDiZai = false;
+          this.formCheckAll.isDiZai = "NO";
           this.formCheckAll.diZaiType = "NO";
         }
         this.testQuayVisible = true;
@@ -2527,7 +2224,7 @@
         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("鍒犻櫎澶辫触");
@@ -2568,17 +2265,17 @@
       var mm = time.getMinutes();
       var s = time.getSeconds();
       return (
-          y +
-          "-" +
-          this.add0(m) +
-          "-" +
-          this.add0(d) +
-          " " +
-          h +
-          ":" +
-          mm +
-          ":" +
-          s
+        y +
+        "-" +
+        this.add0(m) +
+        "-" +
+        this.add0(d) +
+        " " +
+        h +
+        ":" +
+        mm +
+        ":" +
+        s
       );
     },
     //鏍煎紡鍖栨椂闂�
@@ -2599,11 +2296,13 @@
     },
     //涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
     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();
     },
     //鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
@@ -2673,6 +2372,8 @@
       this.formInline.entryId = null;
       this.formInline.selectFileType = "*.*";
       this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
+      this.formInline.medium = "";
+      this.formInline.tab = "";
     },
     //閫夋嫨鏁版嵁
     setSelectFile() {
@@ -2692,9 +2393,17 @@
         this.formInline.entryId = this.entryOption[0].name;
         this.formInline.dirid = this.entryOption[0].id;
         this.getselectVerByDirid();
-        this.pathBak = this.entryOption[0].bak;
+        this.pathBak = this.entryOption[0].checks;
+      } else if (res == "v3") {
+        this.formInline.selectFileType = ".kml";
+        this.getSelectdirTab();
+        this.getselectVerByDirid();
+        this.formInline.specialtyId = "绾胯矾涓撲笟";
+        this.uploadFlag = true;
+        this.formInline.tab = this.lineOptions[0].value;
+        this.formInline.medium = this.mediumOptions[0].value
       } else {
-        this.getStartDirChecked(this.catalogOption);
+        this.getSelectdirTab();
         this.getselectVerByDirid();
         this.uploadFlag = true;
       }
@@ -2703,10 +2412,11 @@
     //鐗堟湰鍙疯幏鍙�
     async getselectVerByDirid() {
       this.verOption = [];
-      this.formInline.verid = "";
+
       const res = await dataUploadSelectVerByDirid({
         dirid: this.formInline.dirid,
       });
+
       if (res.code != 200) {
         this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
         return;
@@ -2721,9 +2431,11 @@
         this.$message.error("鐩綍鍒楄〃鑾峰彇澶辫触");
         return;
       }
+
       this.catalogOption = this.treeData(res.result);
       this.formInline.dirName = this.catalogOption[0].name;
-      this.getStartDirChecked(this.catalogOption);
+      this.formInline.dirid = this.catalogOption[0].id;
+      // this.getStartDirChecked(this.catalogOption);
       this.getselectVerByDirid();
     },
 
@@ -2751,20 +2463,20 @@
         lazDensity: "1",
         imgResolution: "0.2",
       }),
-          (this.quayTestShow = {
-            checkOsgb: false,
-            checkXls: false,
-            checkLaz: false,
-            checkDem: false,
-            checkAttrs: false,
-            checkTopology: false,
-            checkDecorate: false,
-            checkOrigin: false,
-            checkDom: false,
-            checkMath: false,
-            checkMeta: false,
-            checkMain: false,
-          });
+        (this.quayTestShow = {
+          checkOsgb: false,
+          checkXls: false,
+          checkLaz: false,
+          checkDem: false,
+          checkAttrs: false,
+          checkTopology: false,
+          checkDecorate: false,
+          checkOrigin: false,
+          checkDom: false,
+          checkMath: false,
+          checkMeta: false,
+          checkMain: false,
+        });
     },
     //鐩綍鍒囨崲
     catalogChange(data, node, nodeData) {
@@ -2772,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) {
@@ -2781,7 +2494,7 @@
           }
         }
       }
-      var fileType = node.data.code;
+      var fileType = node.data.exts;
       if (fileType == null) {
         fileType = "*.*";
       }
@@ -2789,11 +2502,16 @@
       this.formInline.dirid = node.data.id;
       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();
     },
@@ -2813,7 +2531,7 @@
 <style lang="less" scoped>
 .bottom {
   width: 100%;
-  margin-top: 1%;
+  margin-top: 0.5%;
   // height: 74%;
   height: 570px;
   display: flex;
@@ -2839,6 +2557,27 @@
   }
 }
 
+.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;
@@ -2852,7 +2591,7 @@
 }
 
 .el-tabs {
-  height: calc(100% - 70px);
+  height: calc(100% - 18px);
 }
 
 /deep/ .el-tabs__content {
@@ -2866,4 +2605,4 @@
 .text-center {
   text-align: center;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3