From 080ff408e2b954fd1d1f812e51a49c0fc0e42f32 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期二, 15 四月 2025 14:13:08 +0800
Subject: [PATCH] change
---
src/views/left/KGSim.vue | 5 +-
src/views/left/Left.vue | 6 ++-
src/views/left/CitySim.vue | 7 +--
src/views/left/Simulation.vue | 77 +++++++++++++++++++++-----------------
4 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/src/views/left/CitySim.vue b/src/views/left/CitySim.vue
index 180010b..411ea44 100644
--- a/src/views/left/CitySim.vue
+++ b/src/views/left/CitySim.vue
@@ -1,6 +1,6 @@
<template>
<div style="width: 100%; height: 100%">
- <div class="left-top" v-if="disForm == '琛屾斂鍖哄垝浠跨湡'">
+ <div class="left-top" v-if="disForm == '琛屾斂鍖哄垝浠跨湡'" style="margin-top: 0px;">
琛屾斂鍖哄垝浠跨湡锛�30m绮惧害锛�
</div>
<div class="left-top" v-if="disForm == '閲嶇偣鍖哄煙浠跨湡'">
@@ -38,10 +38,7 @@
/>
</el-select>
</el-form-item>
-
-
-
- <el-form-item label="閲嶇偣鍖哄煙" v-if="disForm == '閲嶇偣鍖哄煙浠跨湡'">
+ <el-form-item label="閲嶇偣鍖哄煙:" v-if="disForm == '閲嶇偣鍖哄煙浠跨湡'">
<el-select
v-model="forms.eares"
placeholder="Select"
diff --git a/src/views/left/KGSim.vue b/src/views/left/KGSim.vue
index 5fe0074..8f419a6 100644
--- a/src/views/left/KGSim.vue
+++ b/src/views/left/KGSim.vue
@@ -38,10 +38,10 @@
<HistorySimulation :selectedArea="selectedArea" />
</div>
<div v-if="selectedSimulation === '瀹炴椂妯℃嫙'">
- <RealTimeSimulation :selectedArea="selectedArea" />
+ <!-- <RealTimeSimulation :selectedArea="selectedArea" /> -->
</div>
<div v-if="selectedSimulation === '棰勬祴妯℃嫙'">
- <PredictiveSimulation :selectedArea="selectedArea" />
+ <!-- <PredictiveSimulation :selectedArea="selectedArea" /> -->
</div>
</div>
</div>
@@ -91,6 +91,7 @@
<style scoped>
.simulation-module {
color: #61f7d4;
+ font-size: 14px;
}
.simulation-area {
diff --git a/src/views/left/Left.vue b/src/views/left/Left.vue
index dc6ec0f..4ff6a2f 100644
--- a/src/views/left/Left.vue
+++ b/src/views/left/Left.vue
@@ -35,7 +35,7 @@
</div>
</div>
<div class="left" v-show="showAddIns">
- <simulation @start="start" @end="end"/>
+ <simulation @start="start" @end="end" @back="handleBack" />
</div>
</template>
@@ -306,7 +306,9 @@
// currentMock.value = mock.name;
showAddIns.value = true;
}
-
+function handleBack(value) {
+ showAddIns.value = false; // 闅愯棌瀛愮粍浠�
+}
function initDevicePoint() {
list.forEach((item) => {
item.id = item.id + item.alias;
diff --git a/src/views/left/Simulation.vue b/src/views/left/Simulation.vue
index d3238f9..e6df209 100644
--- a/src/views/left/Simulation.vue
+++ b/src/views/left/Simulation.vue
@@ -1,24 +1,27 @@
<template>
- <el-tabs
- style="height: 100%"
- v-model="activeName"
- type="card"
- class="demo-tabs"
- @tab-click="handleClick"
- >
- <el-tab-pane label="琛屾斂鍖哄垝浠跨湡" name="first"
- ><city-sim :clickValue="clickValue" />
- <!-- ><city-sim :clickValue="clickValue" @start="start" @end="end"/> -->
- </el-tab-pane>
- <el-tab-pane label="閲嶇偣鍖哄煙浠跨湡" name="second">
- <city-sim :clickValue="clickValue" />
- <!-- <city-sim :clickValue="clickValue" @start="start" @end="end"/> -->
- </el-tab-pane>
- <el-tab-pane label="閲嶇偣娌熶豢鐪�" name="third">
- <!-- <kg-sim :clickValue="clickValue" @start="start" @end="end" /> -->
- <kg-sim :clickValue="clickValue" />
- </el-tab-pane>
- </el-tabs>
+ <div style="height: 100%">
+ <div class="left-top" style="margin-bottom: 20px;">
+ <span>鏂板缓浠跨湡鏂规</span>
+ <span class="clickable-text" @click="goBack">杩斿洖鍒楄〃</span>
+ </div>
+ <el-tabs
+ style="height: calc(100% - 40px);"
+ v-model="activeName"
+ type="card"
+ class="demo-tabs"
+ @tab-click="handleClick"
+ >
+ <el-tab-pane label="琛屾斂鍖哄垝浠跨湡" name="first">
+ <city-sim :clickValue="clickValue" />
+ </el-tab-pane>
+ <el-tab-pane label="閲嶇偣鍖哄煙浠跨湡" name="second">
+ <city-sim :clickValue="clickValue" />
+ </el-tab-pane>
+ <el-tab-pane label="閲嶇偣娌熶豢鐪�" name="third">
+ <kg-sim :clickValue="clickValue" />
+ </el-tab-pane>
+ </el-tabs>
+ </div>
</template>
<script setup>
@@ -26,23 +29,25 @@
import citySim from "./CitySim.vue";
import kgSim from "./KGSim.vue";
+// 瀹氫箟杩斿洖浜嬩欢
+const emits = defineEmits(["back"]);
+
+// 褰撳墠婵�娲荤殑鏍囩椤�
const activeName = ref("first");
+// 鐐瑰嚮鍊�
const clickValue = ref("");
+// 鏍囩鐐瑰嚮浜嬩欢
const handleClick = (tab) => {
clickValue.value = tab.props.label;
console.log(clickValue.value);
};
-// const emits = defineEmits(["start", "end"]);
-// function start() {
-// emits("start");
-// console.log("寮�濮嬫ā鎷�");
-// }
-// function end() {
-// emits("end");
-// }
+// 杩斿洖涓婁竴绾�
+const goBack = () => {
+ emits("back", clickValue.value);
+};
</script>
<style lang="less" scoped>
@@ -53,19 +58,23 @@
font-weight: 600;
height: 100%;
}
+/deep/.el-tabs__header{
+ margin: 0px !important;
+}
/deep/ .el-tabs__item.is-active,
/deep/ .el-tabs__item:hover {
color: #fff;
}
+
/deep/ .el-tabs__item {
padding: 0 18px;
color: #fff;
background-color: #009688;
}
-// /deep/ .el-tabs__content {
-// background-color: #fff;
-// }
-.el-tab-pane {
- height: 100%;
+.clickable-text {
+ margin-left: 85px;
+ cursor: pointer;
+ font-size: 14px;
+ color: #61f7d4;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3