fix: BUG修改
This commit is contained in:
parent
e9862f5245
commit
913dc74cb6
@ -321,6 +321,7 @@
|
|||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
type="number"
|
type="number"
|
||||||
|
oninput="if(value.length>5)value=value.slice(0,5)"
|
||||||
v-model="item.temperatureThreshold"
|
v-model="item.temperatureThreshold"
|
||||||
style="width: 120px"
|
style="width: 120px"
|
||||||
:placeholder="$t('message.safeManage.placeholder')"
|
:placeholder="$t('message.safeManage.placeholder')"
|
||||||
|
|||||||
@ -211,7 +211,7 @@
|
|||||||
>
|
>
|
||||||
<div class="dialog_content">
|
<div class="dialog_content">
|
||||||
<div class="filterBox">
|
<div class="filterBox">
|
||||||
<el-select
|
<!-- <el-select
|
||||||
size="medium"
|
size="medium"
|
||||||
:placeholder="$t('message.highModulus.realData')"
|
:placeholder="$t('message.highModulus.realData')"
|
||||||
v-model="filterForm.alarmState"
|
v-model="filterForm.alarmState"
|
||||||
@ -224,7 +224,7 @@
|
|||||||
:value="index + 1"
|
:value="index + 1"
|
||||||
:label="item"
|
:label="item"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select> -->
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
size="medium"
|
size="medium"
|
||||||
v-model="daterange"
|
v-model="daterange"
|
||||||
|
|||||||
@ -830,14 +830,14 @@ export default {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.cardForm.workernum = this.cardForm.list.length;
|
this.cardForm.workernum = this.cardForm.list.length;
|
||||||
var json = this.cardForm;
|
let json = this.cardForm;
|
||||||
var arr = [];
|
let arr = [];
|
||||||
console.log(json.list);
|
console.log(json.list);
|
||||||
json.list.forEach((element) => {
|
json.list.forEach((element) => {
|
||||||
var item = {
|
let item = {
|
||||||
isQualified: element.isQualified,
|
isQualified: element.isQualified,
|
||||||
score: element.score,
|
score: element.score,
|
||||||
workerId: this.isAdd ? element.id : element.workerId,
|
workerId: element.id,
|
||||||
projectSn: this.$store.state.projectSn,
|
projectSn: this.$store.state.projectSn,
|
||||||
};
|
};
|
||||||
if (!this.isAdd) {
|
if (!this.isAdd) {
|
||||||
@ -848,7 +848,7 @@ export default {
|
|||||||
});
|
});
|
||||||
json.list = arr;
|
json.list = arr;
|
||||||
if (this.isAdd) {
|
if (this.isAdd) {
|
||||||
console.log(json);
|
console.log(json,"新增");
|
||||||
workerSafeEducationAddApi(json).then((res) => {
|
workerSafeEducationAddApi(json).then((res) => {
|
||||||
this.cardDialog = false;
|
this.cardDialog = false;
|
||||||
this.loadCardData();
|
this.loadCardData();
|
||||||
@ -858,7 +858,8 @@ export default {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// console.log(this.cardForm)
|
// console.log(this.cardForm)
|
||||||
workerSafeEducationEditApi(this.cardForm).then((res) => {
|
console.log(json,"修改")
|
||||||
|
workerSafeEducationEditApi(json).then((res) => {
|
||||||
this.cardDialog = false;
|
this.cardDialog = false;
|
||||||
this.loadCardData();
|
this.loadCardData();
|
||||||
this.$message.success(
|
this.$message.success(
|
||||||
|
|||||||
@ -346,7 +346,7 @@ export default {
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
total: 0,
|
total: 0,
|
||||||
moment: moment,
|
moment: moment,
|
||||||
valueTime: '',
|
valueTime: null,
|
||||||
selectAlarmType: '',
|
selectAlarmType: '',
|
||||||
// 1力矩,2风速,3高度上限位,4幅度内限位,5幅度外限位,6顺时针回转限位,7逆时针回转限位,8倾角,9环境防撞,10多机防撞
|
// 1力矩,2风速,3高度上限位,4幅度内限位,5幅度外限位,6顺时针回转限位,7逆时针回转限位,8倾角,9环境防撞,10多机防撞
|
||||||
alarmTypeList: [
|
alarmTypeList: [
|
||||||
@ -404,7 +404,7 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn;
|
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn;
|
||||||
this.queryDev()
|
this.queryDev()
|
||||||
this.selectNowDate()
|
// this.selectNowDate()
|
||||||
this.queryTowerAlarmList()
|
this.queryTowerAlarmList()
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
@ -425,7 +425,7 @@ export default {
|
|||||||
this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
|
this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
|
||||||
this.startTime = this.endTime = moment(new Date()).format('YYYY-MM-DD')
|
this.startTime = this.endTime = moment(new Date()).format('YYYY-MM-DD')
|
||||||
console.log(this.startTime, this.endTime)
|
console.log(this.startTime, this.endTime)
|
||||||
this.selectNowDate()
|
// this.selectNowDate()
|
||||||
this.queryDev()
|
this.queryDev()
|
||||||
this.queryTowerCurrentDataList()
|
this.queryTowerCurrentDataList()
|
||||||
},
|
},
|
||||||
|
|||||||
@ -157,7 +157,7 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
|
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
|
||||||
this.queryDev()
|
this.queryDev()
|
||||||
this.selectNowDate()
|
// this.selectNowDate()
|
||||||
this.queryTowerWorkCycle()
|
this.queryTowerWorkCycle()
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
@ -458,7 +458,7 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
|
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
|
||||||
this.queryDev()
|
this.queryDev()
|
||||||
this.selectNowDate()
|
// this.selectNowDate()
|
||||||
this.queryTowerWorkCycle()
|
this.queryTowerWorkCycle()
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user