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

---
 src/views/datamanage/dataUpdata.vue | 1538 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 989 insertions(+), 549 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 6f683da..444e5ed 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -3,6 +3,7 @@
     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')}`,
@@ -10,6 +11,7 @@
       ]"></My-bread>
     <el-divider />
     <el-tabs
+      type="card"
       v-model="activeTabName"
       @tab-click="handleTabClick"
     >
@@ -18,7 +20,10 @@
         :label="$t('dataManage.dataUpObj.uploaddata')"
         name="first"
       >
-        <div class="inquire subpage_Div" ref="container">
+        <div
+          class="inquire subpage_Div"
+          ref="container"
+        >
           <el-form
             :inline="true"
             :model="formInline"
@@ -28,6 +33,7 @@
             <el-form-item
               :label="$t('dataManage.dataUpObj.UploadType')"
               style="margin-right: 2%"
+              size="small"
             >
               <el-select
                 :disabled="tableData.length == 0 ? false : true"
@@ -36,21 +42,34 @@
                 :popper-append-to-body="false"
                 placeholder="璇烽�夋嫨"
               >
+                <!--                <el-option
+                                  v-for="item in uploadOption"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value"
+                                ></el-option>-->
+
                 <el-option
-                  v-for="item in uploadOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
+                  :label="$t('shuJuGuanLi.pselect.dFile')"
+                  value="v1"
+                />
+                <el-option
+                  :label="$t('shuJuGuanLi.pselect.dFiles')"
+                  value="v2"
+                />
+
               </el-select>
+
             </el-form-item>
             <!-- 瀛樺偍鐩綍 -->
             <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"
@@ -83,6 +102,7 @@
               style="margin-right: 2%"
               v-show="!uploadFlag"
               :label="$t('dataManage.dataUpObj.entryName')"
+              size="small"
             >
               <el-select
                 :popper-append-to-body="false"
@@ -103,6 +123,7 @@
             <el-form-item
               :label="$t('dataManage.dataUpObj.dataVersion')"
               style="margin-right: 2%"
+              size="small"
             >
               <el-select
                 :popper-append-to-body="false"
@@ -123,6 +144,7 @@
             <el-form-item
               :label="$t('dataManage.dataUpObj.dataSpecialty')"
               style="margin-right: 2%"
+              size="small"
             >
               <el-select
                 :popper-append-to-body="false"
@@ -130,19 +152,40 @@
                 v-model="formInline.specialtyId"
                 :placeholder="$t('common.choose')"
               >
+                <!--                <el-option
+                                  v-for="item in specialtyOption"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>-->
+
                 <el-option
-                  v-for="item in specialtyOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.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"
@@ -161,22 +204,25 @@
             </el-form-item>
             <div class="flex_box">
               <div style="margin-right: auto">
-                 <!-- 閫夋嫨鏁版嵁 -->
-                <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>
+                  >{{ $t('dataManage.dataUpObj.selectData') }}
+                  </el-link>
                   <el-link
                     v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'"
                     @click="restSelectFile"
                     :underline="false"
                     type="primary"
-                  >{{$t('common.reset') }}</el-link>
+                  >{{ $t('common.reset') }}
+                  </el-link>
                   <input
+                    size="small"
                     id="selectDataFile"
                     type="file"
                     name="file"
@@ -186,30 +232,35 @@
                     style="display: none"
                   ></input>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item size="small">
                   <el-input
-                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
                     v-model="formInline.specialtyData"
-                    style="width:210px;"
+                    style="width:200px;"
                     disabled
                   >
                   </el-input>
                 </el-form-item>
                 <!-- 閫夋嫨鍏冩暟鎹� -->
-                <el-form-item v-show="uploadFlag">
+                <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-link>
+                  >{{ $t('dataManage.dataUpObj.selectMetadata') }}
+                  </el-link>
                   <el-link
                     v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'"
                     @click="restMetaFile"
                     :underline="false"
                     type="primary"
-                  >{{$t('common.reset') }}</el-link>
+                  >{{ $t('common.reset') }}
+                  </el-link>
                   <input
                     id="metaDataFile"
                     type="file"
@@ -222,106 +273,116 @@
                 </el-form-item>
                 <el-form-item
                   v-show="uploadFlag"
+                  size="small"
                 >
                   <el-input
-                    placeholder="璇疯緭鍏ュ唴瀹�"
+                    :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
                     v-model="formInline.metaData"
-                    style="width:210px;"
+                    style="width:200px;"
                     disabled
                   >
                   </el-input>
                 </el-form-item>
                 <!-- 閫夋嫨WBS鏁版嵁 -->
                 <el-form-item v-show="!uploadFlag">
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
-                @click="setWBSFile"
-                :underline="false"
-                type="primary"
-              >{{$t('dataManage.dataUpObj.selectWBSData') }}</el-link>
-              <el-link
-                :disabled="tableData.length == 0 ? false : true"
-                v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
-                @click="restWBSFile"
-                :underline="false"
-                type="primary"
-              >{{$t('common.reset') }}</el-link>
-              <input
-                id="wbsDataFile"
-                type="file"
-                name="file"
-                multiple="multiple"
-                accept=".xls,.xlsx"
-                style="display: none"
-                @change="handleWBSFileChange"
-              ></input>
+                  <el-link
+                    :disabled="tableData.length == 0 ? false : true"
+                    v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
+                    @click="setWBSFile"
+                    :underline="false"
+                    type="primary"
+                  >{{ $t('dataManage.dataUpObj.selectWBSData') }}
+                  </el-link>
+                  <el-link
+                    :disabled="tableData.length == 0 ? false : true"
+                    v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
+                    @click="restWBSFile"
+                    :underline="false"
+                    type="primary"
+                  >{{ $t('common.reset') }}
+                  </el-link>
+                  <input
+                    id="wbsDataFile"
+                    type="file"
+                    name="file"
+                    multiple="multiple"
+                    accept=".xls,.xlsx"
+                    style="display: none"
+                    @change="handleWBSFileChange"
+                  ></input>
                 </el-form-item>
                 <el-form-item v-show="!uploadFlag">
-              <el-input
-                placeholder="璇烽�夋嫨WBS鏁版嵁"
-                v-model="formInline.wbsData"
-                style="width:210px;"
-                disabled
-              >
-              </el-input>
+                  <el-input
+                    placeholder="璇烽�夋嫨WBS鏁版嵁"
+                    v-model="formInline.wbsData"
+                    style="width:210px;"
+                    disabled
+                  >
+                  </el-input>
                 </el-form-item>
               </div>
               <div>
                 <el-form-item>
-              <!-- 涓婁紶 -->
-              <el-button
-                v-if="menuStatus.upload"
-                :disabled="tableData.length == 0 ? false : true"
-                @click="setFileUpload"
-                size="small"
-                icon="el-icon-upload"
-                type="success"
-              >{{
-              $t('common.upload')
-            }}</el-button>
-              <!-- 鍒犻櫎 -->
-              <el-button
-                v-if="menuStatus.delete"
-                :disabled="multipleSelection.length == 0 ? true : false"
-                icon="el-icon-delete"
-                size="small"
-                @click="setFileDelete"
-                type="danger"
-              >{{ $t('common.delete') }}</el-button>
-              <!-- 鍏ュ簱 -->
-              <el-button
-                v-if="menuStatus.insert"
-                @click="setFileWare"
-                size="small"
-                :disabled="tableData.length == 0 ?  true: false"
-                icon="el-icon-folder-add"
-                type="warning"
-              >{{ $t('common.Warehousin') }}</el-button>
-              <!-- 璐ㄦ -->
-              <el-button
-                style="margin-right:-9px"
-                v-if="menuStatus.insert"
-                :disabled="multipleSelection.length == 0 ? true : false"
-                type="info"
-                size="small"
-                icon="el-icon-folder-checked"
-                @click="handleQuayTestClick()"
-              >{{$t('common.quayTest')}}
-              </el-button>
+                  <!-- 涓婁紶 -->
+                  <el-button
+                    v-if="menuStatus.upload"
+                    :disabled="tableData.length == 0 ? false : true"
+                    @click="setFileUpload"
+                    size="small"
+                    icon="el-icon-upload"
+                    type="success"
+                  >{{
+                      $t('common.upload')
+                    }}
+                  </el-button>
+                  <!-- 鍒犻櫎 -->
+                  <el-button
+                    v-if="menuStatus.delete"
+                    :disabled="multipleSelection.length == 0 ? true : false"
+                    icon="el-icon-delete"
+                    size="small"
+                    @click="setFileDelete"
+                    type="danger"
+                  >{{ $t('common.delete') }}
+                  </el-button>
+                  <!-- 鍏ュ簱 -->
+                  <el-button
+                    v-if="menuStatus.insert"
+                    @click="setFileWare"
+                    size="small"
+                    :disabled="tableData.length == 0 ?  true: false"
+                    icon="el-icon-folder-add"
+                    type="warning"
+                  >{{ $t('common.Warehousin') }}
+                  </el-button>
+                  <!-- 璐ㄦ -->
+                  <el-button
+                    style="margin-right:-9px"
+                    v-if="menuStatus.insert"
+                    :disabled="multipleSelection.length == 0 ? true : false"
+                    type="info"
+                    size="small"
+                    icon="el-icon-folder-checked"
+                    @click="handleQuayTestClick()"
+                  >{{ $t('common.quayTest') }}
+                  </el-button>
 
                 </el-form-item>
               </div>
             </div>
-           
-          
+
           </el-form>
-         
+
         </div>
         <!-- 涓婁紶鏁版嵁鍒楄〃 -->
-        <div class="table_box" :style="styleVar">
+        <div class="dividing-line"></div>
+        <div
+          class="table_box"
+          :style="styleVar"
+        >
           <el-table
             style="width:100%"
+            border
             :data="tableData"
             @selection-change="handleSelectionChange"
             height="calc(100% - 57px)"
@@ -368,9 +429,9 @@
                   v-if="menuStatus.download"
                   v-show="scope.row.code != null"
                   @click="handerLogClick(scope.row)"
-                  type="text"
+                  type="primary"
                   size="mini"
-                  style="font-size: 14px;"
+                  plain
                 > 鏃ュ織
                 </el-button>
               </template>
@@ -383,175 +444,213 @@
         :label="$t('dataManage.dataUpObj.receiptdata')"
         name="second"
       >
-        <div class="inquire subpage_Div" ref="container1">
+        <div
+          class="inquire subpage_Div"
+          ref="container1"
+        >
           <el-form
             :inline="true"
             :model="formWarehousing"
             class="demo-form-inline"
           >
-          <div class="flex_box">
-            <div style="margin-right: auto">
-            <el-form-item :label="$t('dataManage.dataUpObj.describe')">
-              <el-input
-                v-model="formWarehousing.name"
-                placeholder="璇疯緭鍏ュ唴瀹�"
-                style="width: 200px;"
-              ></el-input>
-            </el-form-item>
+            <div class="flex_box">
+              <div style="margin-right: auto">
+                <el-form-item
+                  size="small"
+                  :label="$t('dataManage.dataUpObj.describe')"
+                >
+                  <el-input
+                    v-model="formWarehousing.name"
+                    :placeholder="$t('shuJuGuanLi.lable1')"
+                    style="width: 200px;"
+                  ><i
+                      slot="suffix"
+                      class="el-icon-search"
+                      @click="setWarehouseSearch"
+                      style="padding-right: 8px"
+                    ></i></el-input>
+                </el-form-item>
+              </div>
+              <div>
+                <el-form-item>
+                  <el-button
+                    v-if="menuStatus.upload"
+                    :disabled="multipleDelete.length == 0 ? true : false"
+                    @click="setEnclosure"
+                    icon="el-icon-folder-opened"
+                    type="success"
+                    size="small"
+                  >{{ $t('common.enclosure') }}
+                  </el-button>
+                  <el-button
+                    v-if="menuStatus.delete"
+                    @click="setWarehouseDel"
+                    icon="el-icon-folder-delete"
+                    type="danger"
+                    size="small"
+                  >{{ $t('common.delete') }}
+                  </el-button>
+                  <!--                  <el-button
+                      @click="setWarehouseSearch"
+                      icon="el-icon-upload"
+                      size="small"
+                      class="primary"
+                  >{{
+                      $t('common.iquery')
+                    }}
+                  </el-button>-->
+                  <el-button
+                    @click="setWarehouseReset"
+                    icon="el-icon-folder-add"
+                    size="small"
+                    type="info"
+                  >{{ $t('common.reset') }}
+                  </el-button>
+                </el-form-item>
+              </div>
             </div>
-            <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>
-              <el-button
-                @click="setWarehouseSearch"
-                icon="el-icon-upload"
-                size="small"
-                class="primary"
-              >{{
-              $t('common.iquery')
-            }}</el-button>
-              <el-button
-                @click="setWarehouseReset"
-                icon="el-icon-folder-add"
-                size="small"
-                type="info"
-              >{{ $t('common.reset') }}</el-button>
-            </el-form-item>
-            <el-form-item>
-              <el-button
-                v-if="menuStatus.upload"
-                :disabled="multipleDelete.length == 0 ? true : false"
-                @click="setEnclosure"
-                icon="el-icon-folder-opened"
-                type="success"
-                size="small"
-              >{{ $t('common.enclosure') }}</el-button>
-            </el-form-item>
-            </div>
-          </div>
-           
-          
+
           </el-form>
         </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-column>
-                <el-table-column
-                  align="center"
-                  type="index"
-                  :label="$t('common.index')"
-                  width="70px"
-                ></el-table-column>
-                <el-table-column
-                  align="center"
-    
-                  :label="$t('common.name')"
-          
-                  width="120"
-                 >
-                      <template slot-scope="scope">
-                                  <span v-if="scope.row.ismeta > 0 ">
-                     <el-link  title="鍏冩暟鎹煡璇�" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
-           
-            </span>
-            <span v-else>{{ scope.row.name }}</span>
-                    </template>
-                 </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="dirName"
-                  :label="$t('dataManage.dataUpObj.catalogue')"
-                  width="300"
-                />
-                <el-table-column
-                  align="center"
-                  prop="depName"
-                  :label="$t('dataManage.dataUpObj.company')"
-                  width="200"
-                />
-                <el-table-column
-                  align="center"
-                  prop="verName"
-                  :label="$t('dataManage.dataUpObj.versionNo')"
-                />
-                <el-table-column
-                  align="center"
-                  prop="type"
-                  :label="$t('common.type')"
-                />
-                <el-table-column
-                  align="center"
-                  prop="sizes"
-                  :label="$t('common.size')"
-                  :formatter="changeSizeFile"
-                />
-                <el-table-column
-                  align="center"
-                  :label="$t('dataManage.dataUpObj.tableName')"
-                >
-                  <template slot-scope="scope">
-                    <a
-                      class="scopeRowColor"
-                      @click="detail(scope.row)"
-                    >{{ scope.row.tab }}</a>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="rows"
-                  :label="$t('common.lineNuber')"
-                />
-                <el-table-column
-                  align="center"
-                  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"
-              >
-              </el-pagination>
-            </div>
-            </div>
-           
-         
+        <div class="dividing-line"></div>
+        <div
+          class="table_box"
+          :style="styleVar1"
+        >
+          <el-table
+            ref="filterTable"
+            :data="waretableData"
+            style="width: 100%"
+            border
+            height="calc(100% - 57px)"
+            @selection-change="handleDelteChange"
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              type="index"
+              :label="$t('common.index')"
+              width="70px"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              :label="$t('common.name')"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.ismeta > 0">
+                  <el-link
+                    style="color:#409eff"
+                    title="婧愭暟鎹煡璇�"
+                    @click="setQueryMetaData(scope.row)"
+                    target="_blank"
+                  >{{ scope.row.name }}</el-link>
+
+                </span>
+                <span v-else-if="scope.row.metaid > 0">
+                  <el-link
+                    style="color:#409eff"
+                    title="鍏冩暟鎹煡璇�"
+                    @click="setMetaDataQuery(scope.row)"
+                    target="_blank"
+                  >{{ scope.row.name }}</el-link>
+
+                </span>
+                <span v-else>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="dirName"
+              :label="$t('dataManage.dataUpObj.catalogue')"
+              width="300"
+            />
+            <el-table-column
+              align="center"
+              prop="depName"
+              :label="$t('dataManage.dataUpObj.company')"
+              width="200"
+            />
+            <el-table-column
+              align="center"
+              prop="verName"
+              :label="$t('dataManage.dataUpObj.versionNo')"
+            />
+            <el-table-column
+              align="center"
+              prop="type"
+              :label="$t('common.type')"
+            />
+            <el-table-column
+              align="center"
+              prop="sizes"
+              :label="$t('common.size')"
+              :formatter="changeSizeFile"
+            />
+            <el-table-column
+              align="center"
+              :label="$t('dataManage.dataUpObj.tableName')"
+            >
+              <template slot-scope="scope">
+                <a
+                  class="scopeRowColor"
+                  @click="detail(scope.row)"
+                >{{ scope.row.tab }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="rows"
+              :label="$t('common.lineNuber')"
+            />
+            <el-table-column
+              align="center"
+              :label="$t('common.dataStatus')"
+              :formatter="stateFormat"
+            >
+
+            </el-table-column>
+            <el-table-column
+              align="
+                  center"
+              prop="desc"
+              :label="$t('dataManage.dataUpObj.describe')"
+            />
+            <el-table-column
+              align="center"
+              prop="uname"
+              :label="$t('dataManage.vmobj.createonuser')"
+            />
+            <el-table-column
+              align="center"
+              prop="createTime"
+              :label="$t('dataManage.vmobj.createontime')"
+              :formatter="changetimeFile"
+              width="100"
+            />
+          </el-table>
+          <div
+            class="pagination_box"
+            style="margin-top: 15px"
+          >
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="listData.pageIndex"
+              :page-sizes="[10, 50, 100, 200,500]"
+              :page-size="listData.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="count"
+            >
+            </el-pagination>
+          </div>
+        </div>
+
       </el-tab-pane>
     </el-tabs>
     <!-- 璐ㄦ寮圭獥 -->
@@ -559,7 +658,6 @@
       title="鏁版嵁璐ㄦ"
       :visible.sync="quayTestVisible"
       width="70%"
-      top="10vh"
       :modal="false"
       :before-close="handleQuayTestCloseDown"
     >
@@ -592,7 +690,8 @@
             <el-checkbox
               checked
               disabled
-            >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)</el-checkbox>
+            >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -601,7 +700,8 @@
             <el-checkbox
               checked
               disabled
-            >鏁板鍩虹妫�鏌ワ細(.shp,.dlg)</el-checkbox>
+            >鏁板鍩虹妫�鏌ワ細(.shp,.dlg)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -610,7 +710,8 @@
             <el-checkbox
               checked
               disabled
-            >鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)</el-checkbox>
+            >鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -619,7 +720,8 @@
             <el-checkbox
               checked
               disabled
-            >琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)</el-checkbox>
+            >琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -628,7 +730,8 @@
             <el-checkbox
               checked
               disabled
-            >鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)</el-checkbox>
+            >鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -637,7 +740,8 @@
             <el-checkbox
               checked
               disabled
-            >鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)</el-checkbox>
+            >鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)
+            </el-checkbox>
           </div>
           <div
             class="ContBox"
@@ -652,7 +756,8 @@
                 <el-checkbox
                   checked
                   disabled
-                >鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)</el-checkbox>
+                >鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -709,7 +814,8 @@
                 <el-checkbox
                   checked
                   disabled
-                >鏍呮牸妫�鏌ワ細(.tif/.img)</el-checkbox>
+                >鏍呮牸妫�鏌ワ細(.tif/.img)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -742,7 +848,8 @@
                 <el-checkbox
                   checked
                   disabled
-                >楂樼▼妫�鏌ワ細(.tif/.img)</el-checkbox>
+                >楂樼▼妫�鏌ワ細(.tif/.img)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -775,7 +882,8 @@
                 <el-checkbox
                   checked
                   disabled
-                >鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)</el-checkbox>
+                >鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -800,7 +908,8 @@
                 <el-checkbox
                   checked
                   disabled
-                >OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) </el-checkbox>
+                >OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx)
+                </el-checkbox>
               </el-form-item>
               <el-form-item>
                 <div class="ContDiv">
@@ -834,50 +943,49 @@
     <el-dialog
       title="鏁版嵁璐ㄦ"
       :visible.sync="testQuayVisible"
-      width="50%"
-      top="15vh"
       :modal="false"
       :before-close="handleTestQuayCloseDown"
-      label-width="80px"
     >
-      <el-form :model="formCheckAll">
+      <el-form
+        :model="formCheckAll"
+        label-position="top"
+      >
         <el-form-item label="椤圭洰鍚嶇О">
-          <el-col :span="20">
-            <el-input
-              disabled
-              v-model="formCheckAll.xmmc"
-            ></el-input>
-          </el-col>
+
+          <el-input
+            disabled
+            v-model="formCheckAll.xmmc"
+            style="width:85%"
+          ></el-input>
+
         </el-form-item>
         <el-form-item label="鎵�灞炰笓涓�">
 
-          <el-col :span="20">
-            <el-input
-              disabled
-              v-model="formCheckAll.sjzy"
-              width="100px"
-            ></el-input>
-          </el-col>
+          <el-input
+            disabled
+            v-model="formCheckAll.sjzy"
+            style="width:85%"
+          ></el-input>
+
         </el-form-item>
         <el-form-item
           v-show="formCheckAll.isDiZai"
-          label="鎵�灞炰笓涓�"
+          label="鍦扮伨绫诲瀷"
         >
-          <el-col :span="20">
-            <el-select
-              v-model="formCheckAll.diZaiType"
-              placeholder="璇烽�夋嫨"
-              style="width:100%"
+
+          <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
-                v-for="item in disOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
+            </el-option>
+          </el-select>
 
         </el-form-item>
       </el-form>
@@ -893,7 +1001,7 @@
         <el-button
           class="elBotton"
           size="small"
-          @click="commonTestQuay"
+          @click="commonTestQuay()"
         >纭� 瀹�</el-button>
       </span>
     </el-dialog>
@@ -910,13 +1018,17 @@
       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>
+            >{{ item.tab }} ({{ item.type }})
+            </li>
           </ul>
         </div>
         <div class="tarnsbtton">
@@ -927,20 +1039,25 @@
           </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>
+            >{{ item.tabDesc }} ( {{ item.ns }}.{{ item.tab }})
+            </li>
           </ul>
         </div>
         <div class="tarnsbtton">
           <div>
             <div style="padding:2%">
               <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link>
-            </div><br />
+            </div>
+            <br />
             <div style="padding:2%">
               <el-link><i
                   @click="setWareTableChangeRight"
@@ -949,13 +1066,17 @@
             </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>
+            >{{ item.tab }} ( {{ item.tabDesc }} {{ item.ns }}.{{ item.tabs }} )
+            </li>
           </ul>
         </div>
       </div>
@@ -984,9 +1105,8 @@
       :title="$t('common.details')"
       :visible.sync="dialogVisible"
       width="70%"
-      top="10vh"
     >
-      <div style="height:550px">
+      <div style="height: 500px; overflow: auto">
         <el-table
           ref="filterTable"
           :data="dbTableData"
@@ -1009,14 +1129,14 @@
           ></el-table-column>
         </el-table>
         <div
-          style="margin-top: 10px"
+          style="margin-top: 15px"
           class="pagination_box"
         >
           <el-pagination
             @size-change="handleLoaderSizeChange"
             @current-change="handleLoaderCurrentChange"
             :current-page="listLoader.pageIndex"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 50, 100, 200]"
             :page-size="listLoader.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="count1"
@@ -1028,13 +1148,13 @@
     </el-dialog>
     <el-dialog
       :close-on-click-modal="false"
-      title="涓婁紶杩涘害"
+      :title="sc.label1"
       :visible.sync="jindudialogVisible"
       width="30%"
     >
       <div>
         <div>
-          鏂囦欢浼犺緭杩涘害锛�
+          {{sc.label2}}
         </div>
         <div>
           <el-progress
@@ -1053,7 +1173,7 @@
       <span
         style="font-size:20px"
         class="scopeRowColor"
-      >{{enclosureTitle}}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
+      >{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
       <span
         slot="footer"
         class="dialog-footer"
@@ -1065,116 +1185,247 @@
         >缁х画</el-button>
       </span>
     </el-dialog>
-   <el-dialog
+    <el-dialog
       :title="fromQueryMeta.title"
       :visible.sync="queryMetaFlag"
-      width="70%" 
-      
+      width="70%"
     >
-    <div style="height:65vh;width:100%; ">
-    <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
-  <el-form-item  >
-    <el-input size="small" v-model="fromQueryMeta.name" ></el-input>
-  </el-form-item>
-  
-  <el-form-item>
-    <el-button type="primary" size="small"  @click="setSearchMetaData()">鏌ヨ</el-button>
-      <el-button type="info" size="small"  @click="setRestMetaData()" >閲嶇疆</el-button>
-  </el-form-item>
-</el-form>
-    <el-table
-                ref="filterTable"
-                :data="metaDataTable"
-                style="width: 100%"
-                height="calc(100% - 100px)"
-                
-              >
-             
-                <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
-         
+      <div style="height: 500px; overflow: auto;width:100%; ">
+        <el-form
+          :inline="true"
+          :model="fromQueryMeta"
+          class="demo-form-inline"
+        >
+          <el-form-item>
+            <el-input
+              size="small"
+              v-model="fromQueryMeta.name"
+              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+              suffix-icon="el-icon-edit"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              @click="setSearchMetaData()"
+            >鏌ヨ</el-button>
+            <el-button
+              type="info"
+              size="small"
+              @click="setRestMetaData()"
+            >閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          ref="filterTable"
+          :data="metaDataTable"
+          style="width: 100%"
+          height="calc(100% - 130px)"
+        >
+
+          <el-table-column
+            align="center"
+            type="index"
+            :label="$t('common.index')"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            :label="$t('common.name')"
+            width="120"
+          >
+
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="dirName"
+            :label="$t('dataManage.dataUpObj.catalogue')"
+            width="300"
+          />
+          <el-table-column
+            align="center"
+            prop="depName"
+            :label="$t('dataManage.dataUpObj.company')"
+            width="200"
+          />
+          <el-table-column
+            align="center"
+            prop="verName"
+            :label="$t('dataManage.dataUpObj.versionNo')"
+          />
+          <el-table-column
+            align="center"
+            prop="type"
+            :label="$t('common.type')"
+          />
+          <el-table-column
+            align="center"
+            prop="sizes"
+            :label="$t('common.size')"
+            :formatter="changeSizeFile"
+          />
+          <el-table-column
+            align="center"
+            :label="$t('dataManage.dataUpObj.tableName')"
+          >
+            <template slot-scope="scope">
+              <a
+                class="scopeRowColor"
+                @click="detail(scope.row)"
+              >{{ scope.row.tab }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="rows"
+            :label="$t('common.lineNuber')"
+          />
+          <el-table-column
+            align="center"
+            prop="desc"
+            :label="$t('dataManage.dataUpObj.describe')"
+          />
+
+        </el-table>
+        <div
+          style="margin-top: 15px"
           class="pagination_box"
         >
           <el-pagination
             @size-change="handleMetaSizeChange"
             @current-change="handMetaCurrentChange"
             :current-page="listMetaData.pageIndex"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 50, 100, 200]"
             :page-size="listMetaData.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listMetaData.count"
           >
           </el-pagination>
         </div>
-    </div>
-     
+      </div>
+
+    </el-dialog>
+    <el-dialog
+      :title="fromQueryMeta.title"
+      :visible.sync="queryMetaFlag1"
+      width="70%"
+    >
+      <div style="height: 65vh; width: 100%">
+
+        <el-table
+          ref="filterTable"
+          :data="metaDataTable1"
+          style="width: 100%"
+          height="100%"
+        >
+          <el-table-column
+            align="center"
+            type="index"
+            :label="$t('common.index')"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            :label="$t('common.name')"
+            width="120"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="dirName"
+            :label="$t('dataManage.dataUpObj.catalogue')"
+            width="300"
+          />
+          <el-table-column
+            align="center"
+            prop="depName"
+            :label="$t('dataManage.dataUpObj.company')"
+            width="200"
+          />
+          <el-table-column
+            align="center"
+            prop="verName"
+            :label="$t('dataManage.dataUpObj.versionNo')"
+          />
+          <el-table-column
+            align="center"
+            prop="type"
+            :label="$t('common.type')"
+          />
+          <el-table-column
+            align="center"
+            prop="sizes"
+            :label="$t('common.size')"
+            :formatter="changeSizeFile"
+          />
+          <el-table-column
+            align="center"
+            :label="$t('dataManage.dataUpObj.tableName')"
+          >
+            <template slot-scope="scope">
+              <a
+                class="scopeRowColor"
+                @click="detail(scope.row)"
+              >{{
+                  scope.row.tab
+                }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="rows"
+            :label="$t('common.lineNuber')"
+          />
+          <el-table-column
+            align="center"
+            prop="desc"
+            :label="$t('dataManage.dataUpObj.describe')"
+          />
+        </el-table>
+
+      </div>
+    </el-dialog>
+    <el-dialog
+      :title="fromQueryMeta.title"
+      :visible.sync="warehouseDialog"
+      width="70%"
+      :close-on-click-modal="false"
+      :before-close="handleWarehouseClose"
+    >
+      <div style="height:65vh">
+        <el-table
+          ref="wareTable"
+          :data="wareData"
+          style="width: 100%"
+          height="calc(100% - 1px)"
+        >
+          <el-table-column
+            align="center"
+            prop="name"
+            :label="$t('common.name')"
+          />
+          <el-table-column
+            align="center"
+            prop="sizes"
+            :label="$t('common.size')"
+            :formatter="changeSizeFile"
+          />
+          <el-table-column
+            align="center"
+            prop="type"
+            :label="$t('common.type')"
+          />
+          <el-table-column
+            align="center"
+            prop="msg"
+            :label="$t('common.warehousResults')"
+          />
+        </el-table>
+      </div>
     </el-dialog>
     <input
       name="file1"
@@ -1185,6 +1436,37 @@
       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>
 
@@ -1193,24 +1475,26 @@
 import MyBread from "../../components/MyBread.vue";
 import { getToken } from "@/utils/auth";
 import {
-  dataUploadSelectPath,
-  selectdirTab,
-  dataUploadSelectVerByDirid,
-  dataUpload_selectByPageForUpload,
   dataUpload_deleteMetas,
-  dataUpload_selectCoords,
-  dataUpload_selectProject,
-  dataUploadSelectFiles,
-  dataUploadDeleteFiles,
-  dataUpload_uploadChecks,
-  dataUpload_selectTaskStatus,
-  dataUpload_selectMappers,
-  dataUpload_selectTabs,
   dataUpload_insertFiles,
-  dataUpload_selectFields,
+  dataUpload_selectByPageForUpload,
+  dataUpload_selectCoords,
   dataUpload_selectDbData,
- dataUpload_selectPageAndCountByPid
+  dataUpload_selectFields,
+  dataUpload_selectMappers,
+  dataUpload_selectPageAndCountByPid,
+  dataUpload_selectProject,
+  dataUpload_selectTabs,
+  dataUpload_selectTaskStatus,
+  dataUpload_uploadChecks,
+  dataUploadDeleteFiles,
+  dataUploadSelectFiles,
+  dataUploadSelectPath,
+  dataUploadSelectVerByDirid,
+  dataUpload_selectMetaById,
+  selectdirTab,
 } from "../../api/api";
+
 export default {
   name: "dataUpdata",
   components: {
@@ -1271,7 +1555,6 @@
         demTolerance: "5",
         demChangeRate: "200",
         lazDensity: "1",
-        imgResolution: "0.2",
       },
       quayTestShow: {
         checkOsgb: false,
@@ -1317,7 +1600,6 @@
       formInline: {
         uploadType: "v1",
         dirid: null,
-        verid: null,
         specialtyId: "娴嬮噺涓撲笟",
         specialtyData: "璇烽�夋嫨鏁版嵁",
         metaData: "璇烽�夋嫨鍏冩暟鎹�",
@@ -1326,6 +1608,7 @@
         selectFileType: "*.*",
         coordinateId: null,
         path: null,
+        verid: null,
       },
       cascader: {
         label: "name",
@@ -1368,11 +1651,12 @@
       wareTableFlag: null,
       insertWareList: null,
       loading: false,
+      loadText: '',
       dbTableData: [],
       dialogVisible: false,
       listLoader: {
-        id: null,
-        pageSize: 1,
+        dirid: null,
+        pageIndex: 1,
         pageSize: 10,
       },
       count1: 0,
@@ -1398,26 +1682,35 @@
       styleVar1: {
         height: "calc(100% - 109px)",
       },
-      metaFileData:[],
-      listMetaData:{
-        metaid:0,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-        count:0,
+      metaFileData: [],
+      listMetaData: {
+        metaid: 0,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
       },
-      queryMetaFlag:false,
-      fromQueryMeta:{
-        title:'',
-        name:''
+      queryMetaFlag: false,
+      fromQueryMeta: {
+        title: "",
+        name: "",
       },
-      metaDataTable:[],
+      metaDataTable: [],
+      queryMetaFlag1: false,
+      metaDataTable1: [],
+      getCheckedKeys: null,
+      sc: {
+        label1: '涓婁紶',
+        label2: '鏂囦欢涓婁紶杩涘害锛�'
+      },
+      warehouseDialog: false,
+      wareData: [],
+      noteVisible: false,
     };
   },
 
   mounted() {
-    //鑾峰彇鐩綍
-    this.getSelectdirTab();
+    this.noteVisible = true;
     //鑾峰彇鍧愭爣绯�
     this.setCoordinateSystem();
     //鑾峰彇椤圭洰鍚嶇О
@@ -1428,6 +1721,8 @@
     this.getPerms();
     window.addEventListener("resize", this.onResize);
     this.calHeight();
+    //鑾峰彇鐩綍
+    this.getSelectdirTab();
   },
   beforeDestroy() {
     this.timer && clearTimeout(this.timer);
@@ -1435,53 +1730,79 @@
   },
   watch: {},
   methods: {
- setRestMetaData(){
- this.fromQueryMeta.name="";
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    stateFormat(row, column) {
+      var val = ['shp', 'gdb', 'xls', 'xlsx']
+      if (val.indexOf(row.type) > -1 && row.rows > 0) {
+        return '宸蹭笂浼�,宸插叆搴�'
+      } else if (val.indexOf(row.type) > -1 && row.rows == 0) {
+        return '宸蹭笂浼�,鏈叆搴�'
+      } else {
+        return '宸蹭笂浼�'
+      }
+    },
+    setRestMetaData() {
+      this.fromQueryMeta.name = "";
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
-    setSearchMetaData(){
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    setSearchMetaData() {
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
     //鍏冩暟鎹〉闈㈠垏鎹�
-    handleMetaSizeChange(val){
+    handleMetaSizeChange(val) {
       this.listMetaData.pageIndex = 1;
-     this.listMetaData.pageSize = val;
-     this.startQueryMetaData();
+      this.listMetaData.pageSize = val;
+      this.startQueryMetaData();
     },
-     //鍏冩暟鎹〉闈㈠垏鎹�
-    handMetaCurrentChange(val){
+    //鍏冩暟鎹〉闈㈠垏鎹�
+    handMetaCurrentChange(val) {
       this.listMetaData.pageIndex = val;
       this.startQueryMetaData();
     },
-  //鍏冩暟鎹煡璇�
- setQueryMetaData(row){
-  this.fromQueryMeta.title = row.name
-  this.listMetaData = {
-        metaid:row.id,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-         count:0,
+
+    //鍏冩暟鎹煡璇�
+    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.startQueryMetaData();
-this.queryMetaFlag=true;
-},
-async startQueryMetaData(){
-const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
- if(data.code != 200){
-  return;
- }
- this.metaDataTable= data.result;
- this.listMetaData.count = data.count;
-},
+      this.queryMetaFlag1 = true;
+      this.metaDataTable1 = [data.result];
+    },
+
+
+    //鍏冩暟鎹煡璇�
+    setQueryMetaData(row) {
+      this.fromQueryMeta.title = row.name;
+      this.listMetaData = {
+        metaid: row.id,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+      };
+      this.startQueryMetaData();
+      this.queryMetaFlag = true;
+    },
+    async startQueryMetaData() {
+      const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
+      if (data.code != 200) {
+        return;
+      }
+      this.metaDataTable = data.result;
+      this.listMetaData.count = data.count;
+    },
 
     onResize() {
       this.timer && clearTimeout(this.timer);
@@ -1493,10 +1814,10 @@
       this.$nextTick(() => {
         const rect = this.$refs.container.getBoundingClientRect();
         const rect1 = this.$refs.container1.getBoundingClientRect();
- 
+
         this.tableHeight = `${rect.height + 40}px`;
-        this.styleVar["height"] = `calc(100% - ${rect.height + 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() {
@@ -1520,16 +1841,21 @@
         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,
+        "/dataUpload/uploadXlsAnnex?token=" +
+        getToken() +
+        "&path=" +
+        this.formInline.path,
         {
           type: "post",
           data: formData,
@@ -1573,7 +1899,8 @@
       $("#editimageFile").click();
     },
     //涓婁紶闄勪欢
-    uploadAnnex() {},
+    uploadAnnex() {
+    },
     //闄勪欢涓婁紶
     setEnclosure() {
       var enclosureData = [
@@ -1585,7 +1912,7 @@
         "bs.m_equipment_nameplate",
         "bs.m_hydraulic_protection",
         "bs.m_marker",
-        "bs.s_borehole",
+        "bs.s_explorationpoint",
       ];
       var std = [];
       this.enclosureData = [];
@@ -1684,6 +2011,7 @@
         this.$message.error("瀛楁鍒楄〃璋冪敤澶辫触");
         return;
       }
+
       var val = data1.result;
       for (var i in val) {
         val[i].createuser = val[i].createName;
@@ -1701,6 +2029,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;
@@ -1715,6 +2066,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;
@@ -1725,28 +2079,40 @@
           }
         }
       }
-      for(var i in this.metaFileData){
-        this.insertWareList.filter((res)=>{
-          if(res.name == this.metaFileData[i]){
-              res.isMeta = true;
+      for (var i in this.metaFileData) {
+        this.insertWareList.filter((res) => {
+          if (res.name == this.metaFileData[i]) {
+            res.isMeta = true;
           }
-        })
+        });
       }
- 
-      this.loading = true;
+
+
       const res = await dataUpload_insertFiles(
         JSON.stringify(this.insertWareList)
       );
-      this.loading = false;
+
       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() {
@@ -1756,7 +2122,8 @@
       for (var i = 0; i < val1.length; i++) {
         const stdTab = this.setSplitWare(val1[i].tab);
         for (var j = 0; j < val2.length; j++) {
-          if (val2[j].tab == 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;
@@ -1884,18 +2251,21 @@
           }
         }
       }
- 
+      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;
@@ -1926,10 +2296,16 @@
     //鏁翠綋鏂囦欢璐ㄦ鎻愪氦
     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();
     },
     //鏁翠綋鏂囦欢澶氭潯鏁版嵁璐ㄦ
@@ -1938,6 +2314,7 @@
         this.multipleSelection == 0 ||
         this.taskStatus == this.multipleSelection.length
       ) {
+        this.jindudialogVisible = false;
         this.loading = false;
         return;
       }
@@ -1952,6 +2329,7 @@
           this.formCheckAll.wbsPath = path;
         }
       }
+      this.formCheckAll.sjfl = '鏁板瓧鍖栨垚鏋�'
       const data = await dataUpload_uploadChecks(this.formCheckAll);
       if (data.code != 200) {
         this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -1968,32 +2346,44 @@
 
     //鍗曟枃浠舵暟鎹川妫�鎻愪氦
     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.loading = false;
+        that.jindudialogVisible = false;
         return;
       }
+
+
       this.quayTestForms.zipPath = 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("\\");
+        var value = this.getCheckedKeys
+        var bak = value.data.fullName.split("\\");
         this.quayTestForms.xmmc = bak[this.taskStatus];
         this.quayTestForms.sjzy = this.formInline.specialtyId;
         this.quayTestForms.zipPath =
           this.multipleSelection[this.taskStatus].path;
+        this.quayTestForms.sjfl = '鏁板瓧鍖栨垚鏋�'
         const data = await dataUpload_uploadChecks(this.quayTestForms);
         if (data.code != 200) {
           this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -2025,14 +2415,15 @@
                 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) {
@@ -2062,6 +2453,7 @@
         if (
           this.tableData[i].path == this.multipleSelection[this.taskStatus].path
         ) {
+          this.$set(this, "jindutiao", parseInt(this.progress * 100));
           this.tableData[i].status = parseInt(this.progress * 100) + "%";
         }
       }
@@ -2083,11 +2475,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) {
@@ -2114,11 +2506,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) {
@@ -2252,13 +2647,13 @@
       });
       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,
+        "/dataUpload/uploadFiles?token=" +
+        token +
+        "&path=" +
+        this.formInline.path,
         {
           type: "post",
           data: formData,
@@ -2307,7 +2702,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() {
@@ -2325,7 +2728,7 @@
           return rs;
         }
       });
-      this.pathBak = val[0].bak;
+      this.pathBak = val[0].checks;
       this.formInline.dirid = val[0].id;
       this.getselectVerByDirid();
     },
@@ -2377,7 +2780,8 @@
         .then((_) => {
           this.closeTestQuayCloseDialog();
         })
-        .catch((_) => {});
+        .catch((_) => {
+        });
     },
     closeTestQuayCloseDialog() {
       this.testQuayVisible = false;
@@ -2388,7 +2792,8 @@
         .then((_) => {
           this.closeQuayTestCloseDialog();
         })
-        .catch((_) => {});
+        .catch((_) => {
+        });
     },
     closeQuayTestCloseDialog() {
       this.quayTestVisible = false;
@@ -2402,8 +2807,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;
@@ -2436,10 +2842,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;
@@ -2525,11 +2931,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();
     },
     //鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
@@ -2587,7 +2995,7 @@
         std.push(f.name);
       }
       this.formInline.metaData = std.toString();
-      this.metaFileData= std;
+      this.metaFileData = std;
     },
 
     //From琛ㄥ崟鍒濆鍖�
@@ -2618,7 +3026,7 @@
         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 {
         this.getStartDirChecked(this.catalogOption);
         this.getselectVerByDirid();
@@ -2629,10 +3037,11 @@
     //鐗堟湰鍙疯幏鍙�
     async getselectVerByDirid() {
       this.verOption = [];
-      this.formInline.verid = "";
+
       const res = await dataUploadSelectVerByDirid({
         dirid: this.formInline.dirid,
       });
+
       if (res.code != 200) {
         this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
         return;
@@ -2647,9 +3056,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();
     },
 
@@ -2698,7 +3109,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) {
@@ -2707,7 +3119,7 @@
           }
         }
       }
-      var fileType = node.data.code;
+      var fileType = node.data.exts;
       if (fileType == null) {
         fileType = "*.*";
       }
@@ -2715,11 +3127,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();
     },
@@ -2739,7 +3156,7 @@
 <style lang="less" scoped>
 .bottom {
   width: 100%;
-  margin-top: 1%;
+  margin-top: 0.5%;
   // height: 74%;
   height: 570px;
   display: flex;
@@ -2751,6 +3168,7 @@
 
     border-radius: 5px;
     padding: 1%;
+
     .table_box {
       width: 100%;
       height: 93%;
@@ -2758,31 +3176,53 @@
       overflow: auto;
     }
   }
-  /deeep/.el-loading-mask{
-    z-index:9999
+
+  /deeep/ .el-loading-mask {
+    z-index: 9999;
+  }
+}
+.nodeBox {
+  h5 {
+    line-height: 26px;
+    font-size: 14px;
+    span {
+      font-weight: bolder;
+    }
+  }
+  h3 {
+    line-height: 40px;
+    font-size: 16px;
+    font-weight: bold;
+  }
+  h1 {
+    font-weight: bold;
   }
 }
 .inquire {
   padding: 8px;
-  margin-top: 20px;
+  //margin-top: 20px;
 
   border-radius: 5px;
 
-  margin-bottom: 20px;
+  //margin-bottom: 20px;
   .el-form-item {
     margin: 5px;
   }
 }
+
 .el-tabs {
-  height: calc(100% - 70px);
+  height: calc(100% - 18px);
 }
+
 /deep/ .el-tabs__content {
   height: calc(100% - 49px);
 }
+
 /deep/ .el-tab-pane {
   height: 100%;
 }
+
 .text-center {
   text-align: center;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3