Skip to content

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

fix:井道完成

上级 38f620e9
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 218 行增加 和 111 行删除
common/global.css
浏览文件 @ af54e348
...@@ -15,11 +15,24 @@ uni-page-head .uni-btn-icon { ...@@ -15,11 +15,24 @@ uni-page-head .uni-btn-icon {
} }
.uni-nav-bar-right-text{ .uni-nav-bar-right-text {
font-size: 14px !important; font-size: 14px !important;
} }
.uni-navbar-btn-text>text{ .uni-nav-bar-text {
height: 28.8px;
width: 28.8px;
background: #ffffff;
border: 0.32px solid rgba(224, 224, 224, 1);
border-radius: 14.4px;
color: #333;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
}
.uni-navbar-btn-text>text {
font-size: 14px !important; font-size: 14px !important;
} }
...@@ -45,7 +58,7 @@ uni-page-head .uni-btn-icon { ...@@ -45,7 +58,7 @@ uni-page-head .uni-btn-icon {
} }
.uni-navbar__header { .uni-navbar__header {
padding: 0 32px !important; padding: 0 25.6px !important;
/* padding-right: 18px !important; */ /* padding-right: 18px !important; */
} }
......
components/jackyq-signature/jackyq-signature.vue 0 → 100644
浏览文件 @ af54e348
<template>
<view>
<view class="canvas-container">
<canvas canvas-id="canvas" id="canvas" :disable-scroll="true" style="width: 100%; height: 200px;background-color: #FFFFFF;"
@touchstart="handleTouchStart($event)" @touchmove="handleTouchMove($event)" @touchend="handleTouchEnd($event)"
@touchcancel="handleEnd($event)"></canvas>
</view>
<view class="btn-container">
<button class="cu-btn lg bg-blue" @click="handleConfirm()">确定</button>
<button class="cu-btn lg line-gray" @click="reset()">重置</button>
</view>
</view>
</template>
<script>
var context = null
export default {
props: {
dialogVisiable: {
type: Boolean,
default: false
}
},
data() {
return {
canvasData: []
};
},
watch: {
dialogVisiable() {
if (this.dialogVisiable === true) {
context = uni.createCanvasContext('canvas')
context.setLineWidth(3)
context.setStrokeStyle("#000000")
this.reset()
}
},
canvasData() {
context.moveTo(this.canvasData[0].x, this.canvasData[0].y)
for (let i = 0; i < this.canvasData.length; i++) {
context.lineTo(this.canvasData[i].x, this.canvasData[i].y)
}
context.stroke()
context.draw(true)
}
},
methods: {
reset() {
context.draw()
},
hideModal() {
this.$emit('update:dialogVisiable', false)
},
handleTouchStart(e) {
this.canvasData = []
const a = e.changedTouches[0]
this.canvasData.push({
x: a.x,
y: a.y
})
},
handleTouchMove(e) {
const a = e.changedTouches[0]
this.canvasData.push({
x: a.x,
y: a.y
})
},
handleTouchEnd(e) {
const a = e.changedTouches[0]
this.canvasData.push({
x: a.x,
y: a.y
})
},
handleEnd() {
context.stroke()
context.draw(true)
},
handleConfirm() {
uni.canvasToTempFilePath({
canvasId: 'canvas',
success: res => {
this.$emit('success', res.tempFilePath)
}
})
}
}
}
</script>
<style lang="scss" scoped>
.canvas-container {
width: 400px;
}
.btn-container {
padding-bottom: 20rpx;
display: flex;
justify-content: space-around;
}
</style>
index.js 0 → 100644
浏览文件 @ af54e348
import Signature from './components/jackyq-signature.vue'
export default Signature
\ No newline at end of file
pages/inspectionManagement/index.vue
浏览文件 @ af54e348
<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"> <uni-nav-bar
:fixed="true"
background-color="rgba(214, 240, 255, 0.0)"
status-bar
rightWidth="300"
>
<block slot="left"> <block slot="left">
<view class="uni-nav-bar-text" @click="back"> <view class="uni-nav-bar-text" @click="back">
<text class="iconfont icon-Arrow-Left"></text> <text class="iconfont icon-Arrow-Left"></text>
...@@ -26,13 +31,21 @@ ...@@ -26,13 +31,21 @@
<view class="month-list"> <view class="month-list">
<!-- 每月记录 --> <!-- 每月记录 -->
<view class="month-record-item" v-for="(item, index) in list" :key="index"> <view
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 v-for="ele in item.list" :key="ele.uid" :details="ele" /> <InspectionItem
v-for="ele in item.list"
:key="ele.uid"
:details="ele"
/>
</view> </view>
</view> </view>
...@@ -46,17 +59,13 @@ ...@@ -46,17 +59,13 @@
</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 { import { getDarft } from "@/request/index.js";
getDarft import { getAllInspections } from "@/request/index.js";
} from "@/request/index.js"; import Empty from "@/components/empty/index.vue";
import {
getAllInspections
} from "@/request/index.js";
import Empty from "@/components/empty/index.vue";
export default { export default {
components: { components: {
SearchCom, SearchCom,
InspectionItem, InspectionItem,
...@@ -98,7 +107,6 @@ ...@@ -98,7 +107,6 @@
userInfo() { userInfo() {
return this.$store.state.now_user || {}; return this.$store.state.now_user || {};
}, },
}, },
methods: { methods: {
// 返回 // 返回
...@@ -114,15 +122,12 @@ ...@@ -114,15 +122,12 @@
uni.navigateTo({ uni.navigateTo({
url: "/pages/shaftInspection/shaftInspectionNew", url: "/pages/shaftInspection/shaftInspectionNew",
}); });
} }
}, },
init() { init() {
const all_data = this.all_data || []; const all_data = this.all_data || [];
const { const { inspectionTime = [] } = this.searchForm;
inspectionTime = []
} = this.searchForm;
const startTime = inspectionTime[0]; const startTime = inspectionTime[0];
const endTime = inspectionTime[1]; const endTime = inspectionTime[1];
...@@ -132,13 +137,13 @@ ...@@ -132,13 +137,13 @@
return true; return true;
} else { } else {
return ( return (
new Date(startTime).getTime() <= new Date(item.submitTime).getTime() && new Date(startTime).getTime() <=
new Date(item.submitTime).getTime() &&
new Date(item.submitTime).getTime() <= new Date(endTime).getTime() new Date(item.submitTime).getTime() <= new Date(endTime).getTime()
); );
} }
}); });
// 属于同一个月的数据 聚合 // 属于同一个月的数据 聚合
const tempAllData = {}; const tempAllData = {};
timeFrame.forEach((item) => { timeFrame.forEach((item) => {
...@@ -165,23 +170,28 @@ ...@@ -165,23 +170,28 @@
}); });
this.list = list; this.list = list;
console.log("this.list",this.list) console.log("this.list", this.list);
}, },
coverData(arr = []) { coverData(arr = []) {
console.log("arr",arr)
const { const {
isException = "", isException = "",
inspectionType = "", inspectionType = "",
synchronization = "", synchronization = "",
} = this.searchForm; } = this.searchForm;
return arr.filter((item) => { return arr.filter((item) => {
return ( return (
(!isException || isException == "all" || item.isException == isException) && (!isException ||
(!inspectionType || inspectionType == "all" || item.inspectionType == inspectionType) && isException == "all" ||
(!synchronization || synchronization == "all" || item.synchronization == synchronization) item.isException == isException) &&
(!inspectionType ||
inspectionType == "all" ||
item.inspectionType == inspectionType) &&
(!synchronization ||
synchronization == "all" ||
item.synchronization == synchronization)
); );
}); });
}, },
...@@ -230,93 +240,83 @@ ...@@ -230,93 +240,83 @@
}); });
}, },
}, },
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
/* 导航栏样式 */ .uni-nav-bar-text {
.uni-nav-bar-text { height: 28.8px;
height: 36px; width: 28.8px;
width: 36px;
background: #ffffff; background: #ffffff;
border: 0.4px solid rgba(224, 224, 224, 1); border: 0.32px solid rgba(224, 224, 224, 1);
border-radius: 18px; border-radius: 14.4px;
border-radius: 50%;
color: #333; color: #333;
display: flex;
align-items: center;
justify-content: center;
text-align: center; text-align: center;
.iconfont { .iconfont {
font-size: 20px; font-size: 16px;
line-height: 36px; line-height: 28.8px;
}
}
.nav-right {
width: 240px;
} }
}
.header-buttons { .nav-right {
width: 192px;
}
.header-buttons {
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: auto; // 将按钮组推到最右侧 margin-left: auto;
.button { .button {
width: 112px; width: 89.6px;
height: 36px; height: 28.8px;
background: #FFFFFF; background: #ffffff;
border-radius: 18px; border-radius: 14.4px;
margin-left: 16px; margin-left: 12.8px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 16px; font-size: 12.8px;
color: #000000; color: #000000;
line-height: 36px; line-height: 28.8px;
font-weight: 400; font-weight: 400;
border: 0;
} }
} }
.inspection-management {
.inspection-management { background-image: linear-gradient(115deg, #e8f0fb 0%, #e1ebfa 100%);
background-image: linear-gradient(115deg, #E8F0FB 0%, #E1EBFA 100%); padding: 0 25.6px;
padding: 0 32px;
.inspection-management-content { .inspection-management-content {
.count-tatal { .count-tatal {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
margin: 16px 0px 24px; margin: 12.8px 0px 19.2px;
font-size: 14px; font-size: 11.2px;
color: #4a4a4a; color: #4a4a4a;
font-weight: 400; font-weight: 400;
height: 28px; height: 22.4px;
line-height: 28px; line-height: 22.4px;
.num { .num {
font-size: 20px; font-size: 16px;
color: #3774f6; color: #3774f6;
line-height: 28px; line-height: 22.4px;
font-weight: 500; font-weight: 500;
margin-right: 2px; margin-right: 1.6px;
} }
} }
.month-list { .month-list {
height: calc(100vh - 26px - 16px - 8px - 36px - 62px); height: calc(100vh - 20.8px - 12.8px - 6.4px - 28.8px - 49.6px - 25px);
overflow: auto; overflow: auto;
padding-bottom: 140px; // padding-bottom: 112px;
.seconed-title { .seconed-title {
font-size: 20px; font-size: 16px;
color: #000000; color: #000000;
line-height: 28px; line-height: 22.4px;
font-weight: 500; font-weight: 500;
margin-bottom: 12px; margin-bottom: 9.6px;
} }
.month-record-item { .month-record-item {
margin-bottom: 24px; margin-bottom: 19.2px;
&:last-of-type { &:last-of-type {
margin: 0; margin: 0;
} }
.inspect-list { .inspect-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -325,21 +325,20 @@ ...@@ -325,21 +325,20 @@
} }
} }
} }
.inspection-button { .inspection-button {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: fixed; position: fixed;
bottom: 60px; bottom: 48px;
width: 240px; width: 192px;
height: 48px; height: 38.4px;
left: 50%; left: 50%;
color: #fff; color: #fff;
transform: translateX(-50%); transform: translateX(-50%);
background-image: linear-gradient(180deg, #3773f6 0%, #2c57f6 99%); background-image: linear-gradient(180deg, #3773f6 0%, #2c57f6 99%);
box-shadow: 0px 10px 24px 0px rgba(51, 104, 246, 0.24); box-shadow: 0px 8px 19.2px 0px rgba(51, 104, 246, 0.24);
border-radius: 27px; border-radius: 21.6px;
}
} }
}
</style> </style>
pages/listingManagement/index.vue
浏览文件 @ af54e348
...@@ -330,8 +330,10 @@ export default { ...@@ -330,8 +330,10 @@ export default {
background: #ffffff; background: #ffffff;
border: 0.32px solid rgba(224, 224, 224, 1); border: 0.32px solid rgba(224, 224, 224, 1);
border-radius: 14.4px; border-radius: 14.4px;
border-radius: 50%;
color: #333; color: #333;
display: flex;
align-items: center;
justify-content: center;
text-align: center; text-align: center;
.iconfont { .iconfont {
......
pages/shaftInspection/shaftInspectionList.vue
浏览文件 @ af54e348
...@@ -280,21 +280,6 @@ export default { ...@@ -280,21 +280,6 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/* 导航栏样式 */ /* 导航栏样式 */
.uni-nav-bar-text {
height: 28.8px;
width: 28.8px;
background: #ffffff;
border: 0.32px solid rgba(224, 224, 224, 1);
border-radius: 14.4px;
border-radius: 50%;
color: #333;
text-align: center;
.iconfont {
font-size: 16px;
line-height: 28.8px;
}
}
.nav-right { .nav-right {
width: 192px; width: 192px;
......
uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
浏览文件 @ af54e348
<template> <template>
<view class="uni-navbar" :class="{'uni-dark':dark, 'uni-nvue-fixed': fixed}"> <view class="uni-navbar" :class="{'uni-dark':dark, 'uni-nvue-fixed': fixed}">
<view class="uni-navbar__content" :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }" <view class="uni-navbar__content"
:style="{ 'background-color': themeBgColor }" > :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
:style="{ 'background-color': themeBgColor }">
<status-bar v-if="statusBar" /> <status-bar v-if="statusBar" />
<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}" <view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}" class="uni-navbar__header">
class="uni-navbar__header">
<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left" <view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
:style="{width:leftIconWidth}"> :style="{width:leftIconWidth}">
<slot name="left"> <slot name="left">
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
<view class="uni-navbar__header-container " @tap="onClickTitle"> <view class="uni-navbar__header-container " @tap="onClickTitle">
<slot> <slot>
<view class="uni-navbar__header-container-inner" v-if="title.length>0"> <view class="uni-navbar__header-container-inner" v-if="title.length>0">
<text class="uni-nav-bar-text uni-ellipsis-1" <text class="uni-nav-bar-text uni-ellipsis-1" :style="{color: themeColor }">{{ title }}</text>
:style="{color: themeColor }">{{ title }}</text>
</view> </view>
</slot> </slot>
</view> </view>
...@@ -205,11 +204,16 @@ ...@@ -205,11 +204,16 @@
position: sticky; position: sticky;
/* #endif */ /* #endif */
} }
.uni-navbar { .uni-navbar {
// box-sizing: border-box; // box-sizing: border-box;
} }
.uni-nav-bar-text { .uni-nav-bar-text {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
font-size: 34rpx; font-size: 34rpx;
/* #endif */ /* #endif */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论