Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

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) {

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 = () => {

src/view/person/index.vue

@@ -374,8 +374,9 @@
     >
     </Dialog> -->
     <DialogCamera
-      :cameraShow="camera.show"
-      :hlsUriSsl="camera.hlsUriSsl"
+      :cameraShow="camerali.show"
+      :hlsUriSsl="camerali.hlsUriSsl"
+      :sxtnames="camerali.name"
       @close="close1"
     >
     </DialogCamera>
@@ -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({

src/view/sy_details.vue

@@ -122,6 +122,17 @@
               体检记录
             </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">
             <img
               v-if="data.first"
@@ -159,8 +170,19 @@
               :label="item.label"
               :prop="item.property"
               :width="item.width || ''"
+              :align="item.align || 'left'"
             >
               <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="scope.row.bzlx == 1">高龄津贴</div>
@@ -197,6 +219,15 @@ import http from "@/utils/request.js";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage } from "element-plus";
 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 routers = useRoute();
 const mxbtabelshow = ref(true);
@@ -584,6 +615,13 @@ const formData = reactive({
         property: "xm",
         width: "90",
       },
+      {
+        label: "状态",
+        property: "zt",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
       {
         label: "地址",
         property: "dz",
@@ -746,6 +784,85 @@ const formData = reactive({
         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: {
     url: "",
@@ -1347,6 +1464,28 @@ const change = (val) => {
     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) => {
   http
     .get(
@@ -1459,7 +1598,7 @@ const handleRowClick = (row, column, event) => {
       break;
     case "义务教育学生营养改善计划":
       data.identNo = row.identNo;
-      if (data.identNo !== null ) {
+      if (data.identNo !== null) {
         router.push({
           path: `/home/index/person`,
           query: { identNo: data.identNo, type: "detail" },
@@ -1505,7 +1644,8 @@ const listAssignment = () => {
       pagination.url = "/api/ggfwyth/pg/ylzlFlbt";
       pagination2.url = "/api/ggfwyth/pg/ylzlFlbt";
       getServiceList(pagination, 1);
-      getServiceList(pagination2, 0);
+      data.tableData2 = formData.hjlnrTableData.tableData2;
+      // getServiceList(pagination2, 0);
       break;
     case "慢性病患者健康管理":
       updateFormDataAndTable("两慢病患者", formData.lmbhzTableData);
@@ -1534,6 +1674,7 @@ onMounted(() => {
   if (routers.query.name) {
     data.name = routers.query.name;
     listAssignment();
+    lampScreen(1);
   }
 });
 </script>
@@ -1911,6 +2052,7 @@ onMounted(() => {
       cursor: pointer;
     }
   }
+
   .text {
     display: flex;
     position: absolute;
@@ -1945,11 +2087,31 @@ onMounted(() => {
     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 {
   content: "";
   width: 4px;
   height: 4px;
-  background-color: #00e5ff;
+  background-color: rgba(0, 229, 255, 1);
   border-radius: 50%;
   position: absolute;
   left: 0;