Compare commits

..

No commits in common. "864bf33fefaa84d7b473c9c1523bd8dd66122e47" and "73e2f94fe3a6a7128964c991945cbf849f120165" have entirely different histories.

3 changed files with 317 additions and 553 deletions

View File

@ -11,9 +11,7 @@
/* 5+App */ /* 5+App */
"modules" : { "modules" : {
"Payment" : {}, "Payment" : {},
"Share" : {}, "Share" : {}
"Maps" : {},
"Geolocation" : {}
}, },
/* */ /* */
"distribute" : { "distribute" : {
@ -42,12 +40,7 @@
"ios" : {}, "ios" : {},
/* ios */ /* ios */
"sdkConfigs" : { "sdkConfigs" : {
"maps" : { "maps" : {},
"amap" : {
"appkey_ios" : "",
"appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
}
},
"payment" : { "payment" : {
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
@ -56,18 +49,7 @@
} }
}, },
"push" : {}, "push" : {},
"geolocation" : { "geolocation" : {},
"baidu" : {
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "",
"appkey_android" : "mDcZsWM7gGKb7MC1bC8Mo33FScjYEr0I"
},
"amap" : {
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "",
"appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
}
},
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wx2654bc27c419ada6", "appid" : "wx2654bc27c419ada6",

View File

@ -1,69 +1,62 @@
<template> <template>
<view class="content" :style="{paddingTop: statusHeight + 'px'}"> <view class="content" :style="{paddingTop: statusHeight + 'px'}">
<statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav> <statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
<container-subgroup-two> <container-subgroup-two>
<view slot="content" style="margin: -100rpx -30rpx -0rpx;"> <view slot="content" style="margin: -100rpx -30rpx;">
<view class="project-list-input"> <view class="project-list-input">
<input type="text" class="int" value="" placeholder="请输入关键字" /> <input type="text" class="int" value="" placeholder="请输入关键字" />
<view class="xian"></view> <view class="xian"></view>
<image class="search" src="../../static/iocn/ss.png" mode="aspectFill" lazy-load> <image class="search" src="../../static/iocn/ss.png" mode="aspectFill" lazy-load></image>
</image>
</view> </view>
<view class="screen bbot mar-sx20"> <view class="screen bbot mar-sx20">
<picker @change="bindPickerChange" :value="index" :range="array" :range-key="array"> <picker @change="bindPickerChange" :value="index" :range="array">
<view class="li"> <view class="li">
<view class="text">产品类型</view> <view class="text">产品类型</view>
<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load> <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
</image>
</view> </view>
</picker> </picker>
<picker mode="date" :value="date" @change="bindDateChange"> <picker mode="date" :value="date" @change="bindDateChange">
<view class="li"> <view class="li">
<view class="text">竣工日期</view> <view class="text">竣工日期</view>
<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load> <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
</image>
</view> </view>
</picker> </picker>
<view class="li"> <view class="li">
<view class="text">筛选</view> <view class="text">筛选</view>
<image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load> <image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load></image>
</image>
</view> </view>
</view> </view>
<view class="project-list"> <view class="project-list">
<view class="li" @click="projectDetailsFun()" v-for="(item,index) in dataList.data" :key="index"> <view class="li" @click="projectDetailsFun()" v-for="(item,index) in 10" :key="index">
<view class="message"> <view class="message">
<image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image> <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
<view class="text disjb fc" style="height: 180rpx;"> <view class="text disjb fc" style="height: 180rpx;">
<view class="clips1 fon24 bold">{{item.title}}</view> <view class="clips1 fon24 bold">湖南工业大学化工学院会议室P2.5全彩LED显示屏</view>
<view class="disjb fc" style="margin-left: -20rpx;height: 80%;"> <view class="disjb fc" style="margin-left: -20rpx;height: 80%;">
<view class="serial-number scal09">项目编号{{item.projectCode}}</view> <view class="serial-number scal09">项目编号20220108-1001</view>
<view class="specification scal09">规格型号{{item.model}}</view> <view class="specification scal09">规格型号DS-CK25FI/H</view>
<view class="specification scal09">产品尺寸{{item.size}}</view> <view class="specification scal09">产品尺寸3.94*2.02</view>
<view class="installation-site scal09">安装位置{{item.installationSite}} <view class="installation-site scal09">安装位置xxx综合楼2楼会议室</view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="project-list-address col6 mar-s20 disjbac"> <view class="project-list-address col6 mar-s20 disjbac">
<view class="address"> <view class="address">
<image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load> <image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load></image>
</image> <view class="text scal09" style="margin-left: -26rpx;">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
<view class="text scal09" style="margin-left: -26rpx;">{{item.address}}
</view> </view>
<view class="date scal09">2022/01/08</view>
</view> </view>
<view class="date scal09">{{item.date}}</view> <!-- <view class="icon iconBera">质保中</view> -->
</view> <view class="icon iconBer">质保到期</view>
<view v-if="item.state==1" class="icon iconBera"></view>
<view v-else class="icon iconBer">质保到期</view>
</view>
</view> </view>
</view> </view>
</view>
</container-subgroup-two> </container-subgroup-two>
</container-subgroup-two>
<footTabOne :current="1"></footTabOne> <footTabOne :current="1"></footTabOne>
</view> </view>
</template> </template>
@ -83,160 +76,18 @@
format: true format: true
}) })
return { return {
statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 40,
inputData: "",
date: currentDate, date: currentDate,
array: [{ array: ['类型', '类型', '类型', '类型'],
title: "质保中",
key: 1,
}, {
title: "质保到期",
key: 0,
}, ],
index: 0, index: 0,
statusHeight: uni.getSystemInfoSync().statusBarHeight + 40, statusHeight: uni.getSystemInfoSync().statusBarHeight + 40
dataList: {
list_rows: 10,
page: 1,
data: [{
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 0
},
{
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 1
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 1
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 1
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 0
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 0
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 1
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 0
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 0
}, {
title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
projectCode: "20220108-1001",
model: "DS-CK25FI/H",
installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08",
size: "3.94*2.02",
state: 1
},
]
} }
}
},
onLoad() {
// this.getData()
}, },
methods: { methods: {
getData() {
this.$requst.post('/universal/api.project/project_list', {
list_rows: this.dataList.list_rows,
page: this.dataList.page,
}).then(res => {
// this.$toolAll.tools.showToast(res.msg);
if (res.code == 0) {
this.dataList = res.data.data
} else {
}
})
},
projectDetailsFun() { projectDetailsFun() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/project/details" url: "/pages/project/details"
}) })
}, },
//
inquireProject() {
this.$requst.post('/universal/api.project/project_list', {
list_rows: this.dataList.list_rows,
page: this.dataList.page,
value: this.inputData,
}).then(res => {
// this.$toolAll.tools.showToast(res.msg);
if (res.code == 0) {
console.log(res.data.data)
// this.dataList = res.data.data
} else {
}
})
},
bindPickerChange(data) { bindPickerChange(data) {
console.log(data) console.log(data)
}, },
@ -263,7 +114,6 @@
} }
</script> </script>
<style scoped> <style scoped>
page { page {
background-color: #F7F7F7; background-color: #F7F7F7;
@ -283,13 +133,11 @@
height: 100%; height: 100%;
background-color: #F7F7F7; background-color: #F7F7F7;
padding: 0 25rpx; padding: 0 25rpx;
padding-right: 100rpx; padding-right: 100rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 36rpx; border-radius: 36rpx;
} }
.project-list-input .xian { .project-list-input .xian {
width: 3rpx; width: 3rpx;
height: 35rpx; height: 35rpx;
@ -299,7 +147,6 @@
top: 50%; top: 50%;
margin-top: -14rpx; margin-top: -14rpx;
} }
.project-list-input .search { .project-list-input .search {
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
@ -386,7 +233,6 @@
.project-list .li .message .text { .project-list .li .message .text {
flex: 1; flex: 1;
} }
.project-list .li .message .serial-number { .project-list .li .message .serial-number {
color: #ff8800; color: #ff8800;
font-size: 22rpx; font-size: 22rpx;

View File

@ -4,8 +4,7 @@
<container-subgroup> <container-subgroup>
<view slot="content" style="margin: 0 -30rpx;"> <view slot="content" style="margin: 0 -30rpx;">
<view class="repairs-nav" style="margin-top: -30rpx;"> <view class="repairs-nav" style="margin-top: -30rpx;">
<view class="li" @click="repairsNavFun(index)" :class="item.state?'on':''" <view class="li" @click="repairsNavFun(index)" :class="item.state?'on':''" v-for="(item,index) in navDataState">
v-for="(item,index) in navDataState">
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
@ -17,22 +16,22 @@
</view> </view>
<view class="fault-type-title padding">故障类型</view> <view class="fault-type-title padding">故障类型</view>
<view class="padding fault-type-content"> <view class="padding fault-type-content">
<view class="li" @click="repairsTypeFun(index)" :class="item.state?'on':''" <view class="li" :class="item.state?'on':''" v-for="(item,index) in faultTypeData">
v-for="(item,index) in faultTypeData">
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
<view class="padding"> <view class="padding">
<view class="devicename" @click="scanCodeFun()" v-if="navDataState[0].state"> <view class="devicename" v-if="navDataState[0].state">
<view class=""> <view class="">
请填写设备名称和型号或扫描二维码 请填写设备名称和型号或扫描二维码
</view> </view>
<image class="sm" src="../../static/iocn/sm.png" mode=""></image> <image class="sm" src="../../static/iocn/sm.png" mode=""></image>
</view> </view>
<input v-model="data.model" class="devicename" placeholder="请填写设备名称和型号" v-else /> <view class="devicename" v-else>
请填写设备名称和型号
</view>
<view class="fault-pictures"> <view class="fault-pictures">
<image class="img" src="../../static/iocn/gz.png" mode="aspectFill"></image> <image class="img" src="../../static/iocn/gz.png" mode="aspectFill"></image>
@ -41,27 +40,24 @@
</view> </view>
</view> </view>
<textarea value="" v-model="data.condition" class="fault-description" placeholder="故障情况描述" <textarea value="" class="fault-description" placeholder="故障情况描述"
placeholder-class="fault-description-text" /> placeholder-class="fault-description-text" />
<view class="detailed-address inputCss"> <view class="detailed-address inputCss">
<input type="text" v-model="data.address" value="" placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" /> <input type="text" value="" placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" />
<image @click="mapFun()" src="../../static/iocn/map.png" class="map" mode="aspectFill"></image> <image @click="mapFun()" src="../../static/iocn/map.png" class="map" mode="aspectFill"></image>
</view> </view>
<input type="text" class="inputCss" v-model="data.name" placeholder="请填写您的姓名" placeholder-class="inputCss-input" <input type="text" class="inputCss" placeholder="请填写您的姓名" placeholder-class="inputCss-input" value="" />
value="" /> <input type="text" class="inputCss" placeholder="请填写联系电话" placeholder-class="inputCss-input" value="" />
<input type="text" class="inputCss" v-model="data.tel" placeholder="请填写联系电话" placeholder-class="inputCss-input"
value="" />
<picker mode="date" > <picker mode="date" >
<input type="text" class="inputCss" v-model="data.date" placeholder="请选择上门时间" placeholder-class="inputCss-input" <input type="text" class="inputCss" placeholder="请选择上门时间" placeholder-class="inputCss-input" value="" />
value="" />
</picker> </picker>
<button class="submit-button" @click="submitButton()" type="default">提交故障申报</button> <button class="submit-button" type="default">提交故障申报</button>
</view> </view>
</view> </view>
</container-subgroup> </container-subgroup>
@ -75,15 +71,6 @@
return { return {
single: "2021-04-3", single: "2021-04-3",
data:{
model:"",
condition:"",
address:"",
name:"",
tel:"",
date:""
},
navDataState: [{ navDataState: [{
title: "有设备", title: "有设备",
state: false state: false
@ -128,60 +115,17 @@
] ]
} }
}, },
onLoad(){
this.getType()
},
methods: { methods: {
getType(){
// /universal/api.order/fault_type
this.$requst.post('/universal/api.work_order/fault_type').then(res => {
// this.$toolAll.tools.showToast(res.msg);
if (res.code == 0) {
console.log(res)
} else {
}
})
},
change(e) { change(e) {
this.single = e; this.single = e;
console.log("-change事件:", e); console.log("-change事件:", e);
}, },
scanCodeFun() {
uni.scanCode({
success: function(res) {
console.log('条码类型:' + res.scanType);
console.log('条码内容:' + res.result);
}
});
},
submitButton(){
// if()
},
mapFun() { mapFun() {
uni.getLocation({ uni.getLocation({
type: 'gcj02', //uni.openLocation type: 'wgs84',
success: function(res) { success: function(res) {
const latitude = res.latitude; console.log('当前位置的经度:' + res.longitude);
const longitude = res.longitude; console.log('当前位置的纬度:' + res.latitude);
console.log(latitude,longitude,78);
uni.chooseLocation({
success: function (res) {
console.log(res,81);
console.log('位置名称:' + res.name);
console.log('详细地址:' + res.address);
console.log('纬度:' + res.latitude);
console.log('经度:' + res.longitude);
}
});
// uni.openLocation({
// latitude: latitude,
// longitude: longitude,
// success: function () {
// console.log('success');
// }
// });
} }
}); });
}, },
@ -190,13 +134,7 @@
this.navDataState[i].state=false this.navDataState[i].state=false
} }
this.navDataState[index].state=true this.navDataState[index].state=true
},
repairsTypeFun(index) {
for (var i = 0; i < this.faultTypeData.length; i++) {
this.faultTypeData[i].state = false
} }
this.faultTypeData[index].state = true
},
} }
} }
@ -282,7 +220,6 @@
background-color: #FFFFFF; background-color: #FFFFFF;
font-size: 26rpx; font-size: 26rpx;
color: #5e5e5e; color: #5e5e5e;
box-sizing: border-box;
text-align: center; text-align: center;
line-height: 59rpx; line-height: 59rpx;
border-radius: 22rpx; border-radius: 22rpx;
@ -399,7 +336,6 @@
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
} }
.devicename .sm{ .devicename .sm{
width: 42rpx; width: 42rpx;
height: 36rpx; height: 36rpx;