Skip to content

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

fix:巡检管理

上级 9b32c3a6
显示空白字符变更
内嵌 并排
正在显示 包含 192 行增加 和 85 行删除
common/global.css
浏览文件 @ fb35d0e1
...@@ -45,7 +45,7 @@ uni-page-head .uni-btn-icon { ...@@ -45,7 +45,7 @@ uni-page-head .uni-btn-icon {
} }
.uni-navbar__header { .uni-navbar__header {
padding: 0 24px !important; padding: 0 32px !important;
/* padding-right: 18px !important; */ /* padding-right: 18px !important; */
} }
......
components/inspectionItem/index.vue
浏览文件 @ fb35d0e1
<template> <template>
<view class="inspect-item" @click="toPage"> <view class="inspect-item" @click="toPage">
<view <view class="content" :class="details.synchronization == 1 ? 'synchronization' : ''">
class="content" <view class="name">{{
:class="details.synchronization == 1 ? 'synchronization' : ''" details.synchronization == 0 ? "待同步" : "已同步"
> }}</view>
<view class="name">{{ getLabel(details.inspectionType) }}</view>
<view class="info"> <view class="info">
<view class="info-row"> <view class="info-row">
<text class="title">{{ details.recordName }}</text> <text class="title">{{ getLabel(details.inspectionType) }}</text>
<text class="status">{{ <text class="status">{{
details.synchronization == 0 ? "待同步" : "已同步" details.synchronization == 0 ? "待同步" : "已同步"
}}</text> }}</text>
<view v-if="details.isException == 1" class="status alarm"> <view v-if="details.isException == 1" class="status alarm">
<text class="iconfont icon-yichang1"></text> <text class="iconfont icon-yichang1"></text>
<text>有异常</text></view <text>有异常</text>
> </view>
</view> </view>
<view class="info-row info-row-code"> <view class="info-row info-row-code">
<text>巡检人：</text>
<text class="code-num">admin</text>
<text>编号：</text> <text>编号：</text>
<text class="code-num">{{ details.inspectionCode }}</text> <text class="code-num">{{ details.inspectionCode }}</text>
<text>巡检日期：</text>
<text class="code-num">2025-01-29</text>
</view> </view>
</view> </view>
<view class="img"> <view class="img">
<image <image v-if="details.synchronization == 1" class="bg-img" src="../../static/img/add-img/default.png"></image>
v-if="details.synchronization == 1" <!-- <image v-else class="bg-img" src="../../static/img/add-img/active.png"></image> -->
class="bg-img"
src="../../static/img/add-img/default.png"
></image>
<image
v-else
class="bg-img"
src="../../static/img/add-img/active.png"
></image>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { pad_inspection_type } from "@/utils/dict.js"; import {
pad_inspection_type
} from "@/utils/dict.js";
export default { export default {
props: { props: {
details: { details: {
type: Object, type: Object,
...@@ -53,18 +50,17 @@ export default { ...@@ -53,18 +50,17 @@ export default {
getLabel(val) { getLabel(val) {
const temp = const temp =
( (
pad_inspection_type.rows.filter((item) => item.dictValue == val)[0] || pad_inspection_type.rows.filter((item) => item.dictValue == val)[0] || {}
{}
).dictLabel || ""; ).dictLabel || "";
return temp.length ? temp.slice(0, 2) : ""; return temp.length ? temp : "";
}, },
toPage() { toPage() {
const url = const url =
this.details.inspectionType == 1 this.details.inspectionType == 1 ?
? `/pages/inspectionContent/inspectionContent?isDisable=${ `/pages/inspectionContent/inspectionContent?isDisable=${
this.isDisable ? 1 : 0 this.isDisable ? 1 : 0
}` }` :
: `/pages/shaftInspection/shaftInspectionNew?isDisable=${ `/pages/shaftInspection/shaftInspectionNew?isDisable=${
this.isDisable ? 1 : 0 this.isDisable ? 1 : 0
}`; }`;
...@@ -73,24 +69,24 @@ export default { ...@@ -73,24 +69,24 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.inspect-item { .inspect-item {
width: 50%; width: calc(50% - 8px);
padding-right: 16px;
margin-bottom: 16px; margin-bottom: 16px;
.content { .content {
background: #fff; background: #fff;
border: 0.4px solid rgba(224, 224, 224, 1); border: 0.4px solid rgba(224, 224, 224, 1);
border-radius: 12px; border-radius: 12px;
padding: 18px 16px 14px 10px; padding: 12px;
display: flex; display: flex;
align-items: center; align-items: center;
height: 84px; height: 78px;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
background-image: linear-gradient(-67deg, #ffab2423, #ffab2411 50%);
.name { .name {
background: #ffab2423; background: #ffab2423;
border-radius: 12px; border-radius: 12px;
...@@ -102,20 +98,24 @@ export default { ...@@ -102,20 +98,24 @@ export default {
align-items: center; align-items: center;
color: #f39800; color: #f39800;
} }
.info { .info {
.info-row { .info-row {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 8px; margin-bottom: 8px;
&:last-of-type { &:last-of-type {
margin: 0; margin: 0;
} }
.title { .title {
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
margin-right: 8px; margin-right: 8px;
} }
.status { .status {
padding: 2px 4px; padding: 2px 4px;
font-size: 12px; font-size: 12px;
...@@ -126,6 +126,7 @@ export default { ...@@ -126,6 +126,7 @@ export default {
background: #ffab24; background: #ffab24;
border-radius: 3px; border-radius: 3px;
} }
.alarm { .alarm {
margin-left: 8px; margin-left: 8px;
background: rgba(255, 105, 82, 0.1); background: rgba(255, 105, 82, 0.1);
...@@ -136,14 +137,20 @@ export default { ...@@ -136,14 +137,20 @@ export default {
font-weight: 400; font-weight: 400;
} }
} }
.info-row-code { .info-row-code {
font-size: 14px; font-size: 12px;
color: #7c7c7c; color: #7c7c7c;
font-weight: 400; font-weight: 400;
.code-num { .code-num {
font-size: 14px; font-size: 12px;
color: #000000; color: #000000;
font-weight: 400; font-weight: 400;
margin-right: 10px;
&:last-child{
margin-right: 0;
}
} }
} }
} }
...@@ -153,6 +160,7 @@ export default { ...@@ -153,6 +160,7 @@ export default {
right: 0; right: 0;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
.bg-img { .bg-img {
width: 80px; width: 80px;
height: 80px; height: 80px;
...@@ -162,15 +170,17 @@ export default { ...@@ -162,15 +170,17 @@ export default {
.synchronization { .synchronization {
background-image: linear-gradient(-67deg, #9c9c9c16, #9c9c9c09 50%); background-image: linear-gradient(-67deg, #9c9c9c16, #9c9c9c09 50%);
.name { .name {
background: #9c9c9c16; background: #9c9c9c16;
border-radius: 12px; border-radius: 12px;
color: #4a4a4a; color: #4a4a4a;
} }
.status { .status {
background: #9c9c9c16 !important; background: #9c9c9c16 !important;
color: #4a4a4a !important; color: #4a4a4a !important;
} }
} }
} }
</style> </style>
\ No newline at end of file
components/searchCom/index.vue
浏览文件 @ fb35d0e1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
v-model="searchFrom.inspectionType" v-model="searchFrom.inspectionType"
:localdata="inspectArr" :localdata="inspectArr"
@change="(e) => change(e, 'inspectionType')" @change="(e) => change(e, 'inspectionType')"
placeholder="巡检类型:全部" placeholder="类型"
:clear="true" :clear="true"
:key="new Date().getTime()" :key="new Date().getTime()"
></uni-data-select> ></uni-data-select>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
class="uni-search-item" class="uni-search-item"
v-model="searchFrom.synchronization" v-model="searchFrom.synchronization"
:localdata="synchronization" :localdata="synchronization"
placeholder="是否同步:全部" placeholder="状态"
@change="(e) => change(e, 'synchronization')" @change="(e) => change(e, 'synchronization')"
:clear="true" :clear="true"
:key="new Date().getTime()" :key="new Date().getTime()"
...@@ -29,14 +29,24 @@ ...@@ -29,14 +29,24 @@
class="uni-search-item" class="uni-search-item"
v-model="searchFrom.isException" v-model="searchFrom.isException"
:localdata="exceptionArr" :localdata="exceptionArr"
placeholder="有无异常:全部" placeholder="异常"
@change="(e) => change(e, 'isException')" @change="(e) => change(e, 'isException')"
:clear="true" :clear="true"
:key="new Date().getTime()" :key="new Date().getTime()"
></uni-data-select> ></uni-data-select>
<uni-data-select
v-if="!hiddenSearch.includes('inspectionTime')"
class="uni-search-item"
v-model="searchFrom.inspectionTime"
:localdata="dateArr"
placeholder="选择时间"
@change="(e) => change(e, 'inspectionTime')"
:clear="true"
:key="new Date().getTime()"
></uni-data-select>
</view> </view>
<view <!-- <view
class="search-com-right" class="search-com-right"
v-if="!hiddenSearch.includes('inspectionTime')" v-if="!hiddenSearch.includes('inspectionTime')"
> >
...@@ -47,7 +57,7 @@ ...@@ -47,7 +57,7 @@
:border="false" :border="false"
@change="(e) => change(e, 'inspectionTime')" @change="(e) => change(e, 'inspectionTime')"
/> />
</view> </view> -->
</view> </view>
</template> </template>
<script> <script>
...@@ -82,8 +92,14 @@ export default { ...@@ -82,8 +92,14 @@ export default {
], ],
exceptionArr: [ exceptionArr: [
{ value: "all", text: "全部" }, { value: "all", text: "全部" },
{ value: "1", text: "有异常" }, { value: "1", text: "有" },
{ value: "0", text: "无异常" }, { value: "0", text: "无" },
],
dateArr: [
{ value: "0", text: "本月" },
{ value: "1", text: "本季" },
{ value: "2", text: "本年" },
{ value: "3", text: "自定义" },
], ],
}; };
}, },
...@@ -101,13 +117,13 @@ export default { ...@@ -101,13 +117,13 @@ export default {
.search-com { .search-com {
display: flex; display: flex;
align-items: center; align-items: center;
width: 50%;
.search-com-left { .search-com-left {
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;
.uni-search-item { .uni-search-item {
margin-right: 12px; margin-right: 12px;
width: 130px;
background: #fff; background: #fff;
border-radius: 4px; border-radius: 4px;
border: none !important; border: none !important;
......
pages.json
浏览文件 @ fb35d0e1
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
}, },
// 新增配置---------
// 巡检管理
{
"path": "pages/inspectionManagement/index"
},
// 井道巡检新页面 // 井道巡检新页面
{ {
"path": "pages/shaftInspection/shaftInspectionNew", "path": "pages/shaftInspection/shaftInspectionNew",
......
pages/home/home.vue
浏览文件 @ fb35d0e1
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<view class="username">{{ userName }}</view> <view class="username">{{ userName }}</view>
</view> </view>
<view class="profile-right"> <view class="profile-right">
<button class="inspection-button">巡检管理</button> <button class="inspection-button" @click="toInspectionManagement">巡检管理</button>
<button class="record-button">上架记录</button> <button class="record-button">上架记录</button>
</view> </view>
</view> </view>
...@@ -87,6 +87,13 @@ ...@@ -87,6 +87,13 @@
url: "/pages/index/operLog", url: "/pages/index/operLog",
}); });
}, },
// 巡检管理
toInspectionManagement() {
console.log(1111)
uni.navigateTo({
url: "/pages/inspectionManagement/index",
});
},
// 井道巡检 // 井道巡检
toShaftInspection() { toShaftInspection() {
uni.navigateTo({ uni.navigateTo({
......
pages/inspectionManagement/index.vue
浏览文件 @ fb35d0e1
<template> <template>
<view class="inspection-management"> <view class="inspection-management">
<uni-nav-bar :fixed="true" background-color="rgba(214, 240, 255, 0.0)" status-bar rightWidth="300">
<block slot="left">
<view class="uni-nav-bar-text" @click="back">
<text class="iconfont icon-Arrow-Left"></text>
</view>
</block>
<block slot="right" class="nav-right">
<view class="header-buttons">
<button class="button" @click="lookLog">机房巡检</button>
<button class="button" @click="lookLog">井道巡检</button>
</view>
</block>
</uni-nav-bar>
<!-- 搜索项 --> <!-- 搜索项 -->
<SearchCom @change="change" /> <SearchCom @change="change" />
...@@ -7,26 +20,18 @@ ...@@ -7,26 +20,18 @@
<view class="inspection-management-content"> <view class="inspection-management-content">
<view class="count-tatal"> <view class="count-tatal">
<text class="num">{{ countNum || 0 }}条</text> <text class="num">{{ countNum || 0 }}条</text>
<text>查询结果</text> <text calss="">查询结果</text>
</view> </view>
<view class="month-list"> <view class="month-list">
<!-- 每月记录 --> <!-- 每月记录 -->
<view <view class="month-record-item" v-for="(item, index) in list" :key="index">
class="month-record-item"
v-for="(item, index) in list"
:key="index"
>
<view v-if="(item.list || []).length" class="seconed-title"> <view v-if="(item.list || []).length" class="seconed-title">
{{ item.submitTime || item.time}} {{ item.submitTime || item.time}}
</view> </view>
<view class="inspect-list"> <view class="inspect-list">
<InspectionItem <InspectionItem v-for="ele in item.list" :key="ele.uid" :details="ele" />
v-for="ele in item.list"
:key="ele.uid"
:details="ele"
/>
</view> </view>
</view> </view>
...@@ -35,20 +40,22 @@ ...@@ -35,20 +40,22 @@
</view> </view>
<!-- 开始巡检 --> <!-- 开始巡检 -->
<view class="inspection-button" @click="toPage" <view class="inspection-button" @click="toPage">同步数据</view>
>开始巡检</view
>
</view> </view>
</template> </template>
<script> <script>
import SearchCom from "@/components/searchCom/index.vue"; import SearchCom from "@/components/searchCom/index.vue";
import InspectionItem from "@/components/inspectionItem/index.vue"; import InspectionItem from "@/components/inspectionItem/index.vue";
import { getDarft } from "@/request/index.js"; import {
import { getAllInspections } from "@/request/index.js"; getDarft
import Empty from "@/components/empty/index.vue"; } from "@/request/index.js";
import {
getAllInspections
} from "@/request/index.js";
import Empty from "@/components/empty/index.vue";
export default { export default {
components: { components: {
SearchCom, SearchCom,
InspectionItem, InspectionItem,
...@@ -93,10 +100,16 @@ export default { ...@@ -93,10 +100,16 @@ export default {
}, },
methods: { methods: {
// 返回
back() {
uni.navigateBack();
},
init() { init() {
const all_data = this.all_data || []; const all_data = this.all_data || [];
const { inspectionTime = [] } = this.searchForm; const {
inspectionTime = []
} = this.searchForm;
const startTime = inspectionTime[0]; const startTime = inspectionTime[0];
const endTime = inspectionTime[1]; const endTime = inspectionTime[1];
...@@ -152,9 +165,9 @@ export default { ...@@ -152,9 +165,9 @@ export default {
return arr.filter((item) => { return arr.filter((item) => {
return ( return (
( !isException || isException =="all" || item.isException == isException) && (!isException || isException == "all" || item.isException == isException) &&
( !inspectionType || inspectionType =="all" || item.inspectionType == inspectionType) && (!inspectionType || inspectionType == "all" || item.inspectionType == inspectionType) &&
( !synchronization || synchronization =="all" || item.synchronization == synchronization) (!synchronization || synchronization == "all" || item.synchronization == synchronization)
); );
}); });
}, },
...@@ -203,37 +216,89 @@ export default { ...@@ -203,37 +216,89 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.inspection-management { /* 导航栏样式 */
padding-top: 16px; .uni-nav-bar-text {
height: 36px;
width: 36px;
background: #ffffff;
border: 0.4px solid rgba(224, 224, 224, 1);
border-radius: 18px;
border-radius: 50%;
color: #333;
text-align: center;
.iconfont {
font-size: 20px;
line-height: 36px;
}
}
.nav-right {
width: 240px;
}
.header-buttons {
display: flex;
align-items: center;
margin-left: auto; // 将按钮组推到最右侧
.button {
width: 112px;
height: 36px;
background: #FFFFFF;
border-radius: 18px;
margin-left: 16px;
font-family: PingFangSC-Regular;
font-size: 16px;
color: #000000;
line-height: 36px;
font-weight: 400;
}
}
.inspection-management {
background-image: linear-gradient(115deg, #E8F0FB 0%, #E1EBFA 100%);
padding: 0 32px;
.inspection-management-content {
.count-tatal { .count-tatal {
margin: 16px 0 8px 0; font-family: PingFangSC-Medium;
margin: 16px 0px 24px;
font-size: 14px; font-size: 14px;
color: #4a4a4a; color: #4a4a4a;
font-weight: 400; font-weight: 400;
height: 28px;
line-height: 28px;
.num { .num {
font-size: 18px; font-size: 20px;
color: #3774f6; color: #3774f6;
line-height: 26px; line-height: 28px;
font-weight: 600; font-weight: 500;
margin-right: 5px; margin-right: 2px;
} }
} }
.inspection-management-content {
.month-list { .month-list {
height: calc(100vh - 26px - 16px - 8px - 36px - 62px); height: calc(100vh - 26px - 16px - 8px - 36px - 62px);
overflow: auto; overflow: auto;
padding-bottom: 140px; padding-bottom: 140px;
.seconed-title { .seconed-title {
margin-top: 16px; font-size: 20px;
font-size: 18px;
color: #000000; color: #000000;
font-weight: bold; line-height: 28px;
font-weight: 500;
margin-bottom: 12px;
} }
.month-record-item { .month-record-item {
margin-bottom: 24px; margin-bottom: 24px;
&:last-of-type { &:last-of-type {
margin: 0; margin: 0;
} }
...@@ -241,6 +306,7 @@ export default { ...@@ -241,6 +306,7 @@ export default {
.inspect-list { .inspect-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between;
} }
} }
} }
...@@ -261,5 +327,5 @@ export default { ...@@ -261,5 +327,5 @@ export default {
box-shadow: 0px 10px 24px 0px rgba(51, 104, 246, 0.24); box-shadow: 0px 10px 24px 0px rgba(51, 104, 246, 0.24);
border-radius: 27px; border-radius: 27px;
} }
} }
</style> </style>
\ No newline at end of file
uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
浏览文件 @ fb35d0e1
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
/* #endif */ /* #endif */
flex-wrap: nowrap; flex-wrap: nowrap;
flex-direction: row; flex-direction: row;
width: 120rpx; width: auto;
// padding: 0 6px; // padding: 0 6px;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论