From dc412901096a7ea7d65d1c7e097d7f9043073d93 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 21 八月 2023 09:27:56 +0800
Subject: [PATCH] 代码更新
---
src/views/datamanage/uploadmanage.vue | 166 +++++++++++++++++++++++++++---------------------------
1 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index 0aac1da..89ed182 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,7 +874,7 @@
<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>
@@ -1056,6 +1037,7 @@
},
stridOption: [],
osgbLasOption: [],
+ loadingText: '鏁版嵁鍙戝竷涓�'
}
},
methods: {
@@ -1071,24 +1053,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,16 +1089,17 @@
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.loadingText = '鏁版嵁鍙戝竷涓�';
this.loadDialogVisible = true
this.setOsgbCanel();
const data = await publish_insert(obj);
@@ -1162,6 +1153,7 @@
models: models
}
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
this.loadDialogVisible = true
this.insertModelVisible = false;
@@ -1201,7 +1193,9 @@
this.options = std;
},
setloadDialogVisible() {
- this.loadDialogVisible = false
+
+ this.loadDialogVisible = false;
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
},
setinsertLayerCancel() {
this.insertDialogVisible = false;
@@ -1252,6 +1246,7 @@
type: this.formInline.type,
noData: this.insertLayer.noData
}
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
this.loadDialogVisible = true
this.insertDialogVisible = false;
@@ -1346,7 +1341,7 @@
ids: std,
type: this.formInline.type
}
-
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
this.loadDialogVisible = true
this.insertDialogVisible = false;
@@ -1435,6 +1430,7 @@
var that = this
this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?')
.then(_ => {
+
that.deletePage()
})
.catch(_ => {
@@ -1443,6 +1439,8 @@
}
},
async deletePage() {
+ this.loadingText = '鏁版嵁鍒犻櫎涓�';
+ this.loadDialogVisible = true;
var std = [];
for (var i in this.multipleSelection) {
std.push(this.multipleSelection[i].id);
@@ -1458,6 +1456,7 @@
});
this.getTableData();
}
+ this.loadDialogVisible = false;
},
//棰勮寮圭獥鎵撳紑
setPreviewLayer(res) {
@@ -1923,7 +1922,8 @@
padding: 10px !important;
}
.contLable {
- width: 160px;
+ width: 140px;
+ text-align: right;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3