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

拍照装置管理新增修改

Browse Source
ds1.0
fanluyan 2 years ago
parent 50f3822bc7
commit 548ecb0bfc
4 changed files with 220 additions and 26 deletions
Show Stats Download Patch File Download Diff File

7
src/views/devicePhotoSchedule/components/adddeviceDialog.vue
Unescape Escape View File

@ -138,9 +138,10 @@ export default {
this.$refs.formInfo.validate((valid) => { this.$refs.formInfo.validate((valid) => {
if (valid) { if (valid) {
// delete this.ruleForm.time; // delete this.ruleForm.time;
this.ruleForm.listTime.forEach((val) => { this.ruleForm.listTime.forEach((val) => {
this.$set(val, "startTime", val.time[0]); this.$set(val, "startTime", new Date(val.time[0]));
this.$set(val, "endTime", val.time[1]); this.$set(val, "endTime", new Date(val.time[1]));
// console.log(val.time[0]); // console.log(val.time[0]);
// console.log(typeof val.time[0]); // console.log(typeof val.time[0]);
// console.log(new Date(val.time[0])); // console.log(new Date(val.time[0]));
@ -148,9 +149,11 @@ export default {
// console.log(new Date(val.time[0]).getHours()); // console.log(new Date(val.time[0]).getHours());
// console.log(new Date(val.time[0]).getMinutes()); // console.log(new Date(val.time[0]).getMinutes());
}); });
let arr = []; let arr = [];
for (var i = 0; i < this.ruleForm.listTime.length; i++) { for (var i = 0; i < this.ruleForm.listTime.length; i++) {
console.log(this.ruleForm.listTime); console.log(this.ruleForm.listTime);
arr.push( arr.push(
{ {
hour: Math.floor(this.ruleForm.listTime[i].span / 60), hour: Math.floor(this.ruleForm.listTime[i].span / 60),

41
src/views/devicePhotoSchedule/components/setdevice.vue
Unescape Escape View File

@ -14,13 +14,29 @@
<p class="timeGz" v-for="(val, index) in ruleSchedule" :key="index"> <p class="timeGz" v-for="(val, index) in ruleSchedule" :key="index">
<span> <span>
{{ {{
val.startTime.substring(0, val.startTime.lastIndexOf(":")) new Date(val.startTime).getHours() < 10
? "0" + new Date(val.startTime).getHours()
: new Date(val.startTime).getHours()
}}:
{{
new Date(val.startTime).getMinutes() < 10
? "0" + new Date(val.startTime).getMinutes()
: new Date(val.startTime).getMinutes()
}}</span }}</span
> >
~ ~
<span>{{ <span
val.endTime.substring(0, val.endTime.lastIndexOf(":")) >{{
}}</span> new Date(val.endTime).getHours() < 10
? "0" + new Date(val.endTime).getHours()
: new Date(val.endTime).getHours()
}}:
{{
new Date(val.endTime).getMinutes() < 10
? "0" + new Date(val.endTime).getMinutes()
: new Date(val.endTime).getMinutes()
}}</span
>
间隔：<b>{{ val.span }}分钟</b> 间隔：<b>{{ val.span }}分钟</b>
</p> </p>
</div> </div>
@ -65,6 +81,10 @@
:max="9" :max="9"
></el-input-number> ></el-input-number>
</div> </div>
<div class="math">
规约：
{{ data.protocol }}
</div>
<div <div
class="deStatus" class="deStatus"
v-if="allCheckNode.indexOf(data) != -1 && showtag" v-if="allCheckNode.indexOf(data) != -1 && showtag"
@ -154,9 +174,10 @@ export default {
methods: { methods: {
//判断 //判断
getdataform(val) { getdataform(val) {
console.log(val);
this.selid = val.id; this.selid = val.id;
this.ruleSchedule = val.list; this.ruleSchedule = val.listTime;
console.log(this.ruleSchedule, "时间规则"); // console.log(this.ruleSchedule, "时间规则");
this.getlistnr(); this.getlistnr();
}, },
//获取所有通道 //获取所有通道
@ -188,7 +209,7 @@ export default {
}) })
.catch((err) => {}); .catch((err) => {});
}, },
//// 给数组里的每一个对象都添加一个isEdit属性 // 给数组里的每一个对象都添加一个isEdit属性
getChildren(data) { getChildren(data) {
console.log(data); console.log(data);
return data.map((item) => { return data.map((item) => {
@ -224,14 +245,16 @@ export default {
}, },
//时间表 //时间表
sureSum() { sureSum() {
//console.log(this.termidArr); console.log(this.ruleSchedule);
console.log(this.checkedAisle); console.log(this.checkedAisle);
var ruleBox = []; var ruleBox = [];
for (var i = 0; i < this.allCheckNode.length; i++) { for (var i = 0; i < this.allCheckNode.length; i++) {
var parmsobj = { var parmsobj = {
termid: this.allCheckNode[i].id, termid: this.allCheckNode[i].id,
channelidlist: [this.checkedAisle], channelidlist: this.checkedAisle,
offset: this.allCheckNode[i].offsetNum, offset: this.allCheckNode[i].offsetNum,
list: [],
}; };
console.log(parmsobj); console.log(parmsobj);
ruleBox.push(parmsobj); ruleBox.push(parmsobj);

75
src/views/devicePhotoSchedule/index.vue
Unescape Escape View File

@ -37,9 +37,32 @@
v-for="(val, index) in scope.row.listTime" v-for="(val, index) in scope.row.listTime"
:key="index" :key="index"
> >
<span> {{ val.startTime }}</span> <span>
{{
new Date(val.startTime).getHours() < 10
? "0" + new Date(val.startTime).getHours()
: new Date(val.startTime).getHours()
}}:
{{
new Date(val.startTime).getMinutes() < 10
? "0" + new Date(val.startTime).getMinutes()
: new Date(val.startTime).getMinutes()
}}</span
>
~ ~
<span>{{ val.endTime }}</span> <span
>{{
new Date(val.endTime).getHours() < 10
? "0" + new Date(val.endTime).getHours()
: new Date(val.endTime).getHours()
}}:
{{
new Date(val.endTime).getMinutes() < 10
? "0" + new Date(val.endTime).getMinutes()
: new Date(val.endTime).getMinutes()
}}</span
>
间隔：<b>{{ val.span }}分钟</b> 间隔：<b>{{ val.span }}分钟</b>
</p> </p>
</template> </template>
@ -134,7 +157,7 @@ export default {
// for (var i = 0; i < this.deviceTableData.list.length; i++) { // for (var i = 0; i < this.deviceTableData.list.length; i++) {
// console.log(this.deviceTableData.list[i]); // console.log(this.deviceTableData.list[i]);
// } // }
// console.log(this.deviceTableData); console.log(this.deviceTableData);
for (var i = 0; i < this.deviceTableData.length; i++) { for (var i = 0; i < this.deviceTableData.length; i++) {
var arr = []; var arr = [];
@ -153,17 +176,55 @@ export default {
// this.deviceTableData[i].list[k].hour + // this.deviceTableData[i].list[k].hour +
// ":" + // ":" +
// this.deviceTableData[i].list[k].minute; // this.deviceTableData[i].list[k].minute;
obj.startTime = new Date().toISOString(); // console.log(new Date());
let timeDate = new Date();
timeDate.setHours(this.deviceTableData[i].list[k].hour);
timeDate.setMinutes(this.deviceTableData[i].list[k].minute);
console.log(timeDate);
// console.log(new Date().getHours());
// console.log(
// new Date().setHours(this.deviceTableData[i].list[k].hour)
// );
// console.log(d.getHours() + ":" + d.getMinutes());
// if (timeDate.getHours() < 10) {
// console.log(timeDate.getHours());
// obj.startTime =
// "0" + timeDate.getHours() + ":" + timeDate.getMinutes();
// } else {
// }
// let timeHour =
// timeDate.getHours() < 10
// ? "0" + timeDate.getHours()
// : timeDate.getHours();
// let timeMinute =
// timeDate.getMinutes() < 10
// ? "0" + timeDate.getMinutes()
// : timeDate.getMinutes();
obj.startTime = timeDate.toUTCString();
} else if (k % 3 == 2) { } else if (k % 3 == 2) {
console.log("结束时间"); console.log("结束时间");
obj.endTime = obj.endTime =
this.deviceTableData[i].list[k].hour + this.deviceTableData[i].list[k].hour +
":" + ":" +
this.deviceTableData[i].list[k].minute; this.deviceTableData[i].list[k].minute;
let timeDate = new Date();
timeDate.setHours(this.deviceTableData[i].list[k].hour);
timeDate.setMinutes(this.deviceTableData[i].list[k].minute);
// obj.endTime = c.toJSON();
let timeHour =
timeDate.getHours() < 10
? "0" + timeDate.getHours()
: timeDate.getHours();
let timeMinute =
timeDate.getMinutes() < 10
? "0" + timeDate.getMinutes()
: timeDate.getMinutes();
//obj.startTime = timeHour + ":" + timeMinute;
// obj.endTime = timeHour + ":" + timeMinute;
obj.endTime = timeDate.toUTCString();
arr.push(obj); arr.push(obj);
console.log("2222222222222222222222222222");
console.log(arr);
console.log("2222222222222222222222222222");
} }
console.log(this.deviceTableData[i].list[k]); console.log(this.deviceTableData[i].list[k]);
} }

123
src/views/realTimeMonitor/components/setschedule.vue
Unescape Escape View File

@ -92,7 +92,7 @@
<div class="deviceTable"> <div class="deviceTable">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="deviceTableData" :data="newList"
tooltip-effect="dark" tooltip-effect="dark"
stripe stripe
style="width: 100%" style="width: 100%"
@ -104,22 +104,39 @@
<el-table-column label="时间表类型" show-overflow-tooltip> <el-table-column label="时间表类型" show-overflow-tooltip>
<template>按时间段</template> <template>按时间段</template>
</el-table-column> </el-table-column>
<el-table-column label="时间表规则" width="300"> <el-table-column label="时间表规则">
<template slot-scope="scope"> <template slot-scope="scope">
<p <p
class="timeGz" class="timeGz"
v-for="(val, index) in scope.row.list" v-for="(val, index) in scope.row.listTime"
:key="index" :key="index"
> >
<span> <span>
{{ {{
val.startTime.substring(0, val.startTime.lastIndexOf(":")) new Date(val.startTime).getHours() < 10
? "0" + new Date(val.startTime).getHours()
: new Date(val.startTime).getHours()
}}:
{{
new Date(val.startTime).getMinutes() < 10
? "0" + new Date(val.startTime).getMinutes()
: new Date(val.startTime).getMinutes()
}}</span }}</span
> >
~ ~
<span>{{ <span
val.endTime.substring(0, val.endTime.lastIndexOf(":")) >{{
}}</span> new Date(val.endTime).getHours() < 10
? "0" + new Date(val.endTime).getHours()
: new Date(val.endTime).getHours()
}}:
{{
new Date(val.endTime).getMinutes() < 10
? "0" + new Date(val.endTime).getMinutes()
: new Date(val.endTime).getMinutes()
}}</span
>
间隔：<b>{{ val.span }}分钟</b> 间隔：<b>{{ val.span }}分钟</b>
</p> </p>
</template> </template>
@ -259,6 +276,8 @@ export default {
selaccess: "", //选中的通道 selaccess: "", //选中的通道
shedulenr: [], //查询的时间表 shedulenr: [], //查询的时间表
deviceTableData: [], //时间表-表格 deviceTableData: [], //时间表-表格
newList: [],
listTime: [],
page: 1, // 当前页数 page: 1, // 当前页数
pageSize: 10, // 每页数量 pageSize: 10, // 每页数量
total: 0, //总条数 total: 0, //总条数
@ -416,10 +435,98 @@ export default {
pagesize: this.pageSize, pagesize: this.pageSize,
}) })
.then((res) => { .then((res) => {
// this.deviceTableData = res.data.list;
// this.total = res.data.total;
// console.log(this.deviceTableData);
// this.loading = false;
this.newList = [];
this.deviceTableData = res.data.list; this.deviceTableData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
console.log(this.deviceTableData);
this.loading = false; this.loading = false;
// for (var i = 0; i < this.deviceTableData.list.length; i++) {
// console.log(this.deviceTableData.list[i]);
// }
// console.log(this.deviceTableData);
for (var i = 0; i < this.deviceTableData.length; i++) {
var arr = [];
console.log(this.deviceTableData[i]);
for (var k = 0; k < this.deviceTableData[i].list.length; k++) {
if (k % 3 == 0) {
var obj = {};
obj.span =
this.deviceTableData[i].list[k].hour * 60 +
this.deviceTableData[i].list[k].minute;
console.log("时间间隔");
} else if (k % 3 == 1) {
console.log("开始时间");
console.log("a");
// obj.startTime =
// this.deviceTableData[i].list[k].hour +
// ":" +
// this.deviceTableData[i].list[k].minute;
// console.log(new Date());
let timeDate = new Date();
timeDate.setHours(this.deviceTableData[i].list[k].hour);
timeDate.setMinutes(this.deviceTableData[i].list[k].minute);
console.log(timeDate);
// console.log(new Date().getHours());
// console.log(
// new Date().setHours(this.deviceTableData[i].list[k].hour)
// );
// console.log(d.getHours() + ":" + d.getMinutes());
// if (timeDate.getHours() < 10) {
// console.log(timeDate.getHours());
// obj.startTime =
// "0" + timeDate.getHours() + ":" + timeDate.getMinutes();
// } else {
// }
// let timeHour =
// timeDate.getHours() < 10
// ? "0" + timeDate.getHours()
// : timeDate.getHours();
// let timeMinute =
// timeDate.getMinutes() < 10
// ? "0" + timeDate.getMinutes()
// : timeDate.getMinutes();
obj.startTime = timeDate.toUTCString();
} else if (k % 3 == 2) {
console.log("结束时间");
obj.endTime =
this.deviceTableData[i].list[k].hour +
":" +
this.deviceTableData[i].list[k].minute;
let timeDate = new Date();
timeDate.setHours(this.deviceTableData[i].list[k].hour);
timeDate.setMinutes(this.deviceTableData[i].list[k].minute);
// obj.endTime = c.toJSON();
let timeHour =
timeDate.getHours() < 10
? "0" + timeDate.getHours()
: timeDate.getHours();
let timeMinute =
timeDate.getMinutes() < 10
? "0" + timeDate.getMinutes()
: timeDate.getMinutes();
//obj.startTime = timeHour + ":" + timeMinute;
// obj.endTime = timeHour + ":" + timeMinute;
obj.endTime = timeDate.toUTCString();
arr.push(obj);
}
console.log(this.deviceTableData[i].list[k]);
}
this.newList.push({
id: this.deviceTableData[i].id,
list: this.deviceTableData[i].list,
name: this.deviceTableData[i].name,
remark: this.deviceTableData[i].remark,
listTime: arr,
});
}
console.log("this.newList");
console.log(this.newList);
}) })
.catch((err) => {}); .catch((err) => {});
}, },

Write Preview
Loading…
Cancel
Save