Merge branch 'master-500-dev-xwx' into 'master-500-dev'

告警处理入知识库优化



See merge request !544

@@ -124,7 +124,7 @@
             <span class="title-handle-per"  v-if="!isExamine || status==0">时间：{{dateTime}}</span>
             <span class="title-handle-per"  v-if="!isExamine || status==0">时间：{{dateTime}}</span>
             <span class="title-handle-per"  v-if="status==3">时间：{{handleInfoObj.managetime}}</span>
             <span class="title-handle-per"  v-if="status==3">时间：{{handleInfoObj.managetime}}</span>
         </div>
         </div>
-        <cm-wang-editor  v-if="!isView && ( !isExamine || status==0 || (status==3  && handleInfoObj.managename==loginName))" v-model="detail" :repositoryInfo="repositoryInfo" :isDisabled="repositoryInto==1?true:false" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
+        <cm-wang-editor  v-if="!isView && ( !isExamine || status==0 || (status==3  && handleInfoObj.managename==loginName))" v-model="detail" :repositoryInfo="repositoryInfo" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
         <div class="editor_detail"  v-if="(isView || status==1) && isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
         <div class="editor_detail"  v-if="(isView || status==1) && isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
             <div v-html="handleInfoObj.pcontent"></div>
             <div v-html="handleInfoObj.pcontent"></div>
         </div>
         </div>

@@ -67,10 +67,6 @@ export default {
         let saveDetail=(val)=>{
         let saveDetail=(val)=>{
             let dynamicTagsStr=dynamicTags.value.join(',');
             let dynamicTagsStr=dynamicTags.value.join(',');
             let pcontent=detail.value;
             let pcontent=detail.value;
-            if(!repositoryInto.value){
-                pcontent='';
-                detailText.value=''
-            }
             let params={};
             let params={};
             if((val==2 || val==3 ) && !opinion.value){
             if((val==2 || val==3 ) && !opinion.value){
                 proxy.$global.showMsg("请输入审核意见", 'warning');
                 proxy.$global.showMsg("请输入审核意见", 'warning');