Compare commits

..

No commits in common. "cb575efc74483bc8b6ba5d96c8069a1e7e4b082e" and "9419c7048a0aa9b4e823fd218d7b8f1d0bc548fd" have entirely different histories.

13 changed files with 18 additions and 184 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -79,12 +79,6 @@ const props = defineProps({
type: String, type: String,
default: "", default: "",
}, },
sxtnames: {
type: String,
default: () => {
return "";
},
},
}); });
const emit = defineEmits(["close"]); const emit = defineEmits(["close"]);
@ -130,9 +124,9 @@ const initializeVideo = () => {
} else { } else {
num.value = true; num.value = true;
} }
cameraShow.value = props.cameraShow; cameraShow.value = props.cameraShow;
hlsUriSslNow.value = props.hlsUriSsl; hlsUriSslNow.value = props.hlsUriSsl;
data.title = props.sxtnames;
attachmentLink.value = hlsUriSslNow.value; attachmentLink.value = hlsUriSslNow.value;
if (num.value) { if (num.value) {

View File

@ -70,6 +70,7 @@ import { CircleCloseFilled } from "@element-plus/icons-vue";
import VideojsZhcnLanguage from "video.js/dist/lang/zh-CN.json"; import VideojsZhcnLanguage from "video.js/dist/lang/zh-CN.json";
videojs.addLanguage("zh-CN", VideojsZhcnLanguage); // videojs.addLanguage("zh-CN", VideojsZhcnLanguage); //
const props = defineProps({ const props = defineProps({
cameraShow: { cameraShow: {
type: Boolean, type: Boolean,
@ -116,6 +117,7 @@ watch(
cameraShow.value = newVal; cameraShow.value = newVal;
hlsUriSslNow.value = props.hlsUriSsl; hlsUriSslNow.value = props.hlsUriSsl;
data.title = props.sxtname; data.title = props.sxtname;
// console.log(hlsUriSslNow.value, props.sxtname, 5555);
attachmentLink.value = hlsUriSslNow.value; attachmentLink.value = hlsUriSslNow.value;
dp.value = null; dp.value = null;
@ -158,7 +160,9 @@ const options = {
muted: true, muted: true,
preload: "auto", preload: "auto",
controls: true, controls: true,
hls: {}, hls:{
}
}; };
const loadVideo = () => { const loadVideo = () => {

View File

@ -374,9 +374,8 @@
> >
</Dialog> --> </Dialog> -->
<DialogCamera <DialogCamera
:cameraShow="camerali.show" :cameraShow="camera.show"
:hlsUriSsl="camerali.hlsUriSsl" :hlsUriSsl="camera.hlsUriSsl"
:sxtnames="camerali.name"
@close="close1" @close="close1"
> >
</DialogCamera> </DialogCamera>
@ -577,11 +576,10 @@ const baseInfo = ref({
maritalStatus: "", maritalStatus: "",
}); });
const dialogShow = ref(false); const dialogShow = ref(false);
const camerali = reactive({ const camera = reactive({
show: false, show: false,
deviceCode: "", deviceCode: "",
hlsUriSsl: "", hlsUriSsl: "",
name: "",
}); });
const tableType = reactive({ const tableType = reactive({
url: "", url: "",
@ -918,7 +916,7 @@ const close = () => {
dialogShow.value = false; dialogShow.value = false;
}; };
const close1 = () => { const close1 = () => {
camerali.show = false; camera.show = false;
}; };
// //
const handlePagination = (currentPage) => { const handlePagination = (currentPage) => {
@ -949,7 +947,7 @@ const getData = (identNo) => {
// ryjbxx camera // ryjbxx camera
baseInfo.value = ryjbxx || {}; baseInfo.value = ryjbxx || {};
dataMyTag.camera = camera ?? false; dataMyTag.camera = camera ?? false;
camerali.name = camera.sbmc; // console.log(dataMyTag.camera, camera);
if (Array.isArray(dataMyTag.myTag)) { if (Array.isArray(dataMyTag.myTag)) {
dataMyTag.myTag.forEach((item) => { dataMyTag.myTag.forEach((item) => {
@ -1001,14 +999,14 @@ const openCamera = () => {
const errorMessage = ref(""); const errorMessage = ref("");
// //
const getCameraUrl = () => { const getCameraUrl = () => {
camerali.deviceCode = dataMyTag.camera.sbbm; camera.deviceCode = dataMyTag.camera.sbbm;
// camera.deviceCode = "3KSCP274757F2JU"; // camera.deviceCode = "3KSCP274757F2JU";
http http
.get(`/api/ggfwyth/ysyzt/getPlayAddress?deviceCode=${camerali.deviceCode}`) .get(`/api/ggfwyth/ysyzt/getPlayAddress?deviceCode=${camera.deviceCode}`)
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
camerali.show = true; camera.show = true;
camerali.hlsUriSsl = res.data.hlsUriSsl; camera.hlsUriSsl = res.data.hlsUriSsl;
} else { } else {
// errorMessage.value = res.message; // errorMessage.value = res.message;
ElMessage.warning({ ElMessage.warning({

View File

@ -122,17 +122,6 @@
体检记录 体检记录
</div> </div>
</div> </div>
<div v-if="data.name == '老年人福利补贴'" class="lampState">
<div>
<img
v-for="n in 9"
:key="n"
:src="lampImages[n]"
@click="lampScreen(n)"
:class="{ selected: selectedLamp == n }"
/>
</div>
</div>
<span class="text" v-else-if="data.tabelshow"> <span class="text" v-else-if="data.tabelshow">
<img <img
v-if="data.first" v-if="data.first"
@ -170,19 +159,8 @@
:label="item.label" :label="item.label"
:prop="item.property" :prop="item.property"
:width="item.width || ''" :width="item.width || ''"
:align="item.align || 'left'"
> >
<template #default="scope"> <template #default="scope">
<!-- 状态 -->
<div v-if="item.property == 'zt'">
<div v-for="index in 9" :key="index">
<img
style="width: 30px; height: 30px"
v-if="scope.row.zt == index"
:src="lampImages[index]"
/>
</div>
</div>
<!-- 补助类型 --> <!-- 补助类型 -->
<div v-if="item.property == 'bzlx'"> <div v-if="item.property == 'bzlx'">
<div v-if="scope.row.bzlx == 1">高龄津贴</div> <div v-if="scope.row.bzlx == 1">高龄津贴</div>
@ -219,15 +197,6 @@ import http from "@/utils/request.js";
import { useRouter, useRoute } from "vue-router"; import { useRouter, useRoute } from "vue-router";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import tools from "@/utils/tools"; import tools from "@/utils/tools";
import lamp1 from "../assets/sy-table/lampGreen1.png";
import lamp2 from "../assets/sy-table/lampGreen2.png";
import lamp3 from "../assets/sy-table/lampGreen3.png";
import lamp4 from "../assets/sy-table/lampRed1.png";
import lamp5 from "../assets/sy-table/lampRed2.png";
import lamp6 from "../assets/sy-table/lampRed3.png";
import lamp7 from "../assets/sy-table/lampYellow1.png";
import lamp8 from "../assets/sy-table/lampYellow2.png";
import lamp9 from "../assets/sy-table/lampYellow3.png";
const router = useRouter(); const router = useRouter();
const routers = useRoute(); const routers = useRoute();
const mxbtabelshow = ref(true); const mxbtabelshow = ref(true);
@ -615,13 +584,6 @@ const formData = reactive({
property: "xm", property: "xm",
width: "90", width: "90",
}, },
{
label: "状态",
property: "zt",
width: "90",
align: "center",
type: "slot",
},
{ {
label: "地址", label: "地址",
property: "dz", property: "dz",
@ -784,85 +746,6 @@ const formData = reactive({
subsidyType: "老年人综合能力评估", subsidyType: "老年人综合能力评估",
}, },
], ],
tableData2: [
{
xm: "杨*根",
zt: 1,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "舒*香",
zt: 2,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "2",
},
{
xm: "罗*华",
zt: 3,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "周*田",
zt: 4,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "2",
},
{
xm: "徐*英",
zt: 5,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "王*奶",
zt: 6,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "夏*香",
zt: 7,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "夏*寿",
zt: 8,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "邱*兰",
zt: 9,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "楼*生",
zt: 1,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
{
xm: "饶*云",
zt: 2,
dz: "浙江省龙游县龙*****号",
age: "87",
bzlx: "1",
},
],
}, },
lmbhzTableData: { lmbhzTableData: {
url: "", url: "",
@ -1464,28 +1347,6 @@ const change = (val) => {
data.first = data.first == 1 ? 0 : 1; data.first = data.first == 1 ? 0 : 1;
} }
}; };
// 使
const lampImages = {
1: lamp1,
2: lamp2,
3: lamp3,
4: lamp4,
5: lamp5,
6: lamp6,
7: lamp7,
8: lamp8,
9: lamp9,
};
const selectedLamp = ref(null);
const lampScreen = (val) => {
selectedLamp.value = val;
const filteredData = formData.hjlnrTableData.tableData2.filter(
(element) => element.zt === val
);
data.tableData2 = filteredData;
// console.log(val, data.tableData2);
};
const getTable = (pagination) => { const getTable = (pagination) => {
http http
.get( .get(
@ -1598,7 +1459,7 @@ const handleRowClick = (row, column, event) => {
break; break;
case "义务教育学生营养改善计划": case "义务教育学生营养改善计划":
data.identNo = row.identNo; data.identNo = row.identNo;
if (data.identNo !== null) { if (data.identNo !== null ) {
router.push({ router.push({
path: `/home/index/person`, path: `/home/index/person`,
query: { identNo: data.identNo, type: "detail" }, query: { identNo: data.identNo, type: "detail" },
@ -1644,8 +1505,7 @@ const listAssignment = () => {
pagination.url = "/api/ggfwyth/pg/ylzlFlbt"; pagination.url = "/api/ggfwyth/pg/ylzlFlbt";
pagination2.url = "/api/ggfwyth/pg/ylzlFlbt"; pagination2.url = "/api/ggfwyth/pg/ylzlFlbt";
getServiceList(pagination, 1); getServiceList(pagination, 1);
data.tableData2 = formData.hjlnrTableData.tableData2; getServiceList(pagination2, 0);
// getServiceList(pagination2, 0);
break; break;
case "慢性病患者健康管理": case "慢性病患者健康管理":
updateFormDataAndTable("两慢病患者", formData.lmbhzTableData); updateFormDataAndTable("两慢病患者", formData.lmbhzTableData);
@ -1674,7 +1534,6 @@ onMounted(() => {
if (routers.query.name) { if (routers.query.name) {
data.name = routers.query.name; data.name = routers.query.name;
listAssignment(); listAssignment();
lampScreen(1);
} }
}); });
</script> </script>
@ -2052,7 +1911,6 @@ onMounted(() => {
cursor: pointer; cursor: pointer;
} }
} }
.text { .text {
display: flex; display: flex;
position: absolute; position: absolute;
@ -2087,31 +1945,11 @@ onMounted(() => {
cursor: pointer; cursor: pointer;
} }
} }
.lampState {
position: absolute;
top: 0px;
right: 0;
img {
width: 30px;
height: 30px;
margin-right: 8px;
cursor: pointer;
&:nth-child(3n) {
margin-right: 20px;
}
}
.selected {
border-radius: 50%;
background-color: rgba(255, 255, 255, 0.3);
box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
}
}
.yd_title::before { .yd_title::before {
content: ""; content: "";
width: 4px; width: 4px;
height: 4px; height: 4px;
background-color: rgba(0, 229, 255, 1); background-color: #00e5ff;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
left: 0; left: 0;