Merge branch 'dev' into test

src/components/icss/BloodPressTagGroup.vue

@@ -66,6 +66,10 @@ export default {
             default: '',
             type: String
         },
+        sexType: {
+            default: '',
+            type: String
+        },
     },
     data() {
         return {
@@ -98,6 +102,19 @@ export default {
                 this.searchTagList()
             }
         },
+        sexType(newVal, preVal) {
+            if (newVal != preVal) {
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                    this.leftTagsList = [];
+                    this.selectLeftTagsList = [];
+                    this.rightTagsList = [];
+                    this.rightTagsList2 = [];
+                    this.selectRightTagsList = [];
+                    this.searchVal = '';
+                     this.searchTagList();
+                }
+            }
+        },
         
         
     },
@@ -207,6 +224,7 @@ export default {
                 "controlType": [],
                 "type": this.type || '',
                 "notIds": notIds,
+                "sexType": this.sexType,
 
             }
             api.searchTagList(param).then((res) => {
@@ -250,21 +268,22 @@ export default {
         height: 30px;
     }
     .tagList {
-        padding: 10px 10px;
         height: 300px;
         overflow-y: auto;
         border: 1px solid @icssBorder;
     }
     .tagItem {
-        line-height: 20px;
+        line-height: 30px;
+        padding: 0px 10px;
+
     }
     .operationPool {
         position: relative;
         width: 85%;
     }
     .tagName {
-        height: 40px;
-        line-height: 40px;
+        height: 30px;
+        line-height: 30px;
     }
     .tagName:before {
         content: '['

src/components/icss/NoiseTemplate.vue

@@ -28,6 +28,7 @@
         v-if="dataPub.region2 == 4" 
         :pool="dataPub.tagPool" 
         :type="dataPub.region1"
+        :sexType="dataPub.region7"
         @changeActionData="changeActionData"
         >
       </SymptomTagGroup>
@@ -35,6 +36,7 @@
         v-if="dataPub.region2 == 3" 
         :pool="dataPub.tagPool" 
         :type="dataPub.region1"
+        :sexType="dataPub.region7"
         @changeActionData="changeActionData"
         >
       </BloodPressTagGroup>

src/components/icss/SymptomTagGroup.vue

@@ -78,6 +78,10 @@ export default {
             default: '',
             type: String
         },
+        sexType: {
+            default: '',
+            type: String
+        },
     },
     data() {
         return {
@@ -110,7 +114,20 @@ export default {
                 this.searchTagList()
             }
         },
-        
+        sexType(newVal, preVal) {
+            if (newVal != preVal) {
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                    this.leftTagsList = [];
+                    this.selectLeftTagsList = [];
+                    this.rightTagsList = [];
+                    this.rightTagsList2 = [];
+                    this.selectRightTagsList = [];
+                    this.searchVal = '';
+                     this.searchTagList();
+                }
+            }
+        },
+
         
     },
     methods: {
@@ -223,6 +240,7 @@ export default {
                 "controlType": [],
                 "type": this.type || '',
                 "notIds": notIds,
+                "sexType": this.sexType,
 
             }
             api.searchTagList(param).then((res) => {
@@ -286,7 +304,6 @@ export default {
         height: 30px;
     }
     .tagList {
-        padding: 10px 10px;
         border: 1px solid @icssBorder;
     }
     .tagPool {
@@ -297,17 +314,19 @@ export default {
     .attributeBox {
         position: absolute;
         right: -100px;
-        top: 10px;
+        top: 5px;
     }
     .tagItem {
         position: relative;
-        line-height: 40px;
+        line-height: 30px;
         cursor: pointer;
+        padding: 0 10px;
     }
     .operationPool {
         position: relative;
         width: 60%;
         min-height: 300px;
+        padding: 10px 0;
     }
     .tagName:before {
         content: '['