解决冲突
This commit is contained in:
parent
283fa6499b
commit
f3ece74885
|
|
@ -3,11 +3,6 @@
|
||||||
<img src="@/assets/images/head/peiluoxi2.png" alt="" class="head" />
|
<img src="@/assets/images/head/peiluoxi2.png" alt="" class="head" />
|
||||||
<div class="key-node-recognition">
|
<div class="key-node-recognition">
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<<<<<<< HEAD
|
|
||||||
<img src="@/assets/images/peiluoxi.png" class="graph-img-title" alt="" />
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 3bb5c3667c0a8e558c40777a75dd5bbfdcbf56a0
|
|
||||||
<div class="chart-container">
|
<div class="chart-container">
|
||||||
<DynamicGraph
|
<DynamicGraph
|
||||||
ref="leaderGraphRef"
|
ref="leaderGraphRef"
|
||||||
|
|
@ -177,11 +172,6 @@ defineExpose({ highlightNode })
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
<<<<<<< HEAD
|
|
||||||
padding: 0px 20px;
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> 3bb5c3667c0a8e558c40777a75dd5bbfdcbf56a0
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
.graph-img-title {
|
.graph-img-title {
|
||||||
display: absolute;
|
display: absolute;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user