From e28e9395819fd992bc3e168b6ff89fb6f538f1bc Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:25:34 +0800
Subject: [PATCH] 提交代码
---
src/views/device/equipment/index.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 8e56435..5a3f065 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -139,11 +139,7 @@
{{formatZero(scope.row.serialNumber, 4)}}
</template>
</el-table-column>
- <el-table-column label="璁惧绫诲瀷" min-width="120" align="center" prop="type">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.DICT101" :value="scope.row.type"/>
- </template>
- </el-table-column>
+ <el-table-column label="璁惧绫诲瀷" min-width="120" align="center" prop="type_dictText"/>
<el-table-column label="纭欢搴忓垪鐮�" min-width="120" align="center" prop="sequenceCode" show-overflow-tooltip/>
<el-table-column label="杞欢鐗堟湰" align="center" min-width="120" prop="edition" show-overflow-tooltip/>
<el-table-column label="瀛︽牎鍚嶇О" align="center" prop="schoolId_dictText" show-overflow-tooltip/>
@@ -192,9 +188,9 @@
/>
<!-- 娣诲姞鎴栦慨鏀规櫤鎺ц澶囧璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="50%" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="搴忓垪鍙�11" prop="serialNumber">
+ <el-form-item label="搴忓垪鍙�" prop="serialNumber">
<el-input v-model="form.serialNumber" :disabled="disabled" placeholder="璇疯緭鍏ュ簭鍒楀彿"/>
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="type">
@@ -339,12 +335,12 @@
hostId: [
{required: true, message: "涓绘満ID涓嶈兘涓虹┖", trigger: "blur"}
],
- networkId: [
- {required: true, message: "尾缃戠粶ID涓嶈兘涓虹┖", trigger: "blur"}
- ],
- frequencyBand: [
- {required: true, message: "尾宸ヤ綔棰戞涓嶈兘涓虹┖", trigger: "blur"}
- ],
+ // networkId: [
+ // {required: true, message: "尾缃戠粶ID涓嶈兘涓虹┖", trigger: "blur"}
+ // ],
+ // frequencyBand: [
+ // {required: true, message: "尾宸ヤ綔棰戞涓嶈兘涓虹┖", trigger: "blur"}
+ // ],
batchId: [
{required: true, message: "鐢熶骇鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
@@ -361,7 +357,7 @@
},
created() {
this.getList();
- this.getSchool()
+ //this.getSchool()
this.getBatch()
},
methods: {
@@ -370,6 +366,7 @@
this.loading = true;
listEquipment(this.queryParams).then(response => {
this.equipmentList = response.rows;
+ console.log(this.equipmentList);
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.9.1