时间设置
计划有效期 *
-
+
-
-
+
任务执行周期 *
-
-
+
间隔*
-
+
-
-
+
@@ -292,6 +228,7 @@
v-model="intervalExecuteTime"
placeholder="间隔内开始时间"
value-format="HH:mm:ss"
+ @change="intervalNumber = 0"
>
@@ -318,7 +255,6 @@
v-model="intervalNumber"
:min="1"
:max="maxintervalNumber"
- :precision="0"
>
-
+
-
-
-
- {{ option.deviceName }}
-
-
-
-
- 上一步
- 下一步
+
+
+
+
+
+
+ {{ option.deviceName }}
+
+
+
-
+ 上一步
+ 下一步
+
-
-
全选
+ >全选
是否开启 *
是 是
否 否
@@ -441,9 +376,9 @@ import TreeSelect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import linq from "linq";
import { listPatroltype } from "@/api/basedata/patrolpointmnt/patroltype";
-import { getWeekdaysInRange, getDaysInRange } from "@/utils/index.js";
export default {
name: "edit_task",
+ props: ["editid"],
components: { TreeSelect },
data() {
return {
@@ -455,7 +390,6 @@ export default {
intervalExecuteTime: "",
intervalType: "1",
intervalNumber: 0,
- editid: "",
pickerOptions: {
shortcuts: [
{
@@ -502,11 +436,165 @@ export default {
input3: "",
active: 1,
radio: "1",
- checked: true,
+ checked: false,
zhixing: "选择",
- weekendList: [],
+ options3: [
+ {
+ value: "星期一",
+ label: "周一",
+ },
+ {
+ value: "星期二",
+ label: "周二",
+ },
+ {
+ value: "星期三",
+ label: "周三",
+ },
+ {
+ value: "星期四",
+ label: "周四",
+ },
+ {
+ value: "星期五",
+ label: "周五",
+ },
+ {
+ value: "星期六",
+ label: "周六",
+ },
+ {
+ value: "星期日",
+ label: "周日",
+ },
+ ],
zhixing2: "选择",
- dayList: [],
+ options4: [
+ {
+ value: "1号",
+ label: "1号",
+ },
+ {
+ value: "2号",
+ label: "2号",
+ },
+ {
+ value: "3号",
+ label: "3号",
+ },
+ {
+ value: "4号",
+ label: "4号",
+ },
+ {
+ value: "5号",
+ label: "5号",
+ },
+ {
+ value: "6号",
+ label: "6号",
+ },
+ {
+ value: "7号",
+ label: "7号",
+ },
+ {
+ value: "8号",
+ label: "8号",
+ },
+ {
+ value: "9号",
+ label: "9号",
+ },
+ {
+ value: "10号",
+ label: "10号",
+ },
+ {
+ value: "11号",
+ label: "11号",
+ },
+ {
+ value: "12号",
+ label: "12号",
+ },
+ {
+ value: "13号",
+ label: "13号",
+ },
+ {
+ value: "14号",
+ label: "14号",
+ },
+ {
+ value: "15号",
+ label: "15号",
+ },
+ {
+ value: "16号",
+ label: "16号",
+ },
+ {
+ value: "17号",
+ label: "17号",
+ },
+ {
+ value: "18号",
+ label: "18号",
+ },
+ {
+ value: "19号",
+ label: "19号",
+ },
+ {
+ value: "20号",
+ label: "20号",
+ },
+ {
+ value: "21号",
+ label: "21号",
+ },
+ {
+ value: "22号",
+ label: "22号",
+ },
+ {
+ value: "23号",
+ label: "23号",
+ },
+ {
+ value: "24号",
+ label: "24号",
+ },
+ {
+ value: "25号",
+ label: "25号",
+ },
+ {
+ value: "26号",
+ label: "26号",
+ },
+ {
+ value: "27号",
+ label: "27号",
+ },
+ {
+ value: "28号",
+ label: "28号",
+ },
+ {
+ value: "29号",
+ label: "29号",
+ },
+ {
+ value: "30号",
+ label: "30号",
+ },
+ {
+ value: "31号",
+ label: "31号",
+ },
+ ],
value: "第一间隔单元",
value1: "",
value2: "",
@@ -581,7 +669,6 @@ export default {
},
// 设置计划对象选择Id数组
selectAreaIdList: [],
-
// 选择巡检对象选择Id数组
selectObjectAreaIdList: [],
checkedId: "",
@@ -598,9 +685,7 @@ export default {
devNo: "",
setCheck: [],
type: null,
- priority: "1",
- filterText: "",
- filterText2: "",
+ priority: 1,
transferFilterMethod: (query, item) => {
if (
this.selectObjectAreaIdList &&
@@ -611,7 +696,6 @@ export default {
return false;
}
}
-
if (query) {
return (
item.deviceName.toLowerCase().indexOf(query.toLowerCase()) > -1
@@ -621,14 +705,6 @@ export default {
},
};
},
- watch: {
- filterText(val) {
- this.$refs.treeForm.filter(val);
- },
- filterText2(val) {
- this.$refs.tree.filter(val);
- },
- },
created() {
listPatroltype().then((res) => {
const list = [];
@@ -665,8 +741,6 @@ export default {
this.listPatroltype = list;
this.type = this.listPatroltype[0].id;
});
- this.editid = JSON.parse(sessionStorage.getItem("reportLineId"));
- console.log("11111111111122", sessionStorage.getItem("reportLineId"));
this.getList();
this.getInfo();
if (this.weekormonth == "week") {
@@ -686,185 +760,96 @@ export default {
},
},
methods: {
- onChangeWeekOrMonth() {
- this.changeDateList();
- },
- changeDateList() {
- if (!this.value1 || !this.value2) {
- return;
- }
- if (this.weekormonth == "month") {
- this.dayList = getDaysInRange(this.value1, this.value2);
- } else if (this.weekormonth == "week") {
- this.weekendList = getWeekdaysInRange(this.value1, this.value2);
- }
- },
- handleChangeTaskRunTimeWithMonth(t, item) {
- const sameArray = linq
- .from(this.timelist1)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
+ handleChangeTaskRunTime (t, item) {
+ const sameArray = linq.from(this.timelist2).where((x) => {
+ return x != item && x.zhixing == item.zhixing && new Date("2020-01-01 " + x.time).valueOf() == new Date("2020-01-01 " + item.time).valueOf();
+ }).toArray();
if (sameArray.length > 0) {
this.$message({
type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
- });
- item.time = null;
- }
- },
- handleChangeTaskRunDayWithMonth(item) {
- const sameArray = linq
- .from(this.timelist1)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
- if (sameArray.length > 0) {
- this.$message({
- type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
- });
- item.zhixing = "";
- }
- },
- handleChangeTaskRunTime(t, item) {
- const sameArray = linq
- .from(this.timelist2)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
- if (sameArray.length > 0) {
- this.$message({
- type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+ message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`
});
item.time = null;
}
},
- handleChangeTaskRunDay(item) {
- const sameArray = linq
- .from(this.timelist2)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
+ handleChangeTaskRunDay (item) {
+ const sameArray = linq.from(this.timelist2).where((x) => {
+ return x != item && x.zhixing == item.zhixing && new Date("2020-01-01 " + x.time).valueOf() == new Date("2020-01-01 " + item.time).valueOf();
+ }).toArray();
if (sameArray.length > 0) {
this.$message({
type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+ message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`
});
item.zhixing = "";
}
},
-
- handleChangeIntervalStartTime(t) {
- if (t == null || t == "") {
+ handleChangeIntervalStartTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.intervalEndTime != "" && this.intervalEndTime != null) {
+ if (this.intervalEndTime != '' && this.intervalEndTime != null) {
if (new Date(t).valueOf() >= new Date(this.intervalEndTime).valueOf()) {
this.$nextTick(() => {
- this.intervalStartTime = "";
+ this.intervalStartTime = '';
this.$message({
type: "warning",
- message: "起始时间要小于截止时间",
+ message: "起始时间要小于截止时间"
});
- });
+ })
}
}
},
- handleChangeIntervalEndTime(t) {
- if (t == null || t == "") {
+ handleChangeIntervalEndTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.intervalStartTime != "" && this.intervalStartTime != null) {
- if (
- new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()
- ) {
+ if (this.intervalStartTime != '' && this.intervalStartTime != null) {
+ if (new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()) {
this.$nextTick(() => {
- this.intervalEndTime = "";
+ this.intervalEndTime = '';
this.$message({
type: "warning",
- message: "截止时间要大于起始时间",
+ message: "截止时间要大于起始时间"
});
- });
+ })
}
}
},
- handleChangeStartTime(t) {
- if (t == null || t == "") {
+ handleChangeStartTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.value2 != "" && this.value2 != null) {
+ if (this.value2 != '' && this.value2 != null) {
if (new Date(t).valueOf() >= new Date(this.value2).valueOf()) {
this.$nextTick(() => {
- this.value1 = "";
+ this.value1 = '';
this.$message({
type: "warning",
- message: "起始时间要小于截止时间",
+ message: "起始时间要小于截止时间"
});
- });
+ })
}
}
-
- this.changeDateList();
- // 日期改变，需要重新选择
- if (this.weekormonth == "month") {
- this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
- } else if (this.weekormonth == "week") {
- this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
- }
},
- handleChangeEndTime(t) {
- if (t == null || t == "") {
+ handleChangeEndTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.value1 != "" && this.value1 != null) {
+ if (this.value1 != '' && this.value1 != null) {
if (new Date(t).valueOf() <= new Date(this.value1).valueOf()) {
this.$nextTick(() => {
- this.value2 = "";
+ this.value2 = '';
this.$message({
type: "warning",
- message: "截止时间要大于起始时间",
+ message: "截止时间要大于起始时间"
});
- });
+ })
}
}
-
- this.changeDateList();
- // 日期改变，需要重新选择
- if (this.weekormonth == "month") {
- this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
- } else if (this.weekormonth == "week") {
- this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
- }
},
-
- handleCheckAllChange(val) {
+ handleCheckAllChange (val) {
if (this.checkAll) {
this.$refs.treeForm.setCheckedNodes(this.areaList);
} else {
@@ -878,156 +863,103 @@ export default {
this.$refs.tree.setCheckedNodes([]);
}
},
- filterNode(value, data) {
- if (!value) return true;
- return data.areaName.indexOf(value) !== -1;
- },
- filterNode2(value, data, node) {
- if (!value) return true;
- let one = data.label.indexOf(value) !== -1;
- let two =
- node.parent &&
- node.parent.data &&
- node.parent.data.label &&
- node.parent.data.label.indexOf(value) !== -1;
- let three =
- node.parent &&
- node.parent.parent &&
- node.parent.parent.data &&
- node.parent.parent.data.label &&
- node.parent.parent.data.label.indexOf(value) !== -1;
- let four =
- node.parent &&
- node.parent.parent &&
- node.parent.parent.parent &&
- node.parent.parent.parent.data &&
- node.parent.parent.parent.data.label &&
- node.parent.parent.parent.data.label.indexOf(value) !== -1;
-
- let result_one = false;
- let result_two = false;
- let result_three = false;
- let result_four = false;
- if (node.level === 1) {
- result_one = one;
- } else if (node.level === 2) {
- result_two = one || two;
- } else if (node.level === 3) {
- result_three = one || two || three;
- } else if (node.level === 4) {
- result_four = one || two || three || four;
- }
- return result_one || result_two || result_three || result_four;
- },
getInfo: function () {
- console.log("111111111", this.editid);
- if (this.editid != -1) {
- editTask(this.editid).then((response) => {
- if (response.data.executionMode == "0") {
- this.checked = true;
- }
- if (response.data.executionStatus == "4") {
- this.radio = "3";
- } else if (response.data.executionStatus == "1") {
- this.radio = "2";
- } else if (response.data.executionStatus == "2") {
- this.radio = "1";
- }
- let setArr = [];
- response.data.prevPoints.forEach((item) => {
- setArr.push(item.parentId);
- });
- if (response.data.taskCycle == "1") {
- this.weekormonth = "week";
- this.taskCycle = 1;
- this.intervalStartTime = response.data.intervalStartTime;
- this.intervalEndTime = response.data.intervalEndTime;
- this.intervalExecuteTime = response.data.intervalExecuteTime;
- this.intervalType = response.data.intervalType;
- this.intervalNumber = response.data.intervalNumber;
- } else if (response.data.taskCycle == "0") {
- this.weekormonth = "month";
- this.taskCycle = 0;
- }
- this.priority = response.data.priority;
- this.setCheck = setArr;
- this.input3 = response.data.taskName;
- this.value11 = response.data.fixedStartTime;
- this.queryParams.areaId = response.data.areaId;
- if (response.data.areaIdS) {
- this.selectAreaIdList = response.data.areaIdS.split(",");
- }
- this.queryParams.areaName = response.data.areaName;
- this.deviceList = response.data.deviceList;
- this.devNo = response.data.devNo;
- this.addList = response.data.prevPoints;
+ editTask(this.editid).then((response) => {
+ if (response.data.executionMode == "0") {
+ this.checked = true;
+ }
+ if (response.data.executionStatus == "4") {
+ this.radio = "3";
+ } else if (response.data.executionStatus == "1") {
+ this.radio = "2";
+ } else if (response.data.executionStatus == "2") {
+ this.radio = "1";
+ }
+ let setArr = [];
+ response.data.prevPoints.forEach((item) => {
+ setArr.push(item.parentId);
+ });
+ if (response.data.taskCycle == "1") {
+ this.weekormonth = "week";
+ this.taskCycle = 1;
+ this.intervalStartTime = response.data.intervalStartTime;
+ this.intervalEndTime = response.data.intervalEndTime;
+ this.intervalExecuteTime = response.data.intervalExecuteTime;
+ this.intervalType = response.data.intervalType;
+ this.intervalNumber = response.data.intervalNumber;
+ } else if (response.data.taskCycle == "0") {
+ this.weekormonth = "month";
+ this.taskCycle = 0;
+ }
+ this.priority = response.data.priority;
+ this.setCheck = setArr;
+ this.input3 = response.data.taskName;
+ this.value11 = response.data.fixedStartTime;
+ this.queryParams.areaId = response.data.areaId;
+ if (response.data.areaIdS) {
+ this.selectAreaIdList = response.data.areaIdS.split(",");
+ }
+ this.queryParams.areaName = response.data.areaName;
+ this.deviceList = response.data.deviceList;
+ this.devNo = response.data.devNo;
+ this.addList = response.data.prevPoints;
+ this.type = response.data.type;
+ var deviceLists = response.data.deviceList.split(",");
+ deviceLists.forEach((item) => {
+ this.value5.push(Number(item));
+ });
- if (response.data.type) {
- this.type = response.data.type;
- }
- var deviceLists = response.data.deviceList.split(",");
- deviceLists.forEach((item) => {
- this.value5.push(Number(item));
- });
-
- //1,2,3种执行状态
- this.executionStatus = response.data.executionStatus;
- //选第二个
- this.value2 = response.data.cycleEndTime; //周期结束时间
- this.value1 = response.data.cycleStartTime; //周期结束
- this.time3 = response.data.cycleExecuteTime; //周期执行时间
- //是否开启
- this.beginradio = response.data.isenable;
- // let str = response.data.cycleWeek;
- if (response.data.cycleWeek) {
- let strResult = response.data.cycleWeek.split(",");
- let timeTmpList = response.data.cycleExecuteTime.split(",");
- this.timelist2 = [];
- for (let index = 0; index < strResult.length; index++) {
- this.timelist2.push({
- zhixing: strResult[index],
- time: timeTmpList[index],
- });
- }
+ //1,2,3种执行状态
+ this.executionStatus = response.data.executionStatus;
+ //选第二个
+ this.value2 = response.data.cycleEndTime; //周期结束时间
+ this.value1 = response.data.cycleStartTime; //周期结束
+ this.time3 = response.data.cycleExecuteTime; //周期执行时间
+ //是否开启
+ this.beginradio = response.data.isenable;
+ // let str = response.data.cycleWeek;
+ if (response.data.cycleWeek) {
+ let strResult = response.data.cycleWeek.split(",");
+ let timeTmpList = response.data.cycleExecuteTime.split(",");
+ this.timelist2 = [];
+ for (let index = 0; index < strResult.length; index++) {
+ this.timelist2.push({
+ zhixing: strResult[index],
+ time: timeTmpList[index],
+ });
}
- if (response.data.cycleMonth) {
- let strmouth = response.data.cycleMonth;
- let strmouthResult = strmouth.split(",");
- let timeTmpList = response.data.cycleExecuteTime.split(",");
- // let basic1 = strmouthResult.substr(0, strmouthResult.length - 1);
- // let timeli1 = strmouthResult.pop();
- // console.log(strmouthResult.pop())
- this.timelist1 = [];
- for (let index = 0; index < strmouthResult.length - 1; index++) {
- this.timelist1.push({
- zhixing: strmouthResult[index],
- time: timeTmpList[index],
- });
- }
+ }
+ if (response.data.cycleMonth) {
+ let strmouth = response.data.cycleMonth;
+ let strmouthResult = strmouth.split(",");
+ let timeTmpList = response.data.cycleExecuteTime.split(",");
+ // let basic1 = strmouthResult.substr(0, strmouthResult.length - 1);
+ // let timeli1 = strmouthResult.pop();
+ // console.log(strmouthResult.pop())
+ this.timelist1 = [];
+ for (let index = 0; index < strmouthResult.length - 1; index++) {
+ this.timelist1.push({
+ zhixing: strmouthResult[index],
+ time: timeTmpList[index],
+ });
}
- this.changeDateList();
- this.tree();
- });
- } else {
- this.type = null;
- }
+ }
+ this.tree();
+ });
},
changeBegine: function () {
console.log(this.beginradio);
- if (this.editid != -1) {
- const data = {
- taskId: this.editid,
- isenable: this.beginradio,
- };
- changeStatus(data).then((response) => {
- // if (response.code == 200) {
- // this.$modal.msgSuccess("修改成功");
- // this.$emit("editSuccess");
- // }
- });
- }
+ const data = {
+ taskId: this.editid,
+ isenable: this.beginradio,
+ };
+ changeStatus(data).then((response) => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess("修改成功");
+ this.$emit("editSuccess");
+ }
+ });
},
-
typeClick() {
console.log(322, this.type);
},
@@ -1057,7 +989,6 @@ export default {
let data = {};
let res = this.$refs.tree.getCheckedNodes(true);
this.addList = res;
- console.log(this.addList);
if (this.addList.length == 0) {
this.$modal.msgError("请选择巡视设备");
} else {
@@ -1082,126 +1013,38 @@ export default {
// this.executionStatus = 0;
this.executionStatus = 4;
}
-
- if (this.editid != -1) {
- data = {
- executionType: this.radio,
- priority: this.priority,
- deviceList: this.value5.join(","),
- taskId: this.editid,
- taskName: this.input3,
- executionMode: 0,
- cycleEndTime: this.value2,
- cycleStartTime: this.value1,
- cycleExecuteTime: this.time3,
- fixedStartTime: this.value11,
- taskCycle: this.taskCycle,
- executionStatus: this.executionStatus,
- prevPoints: this.addList,
- areaIdS: this.selectAreaIdList.join(","),
- areaId: this.queryParams.areaId,
- areaName: this.queryParams.areaName,
- cycleWeek: this.cycleWeek,
- cycleMonth: this.cycleMonth,
- isenable: this.beginradio,
- type: this.type,
- intervalStartTime: this.intervalStartTime,
- intervalEndTime: this.intervalEndTime,
- intervalExecuteTime: this.intervalExecuteTime,
- intervalType: this.intervalType,
- intervalNumber: this.intervalNumber,
- };
- editSave(data)
- .then((res) => {
- this.$modal.msgSuccess("修改成功");
- this.$emit("editSuccess");
- var data_close = {
- id: "alarmManage2",
- sourceId: "",
- targetId: "main_frame_global_modal", // 基座系统弹窗ID
- event: {
- type: "SWITCH_GLOBAL_MODAL",
- data: {
- cardId: "", // 弹窗卡片ID
- closeModal: true, // 布尔值, true为关闭
- },
- },
- tm: new Date().getTime(), // 时间戳
- };
- window.top.postMessage(JSON.stringify(data_close), "*");
- var data_shua = {
- id: "editTask",
- sourceId: "",
- targetId: "main_frame_global_modal", // 基座系统弹窗ID
- event: {
- type: "PING",
- data: {},
- },
- tm: new Date().getTime(), // 时间戳
- };
- window.top.postMessage(JSON.stringify(data_shua), "*");
- })
- .catch((res) => {});
- } else {
- data = {
- executionType: this.radio,
- priority: this.priority,
- deviceList: this.value5.join(","),
- taskName: this.input3,
- executionMode: 0,
- cycleEndTime: this.value2,
- cycleStartTime: this.value1,
- cycleExecuteTime: this.time3,
- fixedStartTime: this.value11,
- taskCycle: this.taskCycle,
- executionStatus: this.executionStatus,
- prevPoints: this.addList,
- areaId: this.queryParams.areaId,
- areaIdS: this.selectAreaIdList.join(","),
- areaName: this.queryParams.areaName,
- cycleWeek: this.cycleWeek,
- cycleMonth: this.cycleMonth,
- isenable: this.beginradio,
- type: this.type,
- intervalStartTime: this.intervalStartTime,
- intervalEndTime: this.intervalEndTime,
- intervalExecuteTime: this.intervalExecuteTime,
- intervalType: this.intervalType,
- intervalNumber: this.intervalNumber,
- };
- addPatrol(data)
- .then((res) => {
- this.$modal.msgSuccess("添加成功");
- this.$emit("addSuccess");
- let ShuaXing = "ShuaXingList";
- var data_close = {
- id: "alarmManage2",
- sourceId: "",
- targetId: "main_frame_global_modal", // 基座系统弹窗ID
- event: {
- type: "SWITCH_GLOBAL_MODAL",
- data: {
- cardId: "", // 弹窗卡片ID
- closeModal: true, // 布尔值, true为关闭
- },
- },
- tm: new Date().getTime(), // 时间戳
- };
- window.top.postMessage(JSON.stringify(data_close), "*");
- var data_shua = {
- id: "editTask",
- sourceId: "",
- targetId: "main_frame_global_modal", // 基座系统弹窗ID
- event: {
- type: "PING",
- data: {},
- },
- tm: new Date().getTime(), // 时间戳
- };
- window.top.postMessage(JSON.stringify(data_shua), "*");
- })
- .catch((res) => {});
- }
+ data = {
+ priority: this.priority,
+ deviceList: this.value5.join(","),
+ taskId: this.editid,
+ taskName: this.input3,
+ executionMode: 0,
+ cycleEndTime: this.value2,
+ cycleStartTime: this.value1,
+ cycleExecuteTime: this.time3,
+ fixedStartTime: this.value11,
+ taskCycle: this.taskCycle,
+ executionStatus: this.executionStatus,
+ prevPoints: this.addList,
+ areaIdS: this.selectAreaIdList.join(","),
+ areaId: this.queryParams.areaId,
+ areaName: this.queryParams.areaName,
+ cycleWeek: this.cycleWeek,
+ cycleMonth: this.cycleMonth,
+ isenable: this.beginradio,
+ type: this.type,
+ intervalStartTime: this.intervalStartTime,
+ intervalEndTime: this.intervalEndTime,
+ intervalExecuteTime: this.intervalExecuteTime,
+ intervalType: this.intervalType,
+ intervalNumber: this.intervalNumber,
+ };
+ editSave(data)
+ .then((res) => {
+ this.$modal.msgSuccess("修改成功");
+ this.$emit("editSuccess");
+ })
+ .catch((res) => {});
}
},
getList: function () {
@@ -1235,6 +1078,7 @@ export default {
},
searchClick: function () {
// this.queryParams.areaName = this.searchName;
+ var obj = { ...this.queryParams };
const areaIdS = this.selectAreaIdList.join(",");
var obj = { ...this.queryParams, areaIdS };
obj.areaName = this.searchName;
@@ -1257,6 +1101,7 @@ export default {
}
},
next1() {
+ // debugger;
let arr = [];
let timeArr = [];
let arr1 = [];
@@ -1309,15 +1154,10 @@ export default {
}
}
if (this.radio == 2) {
- if (this.value1 == "" || this.value2 == "") {
+ if (!this.value1 || !this.value2) {
this.$modal.msgError("请选择计划有效期");
return false;
}
- if (new Date(this.value1) >= new Date(this.value2)) {
- this.$modal.msgError("计划有效期开始时间不能大于等于结束时间");
- return false;
- }
-
if (this.weekormonth == "week") {
for (let index = 0; index < this.timelist2.length; index++) {
const element = this.timelist2[index];
@@ -1360,9 +1200,7 @@ export default {
// this.$modal.msgError("计划有效期开始时间不能大于结束时间");
// return false;
// }
- if (
- new Date(this.intervalStartTime) >= new Date(this.intervalEndTime)
- ) {
+ if (new Date(this.intervalStartTime) > new Date(this.intervalEndTime)) {
this.$modal.msgError("间隔开始时间不能大于结束时间");
return false;
}
@@ -1377,18 +1215,11 @@ export default {
// return false;
// }
- if (!this.intervalExecuteTime) {
+ if (this.intervalExecuteTime == "") {
this.$modal.msgError("请选择执行时间");
return false;
}
- // 提取时间
- const startTime = this.intervalStartTime.split(" ")[1];
- if (startTime > this.intervalExecuteTime) {
- this.$modal.msgError("执行时间需大于间隔开始时间");
- return false;
- }
-
if (
24 - new Date(this.intervalExecuteTime).getHours() <
this.intervalNumber
@@ -1435,14 +1266,13 @@ export default {
},
add1() {
if (this.weekormonth == "month") {
- // if (this.timelist1.length < 31) {
+ if (this.timelist1.length < 7) {
this.timelist1.push({ zhixing: "", time: "" });
- // }
- }
- else if (this.weekormonth == "week") {
- // if (this.timelist2.length < 7) {
+ }
+ } else if (this.weekormonth == "week") {
+ if (this.timelist2.length < 7) {
this.timelist2.push({ zhixing: "", time: "" });
- // }
+ }
}
},
delete1(idx) {
@@ -1461,15 +1291,6 @@ export default {
-
diff --git a/src/views/administration/new_task.vue b/src/views/administration/new_task.vue
index 1aa887f..7673107 100644
--- a/src/views/administration/new_task.vue
+++ b/src/views/administration/new_task.vue
@@ -3,37 +3,26 @@
现场巡检
- 全选
-
-
+
+ 全选
+
-
-
- 定时执行
- 周期执行
- 间隔执行
+ 定时执行
+ 周期执行
+ 间隔执行
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -187,6 +182,8 @@ export default {
],
},
professionTypeData: [],
+ devicetypeId: null,
+ disabledForm:true,
};
},
mounted() {
@@ -210,8 +207,10 @@ export default {
});
},
handleNodeClick(data) {
+ this.disabledForm=true;
console.log(data);
// this.type = data.type;
+ this.devicetypeId = data.devicetypeId;
if (data.devicetypeId == 1) {
this.rightTitle = this.$t("equipment_type.AddDevice");
this.show = false;
@@ -224,6 +223,7 @@ export default {
}
},
addBtn() {
+ this.disabledForm=false;
this.formData = {};
this.show = true;
this.type = 0;
@@ -240,9 +240,9 @@ export default {
} else if (this.formData.phaseNum == "三相") {
this.formData.phase = "ABC";
}
- this.formData.powerMainEquFlag="Yes";
+ this.formData.powerMainEquFlag = "Yes";
if (this.type == 0) {
- this.formData.parentId = 1;
+ this.formData.parentId = this.devicetypeId;
add(this.formData).then((res) => {
if (res.code == 200) {
this.$message({
diff --git a/src/views/point copy/components/site_VideoDialog copy.vue b/src/views/point copy/components/site_VideoDialog copy.vue
new file mode 100644
index 0000000..fe8c554
--- /dev/null
+++ b/src/views/point copy/components/site_VideoDialog copy.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/point copy/components/site_VideoDialog.vue b/src/views/point copy/components/site_VideoDialog.vue
new file mode 100644
index 0000000..966ef3c
--- /dev/null
+++ b/src/views/point copy/components/site_VideoDialog.vue
@@ -0,0 +1,696 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/point copy/point_mang.vue b/src/views/point copy/point_mang.vue
new file mode 100644
index 0000000..3da0aaa
--- /dev/null
+++ b/src/views/point copy/point_mang.vue
@@ -0,0 +1,452 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point/components/chooseDevices.vue b/src/views/point/components/chooseDevices.vue
new file mode 100644
index 0000000..63e2a7c
--- /dev/null
+++ b/src/views/point/components/chooseDevices.vue
@@ -0,0 +1,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point/components/site_VideoDialog copy.vue b/src/views/point/components/site_VideoDialog copy.vue
new file mode 100644
index 0000000..fe8c554
--- /dev/null
+++ b/src/views/point/components/site_VideoDialog copy.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/point/components/site_VideoDialog.vue b/src/views/point/components/site_VideoDialog.vue
index fe8c554..966ef3c 100644
--- a/src/views/point/components/site_VideoDialog.vue
+++ b/src/views/point/components/site_VideoDialog.vue
@@ -17,7 +17,23 @@
@@ -182,7 +198,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/point/point_mang copy.vue b/src/views/point/point_mang copy.vue
new file mode 100644
index 0000000..155ac92
--- /dev/null
+++ b/src/views/point/point_mang copy.vue
@@ -0,0 +1,531 @@
+el-button
+
@@ -11,7 +11,7 @@
（0/200）{{ $t("point_mang.tableHeadMsg") }}
-
+
-
-
-
-
+
@@ -75,10 +84,6 @@
-
-
+
{{ $t("share.copy") }}
{{
@@ -179,9 +185,12 @@
:label="$t('point_mang.ThresholdUpperLimit')"
:render-header="addRedStar"
>
-
+
+
-
+
+
@@ -216,15 +228,16 @@ import {
subtypeList,
} from "@/api/point/point_mang";
export default {
+ components: {},
data() {
return {
- treeData: [],
+ treeDataNew: [],
defaultProps: {
children: "children",
label: "devicetypeName",
},
tableData: [],
- DevicetypeIdOptions: [],
+ // DevicetypeIdOptions: [],
options: [],
value: [],
dialogVisible: false,
@@ -234,6 +247,13 @@ export default {
stdpatrolPointId: null,
dialogTableSelectName: [],
filterText: null,
+ showTreePopover: false,
+ selectedDeviceTypeName: "",
+ DevicetypeIdOptions: [],
+ defaultPropsObj: {
+ children: "children",
+ label: "devicetypeName",
+ },
};
},
watch: {
@@ -244,37 +264,59 @@ export default {
created() {},
mounted() {
this.init();
- devicetype().then((res) => {
- if (res.code == 200) {
- res.data.forEach((item) => {
- if (item.devicetypeId !== 1) {
- this.DevicetypeIdOptions.push(item);
- }
- });
- }
- });
+ // devicetype().then((res) => {
+ // if (res.code == 200) {
+ // res.data.forEach((item) => {
+ // if (item.devicetypeId !== 1) {
+ // this.DevicetypeIdOptions.push(item);
+ // }
+ // });
+ // }
+ // });
dataFormat().then((res) => {
if (res.code == 200) {
console.log(this.options, res.data);
res.data.forEach((item) => {
- item.dictValue = String(item.dictValue);
+ item.dictValue = Number(item.dictValue);
});
this.options = res.data;
}
});
},
methods: {
+ handleNodeClickInSelect(data, row) {
+ if (row) {
+ row.componentDevicetypeId = data.devicetypeId;
+ row.devicetypeName = data.devicetypeName;
+ this.showTreePopover = false;
+ }
+ },
+ getDeviceTypeNameById(id) {
+ function findNode(nodes) {
+ for (const node of nodes) {
+ if (node.devicetypeId === id) return node.devicetypeName;
+ if (node.children) {
+ const result = findNode(node.children);
+ if (result) return result;
+ }
+ }
+ return "";
+ }
+ return findNode(this.DevicetypeIdOptions);
+ },
+
filterNode(value, data) {
if (!value) return true;
return data.devicetypeName.indexOf(value) !== -1;
},
init(qurey) {
- getTreeAreaDeviceSelect(qurey).then((res) => {
+ devicetype(qurey).then((res) => {
+ this.treeDataNew = [];
this.tableData = [];
if (res.code == 200) {
res.data.forEach((item) => {
if (item.devicetypeId !== 1) {
- this.treeData.push(item);
+ this.treeDataNew.push(item);
}
});
}
@@ -345,19 +387,51 @@ export default {
initClickList(data) {
cilikList(data.devicetypeId).then((res) => {
if (res.code == 200) {
- console.log(res, 111);
- this.tableData = res.rows;
+ this.tableData = res.rows.map((row) => ({
+ ...row,
+ devicetypeName: this.getDeviceTypeNameById(
+ row.componentDevicetypeId
+ ),
+ }));
}
});
+ getTreeAreaDeviceSelect(data.devicetypeId).then((res) => {
+ if (res.code == 200) {
+ this.DevicetypeIdOptions = res.data.filter(
+ (item) => item.devicetypeId !== 1 && item.powerMainEquFlag == "Yes"
+ );
+ this.$nextTick(() => {
+ cilikList(data.devicetypeId).then((res2) => {
+ if (res2.code == 200) {
+ this.tableData = res2.rows.map((row) => ({
+ ...row,
+ devicetypeName: this.getDeviceTypeNameById(
+ row.componentDevicetypeId
+ ),
+ }));
+ }
+ });
+ });
+ }
+ });
+ },
+ areaNormalizer(node) {
+ return {
+ id: node.devicetypeId,
+ label: node.devicetypeName,
+ children: node.children,
+ };
},
addBtn() {
if (this.tableData.length < 200) {
- this.tableData.push({});
- } else {
- this.$message({
- type: "warning",
- message: "最多添加200条数据!",
+ this.tableData.push({
+ componentDevicetypeId: null,
+ devicetypeName: "",
+ patrolContent: "",
+ mainDevicetypeId: null,
});
+ } else {
+ this.$message.warning("最多添加200条数据!");
}
},
// 保存
@@ -374,6 +448,10 @@ export default {
if (flag) {
add(this.tableData).then((res) => {
this.initClickList(this.devicetypeId);
+ this.$message({
+ type: "success",
+ message: "保存成功",
+ });
});
} else {
this.$message({
@@ -428,6 +506,28 @@ export default {
handleClose() {
this.dialogVisible = false;
},
+ // 复制
+ handleCopy(row) {
+ let { stdpatrolPointId, ...newObj } = row;
+ console.log(newObj, 111);
+ newObj.patrolContent = row.patrolContent + "_复制";
+ this.tableData.push(newObj);
+ },
+ handleNodeClickOption(data) {
+ console.log(data, 111);
+ },
+ disabledFn(row) {
+ console.log(
+ this.$refs.multipleTable.selection.some((item) => item.id === row.id)
+ ? false
+ : false
+ );
+ return this.$refs.multipleTable.selection.some(
+ (item) => item.id === row.id
+ )
+ ? false
+ : true;
+ },
},
};
@@ -449,4 +549,20 @@ export default {
text-align: center;
margin-top: 10px;
}
+.popover-content {
+ max-height: 200px;
+ overflow-y: auto;
+ padding: 5px 0;
+}
+// .tree-select {
+// position: absolute;
+// z-index: 9999999;
+// width: 100%;
+// max-height: 200px;
+// overflow-y: auto;
+// border: 1px solid #dcdfe6;
+// border-radius: 4px;
+// background: #fff;
+// box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+// }
diff --git a/src/views/point/site_management.vue b/src/views/point/site_management.vue
index dab4eac..003b7b3 100644
--- a/src/views/point/site_management.vue
+++ b/src/views/point/site_management.vue
@@ -1,1372 +1,3053 @@
-
名称 *
任务类型 *
- 任务执行方式 *
+ 巡检区域 *
-
+
时间设置
计划有效期 *
-
+
-
-
+
+
任务执行周期 *
-
任务执行时间 *
- 添加({{ timelist1.length }})
+ 添加({{ timelist1.length }}/31)
- 添加({{ timelist2.length }})
+ 添加({{ timelist2.length }}/7)
日期
时间
操作
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -266,34 +147,19 @@
+
-
+
-
+
间隔*
-
+
-
-
+
执行时间 *
-
+
-
+ }" @change="handleChange" :data="treeList">
-
+
{{ option.deviceName }}
-
+
- 上一步
- 下一步
-
+ 上一步
+ 下一步
+
-
-
-
- {{
+ {{
$t("share.export")
}}
@@ -258,6 +253,18 @@ export default {
cancel() {
this.dialogVisible = false;
},
+ handleExport(){
+ this.download(
+ "/basedata/alg/export",
+ {
+ ...this.queryParams,
+ },
+ `alg_${new Date().getTime()}.xlsx`
+ );
+ },
+ handleClose(){
+ this.dialogVisible = false;
+ }
},
};
diff --git a/src/views/basedata/alg/subtype/index.vue b/src/views/basedata/alg/subtype/index.vue
index 16e6177..5477947 100644
--- a/src/views/basedata/alg/subtype/index.vue
+++ b/src/views/basedata/alg/subtype/index.vue
@@ -64,7 +64,7 @@
>
- {{
+ {{
$t("share.export")
}}
@@ -106,7 +106,7 @@
>
@@ -191,7 +191,7 @@
diff --git a/src/views/basedata/bdconfig/deviceconvert/index.vue b/src/views/basedata/bdconfig/deviceconvert/index.vue
index af23d95..2e92c3b 100644
--- a/src/views/basedata/bdconfig/deviceconvert/index.vue
+++ b/src/views/basedata/bdconfig/deviceconvert/index.vue
@@ -351,6 +351,7 @@ export default {
});
},
add() {
+ this.dialogForm = {};
this.type = 0;
this.dialogVisible = true;
this.title = this.$t("deviceconvert.AddBasicData-DeviceCorrespondence");
@@ -436,12 +437,12 @@ export default {
},
// 查询
handleQuery() {
- this.init()
+ this.init();
},
// 重置
- resetQuery(){
+ resetQuery() {
this.queryParams = { pageNum: 1, pageSize: 10 };
- this.init()
+ this.init();
},
// 导出
handleExport() {
diff --git a/src/views/basedata/eqpbook/channel/index.vue b/src/views/basedata/eqpbook/channel/index.vue
index bd9644e..8545fd6 100644
--- a/src/views/basedata/eqpbook/channel/index.vue
+++ b/src/views/basedata/eqpbook/channel/index.vue
@@ -26,7 +26,7 @@
:label="item.patroldeviceName"
:value="item.eqpbookId"
v-for="item in eqpbookListData"
- :key="item.areaId"
+ :key="item.eqpbookId"
>
@@ -86,7 +86,7 @@
>
- {{
+ {{
$t("share.export")
}}
@@ -140,7 +140,6 @@
align="center"
>
-
可见光
@@ -306,7 +305,7 @@
"
>
-
+
{
- if(res.code==200){
+ if (res.code == 200) {
this.dialogForm = res.data;
}
});
@@ -504,6 +503,15 @@ export default {
}
});
},
+ handleExport() {
+ this.download(
+ "/basedata/eqpbook/channel/export",
+ {
+ ...this.queryParams,
+ },
+ `channel_${new Date().getTime()}.xlsx`
+ );
+ },
},
};
diff --git a/src/views/basedata/patrolpointmnt/patrolpointpreset/index.vue b/src/views/basedata/patrolpointmnt/patrolpointpreset/index.vue
index 50403df..0049bde 100644
--- a/src/views/basedata/patrolpointmnt/patrolpointpreset/index.vue
+++ b/src/views/basedata/patrolpointmnt/patrolpointpreset/index.vue
@@ -3,6 +3,7 @@
- {{
- $t("share.delete")
- }}
+ {{ $t("share.delete") }}
-
+
@@ -131,13 +145,13 @@
{{ $t("share.edit") }}
{{ $t("share.delete") }}
@@ -160,7 +174,7 @@
{{
- dialogForm.patrolpointId || fatherID
+ dialogForm.patrolPointId || fatherID
}}
- {{ dialogForm.patrolpointCode }}
+ {{ dialogForm.patrolPointPresetId }}
- {{ dialogForm.patrolpointName }}
+ {{ dialogForm.patrolPointName }}
-
+
- {{
+ {{
$t("share.export")
}}
@@ -112,7 +112,7 @@
prop="patrolTypeLevel"
align="center"
/>
-
diff --git a/src/views/basedata/station/index.vue b/src/views/basedata/station/index.vue
index d76bd3b..697446e 100644
--- a/src/views/basedata/station/index.vue
+++ b/src/views/basedata/station/index.vue
@@ -361,14 +361,13 @@ export default {
},
// 导出
handleExport() {
- Export(this.queryParams).then((res) => {
- if (res.code == 200) {
- this.$message({
- type: "success",
- message: "导出成功!",
- });
- }
- });
+ this.download(
+ "/basedata/station/export",
+ {
+ ...this.queryParams,
+ },
+ `station_${new Date().getTime()}.xlsx`
+ );
},
},
};
diff --git a/src/views/common.js b/src/views/common.js
new file mode 100644
index 0000000..d5464c5
--- /dev/null
+++ b/src/views/common.js
@@ -0,0 +1,48 @@
+let messageId = 0;
+/**
+ * 调用卡片系统弹窗
+ * @param {*} zhan_name 站点名称
+ * @param {*} sourceCardId 源卡片id
+ * @param {*} targetCardId 目标卡片id
+ * @param {*} dialogTitle 弹窗标题
+ * @param {*} dialogIsDrag 弹窗是否可拖拽 默认 true
+ * @param {*} positionTop 弹窗上边距
+ * @param {*} positionLeft 弹窗左边距
+ * @param {*} contentWidth 弹窗内容宽度
+ * @param {*} contentHeight 弹窗内容高度
+ * @param {*} params 要传递给卡片的参数
+ */
+export function openDialog({
+ zhan_name = "",
+ sourceCardId,
+ targetCardId,
+ dialogTitle,
+ dialogIsDrag = true,
+ positionTop = "30",
+ positionLeft = "30",
+ contentWidth = "1856",
+ contentHeight = "896",
+ params = {},
+}) {
+ const id = "message_" + ++messageId;
+ var data = {
+ id,
+ sourceId: zhan_name + sourceCardId,
+ targetId: "main_frame_global_modal", // 基座系统弹窗ID
+ event: {
+ type: "SWITCH_GLOBAL_MODAL",
+ data: {
+ title: dialogTitle, // 弹窗标题
+ cardId: zhan_name + targetCardId,
+ isDrag: dialogIsDrag, // 弹窗是否可拖拽，默认为true可拖拽
+ positionTop, // 数字，弹窗上边距 positionTop
+ positionLeft, // 数字，弹窗左边距 positionLeft
+ contentWidth, // 数字，弹窗内容宽度
+ contentHeight, // 数字，弹窗内容高度
+ params, // 需要传递的参数
+ },
+ },
+ tm: new Date().getTime(), // 时间戳
+ };
+ window.parent.postMessage(JSON.stringify(data), "*");
+}
diff --git a/src/views/equipment/entry.vue b/src/views/equipment/entry.vue
index 433af11..1d139ec 100644
--- a/src/views/equipment/entry.vue
+++ b/src/views/equipment/entry.vue
@@ -1,7 +1,7 @@
-
+
-
+
-
-
-
-
-
- {{ node.label }}
-
-
-
+
-
+
+
+
+
+
+
+
+
+
-
+
@@ -467,4 +565,9 @@ export default {
color: #dddddd;
cursor: not-allowed;
}
+.treeBox {
+ height: 80vh;
+ overflow: hidden;
+ overflow-y: scroll;
+}
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index b38818f..d8ab335 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -83,9 +83,13 @@
>
- {{
- $t("share.import")
- }}
+ {{ $t("share.import") }}
{{ $t("equipment.uploadPictures") }}
@@ -681,10 +685,76 @@
确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipment/equipment_type.vue b/src/views/equipment/equipment_type.vue
index fa57084..9d0ac7e 100644
--- a/src/views/equipment/equipment_type.vue
+++ b/src/views/equipment/equipment_type.vue
@@ -59,6 +59,7 @@
"
>
+
- 全选
+
+
+
+ 全选
-
+
是否开启 *
@@ -429,20 +252,18 @@ import {
equipmentree,
equSelect,
addPatrol,
- changeStatus,
} from "@/api/basedata/area/area";
import TreeSelect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import linq from "linq";
import { listPatroltype } from "@/api/basedata/patrolpointmnt/patroltype";
-import { getWeekdaysInRange, getDaysInRange } from "@/utils/index.js";
export default {
name: "new_task",
- components: { TreeSelect },
- data() {
+ data () {
return {
checkAll: false,
checkPointAll: false,
+ priority: "1",
listPatroltype: [],
intervalStartTime: "",
intervalEndTime: "",
@@ -453,7 +274,7 @@ export default {
shortcuts: [
{
text: "最近一周",
- onClick(picker) {
+ onClick (picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -462,7 +283,7 @@ export default {
},
{
text: "最近一个月",
- onClick(picker) {
+ onClick (picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -471,7 +292,7 @@ export default {
},
{
text: "最近三个月",
- onClick(picker) {
+ onClick (picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -481,39 +302,15 @@ export default {
],
},
pickerOptions0: {
- disabledDate(time) {
+ disabledDate (time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
pickerOptions1: {
- disabledDate(time) {
+ disabledDate (time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
- dateShow: true,
- beginradio: "0",
- input3: "",
- active: 1,
- radio: "1",
- checked: true,
- zhixing: "选择",
- weekendList: [],
- zhixing2: "选择",
- dayList: [],
- value: "第一间隔单元",
- value1: "",
- value2: "",
- value11: "",
- options1: [
- {
- value: "week",
- label: "按周选择",
- },
- {
- value: "month",
- label: "按月选择",
- },
- ],
typeOptions: [
{
value: "1",
@@ -540,11 +337,189 @@ export default {
label: "静默类型",
},
],
+ dateShow: true,
+ beginradio: "0",
+ input3: "",
+ active: 1,
+ radio: "1",
+ checked: true,
+ zhixing: "选择",
+ options3: [
+ {
+ value: "星期一",
+ label: "周一",
+ },
+ {
+ value: "星期二",
+ label: "周二",
+ },
+ {
+ value: "星期三",
+ label: "周三",
+ },
+ {
+ value: "星期四",
+ label: "周四",
+ },
+ {
+ value: "星期五",
+ label: "周五",
+ },
+ {
+ value: "星期六",
+ label: "周六",
+ },
+ {
+ value: "星期日",
+ label: "周日",
+ },
+ ],
+ zhixing2: "选择",
+ options4: [
+ {
+ value: "1号",
+ label: "1号",
+ },
+ {
+ value: "2号",
+ label: "2号",
+ },
+ {
+ value: "3号",
+ label: "3号",
+ },
+ {
+ value: "4号",
+ label: "4号",
+ },
+ {
+ value: "5号",
+ label: "5号",
+ },
+ {
+ value: "6号",
+ label: "6号",
+ },
+ {
+ value: "7号",
+ label: "7号",
+ },
+ {
+ value: "8号",
+ label: "8号",
+ },
+ {
+ value: "9号",
+ label: "9号",
+ },
+ {
+ value: "10号",
+ label: "10号",
+ },
+ {
+ value: "11号",
+ label: "11号",
+ },
+ {
+ value: "12号",
+ label: "12号",
+ },
+ {
+ value: "13号",
+ label: "13号",
+ },
+ {
+ value: "14号",
+ label: "14号",
+ },
+ {
+ value: "15号",
+ label: "15号",
+ },
+ {
+ value: "16号",
+ label: "16号",
+ },
+ {
+ value: "17号",
+ label: "17号",
+ },
+ {
+ value: "18号",
+ label: "18号",
+ },
+ {
+ value: "19号",
+ label: "19号",
+ },
+ {
+ value: "20号",
+ label: "20号",
+ },
+ {
+ value: "21号",
+ label: "21号",
+ },
+ {
+ value: "22号",
+ label: "22号",
+ },
+ {
+ value: "23号",
+ label: "23号",
+ },
+ {
+ value: "24号",
+ label: "24号",
+ },
+ {
+ value: "25号",
+ label: "25号",
+ },
+ {
+ value: "26号",
+ label: "26号",
+ },
+ {
+ value: "27号",
+ label: "27号",
+ },
+ {
+ value: "28号",
+ label: "28号",
+ },
+ {
+ value: "29号",
+ label: "29号",
+ },
+ {
+ value: "30号",
+ label: "30号",
+ },
+ {
+ value: "31号",
+ label: "31号",
+ },
+ ],
+ value: "第一间隔单元",
+ value1: "",
+ value2: "",
+ value11: "",
+ options1: [
+ {
+ value: "week",
+ label: "按周选择",
+ },
+ {
+ value: "month",
+ label: "按月选择",
+ },
+ ],
weekormonth: "week",
time: "",
week1: "",
value5: [],
- renderFunc(h, option) {
+ renderFunc (h, option) {
return (
{option.key} - {option.label}
@@ -574,7 +549,6 @@ export default {
},
// 设置计划对象选择Id数组
selectAreaIdList: [],
-
// 选择巡检对象选择Id数组
selectObjectAreaIdList: [],
checkedId: "",
@@ -587,11 +561,7 @@ export default {
addList: [],
cycleWeek: "",
cycleMonth: "",
- deviceList: "",
- devNo: "",
- setCheck: [],
type: null,
- priority: "1",
filterText: "",
filterText2: "",
transferFilterMethod: (query, item) => {
@@ -604,7 +574,6 @@ export default {
return false;
}
}
-
if (query) {
return (
item.deviceName.toLowerCase().indexOf(query.toLowerCase()) > -1
@@ -615,14 +584,15 @@ export default {
};
},
watch: {
- filterText(val) {
+ filterText (val) {
this.$refs.treeForm.filter(val);
},
- filterText2(val) {
+ filterText2 (val) {
this.$refs.tree.filter(val);
},
},
- created() {
+ components: { TreeSelect },
+ created () {
listPatroltype().then((res) => {
const list = [];
let childs = [];
@@ -659,7 +629,6 @@ export default {
this.type = this.listPatroltype[0].id;
});
this.getList();
- // this.getInfo();
if (this.weekormonth == "week") {
this.taskCycle = 1;
} else if (this.weekormonth == "month") {
@@ -667,7 +636,7 @@ export default {
}
},
computed: {
- maxintervalNumber() {
+ maxintervalNumber () {
try {
var date = 24 - new Date(this.intervalExecuteTime).getHours();
return date;
@@ -677,203 +646,115 @@ export default {
},
},
methods: {
- onChangeWeekOrMonth() {
- this.changeDateList();
- },
- changeDateList() {
- if (!this.value1 || !this.value2) {
- return;
- }
- if (this.weekormonth == "month") {
- this.dayList = getDaysInRange(this.value1, this.value2);
- } else if (this.weekormonth == "week") {
- this.weekendList = getWeekdaysInRange(this.value1, this.value2);
- }
- },
- handleChangeTaskRunTimeWithMonth(t, item) {
- const sameArray = linq
- .from(this.timelist1)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
+ handleChangeTaskRunTime (t, item) {
+ const sameArray = linq.from(this.timelist2).where((x) => {
+ return x != item && x.zhixing == item.zhixing && new Date("2020-01-01 " + x.time).valueOf() == new Date("2020-01-01 " + item.time).valueOf();
+ }).toArray();
if (sameArray.length > 0) {
this.$message({
type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
- });
- item.time = null;
- }
- },
- handleChangeTaskRunDayWithMonth(item) {
- const sameArray = linq
- .from(this.timelist1)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
- if (sameArray.length > 0) {
- this.$message({
- type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
- });
- item.zhixing = "";
- }
- },
- handleChangeTaskRunTime(t, item) {
- const sameArray = linq
- .from(this.timelist2)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
- if (sameArray.length > 0) {
- this.$message({
- type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+ message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`
});
item.time = null;
}
},
- handleChangeTaskRunDay(item) {
- const sameArray = linq
- .from(this.timelist2)
- .where((x) => {
- return (
- x != item &&
- x.zhixing == item.zhixing &&
- new Date("2020-01-01 " + x.time).valueOf() ==
- new Date("2020-01-01 " + item.time).valueOf()
- );
- })
- .toArray();
+ handleChangeTaskRunDay (item) {
+ const sameArray = linq.from(this.timelist2).where((x) => {
+ return x != item && x.zhixing == item.zhixing && new Date("2020-01-01 " + x.time).valueOf() == new Date("2020-01-01 " + item.time).valueOf();
+ }).toArray();
if (sameArray.length > 0) {
this.$message({
type: "warning",
- message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+ message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`
});
item.zhixing = "";
}
},
-
- handleChangeIntervalStartTime(t) {
- if (t == null || t == "") {
+ handleChangeIntervalStartTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.intervalEndTime != "" && this.intervalEndTime != null) {
+ if (this.intervalEndTime != '' && this.intervalEndTime != null) {
if (new Date(t).valueOf() >= new Date(this.intervalEndTime).valueOf()) {
this.$nextTick(() => {
- this.intervalStartTime = "";
+ this.intervalStartTime = '';
this.$message({
type: "warning",
- message: "起始时间要小于截止时间",
+ message: "起始时间要小于截止时间"
});
- });
+ })
}
}
},
- handleChangeIntervalEndTime(t) {
- if (t == null || t == "") {
+ handleChangeIntervalEndTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.intervalStartTime != "" && this.intervalStartTime != null) {
- if (
- new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()
- ) {
+ if (this.intervalStartTime != '' && this.intervalStartTime != null) {
+ if (new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()) {
this.$nextTick(() => {
- this.intervalEndTime = "";
+ this.intervalEndTime = '';
this.$message({
type: "warning",
- message: "截止时间要大于起始时间",
+ message: "截止时间要大于起始时间"
});
- });
+ })
}
}
},
- handleChangeStartTime(t) {
- if (t == null || t == "") {
+ handleChangeStartTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.value2 != "" && this.value2 != null) {
+ if (this.value2 != '' && this.value2 != null) {
if (new Date(t).valueOf() >= new Date(this.value2).valueOf()) {
this.$nextTick(() => {
- this.value1 = "";
+ this.value1 = '';
this.$message({
type: "warning",
- message: "起始时间要小于截止时间",
+ message: "起始时间要小于截止时间"
});
- });
+ })
}
}
-
- this.changeDateList();
- // 日期改变，需要重新选择
- if (this.weekormonth == "month") {
- this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
- } else if (this.weekormonth == "week") {
- this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
- }
},
- handleChangeEndTime(t) {
- if (t == null || t == "") {
+ handleChangeEndTime (t) {
+ if (t == null || t == '') {
return;
}
- if (this.value1 != "" && this.value1 != null) {
+ if (this.value1 != '' && this.value1 != null) {
if (new Date(t).valueOf() <= new Date(this.value1).valueOf()) {
this.$nextTick(() => {
- this.value2 = "";
+ this.value2 = '';
this.$message({
type: "warning",
- message: "截止时间要大于起始时间",
+ message: "截止时间要大于起始时间"
});
- });
+ })
}
}
-
- this.changeDateList();
- // 日期改变，需要重新选择
- if (this.weekormonth == "month") {
- this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
- } else if (this.weekormonth == "week") {
- this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
- }
},
-
- handleCheckAllChange(val) {
+ handleCheckAllChange (val) {
if (this.checkAll) {
this.$refs.treeForm.setCheckedNodes(this.areaList);
} else {
- this.$refs.treeForm.setCheckedNodes([]);
+ this.$refs.treeForm.setCheckedKeys([]);
}
},
- handleCheckPointAllChange(val) {
+ handleCheckPointAllChange (val) {
+ console.log(this.setList, this.checkPointAll);
if (this.checkPointAll) {
this.$refs.tree.setCheckedNodes(this.setList);
} else {
this.$refs.tree.setCheckedNodes([]);
}
},
- filterNode(value, data) {
+ filterNode (value, data) {
if (!value) return true;
return data.areaName.indexOf(value) !== -1;
},
- filterNode2(value, data, node) {
+ filterNode2 (value, data, node) {
if (!value) return true;
let one = data.label.indexOf(value) !== -1;
let two =
@@ -910,14 +791,20 @@ export default {
}
return result_one || result_two || result_three || result_four;
},
- typeClick() {
+ // filterNode2(value, data) {
+ // console.log(data);
+ // if (!value) return true;
+ // return data.label.indexOf(value) !== -1;
+ // },
+ typeClick () {
console.log(322, this.type);
},
linkUrl: function () {
this.$emit("hideDialog");
},
- treeClick() {
- let res = this.$refs.tree.getCheckedNodes();
+ treeClick () {
+ let res = this.$refs.tree.getCheckedNodes(true);
+ console.log(res);
let arr = [];
res.forEach((item) => {
if (item.eqpbookId != null) {
@@ -926,20 +813,13 @@ export default {
}
}
});
-
- // res.forEach((item) => {
- // if (item.children) {
- // item.children.forEach((items) => {
- // arr.push(items);
- // });
- // }
- // });
this.addList = arr;
},
saveClick: function () {
let data = {};
let res = this.$refs.tree.getCheckedNodes(true);
this.addList = res;
+
if (this.addList.length == 0) {
this.$modal.msgError("请选择巡视设备");
} else {
@@ -989,13 +869,12 @@ export default {
intervalType: this.intervalType,
intervalNumber: this.intervalNumber,
};
-
addPatrol(data)
.then((res) => {
this.$modal.msgSuccess("添加成功");
this.$emit("addSuccess");
})
- .catch((res) => {});
+ .catch((res) => { });
}
},
getList: function () {
@@ -1004,10 +883,6 @@ export default {
});
},
getList1: function () {
- // listArea(this.queryParams).then((response) => {
- // this.areaList1 = this.handleTree(response.data, "areaId");
- // });
-
const areaIdS = this.selectAreaIdList.join(",");
listArea({ areaIdS }).then((response) => {
this.areaList1 = this.handleTree(response.data, "areaId");
@@ -1018,7 +893,7 @@ export default {
}
});
},
- tree(areaId = "") {
+ tree (areaId = "") {
let areaIdS = areaId;
if (!areaIdS) {
areaIdS = this.selectAreaIdList.join(",");
@@ -1029,16 +904,14 @@ export default {
},
searchClick: function () {
// this.queryParams.areaName = this.searchName;
- const areaIdS = this.selectAreaIdList.join(",");
- var obj = { ...this.queryParams, areaIdS };
+ var obj = { ...this.queryParams };
obj.areaName = this.searchName;
this.selectObjectAreaIdList = [];
listArea(obj).then((response) => {
this.areaList1 = this.handleTree(response.data, "areaId");
});
},
-
- handleObjectTreeChecked(data, checked, node) {
+ handleObjectTreeChecked (data, checked, node) {
// this.queryParams.areaId = data.areaId;
// this.queryParams.areaName = data.areaName;
// this.tree();
@@ -1050,29 +923,27 @@ export default {
this.selectObjectAreaIdList.push(data.areaId);
}
},
- next1() {
- let arr = [];
- let timeArr = [];
- let arr1 = [];
-
+ next1 () {
if (this.weekormonth == "week") {
this.taskCycle = 1;
- this.timelist2.forEach((item) => {
- if (item.zhixing) {
- arr.push(item.zhixing);
- timeArr.push(item.time);
- }
- });
} else if (this.weekormonth == "month") {
this.taskCycle = 0;
- this.timelist1.forEach((item) => {
- if (item.zhixing) {
- arr1.push(item.zhixing);
- timeArr.push(item.time);
- }
- });
}
-
+ let arr = [];
+ let timeArr = [];
+ this.timelist2.forEach((item) => {
+ if (item.zhixing) {
+ arr.push(item.zhixing);
+ timeArr.push(item.time);
+ }
+ });
+ let arr1 = [];
+ this.timelist1.forEach((item) => {
+ if (item.zhixing) {
+ arr1.push(item.zhixing);
+ timeArr.push(item.time);
+ }
+ });
this.cycleMonth = arr1.toString();
this.cycleWeek = arr.toString();
this.time3 = timeArr.join(",");
@@ -1088,10 +959,12 @@ export default {
this.$modal.msgError("请选择任务执行方式");
return false;
}
+
this.selectAreaIdList = [
...this.$refs.treeForm.getCheckedKeys(),
// ...this.$refs.treeForm.getHalfCheckedKeys(),
];
+ console.log("this.selectAreaIdList", this.selectAreaIdList);
if (this.selectAreaIdList.length <= 0) {
this.$modal.msgError("请选择巡检区域");
return false;
@@ -1107,19 +980,18 @@ export default {
this.$modal.msgError("请选择计划有效期");
return false;
}
- if (new Date(this.value1) >= new Date(this.value2)) {
- this.$modal.msgError("计划有效期开始时间不能大于等于结束时间");
+ if (new Date(this.value1) > new Date(this.value2)) {
+ this.$modal.msgError("计划有效期开始时间不能大于结束时间");
return false;
}
-
if (this.weekormonth == "week") {
for (let index = 0; index < this.timelist2.length; index++) {
const element = this.timelist2[index];
- if (!element.zhixing) {
+ if (element.zhixing == "") {
this.$modal.msgError("请选择日期");
return;
}
- if (!element.time) {
+ if (element.time == "") {
this.$modal.msgError("请选择时间");
return;
}
@@ -1128,11 +1000,11 @@ export default {
if (this.weekormonth == "month") {
for (let index = 0; index < this.timelist1.length; index++) {
const element = this.timelist1[index];
- if (!element.zhixing) {
+ if (element.zhixing == "") {
this.$modal.msgError("请选择日期");
return;
}
- if (!element.time) {
+ if (element.time == "") {
this.$modal.msgError("请选择时间");
return;
}
@@ -1154,9 +1026,7 @@ export default {
// this.$modal.msgError("计划有效期开始时间不能大于结束时间");
// return false;
// }
- if (
- new Date(this.intervalStartTime) >= new Date(this.intervalEndTime)
- ) {
+ if (new Date(this.intervalStartTime) > new Date(this.intervalEndTime)) {
this.$modal.msgError("间隔开始时间不能大于结束时间");
return false;
}
@@ -1171,18 +1041,11 @@ export default {
// return false;
// }
- if (!this.intervalExecuteTime) {
+ if (this.intervalExecuteTime == "") {
this.$modal.msgError("请选择执行时间");
return false;
}
- // 提取时间
- const startTime = this.intervalStartTime.split(" ")[1];
- if (startTime > this.intervalExecuteTime) {
- this.$modal.msgError("执行时间需大于间隔开始时间");
- return false;
- }
-
if (
24 - new Date(this.intervalExecuteTime).getHours() <
this.intervalNumber
@@ -1191,10 +1054,12 @@ export default {
return false;
}
}
+
if (this.active++ > 2) this.active = 0;
+ this.value5 = [];
this.getList1();
},
- next() {
+ next () {
if (this.value5.length == 0) {
this.$modal.msgError("请选择巡检对象");
return;
@@ -1205,41 +1070,37 @@ export default {
return false;
}
}
+
if (this.active++ > 2) this.active = 0;
if (this.active == 3) {
- equSelect({
- deviceIdAll: this.value5.join(","),
- eqbookCode: this.devNo,
- }).then((response) => {
+ equSelect(this.queryParams).then((response) => {
this.setList = response.data;
this.checkPointAll = false;
});
}
},
- prev() {
+ prev () {
this.active--;
},
- handleChange(value, direction, movedKeys) {
+ handleChange (value, direction, movedKeys) {
let rightArr = [];
for (let i = 0; i < this.value5.length; i++) {
rightArr.push(this.value5[i]);
}
- rightArr.splice(0, 1);
this.queryParams.deviceIdAll = rightArr.toString();
},
- add1() {
+ add1 () {
if (this.weekormonth == "month") {
- // if (this.timelist1.length < 31) {
+ if (this.timelist1.length < 31) {
this.timelist1.push({ zhixing: "", time: "" });
- // }
- }
- // else if (this.weekormonth == "week") {
- // if (this.timelist2.length < 7) {
+ }
+ } else if (this.weekormonth == "week") {
+ if (this.timelist2.length < 7) {
this.timelist2.push({ zhixing: "", time: "" });
- // }
- // }
+ }
+ }
},
- delete1(idx) {
+ delete1 (idx) {
if (this.weekormonth == "month") {
if (this.timelist1.length > 1) {
this.timelist1.splice(idx, 1);
@@ -1250,7 +1111,7 @@ export default {
}
}
},
- handleCheckChange(data, checked, node) {
+ handleCheckChange (data, checked, node) {
// console.log('handleCheckChange', data);
// const idx = this.selectAreaIdList.indexOf(data.areaId)
// if (idx >= 0) {
@@ -1265,15 +1126,6 @@ export default {
-
-
diff --git a/src/views/area/area.vue b/src/views/area/area.vue
index 06ea2b6..82b0bb3 100644
--- a/src/views/area/area.vue
+++ b/src/views/area/area.vue
@@ -351,6 +351,7 @@ export default {
});
},
handleAdd(areaId) {
+ this.type = 0;
this.dialogForm = {};
this.dialogForm.parentId = areaId;
let data = {
@@ -364,8 +365,6 @@ export default {
this.dialogForm.parentId = val;
},
submitForm() {
- console.log(this.dialogForm, 111111111);
- // return
if (!this.dialogForm.parentId)
return this.$message.error("请选择上级区域");
if (this.type == 0) {
diff --git a/src/views/basedata/alg/index.vue b/src/views/basedata/alg/index.vue
index 3adc388..7f8b574 100644
--- a/src/views/basedata/alg/index.vue
+++ b/src/views/basedata/alg/index.vue
@@ -31,11 +31,6 @@
>{{ $t("share.new") }}
-
+
+
+
+
+
+
+ {{ node.label }}
+
+
+
+
将文件拖到此处，或点击上传
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+ {{ $t("site_management.PTZ") }}
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+ 
+
+
+
+ 确定
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("site_management.PTZ") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一步,配置测温位置
+ 确定
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.algSubtypeName ? scope.row.algSubtypeName : "设置"
+ }}
+
+
+
+
+
+ {{ $t("share.copy") }}
+
+ {{ $t("share.delete") }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.algSubtypeName
+ ? scope.row.algSubtypeName
+ : scope.row.algName
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point copy/site_management.vue b/src/views/point copy/site_management.vue
new file mode 100644
index 0000000..c341557
--- /dev/null
+++ b/src/views/point copy/site_management.vue
@@ -0,0 +1,1374 @@
+
+
+
+
+
+
+ {{
+ $t("share.addTo")
+ }}
+ （0/200）{{ $t("point_mang.tableHeadMsg") }}
+
+
+ {{
+ $t("share.save")
+ }}
+
+ 请先选择左侧点位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ patrolTypeNameFn(scope.row.patrolTypeIds) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设置
+ {{
+ scope.row.algSubtypeName
+ }}
+
+
+
+
+
+
+ 修改
+ {{ $t("share.delete") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 解绑
+
+ 查看快照
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t("share.search")
+ }}
+ {{
+ $t("share.reset")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
diff --git a/src/views/point/algorithm.vue b/src/views/point/algorithm.vue
new file mode 100644
index 0000000..21caf1a
--- /dev/null
+++ b/src/views/point/algorithm.vue
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+
+
+ {{
+ $t("share.addTo")
+ }}
+ {{ $t("share.delete") }}
+ {{
+ $t("site_management.RobotPointUpload")
+ }}
+
+
+
+
+
+
+
+
+
+ 
+
+
+ {{ $t("site_management.ClickOnTheLeftSide") }}
+
+ {{
+ $t("site_management.BindVisibleLightMonitoringPoints")
+ }}
+ {{
+ $t("site_management.BindThermalImagingMonitoringPoints")
+ }}
+
+
+ {{
+ $t("site_management.BindMonitoringDevices")
+ }}
+
+
+
+
+
+
+
+
+ {{
+ $t("site_management.Unbind")
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t("site_management.uploadMsg") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point/components/ImageAnnotation.vue b/src/views/point/components/ImageAnnotation.vue
new file mode 100644
index 0000000..0435664
--- /dev/null
+++ b/src/views/point/components/ImageAnnotation.vue
@@ -0,0 +1,534 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ 启用
+
+ 停用
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point/components/chooseAlg.vue b/src/views/point/components/chooseAlg.vue
new file mode 100644
index 0000000..28cbc09
--- /dev/null
+++ b/src/views/point/components/chooseAlg.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+
+
+
+
+ ![标注图片]()
+
+
+
+
+ 阈值上限 *
+
+
+ 阈值下限 *
+
+
+
+
+
+
+
+ {{ $t("site_management.PTZ") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+ 取消
+
+
+
-
+
+
- 确定
+ 下一步,配置测温位置
+ 确定
取消
@@ -191,8 +210,10 @@
diff --git a/src/views/point/components/uploadDialog.vue b/src/views/point/components/uploadDialog.vue
new file mode 100644
index 0000000..d5c309f
--- /dev/null
+++ b/src/views/point/components/uploadDialog.vue
@@ -0,0 +1,171 @@
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.algSubtypeName ? scope.row.algSubtypeName : "设置"
+ }}
+
+
+
+
+
+ {{ $t("share.copy") }}
+
+ {{ $t("share.delete") }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.algSubtypeName
+ ? scope.row.algSubtypeName
+ : scope.row.algName
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/point/point_mang.vue b/src/views/point/point_mang.vue
index 3da0aaa..ea5b2fc 100644
--- a/src/views/point/point_mang.vue
+++ b/src/views/point/point_mang.vue
@@ -1,4 +1,4 @@
-
+el-button
+
+
+
+
+ {{
+ $t("share.addTo")
+ }}
+ （0/200）{{ $t("point_mang.tableHeadMsg") }}
+
+
+ {{
+ $t("share.save")
+ }}
+
+ 请先选择左侧点位
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+ m
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ testobj.isEnable == "1" ? "已启用" : "已停用" }}
+
+
+
+
+
+ 预警配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 告警配置
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- ![]()
+
-
+
diff --git a/vue.config.js b/vue.config.js
index f8d81ed..53cd73a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,6 +10,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const CopyWebpackPlugin = require("copy-webpack-plugin");
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -37,7 +38,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080`,
- target:'http://192.168.1.116:18888',
+ target: 'http://192.168.1.116:18888',
// target:'http://192.168.1.116:18890',
changeOrigin: true,
pathRewrite: {
@@ -62,6 +63,18 @@ module.exports = {
}
},
plugins: [
+ new CopyWebpackPlugin([
+ {
+ from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml'
+ },
+ {
+ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf'
+ },
+ {
+ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js',
+ to: 'js/'
+ }
+ ]),
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({
cache: false, // 不启用文件缓存
@@ -95,39 +108,39 @@ module.exports = {
.end()
config.when(process.env.NODE_ENV !== 'development', config => {
- config
- .plugin('ScriptExtHtmlWebpackPlugin')
- .after('html')
- .use('script-ext-html-webpack-plugin', [{
- // `runtime` must same as runtimeChunk name. default is `runtime`
- inline: /runtime\..*\.js$/
- }])
- .end()
+ config
+ .plugin('ScriptExtHtmlWebpackPlugin')
+ .after('html')
+ .use('script-ext-html-webpack-plugin', [{
+ // `runtime` must same as runtimeChunk name. default is `runtime`
+ inline: /runtime\..*\.js$/
+ }])
+ .end()
- config.optimization.splitChunks({
- chunks: 'all',
- cacheGroups: {
- libs: {
- name: 'chunk-libs',
- test: /[\\/]node_modules[\\/]/,
- priority: 10,
- chunks: 'initial' // only package third parties that are initially dependent
- },
- elementUI: {
- name: 'chunk-elementUI', // split elementUI into a single package
- test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
- priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
- },
- commons: {
- name: 'chunk-commons',
- test: resolve('src/components'), // can customize your rules
- minChunks: 3, // minimum common number
- priority: 5,
- reuseExistingChunk: true
- }
- }
- })
- config.optimization.runtimeChunk('single')
+ config.optimization.splitChunks({
+ chunks: 'all',
+ cacheGroups: {
+ libs: {
+ name: 'chunk-libs',
+ test: /[\\/]node_modules[\\/]/,
+ priority: 10,
+ chunks: 'initial' // only package third parties that are initially dependent
+ },
+ elementUI: {
+ name: 'chunk-elementUI', // split elementUI into a single package
+ test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+ priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
+ },
+ commons: {
+ name: 'chunk-commons',
+ test: resolve('src/components'), // can customize your rules
+ minChunks: 3, // minimum common number
+ priority: 5,
+ reuseExistingChunk: true
+ }
+ }
+ })
+ config.optimization.runtimeChunk('single')
})
}
}
-
-
+
+
+ 点位名称 *
+
-
+
-
+
+
+
+ {{
+ scope.row.algSubtypeName ? scope.row.algSubtypeName : "设置"
+ }}
+
+
+
+
+
+ 选择
+
+ >
+
+
+ 监控预置位编号 *
+
-
+
+ 巡检类型 *
+
- {{ patrolTypeNameFn(scope.row.patrolTypeIds) }}
-
-
-
-
+ @deselect="
+ (node) => {
+ handleDeSelectPointCode(node, scope.row);
+ }
+ "
+ :defaultExpandLevel="2"
+ :limit="1"
+ :disable-branch-nodes="true"
+ :limitText="(count) => `+${count}`"
+ multiple
+ flat
+ v-model="scope.row.patrolTypeId"
+ :options="listPatroltype"
+ :show-count="true"
+ placeholder="请选择巡检类型"
+ />
-
+
+
+ 重要等级 *
+
-
+ v-for="dict in dict.type.point_impt_level"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
-
+
+
+
-
-
-
-
+
- 设置
- {{
- scope.row.algSubtypeName
- }}
+
+
-
-
修改
{{ $t("share.delete") }} 移除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- {{
- $t("share.addTo")
- }}
- {{ $t("share.delete") }}
- {{
- $t("site_management.RobotPointUpload")
- }}
-
-
-
+ 点位配置
+
+ 添加
- 删除
+ 机器人预置位上传
+
+
+
+
-
+
-
-
-
- {{ $t("site_management.ClickOnTheLeftSide") }}
-
- {{
- $t("site_management.BindVisibleLightMonitoringPoints")
- }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{
- $t("site_management.BindThermalImagingMonitoringPoints")
- }} 确定
+ 取消
-
-
-
-
-
-
- 解绑
-
- 查看快照
-
-
-
-
-
-
-
+
- {{
- $t("site_management.BindMonitoringDevices")
- }}
-
-
-
-
-
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 云台
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ 
+
+
+
+
+ 取消
+ 确定
+
+
+
+ 
+
+
+
+
+ 动作列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 确定
-
-
-
-
- 下一步，配置测温位
+ 取消
+
+
- 完成
+ 取消
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 
+
+
+
+ 
+
+
+
+ 
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ patroldeviceName }}
+ 可见光
+ 热成像
+ /{{ presetName }}
+ 位置
+ 测温位
+ 配置
+
+
+ 点击画面右上方按钮配置测温位，最多配置10个测温点、1条测温线、10个测温框写
+
+
+
+ 确定
+ 取消
+
+
+
-
-
-
-
+
- {{ $t("site_management.uploadMsg") }}
-
-
-
-
-
-
-
-