From 0a722969a72ced13136b82d8c01939bea2c43745 Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期四, 27 七月 2023 17:21:53 +0800 Subject: [PATCH] 项目管理,数据发布修改 --- src/views/datamanage/uploadmanage.vue | 663 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 605 insertions(+), 58 deletions(-) diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue index c61aef4..7d78f65 100644 --- a/src/views/datamanage/uploadmanage.vue +++ b/src/views/datamanage/uploadmanage.vue @@ -93,6 +93,28 @@ </el-option> </el-select> </el-form-item> + <!-- 鐩綍 --> + <el-form-item v-if="active == 'second'"> + <el-select + size="small" + v-model="formInline.dirid2" + placeholder="璇烽�夋嫨椤圭洰鐩綍..." + > + <el-option + :value="formInline.dirid2" + :label="formInline.dirName2" + style="height: auto" + > + <el-tree + ref="tree" + :data="dirOption2" + node-key="id" + :props="defaultProps" + @node-click="handleDirChange2" + /> + </el-option> + </el-select> + </el-form-item> <!-- 鐗堟湰 --> <el-form-item v-if="active == 'first'"> <el-select @@ -124,11 +146,28 @@ </el-option> </el-select> </el-form-item> + <el-form-item v-if="active == 'second'"> + <el-select + size="small" + v-model="formInline.type1" + @change="handleTypeChange1" + placeholder="璇烽�夋嫨鏁版嵁绫诲埆..." + > + <el-option + v-for="item in typeOption1" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> <el-form-item> <el-input size="small" :title="$t('dataManage.vmobj.keyword')" v-model="formInline.name" + :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuedataName')" > <i @click="getTableData" :title="$t('common.iquery')" @@ -172,27 +211,32 @@ @selection-change="handleSelectionChange" @cell-dblclick="copyText" height="calc(100% - 1px)" + ref="tableBox" > <el-table-column type="selection" width="55" + key="1" /> <el-table-column :label="$t('dataManage.dictionaryManageObj.number')" type="index" width="50" align="center" + key="2" > </el-table-column> <el-table-column prop="name" :label="$t('dataManage.vmobj.name')" align="center" + key="3" /> <el-table-column prop="type" :label="$t('dataManage.vmobj.format')" align="center" + key="4" /> <el-table-column v-if="active == 'first'" @@ -200,51 +244,69 @@ :label="$t('dataManage.vmobj.size')" :formatter="stateFormatSizes" align="center" + key="5" /> <el-table-column prop="depName" :label="$t('dataManage.vmobj.depName')" align="center" + key="6" /> <el-table-column prop="dirName" :label="$t('dataManage.vmobj.dirName')" width="200" align="center" + key="7" /> <el-table-column prop="verName" :label="$t('dataManage.vmobj.versionNumber')" align="center" + key="8" /> <el-table-column prop="url" :label="$t('common.publishAddress')" align="center" + key="9" /> <el-table-column v-if="active == 'first'" prop="uname" :label="$t('common.rublisher')" align="center" - :key="Math.random()" + key="10" /> <el-table-column v-if="active != 'first'" prop="createName" :label="$t('common.rublisher')" align="center" - :key="Math.random()" + key="11" /> <el-table-column prop="createTime" :label="$t('common.releaseTime')" align="center" + key="12" /> + <el-table-column + v-if="active == 'first'" + prop="createTime" + :label="$t('common.publishStatus')" + align="center" + key="13" + > + <template slot-scope="scope"> + <span v-if="scope.row.url ">宸插彂甯�</span> + </template> + </el-table-column> <el-table-column min-width="150" :label="$t('common.operate')" + v-if="active == 'second'" > <template slot-scope="scope"> <el-button @@ -267,12 +329,20 @@ </el-button> <el-button - v-if="scope.row.url" + v-if="scope.row.url && active == 'second'" size="small" type="success" plain @click="setPreviewLayer(scope.row)" >{{$t('common.preview')}} + + </el-button> + <el-button + v-if="scope.row.url && active == 'first'" + size="small" + type="success" + plain + >宸插彂甯� </el-button> </template> @@ -340,7 +410,7 @@ id="MapDiv" style="background:red;widht:100%;height:calc(100% - 10px)" ></div> - <!-- + </el-dialog> --> <!-- 淇敼鏁版嵁 --> <el-dialog @@ -440,7 +510,7 @@ :close-on-click-modal="false" :show-close="false" > - <div style="width:100%;height:30vh"> + <div style="width:100%; "> <el-form ref="form" :model="insertLayer" @@ -458,7 +528,28 @@ v-model="insertLayer.number" ></el-input> </el-form-item> - <el-form-item :label="$t('dataManage.vmobj.minLevel')"> + <el-form-item + :label="$t('dataManage.vmobj.labe14')" + v-show="formInline.type =='DOM'" + > + <el-select + style="width:100%" + v-model="insertLayer.noData" + > + <el-option + label="榛戣壊" + value="0" + ></el-option> + <el-option + label="鐧借壊" + value="255" + ></el-option> + </el-select> + </el-form-item> + <el-form-item + v-show="formInline.type !='DEM'" + :label="$t('dataManage.vmobj.minLevel')" + > <!-- <el-input v-model="insertLayer.min" :placeholder="$t('dataManage.vmobj.labe11')" @@ -477,7 +568,10 @@ </el-option> </el-select> </el-form-item> - <el-form-item :label="$t('dataManage.vmobj.maxLevel')"> + <el-form-item + :label="$t('dataManage.vmobj.maxLevel')" + v-show="formInline.type !='DEM'" + > <!-- <el-input v-model="insertLayer.max" :placeholder="$t('dataManage.vmobj.labe12')" @@ -511,7 +605,165 @@ </el-form> </div> </el-dialog> + <!--妯″瀷鍙戝竷 --> + <el-dialog + :title="$t('common.publish')" + :visible.sync="insertModelVisible" + width="25%" + :close-on-click-modal="false" + :show-close="false" + > + <div style="width:100%; "> + <div + v-for="item in modelOptions" + style="margin: 5px;" + > + <el-row :gutter="20"> + <el-col :span="10"> + <div + class="contLable" + style="height: 64px; display: flex; align-items: center;" + > + {{ item.name }} + </div> + </el-col> + <el-col :span="10"> + <div style="height: 64px; display: flex; align-items: center;"> + + <el-select + size="small" + v-model="item.isModel" + placeholder="璇烽�夋嫨鏁版嵁绫诲瀷" + > + <el-option + label="鍗曚綋妯″瀷" + value="1" + ></el-option> + <el-option + label="鍊炬枩妯″瀷" + value="0" + >鍊炬枩妯″瀷</el-option> + </el-select> + + </div> + </el-col> + </el-row> + </div> + <div style="display: flex; justify-content: end;margin-top:10px;"> + <el-button + size="small" + type="primary" + @click="setModelInsert" + >{{$t('common.submit')}}</el-button> + <el-button + size="small" + type="info" + @click="setModelCanel" + >{{$t('common.cancel')}}</el-button> + </div> + </div> + </el-dialog> + + <!-- OSGB LAS --> + <el-dialog + :title="$t('common.publish')" + :visible.sync="insertOsgbVisible" + :close-on-click-modal="false" + :show-close="false" + width="35%" + > + <div> + + <div + v-for="item in osgbLasOption" + style="margin-top: 10px; display: flex; align-items: center; justify-content: space-around; " + > + <div + class="contLable" + style=" margin: 0px 10px;" + > + {{ item.name }} + </div> + <div> + <div style="display: flex; align-items: center; margin: 0px 10px;"> + <label class="contLable">楂樺害鍋忕Щ閲忥細</label> + <el-input + size="small" + v-model="item.zs" + > + <i slot="suffix">m</i></el-input> + </div> + + </div> + + <div v-show="formInline.type =='LAS'"> + <div style="display: flex; align-items: center; margin: 0px 10px;"> + <label class="contLable">鍧愭爣绯伙細</label> + <el-select + v-if="!item.lids" + v-model="item.srids" + style="width: 100%;" + size="small" + > + <el-option + v-for="item in stridOption" + :key="item.id" + :label="item.coordinate" + :value="item.epsgcode" + > + </el-option> + </el-select> + <el-input + v-if="item.lids" + v-model="item.srids" + size="small" + disabled + ></el-input> + </div> + + </div> + + </div> + <!-- <el-form-item :label="$t('dataManage.vmobj.heightOffset')"> + <el-input + :placeholder="$t('dataManage.vmobj.label1')" + v-model="osgbLasLayer.z" + ></el-input> + </el-form-item> --> + <!-- <el-form-item + v-if="formInline.type == 'LAS'" + :label="$t('dataManage.vmobj.coordinateSystemID')" + > + <el-select + v-model="osgbLasLayer.strid" + :placeholder="$t('dataManage.vmobj.label2')" + style="width: 100%;" + > + <el-option + v-for="item in stridOption" + :key="item.id" + :label="item.coordinate" + :value="item.epsgcode" + > + </el-option> + </el-select> + </el-form-item> --> + + <div style="display: flex; justify-content: end;margin-top:10px;"> + <el-button + size="small" + type="primary" + @click="setOsgbInsert" + >{{$t('common.submit')}}</el-button> + <el-button + size="small" + type="info" + @click="setOsgbCanel" + >{{$t('common.cancel')}}</el-button> + </div> + </div> + </el-dialog> <div class="loadBox" v-if="loadDialogVisible" @@ -550,7 +802,10 @@ publish_deletes, publish_update, publish_insert, + dataUpload_selectCoords, + publish_selectLasCs } from '../../api/api.js' +import { conditions } from '../Archive/Archive'; export default { components: { @@ -562,12 +817,15 @@ active: 'first', formInline: { dirid: null, + dirid2: null, dirName: null, + dirName2: null, depid: null, verid: null, depName: null, name: "", - type: "" + type: "", + type1: "All", }, listData: { pageIndex: 1, @@ -577,14 +835,56 @@ multipleSelection: [], tableData: [], depOption: [], + dirOption2: [], dirOption: [], verOption: [], + modelOptions: [], typeOption: [{ value: 'DOM', label: '褰卞儚鏁版嵁(.tif, .img)' }, { + value: 'DEM', + label: '楂樼▼鏁版嵁(.tif)' + }, { value: 'MPT', label: '鍦烘櫙鏁版嵁(.mpt)' + }, { + value: 'OSGB', + label: '鍊炬枩鏁版嵁(.osgb)' + }, { + value: 'LAS', + label: '鐐逛簯鏁版嵁(.las, .laz)' + }, { + value: 'CPT', + label: '鐐逛簯鏁版嵁(.cpt)' + }, { + value: '3DML', + label: '涓夌淮妯″瀷(.3dml)' + }, { + value: 'BIM', + label: '涓夌淮妯″瀷(.fbx, .ifc, .rvt)' + }], + typeOption1: [{ + value: 'All', + label: '鍏ㄩ儴' + }, { + value: 'DOM', + label: '褰卞儚鏁版嵁(.tif, .img)' + }, { + value: 'DEM', + label: '楂樼▼鏁版嵁(.tif)' + }, { + value: 'MPT', + label: '鍦烘櫙鏁版嵁(.mpt)' + }, { + value: 'OSGB', + label: '鍊炬枩鏁版嵁(.osgb)' + }, { + value: 'LAS', + label: '鐐逛簯鏁版嵁(.las, .laz)' + }, { + value: 'CPT', + label: '鐐逛簯鏁版嵁(.cpt)' }, { value: '3DML', label: '涓夌淮妯″瀷(.3dml)' @@ -608,13 +908,141 @@ detailsDialogVisible: false, itemdetail: {}, insertDialogVisible: false, - insertLayer: { name: '', number: null, min: 4, max: 18 }, + insertModelVisible: false, + insertLayer: { name: '', number: null, min: 4, max: 18, noData: '0' }, loadDialogVisible: false, options: [], isFullscreen: false, + insertOsgbVisible: false, + osgbLasLayer: { + z: '0', + strid: '' + }, + stridOption: [], + osgbLasOption: [], } }, methods: { + setOsgbCanel() { + this.insertOsgbVisible = false; + this.osgbLasLayer = { + z: '0', + strid: '' + } + }, + async setOsgbInsert() { + + var ids = []; + var zs = [] + for (var i in this.osgbLasOption) { + ids.push(this.osgbLasOption[i].id) + zs.push(this.osgbLasOption[i].zs) + } + var srids = []; + var lerro = []; + if (this.formInline.type == 'LAS') { + for (var i in this.osgbLasOption) { + if (this.osgbLasOption[i].srids) { + var epsg = this.osgbLasOption[i].srids.replace('EPSG:', '') + srids.push(epsg) + } else { + lerro.push(this.osgbLasOption[i].name) + } + } + if (lerro.length > 0) { + return this.$message(lerro + '鏈�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴'); + } + + // if (!this.osgbLasLayer.strid) { + // return this.$message('璇烽�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴'); + // } else { + // strid = this.osgbLasLayer.strid.replace('EPSG:', '') + // } + } + var obj = { + dircode: this.formInline.dirid, + depcode: this.formInline.depid, + min: null, + max: null, + name: null, + type: this.formInline.type, + noData: null, + ids: ids, + models: null, + srids: srids, + zx: zs + } + this.loadDialogVisible = true + this.setOsgbCanel(); + const data = await publish_insert(obj); + + if (data.code == 200 && data.result > 0) { + this.$message({ + message: '鏁版嵁鍙戝竷鎴愬姛', + type: 'success' + }); + } else { + this.$message.error("鏁版嵁鍙戝竷澶辫触") + } + this.loadDialogVisible = false + this.getTableData(); + + }, + setModelCanel() { + this.insertModelVisible = false; + this.modelOptions = []; + }, + async setModelInsert() { + var val = this.modelOptions.filter(res => { + if (!res.isModel) { + return res + } + }) + var str = []; + if (val.length > 0) { + for (var i in val) { + str.push(val[i].name) + } + var mesage = str.toString() + '鏈�夋嫨鏁版嵁绫诲瀷' + this.$message(mesage); + return; + } + var ids = []; + var models = []; + for (var i in this.modelOptions) { + ids.push(this.modelOptions[i].id) + models.push(parseInt(this.modelOptions[i].isModel)) + } + var obj = { + dircode: this.formInline.dirid, + depcode: this.formInline.depid, + min: null, + max: null, + name: null, + type: this.formInline.type, + noData: null, + ids: ids, + models: models + + } + this.loadDialogVisible = true + this.insertModelVisible = false; + + const data = await publish_insert(obj); + + if (data.code == 200 && data.result > 0) { + this.$message({ + message: '鏁版嵁鍙戝竷鎴愬姛', + type: 'success' + }); + } else { + this.$message.error("鏁版嵁鍙戝竷澶辫触") + } + this.loadDialogVisible = false + this.getTableData(); + + + }, copyText(row, column, cell, event) { // 鍙屽嚮澶嶅埗 let save = function (e) { @@ -627,7 +1055,7 @@ }, setOptions() { var std = []; - for (var i = 0; i < 21; i++) { + for (var i = 0; i < 23; i++) { std.push({ value: i, label: i @@ -644,32 +1072,31 @@ }, //鍙戝竷鎻愪氦 async setinsertLayerSubmit() { + var min = this.insertLayer.min; var max = this.insertLayer.max; var name = this.insertLayer.name; + if (this.formInline.type == 'DEM') { + min = 0; + max = 18; + } if (!name) { this.$message.error("鍚嶇О涓嶈兘涓虹┖") return } - if (!min) { - this.$message.error("璇疯緭鍏ユ渶灏忕骇鍒�(0 ~ 20)") - return - } else { - if (parseInt(min) < 0 || parseInt(min) > 20) { - this.$message.error(" 鏈�灏忕骇鍒笉鑳藉皬浜� 0 鎴栧ぇ浜� 20 ") - return - } - } - if (!max) { - this.$message.error("璇疯緭鍏ユ渶澶х骇鍒�(0 ~ 20)") + + if (parseInt(min) < 0 || parseInt(min) > 20) { + this.$message.error("鏈�灏忕骇鍒笉鑳藉皬浜� 0 鎴栧ぇ浜� 20 ") return - } else { - if (parseInt(max) < 0 || parseInt(max) > 20) { - this.$message.error(" 鏈�澶х骇鍒笉鑳藉皬浜� 0 鎴栧ぇ浜� 20 ") - return - } } + + + if (parseInt(max) < 0 || parseInt(max) > 20) { + this.$message.error(" 鏈�澶х骇鍒笉鑳藉皬浜� 0 鎴栧ぇ浜� 20 ") + return + } + if (parseInt(min) > parseInt(max)) { this.$message.error("鏈�灏忕骇鍒笉寰楀ぇ浜庢渶澶х骇鍒�") return @@ -685,20 +1112,21 @@ max: max, name: name, ids: std, - type: this.formInline.type + type: this.formInline.type, + noData: this.insertLayer.noData } this.loadDialogVisible = true this.insertDialogVisible = false; const data = await publish_insert(obj); - if (data.code != 200 || data.count > 0) { - this.$message.error("鏁版嵁鍙戝竷澶辫触") - } else { + if (data.code == 200 && data.result > 0) { this.$message({ message: '鏁版嵁鍙戝竷鎴愬姛', type: 'success' }); + } else { + this.$message.error("鏁版嵁鍙戝竷澶辫触") } this.loadDialogVisible = false this.getTableData(); @@ -707,38 +1135,94 @@ //鏁版嵁鍙戝竷 async setPagePublish() { if (this.multipleSelection.length == 0) { - this.$message.error("璇烽�夋嫨瑕佸彂甯冪殑鏁版嵁") + this.$message("璇烽�夋嫨瑕佸彂甯冪殑鏁版嵁") return } - if (this.formInline.type == "DOM") { - this.insertLayer.name = this.formInline.dirName; + + if (this.formInline.type == "DOM" || this.formInline.type == "DEM") { + + this.insertLayer.name = this.multipleSelection[0].name.split('.')[0]; this.insertLayer.number = this.multipleSelection.length + this.insertLayer.noData = '0'; this.insertDialogVisible = true; + } else if (this.formInline.type == "3DML" || this.formInline.type == "BIM") { + var val = JSON.parse(JSON.stringify(this.multipleSelection)) + for (var i in val) { + val[i].isModel = null + } + this.modelOptions = val; + this.insertModelVisible = true; + } else if (this.formInline.type == "OSGB") { + + var val = JSON.parse(JSON.stringify(this.multipleSelection)) + for (var i in val) { + val[i].zs = 0; + val[i].srids = null; + } + this.osgbLasOption = val; + this.insertOsgbVisible = true; + + } else if (this.formInline.type == "LAS") { + var lids = []; + var val = JSON.parse(JSON.stringify(this.multipleSelection)) + for (var i in val) { + val[i].zs = 0; + val[i].srids = null; + val[i].lids = false; + lids.push('ids=' + val[i].id) + } + + var url = lids.join('&') + const data1 = await publish_selectLasCs(url); + + if (data1.code != 200) { + this.$message('Las鏂囦欢鍧愭爣绯籌D澶辫触'); + } else { + for (var i = 0; i < val.length; i++) { + var coord = data1.result[i] + if (coord > 0) { + val[i].srids = "EPSG:" + coord; + val[i].lids = true; + } + } + + } + + const data = await dataUpload_selectCoords(); + + if (data.code != 200) { + this.$message('鍧愭爣绯绘暟鎹幏鍙栧け璐�'); + } + this.stridOption = data.result; + + this.osgbLasOption = val; + this.insertOsgbVisible = true; } else { var std = []; for (var i in this.multipleSelection) { std.push(this.multipleSelection[i].id) } + var obj = { dircode: this.formInline.dirid, depcode: this.formInline.depid, - ids: std, type: this.formInline.type } + this.loadDialogVisible = true this.insertDialogVisible = false; const data = await publish_insert(obj); - if (data.code != 200) { - this.$message.error("鏁版嵁鍙戝竷澶辫触") - - } else { + if (data.code == 200 && data.result > 0) { this.$message({ message: '鏁版嵁鍙戝竷鎴愬姛', type: 'success' }); + } else { + this.$message.error("鏁版嵁鍙戝竷澶辫触") } + this.loadDialogVisible = false this.getTableData(); } @@ -754,6 +1238,7 @@ var url = this.editLayer.url; this.editLayer.url = url.replace(iisHost, "{host}"); } + const data = await publish_update(this.editLayer); if (data.code != 200) { this.$message.error("鏁版嵁淇敼澶辫触") @@ -795,10 +1280,10 @@ var that = this this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?') .then(_ => { - done(); + that.deletePage() }) .catch(_ => { - that.deletePage() + }); } }, @@ -869,13 +1354,13 @@ //鍒嗛〉鍒囨崲 handleCurrentChange(val) { this.listData.pageIndex = val; - this.getTableData(); + this.getTableData_one(); }, //姣忛〉鏄剧ず鏁伴噺 handleSizeChange(val) { this.listData.pageSize = val; this.listData.pageIndex = 1; - this.getTableData(); + this.getTableData_one(); }, //tabs鍒囨彌 setTabsChange(res) { @@ -893,35 +1378,48 @@ url: "menuLayer" } this.active = 'third'; - break; + + + + this.$nextTick(() => { + this.$refs.tableBox.doLayout() + }) + + } }, //椤甸潰鍒濆鍖� setPageStart() { this.formInline = { dirid: null, + dirid2: null, dirName: null, + dirName2: null, depid: null, verid: null, depName: null, name: "", - type: "" + type: "", + type1: "All" } if (this.active == "first") { this.listData = { pageIndex: 1, - pageSize: 100, + pageSize: 10, count: 0 } - this.showPageSize = [100, 200, 500, 1000] + this.showPageSize = [10, 50, 100, 200] } else { this.listData = { pageIndex: 1, pageSize: 10, count: 0 } - this.showPageSize = [10, 20, 50, 100] + this.showPageSize = [10, 50, 100, 200, 500] + this.formInline.type1 = this.typeOption1[0].value; + this.formInline.dirid2 = this.dirOption2[0].code; + this.formInline.dirName2 = this.dirOption2[0].name; } this.formInline.type = this.typeOption[0].value; @@ -935,9 +1433,25 @@ this.$message.error("鍗曚綅鍒楄〃鑾峰彇澶辫触") return } + var res = JSON.parse(JSON.stringify(data.result)); + var res_val = res.filter((rs) => { + if (rs.pid == 0) { + return rs + } + }) + + res_val.unshift({ + name: '鍏ㄩ儴', + id: 'All', + pid: 0, + code: "All" + }) + this.dirOption2 = this.treeData(res_val) this.dirOption = this.treeData(data.result); this.formInline.dirid = this.dirOption[0].code; this.formInline.dirName = this.dirOption[0].name; + this.formInline.dirid2 = this.dirOption2[0].code; + this.formInline.dirName2 = this.dirOption2[0].name; this.getVerList(this.dirOption[0].id) }, //鑾峰彇鐗堟湰鍒楄〃 @@ -962,6 +1476,10 @@ this.formInline.type = value; this.getTableData(); }, + handleTypeChange1(value) { + this.formInline.type1 = value; + this.getTableData(); + }, //鍗曚綅鍒楄〃鍒囨崲 handleDepChange(data, node, nodeData) { this.formInline.depid = data.code @@ -974,10 +1492,25 @@ this.formInline.dirName = data.name this.getVerList(data.id) }, + //鐩綍鍒楄〃鍒囨崲 + handleDirChange2(data, node, nodeData) { + this.formInline.dirid2 = data.code + this.formInline.dirName2 = data.name + this.getTableData(); + }, + + + + //鑾峰彇Table琛ㄦ牸鏁版嵁 async getTableData() { - this.tableData = []; + this.listData.count = 0; + this.listData.pageIndex = 1; + this.getTableData_one(); + }, + async getTableData_one() { + this.tableData = []; if (this.active == "first") { this.listData.depcode = this.formInline.depid; @@ -1009,26 +1542,37 @@ } } else { - if (this.formInline.name) { - this.listData.name = this.formInline.name + this.listData.name = this.formInline.name + if (this.formInline.dirid2 == 'All') { + this.listData.dircode = this.formInline.dirid2.replace('All', ''); + } else { + this.listData.dircode = this.formInline.dirid2 } + if (this.formInline.type1 == 'All') { + this.listData.type = this.formInline.type1.replace('All', ''); + } else { + this.listData.type = this.formInline.type1 + } + const data = await publish_selectByPage(this.listData); if (data.result) { var that = this - var val = data.result.filter((res) => { - if (res.createTime) { - res.createTime = that.format(res.createTime); + var val = data.result.filter((rs) => { + if (rs.createTime) { + rs.createTime = that.format(rs.createTime); } - if (res.updateTime) { - res.updateTime = that.format(res.updateTime); + if (rs.updateTime) { + rs.updateTime = that.format(rs.updateTime); } - if (res.url) { - res.url = res.url.replace("{host}", iisHost); + if (rs.url) { + + rs.url = rs.url.replace("{host}", iisHost); } - return res + return rs }) + this.tableData = val; this.listData.count = data.count; } @@ -1161,5 +1705,8 @@ /deep/.el-dialog__header { padding: 10px !important; } + .contLable { + width: 160px; + } } </style> \ No newline at end of file -- Gitblit v1.9.3