From 35bff42b22d092d164ef4b9db8701f839c57bd9c Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期六, 11 六月 2022 11:33:08 +0800
Subject: [PATCH] 提交代码
---
src/views/components/manufacturer/index.vue | 4 ++--
src/views/components/nvr/index.vue | 4 ++--
src/views/components/peripheralUnit/index.vue | 4 ++--
src/views/construction/ipc/index.vue | 11 ++---------
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/views/components/manufacturer/index.vue b/src/views/components/manufacturer/index.vue
index cb4b39d..bbaf2fd 100644
--- a/src/views/components/manufacturer/index.vue
+++ b/src/views/components/manufacturer/index.vue
@@ -65,9 +65,9 @@
},
methods: {
handleClear () {
- this.currentId = '';
+ this.currentId = undefined;
this.name = undefined;
- this.$emit("change", '');
+ this.$emit("change", undefined);
},
getCurrentRow (e) {
this.currentId = e.id
diff --git a/src/views/components/nvr/index.vue b/src/views/components/nvr/index.vue
index c404908..c2af710 100644
--- a/src/views/components/nvr/index.vue
+++ b/src/views/components/nvr/index.vue
@@ -69,9 +69,9 @@
},
methods: {
handleClear () {
- this.currentId = '';
+ this.currentId = undefined;
this.name = undefined;
- this.$emit("change", '');
+ this.$emit("change", undefined);
this.$emit('nvrIdChange')
},
getCurrentRow (e) {
diff --git a/src/views/components/peripheralUnit/index.vue b/src/views/components/peripheralUnit/index.vue
index bbd406a..cd15ffa 100644
--- a/src/views/components/peripheralUnit/index.vue
+++ b/src/views/components/peripheralUnit/index.vue
@@ -67,9 +67,9 @@
},
methods: {
handleClear () {
- this.currentId = '';
+ this.currentId = undefined;
this.name = undefined;
- this.$emit("change", '');
+ this.$emit("change", undefined);
},
getCurrentRow (e) {
this.currentId = e.id
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index b0692f3..3e17002 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -81,7 +81,7 @@
<el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
</template>
</el-table-column>
- <el-table-column label="閫氶亾鍙�" align="center" prop="passageway_dictText" show-overflow-tooltip/>
+ <el-table-column label="閫氶亾鍙�" align="center" prop="passageway" show-overflow-tooltip/>
<el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
<el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
<el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
@@ -153,14 +153,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫氶亾鍙�" prop="passageway">
- <el-select v-model="form.passageway" :disabled="!form.nvrId" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�" style="width: 100%;">
- <el-option
- v-for="dict in dict.type.DICT109"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
+ <el-input v-model="form.passageway" :disabled="!form.nvrId" maxlength="4" show-word-limit placeholder="璇疯緭鍏ラ�氶亾鍙�"/>
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.1