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

packages/bigscreen/designer/components/SourceData.vue

@@ -66,6 +66,7 @@
             </el-form-item>
             <el-form-item v-if="form.type === '1'" label="sql语句" style="width: 100%;" prop="description" :rules="[{ required: true, message: '请输入sql语句', trigger: 'blur' }]">
               <el-input
+                :rows="8"
                 size="small"
                 type="textarea"
                 placeholder="请输入数据源描述"

packages/device/IntelligentSecurity/AppISManage/AppISManage.vue

@@ -54,8 +54,7 @@
       splitOps() {
         return [
           { label: '单分屏', value: 1, per: '100%' },
-          { label: '四分屏', value: 4, per: '49.2%' },
-          { label: '九分屏', value: 9, per: '32%' },
+          { label: '四分屏', value: 4, per: '49.2%' }
         ]
       },
       currentSplitStyle() {