diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue index dcf09b2..1f1d4b2 100644 --- a/src/views/base/bracelet/index.vue +++ b/src/views/base/bracelet/index.vue @@ -231,8 +231,8 @@ 取 消 { this.shboxList = response.rows; this.totalTwo = response.total; + console.log(this.queryshCode.pageSize) this.loadingTwo = false; }); }, @@ -1885,7 +1886,9 @@ this.loadingThree = true; listShboxBind(this.queryshCodeBind).then(response => { this.shboxListBind = response.rows; - this.totalThree = response.total; + this.totalTwo = response.total; + console.log(this.totalThree) + console.log(this.queryshCodeBind.pageSize) this.loadingThree = false; }); }, @@ -1922,6 +1925,7 @@ this.getListBind(); this.radioTwo=null; this.queryshCodeBind.pageNum = 1; + this.queryshCodeBind.pageSize = 10; this.queryshCodeBind.shId = row.shId; }, diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue index 00dffb3..23aa98f 100644 --- a/src/views/base/device/index.vue +++ b/src/views/base/device/index.vue @@ -534,21 +534,17 @@ }, //上传组件-图片查看 picturePreview(file) { - console.log(file) this.dialogImageUrl = file.url this.dialogVisible = true }, // 图片上传 handleChange(file, fileList) { - console.log(file) // this.$refs["form"].clearValidate() this.formThree.fileName = file.name; this.fileList = fileList; }, handleRemove(file, fileList) { let sum = 0 - console.log(111111) - console.log(this.fileList) this.fileList.forEach((item, index) => { if(!item?.hasOwnProperty('raw')) { this.delFileId = this.formThree.filePath; @@ -556,7 +552,6 @@ sum = index; }) // this.delFileId = this.fileList[sum].fileId; - console.log(this.delFileId) this.fileList.splice(sum, 1) }, //提交时循环fileList 获取raw文件 @@ -668,7 +663,6 @@ } }, clearCheck(){ - console.log("clearCheck") this.currentSelection = [] this.getList() }, @@ -738,7 +732,6 @@ url: response.data.base64Url, }) } - console.log(this.fileList) //触发校验 // this.formThree.fileName = response.data.fileId; setTimeout(()=>{ @@ -752,7 +745,6 @@ /** 删除按钮操作 */ handleDeleteDeviceAttribute(row) { const id = row.id; - console.log(id) this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项?').then(function() { return delDeviceAttribute({id:id}); }).then(() => { @@ -824,14 +816,7 @@ // this.showDeviceAttribute = true; this.getListDeviceAttribute(); }, - - // handleAddAttribute(row) { - // this.fileList = []; - // this.resetAttribute(); - // this.formThree.deviceId = row.deviceId; - // this.title = "新增设备属性" - // this.showAttribute = true; - // }, + /** 查询设备属性列表 */ getListDeviceAttribute() { @@ -869,14 +854,12 @@ this.$refs["form"].validate(valid => { if (valid) { if (this.form.deviceId != undefined) { - console.log(this.form) editDevice(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - console.log(this.form) addDevice(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; @@ -889,7 +872,6 @@ /** 删除按钮操作 */ handleDelete(row) { - console.log(row) const param = { deviceId:row.deviceId }