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

src/api/config.js

@@ -158,6 +158,7 @@ export default {
     'knowledgeRelation': 'api/knowledgeman/relation/getRelationInfoList', //医学术语-关系维护
     'delKnowledgeRelation': 'api/knowledgeman/relation/removeRelationInfo', //医学术语-关系维护-删除
     'getAllRelationType': 'api/knowledgeman/lexiconRelationship/getAllLexiconRelationship', //医学术语-关系维护-关系下拉
+    'searchRelationConcept': 'api/knowledgeman/concept/getAllConcept', //医学术语-关系维护-搜索
     'addRelationConcept': 'api/knowledgeman/relation/addRelationInfo', //医学术语-关系维护-添加
     'RelationUpload': 'api/knowledgeman/relation/relationInfoExcelIm', //医学术语-关系维护-导入
     'scaleContentStructure': 'api/knowledgeman/scaleContent/page',  //量表结构维护 -- 列表

src/api/icss.js

@@ -263,6 +263,9 @@ export default {
         return axios.post(urls.addRelationConcept, param)
         // return axios.post('http://192.168.3.101:5050/api/knowledgeman/relation/addRelationInfo', param)
     },
+    searchRelationConcept(param) {//关系维护-搜索
+        return axios.post(urls.searchRelationConcept, param)
+    },
     RelationUpload(param) {//关系维护-导入
         return axios.post(urls.RelationUpload, param)
     },

src/components/common/Menu.vue

@@ -12,7 +12,7 @@
                     <i class="el-icon-location"></i>
                     <span>{{item.name}}</span>
                 </template>
-                <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code">{{sub.name}}</el-menu-item>
+                <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code"><p>{{sub.name}}</p></el-menu-item>
             </el-submenu>
         </template>
     </el-menu>
@@ -41,7 +41,14 @@
 </script>
 
 <style lang="less" scoped>
-  .el-menu-vertical-demo {
+    .el-menu-item p{
+        display: table-cell;
+        vertical-align: middle;
+        white-space: normal;
+        line-height: 20px;
+        height: 50px;
+    }
+  /*.el-menu-vertical-demo {
     min-width: 300px;
-  }
+  }*/
 </style>

src/components/forgetPassword/FindPassword.vue

@@ -374,7 +374,7 @@
             } else {
               // this.$message.error('短信验证码错误');
               this.imgCodeErr = true;
-              this.SMSErrText = "短信验证码错误";
+              this.SMSErrText = res.data.msg;
               this.msgCode = "";
             }
           }).catch((err) => {

src/components/icss/AddMedicalMultRelation.vue

@@ -181,7 +181,7 @@ import api from '@api/icss.js';
         })
       },
       IteraNodeList(nodeList,  nodeListResult, type, level = 1) {
-        this.level= this.level + 1
+        this.level= level + 1
         for(let i = 0; i <nodeList.length; i++) {
           let newChild;
           if(type == '0') { //添加的时候保存所有的id列表
@@ -192,7 +192,7 @@ import api from '@api/icss.js';
           } else if(type == '2') { //移除节点的时候同时移除节点（搜索时排除的id列表）
             newChild = nodeList[i].conceptId
           }
-          if(this.level === 3) {
+          if(this.level === 4) {
             return
           }
           if(nodeList[i].nodeList &&nodeList[i].nodeList.length > 0) {

src/components/icss/AddMedicalRelation.vue

@@ -137,7 +137,7 @@
         }
         if(item.trim()){
           // this.showFlag = type;
-          api.getAllConcept(params).then((res)=>{
+          api.searchRelationConcept(params).then((res)=>{
             const result = res.data;
             if(result.code==0){
               this.searchDatas = result.data;

src/components/icss/AddPromptInfo.vue

@@ -46,6 +46,7 @@
   import api from '@api/icss.js';
   import TagPool from './PromptTagPool';
   import InfoParagraph from './InfoParagraph';
+  import config from '@api/config.js';
 
   export default {
     name: 'AddPromptInfo',
@@ -126,7 +127,7 @@
       parseData(info){
         let detail = [];
         info.details.forEach((it)=>{
-          detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position),disabled:true}));
+          detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position),content:it.content.replace('{imageUrlPrefix}',config.imgHost),disabled:true}));
         });
         return {
           id:info.id,
@@ -201,7 +202,7 @@
       },
       parsePosition(data){
         const arr = data.map((it)=>{
-          return Object.assign({},it,{position:typeof it.position=='string'?it.position:it.position.join(",")});
+          return Object.assign({},it,{position:typeof it.position=='string'?it.position:it.position.join(","),content:it.content.replace(config.imgHost,'{imageUrlPrefix}')});
         });
         return arr;
       },

src/components/icss/ChronicDiseaseAdd.vue

@@ -124,7 +124,7 @@ export default {
       for(let i = 0;i < tmpScale.length;i++){
         tmpScale[i].val = tmpScale[i].type
         tmpScale[i].order = tmpScale[i].orderNo
-        tmpScale[i].name = tmpScale[i].type == 0?'文本模块':'推送模块'
+        tmpScale[i].name = tmpScale[i].type == 1?'文本模块':'推送模块'
       }
       this.contentPool = tmpScale
     }
@@ -137,9 +137,9 @@ export default {
       if(JSON.stringify(tmpLeft) == '{}'){
         return
       }
-      if(tmpLeft.val == 1){
+      if(tmpLeft.val == 2){
         for(let i = 0;i < tmpPool.length;i++){
-          if(tmpPool[i].val == 1){
+          if(tmpPool[i].val == 2){
             // this.$message({
             //   message: '推送模块只能添加一次',
             //   type: 'warning'

src/components/icss/PubIndeptTag.vue

@@ -364,12 +364,12 @@
           region12: [
             { required: true, message: '请选择是否为查体', trigger: 'change' }
           ],
-          minNormalVal: [
-            { required: true, message: '请输入正常值范围', trigger: 'change' }
-          ],
-          maxNormalVal: [
-            { required: true, message: '请输入正常值范围', trigger: 'change' }
-          ]
+          // minNormalVal: [
+          //   { required: true, message: '请输入正常值范围', trigger: 'change' }
+          // ],
+          // maxNormalVal: [
+          //   { required: true, message: '请输入正常值范围', trigger: 'change' }
+          // ]
           
         },
         tmpSex: '通用',

src/components/register/Register.vue

@@ -26,9 +26,10 @@
 							<input type="tel" :class="[{ 'error': phoneErrText}]" name="" v-model="phone" maxlength="11" @input="handleTelInput"
                                @blur="checkPhone" placeholder="请输入手机号">
 							<span class="tips" v-show="phoneErrText">{{phoneErrText}}</span>
+              <input type="password" style="display: none"/>
 						</div>
-                        <div class="phoneBox">
-                        	<input type="password" :class="[{ 'error': pswErrText}]" name="" v-model="psw" minlength="6" maxlength="16" @blur="checkPsw" placeholder="请输入密码">
+              <div class="phoneBox">
+                <input type="password" :class="[{ 'error': pswErrText}]" name="" v-model="psw" minlength="6" maxlength="16" readonly onfocus="this.removeAttribute('readonly')" @blur="checkPsw" placeholder="请输入密码">
 							<span class="tips" v-show="pswErrText">{{pswErrText}}</span>
 						</div>
                         
@@ -385,7 +386,7 @@
           } else {
             // this.$message.error('短信验证码错误');
             this.imgCodeErr = true;
-            this.SMSErrText = "短信验证码错误";
+            this.SMSErrText = res.data.msg;
             this.msgCode = "";
           }
         }).catch((err) => {
@@ -478,7 +479,7 @@
     watch: {
       nextButton: {
         handler: function (val) {//所有数据不为空，且手机格式正确、图形验证码正确
-          if (val.phone.trim() && val.psw.trim() && val.picCode.trim() && val.msgCode.trim() && !val.imgCodeErr) {
+          if (val.phone.trim() && val.psw.trim() && val.picCode.trim() && val.msgCode.trim()) {
             this.changCor = false;
           } else {
             this.changCor = true;

src/less/common.less

@@ -7,6 +7,7 @@
 /*公共变量*/
 @disableColor: #ccc;
 @aside-width: 20%;
+@aside-min-width:270px;
 @header-height: 60px;
 @gray: #c9c9c9;
 @baseBackage: #dee2ea;
@@ -37,13 +38,14 @@
 
 .el-aside {
   background: #fff;
+  min-width: @aside-min-width;
   width: @aside-width !important;
   min-height: 220px;
   border-right: 1px @gray solid;
   height: 100%;
   .logo {
-    width: 100%;
-    min-width: 300px;
+    /*width: 100%;
+    min-width: 300px;*/
     text-align: center;
     color: #fff;
     height: @header-height;