Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-16 cc9ddf2ecaf3ad935374f49c842227f7eb15779d

 src/views/systemSetting/device/grid/components/main/index.vue

@@ -201,7 +201,6 @@
                                    message: res.message
                                })
                            }
                            console.log(res);
                        })
                })
                .catch(err => { console.log(err) })
@@ -228,7 +227,6 @@
                                    message: res.message
                                })
                            }
                            console.log(res);
                        })
                })
                .catch(err => { console.log(err) })
@@ -251,7 +249,6 @@
                    method: 'post',
                    url: 'sccg/admin/delete/' + id,
                }).then(res => {
                    console.log(res);
                    this.$message({
                        message: res.message,
                        type: 'success'
@@ -310,7 +307,6 @@
            let { id, status } = obj;
            status == true ? status = 1 : status = 0;
            this.$axios.post(`sccg/admin/updateStatus/` + id + '?status=' + status).then(res => {
                console.log(res);
            })
        },
        // 获取用户列表