修改看板显示

1 month ago · 245542e103
parent 307d735aaa
commit 245542e103
1 changed files with 355 additions and 328 deletions
--- a/ruoyi-manage/src/main/resources/templates/manage/model/model.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/model/model.html
@ -92,7 +92,7 @@
        background-repeat: no-repeat;
    }

-  .threeLabelContent {
+    .threeLabelContent, .threeLabelContent1 {

        display: none;
        /*width: 200px;*/
@ -109,8 +109,13 @@
        max-height: 90vh;
    }

+    .threeLabelContent1 {
+        left: 0;
+        right: inherit;
+    }

-  .threeLabelContent:before {
+
+    .threeLabelContent:before, .threeLabelContent1:before {
        /*content: '';*/
        position: absolute;
        top: 100%;
@ -125,6 +130,7 @@

    .sign {
    }
+
    .sign .content {
        background-image: url("/img/model/sign.png");
        background-size: 100% 100%;
@ -144,6 +150,7 @@
        text-align: center;
        transform: translateY(-50%);
    }
+
    .pageTitle {
        position: absolute;
        transform: translateY(-50%);
@ -155,16 +162,30 @@
        font-size: 2vw;
        color: #fff;
    }
+
    .rightTH {
        display: inline-block;
        width: 33%;
    }
+
+    .rightTH1 {
+        display: inline-block;
+        width: 16.66%;
+    }
+
    .rightTable {
        width: 20vw;
        position: sticky;
        top: 0;
        background-color: rgba(23, 48, 97);
    }
+
+    .rightTable1 {
+        width: 30vw;
+        position: sticky;
+        top: 0;
+        background-color: rgba(23, 48, 97);
+    }
 </style>
 <body class="gray-bg">
 <!--  29.4  39.8 50.1 59.6  68.8 -->
@ -176,6 +197,7 @@
    </div>
    <div class="threeLabel" id="threeLabel">
        <div class="threeLabelContent" id="threeLabelContent"></div>
+        <div class="threeLabelContent1" id="threeLabelContent1"></div>
    </div>
    <div class="sign" id="sign1">
        <div class="content">
@ -386,6 +408,11 @@
            // camera.updateProjectionMatrix()
            // controls.update()
        })
+        $.post(ctx + 'api/getDevice', {id: id.toString()}, (e) => {
+            $("#threeLabelContent1").css('display', 'block')
+            $("#threeLabelContent1").html(`<div class="rightTable1"><div class="rightTH1">摆放桩位</div><div class="rightTH1">设备编码</div><div class="rightTH1">设备名称</div><div class="rightTH1">设备类型</div><div class="rightTH1">使用状态</div><div class="rightTH1">设备状态</div></div>${e.data.map(v => `<div class="rightTH1">${v.locationName}</div><div class="rightTH1">${v.devicecode}</div><div class="rightTH1">${v.deviceName}</div><div class="rightTH1">${v.deviceType}</div><div class="rightTH1">${v.usestate}</div><div class="rightTH1">${v.devicestate}</div> `).join('<br>')}`)
+
+        })
    }

    $.post(ctx + 'api/getArea', {}, (e) => {