From b70dab217e5ebcab6d98196cc2d4b2ffb842c3a1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期日, 08 十月 2023 17:33:34 +0800
Subject: [PATCH] 1、优化车间看板四色灯状态展示以及限制拖拽区域 2、部分页面右侧区域元素位置离顶过高，调整布局 3、增加设备日志页面增加点击表格行数据展示当前行工作曲线功能 4、优化设备日志页面切换时间，工作曲线弹窗中的时间随之切换 5、优化设备日志页面加载后首次点击工作曲线后无法查询到数据问题（同时发送异步请求，先后顺序影响）

---
 src/views/dashboard/Analysis.vue |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 949a625..e0df30b 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -4,24 +4,26 @@
     <!--<index-bdc v-if="indexStyle==2"></index-bdc>-->
     <!--<index-task v-if="indexStyle==3"></index-task>-->
     <!--<div style="width: 100%;text-align: right;margin-top: 20px">-->
-      <!--璇烽�夋嫨棣栭〉鏍峰紡锛�-->
-      <!--&lt;!&ndash;<a-radio-group v-model="indexStyle">&ndash;&gt;-->
-        <!--&lt;!&ndash;<a-radio :value="1">缁熻鍥捐〃</a-radio>&ndash;&gt;-->
-        <!--&lt;!&ndash;<a-radio :value="2">缁熻鍥捐〃2</a-radio>&ndash;&gt;-->
-        <!--&lt;!&ndash;<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>&ndash;&gt;-->
-      <!--&lt;!&ndash;</a-radio-group>&ndash;&gt;-->
+    <!--璇烽�夋嫨棣栭〉鏍峰紡锛�-->
+    <!--&lt;!&ndash;<a-radio-group v-model="indexStyle">&ndash;&gt;-->
+    <!--&lt;!&ndash;<a-radio :value="1">缁熻鍥捐〃</a-radio>&ndash;&gt;-->
+    <!--&lt;!&ndash;<a-radio :value="2">缁熻鍥捐〃2</a-radio>&ndash;&gt;-->
+    <!--&lt;!&ndash;<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>&ndash;&gt;-->
+    <!--&lt;!&ndash;</a-radio-group>&ndash;&gt;-->
     <!--</div>-->
-    <a-button type="primary" @click="navigateToTestWorkshop">璺宠浆鑷虫祴璇曡溅闂�</a-button>
+    <a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"
+              @click="navigateToWorkshopSignage(item.workshopId)">{{item.workshopName}}
+    </a-button>
   </div>
 </template>
 
 <script>
   import IndexChart from './IndexChart'
-  import IndexTask from "./IndexTask"
+  import IndexTask from './IndexTask'
   import IndexBdc from './IndexBdc'
 
   export default {
-    name: "Analysis",
+    name: 'Analysis',
     components: {
       IndexChart,
       IndexTask,
@@ -29,16 +31,34 @@
     },
     data() {
       return {
-        indexStyle:1
+        indexStyle: 1,
+        workshopList: [
+          {
+            workshopName: '闀挎矙杞﹂棿',
+            workshopId: '5321'
+          },
+          {
+            workshopName: '澶╂触杞﹂棿',
+            workshopId: '6312'
+          },
+          {
+            workshopName: '姝︽眽杞﹂棿',
+            workshopId: '3463'
+          },
+          {
+            workshopName: '鍖椾含杞﹂棿',
+            workshopId: '8421'
+          }
+        ]
       }
     },
     created() {
 
     },
     methods: {
-      navigateToTestWorkshop(){
-        const url=this.$router.resolve('/testWorkshop').href
-        window.open(url,'_blank')
+      navigateToWorkshopSignage(workshopId) {
+        const url = this.$router.resolve(`/workshopSignage/${workshopId}`).href
+        window.open(url, '_blank')
       }
     }
   }

--
Gitblit v1.9.3