云小微增加设备标识搜索条件

src/views/device/yxw/index.vue

@@ -3,18 +3,21 @@
     <!-- 搜索 -->
     <el-form inline size="mini">
       <el-form-item label="设备号：">
-        <el-input v-model="form1.dsn" placeholder="请输入设备号" clearable />
+        <el-input v-model="form.dsn" placeholder="请输入设备号" clearable />
       </el-form-item>
       <el-form-item label="设备型号：">
-        <el-input v-model="form1.clientType" placeholder="请输入设备型号" clearable />
+        <el-input v-model="form.clientType" placeholder="请输入设备型号" clearable />
+      </el-form-item>
+      <el-form-item label="设备标识：">
+        <el-input v-model="form.deviceMac" placeholder="请输入设备标识" clearable />
       </el-form-item>
       <el-form-item label="设备类型：">
-        <el-select v-model="form1.deviceType" placeholder="请选择设备类型" clearable>
+        <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable>
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="当前状态：">
-        <el-select v-model="form1.status" placeholder="请选择当前状态" clearable>
+        <el-select v-model="form.status" placeholder="请选择当前状态" clearable>
           <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -45,13 +48,13 @@
       <el-table-column prop="updateTimeStr" label="激活时间" align="center" />
       <el-table-column prop="statusStr" label="当前状态" align="center" />
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="form1.pageIndex" :limit.sync="form1.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="form.pageIndex" :limit.sync="form.pageSize"
       @pagination="getList" />
     <!-- 弹窗 -->
     <el-dialog title="新增" :visible.sync="dialogVisible" width="500px">
-      <el-form :model="form2" ref="form" label-width="100px">
+      <el-form :model="dialogForm" ref="form" label-width="100px">
         <el-form-item prop="num" label="设备数量：" :rules="[{ required: true, message: '请输入设备数量', trigger: 'blur' }]">
-          <el-input v-model="form2.num" placeholder="请输入设备数量" />
+          <el-input v-model="dialogForm.num" placeholder="请输入设备数量" />
         </el-form-item>
       </el-form>
       <div slot="footer">
@@ -83,7 +86,7 @@ export default {
         },
       ],
       // 表单
-      form1: {
+      form: {
         pageIndex: 1,
         pageSize: 10,
       },
@@ -98,19 +101,19 @@ export default {
       // 弹窗
       dialogVisible: false,
       // 新增设备数量
-      form2: {
+      dialogForm: {
         num: ""
       }
     };
   },
   watch: {
     createTime(val) {
-      this.form1.startCreateTime = val[0]
-      this.form1.endCreateTime = val[1]
+      this.form.startCreateTime = val[0]
+      this.form.endCreateTime = val[1]
     },
     updateTime(val) {
-      this.form1.startUpdateTime = val[0]
-      this.form1.endUpdateTime = val[1]
+      this.form.startUpdateTime = val[0]
+      this.form.endUpdateTime = val[1]
     },
   },
   mounted() {
@@ -119,13 +122,13 @@ export default {
   methods: {
     // 搜索
     getSearch() {
-      this.form1.pageIndex = 1;
+      this.form.pageIndex = 1;
       this.getList();
     },
 
     // 重置
     getRefresh() {
-      this.form1 = {
+      this.form = {
         pageIndex: 1,
         pageSize: 10,
       };
@@ -136,7 +139,7 @@ export default {
     // 分页
     getList() {
       this.loading = true;
-      getYxwPage(this.form1).then((res) => {
+      getYxwPage(this.form).then((res) => {
         if (res.code === 0) {
           this.tableData = res.data.records;
           this.total = res.data.total;
@@ -149,7 +152,7 @@ export default {
     getSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          getYxwAdd(this.form2).then((res) => {
+          getYxwAdd(this.dialogForm).then((res) => {
             if (res.code === 0) {
               this.$message.success("新增成功！");
               this.dialogVisible = false;
@@ -167,7 +170,7 @@ export default {
     getDownLoadNo() {
       this.download(
         `/device/yunxiaowei/exportDeviceNo`,
-        this.form1,
+        this.form,
         `云小微设备号.xlsx`
       );
     },
@@ -176,7 +179,7 @@ export default {
     getDownLoadData() {
       this.download(
         `/device/yunxiaowei/exportDeviceData`,
-        this.form1,
+        this.form,
         `云小微设备数据.xlsx`
       );
     }