Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/views/safetyInfo/safetyInfoCategory.vue

@@ -105,7 +105,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="closeDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="类目名称" prop="classifyName">
-          <el-input v-model="form.classifyName" maxlength="10" placeholder="请输入类目名称" />
+          <el-input v-model="form.classifyName" maxlength="30" placeholder="请输入类目名称" />
         </el-form-item>
         <el-form-item label="内容类型" prop="classifyType">
           <el-radio-group v-model="form.classifyType">

src/views/safetyInfo/safetyInfoConfig.vue

@@ -95,7 +95,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="closeDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
         <el-form-item label="信息名称" prop="infoName">
-          <el-input v-model="form.infoName" maxlength="30" placeholder="请输入名称" style="width:320px;"/>
+          <el-input v-model="form.infoName" maxlength="100" placeholder="请输入名称" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="信息类目"  prop="infoClassifyId" class="form-item">
           <el-select placeholder="请选择类目" v-model="form.infoClassifyId" style="width:320px;" @change="categoryClick()">