Skip to content

Y
yanshouyi-Minipro
Commit 4954326f authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

测量页面样式处理

parent 301ed0ea
Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 291 deletions
pages/home/blueMeasure.vue
View file @ 4954326f
...@@ -4,133 +4,118 @@ ...@@ -4,133 +4,118 @@
</CustomNavbar> </CustomNavbar>
<view class="body-wrapper"> <view class="body-wrapper">
<view class="sumary-title"> <view class="demo-uni-row">
手动填写数据 <uni-row>
<uni-col :span="7" class="_title">
<view>工程名称</view>
</uni-col>
<uni-col :span="15">
<uni-data-select v-model="form.productName" :localdata="selectListLv1" :clear="false"
@change="changeLv1"></uni-data-select>
</uni-col>
</uni-row>
</view> </view>
<view class="demo-uni-row">
<uni-row class="demo-uni-row mb-10"> <uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title"> <uni-col :span="7" class="_title">
<view>工程名称</view> <view>爆区名称</view>
</uni-col> </uni-col>
<uni-col :span="16"> <uni-col :span="15">
<uni-data-select v-model="form.engineeringName" :localdata="selectListLv1" :clear="false" <uni-data-select v-model="form.artilleryAreaName" :localdata="selectListLv2" :clear="false"
@change="changeLv1"></uni-data-select>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title">
<view>中段名称</view>
</uni-col>
<uni-col :span="16">
<uni-data-select v-model="form.middleSectionName" :localdata="selectListLv2" :clear="false"
@change="changeLv2"></uni-data-select> @change="changeLv2"></uni-data-select>
</uni-col> </uni-col>
</uni-row> </uni-row>
</view>
<view class="demo-uni-row">
<uni-row class="demo-uni-row mb-10"> <uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title"> <uni-col :span="7" class="_title">
<view>分段名称</view> <view>炮孔排号</view>
</uni-col> </uni-col>
<uni-col :span="16"> <uni-col :span="15">
<uni-data-select v-model="form['segmentName']" :localdata="selectListLv3" :clear="false" <uni-data-select v-model="form['cannonHoleArrayNum']" :localdata="selectListLv3" :clear="false"
@change="changeLv3"></uni-data-select> @change="changeLv3"></uni-data-select>
</uni-col> </uni-col>
</uni-row> </uni-row>
</view>
<view class="demo-uni-row">
<uni-row class="demo-uni-row mb-10"> <uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title"> <uni-col :span="7" class="_title">
<view>排位线名称</view>
</uni-col>
<uni-col :span="16">
<uni-data-select v-model="form['alignmentLineName']" :localdata="selectListLv4" :clear="false"
@change="changeLv4"></uni-data-select>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title">
<view>炮孔编号</view> <view>炮孔编号</view>
</uni-col> </uni-col>
<uni-col :span="16"> <uni-col :span="15">
<uni-data-select v-model="form['boreholeNumber']" :localdata="selectListLv5" :clear="false" <uni-data-select v-model="form['cannonHoleNum']" :localdata="selectListLv4" :clear="false"
@change="changeLv5"></uni-data-select> @change="changeLv4"></uni-data-select>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title">
<view>透孔</view>
</uni-col>
<uni-col :span="16">
<view class="_content unaffix">
{{form['throughHole'] || '-'}}
</view>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title">
<view>设计孔深</view>
</uni-col>
<uni-col :span="16">
<view class="_content">
{{form['designHoleDepth'] || '-'}}
</view>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title">
<view>设计倾角</view>
</uni-col>
<uni-col :span="16">
<view class="_content angle">
<view>{{form['designInclination'] || '-'}}</view>
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
</view>
<view class="body-wrapper auto">
<view class="sumary-title">
自动更新数据
</view> </view>
<view class="only-read-row">
<uni-row class="demo-uni-row mb-10">
<uni-col :span="7" class="_title">
<view>设计孔深</view>
</uni-col>
<uni-col :span="15">
<view class="_content">
{{form['expectedDepth'] || '-'}}
</view>
</uni-col>
</uni-row>
</view>
<view class="demo-uni-row">
<uni-row class="demo-uni-row mb-10"> <uni-row class="demo-uni-row mb-10">
<uni-col :span="6" class="_title"> <uni-col :span="7" class="_title">
<view>实测孔深</view> <view>装药选择</view>
</uni-col>
<uni-col :span="16">
<view class="_content">
{{form['realTestHoleDepth'] || '-'}}
</view>
</uni-col> </uni-col>
</uni-row> <uni-col :span="15">
<uni-row class="demo-uni-row mb-10 demo-uni-row-unborder"> <uni-data-select v-model="form['status']" :localdata="zhuangyaoDict"
<uni-col :span="6" class="_title"> :clear="false"></uni-data-select>
<view>实测倾角</view>
</uni-col>
<uni-col :span="16">
<view class="_content angle">
<view>{{form['realTestInclination'] || '-'}}</view>
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<!-- <uni-row class="demo-uni-row mb-10 demo-uni-row-unborder"> </view>
<uni-col :span="6" class="_title"> <view class="only-read-row">
<view>实测时间</view> <uni-row class="demo-uni-row mb-10">
</uni-col> <uni-col :span="7" class="_title">
<uni-col :span="16"> <view>测量孔深度</view>
<view class="_content unaffix"> </uni-col>
<view>{{form['realTestTime'] || '-'}}</view> <uni-col :span="15">
</view> <view class="_content">
</uni-col> {{form['actualDepth'] || '-'}}
</uni-row> --> </view>
</uni-col>
</uni-row>
</view>
<view class="only-read-row">
<uni-row class="demo-uni-row mb-10 demo-uni-row-unborder">
<uni-col :span="7" class="_title">
<view>测量孔水位</view>
</uni-col>
<uni-col :span="15">
<view class="_content">
<view>{{form['actualWaterLevel'] || '-'}}</view>
</view>
</uni-col>
</uni-row>
</view>
<view class="demo-uni-row">
<uni-row class="demo-uni-row mb-10">
<uni-col :span="7" class="_title">
<view>备注</view>
</uni-col>
<uni-col :span="15">
<input class="uni-input inputEle" focus placeholder="请输入" />
</uni-col>
</uni-row>
</view>
</view> </view>
<!-- <view style="display: flex; justify-content: flex-end; align-items: center; margin-right: 20rpx;padding-top: 10rpx;">
<switch checked style="transform:scale(0.7)" @change="showResultChange" />不显示实测结果直接保存
</view> -->
<view class="footer-wrapper" v-show="connected"> <view class="footer-wrapper" v-show="connected">
<view class="funcBtn" :class="{loading: btnLoading}" @tap="gosend('START')"> <view class="funcBtn end" @tap="resetForm">
{{btnLoading ? '测量中':'开始测量'}} 取消
</view> </view>
<view class="funcBtn end" @tap="gosend('STOP')"> <view class="funcBtn end" @tap="saveData">
结束测量 保存
</view> </view>
</view> </view>
<view class="" v-show="!connected" style="text-align: center; color: darkgray; margin-top:20rpx;"> <view class="" v-show="!connected" style="text-align: center; color: darkgray; margin-top:20rpx;">
...@@ -143,8 +128,8 @@ ...@@ -143,8 +128,8 @@
孔实测结果 孔实测结果
</view> </view>
<view class="_body"> <view class="_body">
<p>实测孔深： <span>{{form['realTestHoleDepth']|| '-'}}m</span></p> <p>实测孔深： <span>{{form['actualDepth']|| '-'}}m</span></p>
<p>实测倾角： <span>{{form['realTestInclination']|| '-'}}°</span></p> <p>实测倾角： <span>{{form['actualWaterLevel']|| '-'}}°</span></p>
</view> </view>
<view class="funcBtn _btn" @click="saveTestResult"> <view class="funcBtn _btn" @click="saveTestResult">
保存测量结果 保存测量结果
...@@ -156,11 +141,20 @@ ...@@ -156,11 +141,20 @@
<script> <script>
import CustomNavbar from '@/pages/component/CustomNavbar.vue'; import CustomNavbar from '@/pages/component/CustomNavbar.vue';
import { blueToothMixin } from '../../common/mixin.js' import {
blueToothMixin
} from '../../common/mixin.js'
import { import {
getCurrentTime, getCurrentTime,
showCustomModal, showCustomToast,
showCustomModal
} from '../../common/util.js' } from '../../common/util.js'
import {
getSelectList,
getDetailInfo,
saveData,
getDict
} from '../../api/blueToothMeasure.js'
export default { export default {
mixins: [blueToothMixin], mixins: [blueToothMixin],
components: { components: {
...@@ -171,6 +165,17 @@ ...@@ -171,6 +165,17 @@
navBarTitle: '炮孔测量', navBarTitle: '炮孔测量',
redirectUrl: '/pages/home/blueSearch?refer=blueMeasure', redirectUrl: '/pages/home/blueSearch?refer=blueMeasure',
// 表单数据相关 // 表单数据相关
zhuangyaoDict: [],
form: {
'productName': '',
'artilleryAreaName': '',
'cannonHoleArrayNum': '',
'cannonHoleNum': '',
'status': '',
'expectedDepth': '',
'actualDepth': '',
'actualWaterLevel': ''
},
dataList: [], dataList: [],
selectListLv1: [], selectListLv1: [],
selectListLv2: [], selectListLv2: [],
...@@ -179,26 +184,41 @@ ...@@ -179,26 +184,41 @@
selectListLv5: [], selectListLv5: [],
}; };
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function(options) { onLoad: function(options) {
uni.hideLoading() uni.hideLoading()
this.dataList = uni.getStorageSync('importDataList') || [] // this.dataList = uni.getStorageSync('importDataList') || []
// console.log('this.dataList',JSON.stringify(this.dataList)); // console.log('this.dataList',JSON.stringify(this.dataList));
this.getDictInfo()
this.getSelectListLv1() this.getSelectListLv1()
this.initLink()
// this.initLink()
}, },
methods: { methods: {
async getDictInfo() {
let res = await getDict({
type: 'zhuangyao_type'
})
if(res){
this.zhuangyaoDict = res.map((item) => {
return {
text: item.dictLabel,
value: item.dictValue
}
})
}
},
changeLvCommonReset(lvNum) { // 下拉列表值改变，清空级联数据公共方法 changeLvCommonReset(lvNum) { // 下拉列表值改变，清空级联数据公共方法
let newFildArr = [] let newFildArr = []
let newDataListSelectArr = [] let newDataListSelectArr = []
let formFieldArr = [ let formFieldArr = [
'engineeringName', 'middleSectionName', 'segmentName', 'productName', 'artilleryAreaName', 'cannonHoleArrayNum', 'cannonHoleNum',
'alignmentLineName', 'boreholeNumber', 'status', 'expectedDepth',
'throughHole', 'designHoleDepth', 'designInclination' 'actualDepth', 'actualWaterLevel'
] ]
...@@ -218,15 +238,28 @@ ...@@ -218,15 +238,28 @@
}); });
}, },
getSelectListLv1() { async getSelectListLv1() {
const dataArr = JSON.parse(JSON.stringify(this.dataList)) // const dataArr = JSON.parse(JSON.stringify(this.dataList))
// 获取第一个数据列表 // // 获取第一个数据列表
this.selectListLv1 = getCascadeList(dataArr, { // this.selectListLv1 = getCascadeList(dataArr, {
engineeringName: null // productName: null
}).map((item) => { // }).map((item) => {
// return {
// text: item.productName,
// value: item.productName
// }
// })
const res = await getSelectList({
productName: '',
artilleryAreaName: '',
cannonHoleArrayNum: '',
cannonHoleNum: ''
})
console.log('响应res', res)
this.selectListLv1 = res.map((item) => {
return { return {
text: item.engineeringName, text: item,
value: item.engineeringName value: item
} }
}) })
}, },
...@@ -238,17 +271,30 @@ ...@@ -238,17 +271,30 @@
}, },
getSelectListLv2(prevLvVal) { async getSelectListLv2(prevLvVal) {
const dataArr = JSON.parse(JSON.stringify(this.dataList)) // const dataArr = JSON.parse(JSON.stringify(this.dataList))
this.selectListLv2 = getCascadeList(dataArr, { // this.selectListLv2 = getCascadeList(dataArr, {
engineeringName: prevLvVal, // productName: prevLvVal,
}).map((item) => { // }).map((item) => {
// return {
// text: item.artilleryAreaName,
// value: item.artilleryAreaName
// }
// })
// //console.log('this.selectListLv2', this.selectListLv2)
const res = await getSelectList({
productName: prevLvVal,
artilleryAreaName: '',
cannonHoleArrayNum: '',
cannonHoleNum: ''
})
console.log('响应res', res)
this.selectListLv2 = res.map((item) => {
return { return {
text: item.middleSectionName, text: item,
value: item.middleSectionName value: item
} }
}) })
//console.log('this.selectListLv2', this.selectListLv2)
}, },
changeLv2(e) { changeLv2(e) {
//console.log("e:", e); //console.log("e:", e);
...@@ -257,15 +303,28 @@ ...@@ -257,15 +303,28 @@
this.getSelectListLv3(e) this.getSelectListLv3(e)
}, },
getSelectListLv3(prevLvVal) { async getSelectListLv3(prevLvVal) {
const dataArr = JSON.parse(JSON.stringify(this.dataList)) // const dataArr = JSON.parse(JSON.stringify(this.dataList))
this.selectListLv3 = getCascadeList(dataArr, { // this.selectListLv3 = getCascadeList(dataArr, {
engineeringName: this.form.engineeringName, // productName: this.form.productName,
middleSectionName: prevLvVal // artilleryAreaName: prevLvVal
}).map((item) => { // }).map((item) => {
// return {
// text: item.cannonHoleArrayNum,
// value: item.cannonHoleArrayNum
// }
// })
const res = await getSelectList({
productName: this.form.productName,
artilleryAreaName: prevLvVal,
cannonHoleArrayNum: '',
cannonHoleNum: ''
})
console.log('响应res', res)
this.selectListLv3 = res.map((item) => {
return { return {
text: item.segmentName, text: item,
value: item.segmentName value: item
} }
}) })
}, },
...@@ -275,75 +334,73 @@ ...@@ -275,75 +334,73 @@
this.getSelectListLv4(e) this.getSelectListLv4(e)
}, },
getSelectListLv4(prevLvVal) { async getSelectListLv4(prevLvVal) {
const dataArr = JSON.parse(JSON.stringify(this.dataList)) // const dataArr = JSON.parse(JSON.stringify(this.dataList))
this.selectListLv4 = getCascadeList(dataArr, { // this.selectListLv4 = getCascadeList(dataArr, {
engineeringName: this.form.engineeringName, // productName: this.form.productName,
middleSectionName: this.form.middleSectionName, // artilleryAreaName: this.form.artilleryAreaName,
segmentName: prevLvVal // cannonHoleArrayNum: prevLvVal
}).map((item) => { // }).map((item) => {
return { // return {
text: item.alignmentLineName, // text: item.cannonHoleNum,
value: item.alignmentLineName // value: item.cannonHoleNum
} // }
// })
const res = await getSelectList({
productName: this.form.productName,
artilleryAreaName: this.form.artilleryAreaName,
cannonHoleArrayNum: prevLvVal,
cannonHoleNum: ''
}) })
}, console.log('响应res', res)
changeLv4(e) { this.selectListLv4 = res.map((item) => {
this.changeLvCommonReset(4)
//console.log("e:", e);
this.getSelectListLv5(e)
},
getSelectListLv5(prevLvVal) {
const dataArr = JSON.parse(JSON.stringify(this.dataList))
this.selectListLv5 = getCascadeList(dataArr, {
engineeringName: this.form.engineeringName,
middleSectionName: this.form.middleSectionName,
segmentName: this.form.segmentName,
alignmentLineName: prevLvVal,
}).map((item) => {
return { return {
text: item.boreholeNumber, text: item,
value: item.boreholeNumber value: item
} }
}) })
}, },
changeLv5(e) { changeLv4(e) {
//console.log("e:", e); // this.changeLvCommonReset(4)
// //console.log("e:", e);
// this.getSelectListLv5(e)
this.getDetailInfo(e) this.getDetailInfo(e)
}, },
getDetailInfo() {
const selectedRows = this.dataList.filter((item) => { // getSelectListLv5(prevLvVal) {
return item['engineeringName'] == this.form['engineeringName'] && // const dataArr = JSON.parse(JSON.stringify(this.dataList))
item['middleSectionName'] == this.form['middleSectionName'] && // this.selectListLv5 = getCascadeList(dataArr, {
item['segmentName'] == this.form['segmentName'] && // productName: this.form.productName,
item['alignmentLineName'] == this.form['alignmentLineName'] && // artilleryAreaName: this.form.artilleryAreaName,
item['boreholeNumber'] == this.form['boreholeNumber'] // cannonHoleArrayNum: this.form.cannonHoleArrayNum,
}) // cannonHoleNum: prevLvVal,
//console.log('selectedRows', selectedRows.length, JSON.stringify(selectedRows)) // }).map((item) => {
if (selectedRows.length > 1) { // return {
showCustomModal({ // text: item.boreholeNumber,
content: `匹配结果超过1条，请检查导入模板中的数据\n // value: item.boreholeNumber
【工程名称：${selectedRows[0]['engineeringName']}】\n // }
【中段名称：${selectedRows[0]['middleSectionName']}】\n // })
【分段名称：${selectedRows[0]['segmentName']}】\n // },
【排位线名称：${selectedRows[0]['alignmentLineName']}】\n // changeLv5(e) {
【炮孔编号：${selectedRows[0]['boreholeNumber']}】\n // //console.log("e:", e);
` // this.getDetailInfo(e)
}) // },
async getDetailInfo() {
let res = await getDetailInfo()
if (res) {
this.form['status'] = res['status']
this.form['expectedDepth'] = res['expectedDepth']
this.form['designInclination'] = res['designInclination']
return return
} }
if (selectedRows.length === 1) { showCustomToast({
this.form['throughHole'] = selectedRows[0]['throughHole'] title: '暂无详情信息'
this.form['designHoleDepth'] = selectedRows[0]['designHoleDepth'] })
this.form['designInclination'] = selectedRows[0]['designInclination']
//console.log('this.form', this.form)
}
}, },
saveFormData2Local() { // 保存当前表单数据到本地 async saveData() { // 保存当前表单数据到本地
let formFieldArr = [ let formFieldArr = [
'engineeringName', 'middleSectionName', 'segmentName', 'productName', 'artilleryAreaName', 'cannonHoleArrayNum',
'alignmentLineName', 'boreholeNumber' 'cannonHoleNum', 'boreholeNumber'
] ]
var validFlag = true var validFlag = true
for (var i = 0; i < formFieldArr.length; i++) { for (var i = 0; i < formFieldArr.length; i++) {
...@@ -359,28 +416,34 @@ ...@@ -359,28 +416,34 @@
}) })
return return
} }
const index = this.dataList.findIndex((item) => { // const index = this.dataList.findIndex((item) => {
return item.engineeringName === this.form.engineeringName && // return item.productName === this.form.productName &&
item.middleSectionName === this.form.middleSectionName && // item.artilleryAreaName === this.form.artilleryAreaName &&
item.segmentName === this.form.segmentName && // item.cannonHoleArrayNum === this.form.cannonHoleArrayNum &&
item.alignmentLineName === this.form.alignmentLineName && // item.cannonHoleNum === this.form.cannonHoleNum &&
item.boreholeNumber === this.form.boreholeNumber // item.boreholeNumber === this.form.boreholeNumber
}) // })
if (index > -1) { if (this.form.measureDepth && this.form.shuiwei) {
this.$set(this.dataList[index], 'realTestInclination', this.form.realTestInclination);
this.$set(this.dataList[index], 'realTestHoleDepth', this.form.realTestHoleDepth); let res = await saveData({
this.$set(this.dataList[index], 'realTestTime', getCurrentTime()); ...this.form
uni.setStorageSync('importDataList', JSON.parse(JSON.stringify(this.dataList)))
uni.showToast({
title: '已保存测量结果',
icon: false
})
this.resetForm()
} else {
showCustomModal({
content: '保存失败，本地数据未匹配',
}) })
// this.$set(this.dataList[index], 'actualWaterLevel', this.form.actualWaterLevel);
// this.$set(this.dataList[index], 'actualDepth', this.form.actualDepth);
// this.$set(this.dataList[index], 'remark', getCurrentTime());
// uni.setStorageSync('importDataList', JSON.parse(JSON.stringify(this.dataList)))
if (res) {
uni.showToast({
title: '保存成功',
icon: false
})
this.resetForm()
}
return
} }
showCustomModal({
content: '孔深水位不能为空',
})
}, },
} }
}; };
...@@ -393,63 +456,106 @@ ...@@ -393,63 +456,106 @@
// let sonArr = new Set() // let sonArr = new Set()
if (paramObj.middleSectionName && paramObj.engineeringName && paramObj.segmentName && paramObj if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum && paramObj
.alignmentLineName) { // 返回第5级 .cannonHoleNum) { // 返回第5级
const tempArr = originArr.filter((item) => { const tempArr = originArr.filter((item) => {
return item.engineeringName === paramObj.engineeringName && return item.productName === paramObj.productName &&
item.middleSectionName === paramObj.middleSectionName && item.artilleryAreaName === paramObj.artilleryAreaName &&
item.segmentName === paramObj.segmentName && item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum &&
item.alignmentLineName === paramObj.alignmentLineName item.cannonHoleNum === paramObj.cannonHoleNum
}) })
const uniqueArray = Array.from(new Map(tempArr.map(item => [item.boreholeNumber, item])).values()); const uniqueArray = Array.from(new Map(tempArr.map(item => [item.boreholeNumber, item])).values());
return uniqueArray return uniqueArray
} }
if (paramObj.middleSectionName && paramObj.engineeringName && paramObj.segmentName) { // 返回第4级 if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum) { // 返回第4级
const tempArr = originArr.filter((item) => { const tempArr = originArr.filter((item) => {
return item.engineeringName === paramObj.engineeringName && return item.productName === paramObj.productName &&
item.middleSectionName === paramObj.middleSectionName && item.artilleryAreaName === paramObj.artilleryAreaName &&
item.segmentName === paramObj.segmentName item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum
}) })
const uniqueArray = Array.from(new Map(tempArr.map(item => [item.alignmentLineName, item])).values()); const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleNum, item])).values());
return uniqueArray return uniqueArray
} }
if (paramObj.middleSectionName && paramObj.engineeringName) { // 返回第三级 if (paramObj.artilleryAreaName && paramObj.productName) { // 返回第三级
const tempArr = originArr.filter((item) => { const tempArr = originArr.filter((item) => {
return item.engineeringName === paramObj.engineeringName && return item.productName === paramObj.productName &&
item.middleSectionName === paramObj.middleSectionName item.artilleryAreaName === paramObj.artilleryAreaName
}) })
const uniqueArray = Array.from(new Map(tempArr.map(item => [item.segmentName, item])).values()); const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleArrayNum, item])).values());
return uniqueArray return uniqueArray
} }
if (paramObj.engineeringName) { // 返回2级列表 if (paramObj.productName) { // 返回2级列表
const tempArr = originArr.filter((item) => { // 二级列表基于1级选择后的值进行过滤 const tempArr = originArr.filter((item) => { // 二级列表基于1级选择后的值进行过滤
return item.engineeringName === paramObj.engineeringName return item.productName === paramObj.productName
}) })
const uniqueArray = Array.from(new Map(tempArr.map(item => [item.middleSectionName, item])).values()); const uniqueArray = Array.from(new Map(tempArr.map(item => [item.artilleryAreaName, item])).values());
return uniqueArray return uniqueArray
} }
if (!paramObj.engineeringName) { // 返回1级列表 if (!paramObj.productName) { // 返回1级列表
const uniqueArray = Array.from(new Map(originArr.map(item => [item.engineeringName, item])).values()); const uniqueArray = Array.from(new Map(originArr.map(item => [item.productName, item])).values());
return uniqueArray return uniqueArray
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
::v-deep .uni-select__input-placeholder{ // placeholder样式调整
font-size: 30rpx !important;
}
.inputEle{
height: 110rpx;
display: flex;
align-items: center;
}
.uni-col-7{
font-size: 32rpx;
font-weight: bold;
color: #000000;
line-height: 110rpx;
}
.demo-uni-row{
line-height: 70rpx;
padding-left: 15rpx;
.uni-select{
height: 108rpx;
}
}
.only-read-row{
background: #E3E6EC !important;
height: 108rpx;
align-items: center;
display: flex;
line-height: 70rpx;
position: relative;
padding-left: 13rpx;
&:after {
content: '米';
width: 70rpx;
height: 70rpx;
position: absolute;
right: 48rpx;
top: 50%;
transform: translateY(-50%);
text-align: center;
line-height: 70rpx;
font-size: 29rpx;
color: #000000;
}
}
::v-deep .uni-row::after { ::v-deep .uni-row::after {
clear: both; clear: both;
width: 608rpx; width: 608rpx;
border-bottom: 1rpx solid #E3E6EC; border-bottom: 1rpx solid #E3E6EC;
transform: translateX(28rpx); transform: translateX(18rpx);
} }
.pageWrapper { .pageWrapper {
width: 100vw; width: 100vw;
height: calc(100vh-44rpx); height: calc(100vh-44rpx);
...@@ -465,25 +571,6 @@ ...@@ -465,25 +571,6 @@
padding-right: 15rpx; padding-right: 15rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
&.auto {
margin-top: 30rpx;
background-color: #D1E5FB;
.demo-uni-row {
padding-top: 10rpx;
padding-bottom: 10rpx;
// border-bottom: 1px solid #F1F8FF;
}
::v-deep .uni-row::after {
border-bottom-color: #FFFFFF;
}
.demo-uni-row-unborder::after{ // 特殊没有底部边线 处理
border-bottom-color: transparent;
}
}
.sumary-title { .sumary-title {
position: relative; position: relative;
padding-left: 50rpx; padding-left: 50rpx;
...@@ -517,20 +604,16 @@ ...@@ -517,20 +604,16 @@
} }
} }
.mb-10 { // ._title {
margin-bottom: 10rpx; // // border: 1px solid lightgray;
} // height: 70rpx;
// text-align: center;
._title { // line-height: 70rpx;
// border: 1px solid lightgray; // margin-right: 10rpx;
height: 70rpx; // font-size: 32rpx;
text-align: center; // font-weight: bold;
line-height: 70rpx; // color: #000000;
margin-right: 10rpx; // }
font-size: 29rpx;
font-weight: bold;
color: #000000;
}
._content { ._content {
// border: 1px solid lightgray; // border: 1px solid lightgray;
...@@ -539,19 +622,19 @@ ...@@ -539,19 +622,19 @@
padding-left: 20rpx; padding-left: 20rpx;
position: relative; position: relative;
&:after { // &:after {
content: 'm'; // content: 'm';
width: 70rpx; // width: 70rpx;
height: 70rpx; // height: 70rpx;
// border-left: 1px solid lightgray; // // border-left: 1px solid lightgray;
position: absolute; // position: absolute;
right: -12rpx; // right: -12rpx;
top: 0; // top: 0;
text-align: center; // text-align: center;
line-height: 70rpx; // line-height: 70rpx;
font-size: 29rpx; // font-size: 29rpx;
color: #000000; // color: #000000;
} // }
} }
.funcBtn { .funcBtn {
...@@ -583,12 +666,6 @@ ...@@ -583,12 +666,6 @@
} }
.angle {
&:after {
content: '°';
}
}
.unaffix { .unaffix {
&:after { &:after {
display: none; display: none;
...@@ -614,6 +691,7 @@ ...@@ -614,6 +691,7 @@
height: 10px; height: 10px;
width: 10px; width: 10px;
} }
.blank { .blank {
height: 150rpx; height: 150rpx;
} }
......
pages/home/home.vue
View file @ 4954326f
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<span>设备测试</span> <span>设备测试</span>
<button size="mini" class="funcBtn" type="primary" @click="navTo('measureTest')">测量</button> <button size="mini" class="funcBtn" type="primary" @click="navTo('measureTest')">测量</button>
</p> --> </p> -->
<p class="list-item"> <p class="list-item" @click="navTo('measure')">
<image src="/static/image/paokong/measure.png" alt="" /> <image src="/static/image/paokong/measure.png" alt="" />
<span>炮孔测量</span> <span>炮孔测量</span>
<!-- <button size="mini" class="funcBtn" type="primary" @click="navTo('measure')">测量</button> --> <!-- <button size="mini" class="funcBtn" type="primary" @click="navTo('measure')">测量</button> -->
...@@ -181,7 +181,10 @@ ...@@ -181,7 +181,10 @@
width: 646rpx; width: 646rpx;
height: 300rpx; height: 300rpx;
background: linear-gradient(-90deg, #F6F9FF 31%, #E4EFFF 100%); // background-color: linear-gradient(-90deg, #F6F9FF 31%, #E4EFFF 100%);
background-image: url('/static/image/paokong/home-title-bg.png');
background-position: center right;
background-size: cover;
box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(7,36,72,0.11); box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(7,36,72,0.11);
border-radius: 10rpx; border-radius: 10rpx;
border: 2px solid #FFFFFF; border: 2px solid #FFFFFF;
......
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