Commit e9f75490 authored by moonby's avatar moonby

240729

parent 85cab6d8
......@@ -27,14 +27,14 @@
<el-form-item label="开始时间:" style="margin-right: 20px;">
<el-config-provider :locale="zhCn">
<el-date-picker v-model="startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间" @change="changeStartTime" style="min-width: 180px;" />
placeholder="选择开始时间" @change="changeStartTime" style="min-width: 180px;" :disabled-date="disabledDate" />
<!-- 日期时间格式 2024-1-1 00:00:00-->
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间:">
<el-config-provider :locale="zhCn">
<el-date-picker v-model="endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间" @change="changeEndTime" style="min-width: 180px;" />
placeholder="选择结束时间" @change="changeEndTime" style="min-width: 180px;" :disabled-date="disabledDate" />
</el-config-provider>
</el-form-item>
</div>
......@@ -345,6 +345,12 @@ function twoDigits(value) {
return value < 10 ? '0' + value : value;
}
//日期范围控制,返回true说明需要被禁用
function disabledDate(thisdate){
var startDate=new Date(2023,7,1);
var endDate=new Date();
return thisdate > endDate || thisdate < startDate;
}
//数据控制,根据isHisData的值决定数据控制逻辑,false为实时数据,true为历史数据
......@@ -400,13 +406,14 @@ function init() {
} else {
initReal();
}
getName();
// setSelect();
}
//数据切换
async function changeData() {
init();
getName();
// getName();
}
//实时数据初始化
......
......@@ -28,14 +28,14 @@
<el-form-item label="开始时间:" style="margin-right: 20px;">
<el-config-provider :locale="zhCn">
<el-date-picker v-model="startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间" @change="changeStartTime" style="min-width: 180px;" />
placeholder="选择开始时间" @change="changeStartTime" style="min-width: 180px;" :disabled-date="disabledDate"/>
<!-- 日期时间格式 2024-1-1 00:00:00-->
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间:">
<el-config-provider :locale="zhCn">
<el-date-picker v-model="endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间" @change="changeEndTime" style="min-width: 180px;" />
placeholder="选择结束时间" @change="changeEndTime" style="min-width: 180px;" :disabled-date="disabledDate"/>
</el-config-provider>
</el-form-item>
</div>
......@@ -327,7 +327,27 @@ var tableInfo = reactive({
const loading = ref(false);
const value = ref(true);
//日期转换字符串
function formatDate(date) {
let year = date.getFullYear();
let month = twoDigits(date.getMonth() + 1); // 月份是从0开始的
let day = twoDigits(date.getDate());
let hour = twoDigits(date.getHours());
let minute = twoDigits(date.getMinutes());
let second = twoDigits(date.getSeconds());
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
}
function twoDigits(value) {
return value < 10 ? '0' + value : value;
}
//日期范围控制,返回true说明需要被禁用
function disabledDate(thisdate){
var startDate=new Date(2023,7,1);
var endDate=new Date();
return thisdate > endDate || thisdate < startDate;
}
//数据控制,根据isHisData的值决定数据控制逻辑,false为实时数据,true为历史数据
var dataUrl = isHisData.value ? '/api/tiger/TigerTapData/His' : '/api/tiger/TigerTapData/Real';
......@@ -385,12 +405,13 @@ function init() {
} else {
initReal();
}
getName();
}
//数据切换
async function changeData() {
init();
getName();
// getName();
}
//实时数据初始化
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment