{{ $t("message.laborMange.essential") }}
@@ -4527,9 +4527,22 @@ export default {
height: calc(100% - 55px);
box-sizing: border-box;
padding: 15px 0 0;
- .__vuescroll {
- width: 80% !important;
- flex: 1;
+ .data_wrap_scroll {
+ width: calc(100% - 12%) !important;
+ // overflow-x: hidden;
+ /deep/ .__panel {
+ width: 100% !important;
+ .__view {
+ width: 100% !important;
+ }
+ }
+ }
+ // .__vuescroll {
+ // width: 80% !important;
+ // flex: 1;
+ // }
+ .tables {
+ width: 100%;
}
}
diff --git a/src/views/projectFront/laborManage/personModule/courseWriter.vue b/src/views/projectFront/laborManage/personModule/courseWriter.vue
index e75de262..e357c519 100644
--- a/src/views/projectFront/laborManage/personModule/courseWriter.vue
+++ b/src/views/projectFront/laborManage/personModule/courseWriter.vue
@@ -338,19 +338,23 @@ export default {
}
.tables {
min-height: initial;
+ width: 100%;
+}
+/deep/ .el-table__body {
+ width: 100% !important;
}
.bigScreen-wrap {
width: calc(100% - 32px);
height: 610px;
position: relative;
- overflow: hidden;
+ // overflow: hidden;
display: flex;
#map {
- width: 814px;
+ width: 714px;
height: 100%;
}
.map-box {
- width: 814px;
+ width: 714px;
height: 100%;
background-color: #eff3f7 !important;
position: relative;
@@ -367,7 +371,7 @@ export default {
}
}
.content-right {
- flex: 1;
+ width: calc(100% - 714px);
.content-right_main {
padding: 0 20px;
.content-right_time {
diff --git a/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue b/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
index dc9271b1..cf908881 100644
--- a/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
+++ b/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
@@ -2121,7 +2121,7 @@ export default {
};
if (this.dangerReviewInfo.enableVerify == 1) {
data.roleName = this.dangerReviewInfo.verifyRoleName;
- data.enterpriseId = this.unitEnterpriseId.join(",");
+ // data.enterpriseId = this.unitEnterpriseId.join(",");
}
getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) {
diff --git a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
index 407867d8..5832cb94 100644
--- a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
+++ b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
@@ -2121,7 +2121,7 @@ export default {
};
if (this.dangerReviewInfo.enableVerify == 1) {
data.roleName = this.dangerReviewInfo.verifyRoleName;
- data.enterpriseId = this.unitEnterpriseId.join(",");
+ // data.enterpriseId = this.unitEnterpriseId.join(",");
}
getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) {
diff --git a/src/views/projectFront/weldingManage/equipmentMonitor.vue b/src/views/projectFront/weldingManage/equipmentMonitor.vue
index 0c775bcf..da9db1c6 100644
--- a/src/views/projectFront/weldingManage/equipmentMonitor.vue
+++ b/src/views/projectFront/weldingManage/equipmentMonitor.vue
@@ -265,7 +265,7 @@ export default {
devSn: row.devSn,
}).then((res) => {
if (res.code == 200) {
- const resultList = res.result instanceof Array ? res.result : [];
+ const resultList = res.result instanceof Array ? res.result.reverse() : [];
const result = {
series: [
{
diff --git a/src/views/projectFront/weldingManage/weldingRecord.vue b/src/views/projectFront/weldingManage/weldingRecord.vue
index 819b3d4c..aecb686f 100644
--- a/src/views/projectFront/weldingManage/weldingRecord.vue
+++ b/src/views/projectFront/weldingManage/weldingRecord.vue
@@ -6,9 +6,9 @@
@@ -198,7 +198,7 @@
@size-change="SizeChange"
@current-change="CurrentChange"
:current-page="pagInfo.pageNo"
- :page-sizes="$store.state.PAGESIZRS"
+ :page-sizes="[...$store.state.PAGESIZRS, 200, 500]"
:page-size="pagInfo.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(pagInfo.total)"
@@ -731,27 +731,28 @@ export default {
}).then((res) => {
if (res.code == 200) {
this.operatingRiskDialog = true;
+ const resultList = res.result instanceof Array ? res.result.reverse() : [];
this.$nextTick(() => {
const params = {
series: [
{
name: "焊接电流",
- data: res.result.map((item) => item.weldingCurrent),
+ data: resultList.map((item) => item.weldingCurrent),
},
{
name: "焊接电压",
- data: res.result.map((item) => item.weldingVoltage),
+ data: resultList.map((item) => item.weldingVoltage),
},
{
name: "预置电压",
- data: res.result.map((item) => item.presetVoltage),
+ data: resultList.map((item) => item.presetVoltage),
},
{
name: "预置电流",
- data: res.result.map((item) => item.presetCurrent),
+ data: resultList.map((item) => item.presetCurrent),
},
],
- x: res.result.map((item) => item.uploadTime),
+ x: resultList.map((item) => item.uploadTime),
};
this.riskTrendLineChartsFn(this.$refs.riskTrendLineCharts, params);
});
@@ -1158,11 +1159,11 @@ export default {
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
devSn: this.searchForm.devSn,
- equipmentName: this.searchForm.equipmentName,
+ eqDevSn: this.searchForm.equipmentName,
operatorName: this.searchForm.operatorName,
weldBead: this.searchForm.weldBead,
dataSource: this.searchForm.dataSource,
- duration: this.searchForm.duration ? this.searchForm.duration : "",
+ duration_begin: this.searchForm.duration ? this.searchForm.duration : "",
endWeldingTime_begin:
this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0]
? this.searchForm.dateRangeArr[0]
@@ -1222,6 +1223,7 @@ export default {
});
},
isAdd(type, obj) {
+ this.tableData = [];
if (type == 1) {
this.title = "新增";
this.close();