修改bug
This commit is contained in:
parent
21a7c204e2
commit
feb02ac338
|
@ -13,6 +13,11 @@
|
||||||
.table-page-search-submitButtons[data-v-6bf815c6] {
|
.table-page-search-submitButtons[data-v-6bf815c6] {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
.jeecg-basic-table .ant-table-wrapper {
|
||||||
|
padding: 14px !important;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
// TODO beta.11 fix
|
// TODO beta.11 fix
|
||||||
.ant-col {
|
.ant-col {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<div style="font-size: 12px;">设备类型:<a-tag color="red">电表</a-tag></div>
|
<div style="font-size: 12px;">设备类型:<a-tag color="red">电表</a-tag></div>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="6" style="display: flex; justify-content: flex-end;">
|
<a-col :span="6" style="display: flex; justify-content: flex-end;">
|
||||||
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
|
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'合闸':'拉闸'}}</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
<a-divider style="margin: 10px 0 0 0" />
|
<a-divider style="margin: 10px 0 0 0" />
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<div style="font-size: 12px;">设备类型:<a-tag color="blue">水表</a-tag></div>
|
<div style="font-size: 12px;">设备类型:<a-tag color="blue">水表</a-tag></div>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="6" style="display: flex; justify-content: flex-end;">
|
<a-col :span="6" style="display: flex; justify-content: flex-end;">
|
||||||
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
|
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'开阀':'关阀'}}</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
<a-divider style="margin: 10px 0 0 0" />
|
<a-divider style="margin: 10px 0 0 0" />
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
|
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;">
|
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;">
|
||||||
<span>{{item.eleValue?item.eleValue:'0.00'}}</span>
|
<span>{{item.waterValue?item.waterValue:'0.00'}}</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="8" style="padding: 12px 0 0 5px;">
|
<a-col :span="8" style="padding: 12px 0 0 5px;">
|
||||||
<div style="font-size: 12px;margin: 8px 0 -5px 2px;">m³</div>
|
<div style="font-size: 12px;margin: 8px 0 -5px 2px;">m³</div>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
</div>
|
</div>
|
||||||
</a-card>
|
</a-card>
|
||||||
</div>
|
</div>
|
||||||
<div class="p-2 con-class" v-show="orgSelectedCon">
|
<div class="p-2 con-class" style="margin-top: -10px;" v-show="orgSelectedCon">
|
||||||
<!-- <a-card :bordered="false" class="org-container"> -->
|
<!-- <a-card :bordered="false" class="org-container"> -->
|
||||||
<a-row :style="props.layout === 'half' ? { height: '68vh', overflow: 'auto' } : {}">
|
<a-row :style="props.layout === 'half' ? { height: '68vh', overflow: 'auto' } : {}">
|
||||||
<a-col v-for="item in orgTableList.records" :key="item.id" :xs="24" :sm="24"
|
<a-col v-for="item in orgTableList.records" :key="item.id" :xs="24" :sm="24"
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
import { useUserStore } from '/@/store/modules/user';
|
import { useUserStore } from '/@/store/modules/user';
|
||||||
|
|
||||||
const formRef = ref();
|
const formRef = ref();
|
||||||
const queryParam = reactive<any>({});
|
const queryParam = reactive<any>({optType:'read'});
|
||||||
const toggleSearchStatus = ref<boolean>(false);
|
const toggleSearchStatus = ref<boolean>(false);
|
||||||
const registerModal = ref();
|
const registerModal = ref();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
|
|
Loading…
Reference in New Issue