From c2e36c45578e63ad17c5e258c92d62d9ae03dadb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 30 五月 2025 11:55:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue
---
src/views/sourcetrace/SourceTrace.vue | 209 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 193 insertions(+), 16 deletions(-)
diff --git a/src/views/sourcetrace/SourceTrace.vue b/src/views/sourcetrace/SourceTrace.vue
index b4a2a63..86de084 100644
--- a/src/views/sourcetrace/SourceTrace.vue
+++ b/src/views/sourcetrace/SourceTrace.vue
@@ -1,21 +1,78 @@
<template>
- <BaseCard>
- <template #content>
- <div>
+ <el-row>
+ <el-col v-show="show" span="10">
+ <BaseCard>
+ <template #content>
+ <!-- <div>
<el-input type="text" v-model="inputVal" />
<button @click="handleSend">send</button>
<button @click="handleLink">link</button>
- </div>
- <div>涓氬姟鐘舵�佷腑鎺�</div>
- <el-scrollbar ref="scrollbarRef" :height="height">
- <div ref="scrollContentRef">
- <div v-for="(item, index) in streams" :key="index">
- <el-text type="primary">[{{ item }}]: </el-text>
- </div>
- </div>
- </el-scrollbar>
- </template>
- </BaseCard>
+ </div> -->
+ <div>鍔ㄦ�佹函婧�</div>
+ <el-scrollbar ref="scrollbarRef" :height="height" class="scrollbar">
+ <div ref="scrollContentRef">
+ <div v-for="(item, index) in streams" :key="index">
+ <!-- <el-text type="primary">{{ item.guid }}</el-text> -->
+ <el-space gap="4">
+ <el-tag :type="item.status == 1 ? 'danger' : 'info'">{{
+ item._statusStr
+ }}</el-tag>
+ <el-text type="default">{{ item.exception }}</el-text>
+ </el-space>
+ <el-row gap="4">
+ <el-text type="primary">鍙戠敓鏃堕棿锛�</el-text>
+ <el-text type="primary">{{
+ item.startTime + ' 鑷� '
+ }}</el-text>
+ <el-text type="primary">{{
+ item.status == 1 ? '褰撳墠' : item.endTime
+ }}</el-text>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-statistic title="鍥犲瓙" :value="item.factorName" />
+ </el-col>
+ <el-col :span="6">
+ <el-statistic title="鍧囧��" :value="item.avg" />
+ </el-col>
+ <el-col :span="6">
+ <el-statistic title="宄板��" :value="item.max" />
+ </el-col>
+ <el-col :span="6">
+ <el-statistic title="璋峰��" :value="item.min" />
+ </el-col>
+ </el-row>
+ <el-row justify="space-between">
+ <el-link
+ type="primary"
+ @click="item.showMore = !item.showMore"
+ >
+ {{
+ (item.showMore ? '鏀惰捣婧簮鍦烘櫙' : '鏌ョ湅婧簮鍦烘櫙') +
+ '锛�' +
+ item.relatedSceneList.length +
+ '锛�'
+ }}
+ </el-link>
+ <el-link type="primary" @click="drawSector(item)">
+ 鏌ョ湅寮傚父
+ </el-link>
+ </el-row>
+ <SceneTable
+ v-show="item.showMore"
+ :scene-list="item.relatedSceneList"
+ ></SceneTable>
+ <el-divider />
+ </div>
+ </div>
+ </el-scrollbar>
+ </template>
+ </BaseCard>
+ </el-col>
+ <el-col span="2">
+ <CardButton name="鍔ㄦ�佹函婧�" @click="() => (show = !show)"></CardButton>
+ </el-col>
+ </el-row>
</template>
<script setup>
/**
@@ -24,9 +81,21 @@
*/
import { reactive, ref, onMounted, onUnmounted, inject } from 'vue';
import websocket from '@/api/websocket';
+import sector from '@/utils/map/sector';
+import mapUtil from '@/utils/map/util';
+import { sceneTypes, sceneIcon } from '@/constant/scene-types';
+import marks from '@/utils/map/marks';
+import { FactorDatas } from '@/model/FactorDatas';
+
+const props = defineProps({
+ factorType: String
+});
+
+const emits = defineEmits(['update:factorType']);
const height = `60vh`;
+const show = ref(false);
const scrollContentRef = ref();
const scrollbarRef = ref();
@@ -34,6 +103,12 @@
const h1 = scrollContentRef.value.clientHeight + 100;
setTimeout(() => {
scrollbarRef.value.setScrollTop(h1);
+ }, 100);
+}
+
+function scrollToTop() {
+ setTimeout(() => {
+ scrollbarRef.value.setScrollTop(0);
}, 100);
}
@@ -50,14 +125,116 @@
*/
const putWorkStream = (data) => {
const obj = JSON.parse(data);
- streams.push(obj);
- scrollToBottom();
+ console.log('sourcetrace: ', obj);
+
+ obj._statusStr = exceptionStatus(obj.status);
+
+ if (streams.length == 0) {
+ streams.push(obj);
+ } else {
+ const index = streams.findIndex((v) => {
+ return v.guid == obj.guid;
+ });
+ if (index != -1) {
+ const old = streams[index];
+ obj.showMore = old.showMore;
+ old.relatedSceneList.forEach((s) => {
+ const index = obj.relatedSceneList.findIndex((v) => {
+ return v.guid == s.guid;
+ });
+ if (index == -1) {
+ obj.relatedSceneList.push(s);
+ }
+ });
+ streams.splice(index, 1, obj);
+ } else {
+ streams.unshift(obj);
+ }
+
+ show.value = true;
+ }
+
+ // scrollToBottom();
+ scrollToTop();
+
+ const excObj = streams.find((v) => {
+ return v.factorId + '' == props.factorType;
+ });
+ if (excObj) {
+ drawSector(excObj);
+ }
};
+
+function exceptionStatus(value) {
+ switch (value) {
+ case 1:
+ return '寮傚父鍙戠敓涓�';
+ case 2:
+ return '寮傚父宸茬粨鏉�';
+ default:
+ return '寮傚父宸茬粨鏉�';
+ }
+}
+
+let lastDrawObjGuid;
+function drawSector(exceptionObj) {
+ emits('update:factorType', exceptionObj.factorId + '');
+ setTimeout(() => {
+ if (exceptionObj.guid != lastDrawObjGuid) {
+ sector.clearSectorPt();
+ lastDrawObjGuid = exceptionObj.guid;
+ }
+ // 1. 缁樺埗鏂版墖褰㈠尯鍩�
+ const datavo = exceptionObj.midData;
+ const factorDatas = new FactorDatas();
+ factorDatas.setData([datavo], 0, () => {
+ const pr = sector.drawSectorPt(factorDatas, 0);
+ // 璋冩暣瑙嗚灞呬腑鏄剧ず
+ // mapUtil.setCenter(pr.p);
+ drawMarks(exceptionObj.relatedSceneList);
+ });
+ }, 1000);
+}
+
+let layer = undefined;
+function drawMarks(sceneList) {
+ if (layer != undefined) {
+ mapUtil.removeViews(layer);
+ // layer = undefined;
+ }
+ if (sceneList.length != 0) {
+ const icons = [];
+ sceneList.forEach((s) => {
+ icons.push(sceneIcon(s.typeId));
+ });
+ layer = marks.createLabelMarks(icons, sceneList, true);
+ }
+}
onMounted(() => {
websocket.registerReceiveEvent(putWorkStream);
});
onUnmounted(() => {
websocket.removeReceiveEvent(putWorkStream);
+ sector.clearSectorPt();
+ mapUtil.clearMap();
+ // if (layer != undefined) {
+ // mapUtil.removeViews(layer);
+ // layer = undefined;
+ // }
});
</script>
+<style scoped>
+:deep(.el-statistic) {
+ --el-statistic-title-color: rgb(215, 215, 215);
+ --el-statistic-content-color: white;
+}
+
+:deep(.el-text) {
+ --el-text-color: white;
+}
+
+.scrollbar {
+ min-width: 300px;
+}
+</style>
--
Gitblit v1.9.3