diff --git a/pages/login/userRegister.vue b/pages/login/userRegister.vue index 582321d..24007c3 100644 --- a/pages/login/userRegister.vue +++ b/pages/login/userRegister.vue @@ -22,7 +22,7 @@ type="text" name="code" v-model="code" placeholder="请输入验证码" /> - + @@ -51,6 +51,7 @@ export default { data() { return { + timer:null, agreement: false, checkedShow: true, name: '', @@ -60,7 +61,8 @@ myTopBgSrc: require("../../static/login/my-bg.jpg"), codeTips: "获取验证码", type:'', - content:'' + content:'', + count:0, } }, onLoad(params) { @@ -142,27 +144,38 @@ }, // 获取验证码 getCode(e) { - debugger; - console.log(this.phone); - if (this.phone !== '') { - uni.showLoading({ - title: '正在获取验证码', - mask: true - }) - this.$u.api.getCode({ - phone: this.phone - }).then(res => { - setTimeout(() => { + // debugger; + // console.log(this.phone); + let that = this; + if (that.phone !== '') { + if(that.count>0){ + that.$u.toast('倒计时结束后再发送'); + }else{ + uni.showLoading({ + title: '正在获取验证码', + mask: true + }) + that.$u.api.getCode({ + phone: that.phone + }).then(res => { uni.hideLoading(); // 这里此提示会被this.start()方法中的提示覆盖 - this.$u.toast('验证码已发送'); - // 通知验证码组件内部开始倒计时 - this.$refs.uCode.start(); - }, 2000); - }) + that.$u.toast('验证码已发送'); + that.count = 59; + that.timer = setInterval(() => { + if (that.count > 0 && that.count <= 60) { + that.count--; + that.codeTips = that.count+'秒重新获取'; + } else { + clearInterval(that.timer); + that.timer = null; + that.codeTips = '重新获取'; + } + }, 1000); + }) + } } else { - // this.$u.toast('倒计时结束后再发送'); - this.$u.toast('请输入手机号'); + that.$u.toast('请输入手机号'); } }, } diff --git a/pages/workSpace/operation/operationCreate.vue b/pages/workSpace/operation/operationCreate.vue index 7d163b6..ad9c0c6 100644 --- a/pages/workSpace/operation/operationCreate.vue +++ b/pages/workSpace/operation/operationCreate.vue @@ -70,11 +70,13 @@ * 属地部门 - + - {{dept_ter_name}} - + + {{dept_ter_name}} + + @@ -82,11 +84,13 @@ * 业务部门 - + - {{dept_bus_name}} - + + {{dept_bus_name}} + + @@ -94,11 +98,13 @@ * 部门协调员 - + - {{dcoordinator_name}} - + + {{dcoordinator_name}} + + diff --git a/pages/workSpace/opls/clear.vue b/pages/workSpace/opls/clear.vue index 63668ad..26a388d 100644 --- a/pages/workSpace/opls/clear.vue +++ b/pages/workSpace/opls/clear.vue @@ -56,9 +56,11 @@ - {{dept_do_name}} + + {{dept_do_name}} + @@ -69,8 +71,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -81,8 +85,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/cooler.vue b/pages/workSpace/opls/cooler.vue index 14b34aa..896018c 100644 --- a/pages/workSpace/opls/cooler.vue +++ b/pages/workSpace/opls/cooler.vue @@ -56,8 +56,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -69,8 +71,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -81,8 +85,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/fire.vue b/pages/workSpace/opls/fire.vue index 66c88cc..a24d38d 100644 --- a/pages/workSpace/opls/fire.vue +++ b/pages/workSpace/opls/fire.vue @@ -82,8 +82,12 @@ - {{charger_name}} - + + + {{charger_name}} + + + @@ -94,8 +98,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/high.vue b/pages/workSpace/opls/high.vue index e6f6714..061b2f1 100644 --- a/pages/workSpace/opls/high.vue +++ b/pages/workSpace/opls/high.vue @@ -66,8 +66,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -79,8 +81,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -91,8 +95,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/hoisting.vue b/pages/workSpace/opls/hoisting.vue index e73d78d..cac04f7 100644 --- a/pages/workSpace/opls/hoisting.vue +++ b/pages/workSpace/opls/hoisting.vue @@ -65,12 +65,13 @@ - {{dept_do_name}} - + :localdata="depRange" valueKey="id" textKey="name" childrenKey="children"/> + + {{dept_do_name}} + + - * @@ -79,8 +80,11 @@ - {{charger_name}} - + + + {{charger_name}} + + @@ -91,8 +95,11 @@ - {{monitor_name}} - + + {{monitor_name}} + + + diff --git a/pages/workSpace/opls/preheat.vue b/pages/workSpace/opls/preheat.vue index 1950c66..c34dee8 100644 --- a/pages/workSpace/opls/preheat.vue +++ b/pages/workSpace/opls/preheat.vue @@ -56,8 +56,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -69,8 +71,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -81,8 +85,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/soil.vue b/pages/workSpace/opls/soil.vue index ad1656a..85c974b 100644 --- a/pages/workSpace/opls/soil.vue +++ b/pages/workSpace/opls/soil.vue @@ -66,8 +66,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -79,8 +81,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -91,8 +95,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/space.vue b/pages/workSpace/opls/space.vue index 0462f4b..a30464e 100644 --- a/pages/workSpace/opls/space.vue +++ b/pages/workSpace/opls/space.vue @@ -66,8 +66,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -79,8 +81,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -91,8 +95,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + diff --git a/pages/workSpace/opls/usecl.vue b/pages/workSpace/opls/usecl.vue index 7d42aeb..1640927 100644 --- a/pages/workSpace/opls/usecl.vue +++ b/pages/workSpace/opls/usecl.vue @@ -56,8 +56,10 @@ - {{dept_do_name}} - + + {{dept_do_name}} + + @@ -69,8 +71,10 @@ - {{charger_name}} - + + {{charger_name}} + + @@ -81,8 +85,10 @@ - {{monitor_name}} - + + {{monitor_name}} + + @@ -388,6 +394,9 @@ console.log(res); }); }, + timeFix(time){ + if(time.length){}else{} + }, getOplDetail(){ let that = this; that.$u.api.oplItem(that.oplId).then((res) => { @@ -570,11 +579,11 @@ }); let that = this; let params = null; - that.formData.start_time = that.formData.start_time; - that.formData.end_time = that.formData.end_time+':00'; - that.formData.power_start_time = that.formData.power_start_time+':00'; - that.formData.power_end_time = that.formData.power_end_time+':00'; - that.formData.work_time = that.formData.work_time+':00'; + // that.formData.start_time = that.formData.start_time; + // that.formData.end_time = that.formData.end_time; + // that.formData.power_start_time = that.formData.power_start_time; + // that.formData.power_end_time = that.formData.power_end_time; + // that.formData.work_time = that.formData.work_time; that.formData.create_imgs = []; that.fileList.forEach(item=>{ if(item.id){ diff --git a/pages/workSpace/rpj/rpjCreate.vue b/pages/workSpace/rpj/rpjCreate.vue index 69bd3de..5a189f8 100644 --- a/pages/workSpace/rpj/rpjCreate.vue +++ b/pages/workSpace/rpj/rpjCreate.vue @@ -52,12 +52,13 @@ 所属部门 - + + {{dept_ter_name}} - + diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue index 3f09f7f..63b9d8b 100644 --- a/pages/workSpace/visit/visitCreate.vue +++ b/pages/workSpace/visit/visitCreate.vue @@ -61,12 +61,12 @@ 接待人 - + - {{formData.receptionist_name}} - + {{receptionist_name}} +