|
|
@@ -12,8 +12,8 @@
|
|
|
style="padding-top: 6px"
|
|
|
>
|
|
|
<el-badge
|
|
|
- :hidden="isNewMessage == 0"
|
|
|
- :is-dot="isNewMessage"
|
|
|
+ :hidden="isNewMessage.length == 0"
|
|
|
+ :value="isNewMessage.length"
|
|
|
class="mr30"
|
|
|
>
|
|
|
<el-icon size="20" color="#00a9dc">
|
|
|
@@ -26,9 +26,11 @@
|
|
|
<div class="quit" @click="quit">[退出]</div>
|
|
|
</div>
|
|
|
<el-dialog v-model="dialogVisible" title="拍照通知" width="30%">
|
|
|
- <h3 style="margin: 10px 30px" v-for="item in isNewMessage" :key="item">
|
|
|
- {{ item }}
|
|
|
- </h3>
|
|
|
+ <el-table :data="isNewMessage" border>
|
|
|
+ <el-table-column align="center" type="index" />
|
|
|
+ <el-table-column align="center" property="shipName" label="船名" />
|
|
|
+ <el-table-column align="center" property="status" label="状态" />
|
|
|
+ </el-table>
|
|
|
<template #footer>
|
|
|
<span class="dialog-footer">
|
|
|
<el-button type="primary" @click="dialogVisible = false">
|
|
|
@@ -58,7 +60,7 @@ export default {
|
|
|
router.push({ path: "/login" });
|
|
|
}
|
|
|
let dialogVisible = ref(false);
|
|
|
- let isNewMessage = ref(0);
|
|
|
+ let isNewMessage = ref([]);
|
|
|
function isWithinTime(t0 = new Date()) {
|
|
|
let t1 = _.cloneDeep(t0);
|
|
|
let t2 = _.cloneDeep(t0);
|
|
|
@@ -77,7 +79,13 @@ export default {
|
|
|
console.log("heart");
|
|
|
let { data } = await api.getUnphotographNotice();
|
|
|
if (data.status == 0) {
|
|
|
- isNewMessage.value = data.result;
|
|
|
+ for (let i of data.result) {
|
|
|
+ isNewMessage.value.push({
|
|
|
+ shipName: i,
|
|
|
+ status: "未拍照",
|
|
|
+ });
|
|
|
+ }
|
|
|
+ console.log(isNewMessage.value);
|
|
|
} else {
|
|
|
isNewMessage.value = 0;
|
|
|
}
|
wangzhihui