|
@@ -88,7 +88,7 @@
|
|
|
class="iconfont icon-quanping fSBtn"
|
|
class="iconfont icon-quanping fSBtn"
|
|
|
></i>
|
|
></i>
|
|
|
<div
|
|
<div
|
|
|
- style="width: 100%; height: 100%"
|
|
|
|
|
|
|
+ style="width: 90%; height: 90%"
|
|
|
:id="'my-video' + count"
|
|
:id="'my-video' + count"
|
|
|
></div>
|
|
></div>
|
|
|
</div>
|
|
</div>
|
|
@@ -207,7 +207,8 @@
|
|
|
class="playBack"
|
|
class="playBack"
|
|
|
@click="playBackDialogVisible = true"
|
|
@click="playBackDialogVisible = true"
|
|
|
></div> -->
|
|
></div> -->
|
|
|
- <div @click="taskFacility" v-show="addrPolt" class="addequip"></div>
|
|
|
|
|
|
|
+ <!-- <div @click="taskFacility" v-show="addrPolt" class="addequip"></div> -->
|
|
|
|
|
+ <div @click="addEquipDialogVisible = true" class="addequip"></div>
|
|
|
<div @click="fScreenFun()" class="fSBtn1"></div>
|
|
<div @click="fScreenFun()" class="fSBtn1"></div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -274,7 +275,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
<!-- 添加设备 -->
|
|
<!-- 添加设备 -->
|
|
|
- <!-- <el-dialog
|
|
|
|
|
|
|
+ <el-dialog
|
|
|
title="添加设备"
|
|
title="添加设备"
|
|
|
:visible.sync="addEquipDialogVisible"
|
|
:visible.sync="addEquipDialogVisible"
|
|
|
width="400px"
|
|
width="400px"
|
|
@@ -307,7 +308,7 @@
|
|
|
<el-button @click="addEquipDialogVisible = false">取 消</el-button>
|
|
<el-button @click="addEquipDialogVisible = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="addEquipSubm">确定</el-button>
|
|
<el-button type="primary" @click="addEquipSubm">确定</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
- </el-dialog> -->
|
|
|
|
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
@@ -333,7 +334,7 @@ export default {
|
|
|
html: "", //插件播放内容
|
|
html: "", //插件播放内容
|
|
|
picUrl: "", //视频拍照地址
|
|
picUrl: "", //视频拍照地址
|
|
|
playBackDialogVisible: false,
|
|
playBackDialogVisible: false,
|
|
|
- // addEquipDialogVisible: false,
|
|
|
|
|
|
|
+ addEquipDialogVisible: false,
|
|
|
fScreen: false, //默认多个监控非全屏
|
|
fScreen: false, //默认多个监控非全屏
|
|
|
oneFScreen: false, //单个监控全屏状态
|
|
oneFScreen: false, //单个监控全屏状态
|
|
|
btnFlag: true, //全屏按钮显示控制
|
|
btnFlag: true, //全屏按钮显示控制
|
|
@@ -367,7 +368,7 @@ export default {
|
|
|
siteVal: "",
|
|
siteVal: "",
|
|
|
plotDataArr: [], // 地块原始数据数组
|
|
plotDataArr: [], // 地块原始数据数组
|
|
|
plotData: {},
|
|
plotData: {},
|
|
|
- addrPolt: false, // 设备分配判断
|
|
|
|
|
|
|
+ addrPolt: true, // 设备分配判断
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
filters: {
|
|
filters: {
|
|
@@ -389,6 +390,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
watch: {
|
|
watch: {
|
|
|
siteVal(val) {
|
|
siteVal(val) {
|
|
|
|
|
+ console.log("11111111111111",val);
|
|
|
if (val !== '') {
|
|
if (val !== '') {
|
|
|
this.addrPolt = true
|
|
this.addrPolt = true
|
|
|
} else {
|
|
} else {
|
|
@@ -423,7 +425,7 @@ export default {
|
|
|
page: this.currPage,
|
|
page: this.currPage,
|
|
|
equip_type: 2,
|
|
equip_type: 2,
|
|
|
site_id: id,
|
|
site_id: id,
|
|
|
- page_size: 19,
|
|
|
|
|
|
|
+ page_size: 12,
|
|
|
plot_id: this.plotData.plot_id !== undefined ? this.plotData.plot_id : '',
|
|
plot_id: this.plotData.plot_id !== undefined ? this.plotData.plot_id : '',
|
|
|
}),
|
|
}),
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
@@ -442,10 +444,11 @@ export default {
|
|
|
page: this.currPage,
|
|
page: this.currPage,
|
|
|
equip_type: 2,
|
|
equip_type: 2,
|
|
|
site_id: this.objData.id,
|
|
site_id: this.objData.id,
|
|
|
- page_size: 19,
|
|
|
|
|
|
|
+ page_size: 12,
|
|
|
}),
|
|
}),
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
this.Idlist = res.data.data;
|
|
this.Idlist = res.data.data;
|
|
|
|
|
+ this.initMonitor()
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
//视频分页
|
|
//视频分页
|
|
@@ -521,8 +524,10 @@ export default {
|
|
|
//分屏默认显示视频
|
|
//分屏默认显示视频
|
|
|
initMonitor() {
|
|
initMonitor() {
|
|
|
this.id = this.Idlist[0].device_id; //第一台设备id
|
|
this.id = this.Idlist[0].device_id; //第一台设备id
|
|
|
|
|
+ console.log("IdlistIdlistIdlistIdlist",this.Idlist);
|
|
|
this.videotape = this.Idlist[0].videotape; //第一台是否有回放
|
|
this.videotape = this.Idlist[0].videotape; //第一台是否有回放
|
|
|
this.divName = "my-video1"; //第一台选中
|
|
this.divName = "my-video1"; //第一台选中
|
|
|
|
|
+ console.log("divNamedivName",this.divName);
|
|
|
this.selected = 1; //第一台选中
|
|
this.selected = 1; //第一台选中
|
|
|
for (let item = 1; item < this.divNum + 1; item++) {
|
|
for (let item = 1; item < this.divNum + 1; item++) {
|
|
|
if (this.Idlist[item - 1]) {
|
|
if (this.Idlist[item - 1]) {
|
|
@@ -945,7 +950,7 @@ li {
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
.viewLists {
|
|
.viewLists {
|
|
|
// height: 50%;
|
|
// height: 50%;
|
|
|
- height: 75%;
|
|
|
|
|
|
|
+ height: 442px;
|
|
|
overflow: auto;
|
|
overflow: auto;
|
|
|
padding: 0;
|
|
padding: 0;
|
|
|
li {
|
|
li {
|