xymp
/
frontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日期选择

Browse Source
master
13703816893 2 years ago
parent d263b9ee85
commit cfc0fbb3b1
3 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File

6
src/views/alarmHandling/components/historyimg.vue
Unescape Escape View File

@ -6,7 +6,7 @@
width="1192px" width="1192px"
@close="handleclose" @close="handleclose"
> >
<div v-loading="loading"> <div v-loading="loadingpic">
<el-carousel <el-carousel
:loop="false" :loop="false"
:autoplay="false" :autoplay="false"
@ -31,7 +31,7 @@ export default {
pageSize: 10, // 每页数量 pageSize: 10, // 每页数量
total: 0, //总条数 total: 0, //总条数
selectnr: "", //获取当前数据内容 selectnr: "", //获取当前数据内容
loadingpic: true, loadingpic: false,
}; };
}, },
mounted() {}, mounted() {},
@ -64,8 +64,6 @@ export default {
}).then((res) => { }).then((res) => {
this.imglist.push(res.data.list); this.imglist.push(res.data.list);
this.total = res.data.total; this.total = res.data.total;
console.log(this.imglist);
console.log(e);
}); });
} }
}, },

40
src/views/alarmHandling/index.vue
Unescape Escape View File

@ -38,13 +38,26 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="日期"> <el-form-item label="日期">
<el-date-picker <!-- <el-date-picker
v-model="formdata.timeVal" v-model="formdata.timeVal"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="timestamp" value-format="timestamp"
></el-date-picker> ></el-date-picker> -->
<el-date-picker
v-model="formdata.starttime"
type="datetime"
placeholder="开始日期"
value-format="timestamp">
</el-date-picker>
<el-date-picker
v-model="formdata.endtime"
type="datetime"
placeholder="结束日期"
value-format="timestamp"
class="ml10">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="告警原因" class="gjbox"> <el-form-item label="告警原因" class="gjbox">
<el-select v-model="formdata.label"> <el-select v-model="formdata.label">
@ -234,7 +247,7 @@ export default {
lineId: 0, lineId: 0,
towerId: 0, towerId: 0,
label: -1, label: -1,
timeVal: "", // timeVal: "",
}, },
photoPic: "", photoPic: "",
tableData: [], tableData: [],
@ -254,11 +267,12 @@ export default {
}; };
}, },
mounted() { mounted() {
this.$set(this.formdata, "timeVal", [ // this.$set(this.formdata, "timeVal", [
new Date(new Date().toLocaleDateString()).getTime(), // new Date(new Date().toLocaleDateString()).getTime(),
new Date().getTime(), // new Date().getTime(),
]); // ]);
this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
this.$set(this.formdata, "endtime", new Date().getTime());
this.getSearchdy(); this.getSearchdy();
this.getTableList(); this.getTableList();
}, },
@ -325,8 +339,8 @@ export default {
this.loading = true; this.loading = true;
this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize); this.$set(this.formdata, "pagesize", this.pageSize);
this.$set(this.formdata, "starttime", this.formdata.timeVal[0]); // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
this.$set(this.formdata, "endtime", this.formdata.timeVal[1]); // this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
getAlarmList(this.formdata) getAlarmList(this.formdata)
.then((res) => { .then((res) => {
this.loading = false; this.loading = false;
@ -346,6 +360,9 @@ export default {
}, },
//查询 //查询
onSubmit() { onSubmit() {
if (this.formdata.starttime > this.formdata.endtime) {
return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
}
this.getTableList(); this.getTableList();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
@ -545,6 +562,9 @@ export default {
padding: 16px; padding: 16px;
border-radius: 4px; border-radius: 4px;
.searchBox { .searchBox {
.ml10{
margin-left: 10px;
}
.el-form { .el-form {
.dybox { .dybox {
.el-form-item__content { .el-form-item__content {

41
src/views/realTimeSearch/index.vue
Unescape Escape View File

@ -67,13 +67,26 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="日期"> <el-form-item label="日期">
<el-date-picker <!-- <el-date-picker
v-model="formdata.timeVal" v-model="formdata.timeVal"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="timestamp" value-format="timestamp"
></el-date-picker> ></el-date-picker> -->
<el-date-picker
v-model="formdata.starttime"
type="datetime"
placeholder="开始日期"
value-format="timestamp">
</el-date-picker>
<el-date-picker
v-model="formdata.endtime"
type="datetime"
placeholder="结束日期"
value-format="timestamp"
class="ml10">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button> <el-button type="primary" @click="onSubmit">查询</el-button>
@ -199,7 +212,7 @@ export default {
towerid: "", towerid: "",
channelid: "", channelid: "",
termid: "", termid: "",
timeVal: "", // timeVal: "",
}, },
picList: [], picList: [],
page: 1, // 当前页数 page: 1, // 当前页数
@ -210,10 +223,12 @@ export default {
}; };
}, },
mounted() { mounted() {
this.$set(this.formdata, "timeVal", [ // this.$set(this.formdata, "timeVal", [
new Date(new Date().toLocaleDateString()).getTime(), // new Date(new Date().toLocaleDateString()).getTime(),
new Date().getTime(), // new Date().getTime(),
]); // ]);
this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
this.$set(this.formdata, "endtime", new Date().getTime());
this.getSearchdy(); this.getSearchdy();
}, },
methods: { methods: {
@ -287,8 +302,8 @@ export default {
this.loading = true; this.loading = true;
this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize); this.$set(this.formdata, "pagesize", this.pageSize);
this.$set(this.formdata, "starttime", this.formdata.timeVal[0]); // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
this.$set(this.formdata, "endtime", this.formdata.timeVal[1]); // this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
getRealtimePhoto(this.formdata) getRealtimePhoto(this.formdata)
.then((res) => { .then((res) => {
this.picList = res.data.list; this.picList = res.data.list;
@ -302,6 +317,9 @@ export default {
}, },
//查询 //查询
onSubmit() { onSubmit() {
if (this.formdata.starttime > this.formdata.endtime) {
return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
}
this.getPicData(); this.getPicData();
}, },
//点击分页 //点击分页
@ -317,7 +335,7 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less" scoped>
.realTimeSearch { .realTimeSearch {
width: calc(100% - 32px); width: calc(100% - 32px);
height: calc(100% - 32px); height: calc(100% - 32px);
@ -328,6 +346,9 @@ export default {
height: calc(100% - 32px); height: calc(100% - 32px);
padding: 16px; padding: 16px;
border-radius: 4px; border-radius: 4px;
.ml10{
margin-left: 10px;
}
} }
.pictureBox { .pictureBox {
display: flex; display: flex;

Write Preview
Loading…
Cancel
Save