dedsudiyu 2 years ago
parent
commit
02a9f84e1a

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/index.vue

@@ -287,13 +287,13 @@
       z-index: 1;
     }
     .switch .el-switch__label--right span{
-      margin-right:10px;
+      margin-left:10px;
     }
     .switch .el-switch__label--left {
       z-index: 1;
     }
     .switch .el-switch__label--left span{
-      margin-left: 14px;
+      margin-left: 24px;
     }
     .switch .el-switch__label.is-active {
       display: block;

+ 6 - 6
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/smartLock.vue

@@ -90,14 +90,14 @@
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能终端编号:" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="智能柜锁名称:" prop="name">
-          <el-input v-model="form.name" placeholder="最大10个字符,包含汉字、大小写字母、数字、符号" maxlength="10" style="width:360px;"/>
+          <el-input v-model="form.name" placeholder="最大10个字符,包含汉字、大小写字母、数字、符号" maxlength="10" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="实验室:" prop="subjectId">
           <el-select
-            style="width:360px;"
+            style="width:320px;"
             v-model="form.subjectId"
             filterable
             remote
@@ -116,13 +116,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="锁柜ID:" prop="lockId">
-          <el-input v-model="form.lockId" placeholder="0-253" maxlength="3" style="width:360px;" onkeyup="value=value.replace(/[^\d]/g,'')"/>
+          <el-input v-model="form.lockId" placeholder="0-253" maxlength="3" style="width:320px;" onkeyup="value=value.replace(/[^\d]/g,'')"/>
         </el-form-item>
         <el-form-item label="摄像头ip:" prop="ipAddress">
-          <el-input v-model="form.ipAddress" placeholder="请输入摄像头ip" maxlength="20" style="width:360px;"/>
+          <el-input v-model="form.ipAddress" placeholder="请输入摄像头ip" maxlength="20" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="采集器编号:" prop="relayCode">
-          <el-input v-model="form.relayCode" placeholder="请输入采集器编号" maxlength="20" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" style="width:360px;"/>
+          <el-input v-model="form.relayCode" placeholder="请输入采集器编号" maxlength="20" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" style="width:320px;"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/msdsPage.vue

@@ -32,12 +32,12 @@
         <el-table  border :data="tableList" ref="multipleTable" :row-key="getRowKeys"
                    tooltip-effect="dark" @select-all="dialogCheck" @select="dialogCheck">
           <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
-          <el-table-column label="序号" type="index" align="center"/>
+          <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="化学品名称" align="center" prop="name"/>
           <el-table-column label="编号" align="center" prop="code"/>
           <el-table-column label="创建时间" align="center" prop="createTime"/>
           <el-table-column label="创建人" align="center" prop="createBy"/>
-          <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="140" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>