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() {

project/dv/apps/AppGridDV.vue

@@ -344,9 +344,9 @@
       getGirdInfo (id, level) {
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
-            const chartData = this.formatList(res.data)
-            if (res.data && res.data[0] && res.data[0].parentGirdInfo) {
-              const parentGirdInfo = res.data[0].parentGirdInfo
+            const chartData = this.formatList([res.data])
+            if (res.data && res.data.parentGirdInfo) {
+              const parentGirdInfo = res.data.parentGirdInfo
               const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
                 return {
                   ...v,
@@ -376,7 +376,7 @@
             }
 
             this.$nextTick(() => {
-              if (level === '2') {
+              if (id) {
                 this.getUserList(id)
               } else {
                 this.isLoading = false
@@ -395,6 +395,7 @@
           }
         }).then(res => {
           if (res.code == 0) {
+            console.log(res.data)
             const userList = res.data.records.map(v => {
               return {
                 ...v,
@@ -402,7 +403,7 @@
                 label: v.name
               }
             })
-            
+
             this.isLoading = false
 
             if (!userList.length) {
@@ -546,7 +547,7 @@
       .el-table {
         background-color: transparent;
       }
-      
+
       .el-table__body tr td:first-child .cell, .ai-table .el-table__header tr th:first-child .cell {
         padding-left: 0!important;
       }
@@ -690,7 +691,7 @@
             text-overflow:ellipsis;
             white-space: nowrap;
             margin-bottom: 10px;
-          
+
             &:nth-of-type(2n) {
               margin-right: 0;
             }
@@ -875,4 +876,4 @@
       }
     }
   }
-</style>
+</style>