Merge remote-tracking branch 'origin/master'

hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceLedgerController.java

@@ -46,6 +46,12 @@ public class DmsBaseDeviceLedgerController extends BaseController
         List<DmsBaseDeviceLedger> list = dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger);
         return getDataTable(list);
     }
+    @GetMapping("/deviceList")
+    public AjaxResult deviceList(DmsBaseDeviceLedger dmsBaseDeviceLedger)
+    {
+        List<DmsBaseDeviceLedger> list = dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger);
+        return AjaxResult.success(list);
+    }
 
     /**
      * 查询设备台账信息下拉框列表

hw-ui/src/api/dms/ledger.js

@@ -8,6 +8,13 @@ export function listLedger(query) {
     params: query
   })
 }
+export function deviceList(query) {
+  return request({
+    url: '/dms/ledger/deviceList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询设备台账信息详细
 export function getLedger(deviceId) {

hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue

@@ -64,41 +64,41 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="primary"
+<!--          type="primary"-->
-          plain
+<!--          plain-->
-          icon="el-icon-plus"
+<!--          icon="el-icon-plus"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="handleAdd"
+<!--          @click="handleAdd"-->
-          v-hasPermi="['dms:dmsBaseAlarmRule:add']"
+<!--          v-hasPermi="['dms:dmsBaseAlarmRule:add']"-->
-        >新增
+<!--        >新增-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="success"
+<!--          type="success"-->
-          plain
+<!--          plain-->
-          icon="el-icon-edit"
+<!--          icon="el-icon-edit"-->
-          size="mini"
+<!--          size="mini"-->
-          :disabled="single"
+<!--          :disabled="single"-->
-          @click="handleUpdate"
+<!--          @click="handleUpdate"-->
-          v-hasPermi="['dms:dmsBaseAlarmRule:edit']"
+<!--          v-hasPermi="['dms:dmsBaseAlarmRule:edit']"-->
-        >修改
+<!--        >修改-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="danger"
+<!--          type="danger"-->
-          plain
+<!--          plain-->
-          icon="el-icon-delete"
+<!--          icon="el-icon-delete"-->
-          size="mini"
+<!--          size="mini"-->
-          :disabled="multiple"
+<!--          :disabled="multiple"-->
-          @click="handleDelete"
+<!--          @click="handleDelete"-->
-          v-hasPermi="['dms:dmsBaseAlarmRule:remove']"
+<!--          v-hasPermi="['dms:dmsBaseAlarmRule:remove']"-->
-        >删除
+<!--        >删除-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="warning"-->

hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue

@@ -246,7 +246,7 @@
 <script>
 import { listDmsInspectRouteDetail, getDmsInspectRouteDetail, delDmsInspectRouteDetail, addDmsInspectRouteDetail, updateDmsInspectRouteDetail } from "@/api/dms/dmsInspectRouteDetail";
 import { listDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'
-import { listLedger } from '@/api/dms/ledger'
+import { listLedger,deviceList } from '@/api/dms/ledger'
 import { addDmsRepairDetail, updateDmsRepairDetail } from '@/api/dms/dmsRepairDetail'
 import { listDmsBaseInspectStandard } from '@/api/dms/dmsBaseInspectStandard'
 
@@ -325,9 +325,9 @@ export default {
     },
     //查询设备信息
     getDevice(){
-      listLedger().then(response => {
+      deviceList().then(response => {
         // console.log(response)
-        this.ledgerList = response.rows;
+        this.ledgerList = response.data;
       })
     },
     /** 查询巡检线路信息列表 */

hw-ui/src/views/dms/maintDetail/index.vue

@@ -328,7 +328,7 @@
 
 <script>
 import { listMaintDetail, getMaintDetail, delMaintDetail, addMaintDetail, updateMaintDetail } from "@/api/dms/maintDetail";
-import { listLedger } from '@/api/dms/ledger'
+import { listLedger,deviceList } from '@/api/dms/ledger'
 import { listStation } from '@/api/dms/station'
 import { getMaint, listMaint } from '@/api/dms/maint'
 import { listStandard } from '@/api/dms/standard'
@@ -439,8 +439,9 @@ export default {
     },
     /** 查询设备台账信息列表 */
     getDeviceLedger() {
-      listLedger(this.queryParams).then(response => {
+      deviceList(this.queryParams).then(response => {
-        this.ledgerList = response.rows;
+        console.log(response.data)
+        this.ledgerList = response.data;
       });
     },
     /** 查询保养计划明细列表 */