Merge commit 'c6b03c6ae4eb522a67dd3b3e420938c2fbad9083' into gzb

public/font/DIN/index.css

@@ -0,0 +1,35 @@
+/* DIN Black 字体 */
+@font-face {
+  font-family: "DIN";
+  src: url('DIN-Black.otf?t=1713509940151') format('opentype');
+  font-weight: 900;
+  /* 通常为 Black 字体设置较高的权重值 */
+  font-style: normal;
+}
+
+/* DIN Bold 字体 */
+@font-face {
+  font-family: "DIN";
+  src: url('DIN-Bold.otf?t=1713509940151') format('opentype');
+  font-weight: bold;
+  /* 通常为 Bold 字体设置 bold 权重值 */
+  font-style: normal;
+}
+
+/* DIN Light 字体 */
+@font-face {
+  font-family: "DIN";
+  src: url('DIN-Light.otf?t=1713509940151') format('opentype');
+  font-weight: normal;
+  /* Light 字体通常使用较轻的权重值 */
+  font-style: normal;
+}
+
+/* DIN Medium 字体 */
+@font-face {
+  font-family: "DIN";
+  src: url('DIN-Medium.otf?t=1713509940151') format('opentype');
+  font-weight: 500;
+  /* Medium 字体使用介于正常和粗体之间的权重值 */
+  font-style: normal;
+}

public/iconfont/demo_index.html → public/font/iconfont/demo_index.html

@@ -240,9 +240,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1713162473058') format('woff2'),
-       url('iconfont.woff?t=1713162473058') format('woff'),
-       url('iconfont.ttf?t=1713162473058') format('truetype');
+  src: url('iconfont.woff2?t=1713509940151') format('woff2'),
+       url('iconfont.woff?t=1713509940151') format('woff'),
+       url('iconfont.ttf?t=1713509940151') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>

public/iconfont/iconfont.css → public/font/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4468064 */
-  src: url('iconfont.woff2?t=1713162473058') format('woff2'),
-       url('iconfont.woff?t=1713162473058') format('woff'),
-       url('iconfont.ttf?t=1713162473058') format('truetype');
+  src: url('iconfont.woff2?t=1713509940151') format('woff2'),
+       url('iconfont.woff?t=1713509940151') format('woff'),
+       url('iconfont.ttf?t=1713509940151') format('truetype');
 }
 
 .iconfont {

public/index.html

@@ -8,7 +8,8 @@
     <meta http-equiv="cache-control" content="no-cache">
     <meta name="viewport" content="width=device-width, user-scalable=no" />
     <link rel="stylesheet" href="/librarys/view-design@4.7.0/iview.css">
-    <link rel="stylesheet" href="/iconfont/iconfont.css">
+    <link rel="stylesheet" href="/font/iconfont/iconfont.css">
+    <link rel="stylesheet" href="/font/DIN/index.css">
     <link rel="icon" href="favicon.ico" />
     <title>星火云鸽管控平台</title>
     <script src="/config.js"></script>

src/assets/less/common.less

@@ -8,7 +8,7 @@ body,
   position: relative;
   width: 100vw;
   height: 100vh;
-  font-family: "Microsoft YaHei", "微软雅黑" !important;
+  font-family: "DIN" !important;
   color: #253a70;
   font-size: 14px;
   -webkit-touch-callout: none;

src/utils/index.js

@@ -733,5 +733,7 @@ export const pushTypeInfo = {
   3: "锁定",
   4: "更新策略",
   5: "重启设备",
-  6: "恢复出厂"
+  6: "恢复出厂",
+  7: "解除管控",
+  8: "解除绑定"
 };

src/views/platformSection/home/index.vue

@@ -202,7 +202,7 @@ export default {
           name: item.areaName.replace(/省|市/g, ""),
           value: item.devicenum,
           numInfo: {
-            schoolnum: item.devicenum,
+            schoolnum: item.schoolnum,
             usernum: item.usernum,
             devicenum: item.devicenum
           }

src/views/regionSection/home/index.vue

@@ -195,7 +195,7 @@ export default {
           name: item.areaName.replace(/省|市/g, ""),
           value: item.devicenum,
           numInfo: {
-            schoolnum: item.devicenum,
+            schoolnum: item.schoolnum,
             usernum: item.usernum,
             devicenum: item.devicenum
           }

src/views/schoolSection/applicationStrategy/appStrategyManage.vue

@@ -525,6 +525,7 @@ export default {
     justify-content: flex-start;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     .table_app_item {
       margin: 10px;
       .app_top {

src/views/schoolSection/applicationStrategy/appStrategyManageEdit.vue

@@ -524,6 +524,7 @@ export default {
     justify-content: flex-start;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     .table_app_item {
       margin: 10px;
       .app_top {

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

@@ -502,6 +502,7 @@ export default {
     justify-content: flex-start;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     .table_app_item {
       margin: 10px;
       .app_top {

src/views/schoolSection/applicationStrategy/appStrategyTemplateEdit.vue

@@ -525,6 +525,7 @@ export default {
     justify-content: flex-start;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     .table_app_item {
       margin: 10px;
       .app_top {

src/views/schoolSection/applicationStrategy/appStrategyTemplateView.vue

@@ -212,6 +212,7 @@ export default {
     justify-content: flex-start;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     .table_app_item {
       margin: 10px;
       .app_top {

src/views/schoolSection/home/index.vue

@@ -42,7 +42,7 @@
               class="online_info online_1"
               v-if="onlineDeviceList.length > 0"
             >
-              <div>
+              <div class="online_percent">
                 {{
                   onlineDeviceList[0].totalnum > 0
                     ? Math.floor(
@@ -53,7 +53,7 @@
                     : 0
                 }}%
               </div>
-              <div>最近1小时</div>
+              <div class="online_percent_title">最近1小时</div>
               <div class="online_title">
                 在线 <span>{{ onlineDeviceList[0].num }}</span>
               </div>
@@ -65,7 +65,7 @@
               class="online_info online_2"
               v-if="onlineDeviceList.length > 0"
             >
-              <div>
+              <div class="online_percent">
                 {{
                   onlineDeviceList[1].totalnum > 0
                     ? Math.floor(
@@ -76,7 +76,7 @@
                     : 0
                 }}%
               </div>
-              <div>最近48小时</div>
+              <div class="online_percent_title">最近48小时</div>
               <div class="online_title">
                 在线 <span>{{ onlineDeviceList[1].num }}</span>
               </div>
@@ -88,7 +88,7 @@
               class="online_info online_3"
               v-if="onlineDeviceList.length > 0"
             >
-              <div>
+              <div class="online_percent">
                 {{
                   onlineDeviceList[2].totalnum > 0
                     ? Math.floor(
@@ -99,7 +99,7 @@
                     : 0
                 }}%
               </div>
-              <div>最近7天</div>
+              <div class="online_percent_title">最近7天</div>
               <div class="online_title">
                 在线 <span>{{ onlineDeviceList[2].num }}</span>
               </div>
@@ -1022,31 +1022,46 @@ export default {
               font-size: 14px;
               text-align: center;
               &.online_1 {
+                padding-top: 130px;
                 color: #339cff;
-                &:first-child {
-                  padding-top: 140px;
+                .online_percent {
+                  margin-bottom: 10px;
+                  font-weight: bold;
                   font-size: 20px;
                 }
+                .online_percent_title {
+                  font-size: 14px;
+                }
                 span {
                   color: #339cff;
                 }
               }
               &.online_2 {
+                padding-top: 130px;
                 color: #52c41a;
-                &:first-child {
-                  padding-top: 140px;
+                .online_percent {
+                  margin-bottom: 10px;
+                  font-weight: bold;
                   font-size: 20px;
                 }
+                .online_percent_title {
+                  font-size: 14px;
+                }
                 span {
                   color: #52c41a;
                 }
               }
               &.online_3 {
+                padding-top: 130px;
                 color: #ed4a99;
-                &:first-child {
-                  padding-top: 140px;
+                .online_percent {
+                  margin-bottom: 10px;
+                  font-weight: bold;
                   font-size: 20px;
                 }
+                .online_percent_title {
+                  font-size: 14px;
+                }
                 span {
                   color: #ed4a99;
                 }
@@ -1056,7 +1071,7 @@ export default {
                 bottom: 0;
                 left: 0;
                 right: 0;
-                padding-bottom: 20px;
+                padding-bottom: 25px;
                 font-size: 14px;
                 text-align: center;
                 color: #798cb5;

src/views/schoolSection/log/devicePush.vue

@@ -25,9 +25,14 @@
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="pushTypeSlot">
-          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ pushTypeInfo[row.pushType] }}</div>
         </template>
+        <template slot-scope="{ row }" slot="receivedSlot">
+          <div class="action_list">
+            <div class="action_success" v-if="row.received === 1">是</div>
+            <div class="action_error" v-else-if="row.received === 0">否</div>
+          </div>
+        </template>
       </Table>
     </div>
     <div class="page_wrap">
@@ -90,6 +95,12 @@ export default {
           slot: "pushTypeSlot",
           align: "center"
         },
+        {
+          title: "接收",
+          slot: "receivedSlot",
+          width: 90,
+          align: "center"
+        },
         {
           title: "设备号",
           key: "sn",