|
|
@@ -317,9 +317,13 @@ const handleRealTimeUpdate = (nosum, deviceItem) => {
|
|
|
// 当日用电量累加
|
|
|
if (
|
|
|
deviceItem.deviceName.includes("箱式变电站") &&
|
|
|
- nosum.name === "当日用电量"
|
|
|
+ nosum.name === "当日用电量kWh"
|
|
|
) {
|
|
|
- debouncedCalculateTotalRunTime("箱式变电站", "当日用电量", "当日用电量kWh");
|
|
|
+ debouncedCalculateTotalRunTime(
|
|
|
+ "箱式变电站",
|
|
|
+ "当日用电量kWh",
|
|
|
+ "当日用电量kWh"
|
|
|
+ );
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -470,28 +474,30 @@ const queryList = (pageNo, pageSize) => {
|
|
|
// 如果是enum类型，且description不为null,则根据description获取对应字典项数组，赋值给enumList
|
|
|
if (nonSumItem.type == "enum" && nonSumItem.description) {
|
|
|
console.log("🚀 ~ onSumItem.description:");
|
|
|
- nonSumItem.enumList =
|
|
|
+ const dictOptions =
|
|
|
nonSumItem.name === "非生产原因"
|
|
|
- ? getIntDictOptions(nonSumItem.description).map(
|
|
|
- (dict) => {
|
|
|
- return {
|
|
|
- ...dict,
|
|
|
- text: dict.label,
|
|
|
- };
|
|
|
- }
|
|
|
- )
|
|
|
- : getStrDictOptions(nonSumItem.description).map(
|
|
|
- (dict) => {
|
|
|
- return {
|
|
|
- ...dict,
|
|
|
- text: dict.label,
|
|
|
- };
|
|
|
- }
|
|
|
- );
|
|
|
- console.log(
|
|
|
- "🚀 ~ nonSumItem.enumList:",
|
|
|
- nonSumItem.enumList
|
|
|
- );
|
|
|
+ ? getIntDictOptions(nonSumItem.description)
|
|
|
+ : getStrDictOptions(nonSumItem.description);
|
|
|
+
|
|
|
+ nonSumItem.enumList = dictOptions.map((dict) => {
|
|
|
+ return {
|
|
|
+ ...dict,
|
|
|
+ text: dict.label,
|
|
|
+ };
|
|
|
+ });
|
|
|
+
|
|
|
+ // 确保 fillContent 的类型与 enumList 中的 value 类型匹配
|
|
|
+ if (nonSumItem.name === "非生产原因") {
|
|
|
+ // 如果是"非生产原因"，将 fillContent 转换为数字类型以匹配 getIntDictOptions
|
|
|
+ if (
|
|
|
+ nonSumItem.fillContent !== null &&
|
|
|
+ nonSumItem.fillContent !== ""
|
|
|
+ ) {
|
|
|
+ nonSumItem.fillContent = parseInt(nonSumItem.fillContent);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log("🚀 ~ nonSumItem.enumList:", nonSumItem.enumList);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -506,12 +512,11 @@ const queryList = (pageNo, pageSize) => {
|
|
|
|
|
|
console.log("resList--", resList);
|
|
|
// 将请求结果通过complete传给z-paging处理，同时也代表请求结束，这一行必须调用
|
|
|
- paging.value.complete(resList);
|
|
|
|
|
|
- if (pageNo * pageSize >= totalNum.value) {
|
|
|
- paging.value.complete([]);
|
|
|
- return;
|
|
|
- }
|
|
|
+ paging.value.completeByNoMore(
|
|
|
+ resList,
|
|
|
+ pageNo * pageSize >= totalNum.value
|
|
|
+ );
|
|
|
})
|
|
|
.catch((res) => {
|
|
|
// 如果请求失败写paging.value.complete(false);
|
|
|
@@ -580,10 +585,21 @@ const onSubmit = async () => {
|
|
|
// 如果所有项全部填写，则调用填写记录接口
|
|
|
|
|
|
for (const item of dataList.value) {
|
|
|
- const nonSumList = item.nonSumList;
|
|
|
+ const nonSumList = Array.isArray(item.nonSumList) ? item.nonSumList : [];
|
|
|
+
|
|
|
+ // 查找当日运转时间H项目
|
|
|
+ const runtimeItem = nonSumList.find((i) => i.name === "当日运转时间H");
|
|
|
+ const isRuntime24 =
|
|
|
+ runtimeItem &&
|
|
|
+ (runtimeItem.fillContent == 24 || runtimeItem.fillContent == "24");
|
|
|
for (const nonSumItem of nonSumList) {
|
|
|
+ // 增加判断条件：如果当日运转时间H等于24，则非生产原因和非生产时间H为非必填，否则为必填
|
|
|
+ const isExemptField =
|
|
|
+ isRuntime24 &&
|
|
|
+ (nonSumItem.name === "非生产原因" || nonSumItem.name === "非生产时间H");
|
|
|
if (
|
|
|
(!item.isReport || item.isReport != 1) &&
|
|
|
+ !isExemptField &&
|
|
|
(nonSumItem.fillContent == null || nonSumItem.fillContent === "")
|
|
|
) {
|
|
|
uni.showToast({
|
