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

src/api/gasManage3_0/gasManage.js

@@ -630,6 +630,16 @@ export function supplierTypeList(query) {
     params: query
   })
 }
+//RFID识别器
+export function RFIDTypeList(query) {
+  return request({
+    url: '/system/dict/data/list?pageNum=1&pageSize=20&dictType=manufacturer_type',
+    method: 'get',
+    params: query
+  })
+}
+
+
 /* 识别器管理 */
 //识别器管理-新增
 export function recognizerAdd(data) {

src/views/emergencyManagement/plan/addPlan.vue

@@ -54,7 +54,7 @@
                 <el-input
                   type="number"
                   v-model="item.minMonitor"
-                  maxLength="6"
+                  oninput="if(value.length>6)value=value.slice(0,6)"
                   placeholder="请输入异常值"
                   clearable
                   size="small"
@@ -66,7 +66,7 @@
                   type="number"
                   v-model="item.maxMonitor"
                   placeholder="请输入异常值"
-                  maxLength="6"
+                  oninput="if(value.length>6)value=value.slice(0,6)"
                   clearable
                   size="small"
                   @keyup.focus.native="handleQuery"

src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -13,11 +13,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <!--<el-form-item label="学院" prop="type">-->
-        <!--<el-select v-model="queryParams.type" placeholder="请选择学院" clearable size="small">-->
-          <!--<el-option label="请选择字典生成" value="" />-->
-        <!--</el-select>-->
-      <!--</el-form-item>-->
       <el-form-item label="实验室" prop="subjectId">
         <el-select v-model="queryParams.subjectId" placeholder="请选择实验室">
           <el-option
@@ -28,11 +23,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <!--<el-form-item label="实验室" prop="type">-->
-        <!--<el-select v-model="queryParams.type" placeholder="请选择实验室" clearable size="small">-->
-          <!--<el-option label="请选择字典生成" value="" />-->
-        <!--</el-select>-->
-      <!--</el-form-item>-->
       <el-form-item label="状态" prop="senseState">
         <el-select v-model="queryParams.senseState" placeholder="请选择状态" clearable size="small">
           <el-option label="离线" value="OFFLINE" />

src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue

@@ -132,7 +132,7 @@
       </div>
     </div>
     <el-dialog :title="'已选气瓶 '+totalNum" border :visible.sync="dialogVisible">
-      <el-table border v-loading="loading" :data="form.listDetailVo">
+      <el-table border v-loading="loading" :data="form.listDetailVo" height="500">
         <el-table-column label="气体名称" align="left" prop="airName"/>
         <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>
         <el-table-column label="气瓶厂家" align="left" prop="companyName"></el-table-column>

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -5,7 +5,7 @@
       <el-form-item label="关键字" prop="name">
         <el-input
           v-model="queryParams.searchValue"
-          placeholder="识别器名称/设备编号/所属实验室"
+          placeholder="设备编号/所属实验室"
           clearable
           maxLength="30"
           size="small"
@@ -80,6 +80,11 @@
         <el-form-item label="IP地址" >
           <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
         </el-form-item>
+        <el-form-item label="供应商">
+          <el-select v-model="form.manufacturerType" placeholder="请选择" style="width:320px;">
+            <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="信道数量" >
           <el-select v-model="form.channels" placeholder="请选择信道数量">
             <el-option  label="1通道" value="1"></el-option>
@@ -127,7 +132,7 @@ import {
   recognizerDelete,
   recognizerList,
   recognizerSwitch,
-  supplierStop
+  supplierStop, RFIDTypeList
 } from '@/api/gasManage3_0/gasManage'
 
 export default {
@@ -163,7 +168,9 @@ export default {
         channels:4,//信道
         sessionIndex:0,//设备推送频率
         uniformPower:33,//设备推送频率
+        manufacturerType:'',//供应商
       },
+      materialTypeList:[],
       // 表单校验
       rules: {
         name:[
@@ -183,8 +190,18 @@ export default {
   mounted(){
     this.getList();
     this.getSubjectAddDictList();
+    this.supplierTypeList();
   },
   methods: {
+    //供应商类型
+    supplierTypeList(){
+      let _this=this;
+      RFIDTypeList().then( response => {
+        let res=response.rows;
+        _this.materialTypeList=res;
+
+      });
+    },
     //状态
     switchChange(row){
       console.log(row)
@@ -278,6 +295,7 @@ export default {
       this.form.channels=row.channels+''
       this.form.sessionIndex=row.sessionIndex+''
       this.form.uniformPower=row.uniformPower
+      this.form.manufacturerType=row.manufacturerType+''
 
 
     },

src/views/gasManage3_0/manage/useGas/useGasAdd.vue

@@ -52,7 +52,7 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="使用气体" prop="useGasId" >
-            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasId" filterable clearable  @change="useGasFun">
+            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasId" filterable clearable  @change="useGasFun" style="width: 300px">
               <el-option
                 v-for="(item,index) in useGasList"
                 :key="item.id"

src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue

@@ -133,7 +133,7 @@
       </div>
     </div>
     <el-dialog  :visible.sync="dialogVisible">
-      <el-table v-loading="loading" :data="form.listDetailVo">
+      <el-table v-loading="loading" :data="form.listDetailVo" height="500">
         <el-table-column label="气体名称" align="left" prop="airName"/>
         <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>
         <el-table-column label="气瓶厂家" align="left" prop="companyName"></el-table-column>

src/views/gasManage3_0/student/useGas/useGasAdd.vue

@@ -52,7 +52,7 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="使用气体" prop="useGasId" >
-            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasId" filterable clearable  @change="useGasFun">
+            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasId" filterable clearable  @change="useGasFun" style="width: 300px">
               <el-option
                 v-for="(item,index) in useGasList"
                 :key="item.id"

src/views/hazardManagement/hazard/addLaboratory.vue

@@ -12,7 +12,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="型号：" prop="code" style="margin-bottom:40px;">
+      <el-form-item label="编号：" prop="code" style="margin-bottom:40px;">
         <el-input
           v-model="form.code"
           maxlength="10"

src/views/safetyEducationExam/securityExam/exam/addExamPage.vue

@@ -219,6 +219,7 @@
                 v-model="form.title"
                 placeholder="请输入考试名称"
                 clearable
+                maxlength="50"
                 size="small"
               />
             </el-form-item>
@@ -230,6 +231,7 @@
                 placeholder="请输入考试描述"
                 clearable
                 size="small"
+                maxlength="50"
               />
             </el-form-item>
           </div>

src/views/safetyEducationExam/securityExam/exam_my/index.vue

@@ -42,33 +42,6 @@
           @pagination="getList"
         />
       </div>
-      <!--<div class="for-max-box" v-if="tableType==1">-->
-        <!--<div class="for-box" v-for="(item,index) in examList" :key="index">-->
-          <!--<div class="for-title-box">-->
-            <!--<div class="for-title-box-top">-->
-              <!--<p class="color_33">{{item.title}}</p>-->
-              <!--<p :class="item.level==1?'exam-level-1':(item.level==2?'exam-level-2':(item.level==3?'exam-level-3':''))">{{item.level==1?'中等':(item.level==2?'较难':(item.level==3?'难':''))}}</p>-->
-              <!--<p :class="item.scopeType==1?'border-colorA':(item.scopeType==2?'border-colorB':(item.scopeType==3?'border-colorC':(item.scopeType==4?'border-colorD':'')))">{{item.scopeType==1?'安全准入考试':item.scopeType==2?'负面清单考试':(item.scopeType==3?'黑名单考试':item.scopeType==4?'模拟考试':'')}}</p>-->
-            <!--</div>-->
-            <!--<p class="for-title-box-bottom color_99">{{item.content}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box">-->
-            <!--<p class="color_99">试卷总分：</p>-->
-            <!--<p class="color_33">{{item.totalScore}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box">-->
-            <!--<p class="color_99">及格分数：</p>-->
-            <!--<p class="color_33">{{item.qualifyScore}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box">-->
-            <!--<p class="color_99">考试时长：</p>-->
-            <!--<p class="color_33">{{item.totalTime}}分钟</p>-->
-          <!--</div>-->
-          <!--<p class="null-p"></p>-->
-          <!--<p class="for-right-button color_0183FA" @click="pageSwitch(2,item)">立即参加 <i class="el-icon-d-arrow-right color_99"></i></p>-->
-        <!--</div>-->
-        <!--<img v-if="!examList[0]" src="@/assets/ZDimages/null-data-1.png" style="display: block;width:200px;margin:100px auto;">-->
-      <!--</div>-->
       <div class="for-max-box for-max-box-one" v-if="tableType==2">
         <el-table v-loading="loading" border :data="myListExam" @selection-change="handleSelectionChange">
           <el-table-column label="考试名称" align="left" prop="title" />
@@ -278,7 +251,6 @@ export default {
     flex-direction: column;
     .pageOne{
       flex:1;
-      overflow: hidden;
       padding-bottom:20px;
       display: flex!important;
       flex-direction: column;

src/views/safetyEducationExam/securityExam/myExercise/playExercise.vue

@@ -599,7 +599,7 @@
           margin-bottom:40px;
           font-size:16px;
           line-height:20px;
-          height:20px;
+          //height:20px;
           display: flex;
           p:nth-child(1){
             background: #0E9EED;
@@ -610,6 +610,12 @@
             line-height:20px;
             font-weight:500;
             margin-right:10px;
+            width: 60px;
+            height:20px;
+            text-align: center;
+          }
+          p:nth-child(2){
+            flex: 1;
           }
         }
         .right-title-text{

src/views/secureAccess/approval_handle/addPage.vue

@@ -50,10 +50,6 @@
               <el-input type="textarea" style="width: 300px" v-model="form.applyCause" placeholder="请输入申请备注" maxlength="50" />
             </el-form-item>
           </div>
-<!--          <el-form-item label="资格有效期" prop="validTime" label-width="100px" style="margin-top:50px;">
-            <el-input-number v-model="form.validTime" :min="1" :max="60" ></el-input-number>
-          </el-form-item>-->
-
           <p class="inquire-button-one" style="width:750px;margin:200px 0 0 85px;" @click="typeClick">我已选择实验室，上传准入材料</p>
         </div>
         <!--学生-->
@@ -91,13 +87,10 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="班级" prop="grade">
-                  <el-input v-model="queryParams.grade" :disabled="gradeIs"  placeholder="班级" clearable size="small" />
+                  <el-input v-model="queryParams.grade" :disabled="gradeIs" maxlength="10"  placeholder="班级" clearable size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-<!--                <el-form-item label="导师" prop="tutorUser">
-                  <el-input v-model="queryParams.tutorUser" :disabled="queryParams.tutorUser?true:false" placeholder="导师" clearable size="small" />
-                </el-form-item>-->
                 <el-form-item label="导师" prop="tutorUserId"  class="form-item">
                   <el-select
                     :disabled="tutorUserIdIs"
@@ -122,31 +115,6 @@
             </el-row>
           </el-form>
           <div v-for="(item,index) in subjectData.listStudent" :key="index">
-<!--            <div class="item-max-box"  v-if="item.materialType==2&&item.relationType==1">
-              <div class="item-title-box">
-                <p>*</p>
-                <p>身份卡</p>
-                <p>(关联学生信息材料)：</p>
-              </div>
-              <div class="item-user-box">
-                <div>
-                  <p>姓名：</p>
-                  <p>{{subjectData.sysUser.nickName}}</p>
-                </div>
-                <div>
-                  <p>学号：</p>
-                  <p>{{subjectData.sysUser.userName}}</p>
-                </div>
-                <div>
-                  <p>学院：</p>
-                  <p>{{subjectData.sysUser.dept.deptName}}</p>
-                </div>
-                <div>
-                  <p>专业：</p>
-                  <p>{{subjectData.sysUser.major}}</p>
-                </div>
-              </div>
-            </div>-->
             <div class="item-max-box" v-if="item.materialType==2&&item.relationType==2">
               <div class="item-title-box">
                 <p>*</p>

src/views/securityCheck/checkRecord/index.vue

@@ -3,31 +3,6 @@
   <div class="app-container checkRecord">
     <div class="checkRecordPage" v-if="pageType == 1">
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true" v-show="showSearch">
-        <!--<el-form-item label="发布状态" prop="isFabu" label-width="90px">-->
-          <!--<el-select v-model="queryParams.isFabu" placeholder="请选择发布状态" clearable size="small">-->
-            <!--<el-option label="未发布" value="0" />-->
-            <!--<el-option label="已发布" value="1" />-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="整改状态" prop="zgStatus" label-width="80px">-->
-          <!--<el-select v-model="queryParams.zgStatus" placeholder="请选择整改状态" clearable size="small">-->
-            <!--<el-option label="待整改" value="0" />-->
-            <!--<el-option label="整改待确认" value="1" />-->
-            <!--<el-option label="复核未通过" value="2" />-->
-            <!--<el-option label="整改中" value="3" />-->
-            <!--<el-option label="完成" value="4" />-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="实验室" prop="laboratoryName" label-width="70px">-->
-          <!--<el-input-->
-            <!--v-model="queryParams.searchValue"-->
-            <!--placeholder="请输入实验室名称/负责人"-->
-            <!--clearable-->
-            <!--maxLength="15"-->
-            <!--size="small"-->
-            <!--@keyup.enter.native="handleQuery"-->
-          <!--/>-->
-        <!--</el-form-item>-->
         <el-form-item label="关键字" prop="searchValue" label-width="70px">
           <el-input
             style="width:230px;"
@@ -57,14 +32,6 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <!--<el-form-item style="float: right;">-->
-          <!--<el-col :span="1.5">-->
-            <!--<p class="add-button-one-90"-->
-               <!--@click="goPageInfo(4)"-->
-               <!--v-hasPermi="['laboratory:checkRecord:export']"-->
-            <!--&gt;发布</p>-->
-          <!--</el-col>-->
-        <!--</el-form-item>-->
         <el-form-item>
           <p class="inquire-button-one" @click="handleQuery">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>

src/views/securityCheck/checkRecord/unsubmittedPageList.vue

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column label="实验室负责人" align="left" prop="fzrName" width="130px" />
         <el-table-column label="负责人联系方式" align="left" prop="fzrLxfs" width="164px" />
-        <el-table-column label="保存时间" align="left" prop="createTime" width="200px" />
+        <el-table-column label="检查时间" align="left" prop="createTime" width="200px" />
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120" v-if="tableButtonType">
           <template slot-scope="scope">
             <div class="button-box" style="display: flex;margin-left:20px;">