From d91f0dfcd2ef95fb3624d94ade24fe69a9169a58 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期日, 04 二月 2024 15:15:00 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/P2022036_Web2 --- src/views/datamanage/dataUpdata.vue | 1945 ++++++++++++++++++++++++++-------------------------------- 1 files changed, 866 insertions(+), 1,079 deletions(-) diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue index 9efead4..9023154 100644 --- a/src/views/datamanage/dataUpdata.vue +++ b/src/views/datamanage/dataUpdata.vue @@ -1,84 +1,40 @@ <template> - <div - class="subpage_Box" - v-loading="loading" - element-loading-background="rgba(0, 0, 0, 0.8)" - > + <div class="subpage_Box" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)" + :element-loading-text="loadText"> <My-bread :list="[ - `${$t('dataManage.dataManage')}`, - `${$t('dataManage.dataUpdata')}`, - ]"></My-bread> + `${$t('dataManage.dataManage')}`, + `${$t('dataManage.dataUpdata')}`, + ]"></My-bread> <el-divider /> - <el-tabs - 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" - > + <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first"> <div class="inquire subpage_Div" ref="container"> - <el-form - :inline="true" - :model="formInline" - class="demo-form-inline" - > + <el-form :inline="true" :model="formInline" class="demo-form-inline"> <!-- 鍏ュ簱绫诲瀷 --> - <el-form-item - :label="$t('dataManage.dataUpObj.UploadType')" - style="margin-right: 2%" - > - <el-select - :disabled="tableData.length == 0 ? false : true" - v-model="formInline.uploadType" - @change="uploadTypeChange" - :popper-append-to-body="false" - placeholder="璇烽�夋嫨" - > -<!-- <el-option - v-for="item in uploadOption" - :key="item.value" - :label="item.label" - :value="item.value" - ></el-option>--> + <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%" size="small"> + <el-select :disabled="tableData.length == 0 ? false : true" v-model="formInline.uploadType" + @change="uploadTypeChange" :popper-append-to-body="false" placeholder="璇烽�夋嫨"> + <!-- <el-option + v-for="item in uploadOption" + :key="item.value" + :label="item.label" + :value="item.value" + ></el-option>--> - <el-option - :label="$t('shuJuGuanLi.pselect.dFile')" - value="v1" - /> - <el-option - :label="$t('shuJuGuanLi.pselect.dFiles')" - value="v2" - /> - + <el-option :label="$t('shuJuGuanLi.pselect.dFile')" value="v1" /> + <el-option :label="$t('shuJuGuanLi.pselect.dFiles')" value="v2" /> + <el-option :label="$t('shuJuGuanLi.pselect.dFfilest')" value="v3" /> </el-select> </el-form-item> <!-- 瀛樺偍鐩綍 --> - <el-form-item - style="margin-right: 2%" - v-show="uploadFlag" - :label="$t('dataManage.dataUpObj.storageDirectory')" - > - <el-select - :popper-append-to-body="false" - v-model="formInline.dirName" - :disabled="tableData.length == 0 ? false : true" - > - <el-option - :value="formInline.dirid" - :label="formInline.dirName" - style=" height:auto" - > - <el-tree - ref="tree" - :data="catalogOption" - node-key="id" - :props="cascader" - @node-click="catalogChange" - /> + <el-form-item style="margin-right: 2%" v-show="uploadFlag" + :label="$t('dataManage.dataUpObj.storageDirectory')" size="small"> + <el-select ref="multiSelect" :popper-append-to-body="false" v-model="formInline.dirName" + :disabled="tableData.length == 0 ? false : true"> + <el-option :value="formInline.dirid" :label="formInline.dirName" style=" height:auto"> + <el-tree ref="tree" :data="catalogOption" node-key="id" :props="cascader" @node-click="catalogChange" /> </el-option> </el-select> <!-- <el-cascader @@ -91,317 +47,160 @@ ></el-cascader> --> </el-form-item> <!-- 椤圭洰鍚嶇О --> - <el-form-item - style="margin-right: 2%" - v-show="!uploadFlag" - :label="$t('dataManage.dataUpObj.entryName')" - > - <el-select - :popper-append-to-body="false" - :disabled="tableData.length == 0 ? false : true" - v-model="formInline.entryId" - @change="entryNameChange" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in entryOption" - :key="item.id" - :label="item.name" - :value="item.name" - ></el-option> + <el-form-item style="margin-right: 2%" v-show="!uploadFlag" :label="$t('dataManage.dataUpObj.entryName')" + size="small"> + <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true" + v-model="formInline.entryId" @change="entryNameChange" placeholder="璇烽�夋嫨"> + <el-option v-for="item in entryOption" :key="item.id" :label="item.name" :value="item.name"></el-option> </el-select> </el-form-item> <!-- 鏁版嵁鐗堟湰 --> - <el-form-item - :label="$t('dataManage.dataUpObj.dataVersion')" - style="margin-right: 2%" - > - <el-select - :popper-append-to-body="false" - :disabled="tableData.length == 0 ? false : true" - v-model="formInline.verid" - :placeholder="$t('common.choose')" - > - <el-option - v-for="item in verOption" - :key="item.id" - :label="item.name" - :value="item.id" - > + <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%" size="small"> + <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true" + v-model="formInline.verid" :placeholder="$t('common.choose')"> + <el-option v-for="item in verOption" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> <!-- 鏁版嵁涓撲笟 --> - <el-form-item - :label="$t('dataManage.dataUpObj.dataSpecialty')" - style="margin-right: 2%" - > - <el-select - :popper-append-to-body="false" - :disabled="tableData.length == 0 ? false : true" - v-model="formInline.specialtyId" - :placeholder="$t('common.choose')" - > -<!-- <el-option - v-for="item in specialtyOption" - :key="item.value" - :label="item.label" - :value="item.value"> - </el-option>--> + <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%" size="small"> + <el-select :popper-append-to-body="false" :disabled="tableData.length == 0 ? false : true" + v-model="formInline.specialtyId" :placeholder="$t('common.choose')"> + <!-- <el-option + v-for="item in specialtyOption" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option>--> - <el-option - :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')" - value="娴嬮噺涓撲笟" - /> - <el-option - :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')" - value="鍕樺療涓撲笟" - /> - <el-option - :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')" - value="鍦扮伨涓撲笟" - /> - <el-option - :label="$t('shuJuGuanLi.pselect.CavernSpecialty')" - value="娲炲簱涓撲笟" - /> - + <el-option :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')" value="娴嬮噺涓撲笟" /> + <el-option :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')" value="鍕樺療涓撲笟" /> + <el-option :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')" value="鍦扮伨涓撲笟" /> + <el-option :label="$t('shuJuGuanLi.pselect.CavernSpecialty')" value="娲炲簱涓撲笟" /> + <el-option :label="$t('shuJuGuanLi.pselect.LineDiscipline')" value='绾胯矾涓撲笟' /> </el-select> </el-form-item> <!-- 鍧愭爣绯� --> - <el-form-item - :label="$t('dataManage.dataUpObj.coordinateSystem')" - style="margin-right: 3%" - > - <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> - <el-link - :disabled="tableData.length == 0 ? false : true" - v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'" - @click="setSelectFile" - :underline="false" - type="primary" - >{{$t('dataManage.dataUpObj.selectData') }}</el-link> - <el-link - v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'" - @click="restSelectFile" - :underline="false" - type="primary" - >{{$t('common.reset') }}</el-link> - <input - id="selectDataFile" - type="file" - name="file" - multiple="multiple" - :accept="formInline.selectFileType" - @change="handleSelectFileChange" - style="display: none" - ></input> + <!-- 绾胯矾绫诲埆 --> + <el-form-item 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> - <el-input - :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" - v-model="formInline.specialtyData" - style="width:210px;" - disabled - > + <!-- 绾胯矾绫诲埆 --> + <el-form-item :label="$t('dataManage.dataUpObj.labe12')" v-show="formInline.uploadType == 'v3'" + size="small"> + <el-select v-model="formInline.medium" size="small" placeholder="璇烽�夋嫨"> + <el-option v-for="item in mediumOptions" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + </el-form-item> + <!-- 閫夋嫨鏁版嵁 --> + <el-form-item size="small"> + <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'" + @click="setSelectFile" :underline="false" type="primary">{{ $t('dataManage.dataUpObj.selectData') }} + </el-link> + <el-link v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'" @click="restSelectFile" :underline="false" + type="primary">{{ $t('common.reset') }} + </el-link> + <input size="small" id="selectDataFile" type="file" name="file" multiple="multiple" + :accept="formInline.selectFileType" @change="handleSelectFileChange" style="display: none"></input> + </el-form-item> + <el-form-item size="small"> + <el-input :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" v-model="formInline.specialtyData" + style="width:200px;" disabled> </el-input> </el-form-item> <!-- 閫夋嫨鍏冩暟鎹� --> - <el-form-item v-show="uploadFlag"> - <el-link - :disabled="tableData.length == 0 ? false : true" - v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'" - @click="setMetaFile" - :underline="false" - type="primary" - >{{$t('dataManage.dataUpObj.selectMetadata') }}</el-link> - <el-link - v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'" - @click="restMetaFile" - :underline="false" - type="primary" - >{{$t('common.reset') }}</el-link> - <input - id="metaDataFile" - type="file" - name="file" - multiple="multiple" - accept=".xls,.xlsx" - style="display: none" - @change="handleMetaFileChange" - ></input> + <el-form-item v-show="uploadFlag" v-if="formInline.uploadType == 'v1'" style="padding-left: 16px"> + <el-link :disabled="tableData.length == 0 ? false : true" v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'" + @click="setMetaFile" :underline="false" type="primary">{{ $t('dataManage.dataUpObj.selectMetadata') }} + </el-link> + <el-link v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'" @click="restMetaFile" :underline="false" + type="primary">{{ $t('common.reset') }} + </el-link> + <input id="metaDataFile" type="file" name="file" multiple="multiple" accept=".xls,.xlsx" + style="display: none" @change="handleMetaFileChange"></input> </el-form-item> - <el-form-item - v-show="uploadFlag" - > - <el-input - :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" - v-model="formInline.metaData" - style="width:210px;" - 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> - <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="dividing-line"></div> <div class="table_box" :style="styleVar"> - <el-table - style="width:100%" - :data="tableData" - @selection-change="handleSelectionChange" - height="calc(100% - 57px)" - > - <el-table-column - type="selection" - width="55" - /> + <el-table style="width:100%" border :data="tableData" @selection-change="handleSelectionChange" + height="calc(100% - 57px)"> + <el-table-column type="selection" width="55" /> - <el-table-column - align="center" - type="index" - :label="$t('common.index')" - width="70px" - /> - <el-table-column - align="center" - prop="name" - :label="$t('common.name')" - /> - <el-table-column - align="center" - prop="sizes" - :label="$t('common.size')" - :formatter="changeSizeFile" - /> - <el-table-column - align="center" - prop="status" - label="鐘舵��" - /> - <el-table-column - align="center" - prop="code" - label="鐘舵��" - v-if="false" - /> - <el-table-column - label="鎿嶄綔" - width="120" - > + <el-table-column align="center" type="index" :label="$t('common.index')" width="70px" /> + <el-table-column align="center" prop="name" :label="$t('common.name')" /> + <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" /> + <el-table-column align="center" prop="status" label="鐘舵��" /> + <el-table-column align="center" prop="code" label="鐘舵��" v-if="false" /> + <el-table-column label="鎿嶄綔" width="120"> <template slot-scope="scope"> - <el-button - v-if="menuStatus.download" - v-show="scope.row.code != null" - @click="handerLogClick(scope.row)" - type="primary" - size="mini" - plain - > 鏃ュ織 + <el-button v-if="menuStatus.download" v-show="scope.row.code != null" @click="handerLogClick(scope.row)" + type="primary" size="mini" plain> 鏃ュ織 </el-button> </template> </el-table-column> @@ -409,281 +208,140 @@ </div> </el-tab-pane> <!-- 鍏ュ簱鏁版嵁娓呭崟 --> - <el-tab-pane - :label="$t('dataManage.dataUpObj.receiptdata')" - name="second" - > + <el-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second"> <div class="inquire subpage_Div" ref="container1"> - <el-form - :inline="true" - :model="formWarehousing" - class="demo-form-inline" - > - <div class="flex_box"> - <div style="margin-right: auto"> - <el-form-item :label="$t('dataManage.dataUpObj.describe')"> - <el-input - v-model="formWarehousing.name" - :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" - style="width: 200px;" - suffix-icon="el-icon-edit" - ></el-input> - </el-form-item> + <el-form :inline="true" :model="formWarehousing" class="demo-form-inline"> + <div class="flex_box"> + <div style="margin-right: auto"> + <el-form-item size="small" :label="$t('dataManage.dataUpObj.describe')"> + <el-input v-model="formWarehousing.name" :placeholder="$t('shuJuGuanLi.lable1')" + style="width: 200px;"><i slot="suffix" class="el-icon-search" @click="setWarehouseSearch" + style="padding-right: 8px"></i></el-input> + </el-form-item> + </div> + <div> + <el-form-item> + <el-button v-if="menuStatus.upload" :disabled="multipleDelete.length == 0 ? true : false" + @click="setEnclosure" icon="el-icon-folder-opened" type="success" size="small">{{ + $t('common.enclosure') }} + </el-button> + <el-button v-if="menuStatus.delete" @click="setWarehouseDel" icon="el-icon-folder-delete" type="danger" + size="small">{{ $t('common.delete') }} + </el-button> + <!-- <el-button + @click="setWarehouseSearch" + icon="el-icon-upload" + size="small" + class="primary" + >{{ + $t('common.iquery') + }} + </el-button>--> + <el-button @click="setWarehouseReset" icon="el-icon-folder-add" size="small" type="info">{{ + $t('common.reset') }} + </el-button> + </el-form-item> + </div> </div> - <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="dividing-line"></div> - <div class="table_box" :style="styleVar1"> - <el-table - ref="filterTable" - :data="waretableData" - style="width: 100%" - height="calc(100% - 57px)" - @selection-change="handleDelteChange" - > - <el-table-column - type="selection" - width="55" - > - </el-table-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>{{ 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="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> <!-- 璐ㄦ寮圭獥 --> - <el-dialog - title="鏁版嵁璐ㄦ" - :visible.sync="quayTestVisible" - width="70%" - top="2vh" - :modal="false" - :before-close="handleQuayTestCloseDown" - > + <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="quayTestVisible" width="70%" :modal="false" + :before-close="handleQuayTestCloseDown"> <div class="dialogDiv"> - <el-form - :inline="true" - :model="quayTestForms " - class="demo-form-inline" - > + <el-form :inline="true" :model="quayTestForms" class="demo-form-inline"> <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')"> - <el-input - disabled - v-model="quayTestForms.sjzy" - ></el-input> + <el-input disabled v-model="quayTestForms.sjzy"></el-input> </el-form-item> <el-form-item :label="$t('dataManage.dataUpObj.storageDirectory')"> - <el-input - disabled - style="width:400px" - v-model="quayTestForms.names" - ></el-input> + <el-input disabled style="width:400px" v-model="quayTestForms.names"></el-input> </el-form-item> </el-form> <el-divider /> <div class="dialogContent"> - <div - class="ContBox" - v-show="quayTestShow.checkAttrs" - > - <el-checkbox - checked - disabled - >灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkAttrs"> + <el-checkbox checked disabled>灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkMath" - > - <el-checkbox - checked - disabled - >鏁板鍩虹妫�鏌ワ細(.shp,.dlg)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkMath"> + <el-checkbox checked disabled>鏁板鍩虹妫�鏌ワ細(.shp,.dlg) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkDecorate" - > - <el-checkbox - checked - disabled - >鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkDecorate"> + <el-checkbox checked disabled>鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkXls" - > - <el-checkbox - checked - disabled - >琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkXls"> + <el-checkbox checked disabled>琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkOrigin" - > - <el-checkbox - checked - disabled - >鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkOrigin"> + <el-checkbox checked disabled>鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkMeta" - > - <el-checkbox - checked - disabled - >鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)</el-checkbox> + <div class="ContBox" v-show="quayTestShow.checkMeta"> + <el-checkbox checked disabled>鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx) + </el-checkbox> </div> - <div - class="ContBox" - v-show="quayTestShow.checkTopology" - > - <el-form - ref="quayForms" - :model="quayTestForms" - class="demo-form-inline" - > + <div class="ContBox" v-show="quayTestShow.checkTopology"> + <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline"> <el-form-item> - <el-checkbox - checked - disabled - >鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)</el-checkbox> + <el-checkbox checked disabled>鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg) + </el-checkbox> </el-form-item> <el-form-item> <div class="ContDiv"> @@ -727,20 +385,11 @@ </el-form-item> </el-form> </div> - <div - class="ContBox" - v-show="quayTestShow.checkDom" - > - <el-form - ref="quayForms" - :model="quayTestForms" - class="demo-form-inline" - > + <div class="ContBox" v-show="quayTestShow.checkDom"> + <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline"> <el-form-item> - <el-checkbox - checked - disabled - >鏍呮牸妫�鏌ワ細(.tif/.img)</el-checkbox> + <el-checkbox checked disabled>鏍呮牸妫�鏌ワ細(.tif/.img) + </el-checkbox> </el-form-item> <el-form-item> <div class="ContDiv"> @@ -760,20 +409,11 @@ </el-form-item> </el-form> </div> - <div - class="ContBox" - v-show="quayTestShow.checkDem" - > - <el-form - ref="quayForms" - :model="quayTestForms" - class="demo-form-inline" - > + <div class="ContBox" v-show="quayTestShow.checkDem"> + <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline"> <el-form-item> - <el-checkbox - checked - disabled - >楂樼▼妫�鏌ワ細(.tif/.img)</el-checkbox> + <el-checkbox checked disabled>楂樼▼妫�鏌ワ細(.tif/.img) + </el-checkbox> </el-form-item> <el-form-item> <div class="ContDiv"> @@ -793,20 +433,11 @@ </el-form-item> </el-form> </div> - <div - class="ContBox" - v-show="quayTestShow.checkLaz" - > - <el-form - ref="quayForms" - :model="quayTestForms" - class="demo-form-inline" - > + <div class="ContBox" v-show="quayTestShow.checkLaz"> + <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline"> <el-form-item> - <el-checkbox - checked - disabled - >鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)</el-checkbox> + <el-checkbox checked disabled>鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx) + </el-checkbox> </el-form-item> <el-form-item> <div class="ContDiv"> @@ -818,20 +449,11 @@ </el-form-item> </el-form> </div> - <div - class="ContBox" - v-show="quayTestShow.checkOsgb" - > - <el-form - ref="quayForms" - :model="quayTestForms" - class="demo-form-inline" - > + <div class="ContBox" v-show="quayTestShow.checkOsgb"> + <el-form ref="quayForms" :model="quayTestForms" class="demo-form-inline"> <el-form-item> - <el-checkbox - checked - disabled - >OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) </el-checkbox> + <el-checkbox checked disabled>OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx) + </el-checkbox> </el-form-item> <el-form-item> <div class="ContDiv"> @@ -845,110 +467,48 @@ </div> </div> </div> - <span - slot="footer" - class="dialog-footer" - > - <el-button - class="elBotton" - size="small" - @click="quayTestVisible = false" - >鍙� 娑�</el-button> - <el-button - class="elBotton" - size="small" - @click="commonQuayTest" - >纭� 瀹�</el-button> + <span slot="footer" class="dialog-footer"> + <el-button class="elBotton" size="small" @click="quayTestVisible = false">鍙� 娑�</el-button> + <el-button class="elBotton" size="small" @click="commonQuayTest">纭� 瀹�</el-button> </span> </el-dialog> <!-- 鏁翠綋鏂囦欢璐ㄦ寮圭獥 --> - <el-dialog - title="鏁版嵁璐ㄦ" - :visible.sync="testQuayVisible" - top="2vh" - :modal="false" - :before-close="handleTestQuayCloseDown" - - > + <el-dialog title="鏁版嵁璐ㄦ" :visible.sync="testQuayVisible" :modal="false" :before-close="handleTestQuayCloseDown"> <el-form :model="formCheckAll" label-position="top"> <el-form-item label="椤圭洰鍚嶇О"> - - <el-input - disabled - v-model="formCheckAll.xmmc" - style="width:85%" - ></el-input> - + + <el-input disabled v-model="formCheckAll.xmmc" style="width:85%"></el-input> + </el-form-item> <el-form-item label="鎵�灞炰笓涓�"> - - <el-input - disabled - v-model="formCheckAll.sjzy" - style="width:85%" - ></el-input> - + <el-input disabled v-model="formCheckAll.sjzy" style="width:85%"></el-input> + </el-form-item> - <el-form-item - v-show="formCheckAll.isDiZai" - label="鎵�灞炰笓涓�" - > - - <el-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 v-show="formCheckAll.isDiZai" label="鍦扮伨绫诲瀷"> + + <el-select v-model="formCheckAll.diZaiType" placeholder="璇烽�夋嫨" style="width:85%"> + <el-option v-for="item in disOptions" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> </el-form-item> </el-form> - <span - slot="footer" - class="dialog-footer" - > - <el-button - class="elBotton" - size="small" - @click="testQuayVisible = false" - >鍙� 娑�</el-button> - <el-button - class="elBotton" - size="small" - @click="commonTestQuay" - >纭� 瀹�</el-button> + <span slot="footer" class="dialog-footer"> + <el-button class="elBotton" size="small" @click="testQuayVisible = false">鍙� 娑�</el-button> + <el-button class="elBotton" size="small" @click.stop="commonTestQuay()">纭� 瀹�</el-button> </span> </el-dialog> <!-- ifream涓嬭浇鏂囦欢鍦板潃 --> - <iframe - id="downFrame" - src="" - style="display: none; border: 0; padding: 0; height: 0; width: 0" - ></iframe> + <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe> <!-- 鏁版嵁鍖归厤 --> - <el-dialog - :title="$t('dataManage.datawarehousing')" - :visible.sync="dialogWarehousing" - width="70%" - top="2vh" - > + <el-dialog :title="$t('dataManage.datawarehousing')" :visible.sync="dialogWarehousing" width="70%"> <div class="dialogBox"> - <div class="transFarBox subpage_Div"> + <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;"> <ul> - <li - @click="singleElection(item)" - v-for="(item, i) in tableWareOne" - :class="{ active: activeName == item.eventid }" - >{{item.tab}} ({{item.type}})</li> + <li @click="singleElection(item)" v-for="(item, i) in tableWareOne" + :class="{ active: activeName == item.eventid }">{{ item.tab }} ({{ item.type }}) + </li> </ul> </div> <div class="tarnsbtton"> @@ -959,267 +519,188 @@ </div> </div> - <div class="transFarBox subpage_Div"> + <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;"> <ul> - <li - @click="singleElection2(item)" - v-for="(item, i) in tableWareTwo" - :class="{ active: activeName2 == item.entity }" - >{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li> + <li @click="singleElection2(item)" v-for="(item, i) in tableWareTwo" + :class="{ active: activeName2 == item.entity }">{{ item.tabDesc }} ( {{ item.ns }}.{{ item.tab }}) + </li> </ul> </div> <div class="tarnsbtton"> <div> <div style="padding:2%"> <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link> - </div><br /> + </div> + <br /> <div style="padding:2%"> - <el-link><i - @click="setWareTableChangeRight" - class="el-icon-d-arrow-right" - ></i></el-link> + <el-link><i @click="setWareTableChangeRight" class="el-icon-d-arrow-right"></i></el-link> </div> </div> </div> - <div class="transFarBox subpage_Div"> + <div class="transFarBox subpage_Div" style="border: 1px solid #E4E7ED;"> <ul> - <li - @click="singleElection3(i)" - v-for="(item, i) in tableWareThree" - :class="{ active: activeName3 ==( item.tab+i)}" - >{{item.tab}} ( {{item.tabDesc}} {{item.ns}}.{{item.tabs}} )</li> + <li @click="singleElection3(i)" v-for="(item, i) in tableWareThree" + :class="{ active: activeName3 == (item.tab + i) }">{{ item.tab }} ( {{ item.tabDesc }} {{ item.ns }}.{{ + item.tabs }} ) + </li> </ul> </div> </div> - <span - slot="footer" - class="dialog-footer" - > - <el-button - size="small" - @click="autoMatchWare" - type="primary" - >鑷姩鍖归厤</el-button> - <el-button - size="small" - type="info" - @click="setInsrtWareTableClose " - >鍙� 娑�</el-button> - <el-button - size="small" - type="primary" - @click="setInsrtWareTable" - >纭� 瀹�</el-button> + <span slot="footer" class="dialog-footer"> + <el-button size="small" @click="autoMatchWare" type="primary">鑷姩鍖归厤</el-button> + <el-button size="small" type="info" @click="setInsrtWareTableClose">鍙� 娑�</el-button> + <el-button size="small" type="primary" @click="setInsrtWareTable">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog - :title="$t('common.details')" - :visible.sync="dialogVisible" - width="70%" - top="2vh" - > + <el-dialog :title="$t('common.details')" :visible.sync="dialogVisible" width="70%"> <div style="height: 500px; overflow: auto"> - <el-table - ref="filterTable" - :data="dbTableData" - height="90%" - border - style="width: 100%" - > - <el-table-column - width="60" - type="index" - :label="$t('common.index')" - /> - <el-table-column - v-for="(item, index) in attributeData" - :key="index" - :label="item.alias" - :prop="item.field" - show-overflow-tooltip - align="center" - ></el-table-column> + <el-table ref="filterTable" :data="dbTableData" height="90%" border style="width: 100%"> + <el-table-column width="60" type="index" :label="$t('common.index')" /> + <el-table-column v-for="(item, index) in attributeData" :key="index" :label="item.alias" :prop="item.field" + show-overflow-tooltip align="center"></el-table-column> </el-table> - <div - style="margin-top: 10px" - class="pagination_box" - > - <el-pagination - @size-change="handleLoaderSizeChange" - @current-change="handleLoaderCurrentChange" - :current-page="listLoader.pageIndex" - :page-sizes="[10, 20, 50, 100]" - :page-size="listLoader.pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="count1" - > + <div style="margin-top: 15px" class="pagination_box"> + <el-pagination @size-change="handleLoaderSizeChange" @current-change="handleLoaderCurrentChange" + :current-page="listLoader.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listLoader.pageSize" + layout="total, sizes, prev, pager, next, jumper" :total="count1"> </el-pagination> </div> </div> </el-dialog> - <el-dialog - :close-on-click-modal="false" - title="涓婁紶杩涘害" - :visible.sync="jindudialogVisible" - width="30%" - top="2vh" - > + <el-dialog :close-on-click-modal="false" :title="sc.label1" :visible.sync="jindudialogVisible" width="30%"> <div> <div> - 鏂囦欢浼犺緭杩涘害锛� + {{ sc.label2 }} </div> <div> - <el-progress - :percentage="jindutiao" - :format="format" - ></el-progress> + <el-progress :percentage="jindutiao" :format="format"></el-progress> </div> </div> </el-dialog> - <el-dialog - :title="$t('common.details')" - :visible.sync="enclosureVisible" - :show-close="false" - top="2vh" - > - <span - style="font-size:20px" - class="scopeRowColor" - >{{enclosureTitle}}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span> - <span - slot="footer" - class="dialog-footer" - > + <el-dialog :title="$t('common.details')" :visible.sync="enclosureVisible" :show-close="false"> + <span style="font-size:20px" class="scopeRowColor">{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span> + <span slot="footer" class="dialog-footer"> <el-button @click="enclosureVisible = false">鍙� 娑�</el-button> - <el-button - type="primary" - @click="uploadAnFiles" - >缁х画</el-button> + <el-button type="primary" @click="uploadAnFiles">缁х画</el-button> </span> </el-dialog> - <el-dialog - :title="fromQueryMeta.title" - :visible.sync="queryMetaFlag" - width="70%" - top="2vh" - > - <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 - - class="pagination_box" - > - <el-pagination - @size-change="handleMetaSizeChange" - @current-change="handMetaCurrentChange" - :current-page="listMetaData.pageIndex" - :page-sizes="[10, 20, 50, 100]" - :page-size="listMetaData.pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="listMetaData.count" - > + <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag" width="70%"> + <div style="height: 500px; overflow: auto;width:100%; "> + <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline"> + <el-form-item> + <el-input size="small" v-model="fromQueryMeta.name" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" + suffix-icon="el-icon-edit"></el-input> + </el-form-item> + + <el-form-item> + <el-button type="primary" size="small" @click="setSearchMetaData()">鏌ヨ</el-button> + <el-button type="info" size="small" @click="setRestMetaData()">閲嶇疆</el-button> + </el-form-item> + </el-form> + <el-table ref="filterTable" :data="metaDataTable" style="width: 100%" height="calc(100% - 130px)"> + + <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column> + <el-table-column align="center" prop="name" :label="$t('common.name')" width="120"> + + </el-table-column> + <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" /> + <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" /> + <el-table-column align="center" prop="verName" :label="$t('dataManage.dataUpObj.versionNo')" /> + <el-table-column align="center" prop="type" :label="$t('common.type')" /> + <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" /> + <el-table-column align="center" :label="$t('dataManage.dataUpObj.tableName')"> + <template slot-scope="scope"> + <a class="scopeRowColor" @click="detail(scope.row)">{{ scope.row.tab }}</a> + </template> + </el-table-column> + <el-table-column align="center" prop="rows" :label="$t('common.lineNuber')" /> + <el-table-column align="center" prop="desc" :label="$t('dataManage.dataUpObj.describe')" /> + + </el-table> + <div style="margin-top: 15px" class="pagination_box"> + <el-pagination @size-change="handleMetaSizeChange" @current-change="handMetaCurrentChange" + :current-page="listMetaData.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listMetaData.pageSize" + layout="total, sizes, prev, pager, next, jumper" :total="listMetaData.count"> </el-pagination> </div> - </div> - + </div> + </el-dialog> - <input - name="file1" - :accept="'.zip'" - type="file" - id="editimageFile" - multiple="multiple" - style="display: none" - @change="uploadAnFilesChange" - /> + <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag1" width="70%"> + <div style="height: 65vh; width: 100%"> + + <el-table ref="filterTable" :data="metaDataTable1" style="width: 100%" height="100%"> + <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column> + <el-table-column align="center" prop="name" :label="$t('common.name')" width="120"> + </el-table-column> + <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" /> + <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" /> + <el-table-column align="center" prop="verName" :label="$t('dataManage.dataUpObj.versionNo')" /> + <el-table-column align="center" prop="type" :label="$t('common.type')" /> + <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" /> + <el-table-column align="center" :label="$t('dataManage.dataUpObj.tableName')"> + <template slot-scope="scope"> + <a class="scopeRowColor" @click="detail(scope.row)">{{ + scope.row.tab + }}</a> + </template> + </el-table-column> + <el-table-column align="center" prop="rows" :label="$t('common.lineNuber')" /> + <el-table-column align="center" prop="desc" :label="$t('dataManage.dataUpObj.describe')" /> + </el-table> + + </div> + </el-dialog> + <el-dialog :title="fromQueryMeta.title" :visible.sync="warehouseDialog" width="70%" :close-on-click-modal="false" + :before-close="handleWarehouseClose"> + <div style="height:65vh"> + <el-table ref="wareTable" :data="wareData" style="width: 100%" height="calc(100% - 1px)"> + <el-table-column align="center" prop="name" :label="$t('common.name')" /> + <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" /> + <el-table-column align="center" prop="type" :label="$t('common.type')" /> + <el-table-column align="center" prop="msg" :label="$t('common.warehousResults')" /> + </el-table> + </div> + </el-dialog> + <input name="file1" :accept="'.zip'" type="file" id="editimageFile" multiple="multiple" style="display: none" + @change="uploadAnFilesChange" /> + <el-dialog :visible.sync="noteVisible"> + <div class="nodeBox"> + <div style="text-align: center;"> + <h1> + 鏁版嵁涓婁紶娉ㄦ剰浜嬮」 + </h1> + </div> + <h3> + 1銆侀」鐩暣浣撲笂浼� + </h3> + + <h5> + 鎸夌収椤圭洰鏍囧噯缁撴瀯缁勭粐鏁版嵁骞舵墦zip鍖咃紝鎸夎姹傜紪杈戝ソWBS鏂囦欢銆傞�夋嫨闇�瑕佷笂浼犲搴旂殑椤圭洰鍚嶇О锛岄�夋嫨zip鏁版嵁鍖呭拰WBS鏂囦欢锛屽畬鎴愭暣浣撻」鐩暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢鏍煎紡瀛樺偍鍦ㄩ鍏堢粍缁囩殑鐩綍缁撴瀯涓嬨�� + </h5> + <h3> + 2銆佸崟鏂囦欢涓婁紶 + </h3> + <h5> 涓婁紶鍗曚釜鏂囦欢锛岄�夋嫨闇�瑕佷笂浼犵殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙.xls銆�.xlsx銆乸df銆乴as绛夋牸寮忥級銆佸厓鏁版嵁绛夛紝瀹屾垚鍗曚釜鏂囦欢鏁版嵁涓婁紶锛�</h5> + <h5> + 鎵归噺涓婁紶涓�涓渶灏忕洰褰曟枃浠跺す涓嬬殑鍚勭被鏁版嵁锛岄�夋嫨闇�瑕佷笂浼犳暟鎹殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙zip鏍煎紡锛夈�佸厓鏁版嵁绛夛紝瀹屾垚涓�涓枃浠跺す涓嬪悇绫绘暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙e帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢瀛樺偍鏁版嵁銆� + </h5> + <h5> 鍗曟枃浠朵笂浼犱笉鏀寔澶氱骇鐩綍鏂囦欢澶逛互zip鍘嬬缉鍖呮柟寮忎笂浼犮��</h5> + <h3> + 3銆佺壒瀹氭牸寮忓崟鏂囦欢涓婁紶瑕佹眰 + </h3> + <h5>鈭� <span>DOM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>DEM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>OSGB鍊炬枩妯″瀷鏁版嵁涓婁紶锛�</span>闇�鍖呭惈Data鏂囦欢澶广�乵etadata.xml鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>Las銆丩az鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>CPT鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>MPT鍦烘櫙鏁版嵁涓婁紶锛�</span>闇�鍖呭惈.mIdx銆�.Strmi銆�.mpt鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>GDB鏍煎紡鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈gdb鍚勭被瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + <h5>鈭� <span>SHP鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈.shp銆�.shx銆�.dbf銆乸rj瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5> + </div> + </el-dialog> </div> </template> @@ -1228,24 +709,27 @@ 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_selectFields, + dataUpload_selectMappers, dataUpload_selectPageAndCountByPid, + dataUpload_selectProject, + dataUpload_selectTabs, + dataUpload_selectTaskStatus, + dataUpload_uploadChecks, + dataUploadDeleteFiles, + dataUploadSelectFiles, + dataUploadSelectPath, + dataUploadSelectVerByDirid, + dataUpload_selectMetaById, + selectdirTab, + dataUpload_insertKml } from "../../api/api"; + export default { name: "dataUpdata", components: { @@ -1359,6 +843,9 @@ selectFileType: "*.*", coordinateId: null, path: null, + verid: null, + tab: "", + medium: "", }, cascader: { label: "name", @@ -1384,6 +871,67 @@ label: "娲炲簱涓撲笟", }, ], + lineOptions: [ + { + value: 'plpipelinef', + label: "鍙爺涓嚎", + }, + { + value: 'plpipelineb', + label: "璁捐涓嚎", + }, + { + value: 'plpipelined', + label: "鏂藉伐鍥句腑绾�", + }, + { + value: 'plpipelinea', + label: "绔e伐鍥句腑绾�", + }, + ], + mediumOptions: [ + { + value: 'GS', + label: "澶╃劧姘�", + }, + { + value: 'CO', + label: "鍘熸补", + }, + { + value: 'RP', + label: "鎴愬搧娌�", + }, + { + value: 'LN', + label: "娑插寲澶╃劧姘�", + }, + { + value: 'SL', + label: "娑插寲鐭虫补姘�", + }, { + value: 'WA', + label: "鐭挎祮", + }, { + value: 'ST', + label: "钂告苯", + }, { + value: 'CD', + label: "浜屾哀鍖栫⒊", + }, { + value: 'HY', + label: "姘㈡皵", + }, { + value: 'QT', + label: "鍏朵粬", + }, { + value: '-1', + label: "鏈煡", + }, { + value: '0', + label: "鏈皟鏌�", + }, + ], fileType: [], pathBak: null, progress: 0, @@ -1401,6 +949,7 @@ wareTableFlag: null, insertWareList: null, loading: false, + loadText: '', dbTableData: [], dialogVisible: false, listLoader: { @@ -1445,12 +994,21 @@ name: "", }, metaDataTable: [], + queryMetaFlag1: false, + metaDataTable1: [], + getCheckedKeys: null, + sc: { + label1: '涓婁紶', + label2: '鏂囦欢涓婁紶杩涘害锛�' + }, + warehouseDialog: false, + wareData: [], + noteVisible: false, }; }, mounted() { - //鑾峰彇鐩綍 - this.getSelectdirTab(); + this.noteVisible = true; //鑾峰彇鍧愭爣绯� this.setCoordinateSystem(); //鑾峰彇椤圭洰鍚嶇О @@ -1461,6 +1019,8 @@ this.getPerms(); window.addEventListener("resize", this.onResize); this.calHeight(); + //鑾峰彇鐩綍 + this.getSelectdirTab(); }, beforeDestroy() { this.timer && clearTimeout(this.timer); @@ -1468,6 +1028,16 @@ }, watch: {}, methods: { + stateFormat(row, column) { + var val = ['shp', 'gdb', 'xls', 'xlsx'] + if (val.indexOf(row.type) > -1 && row.rows > 0) { + return '宸蹭笂浼�,宸插叆搴�' + } else if (val.indexOf(row.type) > -1 && row.rows == 0) { + return '宸蹭笂浼�,鏈叆搴�' + } else { + return '宸蹭笂浼�' + } + }, setRestMetaData() { this.fromQueryMeta.name = ""; this.listMetaData.name = this.fromQueryMeta.name; @@ -1494,6 +1064,22 @@ this.listMetaData.pageIndex = val; this.startQueryMetaData(); }, + + //鍏冩暟鎹煡璇� + async setMetaDataQuery(row) { + this.fromQueryMeta.title = row.name; + this.listMetaData = { + id: row.metaid, + }; + const data = await dataUpload_selectMetaById(this.listMetaData); + if (data.code != 200) { + return; + } + this.queryMetaFlag1 = true; + this.metaDataTable1 = [data.result]; + }, + + //鍏冩暟鎹煡璇� setQueryMetaData(row) { this.fromQueryMeta.title = row.name; @@ -1528,8 +1114,8 @@ const rect1 = this.$refs.container1.getBoundingClientRect(); this.tableHeight = `${rect.height + 40}px`; - this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`; - this.styleVar1["height"] = `calc(100% - ${rect1.height + 40}px)`; + this.styleVar["height"] = `calc(100% - ${rect.height + 28}px)`; + this.styleVar1["height"] = `calc(100% - ${rect1.height + 28}px)`; }); }, editFromDataClose() { @@ -1553,16 +1139,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, @@ -1606,7 +1197,8 @@ $("#editimageFile").click(); }, //涓婁紶闄勪欢 - uploadAnnex() {}, + uploadAnnex() { + }, //闄勪欢涓婁紶 setEnclosure() { var enclosureData = [ @@ -1618,7 +1210,7 @@ "bs.m_equipment_nameplate", "bs.m_hydraulic_protection", "bs.m_marker", - "bs.s_borehole", + "bs.s_explorationpoint", ]; var std = []; this.enclosureData = []; @@ -1717,6 +1309,7 @@ this.$message.error("瀛楁鍒楄〃璋冪敤澶辫触"); return; } + var val = data1.result; for (var i in val) { val[i].createuser = val[i].createName; @@ -1734,6 +1327,29 @@ this.dbTableData = data1.result; this.count1 = data1.count; }, + + changetimeLayer(res) { + var time = new Date(res); + var y = time.getFullYear(); + var m = time.getMonth() + 1; + var d = time.getDate(); + var h = time.getHours(); + var mm = time.getMinutes(); + var s = time.getSeconds(); + return ( + y + + '-' + + this.add0(m) + + '-' + + this.add0(d) + + ' ' + + h + + ':' + + mm + + ':' + + s + ); + }, //鑷姩鍖归厤鍙栨秷 setInsrtWareTableClose() { this.dialogWarehousing = false; @@ -1748,6 +1364,9 @@ }, //鑷姩鍖归厤纭 async setInsrtWareTable() { + this.loading = true; + this.dialogWarehousing = false; + this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..." if (this.tableWareThree.length != 0) { for (var i in this.tableWareThree) { var tabs = this.tableWareThree[i].tabs; @@ -1766,20 +1385,32 @@ }); } - 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() { @@ -1789,7 +1420,8 @@ for (var i = 0; i < val1.length; i++) { const stdTab = this.setSplitWare(val1[i].tab); for (var j = 0; j < val2.length; j++) { - if (val2[j].tab == stdTab) { + var tabs = stdTab.toLowerCase(); + if (val2[j].tab.indexOf(tabs) > -1) { std.push(val1[i].tab); val1[i].entity = val2[j].entity; val1[i].tabDesc = val2[j].tabDesc; @@ -1879,69 +1511,120 @@ this.getDataLoaderSelectTabs(); this.dialogWarehousing = true; }, - //鏁版嵁鍏ュ簱 - async setFileWare() { - if (this.pathBak != null) { - //鏄惁鏈夎川妫�鏂规 - if (this.formInline.uploadType == "v1") { - //鍗曟枃浠朵笂浼� - var std = []; - for (var i in this.tableData) { - if (this.tableData[i].name.indexOf(".zip") != -1) { - if (this.tableData[i].code != null) { - std.push(this.tableData[i].name); - } - } - } - if (std.length != 0) { - return this.$message.error( - std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱" - ); - } - } else if (this.formInline.uploadType == "v2") { - //鏁翠綋椤圭洰涓婁紶 - - if (this.tableData.length != 2) { - return this.$message.error("璇蜂繚鐣欎竴涓獄ip鏁版嵁,涓�涓猈BS鏁版嵁杩涜鍏ュ簱"); - } - var std = []; - for (var i in this.tableData) { - if (this.tableData[i].code != null) { - std.push(this.tableData[i].name); - } - } - if (std.length != 0) { - return this.$message.error( - std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱" - ); - } - } - } - + //kml鏂囦欢鍏ュ簱 + async setKMlWare() { + this.loading = true; var obj = { dirid: this.formInline.dirid, epsgCode: this.formInline.coordinateId, path: this.formInline.path, verid: this.formInline.verid, + entity: this.formInline.tab, + medium: this.formInline.medium, }; - //鏌ヨ鏄犲皠 + this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..." const data = await dataUpload_selectMappers(obj); if (data.code != 200) { return this.$message.error("鏁版嵁鏄犲皠澶辫触"); } - var std = []; - var result = data.result; - this.insertWareList = data.result; - for (var i in result) { - if (result[i].type == "shp" || result[i].type == "gdb") { - std.push(result[i]); - } + + var std = data.result.filter((res) => { + res.entity = obj.entity + res.medium = obj.medium + return res; + }) + + this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..." + const res = await dataUpload_insertKml( + JSON.stringify(std) + ); + if (res.code != 200) { + this.$message.error("鏁版嵁鍏ュ簱澶辫触"); + return; } - if (std.length != 0) { - this.tableWareOne = std; - this.showWareHousing(); + + this.$message({ + message: "鏁版嵁鍏ュ簱鎴愬姛", + type: "success", + }); + this.loading = false; + this.loadText = "" + if (res.result.length > 0) { + this.warehouseDialog = true; + this.wareData = res.result; + } + + this.setInsrtWareTableClose(); + }, + //鏁版嵁鍏ュ簱 + async setFileWare() { + if (this.formInline.uploadType == "v3") { + this.setKMlWare() } else { - this.setInsrtWareTable(); + if (this.pathBak != null) { + //鏄惁鏈夎川妫�鏂规 + if (this.formInline.uploadType == "v1") { + //鍗曟枃浠朵笂浼� + var std = []; + for (var i in this.tableData) { + if (this.tableData[i].name.indexOf(".zip") != -1) { + if (this.tableData[i].code != null) { + std.push(this.tableData[i].name); + } + } + } + if (std.length != 0) { + return this.$message.error( + std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱" + ); + } + } else if (this.formInline.uploadType == "v2") { + //鏁翠綋椤圭洰涓婁紶 + if (this.tableData.length != 2) { + return this.$message.error("璇蜂繚鐣欎竴涓獄ip鏁版嵁,涓�涓猈BS鏁版嵁杩涜鍏ュ簱"); + } + var std = []; + for (var i in this.tableData) { + if (this.tableData[i].code != null) { + std.push(this.tableData[i].name); + } + } + if (std.length != 0) { + return this.$message.error( + std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱" + ); + } + } + } + this.loading = true; + var obj = { + dirid: this.formInline.dirid, + epsgCode: this.formInline.coordinateId, + path: this.formInline.path, + verid: this.formInline.verid, + }; + this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..." + //鏌ヨ鏄犲皠 + const data = await dataUpload_selectMappers(obj); + if (data.code != 200) { + return this.$message.error("鏁版嵁鏄犲皠澶辫触"); + } + this.loading = false; + this.loadText = " " + var std = []; + var result = data.result; + this.insertWareList = data.result; + for (var i in result) { + if (result[i].type == "shp" || result[i].type == "gdb") { + std.push(result[i]); + } + } + if (std.length != 0) { + this.tableWareOne = std; + this.showWareHousing(); + } else { + this.setInsrtWareTable(); + } } }, //涓嬭浇鏃ュ織 @@ -1959,10 +1642,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(); }, //鏁翠綋鏂囦欢澶氭潯鏁版嵁璐ㄦ @@ -1971,9 +1660,11 @@ this.multipleSelection == 0 || this.taskStatus == this.multipleSelection.length ) { + this.jindudialogVisible = false; this.loading = false; return; } + for (var i in this.multipleSelection) { var name = this.multipleSelection[i].name; var path = this.multipleSelection[i].path; @@ -1985,11 +1676,14 @@ this.formCheckAll.wbsPath = path; } } + + this.formCheckAll.sjfl = '鏁板瓧鍖栨垚鏋�' const data = await dataUpload_uploadChecks(this.formCheckAll); if (data.code != 200) { this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触"); this.taskStatus++; - this.getStartTestQuayTaskStatus(); + this.jindudialogVisible = false; + this.loading = false; return; } var reset = data.result; @@ -2001,32 +1695,46 @@ //鍗曟枃浠舵暟鎹川妫�鎻愪氦 async commonQuayTest() { - this.loading = true; + // this.loading = true; this.quayTestVisible = false; this.taskStatus = 0; this.getStartTaskStatus(); + this.sc = { + label1: '璐ㄦ', + label2: '鏂囦欢璐ㄦ杩涘害锛�' + } + this.jindudialogVisible = true; + + this.$set(this, "jindutiao", 0); }, //鍗曟枃浠跺鏉℃暟鎹川妫� async getStartTaskStatus() { + const that = this; if ( this.multipleSelection == 0 || this.taskStatus == this.multipleSelection.length ) { this.loading = false; + that.jindudialogVisible = false; return; } + + this.quayTestForms.zipPath = this.multipleSelection[this.taskStatus].path; + // this.quayTestForms.wbsPath = this.multipleSelection[this.taskStatus].path; if (this.quayTestForms.zipPath.indexOf(".zip") == -1) { this.taskStatus++; this.getStartTaskStatus(); } else { - this.quayTestForms.names = this.pathBak; - var value = this.$refs["selectcascader"].getCheckedNodes(); - var bak = value[0].data.fullName.split("\\"); + this.quayTestForms.names = this.pathBak + var value = this.getCheckedKeys + var bak = value.data.fullName.split("\\"); this.quayTestForms.xmmc = bak[this.taskStatus]; this.quayTestForms.sjzy = this.formInline.specialtyId; this.quayTestForms.zipPath = this.multipleSelection[this.taskStatus].path; + // this.quayTestForms.wbsPath = this.multipleSelection[this.taskStatus].path; + this.quayTestForms.sjfl = '鏁板瓧鍖栨垚鏋�' const data = await dataUpload_uploadChecks(this.quayTestForms); if (data.code != 200) { this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触"); @@ -2058,14 +1766,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) { @@ -2092,9 +1801,14 @@ } this.progress = std / (res.length * 100); for (var i in this.tableData) { + if (!this.multipleSelection[this.taskStatus]) { + break; + } if ( + this.tableData[i].path == this.multipleSelection[this.taskStatus].path ) { + this.$set(this, "jindutiao", parseInt(this.progress * 100)); this.tableData[i].status = parseInt(this.progress * 100) + "%"; } } @@ -2116,11 +1830,11 @@ } } } - if (this.progress == 1) { - clearInterval(this.setIntel); - this.setIntel = null; - this.loading = false; - } + // if (this.progress == 1) { + clearInterval(this.setIntel); + this.setIntel = null; + this.loading = false; + // } } else { //浠诲姟澶辫触 for (var i in this.tableData) { @@ -2147,11 +1861,14 @@ } } this.progress = std / (res.length * 100); + + // for (var i in this.tableData) { // if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) { // this.tableData[i].status = parseInt(this.progress * 100) + "%"; // } // } + this.$set(this, "jindutiao", parseInt(this.progress * 100)); for (var i in this.tableData) { for (var j in this.multipleSelection) { if (this.tableData[i].path == this.multipleSelection[j].path) { @@ -2214,11 +1931,18 @@ //娓呴櫎鎵�鏈塱nput File; clearFileSelect() { this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁"; - document.getElementById("selectDataFile").value = ""; + if (document.getElementById("selectDataFile")) { + document.getElementById("selectDataFile").value = ""; + } this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�"; - document.getElementById("metaDataFile").value = ""; + if (document.getElementById("metaDataFile")) { + document.getElementById("metaDataFile").value = "" + } this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁"; - document.getElementById("wbsDataFile").value = ""; + + if (document.getElementById("wbsDataFile")) { + document.getElementById("wbsDataFile").value = ""; + } }, //鑾峰彇涓婁紶鏂囦欢鏁伴噺 async getFileLength() { @@ -2260,6 +1984,8 @@ if (fs2.files.length == 0) { return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑WBS鏁版嵁鏂囦欢"); } + } else if (this.formInline.uploadType == "v3") { + } for (var i = 0, c = fs1.files.length; i < c; i++) { formData.append(fs1.files[i].name, fs1.files[i]); @@ -2285,13 +2011,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, @@ -2340,7 +2066,15 @@ this.$set(this, "jindutiao", loaded); }, format(percentage) { - return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`; + + // return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`; + var label; + if (this.sc.label1 == "涓婁紶") { + label = "涓婁紶瀹屾瘯" + } else { + label = `${percentage}%` + } + return percentage === 100 ? label : `${percentage}%`; }, //鑾峰彇鏂囦欢涓婁紶璺緞 async getFilePath() { @@ -2358,7 +2092,7 @@ return rs; } }); - this.pathBak = val[0].bak; + this.pathBak = val[0].checks; this.formInline.dirid = val[0].id; this.getselectVerByDirid(); }, @@ -2410,7 +2144,8 @@ .then((_) => { this.closeTestQuayCloseDialog(); }) - .catch((_) => {}); + .catch((_) => { + }); }, closeTestQuayCloseDialog() { this.testQuayVisible = false; @@ -2421,7 +2156,8 @@ .then((_) => { this.closeQuayTestCloseDialog(); }) - .catch((_) => {}); + .catch((_) => { + }); }, closeQuayTestCloseDialog() { this.quayTestVisible = false; @@ -2435,8 +2171,9 @@ return this.$message("璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�"); } if (this.formInline.uploadType == "v1") { - var value = this.$refs["selectcascader"].getCheckedNodes(); - var fileType = value[0].data.fullName; + + var value = this.getCheckedKeys + var fileType = value.data.fullName; this.quayTestForms.names = fileType; this.quayTestForms.sjzy = this.formInline.specialtyId; this.quayTestVisible = true; @@ -2459,7 +2196,8 @@ if (fileExcel.length != 1) { return this.$message("璇烽�夋嫨涓�涓猈BS鏂囦欢"); } - this.formCheckAll.names = this.pathBak; + + this.formCheckAll.names = JSON.parse(this.pathBak).toString(); var val = this.entryOption.filter((res) => { if (res.id == this.formInline.dirid) { return res; @@ -2469,10 +2207,10 @@ this.formCheckAll.xmmc = val[0].name; this.formCheckAll.sjzy = this.formInline.specialtyId; if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) { - this.formCheckAll.isDiZai = true; + this.formCheckAll.isDiZai = "YES"; this.formCheckAll.diZaiType = this.disOptions[0].value; } else { - this.formCheckAll.isDiZai = false; + this.formCheckAll.isDiZai = "NO"; this.formCheckAll.diZaiType = "NO"; } this.testQuayVisible = true; @@ -2558,11 +2296,13 @@ }, //涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖� setStartWareTable() { - this.listData = { - pageIndex: 1, - pageSize: 10, - name: null, - }; + // this.listData = { + // pageIndex: 1, + // pageSize: 10, + // name: null, + // }; + this.listData.pageIndex = 1; + this.listData.name = null; this.getAllWareTable(); }, //鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟 @@ -2632,6 +2372,8 @@ this.formInline.entryId = null; this.formInline.selectFileType = "*.*"; this.formInline.coordinateId = this.coordinateOption[0].epsgcode; + this.formInline.medium = ""; + this.formInline.tab = ""; }, //閫夋嫨鏁版嵁 setSelectFile() { @@ -2651,9 +2393,17 @@ this.formInline.entryId = this.entryOption[0].name; this.formInline.dirid = this.entryOption[0].id; this.getselectVerByDirid(); - this.pathBak = this.entryOption[0].bak; + this.pathBak = this.entryOption[0].checks; + } else if (res == "v3") { + this.formInline.selectFileType = ".kml"; + this.getSelectdirTab(); + this.getselectVerByDirid(); + this.formInline.specialtyId = "绾胯矾涓撲笟"; + this.uploadFlag = true; + this.formInline.tab = this.lineOptions[0].value; + this.formInline.medium = this.mediumOptions[0].value } else { - this.getStartDirChecked(this.catalogOption); + this.getSelectdirTab(); this.getselectVerByDirid(); this.uploadFlag = true; } @@ -2662,10 +2412,11 @@ //鐗堟湰鍙疯幏鍙� async getselectVerByDirid() { this.verOption = []; - this.formInline.verid = ""; + const res = await dataUploadSelectVerByDirid({ dirid: this.formInline.dirid, }); + if (res.code != 200) { this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触"); return; @@ -2680,9 +2431,11 @@ this.$message.error("鐩綍鍒楄〃鑾峰彇澶辫触"); return; } + this.catalogOption = this.treeData(res.result); this.formInline.dirName = this.catalogOption[0].name; - this.getStartDirChecked(this.catalogOption); + this.formInline.dirid = this.catalogOption[0].id; + // this.getStartDirChecked(this.catalogOption); this.getselectVerByDirid(); }, @@ -2731,7 +2484,8 @@ // this.$refs['selectcascader'].dropDownVisible = false // var value = this.$refs['selectcascader'].getCheckedNodes(); - var bak = node.data.bak; + var bak = node.data.checks; + this.getCheckedKeys = node this.pathBak = bak; if (bak != null) { for (var key in this.quayTestShow) { @@ -2740,7 +2494,7 @@ } } } - var fileType = node.data.code; + var fileType = node.data.exts; if (fileType == null) { fileType = "*.*"; } @@ -2748,11 +2502,16 @@ this.formInline.dirid = node.data.id; this.formInline.dirName = node.data.name; this.getselectVerByDirid(); + setTimeout(() => { + this.$refs.multiSelect.blur() + }, 100) }, //Tabsq鍒囨崲 handleTabClick(tab, event) { if (tab.name == "second") { this.setStartWareTable(); + } else { + this.noteVisible = true } this.calHeight(); }, @@ -2772,7 +2531,7 @@ <style lang="less" scoped> .bottom { width: 100%; - margin-top: 1%; + margin-top: 0.5%; // height: 74%; height: 570px; display: flex; @@ -2784,6 +2543,7 @@ border-radius: 5px; padding: 1%; + .table_box { width: 100%; height: 93%; @@ -2791,10 +2551,33 @@ overflow: auto; } } - /deeep/.el-loading-mask { + + /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; @@ -2806,16 +2589,20 @@ 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