Jelajahi Sumber

Squashed commit of the following:

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date:   Mon Feb 18 13:08:58 2019 +0800

    和单标签

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date:   Mon Feb 18 10:13:29 2019 +0800

    Merge branch 'dev2/luolei' into independentTag

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date:   Fri Feb 15 17:26:43 2019 +0800

    bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Feb 13 16:32:54 2019 +0800

    禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Feb 13 16:28:50 2019 +0800

    修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Feb 13 16:22:22 2019 +0800

    单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Feb 12 11:20:22 2019 +0800

    文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Feb 11 18:10:47 2019 +0800

    单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Feb 11 17:35:26 2019 +0800

    输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Feb 11 16:37:36 2019 +0800

    单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Feb 11 14:53:29 2019 +0800

    单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date:   Sun Feb 3 10:04:46 2019 +0800

    Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date:   Sun Feb 3 09:48:48 2019 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date:   Sat Feb 2 17:30:26 2019 +0800

    单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Feb 1 17:57:41 2019 +0800

    独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Feb 1 15:29:27 2019 +0800

    Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date:   Fri Feb 1 10:12:44 2019 +0800

    bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 17:23:17 2019 +0800

    Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 17:23:09 2019 +0800

    bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:36:20 2019 +0800

    Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:35:33 2019 +0800

    修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 15:23:42 2019 +0800

    Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 15:22:51 2019 +0800

    优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:19:38 2019 +0800

    Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:18:06 2019 +0800

    修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 15:16:48 2019 +0800

    Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 15:15:12 2019 +0800

    互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:06:13 2019 +0800

    修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:01:58 2019 +0800

    Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 15:01:49 2019 +0800

    修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 14:34:44 2019 +0800

    保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 13:24:55 2019 +0800

    Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 13:24:36 2019 +0800

    Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 13:22:17 2019 +0800

    修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 13:18:04 2019 +0800

    去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 11:13:21 2019 +0800

    修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 10:41:53 2019 +0800

    不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 10:13:39 2019 +0800

    去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 10:11:23 2019 +0800

    Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 31 10:11:13 2019 +0800

    添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 31 09:53:55 2019 +0800

    修改样式

# Conflicts:
#	src/components/icss/PubIndeptTag.vue
#	src/components/icss/PubTagGroup.vue
#	src/components/icss/SingleSelect.vue
liucf 6 tahun lalu
induk
melakukan
a9a297fb91

+ 4 - 6
src/components/icss/AddDeptInfo.vue

@@ -4,11 +4,11 @@
         <crumbs :title="topInfo" linkTo="/admin/LT-YXSJWH-KSWH">
         </crumbs>
         <div class="contents">
-            <el-form ref="form" :model="form" :rules="rules" label-width="120" class="add-admin-form">
+            <el-form ref="form" :label-position="labelPosition" :model="form" :rules="rules" label-width="100px" class="add-admin-form">
                 <el-form-item label="科室名称:" prop="name">
                     <el-input v-model="form.name" placeholder="请输入科室名称"></el-input>
                 </el-form-item>
-                <el-form-item label="描述:" prop="remark" class="desc">
+                <el-form-item label="描述:" prop="remark">
                     <el-input type="textarea" :rows="3" placeholder="请输入科室描述" v-model="form.remark" maxlength="1024"></el-input>
                 </el-form-item>
                 </el-form-item>
@@ -39,6 +39,7 @@
       };
       return {
         id:null,
+        labelPosition:'right',
         form: {
           name: '',
           remark: '' //描述
@@ -151,10 +152,7 @@
       cursor: pointer;
     }
   }
-  .desc{
-    padding-left: 39px;
-  }
   .el-textarea{
-    width: 90%;
+    width: 97%;
   }
 </style>

+ 1 - 1
src/components/icss/BloodPressTagGroup.vue

@@ -29,7 +29,7 @@
         <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
-      <p class="poolTitle">操作</p>
+      <p class="poolTitle">操作界面:</p>
       <ul class="tagList operationPool">
             <li class = "tagItem operationItem"
                 v-for="(item) in rightTagsList2" 

+ 1 - 1
src/components/icss/DeptInfo.vue

@@ -43,7 +43,7 @@
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" @click="showDelDialog(scope.row.id)">删除</el-button>
+                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row.id)">删除</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column

+ 11 - 5
src/components/icss/NoiseTemplate.vue

@@ -155,8 +155,8 @@ export default {
           "ageBegin": this.dataPub.region8,       		 //最小年龄
           "ageEnd": this.dataPub.region9,              //最大年龄
           "textGenerate": this.form.currentOrder,      //成文顺序 默认0
-          "copyType": this.dataPub.region2 == 6 ? this.dataPub.region10 : (this.dataPub.region2 == 3 ? this.dataPub.region11 : ''),                               //是否复制
-          "showAdd": 0,                                //是否显示加号血压
+          "copyType": this.dataPub.region10,           //是否复制
+          "showAdd": this.dataPub.region11,            //是否显示加号血压
           "showInfo": 0,
           "questionDetails": [],
           "questionMappings": detailLis       //映射关系,
@@ -168,7 +168,12 @@ export default {
       this.showConfirmDialog('是否保存该标签组?', () => {
         api.saveOrUpdate(param).then((res) => {
           if (res.data.code === '0') {
-            this.warning(res.data.msg || '保存成功', 'success')
+            this.warning(res.data.msg || '保存成功', 'success','1000')
+            setTimeout(() => {
+              this.$router.push({
+                path:'/admin/LT-YXSJWH-BQZWH'
+              })
+            }, 1000);
           } else {
             this.warning(res.data.msg)
           }
@@ -185,11 +190,12 @@ export default {
         resolve();
       }).catch(() => {});
     },
-    warning(msg, type) {
+    warning(msg, type,time) {
       this.$message({
         showClose: true,
         message: msg,
-        type: type || 'warning'
+        type: type || 'warning',
+        duration:time || '3000'
       })
     },
   },

+ 11 - 5
src/components/icss/PubIndeptTag.vue

@@ -150,12 +150,18 @@
                         v-model.number="form.region8"
                         ref="valage1"
                         @input="sendData"
-                ></el-input> ~
-                <el-input
-                        v-model.number="form.region9"
-                        ref="valage2"
-                        @input="sendData"
                 ></el-input>
+            </el-form-item> ~
+            <el-form-item
+              prop="region9"
+              class="ages maxAges"
+            > 
+              <el-input
+                v-model.number="form.region9"
+                type="number"
+                ref="valage2"
+                @input="sendData"
+              ></el-input>
             </el-form-item>
         </el-form>
     </div>

+ 45 - 24
src/components/icss/PubTagGroup.vue

@@ -65,7 +65,7 @@
           @change="sendData"
         ></el-input>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="选择项之间链接:"
         prop="region5"
       >
@@ -75,7 +75,7 @@
           placeholder="请输入选择项之间链接"
           @change="sendData"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="能否当项目检索:"
         prop="region6"
@@ -125,24 +125,31 @@
         <el-input
           v-model.number="form.region8"
           ref="valage1"
+          type="number"
           @input="sendData"
-        ></el-input> ~
+        ></el-input>
+      </el-form-item> ~
+      <el-form-item
+        prop="region9"
+        class="ages maxAges"
+      > 
         <el-input
           v-model.number="form.region9"
+          type="number"
           ref="valage2"
           @input="sendData"
         ></el-input>
       </el-form-item>
-      <el-form-item label="选择子项时是否复制主项标签:" prop="region10" v-if="form.region2 == 6">
+      <el-form-item class="verticalMiddle" label="选择子项时是否复制主项标签:" prop="region10" v-if="form.region2 == 6">
         <el-select v-model="form.region10">
           <el-option label="不可以" value="1"></el-option>
           <el-option label="可以" value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否复制当前模块(是否显示加号):" prop="region11" v-if="form.region2 == 3">
+      <el-form-item label="是否显示加号:" prop="region11" v-if="form.region2 == 2 || form.region2 == 3">
         <el-select v-model="form.region11">
-          <el-option label="不可以" value="1"></el-option>
-          <el-option label="可以" value="0"></el-option>
+          <el-option label="显示" value="1"></el-option>
+          <el-option label="不显示" value="0"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -177,7 +184,7 @@ export default {
         region8: '0',          //最小年龄
         region9: '200',         //最大年龄
         region10: '0',        //是否复制主标签
-        region11: '1',       //是否复制当前模块
+        region11: '0',       //是否复制当前模块
         tagPool:[],          //标签池数据
         order:[],            //排序方式
         tipLis:[],           //提示列表
@@ -288,7 +295,7 @@ export default {
       if(this.form.region3.trim() == ''){ return }
       let param = {
         "existName": this.form.region3,
-        "tagType":this.form.region2 == 2?[1]:(this.form.region2 == 6?[1,2,3,4,10]:[]),
+        "tagType":this.form.region2.split(''),
         "type": this.form.region1
       }
       api.validateSystomName(param).then((res) => {
@@ -376,9 +383,7 @@ export default {
 </script>
 <style lang="less">
 .PubTagGroupWrapper {
-  
-}
-.groups {
+  .groups {
   background-color: #fff;
   padding: 20px;
   margin: 20px 20px -20px 20px;
@@ -401,21 +406,36 @@ export default {
   .el-input__icon {
     line-height: 30px;
   }
-  .ages .el-input {
+  .verticalMiddle .el-form-item__content {
+    position: relative;
+    top: 16px;
+  }
+  .maxAges {
+    margin-left: -125px;
+  }
+  .ages {
     display: inline-block;
-    width: auto;
-    .el-input__inner {
-      width: 40px;
-      padding: 0 5px;
+    .el-form-item__content {
+      width: auto;
     }
+    .el-input {
+      display: inline-block;
+      width: auto;
+      .el-input__inner {
+        width: 60px;
+        padding: 0 5px;
+        margin-right: 25px;
+        text-align: center;
+      }
 
-    .el-input__inner::-webkit-outer-spin-button,
-    .el-input__inner::-webkit-inner-spin-button {
-      -webkit-appearance: none;
-    }
+      .el-input__inner::-webkit-outer-spin-button,
+      .el-input__inner::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+      }
 
-    .el-input__inner[type="number"] {
-      -moz-appearance: textfield;
+      .el-input__inner[type="number"] {
+        -moz-appearance: textfield;
+      }
     }
   }
   .el-message-box__btns .el-button--default {
@@ -428,9 +448,10 @@ export default {
     position: absolute;
     left: 220px;
     min-width: 300px;
-    color: #ea7777;
+    color: #22ccc8;
     font-size: 12px;
   }
 }
+}
 </style>
 

+ 38 - 44
src/components/icss/PubTagPartDetail.vue

@@ -78,13 +78,16 @@
       <div class="partWaring">
         <ul>
           <li v-for="i in 5" :key="i">
-            <p v-for="item in poolDetailListTips[i]" class="partDetail tipsWrap ellipsis" v-show="poolDetailListTips[i].length > 0" :key="item">
-              <template v-for="section in currentTipLis">
-                <span class="tips" v-if="item == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
-              </template>
-            </p>
+            <template v-for="item in poolDetailListTips[i]" v-show="poolDetailListTips[i].length > 0">
+              <p class="partDetail tipsWrap" :key="item.type">
+                <template v-for="section in currentTipLis">
+                  <span v-if="item.type == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
+                </template>
+              </p>        
+              <p class="partDetail tipsWrap" :title="item.name" :key="item.type+'--'">{{item.name}}</p> 
+            </template>
           </li>
-        </ul>
+        </ul> 
       </div>
     </div>
     <span class="mutex">互斥项</span>
@@ -153,39 +156,30 @@ export default {
     sexType(newVal, preVal) {
       if (newVal != preVal) {
         if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-          this.poolDetailList = [[],[],[],[],[],[]]
-          this.poolDetailListTips = [[],[],[],[],[],[]]
-          this.poolDetailListIds = [[],[],[],[],[],[]]
-          this.poolDetailListAll=[]
-          this.activePart='-1'
-          this.activePartSon='-1'
-          this.selectArr = [false, false, false, false, false, false]
-          this.searchVal= ''
-          this.currentPool= []        
-          this.currentLis=[]           
-          this.notIds=[]               
-          this.multipleItem=[]
+          this.clearData()
         }
       }
     },
     sign(newVal, preVal) {
       if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-        this.poolDetailList = [[],[],[],[],[],[]]
-        this.poolDetailListTips = [[],[],[],[],[],[]]
-        this.poolDetailListIds = [[],[],[],[],[],[]]
-        this.poolDetailListAll=[]
-        this.activePart='-1'
-        this.activePartSon='-1'
-        this.selectArr = [false, false, false, false, false, false]
-        this.searchVal= ''
-        this.currentPool= []        
-        this.currentLis=[]           
-        this.notIds=[]               
-        this.multipleItem=[]
+        this.clearData()
       }
     },
     type(newVal, preVal) {
       if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+        this.clearData()
+      }
+    },
+    searchVal(newVal, preVal){
+      if(newVal.trim() == ''){
+        this.searchTagList();
+      }else if(newVal.trim() != preVal.trim()){
+        this.searchTagList();
+      }
+    }
+  },
+  methods: {
+    clearData(){
         this.poolDetailList = [[],[],[],[],[],[]]
         this.poolDetailListTips = [[],[],[],[],[],[]]
         this.poolDetailListIds = [[],[],[],[],[],[]]
@@ -198,17 +192,7 @@ export default {
         this.currentLis=[]
         this.notIds=[]               
         this.multipleItem=[]
-      }
     },
-    searchVal(newVal, preVal){
-      if(newVal.trim() == ''){
-        this.searchTagList();
-      }else if(newVal.trim() != preVal.trim()){
-        this.searchTagList();
-      }
-    }
-  },
-  methods: {
     selectTagOne(e,id,n){
       e.stopPropagation()
       this.activePartSon = n
@@ -279,9 +263,11 @@ export default {
         let tmpLis = list[i];
         if(tmpLis.length > 0){
           for(let j = 0;j < tmpLis.length;j++){
-            let tmpLi = list[i][j];
+            let tmpLi = list[i][j],objTmp={};
             if(!utils.filterArr(poolDetailListTips[i],tmpLi.controlType,2)){
-              poolDetailListTips[i].push(tmpLi.controlType)
+              objTmp.type = tmpLi.controlType
+              objTmp.name = tmpLi.name
+              poolDetailListTips[i].push(objTmp)
             }
             poolDetailListIds[i].push(tmpLi.id)
           }
@@ -401,6 +387,14 @@ export default {
             tmpArr.push(res.data.data[idStr]);
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
+                if(idx == 0 && res.data.data[idStr].questionDetailList && res.data.data[idStr].questionDetailList.length > 1){
+                  this.$message({
+                    showClose: true,
+                    message: '添加的数据有误',
+                    type: 'error'
+                  });
+                  return;
+                }
                 let ids = [];
                 this.poolDetailList[idx] = tmpArr;
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -416,7 +410,7 @@ export default {
                       this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);
                       this.searchTagList();
                       this.getPoolDetailListTips();
-                      return
+                      return;
                     }
                   }
                 }
@@ -430,7 +424,7 @@ export default {
             })
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
-                this.poolDetailList[idx] = tmpArr;
+                this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
                 this.searchTagList();
                 this.getPoolDetailListTips();

+ 6 - 5
src/components/icss/SingleSelect.vue

@@ -89,11 +89,12 @@
       },
       mounted(){
         const {options} = this.$props;
-        const arr = options.map((it)=>{
-          return {name:it.name,defaultSelect:it.defaultSelect=='1'?true:false,isBan:it.code==1?true:'',isNone:it.code==2?true:''};
-        });
-        this.rows = arr;
-        console.log(this.$props.options)
+        if(options){
+          const arr = options.map((it)=>{
+            return {name:it.name,defaultSelect:it.defaultSelect=='1'?true:false,isBan:it.code==1?true:'',isNone:it.code==2?true:''};
+          });
+          this.rows = arr;
+        }
       },
       computed:{
         showTag:function(){

+ 1 - 1
src/components/icss/SymptomTagGroup.vue

@@ -29,7 +29,7 @@
         <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
-      <p class="poolTitle">操作</p>
+      <p class="poolTitle">操作界面:</p>
       <ul class="tagList operationPool">
             <li class = "tagItem"
                 v-for="(item) in rightTagsList2" 

+ 0 - 14
src/components/icss/TagPool.vue

@@ -1,14 +0,0 @@
-<template>
-  
-</template>
-<script>
-export default {
-  data(){
-
-  }
-}
-</script>
-<style lang="less">
-
-</style>
-