bug修复
This commit is contained in:
parent
4d003421fe
commit
7abf71a6fb
|
|
@ -331,10 +331,7 @@
|
|||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
<a-form-item
|
||||
name="phone"
|
||||
label="联系电话"
|
||||
>
|
||||
<a-form-item name="phone" label="联系电话">
|
||||
<a-input v-model:value="formState.phone" style="width: 72%" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -389,7 +386,9 @@
|
|||
:wrapper-col="{ span: 14, offset: 4 }"
|
||||
style="text-align: center; margin-top: 0.4rem"
|
||||
>
|
||||
<a-button @click="resetFields" type="primary" danger>取消</a-button>
|
||||
<a-button @click="appointmentRoom = false" type="primary" danger>
|
||||
取消
|
||||
</a-button>
|
||||
<a-button
|
||||
style="margin-left: 10px"
|
||||
type="primary"
|
||||
|
|
@ -551,7 +550,10 @@
|
|||
>
|
||||
<template #footer></template>
|
||||
<div style="width: 100%; display: flex; justify-content: center">
|
||||
<div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
|
||||
<div
|
||||
style="width: 100%; height: 100%; position: relative"
|
||||
v-show="isXiHaiAn"
|
||||
>
|
||||
<!-- 西海岸--预览视频--遮罩 todo-->
|
||||
<div class="video-cover" @click="videoShowMsg"></div>
|
||||
<div class="waterMark waterMark-left-top">
|
||||
|
|
@ -635,17 +637,33 @@
|
|||
style="width: 100%; height: 100%; position: relative"
|
||||
>
|
||||
<!-- 批量预览视频--遮罩 -->
|
||||
<div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
|
||||
<div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
|
||||
<div
|
||||
class="batch-video-cover"
|
||||
@click="videoShowMsg(index)"
|
||||
v-show="isXiHaiAn"
|
||||
></div>
|
||||
<div
|
||||
class="batch-waterMark batch-waterMark-left-top"
|
||||
v-show="isXiHaiAn"
|
||||
>
|
||||
{{ userInfo.usernameShow }}
|
||||
</div>
|
||||
<div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
|
||||
<div
|
||||
class="batch-waterMark batch-waterMark-right-top"
|
||||
v-show="isXiHaiAn"
|
||||
>
|
||||
{{ userInfo.realNameShow }}
|
||||
</div>
|
||||
<div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
|
||||
<div
|
||||
class="batch-waterMark batch-waterMark-left-bottom"
|
||||
v-show="isXiHaiAn"
|
||||
>
|
||||
{{ userInfo.usernameShow }}
|
||||
</div>
|
||||
<div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
|
||||
<div
|
||||
class="batch-waterMark batch-waterMark-right-bottom"
|
||||
v-show="isXiHaiAn"
|
||||
>
|
||||
{{ userInfo.realNameShow }}
|
||||
</div>
|
||||
<p></p>
|
||||
|
|
@ -899,12 +917,12 @@
|
|||
tabClick(0, '视频资源')
|
||||
} else {
|
||||
// 默认选中
|
||||
if(formPage && formPage == 'noticePage') {
|
||||
if (formPage && formPage == 'noticePage') {
|
||||
tabClick(0, '城市云脑会客厅')
|
||||
roomYuyue.value = false
|
||||
roomResult.value = true
|
||||
onSearch()
|
||||
}else {
|
||||
} else {
|
||||
tabClick(0, '政务云资源')
|
||||
}
|
||||
}
|
||||
|
|
@ -1397,7 +1415,7 @@
|
|||
tabList.value[1].title = '视频标签'
|
||||
}
|
||||
selectType.value = '视频资源'
|
||||
console.log('444------------>', 444);
|
||||
console.log('444------------>', 444)
|
||||
} else if (name == '政务云资源') {
|
||||
room.value = true
|
||||
tableHeight.value = 600
|
||||
|
|
@ -1579,7 +1597,10 @@
|
|||
clickList.value[1].content = []
|
||||
}
|
||||
clickList.value[indexFather].content[0] = name
|
||||
console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
|
||||
console.log(
|
||||
'clickList.value[indexFather].content[0]------------>',
|
||||
clickList.value[indexFather].content[0]
|
||||
)
|
||||
|
||||
if (tabList.value[1]) {
|
||||
tabList.value[1].title = ''
|
||||
|
|
@ -1814,20 +1835,22 @@
|
|||
// 西海岸-视频资源loading
|
||||
const loadingCamera = ref(false)
|
||||
const getCamera = (flag, str) => {
|
||||
loadingCamera.value = true;
|
||||
loadingCamera.value = true
|
||||
if (flag) {
|
||||
mapSearchParam.value.cameraName = str
|
||||
}
|
||||
console.log('初始化调用')
|
||||
console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
|
||||
if (!whoShow1.value.itShowXiHaiAn) {
|
||||
getCameraByParentId(mapSearchParam.value).then((res) => {
|
||||
console.log('res--查询摄像头---------->', res);
|
||||
loadingCamera.value = false;
|
||||
getCameraByParentId(mapSearchParam.value)
|
||||
.then((res) => {
|
||||
console.log('res--查询摄像头---------->', res)
|
||||
loadingCamera.value = false
|
||||
dataSource.value = res.data.data
|
||||
pagination.value.total = res.data.count
|
||||
}).catch(err => {
|
||||
loadingCamera.value = false;
|
||||
})
|
||||
.catch((err) => {
|
||||
loadingCamera.value = false
|
||||
message.error(err)
|
||||
})
|
||||
} else {
|
||||
|
|
@ -1866,13 +1889,15 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
getCameraByCondition(params).then((res) => {
|
||||
console.log('res--查询摄像头---------->', res);
|
||||
loadingCamera.value = false;
|
||||
getCameraByCondition(params)
|
||||
.then((res) => {
|
||||
console.log('res--查询摄像头---------->', res)
|
||||
loadingCamera.value = false
|
||||
dataSource.value = res.data.data
|
||||
pagination.value.total = res.data.count
|
||||
}).catch(err => {
|
||||
loadingCamera.value = false;
|
||||
})
|
||||
.catch((err) => {
|
||||
loadingCamera.value = false
|
||||
message.error(err)
|
||||
})
|
||||
}
|
||||
|
|
@ -1884,7 +1909,7 @@
|
|||
const addShoppingCart = () => {
|
||||
if (selectedList.value.length > 0) {
|
||||
let _arr = []
|
||||
selectedList.value.map(v => {
|
||||
selectedList.value.map((v) => {
|
||||
_arr.push({
|
||||
delFlag: '0',
|
||||
resourceId: v.idtCameraChannel,
|
||||
|
|
@ -1892,7 +1917,7 @@
|
|||
})
|
||||
})
|
||||
xhaAddCart(_arr).then((res) => {
|
||||
if(res.data.code !== 0) {
|
||||
if (res.data.code !== 0) {
|
||||
return message.error(res.data.msg)
|
||||
}
|
||||
message.success('添加申购车成功！')
|
||||
|
|
@ -1929,7 +1954,7 @@
|
|||
},
|
||||
])
|
||||
// 西海岸--状态展示
|
||||
if(isXiHaiAn) {
|
||||
if (isXiHaiAn) {
|
||||
columns.value.splice(2, 0, {
|
||||
title: '状态',
|
||||
dataIndex: 'status',
|
||||
|
|
|
|||
Loading…
Reference in New Issue