Compare commits

..

No commits in common. "a1cfbd1dc7d5a0653f4d083a87f0e47efaa9b66d" and "d40aa801c79404b273c0f5106608eb313c501a6d" have entirely different histories.

1 changed files with 10 additions and 16 deletions

View File

@ -346,7 +346,6 @@ import { useRouter, useRoute } from "vue-router";
import { VideoCamera } from "@element-plus/icons-vue"; import { VideoCamera } from "@element-plus/icons-vue";
import http from "@/utils/request.js"; import http from "@/utils/request.js";
import tools from "@/utils/tools"; import tools from "@/utils/tools";
import { ElMessage, ElMessageBox } from "element-plus";
const router = useRouter(); const router = useRouter();
const routers = useRoute(); const routers = useRoute();
const identNo = ref(""); const identNo = ref("");
@ -834,9 +833,6 @@ const getData = (identNo) => {
} }
}); });
}); });
if (dataMyTag.camera) {
getCameraUrl();
}
} }
}); });
}; };
@ -854,16 +850,8 @@ const oneCardSolution = () => {
}; };
// //
const openCamera = () => { const openCamera = () => {
if (errorMessage.value) { camera.show = true;
ElMessage.warning({
message: errorMessage.value,
});
}else{
camera.show = true;
}
}; };
const errorMessage = ref("");
// //
const getCameraUrl = () => { const getCameraUrl = () => {
// camera.deviceCode = dataMyTag.camera.sbbm; // camera.deviceCode = dataMyTag.camera.sbbm;
@ -874,7 +862,9 @@ const getCameraUrl = () => {
if (res.code == 200) { if (res.code == 200) {
camera.hlsUriSsl = res.data.hlsUriSsl; camera.hlsUriSsl = res.data.hlsUriSsl;
} else { } else {
errorMessage.value = res.message; ElMessage.warning({
message: res.message,
});
} }
}); });
}; };
@ -888,19 +878,20 @@ const back = () => {
watch( watch(
() => props.message, () => props.message,
(newValue, oldValue) => { (newValue, oldValue) => {
errorMessage.value = "";
// identNo.value = props.message.identNo; // identNo.value = props.message.identNo;
dataMyTag.identNo = props.message.identNo; dataMyTag.identNo = props.message.identNo;
getData(props.message.identNo); getData(props.message.identNo);
onClickTag2("出生", "出生"); onClickTag2("出生", "出生");
jump.value = "map"; jump.value = "map";
getshs(); getshs();
if (dataMyTag.camera) {
getCameraUrl();
}
} }
); );
onMounted(() => { onMounted(() => {
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
if (routers.query.type) { if (routers.query.type) {
errorMessage.value = "";
dataMyTag.identNo = routers.query.identNo; dataMyTag.identNo = routers.query.identNo;
jump.value = "detail"; jump.value = "detail";
if (routers.query.identNo !== undefined) { if (routers.query.identNo !== undefined) {
@ -908,6 +899,9 @@ onMounted(() => {
} }
onClickTag2("出生", "出生"); onClickTag2("出生", "出生");
getshs(); getshs();
if (dataMyTag.camera) {
getCameraUrl();
}
} else { } else {
jump.value = "map"; jump.value = "map";
} }