Compare commits

..

5 Commits

3 changed files with 738 additions and 819 deletions

View File

@ -159,27 +159,32 @@
<span class="channelName">{{ val.channelName }}</span> <span class="channelName">{{ val.channelName }}</span>
<span class="type">基础设施</span> <span class="type">基础设施</span>
</div> </div>
<a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn" <div>
@click.stop="openVideo(val)"> <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
视频预览 @click.stop="openVideo(val)">
</a-button> 视频预览
<span class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && !item.ended" >该流程已终止</span> </a-button>
<div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
</div>
</div>
</div> </div>
<div class="ability-bottom"> <div class="ability-bottom">
<div class="dec2">位置{{ val.nodeName }}</div> <div class="dec2">位置{{ val.nodeName }}</div>
<div class="result" v-if="item.approveStatus == '通过'"> <div class="result" v-if="item.approveStatus == '通过'">
申请结果{{ 申请结果
'列表地址:' + <span>列表地址</span><span style="cursor: pointer;" @click="openView(backUrl +
'resource/getApplyCameraList/' +
item.instanceId)">{{
backUrl + backUrl +
'resource/getApplyCameraList/' + 'resource/getApplyCameraList/' +
item.instanceId + item.instanceId }}</span>
';' + <span>视频流地址</span>
'视频流地址:' + <span style="cursor: pointer" @click="openView(backUrl +
'resource/hls/getHls/?key=' +
val.channelId)">{{
backUrl + backUrl +
'resource/hls/getHls/?key=' + 'resource/hls/getHls/?key=' +
val.channelId val.channelId}}</span>
}}
</div> </div>
</div> </div>
</div> </div>
@ -453,6 +458,10 @@ const handleUser = () => {
}) })
} }
const openView = (url) => {
window.open(url, '_blank')
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.title { .title {
@ -531,7 +540,7 @@ const handleUser = () => {
margin-left: 0.1rem; margin-left: 0.1rem;
.ability { .ability {
height: 1.3rem; height: 1.6rem;
display: flex; display: flex;
border-bottom: 1px #eee solid; border-bottom: 1px #eee solid;
padding: 0.1rem 0; padding: 0.1rem 0;
@ -733,6 +742,7 @@ const handleUser = () => {
font-weight: bold; font-weight: bold;
opacity: 0.4; opacity: 0.4;
transform: rotate(-25deg); transform: rotate(-25deg);
width: 470px width: 470px;
} }
</style> </style>

File diff suppressed because it is too large Load Diff

View File

@ -650,17 +650,19 @@ const ceshiFunction = () => {
} }
// delOne delList handleDelete // delOne delList handleDelete
const handleDelete = (item, index) => { const handleDelete = (item, index) => {
console.log('item, index------------>', item, index);
console.log('item------------>', item); console.log('item------------>', item);
let delArr = []; let delArr = [];
// //
if (item) { if (index) {
delArr = [item.id] delArr = [item.id]
} else { } else {
// //
if (checkedListAbility.value.length == 0) { if (checkedListAbility.value.length == 0) {
return message.warning('请先选择需要操作的数据!') return message.warning('请先选择需要操作的数据!')
} else { } else {
delArr = checkedListAbility.value.map(v=>v.id) delArr = checkedListAbility.value
} }
} }
sgcDel({ sgcDel({