Merge branch 'dev5.4.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.4.1

src/store/actions/currentIll.js

@@ -357,7 +357,7 @@ export const confirm = (state,action) =>{
      for(let i=0;i<exists.length; i++){
       tempArr.push(getLabel(exists[i].id,exists[i].questionMapping && exists[i].questionMapping.length==0?exists[i].name+'，':exists[i].name),...(exists[i].questionMapping && exists[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==1;})));
     }
-    arr.splice(ikey,0,...tempArr);
+    arr.splice(ikey,0,...formatContinueDots(tempArr));
   }
   
   let length = arr.length - length1;
@@ -368,7 +368,7 @@ export const confirm = (state,action) =>{
     for(let i=0;i<withs.length; i++){
       tempArr.push(banText,getLabel(withs[i].id,withs[i].questionMapping && withs[i].questionMapping.length==0?(withs[i].name+'，'):(withs[i].name)),...(withs[i].questionMapping&&withs[i].questionMapping.length>0?withs[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==2;}):[]));
     }
-    withsArr.splice(parseInt(ikey)+length,0,...tempArr);
+    withsArr.splice(parseInt(ikey)+length,0,...formatContinueDots(tempArr));
   }
 
   // 无 不用展开

src/utils/tools.js

@@ -1614,7 +1614,6 @@ module.exports = {
     getDomUpDown,
     setFontColorSize,
     moveEnd,
-    setFontColorSize,
     getLifeLabels,
     getValuedLabels,
     removeRepeat,