Skip to content

C
computedRoomPad
提交 38f620e9 authored 作者: caodi\cd's avatar caodi\cd
浏览文件
操作

fix:结构优化

上级 1601fb0f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 80 行增加 和 50 行删除
components/inspectionItem/index.vue
浏览文件 @ 38f620e9
...@@ -2,27 +2,22 @@ ...@@ -2,27 +2,22 @@
<view class="inspect-item" @click="toPage"> <view class="inspect-item" @click="toPage">
<view class="content" :class="details.synchronization == 1 ? 'synchronization' : ''"> <view class="content" :class="details.synchronization == 1 ? 'synchronization' : ''">
<view class="name">{{ <view class="name">{{
details.synchronization == 0 ? "待同步" : "已同步" details.isSubmit == 0 ? "编辑中" :details.synchronization == 0 ? "待同步" : "已同步"
}}</view> }}</view>
<view class="info"> <view class="info">
<view class="info-row"> <view class="info-row">
<text class="title">{{ getLabel(details.inspectionType) }}</text> <text class="title">{{ getLabel(details.inspectionType) }}</text>
<text class="status">{{ <text class="status">{{
details.synchronization == 0 ? "待同步" : "已同步" details.isException>0?"异常":"正常"
}}</text> }}</text>
<view v-if="details.isException == 1" class="status alarm">
<text class="iconfont icon-yichang1"></text>
<text>有异常</text>
</view>
</view> </view>
<view class="info-row info-row-code"> <view class="info-row info-row-code">
<text>巡检人：</text> <text>巡检人：</text>
<text class="code-num">admin</text> <text class="code-num">{{details.inspectionBy}}</text>
<text>编号：</text> <text>编号：</text>
<text class="code-num">{{ details.inspectionCode }}</text> <text class="code-num">{{ details.inspectionCode }}</text>
<text>巡检日期：</text> <text>巡检日期：</text>
<text class="code-num">2025-01-29</text> <text class="code-num">{{ details.submitTime }}</text>
</view> </view>
</view> </view>
<view class="img"> <view class="img">
...@@ -46,6 +41,10 @@ ...@@ -46,6 +41,10 @@
type: Boolean, type: Boolean,
}, },
}, },
mounted() {
console.log(" this.details", this.details)
},
methods: { methods: {
getLabel(val) { getLabel(val) {
const temp = const temp =
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
`/pages/inspectionContent/inspectionContent?isDisable=${ `/pages/inspectionContent/inspectionContent?isDisable=${
this.isDisable ? 1 : 0 this.isDisable ? 1 : 0
}` : }` :
`/pages/shaftInspection/shaftInspectionNew?isDisable=${ `/pages/shaftInspection/shaftInspectionList?isDisable=${
this.isDisable ? 1 : 0 this.isDisable ? 1 : 0
}`; }`;
...@@ -73,26 +72,27 @@ ...@@ -73,26 +72,27 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.inspect-item { .inspect-item {
width: calc(50% - 8px); width: calc(50% - 6.4px);
margin-bottom: 16px; margin-bottom: 12.8px;
.content { .content {
background: #fff; background: #fff;
border: 0.4px solid rgba(224, 224, 224, 1); border: 0.32px solid rgba(224, 224, 224, 1);
border-radius: 12px; border-radius: 9.6px;
padding: 12px; padding: 9.6px;
display: flex; display: flex;
align-items: center; align-items: center;
height: 78px; height: 62.4px;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
.name { .name {
background: #ffab2423; background: #ffab2423;
border-radius: 12px; border-radius: 9.6px;
width: 54px; font-size: 11.2px;
height: 54px; width: 43.2px;
margin-right: 10px; height: 43.2px;
margin-right: 8px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -103,52 +103,53 @@ ...@@ -103,52 +103,53 @@
.info-row { .info-row {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 8px; margin-bottom: 6.4px;
&:last-of-type { &:last-of-type {
margin: 0; margin: 0;
} }
.title { .title {
font-size: 12px; font-size: 11.2px;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
margin-right: 8px; margin-right: 6.4px;
} }
.status { .status {
padding: 2px 4px; padding: 0 6.4px;
font-size: 12px; font-size: 9.6px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
line-height: 20px; line-height: 16px;
font-weight: 400; font-weight: 400;
background: #ffab24; background: #ffab24;
border-radius: 3px; border-radius: 8px;
} }
.alarm { .alarm {
margin-left: 8px; margin-left: 6.4px;
background: rgba(255, 105, 82, 0.1); background: rgba(255, 105, 82, 0.1);
font-size: 12px; font-size: 11.2px;
color: #ff6952; color: #ff6952;
text-align: center; text-align: center;
line-height: 20px; line-height: 16px;
font-weight: 400; font-weight: 400;
} }
} }
.info-row-code { .info-row-code {
font-size: 12px; font-size: 11.2px;
color: #7c7c7c; color: #7c7c7c;
font-weight: 400; font-weight: 400;
.code-num { .code-num {
font-size: 12px; font-size: 11.2px;
color: #000000; color: #000000;
font-weight: 400; font-weight: 400;
margin-right: 10px; margin-right: 19.2px;
&:last-child{
&:last-child {
margin-right: 0; margin-right: 0;
} }
} }
...@@ -162,8 +163,10 @@ ...@@ -162,8 +163,10 @@
transform: translateY(-50%); transform: translateY(-50%);
.bg-img { .bg-img {
width: 80px; width: 64px;
height: 80px; /* 80px * 0.8 */
height: 64px;
/* 80px * 0.8 */
} }
} }
} }
...@@ -173,7 +176,8 @@ ...@@ -173,7 +176,8 @@
.name { .name {
background: #9c9c9c16; background: #9c9c9c16;
border-radius: 12px; border-radius: 9.6px;
/* 12px * 0.8 */
color: #4a4a4a; color: #4a4a4a;
} }
......
utils/dict.js
浏览文件 @ 38f620e9
...@@ -1074,7 +1074,9 @@ export const pad_2_1_floor = { ...@@ -1074,7 +1074,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1092,7 +1094,9 @@ export const pad_2_1_floor = { ...@@ -1092,7 +1094,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1110,7 +1114,9 @@ export const pad_2_1_floor = { ...@@ -1110,7 +1114,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1128,7 +1134,9 @@ export const pad_2_1_floor = { ...@@ -1128,7 +1134,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1146,7 +1154,9 @@ export const pad_2_1_floor = { ...@@ -1146,7 +1154,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1164,7 +1174,9 @@ export const pad_2_1_floor = { ...@@ -1164,7 +1174,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1182,7 +1194,9 @@ export const pad_2_1_floor = { ...@@ -1182,7 +1194,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1200,7 +1214,9 @@ export const pad_2_1_floor = { ...@@ -1200,7 +1214,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1218,7 +1234,9 @@ export const pad_2_1_floor = { ...@@ -1218,7 +1234,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1236,7 +1254,9 @@ export const pad_2_1_floor = { ...@@ -1236,7 +1254,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1254,7 +1274,9 @@ export const pad_2_1_floor = { ...@@ -1254,7 +1274,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1272,7 +1294,9 @@ export const pad_2_1_floor = { ...@@ -1272,7 +1294,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
}, },
{ {
"createBy": "admin", "createBy": "admin",
...@@ -1290,7 +1314,9 @@ export const pad_2_1_floor = { ...@@ -1290,7 +1314,9 @@ export const pad_2_1_floor = {
"isDefault": "N", "isDefault": "N",
"status": "0", "status": "0",
"default": false, "default": false,
"details":[] "statusLable":"未巡检",
"details":[],
"isSubmit":0,
} }
] ]
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论