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

src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -170,7 +170,7 @@
           </el-form-item>
         </el-form>
         <p :class="unifyDeploy?'add-button-one-120':'inquire-button-one'"  @click="unifyDeployFun()">{{unifyDeploy?'取消统一配置':'统一配置'}}</p>
-        <el-button class="color_ff back_one" @click="submitForm()">确定</el-button>
+        <el-button class="color_ff back_one" style="height: 42px" @click="submitForm()">确定</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -74,7 +74,7 @@
           <el-table  v-loading="loading"  border :data="tableData" height="500">
             <el-table-column label="所属单位" align="left" prop="deptName" show-overflow-tooltip/>
             <el-table-column label="姓名" align="left" prop="userName"></el-table-column>
-            <el-table-column  align="left" prop="authName"></el-table-column>
+            <el-table-column label="验证方式" align="left" prop="authName"></el-table-column>
             <el-table-column label="类别" align="left" prop="userType"  width="120px">
               <template slot-scope="scope">
                 <span  v-if="scope.row.userType==11">教职工</span>
@@ -167,8 +167,8 @@
           </el-table-column>
         </el-table>
         <pagination :page-sizes="[20, 30, 40, 50]"
-                    v-show="total>0"
-                    :total="total"
+                    v-show="total2>0"
+                    :total="total2"
                     :page.sync="dialogForm.pageNum"
                     :limit.sync="dialogForm.pageSize"
                     @pagination="getUserList"
@@ -187,7 +187,7 @@
             </el-form-item>
           </el-form>
           <p :class="unifyDeploy?'add-button-one-120':'inquire-button-one'"  @click="unifyDeployFun()">{{unifyDeploy?'取消统一配置':'统一配置'}}</p>
-          <el-button class="color_ff back_one" @click="submitForm()">确定</el-button>
+          <el-button class="color_ff back_one" style="height: 42px" @click="submitForm()">确定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -230,12 +230,14 @@
           queryParams: {
             pageNum: 1,
             pageSize:20,
-            searchValue:'',
+            searchValue:null,
+            userType:null,
             subjectId:this.subjectData.id,
             beginTime:null,
             endTime:null,
           },
           total:0,
+          total2:0,
           tableData:[],
           dateRange:[],
           dialogForm:{
@@ -321,7 +323,6 @@
         },
         //监听关联记录弹窗关闭
         handleClose(){
-          console.log('弹窗关闭');
           this.$refs.multipleTable.clearSelection();
           this.dialogForm.searchValue='';
           this.dialogForm.pageNum=1;
@@ -366,9 +367,9 @@
           this.loading = true;
           if(_this.userType==1){
             this.dialogForm.userType=22
-            listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
+            listUser(this.addDateRange(this.dialogForm)).then(response => {
                 this.dialogTable = response.rows;
-                this.total = response.total;
+                this.total2 = response.total;
                 this.loading = false;
                 this.dialogTable.forEach(function(item) {
                   item.authType='2'
@@ -377,9 +378,9 @@
             );
           }else if(_this.userType==2){
             this.dialogForm.userType=11
-            listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
+            listUser(this.addDateRange(this.dialogForm)).then(response => {
                 this.dialogTable = response.rows;
-                this.total = response.total;
+                this.total2 = response.total;
                 this.loading = false;
                 this.dialogTable.forEach(function(item) {
                   item.authType='2'
@@ -394,7 +395,6 @@
           getSignTypeList().then(response => {
             if(response.code==200){
               this.verifyWayList=response.rows
-              console.log(this.verifyWayList)
             }
           });
         },
@@ -495,17 +495,20 @@
           this.$set(this,'queryParams',{
             pageNum: 1,
             pageSize:20,
-            deptId:"",
-            name: '',
+            subjectId:this.subjectData.id,
+            searchValue: null,
+            userType:null,
+            beginTime:null,
+            endTime:null,
           });
+          this.dateRange=[];
           this.handleQuery();
         },
         handleClick(index,row,doType){
           let _this=this;
           if(doType=='delete'){//删除
             let _this=this
-            console.log(row)
-            this.$confirm('是否确认删除['+row.userName+']门禁授权?', "警告", {
+            this.$confirm('是否确认删除['+row.userName+']?', "警告", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning"
@@ -572,6 +575,13 @@
         },
         getList(){
           let _this=this;
+          if(this.dateRange){
+            this.queryParams.beginTime = this.dateRange[0];
+            this.queryParams.endTime = this.dateRange[1];
+            delete this.queryParams.dateRange
+          }else{
+            delete this.queryParams.dateRange
+          }
           getSignAuthList(_this.queryParams).then( response => {
             let res=response.rows;
             this.loading=false;

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

@@ -222,8 +222,6 @@
         this.$set(this.form,'checkCount',0)
       }
       /** 检查项信息-巡查人员*/
-      console.log('巡查人员')
-      console.log(this.subjectData)
 
       if(this.subjectData.inspectCheckIn){
         let list = this.subjectData.inspectCheckIn.split(",");
@@ -262,13 +260,11 @@
     methods:{
       //删除选中危险源
       delHazard(index){
-        console.log(index);
         this.form.hazardRelations.splice(index, 1);
         this.$forceUpdate();
       },
       //危险源选中事件
       hazardClick(e){
-        console.log("e",e);
         let self = this;
         for(let i=0;i<self.hazardList.length;i++){
           if(e == self.hazardList[i].id){
@@ -277,10 +273,8 @@
               anotherName:self.hazardList[i].anotherName,
               anotherCode:self.hazardList[i].anotherCode
             });
-            console.log("self.hazardList[i]",self.hazardList[i])
           }
         }
-        console.log("self.hazardList[i]",self.form.hazardRelations)
         this.$forceUpdate();
       },
       radioChange(){
@@ -350,13 +344,11 @@
         }
       },
       addNumOne(){
-        console.log("1")
         if(this.form.signTime<99){
           this.form.signTime++
         }
       },
       reduceNumOne(){
-        console.log("2")
         if(this.form.signTime>2){
           this.form.signTime--
         }

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

@@ -2,57 +2,6 @@
 <template>
   <div class="associationConfiguration scrollbar-box">
     <el-form ref="form" :model="form" label-width="160px" :rules="rules" >
-      <!--<div class="title-box">-->
-        <!--<p class="left-title">检查项信息</p>-->
-      <!--</div>-->
-      <!--<div>-->
-        <!--<el-form-item label="穿戴检查项"  prop="checkIn" class="form-item">-->
-          <!--<el-select v-model="form.checkIn" multiple placeholder="请选择穿戴检查项目" @change="radioChange" style="width:320px;">-->
-            <!--<el-option-->
-              <!--v-for="dict in onepcOutcheckIn"-->
-              <!--:key="dict.dictValue"-->
-              <!--:label="dict.dictLabel"-->
-              <!--:value="dict.dictValue"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="穿戴检查可跳过" prop="skipped" class="form-item">-->
-          <!--<el-radio-group v-model="form.skipped" style="width:260px;" @change="radioChange">-->
-            <!--<el-radio :label="1" style="width:100px;margin-left:50px;margin-top:4px;">是</el-radio>-->
-            <!--<el-radio :label="0" style="width:100px;margin-top:4px;">否</el-radio>-->
-          <!--</el-radio-group>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="穿戴检查识别上限"  prop="checkCount" class="form-item" v-if="form.skipped == 1 && form.checkIn[0]">-->
-          <!--<el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.checkCount" style="width:320px;">-->
-            <!--<template slot="prepend" style="height:20px;">次</template>-->
-            <!--<div slot="append" style="display: flex;flex-direction: column;">-->
-              <!--<p class="el-icon-arrow-up" @click="addNum" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>-->
-              <!--<p class="el-icon-arrow-down" @click="reduceNum" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>-->
-            <!--</div>-->
-          <!--</el-input>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
-      <!--<div>-->
-        <!--<el-form-item label="离开时检查项"  prop="checkOutArr" class="form-item">-->
-          <!--<el-select v-model="form.checkOut" multiple placeholder="请选择离开检查项"  style="width:320px;">-->
-            <!--<el-option-->
-              <!--v-for="dict in onepcOutcheck"-->
-              <!--:key="dict.dictValue"-->
-              <!--:label="dict.dictLabel"-->
-              <!--:value="dict.dictValue"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="签到有效时间"  prop="signTime" class="form-item">-->
-          <!--<el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.signTime" style="width:320px;">-->
-            <!--<template slot="prepend" style="height:20px;">小时</template>-->
-            <!--<div slot="append" style="display: flex;flex-direction: column;">-->
-              <!--<p class="el-icon-arrow-up" @click="addNumOne" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>-->
-              <!--<p class="el-icon-arrow-down" @click="reduceNumOne" style="line-height:19px;width:30px;font-size:14px;text-align: center;cursor: pointer;"></p>-->
-            <!--</div>-->
-          <!--</el-input>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
       <div class="title-box">
         <p class="left-title">危险源信息</p>
       </div>

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

@@ -135,7 +135,7 @@
           <p @click="delSign(item)"><i class="el-icon-delete"></i>删除</p>
         </div>
       </div>
-      <p class="add-for-p" @click="addData('addSign')"><i class="el-icon-plus"></i>添加信息牌</p>
+      <p class="add-for-p" @click="addData('addSign')" v-if="listXxp.length<1"><i class="el-icon-plus"></i>添加信息牌</p>
     </div>
     <el-dialog :title="title" :visible.sync="addType" v-if="addType" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
@@ -944,7 +944,6 @@ export default {
       let obj = {
         subjectId:this.subjectData.id
       };
-      console.log("obj",obj)
       listBySubjectId(obj).then(response => {
         this.$set(this,'listCgq',response.data.listCgq);
         this.$set(this,'listYtj',response.data.listYtj);

src/views/safetyInfo/safetyInfoCategory/infoConfig.vue

@@ -42,10 +42,12 @@
         <el-table-column label="" align="left" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
             <el-input
+              onkeyup="value=value.replace(/[^\d]/g,'')"
               :disabled="scope.row.isSpecial==2"
               class="serial"
               v-model="scope.row.sort"
               @change="categorySort(scope.row)"
+              maxLength="3"
               placeholder="序号">
             </el-input>
           </template>
@@ -80,9 +82,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
+        remark:'sort'
       },
       //列表数据
-      tableData:[{status:3}],
+      tableData:[],
       total:0,
 
     }

src/views/safetyInfo/safetyInfoCategory/safetyInfoCategory.vue

@@ -137,12 +137,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        searchValue:'',
-        startTime:'',
-        endTime:'',
+        searchValue:null,
+        beginTime:null,
+        endTime:null,
+        remark:'time',
       },
       total:0,
-      tableData:[{}],
+      tableData:[],
       dateRange:[],
       pageData2:{},
       // 表单参数
@@ -214,9 +215,9 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.searchValue = "";
+        this.queryParams.searchValue = null;
         this.dateRange=[];
-        this.queryParams.startTime=null;
+        this.queryParams.beginTime=null;
         this.queryParams.endTime=null
         this.handleQuery();
       },
@@ -247,10 +248,10 @@ export default {
       getList(){
         let _this=this;
         if(this.dateRange&&this.dateRange.length>0) {
-          this.queryParams.startTime=this.dateRange[0]
+          this.queryParams.beginTime=this.dateRange[0]
           this.queryParams.endTime=this.dateRange[1]
         } else {
-          this.queryParams.startTime=null;
+          this.queryParams.beginTime=null;
           this.queryParams.endTime=null
         }
         infoCategoryList(_this.queryParams).then( response => {

src/views/safetyInfo/safetyInfoConfig/safetyInfoConfig.vue

@@ -173,7 +173,6 @@ export default {
   },
   methods: {
       handleTabClick(tab){
-        console.log(tab.name)
         this.queryParams.infoClassifyId=tab.name;
         this.getList()
       },
@@ -230,7 +229,6 @@ export default {
         this.form.infoContent='';
         this.categoryList.forEach(function(item) {
           if(item.id==_this.form.infoClassifyId){
-              console.log(item)
             _this.form.infoTypeName=item.classifyType==1?'文字':'图片';
             _this.form.infoType=item.classifyType;
           }
@@ -272,7 +270,6 @@ export default {
       },
       //上传
       handleAvatarSuccess(res, file) {
-        console.log(res.data.url);
         this.form.infoContent = res.data.url;
         this.$forceUpdate()
       },
@@ -298,6 +295,8 @@ export default {
         let obj={
           pageNum: 1,
           pageSize:100,
+          isShow:1,
+          remark:'sort',
         }
         infoCategoryList(obj).then( response => {
           let res=response.rows;