Merge branch 'uiUpdate0507' into test

src/components/common/HomePage.vue

@@ -28,7 +28,8 @@
         </p>
       </div>
     </el-aside>
-    <img src="../../images/icon-collect.png" class="collect" @click="collect" />
+    <img src="../../images/icon-collect-right.png" v-show="!onshow" class="collect" @click="collect" />
+    <img src="../../images/icon-collect-left.png" v-show="onshow" class="collect-left" @click="collect" />
     <el-container>
       <el-header class="clearfix">
         <div class="title fl">
@@ -234,13 +235,21 @@ export default {
 <style lang="less">
 @import '../../less/common.less';
 .collect {
-  width: 106px;
-  height: 60px;
+  width: 36px;
+  height: 32px;
   position: fixed;
   left: 0;
   top: 70%;
   z-index: 20;
 }
+.collect-left{
+  width: 36px;
+  height: 32px;
+  position: fixed;
+  left:calc(20% - 36px); 
+  top: 70%;
+  z-index: 20;
+}
 .user .el-menu-item.is-active {
   color: @userBase;
 }

src/components/knowledgeExtra/AddNewRule.vue

@@ -422,28 +422,33 @@ export default {
       this.tableShow = false;
       const date = new Date().valueOf();
       this.$nextTick(() => {
-        this.$set(this.form, "klRuleByIdSub", [
-          {
-            groupId: date,
-            groupChildId: "child" + new Date().valueOf(),
-            baseTypes: this.baseTypeList,
-            baseTermTypeList: [],
-            conceptList: [],
-            subDescription: "",
-            parRuleType: "",
-            subConceptId: "",
-            subType: "",
-            subMaxOperator: "",
-            subMaxUnit: "",
-            subMaxValue: "",
-            subMinOperator: "",
-            subMinUnit: "",
-            subMinValue: "",
-            subEqValue: "",
-            subLenCode: "",
-            dataType: ""
-          }
-        ]);
+        if (this.form.parHasSub && this.form.parHasSub != 0) {
+          this.$set(this.form, "klRuleByIdSub", [
+            {
+              groupId: date,
+              groupChildId: "child" + new Date().valueOf(),
+              baseTypes: this.baseTypeList,
+              baseTermTypeList: [],
+              conceptList: [],
+              subDescription: "",
+              parRuleType: "",
+              subConceptId: "",
+              subType: "",
+              subMaxOperator: "",
+              subMaxUnit: "",
+              subMaxValue: "",
+              subMinOperator: "",
+              subMinUnit: "",
+              subMinValue: "",
+              subEqValue: "",
+              subLenCode: "",
+              dataType: ""
+            }
+          ]);
+        } else {
+          this.$set(this.form, "klRuleByIdSub", []);
+        }
+
         if (!init) {
           this.form.parConceptId = ""; //医学标准术语清空
           this.conceptList = []; //下拉列表清空
@@ -631,9 +636,14 @@ export default {
       deep: true
     },
     "form.parHasSub"(val) {
-      if (!val || val == 0) {
-        this.form.klRuleByIdSub = [];
-      }
+      console.log(val);
+      console.log(this.form);
+      // if (!val || val == 0) {
+      //   // this.form.klRuleByIdSub = [];
+      //   this.$set(this.form, "klRuleByIdSub", []);
+
+      //   console.log(this.form);
+      // }
     }
   },
   computed: {

src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -108,7 +108,7 @@
       :data="klRuleByIdSub"
       size="mini"
       style="min-height: 200px"
-      height="calc(100vh - 415px)"
+      height="calc(100vh - 403px)"
       :row-style="rowStyle"
       :header-row-style="{ background: '#E3EAF4' }"
       :cell-style="cellStyle"