fix: 算法列表增加左侧ICON动态图标，视频管理按钮增加选中状态，增加预警长轮询 (6eda0683) · Commits · AI云守 / ai-yunshou-vue · GitLab

src/utils/dict.js

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ export function useDict(...args) {
	res.value[dictType] = dicts;		res.value[dictType] = dicts;
	} else {		} else {
	getDicts(dictType).then(resp => {		getDicts(dictType).then(resp => {
	res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))		res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass,remark: p.remark }))
	useDictStore().setDict(dictType, res.value[dictType]);		useDictStore().setDict(dictType, res.value[dictType]);
	})		})
	}		}

src/views/alarmControl/index.vue

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@
	<el-button		<el-button
	type="primary"		type="primary"
	plain		plain
			:class="isActive=='4'?'active':''"
	@click="changeDivision(12,4)"		@click="changeDivision(12,4)"
	>四分屏</el-button>		>四分屏</el-button>
	</el-col>		</el-col>
	@@ -55,6 +56,7 @@
	<el-button		<el-button
	type="primary"		type="primary"
	plain		plain
			:class="isActive=='6'?'active':''"
	@click="changeDivision(8,6)"		@click="changeDivision(8,6)"
	>六分屏</el-button>		>六分屏</el-button>
	</el-col>		</el-col>
	@@ -62,6 +64,7 @@
	<el-button		<el-button
	type="primary"		type="primary"
	plain		plain
			:class="isActive=='12'?'active':''"
	@click="changeDivision(6,12)"		@click="changeDivision(6,12)"
	>十二分屏</el-button>		>十二分屏</el-button>
	</el-col>		</el-col>
	@@ -120,6 +123,7 @@
	const ids = ref([]);		const ids = ref([]);
	const total = ref(0);		const total = ref(0);
	const division = ref(6);		const division = ref(6);
			const isActive = ref('12');
	const deviceList = ref([]);		const deviceList = ref([]);
	const algList = ref([]);		const algList = ref([]);
	const data = reactive({		const data = reactive({
	@@ -142,6 +146,7 @@
	function changeDivision(val,pageSize){		function changeDivision(val,pageSize){
	division.value=val		division.value=val
	queryParams.value.pageSize=pageSize		queryParams.value.pageSize=pageSize
			isActive.value=pageSize
	getList()		getList()
	}		}

	@@ -204,6 +209,10 @@
	</script>		</script>

	<style scoped lang="scss">		<style scoped lang="scss">
			.active{
			background-color: #409EFF;
			color: #fff;
			}
	.search-input{		.search-input{
	display: flex;		display: flex;
	width: 400px;		width: 400px;

src/views/algorithmList/components/details.vue

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -296,7 +296,7 @@ getDetials()
	}		}
	.img-box{		.img-box{
	// width: 500px;		// width: 500px;
	min-height: 365px;		min-height: 200px;
	// border: 1px solid #d8dce5;		// border: 1px solid #d8dce5;
	border-radius: 5px;		border-radius: 5px;
	text-align: center;		text-align: center;
	@@ -411,7 +411,7 @@ getDetials()
	text-align: left;		text-align: left;
	font-style: normal;		font-style: normal;
	text-transform: none;		text-transform: none;
	min-height: 180px;		min-height: 120px;
	}		}
	.text-style{		.text-style{
	font-family: PingFang SC, PingFang SC;		font-family: PingFang SC, PingFang SC;

src/views/algorithmList/index.vue

+31 −5

Original line number	Original line	Diff line number	Diff line
	@@ -27,14 +27,17 @@
	default-active="2"		default-active="2"
	class="el-menu-vertical-demo"		class="el-menu-vertical-demo"
	>		>
	<el-menu-item :index="''" @click="handMenuClick">
	<span>全部</span>
	</el-menu-item>
	<el-menu-item :index="'我的算法'" @click="handMenuClick">		<el-menu-item :index="'我的算法'" @click="handMenuClick">
	<span>我的算法</span>		<span><el-icon style="color: #7F8184;"><component :is="'HomeFilled'" /></el-icon>我的算法</span>
			</el-menu-item>
			<el-divider style="margin: 5px 0;"/>
			<el-menu-item :index="''" @click="handMenuClick">
			<span> <el-icon style="color: #7F8184;"><component :is="'DeleteFilled'" /></el-icon>全部</span>
	</el-menu-item>		</el-menu-item>

	<el-menu-item v-for="item in algorithm_scen" :key="item.value" :index="item.value" @click="handMenuClick">		<el-menu-item v-for="item in algorithm_scen" :key="item.value" :index="item.value" @click="handMenuClick">
			<span style="display: flex;align-items: center;">
			<el-icon style="color: #7F8184;"><component :is="iconComponent(item.remark)"/></el-icon>
			</span>
	<span>{{ item.label }}</span>		<span>{{ item.label }}</span>
	</el-menu-item>		</el-menu-item>
	</el-menu>		</el-menu>
	@@ -161,6 +164,10 @@
	const nowText=ref('算法管理')		const nowText=ref('算法管理')
	const nowTopTitle=ref('算法管理')		const nowTopTitle=ref('算法管理')
	const ids = ref([]);		const ids = ref([]);
			// const iconComponent = ref('');
			// setTimeout(() => {
			// iconComponent.value='CirclePlusFilled'
			// }, 1000);
	const algorithmList=reactive([])		const algorithmList=reactive([])
	const algList = ref([]);		const algList = ref([]);
	const data = reactive({		const data = reactive({
	@@ -210,6 +217,15 @@
	getList()		getList()
	}		}

			function iconComponent(row){
			if(row){
			return row
			}else{
			return 'CirclePlusFilled'
			}

			}

	function handleEnable(row){		function handleEnable(row){
	const params={		const params={
	algorithmStatus: row.algorithmStatus=='1'?"0":"1",		algorithmStatus: row.algorithmStatus=='1'?"0":"1",
	@@ -232,6 +248,16 @@
	proxy.$modal.msgSuccess("删除成功");		proxy.$modal.msgSuccess("删除成功");
	}).catch(() => {});		}).catch(() => {});
	}		}

			//
			function handeImg(row){
			if(row){
			return `src/assets/algImg/${row}.png`

			}else{
			return `src/assets/algImg/setting.png`
			}
			}
	getList();		getList();
	</script>		</script>

src/views/videoControl/videoPreview/index.vue

+20 −7

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@
	</el-col>		</el-col>
	<el-col :xs="0" :sm="2" :md="3" :lg="6">		<el-col :xs="0" :sm="2" :md="3" :lg="6">
	<el-scrollbar :height="globalScreenHeight+'px'">		<el-scrollbar :height="globalScreenHeight+'px'">
	<el-card class="danger-list">		<el-card class="danger-list" :style="{minHeight:globalScreenHeight+'px'}">
	<template v-slot:header>		<template v-slot:header>
	<div class="cleartitle" style="justify-content: flex-start">		<div class="cleartitle" style="justify-content: flex-start">
	<img src="@/assets/images/logo_video.png" width="25px" alt />		<img src="@/assets/images/logo_video.png" width="25px" alt />
	@@ -170,11 +170,7 @@ function getTreeData() {
	deptOptions.value=res.data		deptOptions.value=res.data
	})		})
	}		}
	function getWaringData() {
	listAlarm(queryParams.value).then((res) => {
	algorithmList.value=res.rows
	})
	}
	function getVideos(str){		function getVideos(str){
	let canvas = document.getElementById('video')		let canvas = document.getElementById('video')
	let url = str?str:'rtsp://192.168.20.211:554/av0_0'		let url = str?str:'rtsp://192.168.20.211:554/av0_0'
	@@ -198,6 +194,7 @@ function handleNodeClick(row) {
	queryParams.value.regionId = treeID;		queryParams.value.regionId = treeID;
	queryParams.value.locationId = null;		queryParams.value.locationId = null;
	}		}
			clearTimeout(timeoutId);
	getWaringData()		getWaringData()
	}		}
	function handjudge(row) {		function handjudge(row) {
	@@ -216,6 +213,23 @@ function handlvideoPath(id) {
	getVideos(res.data.videoUrl)		getVideos(res.data.videoUrl)
	})		})
	}		}

			let timeoutId = null;
			function getWaringData() {
			listAlarm(queryParams.value).then((res) => {
			algorithmList.value=res.rows
			timeoutId = setTimeout(getWaringData, 30000);
			}).catch((error) => {
			// 请求失败，重新尝试
			timeoutId = setTimeout(getWaringData, 30000);
			});
			}
			onUnmounted(() => {
			// 清除定时器
			if (timeoutId) {
			clearTimeout(timeoutId);
			}
			});
	</script>		</script>

	<style scoped lang="scss">		<style scoped lang="scss">
	@@ -240,7 +254,6 @@ function handlvideoPath(id) {
	}		}
	}		}
	.danger-list{		.danger-list{
	min-height: 700px;
	.alg-list {		.alg-list {
	display: grid;		display: grid;
	grid-template-columns: repeat(minmax(180px, 1fr));		grid-template-columns: repeat(minmax(180px, 1fr));