Merge branch '3.3.2-dzxxp' into 3.3.4-kdyh

src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -330,7 +330,7 @@
               style="width:320px;"
               v-model="form.cardNum"
               placeholder="请输入设备编号"
-              maxlength="30"
+              maxlength="50"
               size="small"
             />
           </el-form-item>

src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -74,7 +74,7 @@
                width="520px" append-to-body id="onDutyConfiguration-dialog-box">
       <el-form ref="form" :model="addForm" :rules="rules" label-width="100px">
         <el-form-item label="设备编号：" prop="cardNum">
-          <el-input v-model="addForm.cardNum" placeholder="请输入设备编号" maxlength="30" style="width:360px;"/>
+          <el-input v-model="addForm.cardNum" placeholder="请输入设备编号" maxlength="50" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select