Skip to content

G
gassafety
Commit 62fa8301 authored by yaqizhang's avatar yaqizhang
Browse files
Options

样式优化

parent ea44c4d2
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 47 deletions
gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue
View file @ 62fa8301
...@@ -12,16 +12,16 @@ ...@@ -12,16 +12,16 @@
<div class="eq-content display-default"> <div class="eq-content display-default">
<div class="text-wrapper"> <div class="text-wrapper">
<div class="eq-text"> <div class="eq-text">
设备类型：<span>{{ title }}</span> 设备类型：<span>{{ title ? title : "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
设备型号：<span>{{ data.deviceModel }}</span> 设备型号：<span>{{ data.deviceModel ? data.deviceModel : "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
所属管道：<span>{{ data.pipeName }}</span> 所属管道：<span>{{ data.pipeName ? data.pipeName : "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
物联网编号：<span>{{ data.iotNo }}</span> 物联网编号：<span>{{ data.iotNo ? data.iotNo : "-" }}</span>
</div> </div>
</div> </div>
<div class="pic"> <div class="pic">
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
<div> <div>
<span>设备所在地址：</span> <span>设备所在地址：</span>
<span>{{ data.pipeAddr }}</span> <span>{{ data.pipeAddr ? data.pipeAddr : "-"}}</span>
</div> </div>
<div> <div>
<span>备注信息：</span> <span>备注信息：</span>
<span>{{ data.remarks }} </span> <span>{{ data.remarks ? data.remarks : "-"}} </span>
</div> </div>
</div> </div>
</div> </div>
...@@ -71,42 +71,42 @@ ...@@ -71,42 +71,42 @@
"> ">
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
标况累积量：<span class="standardConditionAccumulation"></span> 标况累积量：<span class="standardConditionAccumulation">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
工况累积量：<span class="workingConditionAccumulation"></span> 工况累积量：<span class="workingConditionAccumulation">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
剩余量：<span class="residualQuantity"></span> 剩余量：<span class="residualQuantity">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
标况流量：<span class="standardConditionFlow"></span> 标况流量：<span class="standardConditionFlow">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
工况流量：<span class="workingConditionFlow"></span> 工况流量：<span class="workingConditionFlow">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
温度：<span class="temperature"></span> 温度：<span class="temperature">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
压力：<span class="pressure"></span> 压力：<span class="pressure">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="15">
<div class="windowwarn"> <div class="windowwarn">
上报时间：<span class="reportTime"></span> 上报时间：<span class="reportTime">-</span>
</div> </div>
</el-col> </el-col>
</div> </div>
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
"> ">
<el-col :span="24"> <el-col :span="24">
<div class="windowwarn"> <div class="windowwarn">
压力：<span class="pressure"></span> 压力：<span class="pressure">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="windowwarn"> <div class="windowwarn">
上报时间：<span class="reportTime"></span> 上报时间：<span class="reportTime">-</span>
</div> </div>
</el-col> </el-col>
</div> </div>
......
gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
View file @ 62fa8301
...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
<div class="eq-content display-default"> <div class="eq-content display-default">
<div class="text-wrapper"> <div class="text-wrapper">
<div class="eq-text"> <div class="eq-text">
设备类型：<span>{{ title }}</span> 设备类型：<span>{{ title ? title: "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
设备型号：<span>{{ data.deviceModel }}</span> 设备型号：<span>{{ data.deviceModel ? data.deviceModel : "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
所属管道：<span>{{ data.pipeName }}</span> 所属管道：<span>{{ data.pipeName ? data.pipeName : "-" }}</span>
</div> </div>
<div class="eq-text"> <div class="eq-text">
物联网编号：<span>{{ data.iotNo }}</span> 物联网编号：<span>{{ data.iotNo ? data.iotNo : "-" }}</span>
</div> </div>
</div> </div>
<div class="pic"> <div class="pic">
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
<div> <div>
<span>设备所在地址：</span> <span>设备所在地址：</span>
<span>{{ data.pipeAddr }}</span> <span>{{ data.pipeAddr ? data.pipeAddr : "-" }}</span>
</div> </div>
<div> <div>
<span>备注信息：</span> <span>备注信息：</span>
<span>{{ data.remarks }} </span> <span>{{ data.remarks ? data.remarks : "-" }} </span>
</div> </div>
</div> </div>
</div> </div>
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
<div class="warn-wrapper" v-if="true"> <div class="warn-wrapper" v-if="true">
<div class="warn-content"> <div class="warn-content">
<div> <div>
报警状态：<span>报警({{ data.alarmType }})</span> 报警状态：<span>报警({{ data.alarmType ? data.alarmType : "-" }})</span>
</div> </div>
<div> <div>
详细信息：<span>{{ data.alarmValue ? data.alarmValue : "-" }}</span> 详细信息：<span>{{ data.alarmValue ? data.alarmValue : "-" }}</span>
</div> </div>
<div v-if="!orderId"> <div v-if="!orderId">
工单编号：<span>{{ data.orderId }}</span> 工单编号：<span>{{ data.orderId ? data.orderId : "-" }}</span>
</div> </div>
</div> </div>
...@@ -81,42 +81,42 @@ ...@@ -81,42 +81,42 @@
"> ">
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
标况累积量：<span class="standardConditionAccumulation"></span> 标况累积量：<span class="standardConditionAccumulation">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
工况累积量：<span class="workingConditionAccumulation"></span> 工况累积量：<span class="workingConditionAccumulation">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
剩余量：<span class="residualQuantity"></span> 剩余量：<span class="residualQuantity">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
标况流量：<span class="standardConditionFlow"></span> 标况流量：<span class="standardConditionFlow">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
工况流量：<span class="workingConditionFlow"></span> 工况流量：<span class="workingConditionFlow">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="windowwarn"> <div class="windowwarn">
温度：<span class="temperature"></span> 温度：<span class="temperature">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="windowwarn"> <div class="windowwarn">
压力：<span class="pressure"></span> 压力：<span class="pressure">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="15">
<div class="windowwarn"> <div class="windowwarn">
上报时间：<span class="reportTime"></span> 上报时间：<span class="reportTime">-</span>
</div> </div>
</el-col> </el-col>
</div> </div>
...@@ -127,12 +127,12 @@ ...@@ -127,12 +127,12 @@
"> ">
<el-col :span="24"> <el-col :span="24">
<div class="windowwarn"> <div class="windowwarn">
压力：<span class="pressure"></span> 压力：<span class="pressure">-</span>
</div> </div>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="windowwarn"> <div class="windowwarn">
上报时间：<span class="reportTime"></span> 上报时间：<span class="reportTime">-</span>
</div> </div>
</el-col> </el-col>
</div> </div>
......
gassafety-web/src/views/device/map/index.vue
View file @ 62fa8301
...@@ -194,8 +194,8 @@ ...@@ -194,8 +194,8 @@
<div class="list-wrapper"> <div class="list-wrapper">
<div class="thead"> <div class="thead">
<div class="no"></div> <div class="no"></div>
<div class="code">设备编号</div>
<div class="name">设备名称</div> <div class="name">设备名称</div>
<div class="code">设备编号</div>
</div> </div>
<div <div
class="deviceList" class="deviceList"
...@@ -205,12 +205,12 @@ ...@@ -205,12 +205,12 @@
@click.stop="panToo(iten, item)" @click.stop="panToo(iten, item)"
> >
<div class="no">{{ iten.no + 1 }}</div> <div class="no">{{ iten.no + 1 }}</div>
<div :title="iten.code" class="code">
{{ iten.code }}
</div>
<div :title="iten.deviceName" class="name"> <div :title="iten.deviceName" class="name">
{{ iten.deviceName }} {{ iten.deviceName }}
</div> </div>
<div :title="iten.code" class="code">
{{ iten.code }}
</div>
</div> </div>
</div> </div>
</template> </template>
......
gassafety-web/src/views/enterprise/mapView/components/Right.vue
View file @ 62fa8301
...@@ -67,9 +67,9 @@ export default { ...@@ -67,9 +67,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
width: 270px; width: 270px;
height: 700px; height: 857px;
position: absolute; position: fixed;
top: 40px; top: 80px;
right: 0; right: 0;
bottom:0; bottom:0;
overflow-x: hidden; overflow-x: hidden;
...@@ -91,9 +91,7 @@ export default { ...@@ -91,9 +91,7 @@ export default {
& > div { & > div {
} }
.right { .right {
position: absolute;
right: 10px; right: 10px;
top: 51px;
& > .right-content { & > .right-content {
// background-color: #fff; // background-color: #fff;
width: 247px; width: 247px;
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ 62fa8301
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
<div class="list-wrapper"> <div class="list-wrapper">
<div class="thead"> <div class="thead">
<div class="no"></div> <div class="no"></div>
<div class="code">设备编号</div>
<div class="name">设备名称</div> <div class="name">设备名称</div>
<div class="code">设备编号</div>
</div> </div>
<div <div
class="deviceList" class="deviceList"
...@@ -208,12 +208,12 @@ ...@@ -208,12 +208,12 @@
<div class="no"> <div class="no">
{{ iten.no + 1 }} {{ iten.no + 1 }}
</div> </div>
<div :title="iten.code" class="code">
{{ iten.code }}
</div>
<div :title="iten.deviceName" class="name"> <div :title="iten.deviceName" class="name">
{{ iten.deviceName }} {{ iten.deviceName }}
</div> </div>
<div :title="iten.code" class="code">
{{ iten.code }}
</div>
</div> </div>
</div> </div>
</template> </template>
......
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