Commit 8457349d authored by xinzhedeai's avatar xinzhedeai

fix:merge

parent 53eac05d
...@@ -452,4 +452,4 @@ body { ...@@ -452,4 +452,4 @@ body {
color: #0ea5e9; color: #0ea5e9;
font-size: 0.24rem; /* 标签字体24px */ font-size: 0.24rem; /* 标签字体24px */
font-weight: bold; font-weight: bold;
} }
\ No newline at end of file
...@@ -439,9 +439,6 @@ ...@@ -439,9 +439,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 隐患详情底部栏 --> <!-- 隐患详情底部栏 -->
<div class="bottom_bar" v-if="flag=='3' && ['admin', 'common', 'industry', 'street', 'wgy'].includes(userType)"> <div class="bottom_bar" v-if="flag=='3' && ['admin', 'common', 'industry', 'street', 'wgy'].includes(userType)">
<div> <div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment