Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
chenchenzai
commit
cde4f5d82e
|
|
@ -60,6 +60,7 @@
|
|||
<el-form :inline="true" style="margin-right: 40px;">
|
||||
<!--操作按钮查询-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
|
||||
</el-form-item>
|
||||
<!--操作按钮重置-->
|
||||
<el-form-item>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-05-06 11:12:00
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-16 10:21:49
|
||||
* @LastEditTime: 2022-11-21 10:45:07
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<template>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
realName.charCodeAt()
|
||||
)
|
||||
// 如果刚登陆 初始化水印
|
||||
if (oldValue == '/login' || oldValue == '/') {
|
||||
if (newValue == '/home') {
|
||||
waterMarkInit(newValue)
|
||||
}
|
||||
changeWaterMark(newValue)
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
{ immediate: true }
|
||||
)
|
||||
onMounted(() => {
|
||||
waterMarkInit()
|
||||
// waterMarkInit()
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
// 4.卸载前, 关闭链接
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-04-20 17:16:35
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-18 17:52:05
|
||||
* @LastEditTime: 2022-11-21 10:51:25
|
||||
* @Description: 告诉大家这是什么
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
|
@ -106,6 +106,13 @@ export function getListForPOI(params) {
|
|||
)
|
||||
}
|
||||
|
||||
//西海岸 获取左侧标签树
|
||||
export function getPlaceType() {
|
||||
return axios.get(
|
||||
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
|
||||
config2
|
||||
)
|
||||
}
|
||||
// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
|
||||
let _cameraUrl =
|
||||
(_global &&
|
||||
|
|
@ -113,7 +120,7 @@ let _cameraUrl =
|
|||
_global.config.camreaInfo &&
|
||||
_global.config.camreaInfo.cameraUrl) ||
|
||||
'10.134.135.92:9537'
|
||||
//能力集市基础设施-左侧列表
|
||||
//能力集市基础设施-左侧列表
|
||||
export function getCameraInfoByAreaId(params) {
|
||||
return axios.get(
|
||||
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Light
|
||||
* @Date: 2022-11-16 16:46:16
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-18 15:35:25
|
||||
* @LastEditTime: 2022-11-21 10:54:23
|
||||
* @Description: 政务云资源列表
|
||||
-->
|
||||
<template>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,178 @@
|
|||
<!--
|
||||
* @Author: Light
|
||||
* @Date: 2022-11-18 11:53:43
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-19 17:15:15
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<template>
|
||||
<div class="infrastructureApplication">
|
||||
<div class="top">
|
||||
<a-list size="small" bordered :data-source="dataList.toBeApplied">
|
||||
<template #renderItem="{ item }">
|
||||
<a-list-item>
|
||||
<div class="name">
|
||||
<a-tooltip>
|
||||
<template #title>{{ item.channelName }}</template>
|
||||
{{ item.channelName }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<a-button type="link" danger @click="delWillApplyCamera(item.id)">
|
||||
移出
|
||||
</a-button>
|
||||
</a-list-item>
|
||||
</template>
|
||||
<template #header>
|
||||
<div class="title">待申请列表</div>
|
||||
</template>
|
||||
<template #footer>
|
||||
<a-button type="primary">一键申请</a-button>
|
||||
</template>
|
||||
</a-list>
|
||||
</div>
|
||||
<div class="bottom">
|
||||
<a-list size="small" bordered :data-source="data">
|
||||
<template #renderItem="{ item }">
|
||||
<a-list-item>
|
||||
<div class="name">
|
||||
<a-tooltip>
|
||||
<template #title>{{ item }}</template>
|
||||
{{ item }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<a-button type="link" danger>删除</a-button>
|
||||
</a-list-item>
|
||||
</template>
|
||||
<template #header>
|
||||
<div class="title">已申请列表</div>
|
||||
</template>
|
||||
</a-list>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import {
|
||||
willApplyCameraSelect,
|
||||
willApplyCameraBatchInsert,
|
||||
willApplyCameraBatchDelete,
|
||||
} from '@/api/home'
|
||||
import { onBeforeUnmount, reactive, ref } from 'vue'
|
||||
import { message } from 'ant-design-vue'
|
||||
import mybus from '@/myplugins/mybus'
|
||||
const dataList = reactive({ toBeApplied: [], requested: [] })
|
||||
// 待办
|
||||
const addWacFlag = ref(true)
|
||||
const delWacFlag = ref(true)
|
||||
const delWillApplyCamera = (id) => {
|
||||
console.log('删除===>', id)
|
||||
if (delWacFlag.value) {
|
||||
delWacFlag.value = false
|
||||
willApplyCameraBatchDelete([id]).then((res) => {
|
||||
if (res.data.code == 0) {
|
||||
message.success('移出成功')
|
||||
} else {
|
||||
message.warning('移出失败')
|
||||
}
|
||||
init()
|
||||
})
|
||||
}
|
||||
}
|
||||
const init = () => {
|
||||
willApplyCameraSelect().then((res) => {
|
||||
if (res.data.code == 0) {
|
||||
dataList.toBeApplied = res.data.data
|
||||
delWacFlag.value = true
|
||||
addWacFlag.value = true
|
||||
} else {
|
||||
message.warning('查询失败')
|
||||
dataList.toBeApplied = []
|
||||
}
|
||||
})
|
||||
}
|
||||
init()
|
||||
mybus.on('selectCamera', (obj) => {
|
||||
// 判断最多10条
|
||||
if (dataList.toBeApplied.length + dataList.requested.length > 10) {
|
||||
message.warning('最多只能申请10个摄像头！')
|
||||
return
|
||||
}
|
||||
// 判断是否已操作
|
||||
let addFlag = true
|
||||
dataList.toBeApplied.map((val) => {
|
||||
if (addFlag && val.channelId == obj.channelId) {
|
||||
addFlag = false
|
||||
}
|
||||
})
|
||||
dataList.requested.map((val) => {
|
||||
if (addFlag && val.channelId == obj.channelId) {
|
||||
addFlag = false
|
||||
}
|
||||
})
|
||||
if (addWacFlag.value) {
|
||||
if (addFlag) {
|
||||
addWacFlag.value = false
|
||||
willApplyCameraBatchInsert([obj]).then((res) => {
|
||||
if (res.data.code == 0) {
|
||||
message.success('移入成功')
|
||||
} else {
|
||||
message.warning('移入失败')
|
||||
}
|
||||
init()
|
||||
})
|
||||
} else {
|
||||
message.warning('已申请该摄像头！')
|
||||
}
|
||||
}
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
mybus.off('selectCamera')
|
||||
})
|
||||
|
||||
const data = [
|
||||
'Racing car sprays burning fuel into crowd.',
|
||||
'Japanese princess to wed commoner.',
|
||||
'Australian walks 100km after outback crash.',
|
||||
'Man charged over missing wedding girl.',
|
||||
'Los Angeles battles huge wildfires.',
|
||||
'Racing car sprays burning fuel into crowd.',
|
||||
'Japanese princess to wed commoner.',
|
||||
'Australian walks 100km after outback crash.',
|
||||
'Man charged over missing wedding girl.',
|
||||
'Los Angeles battles huge wildfires.',
|
||||
]
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.infrastructureApplication {
|
||||
background: #fff;
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
right: 0.16rem;
|
||||
margin-top: -3.5rem;
|
||||
.bottom {
|
||||
margin-top: 32px;
|
||||
}
|
||||
.title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.name {
|
||||
width: 150px;
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 1;
|
||||
-webkit-box-orient: vertical;
|
||||
word-break: break-all;
|
||||
}
|
||||
:deep(.ant-list-footer) {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
:deep(.ant-list-items) {
|
||||
height: 2.45rem;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
:deep(.ant-spin-nested-loading) {
|
||||
height: 2.45rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -205,8 +205,7 @@ import { ElMessage } from 'element-plus'
|
|||
this.addResourceTomap('videoMap', data)
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
// 查询
|
||||
methods: { // 查询
|
||||
handleEnter(){
|
||||
console.log('查询',this.address,this.addressType)
|
||||
if(this.address){
|
||||
|
|
@ -742,4 +741,13 @@ import { ElMessage } from 'element-plus'
|
|||
max-width: 2.4rem;
|
||||
}
|
||||
}
|
||||
|
||||
.input-with-select{
|
||||
width: 2.4rem;
|
||||
svg{
|
||||
position: relative;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue