diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue
index 620dfa2..ccea72b 100644
--- a/src/views/ems/record/recordDnbInstant/index.vue
+++ b/src/views/ems/record/recordDnbInstant/index.vue
@@ -143,6 +143,7 @@
+
@@ -328,6 +329,7 @@ export default {
recordTime: null,
glys: null,
zxyg: null,
+ fxyg: null,
activePower: null,
reactivePower: null,
collectType: null
@@ -354,13 +356,14 @@ export default {
{ key: 6, label: `A项电流`, visible: true },
{ key: 7, label: `B项电流`, visible: true },
{ key: 8, label: `C项电流`, visible: true },
- { key: 9, label: `记录时间`, visible: true },
+ { key: 9, label: `记录时间`, visible: false },
{ key: 10, label: `功率因数`, visible: true },
{ key: 11, label: `正向有功`, visible: true },
{ key: 12, label: `有功功率`, visible: false },
{ key: 13, label: `无功功率`, visible: false },
{ key: 14, label: `采集方式`, visible: true },
- { key: 15, label: `计量设备名称`, visible: true }
+ { key: 15, label: `计量设备名称`, visible: true },
+ { key: 16, label: `反向有功`, visible: true },
]
}
},
diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue
index 23c448a..0d9fed3 100644
--- a/src/views/ems/record/recordSteamInstant/index.vue
+++ b/src/views/ems/record/recordSteamInstant/index.vue
@@ -319,7 +319,7 @@ export default {
{ key: 8, label: `压力`, visible: false },
{ key: 9, label: `密度`, visible: false },
{ key: 10, label: `压力差值`, visible: false },
- { key: 11, label: `记录时间`, visible: true },
+ { key: 11, label: `记录时间`, visible: false },
{ key: 12, label: `计量设备名称`, visible: true }
]
}
diff --git a/src/views/ems/record/recordWaterInstant/index.vue b/src/views/ems/record/recordWaterInstant/index.vue
index 51ae741..2db7ca2 100644
--- a/src/views/ems/record/recordWaterInstant/index.vue
+++ b/src/views/ems/record/recordWaterInstant/index.vue
@@ -302,7 +302,7 @@ export default {
{ key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `瞬时流量`, visible: true },
{ key: 4, label: `累计流量`, visible: true },
- { key: 5, label: `记录时间`, visible: true },
+ { key: 5, label: `记录时间`, visible: false },
{ key: 6, label: `采集方式`, visible: true },
{ key: 7, label: `计量设备名称`, visible: true }
]
diff --git a/src/views/ems/report/currentVoltageCurve/index.vue b/src/views/ems/report/currentVoltageCurve/index.vue
index f69b13d..4333e92 100644
--- a/src/views/ems/report/currentVoltageCurve/index.vue
+++ b/src/views/ems/report/currentVoltageCurve/index.vue
@@ -336,7 +336,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
@@ -355,7 +355,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
@@ -374,7 +374,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// color: "#058cff",
// },
@@ -467,7 +467,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
@@ -486,7 +486,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
@@ -505,7 +505,7 @@ export default {
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: "emptyCircle", //标记的图形为实心圆
- symbolSize: 5, //标记的大小
+ symbolSize: 1, //标记的大小
// itemStyle: {
// color: "#058cff",
// },
diff --git a/src/views/login.vue b/src/views/login.vue
index 6a65780..b908424 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -72,8 +72,8 @@ export default {
return {
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue
index 7f3ef8a..84dc69f 100644
--- a/src/views/mes/base/baseStaffInfo/index.vue
+++ b/src/views/mes/base/baseStaffInfo/index.vue
@@ -307,7 +307,7 @@ export default {
{ key: 1, label: `员工ID`, visible: true },
{ key: 2, label: `员工名称`, visible: true },
{ key: 3, label: `员工类型`, visible: true },
- { key: 4, label: `卡号`, visible: false },
+ { key: 4, label: `卡号`, visible: true },
{ key: 5, label: `班组编号`, visible: true },
{ key: 6, label: `手机号`, visible: true },
{ key: 7, label: `用户性别`, visible: true },
diff --git a/src/views/mes/record/teamEmployeesWages/index.vue b/src/views/mes/record/teamEmployeesWages/index.vue
index 3afe6c1..6a53738 100644
--- a/src/views/mes/record/teamEmployeesWages/index.vue
+++ b/src/views/mes/record/teamEmployeesWages/index.vue
@@ -255,7 +255,8 @@ export default {
{ key: 15, label: `员工名称`, visible: true },
],
// 班组选项
- teamMembersList: []
+ teamMembersList: [],
+ selectionData: []
}
},
created() {
@@ -325,18 +326,19 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
+ this.selectionData = selection
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
- const dataList = this.recordStaffSalaryList;
+ const dataList = this.selectionData;
if (dataList.length === 0){
- this.$modal.msgError('请生成工资后上传！')
+ this.$modal.msgError('请勾选至少一条工资记录上传！')
return
}
- this.$modal.confirm('是否将员工工资上传至ERP系统？').then(function() {
+ this.$modal.confirm('是否将已勾选的员工工资上传至ERP系统？').then(function() {
return uploadERPStaffSalary(dataList)
}).then(() => {
this.recordStaffSalaryList = [];