Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

yangys

2024-01-14 00c8943add0753245977bdc4eb3dc7d979cf3f45

 src/container/deviceType/index.vue

@@ -107,7 +107,7 @@
             
               ids.push(row.id)
              
              ids = ids.join(',')
              //ids = ids.join(',')
              this.$confirm('确定要永久删除此项?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -119,7 +119,8 @@
                  type: 'success',
                  message: '删除成功！'
                 })
                 this.submitForm()
                 this.query ();
                 //this.submitForm()
               })
              }).catch(() => {
               this.$message({