Merge branch 'uiUpdate0507' into test

src/components/common/HomePage.vue

@@ -247,7 +247,7 @@ export default {
   height: 32px;
   position: fixed;
   left:calc(20% - 36px); 
-  top: 70%;
+  top: 65%;
   z-index: 20;
 }
 .user .el-menu-item.is-active {

src/components/knowledgeExtra/AddDiagBase.vue

@@ -128,7 +128,6 @@
                     width="18"
                     class="icon"
                     @click="delGroup(scope.row.depart_id,scope.$index)"
-                    v-show="groupL[scope.row.depart_id].id>1"
                   />
                 </el-form-item>
               </template>
@@ -553,6 +552,7 @@ export default {
     this.baseTypes = JSON.parse(localStorage.getItem('zskDiagList') || '[]');
     this.dicts = JSON.parse(localStorage.getItem('zskDiagDicts') || '{}');
     let info = param.data;
+    console.log(info)
     if (info) {
       this.id = info.id;
       this.isCopy = param.copy;
@@ -565,7 +565,6 @@ export default {
         info.klDiagnoseTypeVO[i].depart_id = this.i;
         this.i++;
       }
-
       this.form = Object.assign({}, this.form, this.formatData(info));
       if (this.isCopy) {
         this.conceptList = [];