YangJian0701 2 ani în urmă
părinte
comite
05a53251fa

BIN
public/favicon.ico


+ 6 - 2
src/plugins/calculateData.js

@@ -44,11 +44,15 @@ export function calculateFun(value) {
 	let arr = []
 	let arr1 = []
 	value.forEach(item => {
-		arr.push(item.T_name + item.T_id)
+		arr.push(item.T_sn + item.T_id)
 	})
+	console.log('==========================1',arr)
 	arr = [...new Set(arr)]
+	console.log('==========================2',arr)
 	arr.forEach(j=>{
-		const data = value.filter(item => item.T_name + item.T_id == j)
+		let data = value.filter(item => item.T_sn + item.T_id == j)
+		data = data.reverse()
+		// console.log('==========================3',data[0].T_name,data[data.length-1].T_name)
 		arr1.push({
 			sn:data[0].T_name,
 			id:data[0].T_id,

+ 1 - 1
src/views/dataDisplay/chartShow.vue

@@ -43,7 +43,7 @@
 										{{item.T_name}}
 									</div>
 									<div class="chartShow-B-nav2-tSn">
-										{{item.T_sn}}
+										{{item.T_sn}}[{{item.T_id}}]
 									</div>
 								</div>
 							</el-checkbox>

+ 4 - 3
src/views/workbench/workbench.vue

@@ -5,8 +5,9 @@
 		</div>
 		<div class="workbench1">
 			<div class="workbench1-R">
-				<div>
-					<el-avatar :size="100" :src="imgSrc"></el-avatar>
+				<div style="width: 70px;height: 70px;border-radius: 50%;overflow: hidden;background: #f9f9f9;padding: 10px;">
+					<img src="../../assets/img/logo3.png" style="width: 100%;height: 100%;">
+					<!-- <el-avatar :size="100" src=""></el-avatar> -->
 				</div>
 				<div style="font-family: Impact;font-size: 14px;color: #757475;margin: 10px 0 0px 0;display: flex;align-items: flex-end;">
 					<div style="font-weight: bold;">{{workList.T_name}}</div>
@@ -72,7 +73,7 @@
 				<div class="workbench1-L1">
 					<el-progress type="dashboard" :percentage="100" color="#FF5722" :format="format3"></el-progress>
 					<div class="workbench1-L1-txt">
-						剩余
+						剩余流量
 					</div>
 				</div>
 			</div>