hn2.0
fanluyan 2 years ago
parent 627d37cad1
commit 92945af2e3

@ -467,7 +467,7 @@ export default {
}, },
//线 //线
handelClear() { handelClear() {
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); // this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
this.flagline = false; this.flagline = false;
updateMarkEnableStatus({ updateMarkEnableStatus({
status: 0, status: 0,
@ -597,8 +597,9 @@ export default {
this.alarmList = this.fiveList[this.bigNum].alarmlist; this.alarmList = this.fiveList[this.bigNum].alarmlist;
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
console.log(this.fiveList[this.bigNum]); console.log(this.fiveList[this.bigNum]);
getCoordinate({ getCoordinate({
@ -634,8 +635,9 @@ export default {
this.alarmList = this.fiveList[this.bigNum].alarmlist; this.alarmList = this.fiveList[this.bigNum].alarmlist;
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
getCoordinate({ getCoordinate({
channelId: this.fiveList[this.bigNum].channelId, channelId: this.fiveList[this.bigNum].channelId,
@ -664,8 +666,10 @@ export default {
this.alarmList = row.alarmlist; this.alarmList = row.alarmlist;
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); console.log(this.canvas);
this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
// this.bgbigPath = row.path + "!1366x768"; // this.bgbigPath = row.path + "!1366x768";

@ -626,8 +626,9 @@ export default {
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
}); });
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas1");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
console.log(this.fiveList[this.bigNum]); console.log(this.fiveList[this.bigNum]);
getCoordinate({ getCoordinate({
@ -665,8 +666,9 @@ export default {
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
}); });
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas1");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
getCoordinate({ getCoordinate({
channelId: this.fiveList[this.bigNum].channelId, channelId: this.fiveList[this.bigNum].channelId,
@ -697,8 +699,10 @@ export default {
this.drawlineBig(this.alarmList[0]); this.drawlineBig(this.alarmList[0]);
}); });
} else { } else {
// this.canvas = document.getElementById("bigCanvas"); this.canvas = document.getElementById("bigCanvas1");
// this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); console.log(this.canvas);
this.ctx = this.canvas.getContext("2d");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
} }
// this.bgbigPath = row.path + "!1366x768"; // this.bgbigPath = row.path + "!1366x768";

@ -83,6 +83,9 @@
{{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
<p class="timeinfo" v-else></p> <p class="timeinfo" v-else></p>
<span class="isOffLine" v-if="item.isOnline == 0"
>(设备已离线)</span
>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -178,6 +181,7 @@
: picInfoData.channnelname : picInfoData.channnelname
}}{{ $moment(picInfoData.photoTime).format("YYYY-MM-DD ") }} }}{{ $moment(picInfoData.photoTime).format("YYYY-MM-DD ") }}
</p> </p>
<!-- <p class="timeinfo" v-if="item.mediatype !== null"> <!-- <p class="timeinfo" v-if="item.mediatype !== null">
{{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
</p> --> </p> -->
@ -601,6 +605,14 @@ export default {
.timeinfo { .timeinfo {
margin-bottom: 4px; margin-bottom: 4px;
} }
.isOffLine {
color: #999;
margin-bottom: 6px;
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
} }
} }
} }

@ -29,12 +29,13 @@ module.exports = defineConfig({
proxy: { proxy: {
"/api": { "/api": {
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
target: "http://47.96.238.157:8093", //阿里云服务器环境 //target: "http://47.96.238.157:8093", //阿里云服务器环境
//target: "http://180.166.218.222:40080", //dell //target: "http://180.166.218.222:40080", //dell
//target: "http://180.166.218.222:40080", //dell服务器环境 //target: "http://180.166.218.222:40080", //dell服务器环境
target: "http://192.168.50.42:81/", //湖南
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "", //重写api把api变成空字符因为我们真正请求的路径是没有api的 "^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的
}, },
}, },
}, },

Loading…
Cancel
Save