From b8b2820d1a0a55a5555434a3ec95f8bbec1db06d Mon Sep 17 00:00:00 2001 From: zmc <zmc_li@foxmail.com> Date: 星期四, 14 十二月 2023 15:22:54 +0800 Subject: [PATCH] 1.飞行巡检和审核辅助页面中的对话框写成组件 2.增加了数据请求和异常分析配置参数的可视化页面 3.修改了站点输入框,使能够模糊匹配 --- src/sfc/TimeSinglePicker.vue | 63 +++++++++++++++++-------------- 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/sfc/TimeSinglePicker.vue b/src/sfc/TimeSinglePicker.vue index 49e4819..da0bd53 100644 --- a/src/sfc/TimeSinglePicker.vue +++ b/src/sfc/TimeSinglePicker.vue @@ -1,7 +1,5 @@ -<!-- 鍗曚釜 鏃ユ湡鏃堕棿閫夋嫨鍣ㄧ粍浠� 甯︽棩鍛ㄦ湀蹇嵎閫夐」 - 鍓嶄竴澶╂槸褰撳墠鏃堕棿鐨勫墠涓�澶╃殑00鐐瑰埌23锛�59锛�59 - 鍓嶄竷澶� 鍜� 涓婁竴涓湀鍚屾牱 - 浼氬皢鍒濆榛樿鏃堕棿锛堜竴鍛ㄥ墠锛夊拰鏀瑰彉鐨勬椂闂撮�氳繃浜嬩欢鈥榮ubmitTime鈥欎紶閫掔粰鐖剁粍浠� +<!-- 鍗曚釜 鏃ユ湡鏃堕棿閫夋嫨鍣ㄧ粍浠� + 灏嗗垵濮嬮粯璁ゆ椂闂达紙涓�鍛ㄥ墠锛夊拰鏀瑰彉鐨勬椂闂撮�氳繃浜嬩欢鈥榮ubmitTime鈥欎紶閫掔粰鐖剁粍浠� 鍒濆娓叉煋鏃跺氨灏嗘椂闂翠紶閫掔粰鐖剁粍浠讹細 ** @@ -11,16 +9,24 @@ --> <script> -import dayjs from 'dayjs' +import time from '@/utils/time.js' export default { props: { // 鐖剁粍浠朵紶鍏ョ殑鏃堕棿 selectedTime: { - type: String, + // type: [String,null], default: '' }, // 鏄惁璁剧疆鍙灞炴�� readOnly: { + type: Boolean, + default: false + }, + isUTC: { + type: Boolean, + default: false + }, + isDisabled: { type: Boolean, default: false } @@ -28,38 +34,37 @@ emits: ['submitTime'], data() { return { - time: '', - shortcuts: [] + time: '' } }, - // watch: { - // selectedTime(newVal) { - // console.log('time', this.selectedTime) - // if (newVal != '') { - // this.time = this.selectedTime - // } - // } - // }, - mounted() { - console.log('time', this.selectedTime) - - this.time = this.selectedTime + watch: { + selectedTime(newVal) { + if (newVal != '') { + // this.time = time.utcToStr(this.selectedTime) + this.time = this.selectedTime + } + } }, + + mounted() { + this.time = time.utcToStr(this.selectedTime) + }, + methods: { - + change() { + if (this.time != null) { + let t = time.utcTime(this.time) + this.isUTC ? this.$emit('submitTime', t) : this.$emit('submitTime', this.time) + } else { + this.$emit('submitTime', this.time) + } + } } } </script> <template> - <el-date-picker - v-model="time" - type="datetime" - placeholder="閫夋嫨鏃堕棿" - :shortcuts="shortcuts" - value-format="YYYY-MM-DD HH:mm:ss" - @change="$emit('submitTime', time)" - /> + <el-date-picker v-model="time" type="datetime" placeholder="閫夋嫨鏃堕棿" @change="change" /> </template> <style scoped></style> -- Gitblit v1.9.3