From 623c691a3cbf09fc0fe68bfa50d9354d12a3da77 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 17 十一月 2023 14:34:51 +0800
Subject: [PATCH] 1、车间看板页面修改设备详情弹窗触发条件由悬浮改为单击 2、大屏车间管理页面增加有关设备编号字体颜色各项功能，由用户自行设置

---
 src/views/WorkshopSignage.vue                                       |   10 ++++++----
 src/views/system/WorkshopSignageManagement.vue                      |    5 +++++
 src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue |   12 ++++++------
 src/views/system/modules/WorkshopModal.vue                          |    6 +++++-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index e3f9e6b..5353f00 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -37,7 +37,7 @@
           :stickSize="6"
         >
           <div class="single-device" :style="{ width: item.vw + 'px', height: item.vh + 'px' }"
-               @mouseenter="openDetail(item)">
+               @click="openDetail(item)">
             <div class="device-status">
               <div
                 v-if="item.equipmentStatus == 2 || item.equipmentStatus == 1"
@@ -64,7 +64,8 @@
                 class="device-image"
               ></div>
             </div>
-            <div class="device-id" :style="{ fontSize: item.fontSize + 'px' }">
+            <div class="device-id" id="deviceId"
+                 :style="{ fontSize: item.fontSize + 'px',color:workshopDetails.equipmentIdColor }">
               {{ item.equipmentId }}
             </div>
           </div>
@@ -183,6 +184,8 @@
           this.$refs.deviceContainerRef.style.backgroundImage = `url(${this.getImgView(
             this.workshopDetails.backgroundImage
           )})`
+
+
         })
       },
 
@@ -327,9 +330,8 @@
     }
 
     .content-container {
-      position: relative;
       width: 100%;
-      height: 100%;
+      height: calc(100% - 80px);
       background-repeat: no-repeat;
       background-size: 100% 100%;
 
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index 296cba5..4e68f1a 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -1343,7 +1343,7 @@
       handleCancel() {
         this.$emit('close')
         this.visible = false
-        this.modalNode.removeEventListener('mouseleave', this.closeModal)
+        // this.modalNode.removeEventListener('mouseleave', this.closeModal)
         if(this.modalTimer){
           clearInterval(this.modalTimer)
           this.modalTimer = null
@@ -1390,11 +1390,11 @@
       },
 
       getModalNode() {
-        console.log(document.querySelector('.ant-modal-content'))
-        this.modalNode = document.querySelector('.ant-modal-content')
-        this.timeout = setTimeout(() => {
-          this.modalNode.addEventListener('mouseleave', this.closeModal)
-        }, 100)
+        // console.log(document.querySelector('.ant-modal-content'))
+        // this.modalNode = document.querySelector('.ant-modal-content')
+        // this.timeout = setTimeout(() => {
+        //   this.modalNode.addEventListener('mouseleave', this.closeModal)
+        // }, 100)
       },
 
       closeModal() {
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 1572098..837a674 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -230,6 +230,11 @@
           scopedSlots: { customRender: 'backgroundImage' },
         },
         {
+          title: '璁惧缂栧彿棰滆壊',
+          dataIndex: 'equipmentIdColor',
+          align: 'center',
+        },
+        {
           title: '鎿嶄綔',
           dataIndex: 'action',
           align: 'center',
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 364a8fa..0164db1 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -18,6 +18,9 @@
         <a-form-model-item label="杞﹂棿鑳屾櫙鍥�" required prop="backgroundImage">
           <j-image-upload class="avatar-uploader" text="涓婁紶" v-model="model.backgroundImage"></j-image-upload>
         </a-form-model-item>
+        <a-form-model-item label="璁惧缂栧彿棰滆壊">
+          <a-input type="color" v-model="model.equipmentIdColor"></a-input>
+        </a-form-model-item>
       </a-form-model>
     </a-spin>
   </a-modal>
@@ -28,6 +31,7 @@
 
   export default {
     name: 'WorkshopModal',
+    components: {},
     data() {
       return {
         title: '鎿嶄綔',
@@ -49,7 +53,7 @@
             { min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
             { validator: this.validateRoleCode }
           ],
-          backgroundImage:[
+          backgroundImage: [
             { required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
           ]
         }

--
Gitblit v1.9.3