diff --git a/src/assets/sy-table/lampGreen1.png b/src/assets/sy-table/lampGreen1.png new file mode 100644 index 0000000..dcc20bd Binary files /dev/null and b/src/assets/sy-table/lampGreen1.png differ diff --git a/src/assets/sy-table/lampGreen2.png b/src/assets/sy-table/lampGreen2.png new file mode 100644 index 0000000..7437ce2 Binary files /dev/null and b/src/assets/sy-table/lampGreen2.png differ diff --git a/src/assets/sy-table/lampGreen3.png b/src/assets/sy-table/lampGreen3.png new file mode 100644 index 0000000..1343ca5 Binary files /dev/null and b/src/assets/sy-table/lampGreen3.png differ diff --git a/src/assets/sy-table/lampRed1.png b/src/assets/sy-table/lampRed1.png new file mode 100644 index 0000000..3a632d4 Binary files /dev/null and b/src/assets/sy-table/lampRed1.png differ diff --git a/src/assets/sy-table/lampRed2.png b/src/assets/sy-table/lampRed2.png new file mode 100644 index 0000000..32224c7 Binary files /dev/null and b/src/assets/sy-table/lampRed2.png differ diff --git a/src/assets/sy-table/lampRed3.png b/src/assets/sy-table/lampRed3.png new file mode 100644 index 0000000..6b1a079 Binary files /dev/null and b/src/assets/sy-table/lampRed3.png differ diff --git a/src/assets/sy-table/lampYellow1.png b/src/assets/sy-table/lampYellow1.png new file mode 100644 index 0000000..d0b3415 Binary files /dev/null and b/src/assets/sy-table/lampYellow1.png differ diff --git a/src/assets/sy-table/lampYellow2.png b/src/assets/sy-table/lampYellow2.png new file mode 100644 index 0000000..876dca5 Binary files /dev/null and b/src/assets/sy-table/lampYellow2.png differ diff --git a/src/assets/sy-table/lampYellow3.png b/src/assets/sy-table/lampYellow3.png new file mode 100644 index 0000000..768f0d6 Binary files /dev/null and b/src/assets/sy-table/lampYellow3.png differ diff --git a/src/view/dialog/dialogCamera.vue b/src/view/dialog/dialogCamera.vue index 4dc1a63..1938944 100644 --- a/src/view/dialog/dialogCamera.vue +++ b/src/view/dialog/dialogCamera.vue @@ -79,6 +79,12 @@ const props = defineProps({ type: String, default: "", }, + sxtnames: { + type: String, + default: () => { + return ""; + }, + }, }); const emit = defineEmits(["close"]); @@ -124,9 +130,9 @@ const initializeVideo = () => { } else { num.value = true; } - cameraShow.value = props.cameraShow; hlsUriSslNow.value = props.hlsUriSsl; + data.title = props.sxtnames; attachmentLink.value = hlsUriSslNow.value; if (num.value) { diff --git a/src/view/dialog/dialogCameras.vue b/src/view/dialog/dialogCameras.vue index 8f54a5f..eef9cff 100644 --- a/src/view/dialog/dialogCameras.vue +++ b/src/view/dialog/dialogCameras.vue @@ -70,7 +70,6 @@ import { CircleCloseFilled } from "@element-plus/icons-vue"; import VideojsZhcnLanguage from "video.js/dist/lang/zh-CN.json"; videojs.addLanguage("zh-CN", VideojsZhcnLanguage); //中文设置 - const props = defineProps({ cameraShow: { type: Boolean, @@ -117,7 +116,6 @@ watch( cameraShow.value = newVal; hlsUriSslNow.value = props.hlsUriSsl; data.title = props.sxtname; - // console.log(hlsUriSslNow.value, props.sxtname, 5555); attachmentLink.value = hlsUriSslNow.value; dp.value = null; @@ -160,9 +158,7 @@ const options = { muted: true, preload: "auto", controls: true, - hls:{ - - } + hls: {}, }; const loadVideo = () => { diff --git a/src/view/person/index.vue b/src/view/person/index.vue index b116229..bdae436 100644 --- a/src/view/person/index.vue +++ b/src/view/person/index.vue @@ -374,8 +374,9 @@ > --> @@ -576,10 +577,11 @@ const baseInfo = ref({ maritalStatus: "", }); const dialogShow = ref(false); -const camera = reactive({ +const camerali = reactive({ show: false, deviceCode: "", hlsUriSsl: "", + name: "", }); const tableType = reactive({ url: "", @@ -916,7 +918,7 @@ const close = () => { dialogShow.value = false; }; const close1 = () => { - camera.show = false; + camerali.show = false; }; //右侧表格分页 const handlePagination = (currentPage) => { @@ -947,7 +949,7 @@ const getData = (identNo) => { // 判断 ryjbxx 和 camera 是否存在 baseInfo.value = ryjbxx || {}; dataMyTag.camera = camera ?? false; - // console.log(dataMyTag.camera, camera); + camerali.name = camera.sbmc; if (Array.isArray(dataMyTag.myTag)) { dataMyTag.myTag.forEach((item) => { @@ -999,14 +1001,14 @@ const openCamera = () => { const errorMessage = ref(""); //获取摄像头地址 const getCameraUrl = () => { - camera.deviceCode = dataMyTag.camera.sbbm; + camerali.deviceCode = dataMyTag.camera.sbbm; // camera.deviceCode = "3KSCP274757F2JU"; http - .get(`/api/ggfwyth/ysyzt/getPlayAddress?deviceCode=${camera.deviceCode}`) + .get(`/api/ggfwyth/ysyzt/getPlayAddress?deviceCode=${camerali.deviceCode}`) .then((res) => { if (res.code == 200) { - camera.show = true; - camera.hlsUriSsl = res.data.hlsUriSsl; + camerali.show = true; + camerali.hlsUriSsl = res.data.hlsUriSsl; } else { // errorMessage.value = res.message; ElMessage.warning({ diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 2402be4..0fa634f 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -122,6 +122,17 @@ 体检记录 +
+
+ +
+