LIKANG

src/views/device/hyd_equipment/alarm.vue

@@ -102,7 +102,7 @@ export default {
   methods: {
     //获取设备类别
     getEquTotal(){
-        this.$http.get("getTotalByEquipmentType").then(response => {
+        this.$http.get("getTotalByEquipmentType",{params: {id:1}}).then(response => {
             this.list =[];
           let list =response.data;
           list.forEach((item,index,array)=>{

src/views/device/hyd_equipment/component/tableDialog.vue

@@ -1,128 +0,0 @@
-<template>
-  <el-dialog
-    title="推送记录"
-    :visible.sync="dialogVisible"
-    width="900px"
-    custom-class="view-dialog"
-    :modal-append-to-body="false"
-  >
-    
-    <el-row class="head-search">
-      <el-divider class="dialog-divider"></el-divider>
-    </el-row>
-    <el-row class="table-box">
-      <el-table
-        ref="multipleTable"
-        :data="data"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        fit
-        height="300"
-      >
-      <el-table-column prop="username" label="推送用户" align="center"/>
-      <!-- <el-table-column prop="active_rfid" label="学生卡号" align="center"/>
-      <el-table-column prop="alarm_type_name" label="告警类型" align="center"/> -->
-      <el-table-column prop="created_at" label="推送时间" align="center"/>
-      <el-table-column prop="result" label="推送结果" align="center"/>
-
-        
-      </el-table>
-      <!-- 单页隐藏分页  -->
-      <el-pagination
-        background
-        class="pagination-container"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="paginate.current"
-        :page-sizes="paginate.sizes"
-        :page-size="paginate.limit"
-        :layout="paginate.layout"
-        :total="paginate.total"
-      />
-    </el-row>
-
-    
-  </el-dialog>
-</template>
-<script>
-import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
-export default {
-  mixins: [rlListOperate],
-  props: ["detailVisible", "alarmId"],
-  components: { },
-  data() {
-    return {
-      url: "wxPushResultLog",
-      data: [],
-      queryParam: {
-        alarm_id: ""
-      },
-      
-    };
-  },
-  methods: {
-    /**
-     * 监听搜索组件中查出的数据
-     */
-    setTableData(data, queryParam, paginate) {
-      this.data = data;
-      this.queryParam = queryParam;
-      this.paginate = paginate;
-    },
-
-   
-  },
-  mounted() {
-
-
-  },
-  watch: {},
-  computed: {
-    dialogVisible: {
-      set(val) {
-        this.$emit("sendVal", val);
-      },
-      get() {
-        if (this.detailVisible) {
-          if (!this.alarmId) {
-            return;
-          }
-          this.queryParam.page = 1;
-          this.queryParam.alarm_id = this.alarmId;
-          this.getList();
-        }
-        return this.detailVisible;
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-::v-deep .el-dialog{
-  min-width: 560px;
-}
-.el-dialog__body {
-  padding: 0px !important;
-
-  /* padding-bottom: 0px!important; */
-}
-.head-search {
-  /* position: absolute; */
-  width: 100%;
-}
-
-.dialog-divider {
-  margin: 0px;
-}
-.table-box {
-  padding: 10px 20px;
-}
-.view-btn {
-  color: #20a0ff;
-  font-size: 16px;
-}
- .el-tag{
-    border:0px;
-  }
-</style>

src/views/device/hyd_equipment/index.vue

@@ -413,6 +413,7 @@ export default {
   data() {
     return {
       url: "hydEquipment",
+    
       queryParam: {
         pid:1,
         material_number: "",

src/views/device/storage_equipment/alarm.vue

@@ -103,7 +103,7 @@ export default {
   methods: {
     //获取设备类别
     getEquTotal(){
-        this.$http.get("getTotalByEquipmentType").then(response => {
+        this.$http.get("getTotalByEquipmentType",{params: {id:5}}).then(response => {
             this.list =[];
           let list =response.data;
           list.forEach((item,index,array)=>{

src/views/device/storage_equipment/formModel.vue

@@ -321,7 +321,7 @@ export default {
       this.$http.get("getHydEquipmentType",{ params: {code:'Check'} }).then(response => {
       this.formConfig.formDesc.check_status.options = response.data;
     });
-      this.$http.get("findAllByPid",{ params: {id:1} }).then(resp => {
+      this.$http.get("findAllByPid",{ params: {id:5} }).then(resp => {
         let data= resp.data;
         let ar=[];
         data.forEach((item) => {

src/views/device/storage_equipment/index.vue

@@ -413,12 +413,15 @@ export default {
   data() {
     return {
       url: "hydEquipment",
+      defaultQueryParam:{
+         pid:5
+      },
       queryParam: {
+        pid:5,
         material_number: "",
         name: "",
         number: "",
         equipment_type:'',
-       
       },
       deviceTypes:[],
       current_type: {
@@ -471,7 +474,7 @@ export default {
     };
   },
   created() {
-     this.$http.get("findAllByPid",{ params: {id:1} }).then(resp => {
+     this.$http.get("findAllByPid",{ params: {id:5} }).then(resp => {
         let data= resp.data;
         let ar=[];
         data.forEach((item) => {
@@ -654,8 +657,8 @@ export default {
       this.searchDis();
     });
     // 发请求得到checkListInitData的列的名字
-    if (localStorage.getItem("hydEquSet")) {
-      this.checkList = JSON.parse(localStorage.getItem("hydEquSet"));
+    if (localStorage.getItem("storageEquSet")) {
+      this.checkList = JSON.parse(localStorage.getItem("storageEquSet"));
     } else {
       this.checkList = {
         material_number: true,