guhongwei 5 年之前
父節點
當前提交
aa7720df55

+ 2 - 2
src/layout/login/loginMain.vue

@@ -20,7 +20,7 @@
             </el-tab-pane>
             </el-tab-pane>
             <el-tab-pane label="注册" name="second">
             <el-tab-pane label="注册" name="second">
               <el-col :span="24">
               <el-col :span="24">
-                <el-form ref="forms" :model="forms" :rules="rules" label-width="120px">
+                <el-form ref="forms" :model="forms" :rules="rules" label-width="130px">
                   <el-form-item label="用户名称" prop="name">
                   <el-form-item label="用户名称" prop="name">
                     <el-input v-model="forms.name" placeholder="请输入用户名称"></el-input>
                     <el-input v-model="forms.name" placeholder="请输入用户名称"></el-input>
                   </el-form-item>
                   </el-form-item>
@@ -30,7 +30,7 @@
                   <el-form-item label="登录密码" prop="password">
                   <el-form-item label="登录密码" prop="password">
                     <el-input v-model="forms.password" placeholder="请输入登录密码" show-password></el-input>
                     <el-input v-model="forms.password" placeholder="请输入登录密码" show-password></el-input>
                   </el-form-item>
                   </el-form-item>
-                  <el-form-item label="邀请码" prop="code">
+                  <el-form-item label="机构代码或邀请码" prop="code">
                     <el-input v-model="forms.code" placeholder="请输入邀请码"></el-input>
                     <el-input v-model="forms.code" placeholder="请输入邀请码"></el-input>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item label="用户类别" prop="role">
                   <el-form-item label="用户类别" prop="role">

+ 1 - 7
src/layout/technical/semDetail.vue

@@ -280,13 +280,7 @@ export default {
 }
 }
 .main .two .twoInfo .right .info p {
 .main .two .twoInfo .right .info p {
   font-size: 20px;
   font-size: 20px;
-  overflow: auto;
-  text-overflow: ellipsis;
-  // -webkit-line-clamp: 8;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  line-height: 33px;
+  overflow: hidden;
   height: 260px;
   height: 260px;
 }
 }
 .main .two .twoInfo .right .jubao {
 .main .two .twoInfo .right .jubao {

+ 1 - 1
src/views/service/detail/exhibition.vue

@@ -17,7 +17,7 @@
           </el-col>
           </el-col>
         </el-col>
         </el-col>
         <el-col :span="24" class="three">
         <el-col :span="24" class="three">
-          <el-button type="primary">申请办理</el-button>
+          <el-button type="primary">申请举办展会</el-button>
         </el-col>
         </el-col>
       </el-col>
       </el-col>
     </div>
     </div>

+ 2 - 0
src/views/technical/list.vue

@@ -159,9 +159,11 @@ export default {
         res = await this.query({ skip, limit, column_name: '专题研讨', ...info });
         res = await this.query({ skip, limit, column_name: '专题研讨', ...info });
         this.$set(this, `zhuantiList`, res.data);
         this.$set(this, `zhuantiList`, res.data);
       } else if (name == '专家问诊') {
       } else if (name == '专家问诊') {
+        this.pageSize = 10;
         res = await this.query({ skip, limit, column_name: '专家问诊', ...info });
         res = await this.query({ skip, limit, column_name: '专家问诊', ...info });
         this.$set(this, `exportList`, res.data);
         this.$set(this, `exportList`, res.data);
       } else if (name == '行业研究') {
       } else if (name == '行业研究') {
+        this.pageSize = 10;
         res = await this.query({ skip, limit, column_name: '行业研究', ...info });
         res = await this.query({ skip, limit, column_name: '行业研究', ...info });
         this.$set(this, `hangyeList`, res.data);
         this.$set(this, `hangyeList`, res.data);
       } else if (name == '教育培训') {
       } else if (name == '教育培训') {