Merge remote-tracking branch 'origin/master'

baoshiwei

2024-05-27 fa3ac93010bea3805438ee3ab0a182bfbf7423da

 src/views/dry/bigScreen/BigEqp.vue

@@ -122,10 +122,11 @@
                                 margin-left: 100px;
                                 font-size: 22px;
                                 background: sandybrown;
                                 height: 60px;

                                 border-radius: 10px;
                                 line-height: 0;
                                 padding: 29px;
                                 line-height: 25px;
                                 max-width: 500px;
                                 padding: 15px;
                                 font-weight: bold;" >
                              {{ realData?.warnMsg }}
                           </div>
@@ -383,6 +384,7 @@
   import { queryById, listAll } from '../api/DryEquipment.api'
   import { dryEquipment } from '../dataDefine/DryEquipment.data'
   import { useUserStore } from '/@/store/modules/user'
   import { getTenantId, getToken } from '/@/utils/auth'

   const domRef = ref<Nullable<HTMLElement>>(null)
   const { enter, toggle, exit, isFullscreen } = useFullscreen()
@@ -1345,7 +1347,7 @@
      if (eqp.value) {
         eqp.value = eqps.value[eqpNum.value]
         // console.log("888",eqp.value);
         let tenantId = 1003
         let tenantId = getTenantId()
         let eqpCode = eqp.value.code
         let queryRealTimeUrl = '/dry/real/getRealTimeData'
         defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
@@ -1912,7 +1914,7 @@

   .eqpStatus {
      width: 848px;
      height: 300px;
		
   }
   .rightInfo {
      display: flex;