Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-16 13a60da2424da8cd50e52e35e0126e23e34ea6f3

 src/views/CNAS/resourceDemand/device/component/management.vue

@@ -491,10 +491,18 @@
            {
               label: "设备分类", prop: "largeCategory", dataType: "tag",
               formatData: (params) => {
                  return this.equipmentList.find(m => m.value == params).label
            if (this.equipmentList.find(m => m.value == params)) {
                    return this.equipmentList.find(m => m.value == params).label
            } else {
              return null
            }
               },
               formatType: (params) => {
                  return this.equipmentList.find(m => m.value == params).type
            if (this.equipmentList.find(m => m.value == params)) {
              return this.equipmentList.find(m => m.value == params).type
            } else {
              return null
            }
               }
            },
            { label: "单价", prop: "unitPrice" },
@@ -803,10 +811,6 @@
         }
         this.upLoad = true;
         upDeviceParameter(formData).then(res => {
            if (res.code === 201) {
               this.upLoad = false
               return
            }
            this.$message.success('修改成功')
            this.upLoad = false
            this.refreshTable('page')
@@ -856,10 +860,6 @@
         }
         this.upLoad2 = true;
         addDeviceParameter(formData).then(res => {
            if (res.code === 201) {
               this.upLoad2 = false
               return
            }
            this.$message.success('提交成功')
            this.upLoad2 = false
            this.refreshTable('page')
@@ -927,9 +927,6 @@
         this.upLoad3 = true
         numberCollect(this.configForm).then(res => {
            this.upLoad3 = false
            if (res.code === 201) {
               return
            }
            this.$message.success('操作成功')
            this.refreshTable('page')
            this.dialogVisible3 = false
@@ -976,7 +973,6 @@
         })
            .then(() => {
               delDeviceParameter({ id: row.id }).then((res) => {
                  if (res.code == 201) return;
                  this.$message.success("删除成功");
                  this.refresh();
               });