From 307f835cec73f9b8540b243bdf5930971f82aba4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 10:57:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B9=9D=E5=88=86?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/IntelligentSecurity/AppISManage/AppISManage.vue     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
index 36fff7a7..ede77678 100644
--- a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/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() {

From 5bc5bf0672a3e1ad1b2b0da06866293270892345 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:21:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index c7922dfb..7012e858 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/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,
@@ -402,7 +402,7 @@
                 label: v.name
               }
             })
-            
+
             this.isLoading = false
 
             if (!userList.length) {
@@ -424,6 +424,7 @@
       },
 
       formatList (list) {
+        console.log(list)
         return list.map(item => {
           let userList = []
           const girdMemberManageList = item.girdMemberManageList ? item.girdMemberManageList.map(v => {
@@ -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>
\ No newline at end of file
+</style>

From 942078e3fdd4b07285834f113f2149e3f61c4744 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:29:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/components/SourceData.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/bigscreen/designer/components/SourceData.vue b/packages/bigscreen/designer/components/SourceData.vue
index d2280f0d..b116f15d 100644
--- a/packages/bigscreen/designer/components/SourceData.vue
+++ b/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="请输入数据源描述"

From 2dbdc7a4c4779bc7a46d671f7c5b4d05b308faf4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:47:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index 7012e858..b38f4999 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -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,
@@ -424,7 +425,6 @@
       },
 
       formatList (list) {
-        console.log(list)
         return list.map(item => {
           let userList = []
           const girdMemberManageList = item.girdMemberManageList ? item.girdMemberManageList.map(v => {