Merge branch 'web-v2' into web-v2-pro

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -230,13 +230,13 @@ export default {
         if(!response.data.logoutTime){
           response.data.logoutTime = 120;
         }
+        this.$set(this,'form',response.data)
         if(response.data.lotControl){
           let list = response.data.lotControl.split(",");
           this.$set(this.form,'lotControl',list);
         }else{
           this.$set(this.form,'lotControl',['1','2','3','4']);
         }
-        this.$set(this,'form',response.data)
       });
     },
     //上传

src/views/safetyInfo/safetyInfoConfig.vue

@@ -84,7 +84,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="10" placeholder="请输入名称" style="width:320px;"/>
+          <el-input v-model="form.infoName" maxlength="30" 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()">
@@ -160,7 +160,7 @@ export default {
         infoClassifyId:'',
       },
       total:0,
-      tableData:[{}],
+      tableData:[],
       dateRange:[],
       pageData2:{},
       tabsList:[],