src/views/device/equipment/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/device/peripheralUnit/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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/> @@ -194,7 +190,7 @@ <!-- 添加或修改智控设备对话框 --> <Dialog :title="title" :visible.sync="open" width="50%" append-to-body> <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; }); src/views/device/peripheralUnit/index.vue
@@ -227,7 +227,7 @@ </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm" :disabled="disabled">确 定</el-button> <el-button @click="cancel">取 消</el-button> </div> </Dialog> @@ -236,7 +236,7 @@ <Dialog :title="title" :visible.sync="uploadFlag" width="500px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="附件"> <fileUpload v-model="form.filePath" limit="1"/> <fileUpload v-model="form.filePath" :limit="1"/> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -358,12 +358,12 @@ }, created() { this.getList(); this.getManufacturerList(); }, methods: { getManufacturerList() { listManufacturer().then(res => { this.manufacturerList = res.data this.manufacturerList = res.data; }) }, /** 查询外设单元列表 */ @@ -373,6 +373,7 @@ this.peripheralUnitList = response.rows; this.total = response.total; this.loading = false; this.getManufacturerList(); }); }, // 取消按钮 @@ -440,7 +441,7 @@ this.loading = false; this.form = response.data; this.open = true; this.title = "修改外设单元"; this.title = "查看外设单元"; }); }, /** 修改按钮操作 */ @@ -448,11 +449,12 @@ this.loading = true; this.disabled = false this.reset(); this.getManufacturerList(); //this.getManufacturerList(); const id = row.id || this.ids getPeripheralUnit(id).then(response => { this.loading = false; this.form = response.data; this.form.manufacturer = parseInt(this.form.manufacturer); this.open = true; this.title = "修改外设单元"; }); @@ -461,6 +463,12 @@ submitForm() { this.$refs["form"].validate(valid => { if (valid) { if(this.uploadFlag){ if(!this.form.filePath){ this.$modal.msgWarning("请选择上传附件"); return; } } this.buttonLoading = true; if (this.form.id != null) { updatePeripheralUnit(this.form).then(response => {