From 7ab32ddf5446761a067988ce3bea83e480fcd75a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Jan 2024 18:10:46 +0800
Subject: [PATCH] 驾驶舱地址更换，场所维护BUG修复，图片显示异常处理
---
src/views/wel/index.vue | 4 +++-
src/views/place/components/baseAllInfo.vue | 45 ++++++++++++++++++++++++++-------------------
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 88930ba..72ae16c 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -392,9 +392,6 @@
getPlaceExt({ placeId: newData['id'] }),
]).then(that.$axios.spread(function (baseInfo, restInfo) {
that.form = baseInfo.data.data
- console.log(that.form, 90999)
-
- // that.$nextTick(() => that.$refs.baseForm.dicInit('cascader'))
that.form.location = [that.form.lng, that.form.lat, that.form.location].join(',')
@@ -436,13 +433,7 @@
planImageUrls
}
}
-
- // that.$nextTick(() => {
- // that.$refs.baseForm.dicInit('select')
- // })
}))
-
- that.holdOnLoad(this.holdPage)
},
locationDispose (data) {
@@ -523,6 +514,8 @@
},
holdOnLoad (holdPage, params = {}) {
+ console.log(98098599)
+
if (!this.curRow.id) return
let values = {
@@ -549,26 +542,36 @@
this.holdPage.pageSize = pageSize
},
- dataUpdate () {
- const that = this
-
- let imageUrls = this.form.imageUrls
-
- if (imageUrls.length > 0) {
+ desposeImage (data) {
+ if (data.length > 0) {
var urls = []
- var split = imageUrls.split(",").filter(item => item != '')
+ var split = data.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
})
- imageUrls = urls.join(",")
+ data = urls.join(",")
}
+
+ return data
+ },
+
+ dataUpdate () {
+ const that = this
+
+ let imageUrls = this.desposeImage(this.form.imageUrls)
+ let placeImages = this.desposeImage(this.placeForm.imageUrls)
+ let placePlanImageUrls = this.desposeImage(this.placeForm.planImageUrls)
+
let label = this.form.label
if (this.form.smallLabel != '') {
label = label + ',' + this.form.smallLabel
}
+
+ console.log(this.form, this.placeForm, 5555)
+
delete this.form.smallLabel
@@ -582,14 +585,18 @@
label,
...this.locationDispose(this.form.location)
}),
- updatePlaceExt(this.placeForm)
+ updatePlaceExt({
+ ...this.placeForm,
+ imageUrls: placeImages,
+ planImageUrls: placePlanImageUrls
+ })
]).then(that.$axios.spread(function () {
that.$message({
type: "success",
message: "操作成功!",
})
- that.closeRowDetails()
+ that.roleBoxClose()
that.placeElement.onLoad(that.placeElement.page, that.placeElement.query)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 66c66b0..54b819b 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -29,6 +29,7 @@
</template>
<script>
+import { getToken } from '@/util/auth'
import { getStore } from "@/util/store"
export default {
@@ -55,7 +56,8 @@
this.$router.push({ path: "/cGovernance/gridWorkLog" })
},
down6 () {
- window.open('http://srgdjczzxtpt.com:2181/databoard-server/uniformLogin?passwordlessToken=bmtMNkFYcjh1dk50UVlUYXpLV2xHUDZpdGU0d1ZqMStYV01aVzlVMGsyVT0=')
+ let token = 'bearer ' + getToken()
+ window.open(`http://srgdjczzxtpt.com:2181/uniform-auth/login?app=app_smart_aoi&Blade-Auth=${token}`)
},
},
mouted () { },
--
Gitblit v1.9.3