Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai

hanbaoshan

2020-10-23 6397f40249641c65d6ad35cc3b6e60bcb4104af3

 src/pages/settings/components/BasicSetting.vue

@@ -88,11 +88,11 @@
                </el-col>-->
                <el-col :span="12" class="flex-box">
                  <div class="xiangqin-label">设备型号</div>
                  <div class="xiangqing-info">{{sysinfo.deviceType}}</div>
                  <div class="xiangqing-info">{{sysinfo.deviceModel}}</div>
                </el-col>
                <el-col :span="12" class="flex-box">
                  <div class="xiangqin-label">设备类型</div>
                  <div class="xiangqing-info">{{sysinfo.deviceModel}}</div>
                  <div class="xiangqing-info">{{sysinfo.deviceDesc}}</div>
                </el-col>
                <el-col :span="12" class="flex-box">
                  <div class="xiangqin-label">通道个数</div>