admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-04-18 21:00:43 +08:00
commit 465704dbe1
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.development
View File

@ -21,10 +21,10 @@ NODE_ENV = 'development'
# 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551'
# agjt
# VITE_API_URL = 'http://47.93.215.234:9809'
VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
VITE_API_URL = 'http://47.93.215.234:9809'
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
# 苏立信
VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://101.43.164.214:11111'
# 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

21
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue
View File

@ -1,7 +1,18 @@
<template>
<div class="leftTop">
<Card title="项目展示">
<div class="top-tab">
<div class="top-tab" v-if="COMPANY === 'agjt'">
<div
class="tab-box"
:style="boxStyle(item)"
v-for="(item, index) in topText2"
:key="item.id"
@click="activeBtn(item, index)"
>
{{ item.title }}
</div>
</div>
<div class="top-tab" v-else>
<div
class="tab-box"
:style="boxStyle(item)"
@ -69,6 +80,7 @@ import { ElMessage } from "element-plus";
import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/modules/projectOverview";
import { selectLiveVideoListApi } from "@/api/modules/video";
import ckplayerComp from "./ckplayerComp.vue";
import { COMPANY } from "@/config/config";
const store = GlobalStore();
const videoList = ref([] as any);
@ -106,11 +118,16 @@ const showChangeImg = ref(false as any);
// 显示更换视频
const showChangeVideo = ref(false as any);
let topText = ref([
let topText2 = ref([
{ id: 1, title: "现场视频", isActive: true },
{ id: 2, title: "宣传视频", isActive: false },
{ id: 3, title: "效果图", isActive: false }
]);
let topText = ref([
// { id: 1, title: "现场视频", isActive: true },
{ id: 2, title: "宣传视频", isActive: false },
{ id: 3, title: "效果图", isActive: false }
]);
const getVideoList = async () => {
let res: any = await selectLiveVideoListApi({
projectSn: store.sn

32
src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue
View File

@ -3,27 +3,34 @@
<div class="ai-bottom-right">
<div class="list-content">
<div class="tab-list">
<div>序号</div>
<div>抓拍照片</div>
<div>设备名称</div>
<div>告警类型</div>
<div>告警时间</div>
<div>操作</div>
<div style="width:10%">序号</div>
<div style="width:20%">抓拍照片</div>
<div style="width:20%">设备名称</div>
<div style="width:20%" v-if="COMPANY === 'agjt'">不安全行为类型</div>
<div style="width:20%" v-else>告警类型</div>
<div style="width:20%">告警时间</div>
<div style="width:10%">操作</div>
</div>
<el-scrollbar class="list-box">
<div v-for="(item, index) in warnAlarmList" class="list-style" :key="item.id">
<div>{{ index + 1 }}</div>
<div class="list-img">
<div style="width: 10%">{{ index + 1 }}</div>
<div class="list-img" style="width:20%">
<div class="img-style">
<!-- <img src="@/assets/images/noData.png" /> -->
<img :src="BASEURL + '/image/' + item.imageUrl" />
</div>
</div>
<!-- <div>{{ item.dev }}</div> -->
<div>{{ item.hardwareName }}</div>
<div>{{ item.alarmType ? getWarnName(item.alarmType) : "" }}</div>
<div>{{ item.createTime }}</div>
<div style="color: #65d7f9; cursor: pointer" @click="openDetailDialog(item)">查看详情</div>
<div style="width: 20%">{{ item.hardwareName }}</div>
<div style="width: 20%" v-if="COMPANY === 'agjt'">
<span v-if="item.alarmType === 1">未穿安全工作服</span>
<span v-if="item.alarmType === 2">未戴安全帽</span>
<span v-if="item.alarmType === 3">烟火报警</span>
<span v-if="item.alarmType === 4">未穿戴安全带</span>
</div>
<div style="width: 20%" v-else>{{ item.alarmType ? getWarnName(item.alarmType) : "" }}</div>
<div style="width: 20%"> {{ item.createTime }}</div>
<div style="color: #65d7f9; cursor: pointer;width:10%" @click="openDetailDialog(item)">查看详情</div>
</div>
<div class="not-data" v-if="warnAlarmList.length == 0">
<img src="@/assets/images/noData.png" />
@ -68,6 +75,7 @@ import Card from "@/components/card.vue";
import { ref, onMounted, computed , onBeforeUnmount} from "vue";
import { getAlarmList, getAlarmTypeOption } from "@/api/modules/aIEarlyWarn";
import { GlobalStore } from "@/stores";
import { COMPANY } from "@/config/config";
import mitts from "@/utils/bus"; //兄弟组件传值
// import { aiAlarmTypeEnum } from "@/enums/project/aiAlarmTypeEnum";