From 97277a2c41d80bbf375f88a47e242f1b17602b2b Mon Sep 17 00:00:00 2001 From: surprise <15810472099@163.com> Date: 星期三, 29 十一月 2023 16:53:10 +0800 Subject: [PATCH] 发布管理修改 --- src/views/datamanage/uploadmanage.vue | 300 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 159 insertions(+), 141 deletions(-) diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue index 0aac1da..91b2b50 100644 --- a/src/views/datamanage/uploadmanage.vue +++ b/src/views/datamanage/uploadmanage.vue @@ -49,7 +49,7 @@ class="tabsSpan" :class="{ changetabs : active == 'third'}" > - <span> {{$t('dataManage.uploadObj.modelAttachMount')}}</span> + <span> {{$t('dataManage.uploadObj.attachMount')}}</span> </div> </div> </div> @@ -288,6 +288,7 @@ key="7" /> <el-table-column + v-if="active == 'first'" prop="verName" :label="$t('dataManage.vmobj.versionNumber')" align="center" @@ -319,6 +320,7 @@ align="center" key="12" /> + <el-table-column v-if="active == 'first'" prop="createTime" @@ -331,6 +333,20 @@ </template> </el-table-column> + <el-table-column + prop="updateName" + :label="$t('dataManage.vmobj.updateonuser')" + align="center" + key="14" + /> + <el-table-column + prop="updateTime" + :label="$t('dataManage.vmobj.updateontime')" + :formatter="formatData" + align="center" + key="15" + /> + <el-table-column min-width="150" :label="$t('common.operate')" @@ -791,68 +807,27 @@ <div v-for="item in osgbLasOption" - style="margin-top: 10px; display: flex; align-items: center; justify-content: space-around; " + style="margin-top: 10px; display: flex; justify-content: center; align-items: center; " > - <div - class="contLable" - style=" margin: 0px 10px;" - > + + <div style=" text-align: center; "> {{ 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')"> + <!-- <div style="display: flex; align-items: center; margin: 0px 10px;"> + <label class="contLable">楂樺害鍋忕Щ閲忥細</label> <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')" - > + size="small" + v-model="item.zs" + > + <i slot="suffix">m</i></el-input> + </div> + <div style="display: flex; align-items: center; "> + <label class="contLable">鍧愭爣绯伙細</label> <el-select - v-model="osgbLasLayer.strid" - :placeholder="$t('dataManage.vmobj.label2')" + v-if="!item.lids" + v-model="item.srids" style="width: 100%;" + size="small" > <el-option v-for="item in stridOption" @@ -862,8 +837,14 @@ > </el-option> </el-select> - </el-form-item> --> - + <el-input + v-if="item.lids" + v-model="item.srids" + size="small" + disabled + ></el-input> + </div> --> + </div> <div style="display: flex; justify-content: end;margin-top:10px;"> <el-button size="small" @@ -893,11 +874,26 @@ <div v-loading="true" element-loading-background="rgba(0, 0, 0, 0.0) " - element-loading-text="鏁版嵁鍙戝竷涓�" + :element-loading-text="loadingText" style="margin: 0px 20px;widht:100%;height:calc(100% - 80px); " > </div> </div> + <el-dialog + :title="$t('common.details')" + :visible.sync="rasterCsVisible" + :close-on-click-modal="false" + width="35%" + > + <div class="rasterCsBox"> + <div v-for="(item,index) in rasterCsOption"> + <div class="rasterCsContent"> + <label>{{ item.name }} : </label> + <label>{{ item.bak }}</label> + </div> + </div> + </div> + </el-dialog> </div> </template> @@ -919,7 +915,8 @@ dataUpload_selectCoords, publish_selectLasCs, task_selectByPageAndCount, - task_deleteTask + task_deleteTask, + publish_selectRasterCs } from '../../api/api.js' import { conditions } from '../Archive/Archive'; @@ -1056,6 +1053,9 @@ }, stridOption: [], osgbLasOption: [], + loadingText: '鏁版嵁鍙戝竷涓�', + rasterCsVisible: false, + rasterCsOption: [] } }, methods: { @@ -1071,24 +1071,32 @@ var ids = []; var zs = [] - for (var i in this.osgbLasOption) { - ids.push(this.osgbLasOption[i].id) - zs.push(this.osgbLasOption[i].zs) - } + var models = [] var srids = []; var lerro = []; + for (var i in this.osgbLasOption) { + ids.push(this.osgbLasOption[i].id) + // zs.push(this.osgbLasOption[i].zs) + zs.push(0) + srids.push(0) + models.push(0) + } + var name = this.osgbLasOption[0].name + 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 (this.osgbLasOption[i].srids) { + // //var epsg = this.osgbLasOption[i].srids.replace('EPSG:', '') + // // srids.push(epsg) + // srids.push("00") + // } else { + // lerro.push(this.osgbLasOption[i].name) + // } + srids.push(0) } - if (lerro.length > 0) { - return this.$message(lerro + '鏈�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴'); - } + // if (lerro.length > 0) { + // return this.$message(lerro + '鏈�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴'); + // } // if (!this.osgbLasLayer.strid) { // return this.$message('璇烽�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴'); @@ -1099,30 +1107,18 @@ var obj = { dircode: this.formInline.dirid, depcode: this.formInline.depid, - min: null, - max: null, - name: null, + min: 0, + max: 0, + name: name, type: this.formInline.type, - noData: null, + noData: 0, ids: ids, - models: null, - srids: srids, - zx: zs + models: models, + srids: [], + zs: zs } - this.loadDialogVisible = true - this.setOsgbCanel(); - const data = await publish_insert(obj); + this.setPublish_insert(obj) - if (data.code == 200 && data.result > 0) { - this.$message({ - message: '鏁版嵁鍙戝竷鎴愬姛', - type: 'success' - }); - } else { - this.$message.error("鏁版嵁鍙戝竷澶辫触") - } - this.loadDialogVisible = false - this.getTableData(); }, setModelCanel() { @@ -1162,21 +1158,7 @@ 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(); + this.setPublish_insert(obj) }, @@ -1201,7 +1183,9 @@ this.options = std; }, setloadDialogVisible() { - this.loadDialogVisible = false + + this.loadDialogVisible = false; + this.loadingText = '鏁版嵁鍙戝竷涓�'; }, setinsertLayerCancel() { this.insertDialogVisible = false; @@ -1242,6 +1226,21 @@ for (var i in this.multipleSelection) { std.push(this.multipleSelection[i].id) } + + // if (this.formInline.type == 'DOM') { + // const data1 = await publish_selectRasterCs({ + // ids: std.toString() + // }) + // if (data1.code == 200 && data1.result.length == 0) { + // } else { + // this.rasterCsOption = data1.result; + // this.insertDialogVisible = false; + // this.rasterCsVisible = true; + // return + // } + // } + + var obj = { dircode: this.formInline.dirid, depcode: this.formInline.depid, @@ -1252,22 +1251,11 @@ 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.result > 0) { - this.$message({ - message: '鏁版嵁鍙戝竷鎴愬姛', - type: 'success' - }); - } else { - this.$message.error("鏁版嵁鍙戝竷澶辫触") - } - this.loadDialogVisible = false - this.getTableData(); + this.setPublish_insert(obj) }, + + + //鏁版嵁鍙戝竷 async setPagePublish() { @@ -1275,7 +1263,6 @@ this.$message("璇烽�夋嫨瑕佸彂甯冪殑鏁版嵁") return } - if (this.formInline.type == "DOM" || this.formInline.type == "DEM") { this.insertLayer.name = this.multipleSelection[0].name.split('.')[0]; @@ -1347,23 +1334,40 @@ type: this.formInline.type } - this.loadDialogVisible = true - this.insertDialogVisible = 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(); + this.setPublish_insert(obj) } }, + + async setPublish_insert(obj) { + this.insertDialogVisible = false; + this.insertModelVisible = false; + this.insertOsgbVisible = false; + var std = []; + + + + this.loadingText = '鏁版嵁鍙戝竷涓�'; + this.loadDialogVisible = true + this.insertDialogVisible = 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(); + + + }, + + + + //鏁版嵁璇︽儏 setPreviewDetails(res) { this.itemdetail = res; @@ -1435,6 +1439,7 @@ var that = this this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?') .then(_ => { + that.deletePage() }) .catch(_ => { @@ -1443,6 +1448,8 @@ } }, async deletePage() { + this.loadingText = '鏁版嵁鍒犻櫎涓�'; + this.loadDialogVisible = true; var std = []; for (var i in this.multipleSelection) { std.push(this.multipleSelection[i].id); @@ -1458,6 +1465,7 @@ }); this.getTableData(); } + this.loadDialogVisible = false; }, //棰勮寮圭獥鎵撳紑 setPreviewLayer(res) { @@ -1923,7 +1931,17 @@ padding: 10px !important; } .contLable { - width: 160px; + width: 140px; + text-align: right; + } + .rasterCsBox { + max-height: 60vh; + overflow: auto; + .rasterCsContent { + padding: 10px; + font-size: 16px; + font-family: Source Han Sans CN; + } } } </style> \ No newline at end of file -- Gitblit v1.9.3