|
|
@ -275,7 +275,11 @@
|
|
|
|
<videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture>
|
|
|
|
<videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-tab-pane>
|
|
|
|
</el-tab-pane>
|
|
|
|
<el-tab-pane label="水印(安徽)" name="7">
|
|
|
|
<el-tab-pane
|
|
|
|
|
|
|
|
label="水印(安徽)"
|
|
|
|
|
|
|
|
name="7"
|
|
|
|
|
|
|
|
v-if="rowData.protocol == '65281'"
|
|
|
|
|
|
|
|
>
|
|
|
|
<div class="tabsBox">
|
|
|
|
<div class="tabsBox">
|
|
|
|
<el-tabs
|
|
|
|
<el-tabs
|
|
|
|
v-model="tabsActive"
|
|
|
|
v-model="tabsActive"
|
|
|
@ -926,7 +930,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
name: "channel",
|
|
|
|
name: "channel",
|
|
|
|
value: this.waterForm.channelId,
|
|
|
|
value: this.channelId,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
name: "leftBottom",
|
|
|
|
name: "leftBottom",
|
|
|
@ -1073,10 +1077,8 @@ export default {
|
|
|
|
console.log(hexArray);
|
|
|
|
console.log(hexArray);
|
|
|
|
this.upperComputer.ip = hexArray.join(".");
|
|
|
|
this.upperComputer.ip = hexArray.join(".");
|
|
|
|
//ip地址解析结束
|
|
|
|
//ip地址解析结束
|
|
|
|
|
|
|
|
|
|
|
|
console.log(this.idParameter);
|
|
|
|
console.log(this.idParameter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
duration: 1500,
|
|
|
|
duration: 1500,
|
|
|
|
showClose: true,
|
|
|
|
showClose: true,
|
|
|
|