From 03cec15c5f30cb7eda1e76bbf4183ad9c89e4f83 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 05 九月 2025 15:39:54 +0800 Subject: [PATCH] 1、设备TEEP页面删除滚动加载功能 2、mdc首页工段级看板调整样式及功能 --- src/views/dashboard/BranchFactorySignage.vue | 61 +++++++++++++++--------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue index e10f398..d9d099f 100644 --- a/src/views/dashboard/BranchFactorySignage.vue +++ b/src/views/dashboard/BranchFactorySignage.vue @@ -158,7 +158,7 @@ this.getEfficiencyDataByApi() this.getTechConditionAndWarrantyMalfunctionDataByApi() this.getMonthMaintenanceNumByApi() - this.getTwoMaintenanceChartDataByApi() + this.getSecondMaintenanceChartDataByApi() this.getBarChartDataByApi() this.getDoubleBarChartDataByApi() this.getWorkshopProblemChartDataByApi() @@ -226,21 +226,21 @@ technologyStatus: 'QUALIFIED' }, { - value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0, - name: '绂佺敤', - technologyStatus: 'PROHIBITED' - }, - { value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0, name: '闄愮敤', technologyStatus: 'RESTRICTED' + }, + { + value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0, + name: '绂佺敤', + technologyStatus: 'PROHIBITED' } ] this.warrantyMalfunctionData = [ { - value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0, - name: '鎶ヤ慨', - code: 'bx' + value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0, + name: '杩愯', + code: 'run' }, { value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0, @@ -248,9 +248,9 @@ code: 'stop' }, { - value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0, - name: '杩愯', - code: 'run' + value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0, + name: '鎶ヤ慨', + code: 'bx' } ] this.techConditionChartRequireFinished = true @@ -275,8 +275,8 @@ }, /* 璋冪敤鎺ュ彛鑾峰彇浜屼繚璁″垝 */ - getTwoMaintenanceChartDataByApi() { - signageApi.getTwoMaintenancePlanListApi(this.productionCode) + getSecondMaintenanceChartDataByApi() { + signageApi.getSecondMaintenancePlanListApi(this.productionCode) .then(res => { if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.factoryName, item.monthPlan, '浜岀骇淇濆吇']) this.drawMaintenanceChart() @@ -359,10 +359,9 @@ itemGap: 15, textStyle: { color: 'rgba(0,0,0,.45)', - fontSize: 14, - padding: [0, 0, 0, 0] + fontSize: 14 }, - data: ['鍏虫満', '鎶ヨ', '寰呮満', '杩愯'] + data: ['杩愯', '寰呮満', '鎶ヨ', '鍏虫満'] }, grid: { containLabel: true @@ -630,7 +629,6 @@ top: 25, orient: 'vertical', right: 0, - // bottom: "0", itemWidth: 14, itemHeight: 14, icon: 'roundRect', @@ -640,7 +638,7 @@ fontSize: 14, padding: [0, 0, 0, 0] }, - data: ['鍚堟牸', '绂佺敤', '闄愮敤'] + data: ['鍚堟牸', '闄愮敤', '绂佺敤'] }, grid: { containLabel: true @@ -954,10 +952,20 @@ const option = { color: ['#1890FF', '#2EC35C'], tooltip: { - confine: true, + trigger: 'axis', + axisPointer: { + type: 'shadow' + }, formatter: function(params) { - return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' + - '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + params.seriesName + ' : ' + params.value + '%' + let result = '' + params.forEach((item, index) => { + let dom = `<span style="display:inline-block;width:10px;height:10px;border-radius:100px;margin-right:5px;background:${item.color}"></span>${item.seriesName}锛�${item.value}%` + if (index === 0) { + result = `<span style="font-weight:bolder;">${item.name}</span>` + } + result += '<br />' + dom + }) + return result } }, grid: { @@ -1171,15 +1179,6 @@ <style lang="less" scoped> .page-container { - .page-title { - display: flex; - justify-content: space-evenly; - flex-wrap: wrap; - color: #fff; - margin-bottom: 10px; - - } - .content-container { padding-top: 5px; display: flex; -- Gitblit v1.9.3