diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 10ce9ac..23a3708 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -137,6 +137,7 @@ getYlzList() { uni.$http.post('/gunshiApp/xyt/stPptnRReal/list').then(res => { if (res.data.code == 200) { + console.log(this.Ylzlist,'this.Ylzlist'); this.Ylzlist = res.data.data } }) @@ -247,11 +248,12 @@ onLoad() { console.log("走了几遍"); - this.getList(); + this.getYlzList(); }, onShow() { + this.getList(); this.setInsert() this.getXcrwData(); this.getHandleData(); diff --git a/pages/messageList/detail/index.vue b/pages/messageList/detail/index.vue index aa4ce51..d39c3a3 100644 --- a/pages/messageList/detail/index.vue +++ b/pages/messageList/detail/index.vue @@ -1,6 +1,6 @@ @@ -62,6 +66,8 @@ export default { data() { return { + minDate:moment().startOf('year').valueOf(), + maxDate:moment().valueOf(), show: false, showTime:false, showTime1:false, @@ -70,9 +76,6 @@ stm:'', etm:'', userList: uni.getStorageSync('value').data, - customStyle: { - background: '#000' - }, list: [] }; }, diff --git a/pages/mypage/compents/wtcl/detail/index.vue b/pages/mypage/compents/wtcl/detail/index.vue index e362286..0dae1a9 100644 --- a/pages/mypage/compents/wtcl/detail/index.vue +++ b/pages/mypage/compents/wtcl/detail/index.vue @@ -43,14 +43,15 @@ 巡检图片 - - + + + 巡检视频 - - + + @@ -118,6 +119,14 @@ item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath 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); }, methods: { diff --git a/pages/mypage/compents/wtcl/index.vue b/pages/mypage/compents/wtcl/index.vue index 286ff16..7be0a5b 100644 --- a/pages/mypage/compents/wtcl/index.vue +++ b/pages/mypage/compents/wtcl/index.vue @@ -74,6 +74,8 @@ show: false, showTime: false, showTime1: false, + minDate:moment().startOf('year').valueOf(), + maxDate:moment().valueOf(), start: '请选择开始时间', end: '请选择结束时间', stm:moment().startOf('year').format('YYYY-MM-DD'), diff --git a/pages/mypage/compents/wxyh/formZdy/formBottom.vue b/pages/mypage/compents/wxyh/formZdy/formBottom.vue index 37e4157..fa5d820 100644 --- a/pages/mypage/compents/wxyh/formZdy/formBottom.vue +++ b/pages/mypage/compents/wxyh/formZdy/formBottom.vue @@ -12,13 +12,13 @@ - - + - - + @@ -74,78 +74,18 @@ mounted() { this.model1 = this.formData this.model1.maintainName = this.actions.find(item=>item.value == this.formData.maintainType).name - this.model1.fileListpics = this.formData.pic - this.model1.fileListvideos = this.formData.videos + this.model1.pics?.map(item1=>{ + item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath + 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: { - 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() { //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。 diff --git a/pages/mypage/compents/wxyh/formZdy/index.vue b/pages/mypage/compents/wxyh/formZdy/index.vue index 0e67a32..4ae3913 100644 --- a/pages/mypage/compents/wxyh/formZdy/index.vue +++ b/pages/mypage/compents/wxyh/formZdy/index.vue @@ -43,6 +43,7 @@ export default { }, onLoad(options) { this.formData=JSON.parse(options.item) + console.log(this.formData,JSON.parse(options.item)); }, methods: { submitForm(params) { diff --git a/pages/mypage/compents/wxyh/index.vue b/pages/mypage/compents/wxyh/index.vue index 2663430..b474225 100644 --- a/pages/mypage/compents/wxyh/index.vue +++ b/pages/mypage/compents/wxyh/index.vue @@ -97,6 +97,9 @@ } }, methods: { + searchTm(){ + this.getList() + }, toDetail(item){ uni.navigateTo({ url:'/pages/mypage/compents/wxyh/formZdy/index?item='+JSON.stringify(item) diff --git a/pages/mypage/compents/xcrw/detail/dbForm.vue b/pages/mypage/compents/xcrw/detail/dbForm.vue index a3c5ec0..2183dca 100644 --- a/pages/mypage/compents/xcrw/detail/dbForm.vue +++ b/pages/mypage/compents/xcrw/detail/dbForm.vue @@ -33,7 +33,7 @@ 问题描述: - {{o.itemProblemDesc}} + {{o.problemDesc}} @@ -243,7 +243,8 @@