sunliwei/detection-business
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sunliwei:93b222ee38117ad969a0bb0294878da9c026f890
Branches Tags
sunliwei:master
...
compare: sunliwei:2fc6825cf57b7e9659f7c83513062da257a4d7e5
Branches Tags
sunliwei:master

4 Commits
93b222ee38 ... 2fc6825cf5

Author SHA1 Message Date
QJK
2fc6825cf5 11.9 2024-11-09 18:20:01 +08:00
QJK
7d50c4b699 Merge remote-tracking branch 'origin/master' 2024-11-09 18:10:17 +08:00
QJK
46e81a48fb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pages/index/selectProject.vue
 2024-11-09 17:58:56 +08:00
QJK
b8fc167109 11.9 2024-11-09 17:56:06 +08:00
3 changed files with 1195 additions and 1153 deletions
Show Stats Expand all files Collapse all files

4
config.js
View File

@ -1,7 +1,7 @@
// 应用全局配置 // 应用全局配置
module.exports = { module.exports = {
//baseUrl: 'https://www.nuoyunr.com/admin-api', // baseUrl: 'https://www.nuoyunr.com/admin-api',
baseUrl: 'http://127.0.0.1:48080/admin-api', baseUrl: 'http://192.168.31.130:48080/admin-api',
imagesUrl: 'http://www.nuoyunr.com/lananRsc', imagesUrl: 'http://www.nuoyunr.com/lananRsc',
baseImageUrl: 'https://www.nuoyunr.com/minio', baseImageUrl: 'https://www.nuoyunr.com/minio',
// 应用信息 // 应用信息

248
pages/index/orderdetails.vue
View File

@ -89,22 +89,19 @@
</view> </view>
</view> </view>
<view class="x-box" v-for="(item,index) in detailData.stepInfos"> <view class="" v-for="(item,index) in detailData.stepInfos" :key="index">
<view class="x-box">
<view class="h-title" style="display: flex;align-items: center;justify-content: space-between;"> <view class="h-title" style="display: flex;align-items: center;justify-content: space-between;">
<view class="qiu_">{{index +1}}</view>
<text>{{ item.title }}</text> <text>{{ item.title }}</text>
<text class="times">{{ item.createTime }}</text> <text class="times">{{ item.createTime }}</text>
</view> </view>
<view class=""> <view class="">
<text>{{ item.content }}</text> <text>{{ item.content }}</text>
</view> </view>
<!-- <view class="imgs-warp">
<view class="imgss" v-for="(item,index) in item.images.split(',')" :key="index">
<image :src="baseUrl+item" mode=""></image>
</view> </view>
</view> --> <view class="xb_" v-if="index != detailData.stepInfos.length - 1 ">↓ </view>
</view> </view>
<view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1" <view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1"
@click="hge = true;getProject()"> @click="hge = true;getProject()">
<view class="">结束检测</view> <view class="">结束检测</view>
@ -127,14 +124,8 @@
<text>施工图片：</text> <text>施工图片：</text>
<!-- <input type="text" placeholder="请输入内容"> --> <!-- <input type="text" placeholder="请输入内容"> -->
</view> </view>
<u-upload <u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
:fileList="fileList1" :maxCount="10"></u-upload>
@afterRead="afterRead"
@delete="deletePic"
name="1"
multiple
:maxCount="10"
></u-upload>
<view class="t-title">是否合格</view> <view class="t-title">是否合格</view>
<view class="on-inputx"> <view class="on-inputx">
@ -193,8 +184,8 @@
</view> </view>
<view class="warp-box"> <view class="warp-box">
<view class="lan-box" :class=" {'lantong':payType == item.value } " <view class="lan-box" :class=" {'lantong':payType == item.value } " v-for="(item,index) in shelist"
v-for="(item,index) in shelist" :key="index" @click="xuanxiaolan(item)"> :key="index" @click="xuanxiaolan(item)">
{{ item.label }} {{ item.label }}
</view> </view>
</view> </view>
@ -206,8 +197,7 @@
<text>备注：</text> <text>备注：</text>
</view> </view>
<u--textarea v-model="payRemark" placeholder="如果存在组合付款方式,请在备注中描述清楚" <u--textarea v-model="payRemark" placeholder="如果存在组合付款方式,请在备注中描述清楚" border="bottom"></u--textarea>
border="bottom"></u--textarea>
<view class="bottomx" @click="tiijiao()" style="margin-top: 10px;"> <view class="bottomx" @click="tiijiao()" style="margin-top: 10px;">
@ -220,19 +210,18 @@
keyName="label"></u-picker> keyName="label"></u-picker>
<uni-popup ref="alertDialog" type="dialog"> <uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog cancelText="关闭" confirmText="确定" title="通知" content="您确定制证完成吗" <uni-popup-dialog cancelText="关闭" confirmText="确定" title="通知" content="您确定制证完成吗" @confirm="dialogConfirm"
@confirm="dialogConfirm"
@close="dialogClose"></uni-popup-dialog> @close="dialogClose"></uni-popup-dialog>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
<script> <script>
import config from '@/config' import config from '@/config'
import request from '../../utils/request'; import request from '../../utils/request';
import upload from '@/utils/upload.js' import upload from '@/utils/upload.js'
export default { export default {
data() { data() {
return { return {
baseImageUrl: this.$baseImageUrl, baseImageUrl: this.$baseImageUrl,
@ -248,8 +237,8 @@ export default {
tbindex: 1, tbindex: 1,
isOnline: 1, isOnline: 1,
hge: false, hge: false,
roleSelect:'', roleSelect: '',
orImages:false, orImages: false,
show: false, show: false,
xling: false, xling: false,
baseUrl: this.$baseUrl, baseUrl: this.$baseUrl,
@ -302,7 +291,7 @@ export default {
uni.getStorage({ uni.getStorage({
key: 'roleSelect', key: 'roleSelect',
success: (res) => { success: (res) => {
console.log('读取缓存',res) console.log('读取缓存', res)
this.roleSelect = res.data this.roleSelect = res.data
} }
}) })
@ -633,21 +622,21 @@ export default {
this[`fileList${event.name}`].splice(event.index, 1) this[`fileList${event.name}`].splice(event.index, 1)
}, },
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.lantong { .lantong {
background-color: #0D2E8D !important; background-color: #0D2E8D !important;
color: white; color: white;
} }
.lan-box { .lan-box {
font-size: 14px; font-size: 14px;
margin: 5px 10px; margin: 5px 10px;
padding: 5px; padding: 5px;
@ -655,25 +644,25 @@ image {
background-color: #F4F4F4; background-color: #F4F4F4;
border-radius: 4px; border-radius: 4px;
} }
.warp-box { .warp-box {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
} }
.content { .content {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #F4F4F4; background: #F4F4F4;
} }
.top-heder { .top-heder {
width: 100%; width: 100%;
// height: 46px; // height: 46px;
background: white; background: white;
@ -685,24 +674,24 @@ image {
padding-top: 45px; padding-top: 45px;
padding-bottom: 15px; padding-bottom: 15px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.t-title { .t-title {
font-size: 17px; font-size: 17px;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.t-left { .t-left {
width: 10%; width: 10%;
} }
.t-you { .t-you {
height: 100%; height: 100%;
width: 10%; width: 10%;
} }
.x-box { .x-box {
width: 95%; width: 95%;
margin: 10px auto; margin: 10px auto;
background: #FFFFFF; background: #FFFFFF;
@ -713,9 +702,9 @@ image {
// display: flex; // display: flex;
// align-items: center; // align-items: center;
// justify-content: center; // justify-content: center;
} }
.bottomx { .bottomx {
margin: 0 auto; margin: 0 auto;
width: 225px; width: 225px;
height: 46px; height: 46px;
@ -726,9 +715,9 @@ image {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #0D2E8D; color: #0D2E8D;
} }
.bottomxx { .bottomxx {
position: fixed; position: fixed;
right: 10px; right: 10px;
bottom: 150px; bottom: 150px;
@ -742,18 +731,18 @@ image {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: white; color: white;
} }
.touxiang { .touxiang {
width: 50px; width: 50px;
height: 50px; height: 50px;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
margin: 10px auto; margin: 10px auto;
} }
.sanniu { .sanniu {
width: 105px; width: 105px;
height: 35px; height: 35px;
background: #0D2E8D; background: #0D2E8D;
@ -766,9 +755,9 @@ image {
color: #FFFFFF; color: #FFFFFF;
line-height: 15px; line-height: 15px;
margin: 0 auto; margin: 0 auto;
} }
.xiamxia { .xiamxia {
width: 30%; width: 30%;
height: 30px; height: 30px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
@ -781,9 +770,9 @@ image {
color: #FFFFFF; color: #FFFFFF;
line-height: 15px; line-height: 15px;
margin: 15px auto; margin: 15px auto;
} }
.annniu { .annniu {
width: 90%; width: 90%;
height: 45px; height: 45px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
@ -796,9 +785,9 @@ image {
color: #FFFFFF; color: #FFFFFF;
line-height: 15px; line-height: 15px;
margin: 15px auto; margin: 15px auto;
} }
.banniu { .banniu {
width: 20%; width: 20%;
height: 30px; height: 30px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
@ -809,28 +798,27 @@ image {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
.box { .box {}
}
.box-dis { .box-dis {
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
// border-bottom: 1px solid #EEEEEE; // border-bottom: 1px solid #EEEEEE;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.shop-img { .shop-img {
width: 125px; width: 125px;
height: 125px; height: 125px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
margin-right: 10px; margin-right: 10px;
} }
.dis-hui { .dis-hui {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -838,23 +826,23 @@ image {
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-bottom: 5px; margin-bottom: 5px;
} }
.times { .times {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 25px; margin-left: 25px;
} }
.h-title { .h-title {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 5px;
} }
.box-top { .box-top {
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
@ -862,9 +850,9 @@ image {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
} }
.t-input { .t-input {
width: 90%; width: 90%;
margin: 20px auto; margin: 20px auto;
border: 1px solid #0D2E8D; border: 1px solid #0D2E8D;
@ -872,61 +860,61 @@ image {
box-sizing: border-box; box-sizing: border-box;
padding: 2px 5px; padding: 2px 5px;
} }
.on-input { .on-input {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 15px auto; margin: 15px auto;
} }
.on-inputx { .on-inputx {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
margin: 15px auto; margin: 15px auto;
} }
.bottom-input { .bottom-input {
border-top: 1px solid #F4F4F4; border-top: 1px solid #F4F4F4;
box-sizing: border-box; box-sizing: border-box;
padding-top: 20px; padding-top: 20px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
} }
.o-left { .o-left {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
} }
.o-right { .o-right {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }
.o-zui { .o-zui {
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.popup-box { .popup-box {
overflow: hidden; overflow: hidden;
border-radius: 8px; border-radius: 8px;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
width: 100%; width: 100%;
background-color: white; background-color: white;
} }
.sousuo { .sousuo {
width: 95%; width: 95%;
margin: 0 auto; margin: 0 auto;
margin-left: 0px; margin-left: 0px;
@ -943,24 +931,24 @@ image {
input { input {
width: 80%; width: 80%;
} }
} }
.list-box { .list-box {
width: 100%; width: 100%;
height: 300px; height: 300px;
overflow: hidden; overflow: hidden;
box-sizing: border-box; box-sizing: border-box;
} }
.list_scroll { .list_scroll {
height: 100%; // 需设置高度 height: 100%; // 需设置高度
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.list-qiu { .list-qiu {
width: 95%; width: 95%;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
box-sizing: border-box; box-sizing: border-box;
@ -968,16 +956,16 @@ image {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.tel { .tel {
margin-left: 5px; margin-left: 5px;
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
} }
.bd-tel { .bd-tel {
width: 100%; width: 100%;
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE;
box-sizing: border-box; box-sizing: border-box;
@ -987,17 +975,17 @@ image {
justify-content: center; justify-content: center;
color: #0D2E8D; color: #0D2E8D;
} }
.imgs-warp { .imgs-warp {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 10px; margin-top: 10px;
} }
.imgss { .imgss {
width: 32%; width: 32%;
height: 110px; height: 110px;
overflow: hidden; overflow: hidden;
@ -1007,9 +995,9 @@ image {
height: 100%; height: 100%;
} }
} }
.anniu { .anniu {
box-sizing: border-box; box-sizing: border-box;
padding: 2px 10px; padding: 2px 10px;
margin: 0px 10px; margin: 0px 10px;
@ -1021,9 +1009,9 @@ image {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.an { .an {
box-sizing: border-box; box-sizing: border-box;
padding: 2px 10px; padding: 2px 10px;
margin: 0px 10px; margin: 0px 10px;
@ -1035,15 +1023,15 @@ image {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.box_ { .box_ {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.box_button { .box_button {
border-radius: 6px; border-radius: 6px;
border: 1px solid #999; border: 1px solid #999;
display: flex; display: flex;
@ -1054,9 +1042,9 @@ image {
padding: 5px 10px; padding: 5px 10px;
margin-right: 5px; margin-right: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.box_button_x { .box_button_x {
border-radius: 6px; border-radius: 6px;
border: 1px solid #0D2E8D; border: 1px solid #0D2E8D;
display: flex; display: flex;
@ -1069,5 +1057,27 @@ image {
margin-bottom: 5px; margin-bottom: 5px;
background: #0D2E8D; background: #0D2E8D;
color: #fff; color: #fff;
} }
.qiu_ {
width: 35px;
height: 35px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
color: #fff;
background: #0D2E8D;
}
.xb_ {
width: 35px;
height: 35px;
display: flex;
align-items: center;
justify-content: center;
color: #0D2E8D;
font-size: 22px;
font-weight: bold;
}
</style> </style>

100
pages/index/selectProject.vue
View File

@ -24,11 +24,19 @@
<view class="title_"> <view class="title_">
已选检测项目： 已选检测项目：
</view> </view>
<u-steps activeColor="#0D2E8D" direction="column"> <view style="margin-bottom: 15px;" v-for="(item,index) in selectProject" :key="index">
<view class="steps_">
<view class="index_">{{index+1}}</view>
<view style="font-size: 20px; font-weight: bold;">{{item.projectName}}</view>
</view>
<view class="xb_" v-if="index != selectProject.length - 1 ">↓ </view>
</view>
<!-- <u-steps activeColor="#0D2E8D" direction="column">
<u-steps-item :iconSize="iconSize" v-for="item in selectProject" :title="item.projectName"> <u-steps-item :iconSize="iconSize" v-for="item in selectProject" :title="item.projectName">
</u-steps-item> </u-steps-item>
</u-steps> </u-steps> -->
</view> </view>
@ -42,9 +50,9 @@
</template> </template>
<script> <script>
import request from '../../utils/request'; import request from '../../utils/request';
export default { export default {
data() { data() {
return { return {
iconSize: 130, iconSize: 130,
@ -98,35 +106,33 @@ export default {
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
::v-deep .step-style{ .steps_ {
.u-steps-item__content{ display: flex;
.u-text__value { align-items: center;
font-size:80rpx !important;
line-height: 90rpx !important;
} }
}
} .cont_box {
.cont_box {
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
} }
.title_ { .title_ {
font-weight: bold; font-weight: bold;
margin-bottom: 5px; margin-bottom: 5px;
} }
.box_ { .box_ {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.box_button_x { .box_button_x {
border-radius: 6px; border-radius: 6px;
border: 1px solid #0D2E8D; border: 1px solid #0D2E8D;
display: flex; display: flex;
@ -139,9 +145,10 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
background: #0D2E8D; background: #0D2E8D;
color: #fff; color: #fff;
} }
.box_button {
.box_button {
border-radius: 6px; border-radius: 6px;
border: 1px solid #999; border: 1px solid #999;
display: flex; display: flex;
@ -152,9 +159,9 @@ export default {
padding: 10px 15px; padding: 10px 15px;
margin-right: 15px; margin-right: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.dlanniu { .dlanniu {
width: 80%; width: 80%;
height: 45px; height: 45px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
@ -164,21 +171,21 @@ export default {
justify-content: center; justify-content: center;
margin: 20px auto; margin: 20px auto;
color: white; color: white;
} }
.t-you { .t-you {
height: 100%; height: 100%;
width: 20%; width: 20%;
} }
.content { .content {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100vh); height: calc(100vh);
background: white; background: white;
} }
.top-heder { .top-heder {
width: 100%; width: 100%;
height: 46px; height: 46px;
background: white; background: white;
@ -187,15 +194,40 @@ export default {
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 5px 15px; padding: 5px 15px;
} }
.t-title { .t-title {
font-size: 17px; font-size: 17px;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.t-left { .t-left {
width: 10%; width: 10%;
} }
.index_ {
width: 35px;
height: 35px;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
font-weight: bold;
font-size: 18px;
background: #0D2E8D;
border-radius: 50%;
margin-right: 10px;
}
.xb_ {
width: 35px;
height: 35px;
display: flex;
align-items: center;
justify-content: center;
color: #0D2E8D;
font-size: 22px;
font-weight: bold;
}
</style> </style>