Merge branch 'master' into web-v2

src/views/comprehensive/system/user/index.vue

@@ -84,52 +84,6 @@
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
         </el-form>
-        <!--<el-row :gutter="10" class="mb8">-->
-          <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-              <!--type="success"-->
-              <!--plain-->
-              <!--icon="el-icon-edit"-->
-              <!--size="mini"-->
-              <!--:disabled="single"-->
-              <!--@click="handleUpdate"-->
-              <!--v-hasPermiAnd="['system:user:query','system:user:edit']"-->
-            <!--&gt;修改</el-button>-->
-          <!--</el-col>-->
-          <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-              <!--type="danger"-->
-              <!--plain-->
-              <!--icon="el-icon-delete"-->
-              <!--size="mini"-->
-              <!--:disabled="multiple"-->
-              <!--@click="handleDelete"-->
-              <!--v-hasPermi="['system:user:remove']"-->
-            <!--&gt;删除</el-button>-->
-          <!--</el-col>-->
-          <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-              <!--type="info"-->
-              <!--plain-->
-              <!--icon="el-icon-upload2"-->
-              <!--size="mini"-->
-              <!--@click="handleImport"-->
-              <!--v-hasPermi="['system:user:import']"-->
-            <!--&gt;导入</el-button>-->
-          <!--</el-col>-->
-          <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-              <!--type="warning"-->
-              <!--plain-->
-              <!--icon="el-icon-download"-->
-              <!--size="mini"-->
-              <!--@click="handleExport"-->
-              <!--v-hasPermi="['system:user:export']"-->
-            <!--&gt;导出</el-button>-->
-          <!--</el-col>-->
-          <!--&lt;!&ndash;<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>&ndash;&gt;-->
-        <!--</el-row>-->
-
         <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="left" key="userId" prop="userId" v-if="columns[0].visible" />
@@ -558,6 +512,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.queryParams.searchValue='';
+      this.queryParams.status='';
       this.resetForm("queryForm");
       this.handleQuery();
     },

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

@@ -216,6 +216,7 @@ export default {
         gatewayId:[
           {required: true, message: '网关不能为空', trigger: 'blur'},
           { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" },
+          { pattern:/^(192\.168(\.(\d|([1-9]\d)|(1\d{2})|(2[0-4]\d)|(25[0-5]))){2})$/, message: "请输入正确的网关", trigger: "blur" }
         ],
         senseData:[
           {required: true, message: '检测数据不能为空', trigger: 'blur'},

src/views/gasManage3_0/manage/supplierManage/supplierManage.vue

@@ -68,20 +68,19 @@
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="180">
           <template slot-scope="scope">
-            <div  v-hasPermi="['airbottle:supplier:query']" class="button-box" style="display: inline-block;width: 90px;margin-right:20px;">
-              <p class="table-min-button"
-                 @click="handleClick('',scope.row,'detail')"
-              >查看</p>
-            </div>
-            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
-                    <span class="el-dropdown-link">
+            <div style="display: flex;height:30px;">
+              <p v-hasPermi="['airbottle:supplier:query']" class="table-min-button" @click="handleClick('',scope.row,'detail')">查看</p>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+                    <span class="table-min-button">
                       更多<i class="el-icon-d-arrow-right el-icon--right"></i>
                     </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" icon="el-icon-edit-outline" v-hasPermiAnd="['airbottle:supplier:edit']">编辑</el-dropdown-item>
-                <el-dropdown-item command="delete" icon="el-icon-delete" >删除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="edit" icon="el-icon-edit-outline" v-hasPermiAnd="['airbottle:supplier:edit']">编辑</el-dropdown-item>
+                  <el-dropdown-item command="delete" icon="el-icon-delete" >删除</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+
           </template>
         </el-table-column>
       </el-table>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue

@@ -169,7 +169,7 @@
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="540px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <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="20" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="智能柜锁名称：" prop="name">
           <el-input v-model="form.name" placeholder="最大10个字符，包含汉字、大小写字母、数字、符号" maxlength="10" style="width:360px;"/>

src/views/system/algorithm/index.vue

@@ -245,6 +245,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.status=-1;
+      this.queryParams.isAlarm='';
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/apkfile/index.vue

@@ -289,6 +289,7 @@
           onepcHardwareNum: null,
           apkUploadId: null,
           logStatus: null,
+          onepcType: null,
         },
         // 表单参数
         form: {},