From 575a75a0519e53ceec6bb5d31f682124596c3bae Mon Sep 17 00:00:00 2001 From: zenglf <18502938215@163.com> Date: 星期二, 24 十月 2023 10:57:34 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop --- src/views/dashboard/Analysis.vue | 64 +++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 14 deletions(-) diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 949a625..505d8a7 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -4,24 +4,27 @@ <!--<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">--> - <!--璇烽�夋嫨棣栭〉鏍峰紡锛�--> - <!--<!–<a-radio-group v-model="indexStyle">–>--> - <!--<!–<a-radio :value="1">缁熻鍥捐〃</a-radio>–>--> - <!--<!–<a-radio :value="2">缁熻鍥捐〃2</a-radio>–>--> - <!--<!–<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>–>--> - <!--<!–</a-radio-group>–>--> + <!--璇烽�夋嫨棣栭〉鏍峰紡锛�--> + <!--<!–<a-radio-group v-model="indexStyle">–>--> + <!--<!–<a-radio :value="1">缁熻鍥捐〃</a-radio>–>--> + <!--<!–<a-radio :value="2">缁熻鍥捐〃2</a-radio>–>--> + <!--<!–<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>–>--> + <!--<!–</a-radio-group>–>--> <!--</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.id)">{{item.workshopName}} + </a-button> </div> </template> <script> import IndexChart from './IndexChart' - import IndexTask from "./IndexTask" + import IndexTask from './IndexTask' import IndexBdc from './IndexBdc' + import api from '@/api/mdc' export default { - name: "Analysis", + name: 'Analysis', components: { IndexChart, IndexTask, @@ -29,16 +32,49 @@ }, data() { return { - indexStyle:1 + indexStyle: 1, + workshopList: [ + { + workshopName: '闀挎矙杞﹂棿', + id: '5321' + }, + { + workshopName: '澶╂触杞﹂棿', + id: '6312' + }, + { + workshopName: '姝︽眽杞﹂棿', + id: '3463' + }, + { + workshopName: '鍖椾含杞﹂棿', + id: '8421' + } + ] } }, created() { - + this.getWorkshopListByApi() }, methods: { - navigateToTestWorkshop(){ - const url=this.$router.resolve('/testWorkshop').href - window.open(url,'_blank') + /** + * 閫氳繃杞﹂棿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 + } + }) } } } -- Gitblit v1.9.3