From 555377d05dd91f257485b861237b5ae54baf0841 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 04 Feb 2024 14:51:06 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/components/device/calibration.vue | 664 +++++++++++++++++++++++++++++++------------------------
1 files changed, 374 insertions(+), 290 deletions(-)
diff --git a/src/components/device/calibration.vue b/src/components/device/calibration.vue
index ab2ddbe..48d2a3d 100644
--- a/src/components/device/calibration.vue
+++ b/src/components/device/calibration.vue
@@ -71,10 +71,14 @@
<a-form-item style="">
<a-pagination
style="margin-right: 0"
- :default-current="1"
:pageSize="size"
+ :pageSizeOptions="pageSizeOptions"
+ @showSizeChange="onShowSizeChange"
:total="total"
@change="turnPage"
+ show-quick-jumper
+ showSizeChanger
+ :show-total="(total) => `������ ${total} ���������`"
/>
</a-form-item>
</a-form>
@@ -421,509 +425,589 @@
</template>
<script lang="tsx">
-import {
- Component,
- Prop,
- Vue,
- Emit, Watch,
-} from 'vue-property-decorator';
-import moment from 'moment';
+import { Component, Prop, Vue, Emit, Watch } from "vue-property-decorator";
+import moment from "moment";
import { get, post } from "@/util/request";
@Component({})
export default class Calibration extends Vue {
- private flueOfSensor: string = ''
+ private flueOfSensor: string = "";
@Prop({
type: Boolean,
- default: false
+ default: false,
})
- private wFlag: boolean
+ private wFlag: boolean;
@Prop({
type: Object,
- default: () => {
- }
+ default: () => {},
})
- private caliRecord: any
+ private caliRecord: any;
- @Watch('wFlag', {
- deep: true
+ @Watch("wFlag", {
+ deep: true,
})
private watchFlag(newVal: boolean, oldVal: boolean) {
- this.getSensorByVersionId()
+ this.getSensorByVersionId();
}
-// ������������
+ // ������������
private pagination: any = {
total: 0,
current: 1,
pageSize: 5,
showSizeChanger: false,
- showQuickJumper: false
- }
+ showQuickJumper: false,
+ };
private handleTableChange(pagination: any, filters: any, sorter: any): void {
- this.pagination.current = pagination.current
- this.getSersorFomule()
+ this.pagination.current = pagination.current;
+ this.getSersorFomule();
}
// ������������=========================================
private gFormula() {
if (this.addFlag === false && this.editFlag === true) {
- if (this.sensorCode === 'a40001') {
- const yanqi = JSON.parse(this.caliRecord.extend)
- this.editData.cel = (this.editData.val1 !== '') ? ('(currentSpeed' + this.editData.formula1 + '' + this.editData.val1 + ')') + '*' + yanqi.area : ''
- } else if (this.sensorCode === 'a01011') {
- this.editData.cel = (this.editData.val1 !== '') ? ('cel' + this.editData.formula1 + '' + this.editData.val1 ) : this.editData.cel
- }else {
- if (this.editData.val1 === '' && this.editData.val2 !== '') {
- this.editData.cel = 'cel' + this.editData.formula2 + '' + this.editData.val2
- } else if (this.editData.val1 !== '' && this.editData.val2 !== '') {
- this.editData.cel = this.editData.type1 + '' + this.editData.formula1 + '' + this.editData.val1 + '+cel' + this.editData.formula2 + '' + this.editData.val2
- } else if (this.editData.val1 !== '' && this.editData.val2 === '') {
- this.editData.cel = this.editData.type1 + '' + this.editData.formula1 + '' + this.editData.val1
+ if (this.sensorCode === "a40001") {
+ const yanqi = JSON.parse(this.caliRecord.extend);
+ this.editData.cel =
+ this.editData.val1 !== ""
+ ? "(currentSpeed" +
+ this.editData.formula1 +
+ "" +
+ this.editData.val1 +
+ ")" +
+ "*" +
+ yanqi.area
+ : "";
+ } else if (this.sensorCode === "a01011") {
+ this.editData.cel =
+ this.editData.val1 !== ""
+ ? "cel" + this.editData.formula1 + "" + this.editData.val1
+ : this.editData.cel;
+ } else {
+ if (this.editData.val1 === "" && this.editData.val2 !== "") {
+ this.editData.cel =
+ "cel" + this.editData.formula2 + "" + this.editData.val2;
+ } else if (this.editData.val1 !== "" && this.editData.val2 !== "") {
+ this.editData.cel =
+ this.editData.type1 +
+ "" +
+ this.editData.formula1 +
+ "" +
+ this.editData.val1 +
+ "+cel" +
+ this.editData.formula2 +
+ "" +
+ this.editData.val2;
+ } else if (this.editData.val1 !== "" && this.editData.val2 === "") {
+ this.editData.cel =
+ this.editData.type1 +
+ "" +
+ this.editData.formula1 +
+ "" +
+ this.editData.val1;
} else {
- this.editData.cel = ''
+ this.editData.cel = "";
}
}
-
} else {
- if(this.sensorCode === 'a40001') {
+ if (this.sensorCode === "a40001") {
if (this.caliRecord.extend !== null) {
- const yanqi = JSON.parse(this.caliRecord.extend)
+ const yanqi = JSON.parse(this.caliRecord.extend);
if (yanqi.area) {
- this.addData.cel = (this.addData.val1 !== '') ? ('(currentSpeed' + this.addData.formula1 + '' + this.addData.val1 + ')') + '*' + yanqi.area : ''
+ this.addData.cel =
+ this.addData.val1 !== ""
+ ? "(currentSpeed" +
+ this.addData.formula1 +
+ "" +
+ this.addData.val1 +
+ ")" +
+ "*" +
+ yanqi.area
+ : "";
} else {
- this.$message.warning('������������������������������������')
+ this.$message.warning("������������������������������������");
}
} else {
- this.$message.warning('������������������������������������')
+ this.$message.warning("������������������������������������");
}
} else {
- if (this.addData.val1 === '' && this.addData.val2 !== '') {
- this.addData.cel = 'cel' + this.addData.formula2 + '' + this.addData.val2
- } else if (this.addData.val1 !== '' && this.addData.val2 !== '') {
- this.addData.cel = this.addData.type1 + '' + this.addData.formula1 + '' + this.addData.val1 + '+cel' + this.addData.formula2 + '' + this.addData.val2
- } else if (this.addData.val1 !== '' && this.addData.val2 === '') {
- this.addData.cel = this.addData.type1 + '' + this.addData.formula1 + '' + this.addData.val1
+ if (this.addData.val1 === "" && this.addData.val2 !== "") {
+ this.addData.cel =
+ "cel" + this.addData.formula2 + "" + this.addData.val2;
+ } else if (this.addData.val1 !== "" && this.addData.val2 !== "") {
+ this.addData.cel =
+ this.addData.type1 +
+ "" +
+ this.addData.formula1 +
+ "" +
+ this.addData.val1 +
+ "+cel" +
+ this.addData.formula2 +
+ "" +
+ this.addData.val2;
+ } else if (this.addData.val1 !== "" && this.addData.val2 === "") {
+ this.addData.cel =
+ this.addData.type1 +
+ "" +
+ this.addData.formula1 +
+ "" +
+ this.addData.val1;
} else {
- this.addData.cel = ''
+ this.addData.cel = "";
}
}
-
}
-
}
// selectData
private selectType: any[] = [
- {'key': 'aqi', 'value': 'AQI���'}, {'key': 'vocs', 'value': 'Vocs���'}
- ]
+ { key: "aqi", value: "AQI���" },
+ { key: "vocs", value: "Vocs���" },
+ ];
private selectSymbol: any[] = [
- {'key': '+', 'value': '���'}, {'key': '-', 'value': '���'}, {'key': '*', 'value': '���'}, {'key': '/', 'value': '���'}
- ]
+ { key: "+", value: "���" },
+ { key: "-", value: "���" },
+ { key: "*", value: "���" },
+ { key: "/", value: "���" },
+ ];
//������������
private addData: any = {
- startTime: moment('00:00:00', 'HH:mm:ss'),
- endTime: moment('23:59:59', 'HH:mm:ss'),
- type1: 'aqi',
- formula1: '+',
- formula2: '+',
- val1: '',
- val2: '',
- cel: ''
+ startTime: moment("00:00:00", "HH:mm:ss"),
+ endTime: moment("23:59:59", "HH:mm:ss"),
+ type1: "aqi",
+ formula1: "+",
+ formula2: "+",
+ val1: "",
+ val2: "",
+ cel: "",
+ };
+ private pageSizeOptions: any = ["10", "30", "60", "100"];
+
+ private onShowSizeChange(current: any, pageSize: any) {
+ this.size = pageSize;
+ this.getSensorByVersionId();
}
-
-// ������������
- private dataSource: any = null
+ // ������������
+ private dataSource: any = null;
// ������sensorCode
- private sensorCode: any = ''
+ private sensorCode: any = "";
-//������������������
+ //������������������
private turnState(event: any) {
if (event !== undefined) {
- this.sensorCode = ''
- let code = ''
+ this.sensorCode = "";
+ let code = "";
for (let i = 0; i < this.dataSensors.length; i++) {
if (this.dataSensors[i].id === Number(event)) {
- code = this.dataSensors[i].code
+ code = this.dataSensors[i].code;
}
}
- this.sensorCode = code
- this.getTimeArea()
- this.getSersorFomule()
+ this.sensorCode = code;
+ this.getTimeArea();
+ this.getSersorFomule();
}
}
//���������������������������
- private savaTimeArea: any = null
+ private savaTimeArea: any = null;
// ���������������
private getTimeArea() {
- get('deviceAdjustValue/getTimeSlot', {
- mac: this.caliRecord.mac,
- sensor_code: this.sensorCode
+ get("deviceAdjustValue/getTimeSlot", {
+ mac: this.caliRecord.mac,
+ sensor_code: this.sensorCode,
}).then((res: any) => {
- this.savaTimeArea = res.data.data.timeSlotList
- })
+ this.savaTimeArea = res.data.data.timeSlotList;
+ });
}
// ������������������������
private getSersorFomule() {
- get('deviceAdjustValue/getDeviceAdjustValueByCondition', {
- mac: this.caliRecord.mac,
- current: this.pagination.current,
- sensor_code: this.sensorCode,
- size: this.pagination.pageSize,
- orderType: 0
+ get("deviceAdjustValue/getDeviceAdjustValueByCondition", {
+ mac: this.caliRecord.mac,
+ current: this.pagination.current,
+ sensor_code: this.sensorCode,
+ size: this.pagination.pageSize,
+ orderType: 0,
}).then((res: any) => {
- this.pagination.total = res.data.data.totalNumber
- this.dataSource = res.data.data.deviceAdjustValues
+ this.pagination.total = res.data.data.totalNumber;
+ this.dataSource = res.data.data.deviceAdjustValues;
console.log(parseInt(res.data.data.deviceAdjustValues[0].value));
- })
+ });
}
//������������
private caliRules: any = {
startTime: [
- {required: true, message: '���������������������', trigger: ['change', 'blur']},
- {validator: this.vali(), trigger: ['change', 'blur']}
+ {
+ required: true,
+ message: "���������������������",
+ trigger: ["change", "blur"],
+ },
+ { validator: this.vali(), trigger: ["change", "blur"] },
],
endTime: [
- {required: true, message: '���������������������'},
- {validator: this.vali(), trigger: ['change', 'blur']}
+ { required: true, message: "���������������������" },
+ { validator: this.vali(), trigger: ["change", "blur"] },
],
cel: [
- {required: true, message: '���������������������', trigger: ['change', 'blur']},
- ]
- }
+ {
+ required: true,
+ message: "���������������������",
+ trigger: ["change", "blur"],
+ },
+ ],
+ };
private vali() {
let ru = (rule: any, value: any, callback: any) => {
if (this.addFlag === true) {
if (this.addData.endTime < this.addData.startTime) {
- callback(new Error('���������������������������������'))
+ callback(new Error("���������������������������������"));
} else {
- callback()
+ callback();
}
} else {
if (this.editData.endTime < this.editData.startTime) {
- callback(new Error('���������������������������������'))
+ callback(new Error("���������������������������������"));
} else {
- callback()
+ callback();
}
}
-
- }
- return ru
+ };
+ return ru;
}
-
-// ������������������������������������
+ // ������������������������������������
private judgeTime(startTime: any, endTime: any) {
- let arr1 = []
+ let arr1 = [];
// ������������������
- let sTime = new Date(startTime)
- let sSecondNum = ''
- let sHour = sTime.getHours().toString().length === 2 ? sTime.getHours() : '0' + sTime.getHours()
- let sMinutes = sTime.getMinutes().toString().length === 2 ? sTime.getMinutes() : '0' + sTime.getMinutes()
- sSecondNum = Number(sHour) * 60 * 60 + Number(sMinutes) * 60
+ let sTime = new Date(startTime);
+ let sSecondNum = "";
+ let sHour =
+ sTime.getHours().toString().length === 2
+ ? sTime.getHours()
+ : "0" + sTime.getHours();
+ let sMinutes =
+ sTime.getMinutes().toString().length === 2
+ ? sTime.getMinutes()
+ : "0" + sTime.getMinutes();
+ sSecondNum = Number(sHour) * 60 * 60 + Number(sMinutes) * 60;
// ������������������
- let eTime = new Date(endTime)
- let eSecondNum = ''
- let eHour = eTime.getHours().toString().length === 2 ? eTime.getHours() : '0' + eTime.getHours()
- let eMinutes = eTime.getMinutes().toString().length === 2 ? eTime.getMinutes() : '0' + eTime.getMinutes()
- eSecondNum = Number(eHour) * 60 * 60 + Number(eMinutes) * 60
- arr1.push(sSecondNum)
- arr1.push(eSecondNum)
- let arrFlag = []
+ let eTime = new Date(endTime);
+ let eSecondNum = "";
+ let eHour =
+ eTime.getHours().toString().length === 2
+ ? eTime.getHours()
+ : "0" + eTime.getHours();
+ let eMinutes =
+ eTime.getMinutes().toString().length === 2
+ ? eTime.getMinutes()
+ : "0" + eTime.getMinutes();
+ eSecondNum = Number(eHour) * 60 * 60 + Number(eMinutes) * 60;
+ arr1.push(sSecondNum);
+ arr1.push(eSecondNum);
+ let arrFlag = [];
// ������������
for (let i = 0; i < this.savaTimeArea.length; i++) {
if (this.editRecord) {
- if (this.savaTimeArea[i].id === this.editRecord.id){
+ if (this.savaTimeArea[i].id === this.editRecord.id) {
continue;
}
}
- let arr2 = []
- let perStartTime = this.savaTimeArea[i].startTime
- let startArray = perStartTime.split(':')
- let sNum = Number(startArray[0]) * 3600 + Number(startArray[1]) * 60
- arr2.push(sNum)
- let perEndTime = this.savaTimeArea[i].endTime
- let endArray = perEndTime.split(':')
- let eNum = Number(endArray[0]) * 3600 + Number(endArray[1]) * 60
- arr2.push(eNum)
- let flag = this.isIntersect(arr1, arr2)
- arrFlag.push(flag)
+ let arr2 = [];
+ let perStartTime = this.savaTimeArea[i].startTime;
+ let startArray = perStartTime.split(":");
+ let sNum = Number(startArray[0]) * 3600 + Number(startArray[1]) * 60;
+ arr2.push(sNum);
+ let perEndTime = this.savaTimeArea[i].endTime;
+ let endArray = perEndTime.split(":");
+ let eNum = Number(endArray[0]) * 3600 + Number(endArray[1]) * 60;
+ arr2.push(eNum);
+ let flag = this.isIntersect(arr1, arr2);
+ arrFlag.push(flag);
}
- return arrFlag
+ return arrFlag;
}
// ���������������������������������
private isIntersect(arr1: Array, arr2: Array) {
- let start = [Math.min(...arr1), Math.min(...arr2)];//������������������������
- let end = [Math.max(...arr1), Math.max(...arr2)];//������������������������
- return Math.max(...start) < Math.min(...end);//������������������������ ������ ������������ ���������������������
+ let start = [Math.min(...arr1), Math.min(...arr2)]; //������������������������
+ let end = [Math.max(...arr1), Math.max(...arr2)]; //������������������������
+ return Math.max(...start) < Math.min(...end); //������������������������ ������ ������������ ���������������������
}
-
// ������������
private clearCel() {
- this.addData.cel = ''
- this.editData.cel = ''
+ this.addData.cel = "";
+ this.editData.cel = "";
}
- private created() {
- }
+ private created() {}
// ���������������������������
private columns: any[] = [
{
title: "������������",
- dataIndex: "startTime"
+ dataIndex: "startTime",
},
{
title: "������������",
- dataIndex: "endTime"
+ dataIndex: "endTime",
},
{
title: "������",
- dataIndex: "value"
+ dataIndex: "value",
},
{
title: "������",
- customRender: this.opRender
- }
+ customRender: this.opRender,
+ },
];
// ���������������
- private startTimeString: any = ''
- private endTimeString: any = ''
+ private startTimeString: any = "";
+ private endTimeString: any = "";
//������������������
private turnStartTime(time: any) {
- let d = new Date(time._d)
- let hour = d.getHours().toString().length === 2 ? d.getHours() : '0' + d.getHours()
- let minutes = d.getMinutes().toString().length === 2 ? d.getMinutes() : '0' + d.getMinutes()
- this.startTimeString = hour + ':' + minutes + ':00'
-
+ let d = new Date(time._d);
+ let hour =
+ d.getHours().toString().length === 2 ? d.getHours() : "0" + d.getHours();
+ let minutes =
+ d.getMinutes().toString().length === 2
+ ? d.getMinutes()
+ : "0" + d.getMinutes();
+ this.startTimeString = hour + ":" + minutes + ":00";
}
private turnEndTime(time: any) {
- let d = new Date(time._d)
- let hour = d.getHours().toString().length === 2 ? d.getHours() : '0' + d.getHours()
- let minutes = d.getMinutes().toString().length === 2 ? d.getMinutes() : '0' + d.getMinutes()
- this.endTimeString = hour + ':' + minutes + ':00'
+ let d = new Date(time._d);
+ let hour =
+ d.getHours().toString().length === 2 ? d.getHours() : "0" + d.getHours();
+ let minutes =
+ d.getMinutes().toString().length === 2
+ ? d.getMinutes()
+ : "0" + d.getMinutes();
+ this.endTimeString = hour + ":" + minutes + ":00";
}
-// ������������������������--------------------------------------------------
- private currentPage: number = 1
- private total: number = 0
- private size: number = 0
+ // ������������������������--------------------------------------------------
+ private currentPage: number = 1;
+ private total: number = 0;
+ private size: number = 10;
private turnPage(current: any) {
- this.currentPage = current
- this.getSensorByVersionId()
+ this.currentPage = current;
+ this.getSensorByVersionId();
}
// ������������
- private dataSensors: any = null
+ private dataSensors: any = null;
// ������������id������������
private getSensorByVersionId() {
get("version/queryById", {
- id: this.caliRecord.version.id,
- page: this.currentPage,
- size: 5
- })
- .then((res: any) => {
- this.dataSensors = res.data.data.versions[0].sensors
- this.total = res.data.data.total
- this.size = res.data.data.size
- })
- .catch(err => {
- console.log(err);
- });
+ id: this.caliRecord.version.id,
+ page: this.currentPage,
+ size: this.size,
+ })
+ .then((res: any) => {
+ this.dataSensors = res.data.data.versions[0].sensors;
+ this.total = res.data.data.total;
+ })
+ .catch((err) => {
+ console.log(err);
+ });
}
-
private handleCancel() {
- this.sendFlag(false)
- this.currentPage = 1
+ this.sendFlag(false);
+ this.currentPage = 1;
}
private handleOk() {
- this.sendFlag(false)
- this.currentPage = 1
+ this.sendFlag(false);
+ this.currentPage = 1;
}
- @Emit('cFlag')
+ @Emit("cFlag")
private sendFlag(flag: boolean) {
return flag;
}
// ���������������-----------------------------------------------------------------------------
- private addFlag: boolean = false
+ private addFlag: boolean = false;
private addCalib() {
- this.addFlag = true
+ this.addFlag = true;
}
private handleAddlOk() {
this.$refs.addCaliForm.validate((valid: any) => {
if (valid) {
- let flag = this.judgeTime(this.addData.startTime, this.addData.endTime)
+ let flag = this.judgeTime(this.addData.startTime, this.addData.endTime);
if (flag.indexOf(true) !== -1) {
- this.$message.warning('���������������������������������������������������������', 2)
+ this.$message.warning("���������������������������������������������������������", 2);
} else {
- post('deviceAdjustValue/insertOneDeviceAdjustValue', {
- mac: this.caliRecord.mac,
- startTime: this.startTimeString === '' ? '00:00:00' : this.startTimeString,
- endTime: this.endTimeString === '' ? '23:59:00' : this.endTimeString,
- value: this.addData.cel,
- sensorCode: this.sensorCode
- }
- ).then((res: any) => {
+ post("deviceAdjustValue/insertOneDeviceAdjustValue", {
+ mac: this.caliRecord.mac,
+ startTime:
+ this.startTimeString === "" ? "00:00:00" : this.startTimeString,
+ endTime:
+ this.endTimeString === "" ? "23:59:00" : this.endTimeString,
+ value: this.addData.cel,
+ sensorCode: this.sensorCode,
+ }).then((res: any) => {
if (res.data.code === 0) {
- this.addData.val1 = ''
- this.addData.val2 = ''
- this.addData.formula1 = '+'
- this.addData.formula2 = '+'
- this.addData.type1 = 'aqi'
- this.getSersorFomule()
- this.$message.success(res.data.message)
- this.startTimeString = ''
- this.endTimeString = ''
- this.addData.startTime = moment('00:00:00', 'HH:mm:ss')
- this.addData.endTime = moment('23:59:59', 'HH:mm:ss')
- this.addData.cel = ''
- this.addFlag = false
- this.getTimeArea()
+ this.addData.val1 = "";
+ this.addData.val2 = "";
+ this.addData.formula1 = "+";
+ this.addData.formula2 = "+";
+ this.addData.type1 = "aqi";
+ this.getSersorFomule();
+ this.$message.success(res.data.message);
+ this.startTimeString = "";
+ this.endTimeString = "";
+ this.addData.startTime = moment("00:00:00", "HH:mm:ss");
+ this.addData.endTime = moment("23:59:59", "HH:mm:ss");
+ this.addData.cel = "";
+ this.addFlag = false;
+ this.getTimeArea();
} else {
- this.$message.warning(res.data.message)
+ this.$message.warning(res.data.message);
}
- })
+ });
}
}
- })
-
-
+ });
}
private handleAddCancel() {
- this.addData.startTime = moment('00:00:00', 'HH:mm:ss')
- this.addData.endTime = moment('23:59:59', 'HH:mm:ss')
- this.addData.val1 = ''
- this.addData.val2 = ''
- this.addData.formula1 = '+'
- this.addData.formula2 = '+'
- this.addData.type1 = 'aqi'
- this.addData.cel = ''
- this.startTimeString = ''
- this.endTimeString = ''
- this.addFlag = false
+ this.addData.startTime = moment("00:00:00", "HH:mm:ss");
+ this.addData.endTime = moment("23:59:59", "HH:mm:ss");
+ this.addData.val1 = "";
+ this.addData.val2 = "";
+ this.addData.formula1 = "+";
+ this.addData.formula2 = "+";
+ this.addData.type1 = "aqi";
+ this.addData.cel = "";
+ this.startTimeString = "";
+ this.endTimeString = "";
+ this.addFlag = false;
}
// ������------------------------------------------------------------------------------------------------
private editData: any = {
startTime: null,
endTime: null,
- type1: 'aqi',
- formula1: '+',
- formula2: '+',
- val1: '',
- val2: '',
- cel: ''
- }
- private editFlag: boolean = false
- private editRecord: any = null
+ type1: "aqi",
+ formula1: "+",
+ formula2: "+",
+ val1: "",
+ val2: "",
+ cel: "",
+ };
+ private editFlag: boolean = false;
+ private editRecord: any = null;
// ������������
private handleEditlOk() {
this.$refs.editCaliForm.validate((valid: any) => {
if (valid) {
- let flag = this.judgeTime(this.editData.startTime, this.editData.endTime)
+ let flag = this.judgeTime(
+ this.editData.startTime,
+ this.editData.endTime
+ );
if (flag.indexOf(true) !== -1) {
- this.$message.warning('���������������������������������������������������������', 2)
+ this.$message.warning("���������������������������������������������������������", 2);
} else {
- let startTime = this.startTimeString === this.editRecord.startTime ? null : this.startTimeString === '' ? null : this.startTimeString
- let endTime = this.endTimeString === this.editRecord.endTime ? null : this.endTimeString === '' ? null : this.endTimeString
- let fomule = this.editData.cel === this.editRecord.value ? null : this.editData.cel
- if ((startTime || endTime || fomule)) {
- post('deviceAdjustValue/updateOneDeviceAdjustValue', {
- id: this.editRecord.id,
- start_time: startTime,
- end_time: endTime,
- value: fomule
- }
- ).then((res: any) => {
+ let startTime =
+ this.startTimeString === this.editRecord.startTime
+ ? null
+ : this.startTimeString === ""
+ ? null
+ : this.startTimeString;
+ let endTime =
+ this.endTimeString === this.editRecord.endTime
+ ? null
+ : this.endTimeString === ""
+ ? null
+ : this.endTimeString;
+ let fomule =
+ this.editData.cel === this.editRecord.value
+ ? null
+ : this.editData.cel;
+ if (startTime || endTime || fomule) {
+ post("deviceAdjustValue/updateOneDeviceAdjustValue", {
+ id: this.editRecord.id,
+ start_time: startTime,
+ end_time: endTime,
+ value: fomule,
+ }).then((res: any) => {
if (res.data.code === 0) {
- this.getSersorFomule()
- this.$message.success(res.data.message)
- this.editFlag = false
- this.startTimeString = ''
- this.endTimeString = ''
- this.editRecord = null
- this.editData.val1 = ''
- this.editData.val2 = ''
- this.editData.formula1 = '+'
- this.editData.formula2 = '+'
- this.getTimeArea()
+ this.getSersorFomule();
+ this.$message.success(res.data.message);
+ this.editFlag = false;
+ this.startTimeString = "";
+ this.endTimeString = "";
+ this.editRecord = null;
+ this.editData.val1 = "";
+ this.editData.val2 = "";
+ this.editData.formula1 = "+";
+ this.editData.formula2 = "+";
+ this.getTimeArea();
}
- })
+ });
} else {
- this.$message.warning('���������')
+ this.$message.warning("���������");
}
-
}
}
- })
+ });
}
private handleEditCancel() {
- this.editFlag = false
+ this.editFlag = false;
}
private handleEditModalVisible(flag: boolean, record: any) {
- this.editFlag = flag
- this.editRecord = record
- this.editData.startTime = moment(record.startTime, 'HH:mm:ss')
- this.editData.endTime = moment(record.endTime, 'HH:mm:ss')
- this.editData.cel = record.value
+ this.editFlag = flag;
+ this.editRecord = record;
+ this.editData.startTime = moment(record.startTime, "HH:mm:ss");
+ this.editData.endTime = moment(record.endTime, "HH:mm:ss");
+ this.editData.cel = record.value;
}
// ������------------------------------------------------------------------------------------------------
private deleteDevice(record: any) {
- post('deviceAdjustValue/deleteOneDeviceAdjustValue', {
- id: record.id,
- }
- ).then((res: any) => {
+ post("deviceAdjustValue/deleteOneDeviceAdjustValue", {
+ id: record.id,
+ }).then((res: any) => {
if (res.data.code === 0) {
- this.getSersorFomule()
- this.getTimeArea()
- this.$message.success(res.data.message)
+ this.getSersorFomule();
+ this.getTimeArea();
+ this.$message.success(res.data.message);
}
- })
+ });
}
// ������===============================================================================================
private opRender(text: string, record: any, index: number) {
return (
- <div>
- <a onClick={() => this.handleEditModalVisible(true, record)}>
- {" "}
- ������{" "}
- </a>
- <a-divider type="vertical"/>
- <a-popconfirm
- title="������������������"
- ok-text="������"
- cancel-text="������"
- onConfirm={() => this.deleteDevice(record)}
- >
- <a href="#">������</a>
- </a-popconfirm>
- </div>
- )
- ;
+ <div>
+ <a onClick={() => this.handleEditModalVisible(true, record)}> ������ </a>
+ <a-divider type="vertical" />
+ <a-popconfirm
+ title="������������������"
+ ok-text="������"
+ cancel-text="������"
+ onConfirm={() => this.deleteDevice(record)}
+ >
+ <a href="#">������</a>
+ </a-popconfirm>
+ </div>
+ );
}
}
</script>
--
Gitblit v1.8.0