Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev
commit
37e1e5c7c6
|
@ -14,6 +14,14 @@ const getVideoPassage=(deptId,projectId,passageType,importance)=> {
|
|||
})
|
||||
}
|
||||
|
||||
const groupCountByAlarmType=(deptId,projectId)=> {
|
||||
return request({
|
||||
url: `/bgscreen/aiBoxVideo/groupCountByAlarmType?deptId=${deptId||0}&projectId=${projectId||0}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export default{
|
||||
listView,
|
||||
getVideoPassage
|
||||
|
|
|
@ -832,6 +832,7 @@ export default {
|
|||
}
|
||||
}
|
||||
})
|
||||
console.log(tmps);
|
||||
this.availabilityData = tmps;
|
||||
this.elKey++;
|
||||
})
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
<module-one-2-1 label="预警分布">
|
||||
<div class="video-field-layout">
|
||||
<project-overview-chart :key="overview" :sp="''"
|
||||
:maintitle="overviewTotal" :legend-opt="legendOpt1"
|
||||
:maintitle="overviewTotal" :legend-opt="legendOpt1" :typedata="typeDistributionData"
|
||||
:text="overviewText" :height="230"></project-overview-chart>
|
||||
|
||||
<rank-chart :data="availabilityData" :showval="true" :height="300"
|
||||
|
@ -127,12 +127,12 @@
|
|||
<div class="ai-content-padding">
|
||||
<div class="ai-warning-list">
|
||||
<div class="ai-video-title">
|
||||
<div>今日预警 <span class="ai-video-number">(<span v-html="warningList.length">0</span>)</span></div>
|
||||
<div>最新预警 <span class="ai-video-number">(<span v-html="warningList.length">0</span>)</span></div>
|
||||
</div>
|
||||
<div class="ai-warning-list-content">
|
||||
<div class="ai-warning-list-max scroll" id="warningListMax" style="overflow-y:auto">
|
||||
<div id="warningListMin">
|
||||
<div class="project-expect-list active" v-for="item in warningList" >
|
||||
<div class="project-expect-list active" v-for="(item,idx) in warningList" v-if="idx<50">
|
||||
<div class="project-expect-con">
|
||||
<div class="project-expect-title">
|
||||
<div class="project-expect-title-No">{{item.projectName}}</div>
|
||||
|
@ -208,10 +208,16 @@ export default {
|
|||
},
|
||||
},
|
||||
},
|
||||
overviewText: '项目数量',
|
||||
overviewText: '预警数量',
|
||||
//原因类型分析
|
||||
availabilityData: [],
|
||||
projectCategoryWidth: 200,
|
||||
//预警概况
|
||||
typeDistributionData: [
|
||||
{ name: '在建项目', value: '15' },
|
||||
{ name: '项目总投资', value: '515.97' },
|
||||
{ name: '项目年投资', value: '134.86' }
|
||||
],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
@ -480,6 +486,16 @@ export default {
|
|||
this.$api.aiBoxVideo.listView(this.dept?.id||0,this.projectInfo?.projectId).then((response) => {
|
||||
this.warningList = response.data||[];
|
||||
});
|
||||
|
||||
this.$api.aiBoxVideo.groupCountByAlarmType(this.dept?.id||0,this.projectInfo?.projectId).then((response) => {
|
||||
this.typeDistributionData=[];
|
||||
if(response.data){
|
||||
response.data.forEach(datum => {
|
||||
this.typeDistributionData.push({name:datum.alarmTypeName,value:sumValue})
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
getAiVideoAlertorTypeCount(){
|
||||
axios.post(Host + "/api/video/getAiVideoAlertorTypeCount", {
|
||||
|
@ -529,7 +545,7 @@ export default {
|
|||
aiNav(n,id){
|
||||
this.nav = n
|
||||
this.alertorId = id;
|
||||
this.getAiVideoInfoList(alertorId,"");
|
||||
this.getAiVideoInfoList(this.alertorId,"");
|
||||
},
|
||||
getImageUrl(it){
|
||||
return '/jhapi' + it.imageUrl + ".min.jpg";
|
||||
|
|
Loading…
Reference in New Issue