Browse Source

Merge branch 'master' of http://101.35.184.155:3000/LiuTeng/xagx-tp-ws-lx

LiuTeng 7 tháng trước cách đây
mục cha
commit
ddddd5e456
1 tập tin đã thay đổi với 44 bổ sung50 xóa
  1. 44 50
      barscreen.html

+ 44 - 50
barscreen.html

@@ -1,49 +1,48 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link
-      rel="shortcut icon"
-      href="https://www.baidu.com/favicon.ico"
-      type="image/x-icon"
-    />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>条屏</title>
-  </head>
-  <body>
-    <div class="container">
-      <div class="title">
-        <div class="title-text" id="title"></div>
-      </div>
-      <div class="border1"></div>
-      <div class="content">
-        <div class="con-info">
-          <div class="con-info-index" id="index"></div>
-          <div class="con-info-name" id="conInfoName"></div>
-          <div class="con-info-state" id="conInfoState">
-            <div class="con-info-state-icon">
-              <img id="icon" src="./image/frees.png" />
-            </div>
-            <div class="con-info-state-text" id="conStateText"></div>
-          </div>
-        </div>
-        <div class="con-state" id="conState">
-          <div class="con-state-icon">
-            <img id="icon1" src="./image/frees.png" />
+
+<head>
+  <meta charset="UTF-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <link rel="shortcut icon" href="https://www.baidu.com/favicon.ico" type="image/x-icon" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>条屏</title>
+</head>
+
+<body>
+  <div class="container">
+    <div class="title">
+      <div class="title-text" id="title"></div>
+    </div>
+    <div class="border1"></div>
+    <div class="content">
+      <div class="con-info">
+        <div class="con-info-index" id="index"></div>
+        <div class="con-info-name" id="conInfoName"></div>
+        <div class="con-info-state" id="conInfoState">
+          <div class="con-info-state-icon">
+            <img id="icon" src="./image/frees.png" />
           </div>
-          <div class="con-state-text" id="conStateText1">工作中</div>
-        </div>
-        <div class=""></div>
-        <div class="con-now" id="conNowBox">
-          正在办理:<span id="conNow"></span>
+          <div class="con-info-state-text" id="conStateText"></div>
         </div>
-        <div class="con-wait" id="conWaitBox">
-          当前等待:<span id="conWait"></span>
+      </div>
+      <div class="con-state" id="conState">
+        <div class="con-state-icon">
+          <img id="icon1" src="./image/frees.png" />
         </div>
+        <div class="con-state-text" id="conStateText1">工作中</div>
+      </div>
+      <div class=""></div>
+      <div class="con-now" id="conNowBox">
+        正在办理:<span id="conNow"></span>
+      </div>
+      <div class="con-wait" id="conWaitBox">
+        当前等待:<span id="conWait"></span>
       </div>
     </div>
-  </body>
+  </div>
+</body>
+
 </html>
 
 <script>
@@ -284,8 +283,8 @@
         ckzt === "空闲"
           ? textColors.kx
           : ckzt === "暂停服务"
-          ? textColors.zt
-          : textColors.kx
+            ? textColors.zt
+            : textColors.kx
       );
       setEleCon("conStateText", "innerHTML", ckzt === "空闲" ? "工作中" : ckzt);
       // 正在办理
@@ -343,12 +342,6 @@
           setEleCon("icon", "src", srcs.zt);
           setStyle("conStateText", "color", textColors.zt);
           setEleCon("conStateText", "innerHTML", "暂停服务");
-          // 正在办理
-          setEleCon(
-            "conNow",
-            "innerHTML",
-            ckzt != "空闲" && ckzt != "暂停服务" ? ckzt : "暂无"
-          );
           setStyle("conNowBox", "display", "");
           setEleCon("conNowBox", "innerHTML", "潮汐窗口");
           setStyle("conNowBox", "fontSize", "180px");
@@ -386,6 +379,7 @@
     margin: 0;
     padding: 0;
   }
+
   .container {
     width: 1920px;
     height: 1080px;
@@ -464,7 +458,7 @@
     height: 170px;
   }
 
-  .con-info-state-icon > img {
+  .con-info-state-icon>img {
     width: 100%;
     height: 100%;
   }
@@ -494,7 +488,7 @@
     height: 170px;
   }
 
-  .con-state-icon > img {
+  .con-state-icon>img {
     width: 100%;
     height: 100%;
   }
@@ -532,4 +526,4 @@
     font-weight: 400;
     color: #ffffff;
   }
-</style>
+</style>