31
0
Fork 0

master #1

Merged
kongfp merged 2 commits from kongfp/Tp_Web2.0:master into master 2 years ago

@ -3,7 +3,7 @@ import axios from "axios";
import { onMounted, ref } from "vue"; import { onMounted, ref } from "vue";
import dplayer from "@/components/VideoPlayer/MyPlayer.vue"; import dplayer from "@/components/VideoPlayer/MyPlayer.vue";
import OurPlayer from "@/components/VideoPlayer/OurPlayer.vue"; import OurPlayer from "@/components/VideoPlayer/OurPlayer.vue";
import { ElMessageBox } from "element-plus"; import { ElMessageBox, ElMessage } from "element-plus";
import { getConfig } from "@/config"; import { getConfig } from "@/config";
import { getToken, formatToken } from "@/utils/auth"; import { getToken, formatToken } from "@/utils/auth";
@ -90,7 +90,10 @@ function onSearch() {
} }
}) })
.catch(error => { .catch(error => {
// console.log(""); ElMessage({
message: "网络暂不通畅",
type: "warning"
})
console.log(error); console.log(error);
}); });
} }
@ -138,7 +141,10 @@ function getEvents() {
// console.log(eventMap.value); // console.log(eventMap.value);
}) })
.catch(error => { .catch(error => {
// console.log(""); ElMessage({
message: "网络暂不通畅",
type: "warning"
})
console.log(error); console.log(error);
}); });
@ -224,11 +230,11 @@ onMounted(() => {
<el-table-column prop="record_time" sortable label="记录仪日期时间" /> <el-table-column prop="record_time" sortable label="记录仪日期时间" />
<el-table-column prop="police_id" label="警号" /> <el-table-column prop="police_id" label="警号" />
<el-table-column prop="event_type" label="违法行为"> <el-table-column prop="event_type" label="违法行为">
<template v-slot="scope"> <!-- <template v-slot="scope">-->
<span> <!-- <span>-->
{{ scope.row.event_type || "未定义事件" }} <!-- {{ scope.row.event_type || "未定义事件" }}-->
</span> <!-- </span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column prop="is_violation" label="是否违规"> <el-table-column prop="is_violation" label="是否违规">

Loading…
Cancel
Save