6 年之前 · 19f3f1de0e
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -100,7 +100,7 @@ export default {
 
				     'delPromptInfo':'api/icssman/introduceInfo/deleteRecord',//删除提示信息
			
 
				     'PromptInfoDetail':'api/icssman/introduceDetail/getByIntroduceId',//提示信息详情
			
 
				     'getIcssEnumsData':'api/icssman/getIcssEnumsData',//icss枚举
			
 
				-	'similarName': 'api/icssman/retrieval/retrievalList', //别名维护
			
 
				+	  'similarName': 'api/icssman/retrieval/retrievalList', //别名维护
			
 
				     'delSimilarName': 'api/icssman/retrieval/delRetrievalsByQuesId', //别名维护-删除
			
 
				     'similarNameDetl': 'api/icssman/retrieval/getRetrievalsByTag', //别名维护-详情
			
 
				     'addSimilarName': 'api/icssman/retrieval/addTagRetrieval', //别名维护-添加、修改
			
--- a/src/api/icss.js
+++ b/src/api/icss.js
@@ -58,6 +58,7 @@ export default {
 
				     deleteTagGroup(param) {
			
 
				         return axios.post(urls.deleteTagGroup, param)
			
 
				     },
			
 
				+
			
 
				     getGroupParams(val){
			
 
				       if(val == 2){
			
 
				         return groupParams[0]
			
--- a/src/components/icss/BloodPressTagGroup.vue
+++ b/src/components/icss/BloodPressTagGroup.vue
@@ -46,7 +46,7 @@
 
				                     >
			
 
				                     </el-input>
			
 
				                 </div>
			
 
				-                <p v-if="item.tagName" class="tagName">{{item.tagName}} </p>
			
 
				+                <p v-if="item.tagName"  class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
			
 
				             </li>
			
 
				         </ul>
			
 
				     </div>
			
--- a/src/components/icss/DeptInfo.vue
+++ b/src/components/icss/DeptInfo.vue
@@ -189,12 +189,7 @@
 
				 
			
 
				 <style lang="less">
			
 
				     @import "../../less/admin.less";
			
 
				-    .status-span{
			
 
				-        font-size: 12px;
			
 
				-        margin-right:10px;
			
 
				-        color: unset;
			
 
				-    }
			
 
				     .delete{
			
 
				-        color: red
			
 
				+        color: red !important;
			
 
				     }
			
 
				 </style>
			
--- a/src/components/icss/DisclaimerInformation.vue
+++ b/src/components/icss/DisclaimerInformation.vue
@@ -216,7 +216,7 @@
 
				 <style lang="less" scoped>
			
 
				     @import "../../less/admin.less";
			
 
				     .delete{
			
 
				-        color: red !important;
			
 
				+      color: red !important;
			
 
				     }
			
 
				     .forbid{
			
 
				       color: #BFBFBF !important;
			
--- a/src/components/icss/IndeptLabel.vue
+++ b/src/components/icss/IndeptLabel.vue
@@ -1,6 +1,6 @@
 
				 <template>
			
 
				     <div>
			
 
				-        <crumbs title="独立标签维护">
			
 
				+        <crumbs title="独立标签维护" style="min-width: 980px">
			
 
				             <el-form :inline="true" class="demo-form-inline">
			
 
				                 <!--<el-form-item label="标签类型：">
			
 
				                     <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>
			
@@ -62,16 +62,26 @@
 
				                     </template>
			
 
				                 </el-table-column>
			
 
				             </el-table>
			
 
				-
			
 
				+          <el-pagination v-if="total>pageSize"
			
 
				+                        :current-page.sync="currentPage"
			
 
				+                        @current-change="currentChange"
			
 
				+                        background
			
 
				+                        :page-size="pageSize"
			
 
				+                        layout="total,prev, pager, next, jumper"
			
 
				+                        :total="total">
			
 
				+            </el-pagination>
			
 
				         </div>
			
 
				-        <el-pagination v-if="total>pageSize"
			
 
				-                       :current-page.sync="currentPage"
			
 
				-                       @current-change="currentChange"
			
 
				-                       background
			
 
				-                       :page-size="pageSize"
			
 
				-                       layout="total,prev, pager, next, jumper"
			
 
				-                       :total="total">
			
 
				-        </el-pagination>
			
 
				+        <!-- <div class="pagination"> 
			
 
				+            <el-pagination v-if="total>pageSize"
			
 
				+                        :current-page.sync="currentPage"
			
 
				+                        @current-change="currentChange"
			
 
				+                        background
			
 
				+                        :page-size="pageSize"
			
 
				+                        layout="total,prev, pager, next, jumper"
			
 
				+                        :total="total">
			
 
				+            </el-pagination>
			
 
				+        </div> -->
			
 
				+        
			
 
				     </div>
			
 
				 </template>
			
 
				 
			
@@ -224,8 +234,9 @@
 
				 
			
 
				 
			
 
				 <style lang="less">
			
 
				+  @import "../../less/admin.less";
			
 
				     .delete{
			
 
				-        color: red
			
 
				+        color: red;
			
 
				     }
			
 
				     .delete:hover {
			
 
				         color: red;
			
--- a/src/components/icss/InspactTagGroup.vue
+++ b/src/components/icss/InspactTagGroup.vue
@@ -33,7 +33,7 @@
 
				       <p class="poolTitle">操作界面：</p>
			
 
				       <ul class="tagList operationPool">
			
 
				             <li class = "tagItem"
			
 
				-                v-for="(item) in rightTagsList2" 
			
 
				+                v-for="(item) in rightTagsList" 
			
 
				                 :key='item.id'
			
 
				                 :style="getStyle2(item)?styles:null"
			
 
				                 @click='selectRightTag(item)'
			
@@ -84,7 +84,6 @@ export default {
 
				     mounted() {
			
 
				       this.$nextTick(()=>{
			
 
				         this.rightTagsList = this.options
			
 
				-        this.rightTagsList2 = this.options
			
 
				         this.$emit('changeActionData',this.options, false);
			
 
				         this.searchTagList()
			
 
				       })
			
@@ -157,37 +156,36 @@ export default {
 
				             // if(!this.searchVal) {
			
 
				             //     this.leftTagsList = this.searchTagList()
			
 
				             // }
			
 
				-            
			
 
				             for (let i = 0; i < this.selectRightTagsList.length; i++) {
			
 
				                 this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[i].id)
			
 
				             }
			
 
				-            for (let i = 0; i < this.selectRightTagsList.length; i++) {//每次往回移时同时删掉下面输入框
			
 
				-                if (this.selectRightTagsList[i].type !== 'input') {
			
 
				-                    for (let j = 0; j < this.rightTagsList2.length; j++) {
			
 
				-                        if(this.selectRightTagsList[i].id === this.rightTagsList2[j].id) {
			
 
				-                            this.rightTagsList2.splice(j, 1)
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				+            // for (let i = 0; i < this.selectRightTagsList.length; i++) {//每次往回移时同时删掉下面输入框
			
 
				+            //     if (this.selectRightTagsList[i].type !== 'input') {
			
 
				+            //         for (let j = 0; j < this.rightTagsList2.length; j++) {
			
 
				+            //             if(this.selectRightTagsList[i].id === this.rightTagsList2[j].id) {
			
 
				+            //                 this.rightTagsList2.splice(j, 1)
			
 
				+            //             }
			
 
				+            //         }
			
 
				+            //     }
			
 
				+            // }
			
 
				             this.selectLeftTagsList = []
			
 
				             this.selectRightTagsList = []
			
 
				             this.searchTagList()
			
 
				-            this.$emit('changeActionData',this.rightTagsList2, false);
			
 
				+            this.$emit('changeActionData',this.rightTagsList, false);
			
 
				         },
			
 
				         toRightList() {
			
 
				             this.rightTagsList.push(...this.selectLeftTagsList);
			
 
				             // let textItem = { text: ',' ,type:'input' }
			
 
				-            for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个加入输入框，默认为逗号
			
 
				-                this.rightTagsList2.push(this.selectLeftTagsList[i]);
			
 
				-            }
			
 
				-            
			
 
				+            // for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个加入输入框，默认为逗号
			
 
				+            //     this.rightTagsList2.push(this.selectLeftTagsList[i]);
			
 
				+            // }
			
 
				             for (let i = 0; i < this.rightTagsList.length; i++) {
			
 
				                 this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
			
 
				             }
			
 
				             this.selectLeftTagsList = []
			
 
				             this.selectRightTagsList = []
			
 
				-            this.$emit('changeActionData',this.rightTagsList2, false);
			
 
				+            this.$emit('changeActionData',this.rightTagsList, false);
			
 
				+
			
 
				         },
			
 
				         searchTagList() {
			
 
				             let notIds = []
			
@@ -322,6 +320,9 @@ export default {
 
				         top: -5px;
			
 
				         right: -5px;
			
 
				     }
			
 
				+    .pagination {
			
 
				+        min-width: 1010px;
			
 
				+    }
			
 
				     .active {
			
 
				         color: #aBcdef;
			
 
				     }
			
--- a/src/components/icss/LabelGroup.vue
+++ b/src/components/icss/LabelGroup.vue
@@ -62,16 +62,26 @@
 
				                     </template>
			
 
				                 </el-table-column>
			
 
				             </el-table>
			
 
				-
			
 
				-        </div>
			
 
				-        <el-pagination v-if="total>pageSize"
			
 
				+            <el-pagination v-if="total>pageSize"
			
 
				                        :current-page.sync="currentPage"
			
 
				                        @current-change="currentChange"
			
 
				                        background
			
 
				                        :page-size="pageSize"
			
 
				                        layout="total,prev, pager, next, jumper"
			
 
				                        :total="total">
			
 
				-        </el-pagination>
			
 
				+            </el-pagination>
			
 
				+        </div>
			
 
				+       <!--  <div class="pagination">
			
 
				+           <el-pagination v-if="total>pageSize"
			
 
				+                      :current-page.sync="currentPage"
			
 
				+                      @current-change="currentChange"
			
 
				+                      background
			
 
				+                      :page-size="pageSize"
			
 
				+                      layout="total,prev, pager, next, jumper"
			
 
				+                      :total="total">
			
 
				+           </el-pagination>
			
 
				+       </div> -->
			
 
				+        
			
 
				     </div>
			
 
				 </template>
			
 
				 
			
@@ -222,10 +232,14 @@ export default {
 
				 
			
 
				 
			
 
				 <style lang="less">
			
 
				+    @import "../../less/admin.less";
			
 
				     .delete{
			
 
				-       color: red
			
 
				+       color: red;
			
 
				     }
			
 
				     .delete:hover {
			
 
				         color: red;
			
 
				     } 
			
 
				+    .pagination {
			
 
				+        min-width: 1010px;
			
 
				+    }
			
 
				 </style>
			
--- a/src/components/icss/NoiseTemplate.vue
+++ b/src/components/icss/NoiseTemplate.vue
@@ -59,6 +59,7 @@
 
				         :type="dataPub.region1"
			
 
				         :sexType="dataPub.region7"
			
 
				         :options="editData.questionMapping"
			
 
				+        :tipLis="dataPub.tipLis"
			
 
				          @changeActionData="changeActionData"
			
 
				       >
			
 
				       </SymptomPush>
			
--- a/src/components/icss/PromptInfo.vue
+++ b/src/components/icss/PromptInfo.vue
@@ -52,7 +52,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
			
--- a/src/components/icss/PubTagGroup.vue
+++ b/src/components/icss/PubTagGroup.vue
@@ -341,7 +341,7 @@ export default {
 
				       if(this.form.region3.trim() == ''){ return }
			
 
				       let param = {
			
 
				         "existName": this.form.region3,
			
 
				-        "tagType":this.form.region2.split(''),       
			
 
				+        // "tagType":this.form.region2.split(''),       
			
 
				         "type": this.form.region1,
			
 
				         "notTagType":[8],        //去掉文字标签查重
			
 
				       }
			
--- a/src/components/icss/SimilarName.vue
+++ b/src/components/icss/SimilarName.vue
@@ -232,21 +232,16 @@
 
				   }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="less">
			
 
				+<style lang="less" scoped>
			
 
				     @import "../../less/admin.less";
			
 
				-    .status-span{
			
 
				-        font-size: 12px;
			
 
				-        margin-right:10px;
			
 
				-        color: unset;
			
 
				-    }
			
 
				     .delete{
			
 
				-        color: red
			
 
				+        color: red;
			
 
				     }
			
 
				     .el-table .cell{
			
 
				       overflow: hidden;
			
 
				       white-space: nowrap;
			
 
				     }
			
 
				     #upFile{
			
 
				-      display: none;
			
 
				+      display: none !important;
			
 
				     }
			
 
				 </style>
			
--- a/src/components/icss/SymptomPush.vue
+++ b/src/components/icss/SymptomPush.vue
@@ -29,12 +29,12 @@
 
				         <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
			
 
				         <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
			
 
				     </div>
			
 
				-    <div class="symptomPushBottomPartRight ">
			
 
				+    <div class="symptomPushBottomPartRight clearfix">
			
 
				       <p class="symptomPushPoolTitle">操作界面：</p>
			
 
				       <ul v-for="(item, index) in rightTagsList" 
			
 
				             :key="index"    
			
 
				             class="symptomPushTagList symptomPushOperationPool"
			
 
				-            :class="index === 1&&item.id ? 'symptomPushOperationPoolPush':'' "
			
 
				+            :class="{symptomPushOperationPoolPush:index === 1,  hasSymptomPush: index === 1&&item.id} "
			
 
				             :style="currentSelectIndex === index?styles:null"
			
 
				             @click="SelectList(index)"
			
 
				       >
			
@@ -45,10 +45,19 @@
 
				             <li 
			
 
				                 v-for="(it) in item.questionDetailList"
			
 
				                 :key = "it.id"
			
 
				-                class = "symptomPushTagItem">   
			
 
				+                class = "symptomPushTagItem ellipsis">   
			
 
				                 {{it.name}}
			
 
				             </li>
			
 
				         </ul>
			
 
				+        <div class="symptomPushTagListPartBox fl">
			
 
				+            <ul v-for="(item, index) in rightTagsList" 
			
 
				+                :key="index+'part'"    
			
 
				+                class="symptomPushTagListPart fl"
			
 
				+            >
			
 
				+                <p v-if="item.controlType" class="symptomPushTagListPartItem">{{getControlType(item.controlType)}} </p> 
			
 
				+                <p v-if="item.tagName" class="symptomPushTagListPartItem">{{item.tagName}} </p>  
			
 
				+            </ul>
			
 
				+        </div>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -63,6 +72,10 @@ export default {
 
				             default: () => [],
			
 
				             type: Array
			
 
				         },
			
 
				+        tipLis: {
			
 
				+            default: () => [],
			
 
				+            type: Array
			
 
				+        },
			
 
				         type: {
			
 
				             default: '',
			
 
				             type: String
			
@@ -79,9 +92,10 @@ export default {
 
				     data() {
			
 
				         return {
			
 
				             leftTagsList: [],
			
 
				-            selectLeftTagId: {},
			
 
				+            selectLeftTagId: {},    //标签池中选中标签
			
 
				             rightTagsList: [{}, {}],
			
 
				-            currentSelectIndex: -1,
			
 
				+            currentSelectIndex: -1,    //选中操作界面索引
			
 
				+            currentTipLis:[],         //右侧选中的标签提示
			
 
				             searchVal: '',
			
 
				             styles:{
			
 
				                 background:'#eae7e7'
			
@@ -89,16 +103,21 @@ export default {
 
				         }
			
 
				     },
			
 
				     mounted() {
			
 
				-        if(this.options.length) {
			
 
				-            if(this.options.length === 2) {     //当两个模块都有值时
			
 
				-                this.rightTagsList = this.options
			
 
				-                this.$emit('changeActionData',this.rightTagsList, false);
			
 
				-                
			
 
				-            } else if(this.options.length === 1) {
			
 
				-                this.options[0].controlType == 99 ? this.rightTagsList.splice(1, 1, this.options[0]) :this.rightTagsList.splice(0, 1, this.options[0])
			
 
				+        this.currentTipLis = this.tipLis
			
 
				+        this.$nextTick(()=>{ 
			
 
				+            if(this.options.length) {
			
 
				+                if(this.options.length === 2) {     //当两个模块都有值时
			
 
				+                    this.rightTagsList = this.options
			
 
				+                    this.$emit('changeActionData',this.rightTagsList, false);
			
 
				+                    
			
 
				+                } else if(this.options.length === 1) {
			
 
				+                    this.options[0].controlType == 99 ? this.rightTagsList.splice(1, 1, this.options[0]) :this.rightTagsList.splice(0, 1, this.options[0])
			
 
				+                }
			
 
				+                this.searchTagList()
			
 
				             }
			
 
				-            this.searchTagList()
			
 
				-        }
			
 
				+
			
 
				+        })
			
 
				+        
			
 
				     },
			
 
				     watch: {
			
 
				         pool(newVal, preVal) {
			
@@ -106,6 +125,12 @@ export default {
 
				                 this.leftTagsList = newVal
			
 
				             }
			
 
				         },
			
 
				+        tipLis(newVal, preVal) {
			
 
				+            console.log(newVal,preVal)
			
 
				+            if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
			
 
				+                this.currentTipLis = newVal
			
 
				+            }
			
 
				+        },
			
 
				         searchVal(newVal, preVal){
			
 
				             if(newVal.trim() == ''){
			
 
				                 this.searchTagList()
			
@@ -113,11 +138,6 @@ export default {
 
				                 this.searchTagList()
			
 
				             }
			
 
				         },
			
 
				-        sexType(newVal, preVal) {
			
 
				-           
			
 
				-        },
			
 
				-
			
 
				-        
			
 
				     },
			
 
				     methods: {
			
 
				         selectLeftTag(tag, index, e) {
			
@@ -262,6 +282,14 @@ export default {
 
				         SelectList(index) {
			
 
				             
			
 
				             this.currentSelectIndex = this.currentSelectIndex === index ? -1 : index;
			
 
				+        },
			
 
				+        getControlType(controlType) {
			
 
				+            for (let i = 0; i < this.currentTipLis.length; i++) {
			
 
				+                if(this.currentTipLis[i].val == controlType) {
			
 
				+                     return this.currentTipLis[i].name
			
 
				+                }
			
 
				+            }
			
 
				+           
			
 
				         }
			
 
				     }
			
 
				 }
			
@@ -301,6 +329,9 @@ export default {
 
				     .symptomPushOperationPoolPush {
			
 
				         border: 1px dashed @icssBorder;
			
 
				     }
			
 
				+    .hasSymptomPush {
			
 
				+        background: #abcdef;
			
 
				+    }
			
 
				     .symptomPushTagItem {
			
 
				         position: relative;
			
 
				         line-height: 30px;
			
@@ -359,6 +390,21 @@ export default {
 
				             }
			
 
				         }
			
 
				     }
			
 
				+    .symptomPushTagListPartBox {
			
 
				+        width: 100%;
			
 
				+    }
			
 
				+    .symptomPushTagListPart {
			
 
				+        width: 30%;
			
 
				+        padding: 5px;
			
 
				+    }
			
 
				+    .symptomPushTagListPartItem {
			
 
				+        display: inline-block;
			
 
				+        text-align: center;
			
 
				+        border: 1px solid #c0c4cc;
			
 
				+        padding: 2px 3px;
			
 
				+        border-radius: 5px;
			
 
				+        margin: 0 3px 3px 0;
			
 
				+    }
			
 
				     .symptomPushTagItemPushBox {
			
 
				         text-align: center
			
 
				     }
			
--- a/src/components/icss/SymptomTagGroup.vue
+++ b/src/components/icss/SymptomTagGroup.vue
@@ -46,7 +46,7 @@
 
				                     >
			
 
				                     </el-input>
			
 
				                 </div>
			
 
				-                <p v-if="item.tagName" class="tagName">{{item.tagName}} </p>
			
 
				+                <p v-if="item.tagName" class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
			
 
				                 <div class="attributeBox">
			
 
				                     <p v-if="item.symptomType === 1" class="tagAttribute" @click.stop>跟主症状 <span @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
			
 
				                     <p v-if="item.symptomType === 2" class="tagAttribute" @click.stop>跟伴随症状<span  @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
			
@@ -105,7 +105,6 @@ export default {
 
				       this.$nextTick(()=>{
			
 
				         let tagList = this.options;
			
 
				         if(tagList.length > 0){
			
 
				-          console.log(99)
			
 
				           this.rightTagsList2 = this.options
			
 
				           let newArr = []
			
 
				           for (let i = 0; i < this.rightTagsList2.length; i++) {
			
@@ -133,11 +132,6 @@ export default {
 
				     watch: {
			
 
				         pool(newVal, preVal) {
			
 
				              this.leftTagsList = newVal
			
 
				-            // console.log('sdsadasdasdasdas11111111', newVal,'asds',preVal)
			
 
				-            // if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
			
 
				-            //     console.log('sdsadasdasdasdas')
			
 
				-            //     //  this.leftTagsList = newVal
			
 
				-            // }
			
 
				         },
			
 
				         searchVal(newVal, preVal){
			
 
				             if(newVal.trim() == ''){
			
--- a/src/components/login/Login.vue
+++ b/src/components/login/Login.vue
@@ -149,7 +149,7 @@
 
				           "password": password
			
 
				         }
			
 
				         //重新登录清空原有token;
			
 
				-        //localStorage.removeItem('token');
			
 
				+        localStorage.removeItem('token');
			
 
				         this.$refs.ruleFormReg.validate((valid) => {
			
 
				           if (valid) {
			
 
				             api.loginMess(params).then((res) => {
			
--- a/src/less/admin.less
+++ b/src/less/admin.less
@@ -160,4 +160,7 @@
 
				 .el-message {
			
 
				   top: 10%;
			
 
				   transform: translateY(-50%, -50%, 0);
			
 
				+}
			
 
				+.el-pagination{
			
 
				+  min-width: 980px;
			
 
				 }