heyang

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>
@@ -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>
@@ -367,7 +367,7 @@
           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.loading = false;
@@ -378,7 +378,7 @@
             );
           }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.loading = false;

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>