基础信息

src/api/equipment/basicInfo.js

@@ -3,7 +3,7 @@ import Qs from 'qs'
 // 查询基础信息列表
 export function listBasicInfo(query) {
   return request({
-    url: '/wbbaseinfo/queryWbBaseinfos',
+    url: '/wbbaseinfo/queryWbBaseinfoByPagination',
     method: 'get',
     params: query
   })

src/views/equipment/basicInfo.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="pn" prop="roleName">
+      <el-form-item label="pn" prop="pgx">
         <el-input
-          v-model="queryParams.roleName"
+          v-model="queryParams.pn"
           placeholder="请输入pn"
           clearable
           :maxlength="30"
@@ -12,9 +12,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="ptype" prop="roleKey">
+      <el-form-item label="ptype" prop="pgx">
         <el-input
-          v-model="queryParams.roleKey"
+          v-model="queryParams.ptype"
           placeholder="请输入ptype"
           clearable
           size="small"
@@ -22,42 +22,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="pgx" prop="flag">
-        <el-select
-          v-model="queryParams.flag"
-          placeholder="请选择pgx"
+      <el-form-item label="pgx" prop="pgx">
+        <el-input
+          v-model="queryParams.pgx"
+          placeholder="请输入ptype"
           clearable
           size="small"
           style="width: 150px"
-        >
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
-      </el-form-item>
-      <div style="float: right">
+          @keyup.enter.native="handleQuery"
+        />
         <el-form-item>
-          <el-button
-            type="primary"
-            size="small"
-            @click="handleAdd"
-          >新增</el-button>
-          <el-button
-            style="padding: 8px 7px;"
-            type="success"
-            size="small"
-            icon="el-icon-download"
-            @click="handleExport"
-          >导出</el-button>
+          <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
         </el-form-item>
-      </div>
-    </el-form>
+        <div style="float: right">
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleAdd"
+            >新增</el-button>
+            <el-button
+              style="padding: 8px 7px;"
+              type="success"
+              size="small"
+              icon="el-icon-download"
+              @click="handleExport"
+            >导出</el-button>
+          </el-form-item>
+        </div>
+      </el-form-item></el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备基本信息列表</div>
@@ -129,8 +122,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
 
@@ -144,19 +137,19 @@
           <el-input v-model.trim="form.ptype" show-word-limit :maxlength="30" placeholder="请输入ptype" />
         </el-form-item>
         <el-form-item label="pgx" prop="pgx">
-          <el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pgx"/>
+          <el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pgx" />
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入prank"/>
+          <el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入prank" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
-          <el-input-number v-model="form.pissb" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pissb"/>
+          <el-input-number v-model="form.pissb" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pissb" />
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input-number v-model="form.psm" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psm"/>
+          <el-input-number v-model="form.psm" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psm" />
         </el-form-item>
         <el-form-item label="psy" prop="psy">
-          <el-input-number v-model="form.psy" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psy"/>
+          <el-input-number v-model="form.psy" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psy" />
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
@@ -255,8 +248,8 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
         flag: undefined
@@ -309,8 +302,8 @@ export default {
       this.loading = true
       listBasicInfo(this.queryParams).then(
         response => {
-          this.basicInfoList = response.data
-          this.total = response.data.length
+          this.basicInfoList = response.rows
+          this.total = response.total
           this.loading = false
         }
       )
@@ -423,7 +416,7 @@ export default {
     },
     /** 查询按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */