Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-echarts/src/views/centerRight1.vue

@@ -102,6 +102,28 @@ export default {
             "200",
             "89.52%",
           ],
+           ["MO000680", "2020*510门扇 040201001", "1000", "997", "3", "99.70%"],
+          ["MO000681", "2020*560门扇 040201015", "1023", "989", "34", "96.68%"],
+          [
+            "MO000682",
+            "2020*750门扇 040201051",
+            "1653",
+            "1546",
+            "107",
+            "93.53%",
+          ],
+          ["MO000683", "L100延长套", "1245", "1103", "142", "88.59%"],
+          ["MO000684", "C120门套 040201084", "2341", "2340", "1", "99.96%"],
+          ["MO000685", "B100横头 040201093", "2213", "2209", "4", "99.82%"],
+          ["MO000686", "2030*650移门 040201101", "678", "619", "59", "91.30%"],
+          [
+            "MO000687",
+            "2020*600 窄玻璃门 040201111",
+            "1908",
+            "1708",
+            "200",
+            "89.52%",
+          ],
         ],
         rowNum: 8, // 表格行数
         align: ["center"],

mes-ui/mes-echarts/src/views/index.vue

@@ -4,8 +4,12 @@
       <dv-loading v-if="loading">Loading...</dv-loading>
       <div v-else class="host-body">
         <!--        头标-->
+
         <div class="d-flex bg-header">
-          <div style="margin: 50px 30px;font-size: 20px;">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</div>
+          <div style="margin: 50px 30px;font-size: 20px; font-weight: 700;">
+            <span class="F11" @click="F11">全屏</span>
+            {{ dateYear }} {{ dateWeek }} {{ dateDay }}
+          </div>
         </div>
         <!-- <div class="d-flex jc-center">
           <dv-decoration-10 class="dv-dec-10" />
@@ -133,6 +137,17 @@ export default {
     clearInterval(this.timing);
   },
   methods: {
+    F11() {
+      // console.log("F11");
+      this.isFullscreen = !this.isFullscreen;
+      if (!document.fullscreenElement) {
+        document.documentElement.requestFullscreen();
+      } else {
+        if (document.exitFullscreen) {
+          document.exitFullscreen();
+        }
+      }
+    },
     timeFn() {
       this.timing = setInterval(() => {
         this.dateDay = formatTime(new Date(), "HH: mm: ss");
@@ -164,23 +179,23 @@ export default {
       width: 23px;
       height: 13px;
       border-radius: 4px;
-      background: #00FFFF;
+      background: #00ffff;
     }
-     .col2 {
+    .col2 {
       margin-right: 5px;
       display: inline-block;
       width: 23px;
       height: 13px;
       border-radius: 4px;
-      background: #ED3F14;
+      background: #ed3f14;
     }
-     .col3 {
+    .col3 {
       margin-right: 5px;
       display: inline-block;
       width: 23px;
       height: 13px;
       border-radius: 4px;
-      background: #FF9900;
+      background: #ff9900;
     }
   }
 }
@@ -189,4 +204,10 @@ export default {
   text-align: center;
   margin-top: 20px;
 }
+.F11 {
+  cursor: pointer;
+  font-weight: 700;
+  font-size: 18px;
+  margin-right: 20px;
+}
 </style>

mes-ui/mes-ui-admin-vue3/src/views/spectaculars/index.vue

@@ -501,9 +501,7 @@ const tableRowClassName = ({ rowIndex }) => {
     transform: translateX(-50%);
   }
 }
-.ydkb {
-  background: url('@/assets/imgs/mljkb1.png') no-repeat;
-}
+
 .fontstitle {
   padding-top: 40px;
 }