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

src/api/config.js

@@ -1,5 +1,6 @@
 export default {
-  host:'http://192.168.3.100:5050',
+  host:'http://192.168.2.241:5050',
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',
@@ -143,6 +144,7 @@ export default {
     'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
     'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
+    'promptServer':'/api/icssman/file/uploadImage',    //静态知识
     /**************医学术语维护****************/
 	'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
     'delConceptInfo':'/api/knowledgeman/Knowledge/removeConceptKnowledge',   //删除术语静态知识

src/components/icss/AddIndeptLabel.vue

@@ -13,7 +13,10 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11"> <i>*</i> 标签明细：<i style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i></p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
+                <i>*</i> 标签明细：
+                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
+            </p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
                 <el-button

src/components/icss/AddPromptInfo.vue

@@ -17,7 +17,6 @@
                                :index="i"
                                :len="len"
                                :isEdit = "isEdit"
-                               @change="getPgValues"
                                @add="addParagraph"
                                @del="delParagraph" ref="subForm"></InfoParagraph>
                 <p class="line"></p>
@@ -29,7 +28,7 @@
                     </el-form-item>
                     <TagPool :pool="tagPool"
                              :type="form.tagFor"
-                             :selected="editData.selectedTags"
+                             :selected="form.selectedTags"
                              @changeActionData="changeActionData"></TagPool>
                 </el-form-item>
                 </el-form>
@@ -72,6 +71,7 @@
         len:0,
         Adscriptions:[],            //归属列表
         editData:{
+          id:'',
           tagFor:'',
           selectedTags:[],
           prags:[]
@@ -128,6 +128,7 @@
           detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position)}));
         });
         return {
+          id:info.id,
           name:info.name,
           tagFor:info.questionList[0].type+'',
           selectedTags:info.questionList,
@@ -151,10 +152,10 @@
             this.form.prags.splice(i,1);
         });
       },
-      getPgValues(i,data){
+      /*getPgValues(i,data){
         this.form.prags[i] = data;
         //console.log(data,this.form.prags);
-      },
+      },*/
       getDropList() {
         return api.getDropList().then((res) =>{
           if(res.data.code === '0') {
@@ -186,12 +187,18 @@
         }
         //通过必填验证，提交保存
        const param = {
+          id:this.editData.id||undefined,
           name:this.form.name,
-          detailVOList:Object.assign(this.form.prags),
-          mapVOList:Object.assign(this.form.selectedTags)
+          detailVOList:this.parsePosition(this.form.prags),
+          mapVOList:this.parseTagsForSubmit(this.form.selectedTags)
         };
-        //console.log(param);
-         this.showSaveDialog(param);
+        this.showSaveDialog(param);
+      },
+      parsePosition(data){
+        const arr = data.map((it)=>{
+          return Object.assign({},it,{position:typeof it.position=='string'?it.position:it.position.join(",")});
+        });
+        return arr;
       },
       parseTagsForSubmit(data){
         return data.map((it)=>{
@@ -199,7 +206,7 @@
         });
       },
       changeActionData(selectedTags){
-        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
+        this.form.selectedTags = selectedTags;
         //console.log(selectedTags)
       },
       showSaveDialog(param) {

src/components/icss/InfoParagraph.vue

@@ -1,20 +1,20 @@
 <template>
     <el-form :rules="rules" :model="data" ref="form" class="sub-form">
             <p class="line"></p>
-            <el-input v-model="data.orderNo" :value="index" type="hidden"></el-input>
-            <el-form-item label="是否属于诊断：" prop="isReason" @change="emitVal">
+            <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
+            <el-form-item label="是否属于诊断：" prop="isReason">
                 <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
                     <el-option label="否" :value="0"></el-option>
                     <el-option label="是" :value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="显示位置：" prop="position" label-width="130px">
-                <el-checkbox-group v-model="data.position" @change="emitVal" :disabled="isEdit&&index<len">
+                <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
                     <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
             <el-form-item label="标题" prop="title" label-width="130px">
-                <el-input v-model="data.title" @change="emitVal"></el-input>
+                <el-input v-model="data.title" maxlength="120"></el-input>
             </el-form-item>
             <el-form-item label="内容" prop="content" label-width="130px">
                 <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
@@ -31,6 +31,7 @@
   import 'quill/dist/quill.snow.css'
   import 'quill/dist/quill.bubble.css'
   import {quillEditor, Quill} from 'vue-quill-editor'
+  import config from '@api/config';
   import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
   Quill.register('modules/ImageExtend', ImageExtend);
   export default{
@@ -46,9 +47,9 @@
               ImageExtend: {
                 loading: true,
                 name: 'upfile',
-                action: 'http://192.168.2.236/api/icssman/file/uploadImage',
+                action: config.urls.promptServer,
                 response: (res) => {
-                  return 'http://192.168.2.236:82'+res.url;
+                  return config.imgHost+res.url;
                 }
               },
               toolbar: {
@@ -61,7 +62,10 @@
               }
             }
           },
-          form:{},
+          form:{
+            position:[],
+            orderNo:0
+          },
           positions:[],               //位置列表
           rules:{
             isReason: [
@@ -79,18 +83,10 @@
           }
         }
     },
-    watch:{
-      'data.content':{          //content改变时传值
-        handler(newVal,oldVal){
-          this.emitVal();
-        }
-      }
-    },
-    created(){
+    mounted(){
       //显示位置枚举列表
       const pos = localStorage.getItem("icssEnumsData");
       this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
-      this.form = this.data;
     },
     methods:{
       addEmit(){
@@ -99,13 +95,13 @@
       delEmit(){
         this.$emit("del",this.index);
       },
-      emitVal(){
-        let data = Object.assign({},this.data);
-        let pst=this.data.position;
+      /*emitVal(){
+        let data = this.form;
+        let pst=this.form.position;
         pst = typeof pst=='string'?pst:pst.join(',');
-        data =   Object.assign({},data,{position:this.data.position?pst:''});
+        data =   Object.assign({},data,{position:this.form.position?pst:'',orderNo:this.index,text:''});
         this.$emit("change",this.index,data);
-      }
+      }*/
     }
   }
 </script>
@@ -114,5 +110,15 @@
    .is-error .el-form-item__error{
         top:auto;
     }
-
+   /**富文本编辑器样式修改***/
+   .ql-snow .ql-picker.ql-size .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-size .ql-picker-item::before,
+   .ql-snow .ql-picker.ql-header .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-header .ql-picker-item::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-item::before,
+   .ql-snow .ql-color-picker .ql-picker-label svg,
+   .ql-snow .ql-icon-picker .ql-picker-label svg{
+       vertical-align: top;
+   }
 </style>

src/components/icss/PromptTagPool.vue

@@ -80,7 +80,7 @@
         }
       },
       selected(newVal, preVal) {
-        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {console.log(newVal)
+        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
           this.rightTagsList = newVal
         }
       },
@@ -199,11 +199,11 @@
       float: left;
     }
     .pool{
-      .el-input__inner {
+    .el-input .el-input__inner {
         width: 100%;
         border: 1px solid #c0c4cc;
         border-radius: 0;
-        height: 35px;
+        height: 42px;
         border-bottom: none;
       }
       .el-input__prefix {

src/components/icss/SingleSelect.vue

@@ -14,7 +14,7 @@
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
                     <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)||focusOn==-1">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
-                 <span v-if="type == 11" class="tip">可输入"()", 当作可输入内容的占位符</span>
+                 <span v-if="type == 11" class="tip">可输入中文全角括号"（）", 当作可输入内容的占位符</span>
                 <el-button type="danger" size="small" class="del" @click="delRow">删除</el-button>
                
             </div>