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

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

@@ -131,6 +131,18 @@ export default {
         operationGuide: [
           { required: true, message: "操作指南不能为空", trigger: "blur" }
         ],
+        isStart:[
+          { required: true, message: "请选择信息牌模块", trigger: "blur" }
+        ],
+        returnTime:[
+          { required: true, message: "请输入自动返回时间", trigger: "blur" }
+        ],
+        logoutTime:[
+          { required: true, message: "请输入自动注销时间", trigger: "blur" }
+        ],
+
+
+
       },
       imgUrl:"",
       imgOpen:false,
@@ -212,10 +224,6 @@ export default {
     getLogoInfo(){
       getLogoInfo().then(response => {
         localStorage.setItem('videoCover',response.data.videoCover)
-        this.$set(this,'form',response.data)
-        if(!response.data.isStart){
-          response.data.isStart = 1;
-        }
         if(!response.data.returnTime){
           response.data.returnTime = 60;
         }
@@ -228,6 +236,7 @@ export default {
         }else{
           this.$set(this.form,'lotControl',['1','2','3','4']);
         }
+        this.$set(this,'form',response.data)
       });
     },
     //上传

src/views/safetyInfo/safetyInfoCategory/infoConfig.vue

@@ -107,16 +107,28 @@ export default {
       }
     },
     categoryShow(row){
-      let obj={
-        id:row.id,
-        isShow:row.isShow==1?2:1,
-        sort:row.sort,
+      let _this=this;
+      let num=0;
+      for(let i=0;i< this.tableData.length;i++){
+        if(this.tableData[i].isShow==1){
+          num++
+        }
       }
-      infoCategoryPut(obj).then( response => {
-        this.msgSuccess("修改成功");
-        this.open = false;
-        this.getList();
-      });
+      if(num>=8 && row.isShow==2){
+        this.msgError("信息牌启用个数不能超过8个!");
+      }else{
+        let obj={
+          id:row.id,
+          isShow:row.isShow==1?2:1,
+          sort:row.sort,
+        }
+        infoCategoryPut(obj).then( response => {
+          this.msgSuccess("修改成功");
+          this.open = false;
+          this.getList();
+        });
+      }
+
     },
     categorySort(row){
       let obj={

src/views/safetyInfo/safetyInfoConfig/safetyInfoConfig.vue

@@ -19,7 +19,7 @@
     </div>
     <div class="approval_handle-page" v-if="pageType == 1">
       <el-table border v-loading="loading" :data="tableData">
-        <el-table-column label="序号"  width="100" align="left"  type="index"/>
+        <el-table-column label="序号" align="left" prop="sort"  width="50"/>
         <el-table-column label="信息名称" align="left" prop="infoName"/>
         <el-table-column label="公共信息" align="left">
           <template slot-scope="scope">
@@ -384,10 +384,19 @@ export default {
   padding: 0 20px;
   .tab-title-l{
     flex: 1;
+    overflow-x: auto;
     .el-tabs__nav-wrap::after{
       background-color: #fff !important;
     }
   }
+  .el-tabs__nav-next{
+    font-size: 14px;
+    line-height: 40px;
+  }
+  .el-tabs__nav-prev{
+    font-size: 14px;
+    line-height: 40px;
+  }
 }
 .category-switch .el-switch__label {
   position: absolute;