Merge branch 'VERSIONS-FenJiFenLei' into VERSIONS-AnQuanJianCha

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -172,10 +172,22 @@
                 <!--实验室信息-->
                 <div class="subject-dialog-info-box">
                   <div class="subject-dialog-info-left-box">
-                    <p>责 任 单 位：{{dialogData.deptName}}</p>
-                    <p>实验室名称：{{dialogData.subjectName}} - {{dialogData.room}}</p>
-                    <p>实验室负责人：{{dialogData.adminName}}｜{{dialogData.adminPhone}}</p>
-                    <p>安全责任人：<span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{index==1?' 、':''}} {{item.safeUserName}}｜{{item.safeUserPhone}}</span></p>
+                    <div>
+                      <p>责 任 单 位：</p>
+                      <p>{{dialogData.deptName}}</p>
+                    </div>
+                    <div>
+                      <p>实验室名称：</p>
+                      <p>{{dialogData.subjectName}} - {{dialogData.room}}</p>
+                    </div>
+                    <div>
+                      <p>实验室负责人：</p>
+                      <p>{{dialogData.adminName}}｜{{dialogData.adminPhone}}</p>
+                    </div>
+                    <div>
+                      <p>安全责任人：</p>
+                      <p><span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{index==1?' 、':''}} {{item.safeUserName}}｜{{item.safeUserPhone}}</span></p>
+                    </div>
                   </div>
                   <div class="subject-dialog-info-right-box">
                     <vue-qr style="display: block;height:110px;width:110px;"
@@ -901,13 +913,26 @@
                 .subject-dialog-info-left-box{
                   flex:1;
                   padding-top:9px;
-                  p{
-                    color:#000;
-                    margin:7px 29px 11px 29px;
+                  div{
+                    display: flex;
                     height:24px;
-                    line-height:24px;
-                    font-size:18px;
-                    overflow: hidden;
+                    margin:7px 29px 11px 20px;
+                    p:nth-child(1){
+                      width:130px;
+                      text-align: right;
+                      margin-right:10px;
+                      text-align-last: justify;
+                    }
+                    p:nth-child(2){
+                      flex:1;
+                    }
+                    p{
+                      color:#000;
+                      height:24px;
+                      line-height:24px;
+                      font-size:18px;
+                      overflow: hidden;
+                    }
                   }
                 }
                 .subject-dialog-info-right-box{

src/views/serviceCenter/externalLink/addPage.vue

@@ -21,7 +21,7 @@
             </el-form-item>
             <el-form-item label="链接地址：" prop="linkUrl">
               <el-input
-                maxLength="50"
+                maxLength="100"
                 v-model="dialogForm.linkUrl"
                 placeholder="请输入链接地址"
                 clearable
@@ -49,7 +49,7 @@
             </el-form-item>
             <el-form-item label="请求地址：" prop="reqApi" v-if="dialogForm.isAuth">
               <el-input
-                maxLength="50"
+                maxLength="100"
                 v-model="dialogForm.reqApi"
                 placeholder="请输入请求地址"
                 clearable