From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/measurementManagement.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/view/measurementManagement.vue b/src/components/view/measurementManagement.vue
index fbd1415..010cbb6 100644
--- a/src/components/view/measurementManagement.vue
+++ b/src/components/view/measurementManagement.vue
@@ -456,7 +456,7 @@
<template slot="header">
<span class="requiredclass">浠櫒璁惧鍚嶇О</span>
</template>
- <template scope="scope">
+ <template slot-scope="scope">
<el-form-item
:prop="`measureLedgerList[` + scope.$index + `].deviceId`"
:rules="{
@@ -482,7 +482,7 @@
</template>
</el-table-column>
<el-table-column label="娴嬮噺鑼冨洿" min-width="10%">
- <template scope="scope">
+ <template slot-scope="scope">
<el-form-item
:prop="
`measureLedgerList[` + scope.$index + `].measuringRange`
@@ -505,7 +505,7 @@
</template>
</el-table-column>
<el-table-column label="璁￠噺鍛ㄦ湡" min-width="5%">
- <template scope="scope">
+ <template slot-scope="scope">
<span
v-show="
addFormDevice.measureLedgerList[scope.$index]
@@ -519,7 +519,7 @@
</template>
</el-table-column>
<el-table-column label="璁￠噺缁撴灉" min-width="10%">
- <template scope="scope">
+ <template slot-scope="scope">
<el-select
v-model="
addFormDevice.measureLedgerList[scope.$index]
@@ -538,7 +538,7 @@
<template slot="header">
<span class="requiredclass">璁￠噺鏃ユ湡</span>
</template>
- <template scope="scope">
+ <template slot-scope="scope">
<el-form-item
:prop="
`measureLedgerList[` + scope.$index + `].measureDate`
@@ -567,7 +567,7 @@
<template slot="header">
<span class="requiredclass">璁￠噺鏈夋晥鏈�</span>
</template>
- <template scope="scope">
+ <template slot-scope="scope">
<el-form-item
:prop="
`measureLedgerList[` + scope.$index + `].planDateList`
@@ -596,7 +596,7 @@
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="10%">
- <template scope="scope">
+ <template slot-scope="scope">
<el-button
type="text"
size="mini"
@@ -744,9 +744,9 @@
},
key: 0,
measurePlanPageData: [], // 璁￠噺璁″垝琛ㄦ牸鏁版嵁
- measureLedgerTotal: "",
+ measureLedgerTotal: 0,
measureLedgerPageData: [], // 璁￠噺鍙拌处琛ㄦ牸鏁版嵁
- measureLedgerPageTotal: "",
+ measureLedgerPageTotal: 0,
recordData: [],
measurePlanPage: {
pageNo: 1,
@@ -755,7 +755,7 @@
measureId: ""
},
measureTop: {},
- measurePlanPageTotal: "",
+ measurePlanPageTotal: 0,
okOrNo: "",
deviceIdAndNameAndCode: [],
addFormDevice: {
--
Gitblit v1.9.3