From 8835c9e1dec836d6d8159e78b9df12ad6402ad98 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 十一月 2024 10:03:24 +0800
Subject: [PATCH] 修复bug 整合代码
---
Source/plt-web/plt-web-ui/src/views/wel/index.vue | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/index.vue b/Source/plt-web/plt-web-ui/src/views/wel/index.vue
index f40d866..6624c8d 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/index.vue
@@ -3,21 +3,13 @@
<el-row>
<el-col :span="24">
<basic-container v-loading="loading">
- <!-- <div style="display: flex">-->
- <!-- <div style="height: 80px; width: 50px; overflow: hidden;margin-right: 20px">-->
- <!-- <img src="../../../public/img/mainTop.png" style="height: 100%; width: 100%; object-fit: contain;" />-->
- <!-- </div>-->
- <!-- <avue-text-ellipsis :text="text" :height="80" :width="1600" use-tooltip placement="top">-->
- <!-- <small slot="more">...</small>-->
- <!-- </avue-text-ellipsis>-->
- <!-- </div>-->
<avue-data-tabs :option="topOption"></avue-data-tabs>
</basic-container>
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
- <basic-container style="height: 560px">
+ <el-col :span="16" style="height: 560px">
+ <basic-container>
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item name="1" title="娆㈣繋浣跨敤PLT-WEB骞冲彴">
<div>
@@ -49,11 +41,10 @@
</el-collapse>
</basic-container>
</el-col>
- <el-col :span="8">
+ <el-col :span="8" style="height: 560px">
<el-row>
<basic-container>
<div class="el-font-size">
-
<span>浜у搧鍚嶇О</span>
<el-divider direction="vertical"/>
<span><el-tag>PLT-WEB骞冲彴</el-tag></span>
@@ -73,7 +64,9 @@
</div>
</basic-container>
<basic-container>
- <v-chart id="chart" :auto-resize="true" :options="chartOptions"></v-chart>
+ <div style="height: 309px">
+ <v-chart id="chart" :auto-resize="true" :options="chartOptions"></v-chart>
+ </div>
</basic-container>
</el-row>
@@ -95,7 +88,6 @@
data() {
return {
loading: false,
- text: '鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃锛堜互涓嬬畝绉扳�滃畯鍗氳繙杈锯�濓級闀挎湡涓撴敞浜庡埗閫犱笟淇℃伅鍖栧缓璁撅紝涓哄鎴锋彁渚涗紒涓氫俊鎭寲鏁翠綋瑙ｅ喅鏂规鍙婄浉鍏宠蒋浠剁爺鍙戙�佸挩璇㈠強瀹炴柦鏈嶅姟銆傚畯鍗氳繙杈惧鎴风兢浣撴兜鐩栬埅绌恒�佽埅澶┿�佽埞鑸躲�佸叺鍣ㄣ�佹苯杞︺�侀�氱敤鏈烘銆佺數瀛愮瓑鍒堕�犺涓氾紝閫氳繃涓庡鎴锋繁搴﹀悎浣滐紝鎵挎媴浜嗗椤瑰浗瀹剁骇杞欢鐮斿彂涓庢妧鏈湇鍔￠」鐩紝鎷ユ湁澶氶」鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勮蒋浠朵骇鍝併�備负浜嗙粰瀹㈡埛鎻愪緵鏇村鐨勬妧鏈垱鏂拌兘鍔涘強鐩稿簲鐨勪紒涓氱骇绠＄悊鏀拺骞冲彴锛屽畯鍗氳繙杈剧爺鍙戜簡鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勪紒涓氱骇淇℃伅鍖栨暣浣撹В鍐虫柟妗堬紝鍚屾椂閽堝瀹㈡埛鐨勭壒瀹氶渶姹傦紝鎻愪緵浜嗛珮搴﹀彲瀹氬埗鐨勪笓涓氬簲鐢ㄣ�備负浜嗚繘涓�姝ユ彁鍗囨妧鏈湇鍔¤兘鍔涳紝瀹忓崥杩滆揪鎶曞叆涓撻棬鍔涢噺鍦ㄥ墠娌挎妧鏈柟闈㈣繘琛屾帰绱紝鍦ㄤ紒涓氱鏈変簯璁＄畻鍜屽ぇ鏁版嵁绛夐鍩熶笉鏂彇寰楃獊鐮淬�傞殢鐫�鏂颁竴浠ｄ笟鍔′笌绠＄悊鎶�鏈钩鍙扮殑鎺ㄥ嚭锛屾洿澧炲己浜嗗叕鍙镐负瀹㈡埛鎻愪緵楂樿川閲忋�佸叏鏂逛綅銆佹繁灞傛鏈嶅姟鐨勬妧鏈兘鍔涖�傚畯鍗氳繙杈句竴鐩寸鎵库�滅敤鏅烘収涓哄鎴峰垱閫犱环鍊尖�濈殑瀹楁棬锛屾効浠モ�滆瘹淇¤礋璐ｂ�濈殑鎬佸害鍜屼笓涓氬寲鐨勬湇鍔★紝鍦ㄤ紒涓氫俊鎭寲鍙戝睍鐨勯亾璺笂锛屼笌瀹㈡埛涓�璧锋垚闀匡紝鍏卞悓瑙佽瘉鎴愬姛锛�',
activeNames: ['1', '2', '3', '5'],
logActiveNames: ['28'],
topOption: {
@@ -123,7 +115,7 @@
borderRadius: 10,
normal: {
color: function (colors) {
- var colorList = ['rgb(230, 71, 88)', 'rgb(178, 159, 255)','rgb(27, 201, 142)'];
+ const colorList = ['rgb(230, 71, 88)', 'rgb(178, 159, 255)', 'rgb(27, 201, 142)'];
return colorList[colors.dataIndex];
}
}
@@ -230,5 +222,10 @@
.avue-text-ellipsis__text {
font-size: 14px !important;
}
+
+#chart {
+ width: 100%;
+ height: 309px;
+}
</style>
--
Gitblit v1.9.3