From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw

---
 src/views/WorkshopSignage.vue |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index 7505af1..c803017 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -23,11 +23,11 @@
 
           <a-col :span="7" class="device-status-info">
             <!--<a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info"-->
-                     <!--@click="handleScreenDevive(item)">-->
-              <!--<div :style="{color:item.checked?'#1890FF':'#fff'}">{{ item.label }}</div>-->
-              <!--<div class="status-square" :style="{ backgroundColor: item.color }"></div>-->
-              <!--&lt;!&ndash;<a-checkbox :checked="item.checked" @change="checkboxChange(item)"></a-checkbox>&ndash;&gt;-->
-              <!--<div>{{getDeviceNumberByStatus(item.value) }}</div>-->
+            <!--@click="handleScreenDevive(item)">-->
+            <!--<div :style="{color:item.checked?'#1890FF':'#fff'}">{{ item.label }}</div>-->
+            <!--<div class="status-square" :style="{ backgroundColor: item.color }"></div>-->
+            <!--&lt;!&ndash;<a-checkbox :checked="item.checked" @change="checkboxChange(item)"></a-checkbox>&ndash;&gt;-->
+            <!--<div>{{getDeviceNumberByStatus(item.value) }}</div>-->
             <!--</a-space>-->
             <a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
               <div :style="{color:item.checked?'#1890FF':'#fff'}">{{ item.label }}</div>
@@ -42,6 +42,8 @@
       <!--鎷栨嫿璁惧鍖哄煙-->
       <div class="content-container" ref="deviceContainerRef" style="overflow: auto">
         <img :src="imgSrc" width="1920" height="900">
+        <div class="guideline guidelineX" :style="{top:guidelineXTop+'px',display:showGuideline}"></div>
+        <div class="guideline guidelineY" :style="{left:guidelineYLeft+'px',display:showGuideline}"></div>
         <VueDragResize
           v-for="(item, index) in deviceList"
           :key="item.equipmentId"
@@ -59,6 +61,7 @@
           :isDraggable="isDraggable"
           :isResizable="isResizable"
           :stickSize="6"
+          @deactivated="showGuideline = 'none'"
         >
           <div class="single-device" :style="{ width: item.vw + 'px', height: item.vh + 'px' }"
                @click="openDetail(item)">
@@ -127,6 +130,9 @@
         timingAcquisition: null, // 瀹氭椂鍒锋柊鏄惁寮�鍚�
         parentH: 5000,//鐖剁骇楂樺害
         parentW: 1920,//鐖剁骇瀹藉害
+        showGuideline: 'none',
+        guidelineXTop: 0,
+        guidelineYLeft: 0,
         deviceList: [
           // {
           //   equipmentId: '123213213123232',// 璁惧ID
@@ -283,10 +289,13 @@
         // } else {
         //   this.deviceList[index].fontSize = 12
         // }
+        this.showGuideline = 'block'
         this.deviceList[index].vw = newRect.width
         this.deviceList[index].vh = newRect.height
         this.deviceList[index].coordinateTop = newRect.top
         this.deviceList[index].coordinateLeft = newRect.left
+        this.guidelineXTop = newRect.top + newRect.height / 2
+        this.guidelineYLeft = newRect.left + newRect.width / 2
       },
 
       /**
@@ -492,6 +501,22 @@
       width: 100%;
       background-repeat: no-repeat;
       background-size: 100% 100%;
+      position: relative;
+
+      .guideline{
+        position: absolute;
+        border: 1px dashed #ccc;
+      }
+
+      .guidelineX {
+        width: 1920px;
+        left: 0;
+      }
+
+      .guidelineY {
+        top: 0;
+        height: 900px;
+      }
 
       .single-device {
         position: absolute;

--
Gitblit v1.9.3