xielei
/
xytSk-App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xielei:5f4e8c23e564005be5455d823e02b180f3acd37a
Branches Tags
xielei:master
..
compare: xielei:051881323afbd2f1dc7dcb781e689eae198a4572
Branches Tags
xielei:master

No commits in common. "5f4e8c23e564005be5455d823e02b180f3acd37a" and "051881323afbd2f1dc7dcb781e689eae198a4572" have entirely different histories.
5f4e8c23e5 ... 051881323a

15 changed files with 207 additions and 164 deletions
Show Stats Expand all files Collapse all files

3
pages/messageList/detail/index.vue
View File

@ -49,6 +49,9 @@
stm: '', stm: '',
etm: '' etm: ''
}, },
customStyle: {
background: '#000'
},
list: [ list: [
] ]
}; };

3
pages/messageList/index.vue
View File

@ -70,6 +70,9 @@
stm:'', stm:'',
etm:'', etm:'',
userList: uni.getStorageSync('value').data, userList: uni.getStorageSync('value').data,
customStyle: {
background: '#000'
},
list: [] list: []
}; };
}, },

17
pages/mypage/compents/wtcl/detail/index.vue
View File

@ -43,15 +43,14 @@
</view> </view>
<view class="itemNo" style="flex-direction: column;"> <view class="itemNo" style="flex-direction: column;">
<text>巡检图片</text> <text>巡检图片</text>
<view class="" v-for="item in queItem.inspectPics"> <view class="">
<image :src="item.url" style="width: 80px;height: 80px;margin: 5px;" @click="previewImage(item)"></image>
</view> </view>
</view> </view>
<view class="itemNo" style="flex-direction: column;"> <view class="itemNo" style="flex-direction: column;">
<text>巡检视频</text> <text>巡检视频</text>
<view class="" v-for="item in queItem.inspectVideos"> <view class="">
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" show-fullscreen-btn></video>
</view> </view>
</view> </view>
</view> </view>
@ -119,14 +118,6 @@
item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath
return item1 return item1
}) })
this.queItem.inspectVideos?.map(item1=>{
item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath
return item1
})
this.queItem.inspectPics?.map(item1=>{
item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath
return item1
})
console.log(this.queItem); console.log(this.queItem);
}, },
methods: { methods: {

86
pages/mypage/compents/wxyh/formZdy/formBottom.vue
View File

@ -12,13 +12,13 @@
<u-form-item label="内容说明" prop="maintainContent" borderBottom labelPosition='top' required labelWidth="100px"> <u-form-item label="内容说明" prop="maintainContent" borderBottom labelPosition='top' required labelWidth="100px">
<u--textarea v-model="model1.maintainContent" placeholder="请输入内容" disabled></u--textarea> <u--textarea v-model="model1.maintainContent" placeholder="请输入内容" disabled></u--textarea>
</u-form-item> </u-form-item>
<u-form-item label="现场图片" prop="pics" borderBottom labelPosition='top' labelWidth="100px"> <u-form-item label="现场图片" prop="fileListpics" borderBottom labelPosition='top' labelWidth="100px">
<u-upload :fileList="model1.pics" name="pics" multiple disabled <u-upload :fileList="fileListpics" @afterRead="afterRead" @delete="deletePic" name="pics" multiple disabled
multiple accept='image' :maxCount="10"></u-upload> multiple accept='image' :maxCount="10"></u-upload>
</u-form-item> </u-form-item>
<u-form-item label="现场视频" prop="videos" borderBottom labelPosition='top' labelWidth="100px"> <u-form-item label="现场视频" prop="fileListvideos" borderBottom labelPosition='top' labelWidth="100px">
<u-upload :fileList="model1.videos" name="videos" multiple disabled <u-upload :fileList="fileListvideos" @afterRead="afterRead" @delete="deletePic" name="videos" multiple disabled
multiple accept='video' :maxCount="10"></u-upload> multiple accept='video' :maxCount="10"></u-upload>
</u-form-item> </u-form-item>
@ -74,18 +74,78 @@
mounted() { mounted() {
this.model1 = this.formData this.model1 = this.formData
this.model1.maintainName = this.actions.find(item=>item.value == this.formData.maintainType).name this.model1.maintainName = this.actions.find(item=>item.value == this.formData.maintainType).name
this.model1.pics?.map(item1=>{ this.model1.fileListpics = this.formData.pic
item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath this.model1.fileListvideos = this.formData.videos
return item1
})
this.model1.videos?.map(item1=>{
item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath
return item1
})
console.log(this.model1,'83498943r80432',this.formData);
}, },
methods: { methods: {
sexSelect(e) {
this.model1.maintainType = e.name
this.$refs.uForm.validateField('maintainType')
},
submit() {
this.$refs.uForm.validate().then(res => {
let params = {
...this.model1,
maintainType: this.actions.find(item => item.name == this.model1.maintainType).value,
}
this.$emit('submitForm', params)
}).catch(errors => {
uni.$u.toast('校验失败')
})
},
// 删除图片
deletePic(event) {
this[`fileList${event.name}`].splice(event.index, 1)
},
// 新增图片
async afterRead(event) {
// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
let lists = [].concat(event.file)
console.log(`fileList${event.name}`,event);
let fileListLen = this[`fileList${event.name}`].length
lists.map((item) => {
this[`fileList${event.name}`].push({
...item,
status: 'uploading',
message: '上传中'
})
})
for (let i = 0; i < lists.length; i++) {
const result = await this.uploadFilePromise(lists[i].url,event.name)
let item = this[`fileList${event.name}`][fileListLen]
this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
status: 'success',
message: '',
url: result
}))
fileListLen++
}
},
uploadFilePromise(url,name) {
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
url: 'http://local.gunshiiot.com:18083/gunshiApp/xyt/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址
filePath: url,
name: 'file',
formData: {
user: 'test'
},
success: (res) => {
setTimeout(() => {
// const obj = this.model1[name].find(item=>item.fileId==res.data.data.fileId)
// if(obj){
// }
console.log(JSON.parse(res.data),this.model1,name);
this.model1[name].push({fileId:JSON.parse(res.data).data.fileId})
resolve(res.data.data)
}, 1000)
}
});
})
},
}, },
onReady() { onReady() {
//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。 //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。

1
pages/mypage/compents/wxyh/formZdy/index.vue
View File

@ -43,7 +43,6 @@ export default {
}, },
onLoad(options) { onLoad(options) {
this.formData=JSON.parse(options.item) this.formData=JSON.parse(options.item)
console.log(this.formData,JSON.parse(options.item));
}, },
methods: { methods: {
submitForm(params) { submitForm(params) {

3
pages/mypage/compents/wxyh/index.vue
View File

@ -97,9 +97,6 @@
} }
}, },
methods: { methods: {
searchTm(){
this.getList()
},
toDetail(item){ toDetail(item){
uni.navigateTo({ uni.navigateTo({
url:'/pages/mypage/compents/wxyh/formZdy/index?item='+JSON.stringify(item) url:'/pages/mypage/compents/wxyh/formZdy/index?item='+JSON.stringify(item)

9
pages/mypage/compents/xcrw/detail/dbForm.vue
View File

@ -33,7 +33,7 @@
</view> </view>
<view style="display: flex;" class="itemEve"> <view style="display: flex;" class="itemEve">
<text>问题描述:</text> <text>问题描述:</text>
<text>{{o.problemDesc}}</text> <text>{{o.itemProblemDesc}}</text>
</view> </view>
</view> </view>
<view class="" v-if="o.isHandle == 1"> <view class="" v-if="o.isHandle == 1">
@ -243,8 +243,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.contentItem { .contentItem {
height: 100%; height: 340px;
// overflow: auto;
overflow: auto; overflow: auto;
.itemC { .itemC {
@ -282,8 +281,8 @@
} }
.xj-content { .xj-content {
// height: 300px; height: 300px;
// overflow-y: auto; overflow-y: auto;
} }
.xj-text { .xj-text {

16
pages/mypage/compents/xcrw/detail/index.vue
View File

@ -5,10 +5,10 @@
fontSize:'18px' fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'> }" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar> </u-navbar>
<!-- <view class="" <view class=""
style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)"> style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)">
<view style="margin: 10px;background-color: #fff;padding: 10px;"> <view style="margin: 10px;background-color: #fff;padding: 10px;">
<!-- <view class="item"> <view class="item">
<view class="blueTiao"></view> <view class="blueTiao"></view>
<view class="title"> <view class="title">
基本信息 基本信息
@ -35,18 +35,20 @@
<text>结束日期</text> <text>结束日期</text>
<text>{{endDate}}</text> <text>{{endDate}}</text>
</view> </view>
</view>
</view>
<!-- <view v-show="status == 0 && btnStatus == 0" style="display:flex;justify-content: center;margin-top: 20%;">
<view class="circle-btn" @click="startXc">开始巡查</view>
</view> --> </view> -->
<view style="margin: 10px;background-color: #fff;padding: 10px;">
<!-- </view> -->
<view style="margin: 10px;background-color: #fff;padding: 10px; height:calc(100vh - 50px);margin-top: 50px;">
<view class="item"> <view class="item">
<view class="blueTiao"></view> <view class="blueTiao"></view>
<view class="title"> <view class="title">
巡检项 巡检项
</view> </view>
</view> </view>
<view class="contentItem" style="height: calc(100% - 50px);"> <view class="contentItem">
<db-form :xjItem="xjItem"></db-form> <db-form :xjItem="xjItem"></db-form>
</view> </view>
</view> </view>

16
pages/mypage/compents/xcrw/index.vue
View File

@ -36,12 +36,12 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<view class="itemC"> <view class="itemC">
<text>接收时间</text> <text>开始日期</text>
<text>{{item.receiveTime}}</text> <text>{{item.startDate}}</text>
</view> </view>
<view class="itemC"> <view class="itemC">
<text>完成时间</text> <text>结束日期</text>
<text>{{item.finishTime}}</text> <text>{{item.endDate}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -96,8 +96,8 @@
this.getData() this.getData()
}, },
handleStartTime(e){ handleStartTime(e){
let time = moment(e.value).format("YYYY-MM-D") let time = moment(e.value).format("YYYY-MM-DD")
this.stm = time; this.stm = time
this.showTime = false this.showTime = false
}, },
handleEndTime(e){ handleEndTime(e){
@ -110,8 +110,8 @@
const userId = uni.getStorageSync('value')?.userId const userId = uni.getStorageSync('value')?.userId
const params = { const params = {
dateRangeSo:{ dateRangeSo:{
start:moment(this.stm).format("YYYY-MM-DD 00:00:00"), start:moment(this.stm).format("YYYY-MM-DD"),
end:moment(this.etm).format("YYYY-MM-DD 23:59:59"), end:moment(this.etm).format("YYYY-MM-DD"),
}, },
inspectUserId:userId, inspectUserId:userId,
statusList:[2] statusList:[2]

28
pages/wtcl/detail/index.vue
View File

@ -43,21 +43,20 @@
</view> </view>
<view class="itemNo" style="flex-direction: column;"> <view class="itemNo" style="flex-direction: column;">
<text>巡检图片</text> <text>巡检图片</text>
<view class="" v-for="item in queItem.inspectPics"> <view class="">
<image :src="item.url" style="width: 80px;height: 80px;margin: 5px;" @click="previewImage(item)"></image>
</view> </view>
</view> </view>
<view class="itemNo" style="flex-direction: column;"> <view class="itemNo" style="flex-direction: column;">
<text>巡检视频</text> <text>巡检视频</text>
<view class="" v-for="item in queItem.inspectVideos"> <view class="">
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" show-fullscreen-btn></video>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view style="margin: 10px;background-color: #fff;padding: 10px;" class=""> <view style="margin: 10px;background-color: #fff;padding: 10px;" class="">
<u--form labelPosition="left" :model="queItem" ref="uForm" label-width='80px'> <u--form labelPosition="left" :model="o" ref="uForm" label-width='80px'>
<view class="itemCc"> <view class="itemCc">
<u-form-item label="处理人" prop="handleUserName" borderBottom required > <u-form-item label="处理人" prop="handleUserName" borderBottom required >
<u--input v-model="queItem.handleUserName" disabled disabledColor="#ffffff" <u--input v-model="queItem.handleUserName" disabled disabledColor="#ffffff"
@ -103,6 +102,9 @@
stm: '', stm: '',
etm: '' etm: ''
}, },
customStyle: {
background: '#000'
},
queItem:{}, queItem:{},
list: [{ list: [{
title: '5-29日常巡检', title: '5-29日常巡检',
@ -127,15 +129,7 @@
this.queItem.handleUserName = uni.getStorageSync('value').nickName this.queItem.handleUserName = uni.getStorageSync('value').nickName
this.queItem.handleTime = moment().format('YYYY-MM-DD HH:mm:ss') this.queItem.handleTime = moment().format('YYYY-MM-DD HH:mm:ss')
this.queItem.handleUserId = uni.getStorageSync('value').userId this.queItem.handleUserId = uni.getStorageSync('value').userId
// this.queItem.handlePics.map(item=>{ this.queItem.handlePics.map(item=>{
// item.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item.filePath
// return item
// })
this.queItem.inspectPics.map(item=>{
item.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item.filePath
return item
})
this.queItem.inspectVideos.map(item=>{
item.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item.filePath item.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item.filePath
return item return item
}) })
@ -152,7 +146,9 @@
uni.$http.post('/gunshiApp/xyt/inspect/detail/handle', this.queItem).then(res => { uni.$http.post('/gunshiApp/xyt/inspect/detail/handle', this.queItem).then(res => {
uni.$showMsg(res.data.description); uni.$showMsg(res.data.description);
if(res.data.code == 200){ if(res.data.code == 200){
uni.navigateBack() uni.redirectTo({
url:'/pages/wtcl/index'
})
} }
}) })
} }

7
pages/wtcl/index.vue
View File

@ -30,7 +30,7 @@
</view> </view>
<view class="titleRight" @click="toDetail(item)"> <view class="titleRight" @click="toDetail(item)">
<view class="border"> <view class="border">
{{item.isHandle==0?'待处理':'已处理'}} {{isHandle==0?'已处理':'待处理'}}
</view> </view>
<u-icon name="arrow-right" size="20"></u-icon> <u-icon name="arrow-right" size="20"></u-icon>
</view> </view>
@ -76,11 +76,14 @@
end: '请选择结束时间', end: '请选择结束时间',
stm:moment().startOf('year').format('YYYY-MM-DD'), stm:moment().startOf('year').format('YYYY-MM-DD'),
etm:moment().format('YYYY-MM-DD'), etm:moment().format('YYYY-MM-DD'),
customStyle: {
background: '#000'
},
list: [ list: [
] ]
}; };
}, },
onShow() { onLoad() {
this.getList() this.getList()
}, },
computed:{ computed:{

20
pages/xcrw/detail/dbForm.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="contentItem" > <view class="contentItem" style="height: calc(100% - 350px);">
<uni-collapse> <uni-collapse>
<uni-collapse-item title-border="none" v-for="(item,index) in listData" :key="index" :border="false" <uni-collapse-item title-border="none" v-for="(item,index) in listData" :key="index" :border="false"
:show-animation="true"> :show-animation="true">
@ -33,8 +33,8 @@
@delete="(e)=>deletePic(e,o,index,i)" name="inspectVideos" multiple @delete="(e)=>deletePic(e,o,index,i)" name="inspectVideos" multiple
:maxCount="10"></u-upload> :maxCount="10"></u-upload>
</u-form-item> </u-form-item>
<u-form-item label="问题描述" prop="problemDesc" borderBottom required> <u-form-item label="问题描述" prop="itemProblemDesc" borderBottom required>
<u--textarea v-model="o.problemDesc" placeholder="请输入内容"></u--textarea> <u--textarea v-model="o.itemProblemDesc" placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
<u-form-item label="处理状态" prop="isHandle" borderBottom required> <u-form-item label="处理状态" prop="isHandle" borderBottom required>
<u-subsection :list="listStatus" :current="getHandle(o.isHandle)" <u-subsection :list="listStatus" :current="getHandle(o.isHandle)"
@ -261,7 +261,9 @@
console.log(data,'2121'); console.log(data,'2121');
if(data.code==200){ if(data.code==200){
uni.$showMsg('提交成功'); uni.$showMsg('提交成功');
uni.navigateBack() uni.redirectTo({
url:'/pages/xcrw/index'
})
} }
} catch (error) { } catch (error) {
uni.$showMsg(); uni.$showMsg();
@ -278,7 +280,7 @@
this.listData.forEach(item => { this.listData.forEach(item => {
item.ab = item.children.filter(i => { item.ab = item.children.filter(i => {
if (i.isNormal == 0) { if (i.isNormal == 0) {
if (i.inspectPics?.length && i.problemDesc) { if (i.inspectPics?.length && i.itemProblemDesc) {
tigger = true tigger = true
} else { } else {
tigger = false tigger = false
@ -375,8 +377,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.contentItem { .contentItem {
height: 100%; // height: 260px;
overflow: auto; // overflow: auto;
.itemC { .itemC {
display: flex; display: flex;
@ -413,8 +415,8 @@
} }
.xj-content { .xj-content {
// height: 300px; height: 300px;
// overflow-y: auto; overflow-y: auto;
} }
.xj-text { .xj-text {

151
pages/xcrw/detail/index.vue
View File

@ -5,9 +5,8 @@
fontSize:'18px' fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'> }" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar> </u-navbar>
<view class="" <view class="" style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)">
style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)"> <view style="margin: 10px;background-color: #fff;padding: 10px;">
<view style="margin: 10px;background-color: #fff;padding: 10px;" v-show="btnStatus == 0">
<view class="item"> <view class="item">
<view class="blueTiao"></view> <view class="blueTiao"></view>
<view class="title"> <view class="title">
@ -15,7 +14,7 @@
</view> </view>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<view class="itemC"> <view class="itemC">
<text>任务标题</text> <text>任务标题</text>
<text>{{taskTitle}}</text> <text>{{taskTitle}}</text>
</view> </view>
@ -36,27 +35,26 @@
<text>{{endDate}}</text> <text>{{endDate}}</text>
</view> </view>
</view> </view>
</view> </view>
<view v-show="status !== 2 && btnStatus == 0" style="display:flex;justify-content: center;margin-top: 20%;"> <view v-show="status !== 2 && btnStatus == 0" style="display:flex;justify-content: center;margin-top: 20%;">
<view v-show="status !== 2 && btnStatus == 0" class="circle-btn" @click="startXc">{{statusType[status]}} <view v-show="status !== 2 && btnStatus == 0" class="circle-btn" @click="startXc">{{statusType[status]}}</view>
</view> </view>
</view> <view class="" style="height: calc(100vh - 311px);overflow: auto;">
<view class="" style="height: calc(100vh - 50px);overflow: auto;">
<view v-show="btnStatus != 0" style="margin: 10px;background-color: #fff;padding: 10px;">
<view v-show="btnStatus != 0" style="margin: 10px;background-color: #fff;padding: 10px;height: calc(100% - 40px);">
<view class="item"> <view class="item">
<view class="blueTiao"></view> <view class="blueTiao"></view>
<view class="title"> <view class="title">
巡检项 巡检项
</view>
</view>
<view class="contentItem1" style="height: calc(100% - 32px);">
<db-form :xjItem="xjItem"></db-form>
</view> </view>
</view> </view>
</view> <view class="contentItem1" style="height: 100%;">
<db-form :xjItem="xjItem"></db-form>
</view>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -65,58 +63,54 @@
import moment from 'moment' import moment from 'moment'
import DbForm from './dbForm.vue' import DbForm from './dbForm.vue'
export default { export default {
components: { components:{
DbForm DbForm
}, },
data() { data() {
return { return {
taskTitle: '', taskTitle:'',
taskType: '', taskType:'',
taskContent: '', taskContent:'',
startDate: '', startDate:'',
endDate: '', endDate:'',
status: '', status:'',
id: '', id:'',
btnStatus: 0, btnStatus: 0,
xjItem: [], xjItem:[],
list: ["正常", "异常"], list:["正常","异常"],
current: 3, current:3,
statusType: { statusType:{
0: '开始巡查', 0:'开始巡查',
1: '继续巡查', 1:'继续巡查',
2: '已完成' 2:'已完成'
}, },
}; };
}, },
methods: { methods: {
// 开始巡查 // 开始巡查
async startXc() { async startXc(){
try { try {
if (this.status == 0) { if(this.status == 0){
const { const {data} = await uni.$http.get(`/gunshiApp/xyt/inspect/task/startInspect/${this.id}`)
data if(data.code == 200){
} = await uni.$http.get(`/gunshiApp/xyt/inspect/task/startInspect/${this.id}`)
if (data.code == 200) {
this.btnStatus = 1; this.btnStatus = 1;
this.getXjItem(this.id) this.getXjItem(this.id)
} }
} else if (this.status == 1) { }else if(this.status == 1){
this.btnStatus = 1; this.btnStatus = 1;
this.getXjItem(this.id) this.getXjItem(this.id)
} }
this.getLocationWithInterval(); this.getLocationWithInterval();
} catch (error) { } catch (error) {
uni.$showMsg(); uni.$showMsg();
} }
}, },
// 获取巡查项 // 获取巡查项
async getXjItem(id) { async getXjItem(id){
try { try {
const { const {data} = await uni.$http.get(`/gunshiApp/xyt/inspect/detail/info?taskId=${id}`)
data if(data.code == 200){
} = await uni.$http.get(`/gunshiApp/xyt/inspect/detail/info?taskId=${id}`)
if (data.code == 200) {
this.xjItem = data.data this.xjItem = data.data
} }
} catch (error) { } catch (error) {
@ -127,7 +121,7 @@
getLocationWithInterval() { getLocationWithInterval() {
this.getLocation(); // 首次获取经纬度信息 this.getLocation(); // 首次获取经纬度信息
// 设置定时器，每隔5秒获取一次经纬度信息 // 设置定时器，每隔5秒获取一次经纬度信息
let timer = setInterval(() => { let timer= setInterval(() => {
this.getLocation(); this.getLocation();
}, 300000); // 五分钟 }, 300000); // 五分钟
uni.setStorageSync("timer", timer); uni.setStorageSync("timer", timer);
@ -139,7 +133,7 @@
success: (res) => { success: (res) => {
this.latitude = res.latitude; this.latitude = res.latitude;
this.longitude = res.longitude; this.longitude = res.longitude;
this.sendLocation(res.latitude, res.longitude) this.sendLocation(res.latitude,res.longitude)
}, },
fail: (err) => { fail: (err) => {
console.log('Failed to get location:', err); console.log('Failed to get location:', err);
@ -148,27 +142,25 @@
}, },
// 将经纬度传给服务器 // 将经纬度传给服务器
async sendLocation(latitude, longitude) { async sendLocation(latitude, longitude) {
try { try {
const { const { data } = await uni.$http.post(`/gunshiApp/xyt/inspectTaskTrack/insert`, {
data taskId: this.id,
} = await uni.$http.post(`/gunshiApp/xyt/inspectTaskTrack/insert`, { lttd: latitude,
taskId: this.id, lgtd: longitude
lttd: latitude, })
lgtd: longitude if (data.code == 200) {
}) console.log('Location sent successfully')
if (data.code == 200) { }
console.log('Location sent successfully') } catch (error) {
} uni.$showMsg();
} catch (error) { }
uni.$showMsg(); }
}
}
}, },
onLoad(option) { onLoad(option){
this.taskTitle = option.taskTitle this.taskTitle = option.taskTitle
this.taskType = option.taskType this.taskType = option.taskType
this.taskContent = option.taskContent == "null" ? null : option.taskContent this.taskContent = option.taskContent== "null" ? null:option.taskContent
this.startDate = (option.startDate) this.startDate = (option.startDate)
this.endDate = option.endDate == "null" ? "" : option.endDate this.endDate = option.endDate == "null" ? "" : option.endDate
this.status = option.status this.status = option.status
@ -191,31 +183,27 @@
border-top: 1px solid #eee; border-top: 1px solid #eee;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.circle-btn{
.circle-btn {
width: 120px; width: 120px;
height: 120px; height: 120px;
background-color: #007aff; background-color: #007aff;
border-radius: 50%; border-radius: 50%;
color: #fff; color:#fff;
text-align: center; text-align: center;
line-height: 120px; line-height: 120px;
} }
.item { .item {
padding-bottom: 10px; padding-bottom: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
// justify-content: space-between; // justify-content: space-between;
.blueTiao { .blueTiao{
background-color: #007aff; background-color: #007aff;
width: 5px; width: 5px;
height: 16px; height: 16px;
margin-right: 10px; margin-right: 10px;
} }
.title { .title {
border-width: 0px; border-width: 0px;
font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif; font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
@ -227,7 +215,6 @@
.titleRight { .titleRight {
display: flex; display: flex;
.border { .border {
border-width: 0px; border-width: 0px;
background-color: rgba(236, 245, 255, 1); background-color: rgba(236, 245, 255, 1);
@ -245,9 +232,8 @@
} }
} }
.contentItem{
.contentItem { .itemC{
.itemC {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
display: flex; display: flex;
@ -255,8 +241,7 @@
padding: 10px; padding: 10px;
border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
} }
.itemNo{
.itemNo {
color: #666666; color: #666666;
padding: 10px; padding: 10px;
} }

8
pages/xcrw/index.vue
View File

@ -88,7 +88,7 @@
}, },
mounted() { mounted() {
this.getData()
}, },
methods: { methods: {
searchHandle() { searchHandle() {
@ -109,8 +109,8 @@
const userId = uni.getStorageSync('value')?.userId const userId = uni.getStorageSync('value')?.userId
const params = { const params = {
dateRangeSo: { dateRangeSo: {
start: moment(this.stm).format("YYYY-MM-DD 00:00:00"), start: moment(this.stm).format("YYYY-MM-DD"),
end: moment(this.etm).format("YYYY-MM-DD 23:59:59"), end: moment(this.etm).format("YYYY-MM-DD"),
}, },
inspectUserId: userId, inspectUserId: userId,
statusList: [0, 1] statusList: [0, 1]
@ -130,8 +130,8 @@
} }
}, },
onShow(){ onShow(){
this.getData()
const timer =uni.getStorageSync('timer'); const timer =uni.getStorageSync('timer');
console.log(timer);
if(timer){ if(timer){
clearInterval(timer); clearInterval(timer);
uni.removeStorageSync('timer'); uni.removeStorageSync('timer');

3
pages/yj/index.vue
View File

@ -40,6 +40,9 @@
start: moment().subtract(1,'day').format('YYYY-MM-DD HH:mm:ss'), start: moment().subtract(1,'day').format('YYYY-MM-DD HH:mm:ss'),
end: moment().format('YYYY-MM-DD HH:mm:ss') end: moment().format('YYYY-MM-DD HH:mm:ss')
}, },
customStyle: {
background: '#000'
},
mapType:{ mapType:{
aiWarnCount:'AI告警', aiWarnCount:'AI告警',
rzWarn:"水位告警", rzWarn:"水位告警",