自测bug
This commit is contained in:
parent
0e8ed473e7
commit
78f0a8519b
|
|
@ -231,8 +231,8 @@
|
||||||
<el-button @click="cancelBind">取 消</el-button>
|
<el-button @click="cancelBind">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
v-show="totalThree>0"
|
v-show="totalTwo>0"
|
||||||
:total="totalThree"
|
:total="totalTwo"
|
||||||
:page.sync="queryshCodeBind.pageNum"
|
:page.sync="queryshCodeBind.pageNum"
|
||||||
:limit.sync="queryshCodeBind.pageSize"
|
:limit.sync="queryshCodeBind.pageSize"
|
||||||
@pagination="getListBind"
|
@pagination="getListBind"
|
||||||
|
|
@ -1224,7 +1224,7 @@
|
||||||
},
|
},
|
||||||
// 手环绑定选择页面表单重置
|
// 手环绑定选择页面表单重置
|
||||||
resetBind() {
|
resetBind() {
|
||||||
this.queryshCodeBind = {};
|
this.queryshCodeBind.shCode = {};
|
||||||
this.resetForm("queryshCodeBind");
|
this.resetForm("queryshCodeBind");
|
||||||
},
|
},
|
||||||
resetBindTemp() {
|
resetBindTemp() {
|
||||||
|
|
@ -1833,6 +1833,7 @@
|
||||||
listShbox(this.queryshCode).then(response => {
|
listShbox(this.queryshCode).then(response => {
|
||||||
this.shboxList = response.rows;
|
this.shboxList = response.rows;
|
||||||
this.totalTwo = response.total;
|
this.totalTwo = response.total;
|
||||||
|
console.log(this.queryshCode.pageSize)
|
||||||
this.loadingTwo = false;
|
this.loadingTwo = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -1885,7 +1886,9 @@
|
||||||
this.loadingThree = true;
|
this.loadingThree = true;
|
||||||
listShboxBind(this.queryshCodeBind).then(response => {
|
listShboxBind(this.queryshCodeBind).then(response => {
|
||||||
this.shboxListBind = response.rows;
|
this.shboxListBind = response.rows;
|
||||||
this.totalThree = response.total;
|
this.totalTwo = response.total;
|
||||||
|
console.log(this.totalThree)
|
||||||
|
console.log(this.queryshCodeBind.pageSize)
|
||||||
this.loadingThree = false;
|
this.loadingThree = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -1922,6 +1925,7 @@
|
||||||
this.getListBind();
|
this.getListBind();
|
||||||
this.radioTwo=null;
|
this.radioTwo=null;
|
||||||
this.queryshCodeBind.pageNum = 1;
|
this.queryshCodeBind.pageNum = 1;
|
||||||
|
this.queryshCodeBind.pageSize = 10;
|
||||||
this.queryshCodeBind.shId = row.shId;
|
this.queryshCodeBind.shId = row.shId;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -534,21 +534,17 @@
|
||||||
},
|
},
|
||||||
//上传组件-图片查看
|
//上传组件-图片查看
|
||||||
picturePreview(file) {
|
picturePreview(file) {
|
||||||
console.log(file)
|
|
||||||
this.dialogImageUrl = file.url
|
this.dialogImageUrl = file.url
|
||||||
this.dialogVisible = true
|
this.dialogVisible = true
|
||||||
},
|
},
|
||||||
// 图片上传
|
// 图片上传
|
||||||
handleChange(file, fileList) {
|
handleChange(file, fileList) {
|
||||||
console.log(file)
|
|
||||||
// this.$refs["form"].clearValidate()
|
// this.$refs["form"].clearValidate()
|
||||||
this.formThree.fileName = file.name;
|
this.formThree.fileName = file.name;
|
||||||
this.fileList = fileList;
|
this.fileList = fileList;
|
||||||
},
|
},
|
||||||
handleRemove(file, fileList) {
|
handleRemove(file, fileList) {
|
||||||
let sum = 0
|
let sum = 0
|
||||||
console.log(111111)
|
|
||||||
console.log(this.fileList)
|
|
||||||
this.fileList.forEach((item, index) => {
|
this.fileList.forEach((item, index) => {
|
||||||
if(!item?.hasOwnProperty('raw')) {
|
if(!item?.hasOwnProperty('raw')) {
|
||||||
this.delFileId = this.formThree.filePath;
|
this.delFileId = this.formThree.filePath;
|
||||||
|
|
@ -556,7 +552,6 @@
|
||||||
sum = index;
|
sum = index;
|
||||||
})
|
})
|
||||||
// this.delFileId = this.fileList[sum].fileId;
|
// this.delFileId = this.fileList[sum].fileId;
|
||||||
console.log(this.delFileId)
|
|
||||||
this.fileList.splice(sum, 1)
|
this.fileList.splice(sum, 1)
|
||||||
},
|
},
|
||||||
//提交时循环fileList 获取raw文件
|
//提交时循环fileList 获取raw文件
|
||||||
|
|
@ -668,7 +663,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
clearCheck(){
|
clearCheck(){
|
||||||
console.log("clearCheck")
|
|
||||||
this.currentSelection = []
|
this.currentSelection = []
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
|
|
@ -738,7 +732,6 @@
|
||||||
url: response.data.base64Url,
|
url: response.data.base64Url,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log(this.fileList)
|
|
||||||
//触发校验
|
//触发校验
|
||||||
// this.formThree.fileName = response.data.fileId;
|
// this.formThree.fileName = response.data.fileId;
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
|
|
@ -752,7 +745,6 @@
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDeleteDeviceAttribute(row) {
|
handleDeleteDeviceAttribute(row) {
|
||||||
const id = row.id;
|
const id = row.id;
|
||||||
console.log(id)
|
|
||||||
this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项?').then(function() {
|
this.$modal.confirm('是否确认删除级联编码为"' + row.dataCode + '"的数据项?').then(function() {
|
||||||
return delDeviceAttribute({id:id});
|
return delDeviceAttribute({id:id});
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
|
|
@ -824,14 +816,7 @@
|
||||||
// this.showDeviceAttribute = true;
|
// this.showDeviceAttribute = true;
|
||||||
this.getListDeviceAttribute();
|
this.getListDeviceAttribute();
|
||||||
},
|
},
|
||||||
|
|
||||||
// handleAddAttribute(row) {
|
|
||||||
// this.fileList = [];
|
|
||||||
// this.resetAttribute();
|
|
||||||
// this.formThree.deviceId = row.deviceId;
|
|
||||||
// this.title = "新增设备属性"
|
|
||||||
// this.showAttribute = true;
|
|
||||||
// },
|
|
||||||
|
|
||||||
/** 查询设备属性列表 */
|
/** 查询设备属性列表 */
|
||||||
getListDeviceAttribute() {
|
getListDeviceAttribute() {
|
||||||
|
|
@ -869,14 +854,12 @@
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (this.form.deviceId != undefined) {
|
if (this.form.deviceId != undefined) {
|
||||||
console.log(this.form)
|
|
||||||
editDevice(this.form).then(response => {
|
editDevice(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log(this.form)
|
|
||||||
addDevice(this.form).then(response => {
|
addDevice(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("新增成功");
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
|
|
@ -889,7 +872,6 @@
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
console.log(row)
|
|
||||||
const param = {
|
const param = {
|
||||||
deviceId:row.deviceId
|
deviceId:row.deviceId
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue