From 513e1bdf4b2703409d9e4dbb776e67ffa0c134a6 Mon Sep 17 00:00:00 2001 From: WX <1377869194@qq.com> Date: 星期三, 13 九月 2023 09:52:15 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web --- src/views/query/SpatialQuery.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/views/query/SpatialQuery.vue b/src/views/query/SpatialQuery.vue index e8f81bb..1668d16 100644 --- a/src/views/query/SpatialQuery.vue +++ b/src/views/query/SpatialQuery.vue @@ -77,7 +77,7 @@ > <template #default="scope"> <el-button - :icon="Location" + class="el-icon-map" size="small" @click.prevent="spaceLocation(scope.$index, scope.row)" > @@ -513,9 +513,36 @@ return ElMessage.error("绌洪棿鏌ヨ澶辫触"); } listData.value.count = data.count; - tableData.value = data.result; + var val = data.result.filter((res) => { + if (res.apprTime) { + res.apprTime = format(res.apprTime); + } + if (res.createtime) { + res.apprTime = format(res.createtime); + } + if (res.updatetime) { + res.apprTime = format(res.updatetime); + } + return res; + }); + tableData.value = val; }; - +//鏍煎紡鍖栨椂闂� +const format = (shijianchuo) => { + //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲 + var time = new Date(shijianchuo); + 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 + "-" + add01(m) + "-" + add01(d) + " " + h + ":" + mm + ":" + s; +}; +//鏍煎紡鍖栨椂闂� +const add01 = (m) => { + return m < 10 ? "0" + m : m; +}; const setQueySpatialFields = async () => { const data = await dataQuery_selectFields({ ns: "mn", @@ -531,8 +558,17 @@ } }); - attributeData.value = std; - fieldOption.value = std; + var val = std.filter((res) => { + if (res.field.indexOf("_") > -1) { + var str = res.field.split("_"); + res.field = str[0] + str[1][0].toUpperCase() + str[1].slice(1); + return res; + } else { + return res; + } + }); + attributeData.value = val; + fieldOption.value = val; conditionChange(data.result[0]); setQueySpatialData(); }; @@ -786,6 +822,16 @@ color: #d6e4ff !important; } } + .el-icon-map { + background: url("../../assets/img/location.png") center no-repeat; + background-size: 100% 100%; + border: transparent; + } + .el-icon-map:before { + content: "瀹氫綅"; + font-size: 0; + visibility: hidden; + } } </style> <style lang="less" > -- Gitblit v1.9.3