From b0008ef04e1f09aa86a7389cfd185012d0974106 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期二, 17 十月 2023 15:43:23 +0800
Subject: [PATCH] 数据上传,整体上传效果修改

---
 src/views/datamanage/dataUpdata.vue | 1365 ++++++++++++-----------------------------------------------
 1 files changed, 283 insertions(+), 1,082 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index d18246f..d31d464 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1,47 +1,20 @@
 <template>
-  <div
-    class="subpage_Box"
-    v-loading="loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    :element-loading-text="loadText"
-  >
+  <div class="subpage_Box" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)"
+    :element-loading-text="loadText">
     <My-bread :list="[
-        `${$t('dataManage.dataManage')}`,
-        `${$t('dataManage.dataUpdata')}`,
-      ]"></My-bread>
+      `${$t('dataManage.dataManage')}`,
+      `${$t('dataManage.dataUpdata')}`,
+    ]"></My-bread>
     <el-divider />
-    <el-tabs
-      type="card"
-      v-model="activeTabName"
-      @tab-click="handleTabClick"
-    >
+    <el-tabs type="card" v-model="activeTabName" @tab-click="handleTabClick">
       <!-- 涓婁紶鏁版嵁 -->
-      <el-tab-pane
-        :label="$t('dataManage.dataUpObj.uploaddata')"
-        name="first"
-      >
-        <div
-          class="inquire subpage_Div"
-          ref="container"
-        >
-          <el-form
-            :inline="true"
-            :model="formInline"
-            class="demo-form-inline"
-          >
+      <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first">
+        <div class="inquire subpage_Div" ref="container">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
             <!-- 鍏ュ簱绫诲瀷 -->
-            <el-form-item
-              :label="$t('dataManage.dataUpObj.UploadType')"
-              style="margin-right: 2%"
-              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"
@@ -49,46 +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.dFfilest')"
-                  value="v3"
-                />
+                <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
-                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-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
@@ -101,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"
@@ -162,253 +73,109 @@
                                   :value="item.value">
                                 </el-option>-->
 
-                <el-option
-                  :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')"
-                  value="娴嬮噺涓撲笟"
-                />
-                <el-option
-                  :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')"
-                  value="鍕樺療涓撲笟"
-                />
-                <el-option
-                  :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')"
-                  value="鍦扮伨涓撲笟"
-                />
-                <el-option
-                  :label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
-                  value="娲炲簱涓撲笟"
-                />
-                <el-option
-                  :label="$t('shuJuGuanLi.pselect.LineDiscipline')"
-                  value='绾胯矾涓撲笟'
-                />
+                <el-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-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-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 "
-                  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-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"
-                  v-if="formInline.uploadType =='v1'"
-                  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>
@@ -420,63 +187,20 @@
         </div>
         <!-- 涓婁紶鏁版嵁鍒楄〃 -->
         <div class="dividing-line"></div>
-        <div
-          class="table_box"
-          :style="styleVar"
-        >
-          <el-table
-            style="width:100%"
-            border
-            :data="tableData"
-            @selection-change="handleSelectionChange"
-            height="calc(100% - 57px)"
-          >
-            <el-table-column
-              type="selection"
-              width="55"
-            />
+        <div class="table_box" :style="styleVar">
+          <el-table style="width:100%" border :data="tableData" @selection-change="handleSelectionChange"
+            height="calc(100% - 57px)">
+            <el-table-column type="selection" width="55" />
 
-            <el-table-column
-              align="center"
-              type="index"
-              :label="$t('common.index')"
-              width="70px"
-            />
-            <el-table-column
-              align="center"
-              prop="name"
-              :label="$t('common.name')"
-            />
-            <el-table-column
-              align="center"
-              prop="sizes"
-              :label="$t('common.size')"
-              :formatter="changeSizeFile"
-            />
-            <el-table-column
-              align="center"
-              prop="status"
-              label="鐘舵��"
-            />
-            <el-table-column
-              align="center"
-              prop="code"
-              label="鐘舵��"
-              v-if="false"
-            />
-            <el-table-column
-              label="鎿嶄綔"
-              width="120"
-            >
+            <el-table-column align="center" type="index" :label="$t('common.index')" width="70px" />
+            <el-table-column align="center" prop="name" :label="$t('common.name')" />
+            <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" />
+            <el-table-column align="center" prop="status" label="鐘舵��" />
+            <el-table-column align="center" prop="code" label="鐘舵��" v-if="false" />
+            <el-table-column label="鎿嶄綔" width="120">
               <template slot-scope="scope">
-                <el-button
-                  v-if="menuStatus.download"
-                  v-show="scope.row.code != null"
-                  @click="handerLogClick(scope.row)"
-                  type="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>
@@ -484,55 +208,25 @@
         </div>
       </el-tab-pane>
       <!-- 鍏ュ簱鏁版嵁娓呭崟 -->
-      <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-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second">
+        <div class="inquire subpage_Div" ref="container1">
+          <el-form :inline="true" :model="formWarehousing" class="demo-form-inline">
             <div class="flex_box">
               <div style="margin-right: auto">
-                <el-form-item
-                  size="small"
-                  :label="$t('dataManage.dataUpObj.describe')"
-                >
-                  <el-input
-                    v-model="formWarehousing.name"
-                    :placeholder="$t('shuJuGuanLi.lable1')"
-                    style="width: 200px;"
-                  ><i
-                      slot="suffix"
-                      class="el-icon-search"
-                      @click="setWarehouseSearch"
-                      style="padding-right: 8px"
-                    ></i></el-input>
+                <el-form-item 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 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 v-if="menuStatus.delete" @click="setWarehouseDel" icon="el-icon-folder-delete" type="danger"
+                    size="small">{{ $t('common.delete') }}
                   </el-button>
                   <!--                  <el-button
                       @click="setWarehouseSearch"
@@ -543,12 +237,8 @@
                       $t('common.iquery')
                     }}
                   </el-button>-->
-                  <el-button
-                    @click="setWarehouseReset"
-                    icon="el-icon-folder-add"
-                    size="small"
-                    type="info"
-                  >{{ $t('common.reset') }}
+                  <el-button @click="setWarehouseReset" icon="el-icon-folder-add" size="small" type="info">{{
+                    $t('common.reset') }}
                   </el-button>
                 </el-form-item>
               </div>
@@ -558,139 +248,51 @@
         </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"
-            >
+        <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"
-            >
+            <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>
+                  <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>
+                  <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"
-              :label="$t('common.dataStatus')"
-              :formatter="stateFormat"
-            >
+            <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-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"
-            >
+          <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>
@@ -698,109 +300,47 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 璐ㄦ寮圭獥 -->
-    <el-dialog
-      title="鏁版嵁璐ㄦ"
-      :visible.sync="quayTestVisible"
-      width="70%"
-      :modal="false"
-      :before-close="handleQuayTestCloseDown"
-    >
+    <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="quayTestVisible" width="70%" :modal="false"
+      :before-close="handleQuayTestCloseDown">
       <div class="dialogDiv">
-        <el-form
-          :inline="true"
-          :model="quayTestForms "
-          class="demo-form-inline"
-        >
+        <el-form :inline="true" :model="quayTestForms" class="demo-form-inline">
           <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
-            <el-input
-              disabled
-              v-model="quayTestForms.sjzy"
-            ></el-input>
+            <el-input disabled v-model="quayTestForms.sjzy"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.dataUpObj.storageDirectory')">
-            <el-input
-              disabled
-              style="width:400px"
-              v-model="quayTestForms.names"
-            ></el-input>
+            <el-input disabled style="width:400px" v-model="quayTestForms.names"></el-input>
           </el-form-item>
         </el-form>
         <el-divider />
         <div class="dialogContent">
-          <div
-            class="ContBox"
-            v-show="quayTestShow.checkAttrs"
-          >
-            <el-checkbox
-              checked
-              disabled
-            >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)
+          <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>
@@ -845,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>
@@ -879,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>
@@ -913,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>
@@ -939,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>
@@ -967,111 +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"
-      :modal="false"
-      :before-close="handleTestQuayCloseDown"
-    >
-      <el-form
-        :model="formCheckAll"
-        label-position="top"
-      >
+    <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%"
-    >
+    <el-dialog :title="$t('dataManage.datawarehousing')" :visible.sync="dialogWarehousing" width="70%">
       <div class="dialogBox">
-        <div
-          class="transFarBox subpage_Div"
-          style="border: 1px solid #E4E7ED;"
-        >
+        <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>
@@ -1083,16 +519,10 @@
           </div>
 
         </div>
-        <div
-          class="transFarBox subpage_Div"
-          style="border: 1px solid #E4E7ED;"
-        >
+        <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>
@@ -1103,383 +533,139 @@
             </div>
             <br />
             <div style="padding:2%">
-              <el-link><i
-                  @click="setWareTableChangeRight"
-                  class="el-icon-d-arrow-right"
-                ></i></el-link>
+              <el-link><i @click="setWareTableChangeRight" class="el-icon-d-arrow-right"></i></el-link>
             </div>
           </div>
         </div>
-        <div
-          class="transFarBox subpage_Div"
-          style="border: 1px solid #E4E7ED;"
-        >
+        <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%"
-    >
+    <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: 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"
-          >
+        <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="sc.label1"
-      :visible.sync="jindudialogVisible"
-      width="30%"
-    >
+    <el-dialog :close-on-click-modal="false" :title="sc.label1" :visible.sync="jindudialogVisible" width="30%">
       <div>
         <div>
-          {{sc.label2}}
+          {{ sc.label2 }}
         </div>
         <div>
-          <el-progress
-            :percentage="jindutiao"
-            :format="format"
-          ></el-progress>
+          <el-progress :percentage="jindutiao" :format="format"></el-progress>
         </div>
       </div>
 
     </el-dialog>
-    <el-dialog
-      :title="$t('common.details')"
-      :visible.sync="enclosureVisible"
-      :show-close="false"
-    >
-      <span
-        style="font-size:20px"
-        class="scopeRowColor"
-      >{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
-      <span
-        slot="footer"
-        class="dialog-footer"
-      >
+    <el-dialog :title="$t('common.details')" :visible.sync="enclosureVisible" :show-close="false">
+      <span style="font-size:20px" class="scopeRowColor">{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
+      <span slot="footer" class="dialog-footer">
         <el-button @click="enclosureVisible = false">鍙� 娑�</el-button>
-        <el-button
-          type="primary"
-          @click="uploadAnFiles"
-        >缁х画</el-button>
+        <el-button type="primary" @click="uploadAnFiles">缁х画</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      :title="fromQueryMeta.title"
-      :visible.sync="queryMetaFlag"
-      width="70%"
-    >
+    <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 :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-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-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 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
-          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"
-          >
+        <div style="margin-top: 15px" class="pagination_box">
+          <el-pagination @size-change="handleMetaSizeChange" @current-change="handMetaCurrentChange"
+            :current-page="listMetaData.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listMetaData.pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="listMetaData.count">
           </el-pagination>
         </div>
       </div>
 
     </el-dialog>
-    <el-dialog
-      :title="fromQueryMeta.title"
-      :visible.sync="queryMetaFlag1"
-      width="70%"
-    >
+    <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 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')"
-          >
+          <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>
     </el-dialog>
-    <el-dialog
-      :title="fromQueryMeta.title"
-      :visible.sync="warehouseDialog"
-      width="70%"
-      :close-on-click-modal="false"
-      :before-close="handleWarehouseClose"
-    >
+    <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 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"
-    />
+    <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;">
@@ -1491,12 +677,16 @@
           1銆侀」鐩暣浣撲笂浼�
         </h3>
 
-        <h5>&nbsp; &nbsp; &nbsp; &nbsp;鎸夌収椤圭洰鏍囧噯缁撴瀯缁勭粐鏁版嵁骞舵墦zip鍖咃紝鎸夎姹傜紪杈戝ソWBS鏂囦欢銆傞�夋嫨闇�瑕佷笂浼犲搴旂殑椤圭洰鍚嶇О锛岄�夋嫨zip鏁版嵁鍖呭拰WBS鏂囦欢锛屽畬鎴愭暣浣撻」鐩暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢鏍煎紡瀛樺偍鍦ㄩ鍏堢粍缁囩殑鐩綍缁撴瀯涓嬨��</h5>
+        <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鏍煎紡锛夈�佸厓鏁版嵁绛夛紝瀹屾垚涓�涓枃浠跺す涓嬪悇绫绘暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢瀛樺偍鏁版嵁銆�
+        </h5>
         <h5>&nbsp; &nbsp; &nbsp; &nbsp;鍗曟枃浠朵笂浼犱笉鏀寔澶氱骇鐩綍鏂囦欢澶逛互zip鍘嬬缉鍖呮柟寮忎笂浼犮��</h5>
         <h3>
           3銆佺壒瀹氭牸寮忓崟鏂囦欢涓婁紶瑕佹眰
@@ -2474,6 +1664,7 @@
         this.loading = false;
         return;
       }
+
       for (var i in this.multipleSelection) {
         var name = this.multipleSelection[i].name;
         var path = this.multipleSelection[i].path;
@@ -2485,12 +1676,14 @@
           this.formCheckAll.wbsPath = path;
         }
       }
+      debugger
       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;
@@ -2528,6 +1721,7 @@
 
 
       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();
@@ -2539,6 +1733,7 @@
         this.quayTestForms.sjzy = this.formInline.specialtyId;
         this.quayTestForms.zipPath =
           this.multipleSelection[this.taskStatus].path;
+        // this.quayTestForms.wbsPath =this.multipleSelection[this.taskStatus].path;
         this.quayTestForms.sjfl = '鏁板瓧鍖栨垚鏋�'
         const data = await dataUpload_uploadChecks(this.quayTestForms);
         if (data.code != 200) {
@@ -2997,7 +2192,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;
@@ -3356,23 +2552,28 @@
     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;

--
Gitblit v1.9.3