From f4690f7e70b6184817e1d18e3ae8458a71647931 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 9 Aug 2021 09:52:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/User.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index f450709..a8585c0 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -11,21 +11,21 @@
                         <div>
                             <el-form label-width="80px">
                                 <el-row>
-                                    <el-col :span="4">
+                                    <el-col :span="6">
                                         <el-form-item label="国家">
                                             <el-select v-model="form.countries" clearable placeholder="请选择国家">
                                                 <el-option v-for="(item,index) in countryList" :key="index" :label="item.name" :value="item.value"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="5">
+                                    <el-col :span="6">
                                         <el-form-item label="省份">
                                             <el-select v-model="form.provinces" clearable placeholder="请选择省份" @change="getCity" @clear="clearprovince()">
                                                 <el-option v-for="(item,index) in provinceList" :key="index" :label="item.provinceName" :value="item.provinceId"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="5">
+                                    <el-col :span="6">
                                         <el-form-item label="城市">
                                             <el-select v-model="form.city" clearable placeholder="请选择城市"
                                              :disabled="form.provinces ? false : true" @clear="clearcity()" @change="getSchool">
@@ -33,20 +33,20 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="5">
+                                    <el-col :span="6">
                                         <el-form-item label="学校">
                                             <el-select v-model="form.schoolId" clearable placeholder="请选择学校" :disabled="form.city ? false : true" @change="getData()">
                                                 <el-option v-for="(item,index) in schoolList" :key="index" :label="item.schoolName" :value="item.schoolId"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="5">
+                                    <!-- <el-col :span="5">
                                         <el-form-item label="角色">
                                             <el-select v-model="form.accountRole" clearable placeholder="请选择角色" @change="getData()">
                                                 <el-option v-for="(item,index) in accountRoleList" :key="index" :label="item.name" :value="item.value"></el-option>
                                             </el-select>
                                         </el-form-item>
-                                    </el-col>
+                                    </el-col> -->
                                 </el-row>
 
                                 <el-row>

From 637b49c6e31459acb322a04be43eafea4d82d6d5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 9 Aug 2021 18:03:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api.js             |  3 ---
 src/views/data/Framework.vue | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index 8a39b91..d632892 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,8 +1,5 @@
 
 let host = 'http://39.108.250.202:9000'
-if(process.env.NODE_ENV === 'development'){
-  host = 'http://192.168.31.216:9000'
-}
 let host1 = 'http://192.168.31.216:9000'//榕
 let host2 = 'http://192.168.31.125:9000'//林
 // let host = 'http://192.168.31.137:9000'// 陈赓
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index 19a4ff8..d46a1c5 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -319,6 +319,18 @@ export default {
                 }
             })
         },
+        renderChecked(){
+            let result = []
+            let list = this.$refs.typeTree.getCheckedNodes()
+            list.map((n,i) => {
+                if(n.tableLen && n.tableLen > n.children.length){
+                    result = [...result,...n.children.map(n => n.id)]
+                }else{
+                    result.push(n.id)
+                }
+            })
+            this.$refs.typeTree.setCheckedKeys(result)
+        },
         loadType(e){
             clearTimeout(this.typeTimer)
             let typeTree = this.$refs.typeTreeWrap
@@ -328,7 +340,7 @@ export default {
                     this.getMoreTable(this.importTypeList,this.curExpand)
                     setTimeout(() => {
                         this.$nextTick(() => {
-                            this.$refs.typeTree.setCheckedKeys(this.defaultTypeChecked)
+                            this.renderChecked()
                         })
                     },300)
                 }
@@ -431,7 +443,7 @@ export default {
         },
         importTypeExpand(obj,node,com){
             this.curExpand = obj.id
-            this.$refs.typeTree.setCheckedKeys(this.defaultTypeChecked)
+            this.renderChecked()
         },
         closeImport(){
             this.$refs.typeTree.setCheckedKeys([])