From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test

---
 src/views/dashboard/Analysis.vue |   79 ++++++++++++++++++++++++++-------------
 1 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index e0df30b..edb65db 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <index-chart v-if="indexStyle==1"></index-chart>
+  <div class="page-container" style="width: 100%">
+    <!--<index-chart v-if="indexStyle==1"></index-chart>-->
     <!--<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">-->
@@ -11,9 +11,14 @@
     <!--&lt;!&ndash;<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>&ndash;&gt;-->
     <!--&lt;!&ndash;</a-radio-group>&ndash;&gt;-->
     <!--</div>-->
-    <a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"
-              @click="navigateToWorkshopSignage(item.workshopId)">{{item.workshopName}}
-    </a-button>
+    <!--<a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"-->
+    <!--@click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}-->
+    <!--</a-button>-->
+
+    <a-card v-for="item in workshopList" :key="item.workshopId"
+            @click="navigateToWorkshopSignage(item.id)" class="workshop-entrance">
+      {{item.workshopName}}
+    </a-card>
   </div>
 </template>
 
@@ -21,6 +26,7 @@
   import IndexChart from './IndexChart'
   import IndexTask from './IndexTask'
   import IndexBdc from './IndexBdc'
+  import api from '@/api/mdc'
 
   export default {
     name: 'Analysis',
@@ -32,34 +38,53 @@
     data() {
       return {
         indexStyle: 1,
-        workshopList: [
-          {
-            workshopName: '闀挎矙杞﹂棿',
-            workshopId: '5321'
-          },
-          {
-            workshopName: '澶╂触杞﹂棿',
-            workshopId: '6312'
-          },
-          {
-            workshopName: '姝︽眽杞﹂棿',
-            workshopId: '3463'
-          },
-          {
-            workshopName: '鍖椾含杞﹂棿',
-            workshopId: '8421'
-          }
-        ]
+        workshopList: []
       }
     },
     created() {
-
+      this.getWorkshopListByApi()
     },
     methods: {
-      navigateToWorkshopSignage(workshopId) {
-        const url = this.$router.resolve(`/workshopSignage/${workshopId}`).href
+      /**
+       * 閫氳繃杞﹂棿Id璺宠浆鑷崇浉搴旇溅闂村ぇ灞忕湅鏉�
+       * @param id 杞﹂棿Id
+       */
+      navigateToWorkshopSignage(id) {
+        const url = this.$router.resolve(`/workshopSignage/${id}`).href
         window.open(url, '_blank')
+      },
+      /**
+       * 鑾峰彇杞﹂棿鍒楄〃
+       */
+      getWorkshopListByApi() {
+        api.getWorkshopListInHomePageApi().then(res => {
+          console.log('res', res)
+          if (res.result && res.result.length > 0) {
+            this.workshopList = res.result
+          }
+        })
       }
     }
   }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="less" scoped>
+  .page-container {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+
+    .workshop-entrance {
+      font-size: 30px;
+      background-color: #fff;
+      width: 300px;
+      height: 140px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 30px 38px;
+      cursor: pointer;
+      border-radius: 20px;
+    }
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3