Browse Source

高度计算与名称修改

yanqiliang 2 months ago
parent
commit
cf1f7e2325
6 changed files with 13 additions and 13 deletions
  1. 2 2
      index.html
  2. 2 2
      readme.md
  3. 5 5
      src/assets/scss/style.scss
  4. 1 1
      src/components/login/Index.jsx
  5. 2 2
      src/pages/bigScreen/Index.jsx
  6. 1 1
      src/pages/home/Index.jsx

+ 2 - 2
index.html

@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>自助机</title>
+  <title>叫号屏</title>
 </head>
 
 <body>
@@ -12,4 +12,4 @@
   <script type="module" src="/src/main.jsx"></script>
 </body>
 
-</html>
+</html>

+ 2 - 2
readme.md

@@ -1,5 +1,5 @@
 # 简介
-自助机项目
+叫号屏项目
 
 # 启动
 ```shell
@@ -9,4 +9,4 @@ npm run dev
 # 打包
 ```shell
 npm run build
-```
+```

+ 5 - 5
src/assets/scss/style.scss

@@ -32,7 +32,7 @@ body {
 .page-body {
   margin: 0;
   padding: 0.8rem 1rem;
- 
+
   font-family: PingFang SC;
   display: flex;
   flex-direction: column;
@@ -140,8 +140,8 @@ body {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-      height: 4.2rem;
-      line-height: 3.9rem;
+      height: 4rem;
+      line-height: 3.8rem;
       text-align: center;
       color: #fff;
     }
@@ -150,7 +150,7 @@ body {
       border-color: #f0f0f0;
       color: #333;
       font-size: 1.5rem;
-      margin-top: 0.8rem;
+      margin-top: 0.5rem;
       &.patOpeName {
         color: #f39a06;
         padding: 0 0.4rem;
@@ -246,4 +246,4 @@ body {
   .footer{
     color: #fff;
   }
-}
+}

+ 1 - 1
src/components/login/Index.jsx

@@ -103,7 +103,7 @@ class Login extends React.Component {
     React.$fetchPost('04150006', {
       params: [{
         hospID: cacheData.hospital[0] || '',  // 医院ID
-        deviceDesc: '自助机', // 设备名称
+        deviceDesc: '叫号屏', // 设备名称
         deviceIP: cacheData.BASE_URL,
         deviceIdentifyCode: this.props.deviceID, // 设备生成的ID
         purposeID: cacheData.use[0] || '', // 用途ID 未使用

+ 2 - 2
src/pages/bigScreen/Index.jsx

@@ -59,7 +59,7 @@ class BigScreen extends React.Component {
             patList: this.props.patListArea.slice((current - 1) * pageSize, current * pageSize),
           });
           // 10s切换
-          const timer = setTimeout(fn, 10000);
+          const timer = setTimeout(fn, 6000);
           this.setState({
             timer,
           });
@@ -72,7 +72,7 @@ class BigScreen extends React.Component {
   initScroll = () => {
     const parentDom = document.getElementById('patWrap');
     const style = window.getComputedStyle(parentDom);
-    const parentH = parentDom.offsetHeight - parseInt(style.paddingTop) - parseInt(style.paddingBottom);
+    const parentH = parentDom.offsetHeight - parseInt(style.paddingTop) - parseInt(style.paddingBottom) - 50;
     const childH = parentDom.children[0].offsetHeight;
     const pageSize = Math.floor(parentH / childH) - 1;
     this.setState({

+ 1 - 1
src/pages/home/Index.jsx

@@ -225,4 +225,4 @@ class Home extends React.Component {
     );
   }
 }
-export default Home;
+export default Home;