Browse Source

分页bug以及机房维保下拉框问题处理

zhulizhen1111 4 years ago
parent
commit
8820d4f631

+ 1 - 0
src/views/equipment/table/eqListTable.vue

@@ -75,6 +75,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'

+ 20 - 19
src/views/equipment/table/otherTable.vue

@@ -78,6 +78,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'
@@ -103,12 +104,12 @@ export default {
             keyword: '',
             handleresults: '1',
             handledate: '',
-            handleOption: []
+            handleOption: [],
         }
     },
     props: ['major', 'smsxt', 'tabLabel'],
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     methods: {
         //序号的方法
@@ -126,8 +127,8 @@ export default {
                     // tab: this.major,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    size: this.size
-                }
+                    size: this.size,
+                },
             }
             //输入框
             getParams.data.keyword = ''
@@ -146,7 +147,7 @@ export default {
             if (this.handleresults && this.handleresults != 1) {
                 getParams.data.handleresults = this.handleresults
             }
-            queryQtsx(getParams).then(res => {
+            queryQtsx(getParams).then((res) => {
                 //console.log(res)
                 this.tableData = res.data ? res.data : []
                 this.total = res.count
@@ -157,11 +158,11 @@ export default {
             let postParams = [
                 {
                     columnName: { handleresults: 'handleresults' },
-                    params:{
-                        system:this.smsxt
+                    params: {
+                        system: this.smsxt,
                     },
-                    tableName: 'sms_qtsx' //视图名称
-                }
+                    tableName: 'sms_qtsx', //视图名称
+                },
             ]
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -185,27 +186,27 @@ export default {
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-             if(major!='土建'){
+            if (major != '土建') {
                 data.onlyMainAsset = true
             }
             this.handleOption = []
             this.handleOption.push({
                 id: '1',
-                name: '全部'
+                name: '全部',
             })
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
-                let handleresults = res.data && res.data.data && res.data.data.sms_qtsx?res.data.data.sms_qtsx.handleresults:[]
-                handleresults.forEach(el => {
+                let handleresults = res.data && res.data.data && res.data.data.sms_qtsx ? res.data.data.sms_qtsx.handleresults : []
+                handleresults.forEach((el) => {
                     this.handleOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
             })
-        }
+        },
     },
     watch: {
         smsxt(newV, oldV) {
@@ -222,13 +223,13 @@ export default {
         },
         handleresults() {
             this.getList()
-        }
+        },
     },
     mounted() {
         this.tabFind()
         //console.log(this.smsxt)
         this.getList()
-    }
+    },
 }
 </script>
 <style lang="less" scoped>

+ 4 - 2
src/views/equipment/table/rcwbTable.vue

@@ -138,6 +138,7 @@
                 background
                 layout='prev, pager, next'
                 :total='total'
+                :current-page='currentPage'
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
@@ -170,7 +171,7 @@ export default {
                 {
                     id: '2',
                     name: '全部',
-                }
+                },
             ],
             statusOption: [],
             status: '全部',
@@ -265,9 +266,10 @@ export default {
                 }
                 if (zt.length > 0) {
                     zt.forEach((el) => {
+                        console.log(el)
                         let obj = {
                             id: el.key,
-                            name: el.value == '正常' ? '正常' : '异常',
+                            name: el.value,
                         }
                         arr1.push(obj)
                     })

+ 270 - 313
src/views/equipment/table/rcwxTable.vue

@@ -1,191 +1,152 @@
 <!-- 维修-->
 <template>
-  <div class="rcwx-list">
-    <div class="eq-list-top">
-      <el-input
-        placeholder="搜索设备名称或内码"
-        size="small"
-        @keyup.enter.native="pageChanged(1)"
-        @blur="pageChanged(1)"
-        clearable
-        prefix-icon="el-icon-search"
-        v-model="sbjc"
-        style="width:192px;margin-right:12px"
-      ></el-input>
-       <el-input
-        placeholder="搜索位置名称或内码"
-        size="small"
-        @keyup.enter.native="pageChanged(1)"
-        @blur="pageChanged(1)"
-        clearable
-        prefix-icon="el-icon-search"
-        v-model="wzjc"
-        style="width:192px;margin-right:12px"
-      ></el-input>
-      <el-input
-        placeholder="搜索描述"
-        size="small"
-        clearable
-        @keyup.enter.native="pageChanged(1)"
-        @blur="pageChanged(1)"
-        prefix-icon="el-icon-search"
-        v-model="matters"
-        style="width:192px;margin-right:12px"
-      ></el-input>
-      <el-input
-        placeholder="搜索工单编号"
-        size="small"
-        clearable
-        @keyup.enter.native="pageChanged(1)"
-        @blur="pageChanged(1)"
-        prefix-icon="el-icon-search"
-        v-model="wonum2"
-        style="width:192px;margin-right:12px"
-      ></el-input>
-      <Select
-        @change="pageChanged(1)"
-        style="margin-right:12px;"
-        v-model="status"
-        width="180"
-        tipPlace="top"
-        caption="任务状态描述:"
-        :selectdata="statusOption"
-      ></Select>
-      <Select
-        @change="pageChanged(1)"
-        style="margin-right:12px;"
-        v-model="source"
-        width="180"
-        tipPlace="top"
-        caption="报修来源:"
-        :selectdata="sourceOption"
-      ></Select>
-      <el-input
-        placeholder="搜索执行人"
-        size="small"
-        clearable
-        @keyup.enter.native="pageChanged(1)"
-        @blur="pageChanged(1)"
-        prefix-icon="el-icon-search"
-        v-model="people"
-        style="width:192px;margin-right:12px"
-      ></el-input>
-      <input-dialog :type="5" @confirm="confirm"></input-dialog>
+    <div class='rcwx-list'>
+        <div class='eq-list-top'>
+            <el-input
+                placeholder='搜索设备名称或内码'
+                size='small'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
+                clearable
+                prefix-icon='el-icon-search'
+                v-model='sbjc'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='搜索位置名称或内码'
+                size='small'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
+                clearable
+                prefix-icon='el-icon-search'
+                v-model='wzjc'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='搜索描述'
+                size='small'
+                clearable
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
+                prefix-icon='el-icon-search'
+                v-model='matters'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='搜索工单编号'
+                size='small'
+                clearable
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
+                prefix-icon='el-icon-search'
+                v-model='wonum2'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <Select
+                @change='pageChanged(1)'
+                style='margin-right:12px;'
+                v-model='status'
+                width='180'
+                tipPlace='top'
+                caption='任务状态描述:'
+                :selectdata='statusOption'
+            ></Select>
+            <Select
+                @change='pageChanged(1)'
+                style='margin-right:12px;'
+                v-model='source'
+                width='180'
+                tipPlace='top'
+                caption='报修来源:'
+                :selectdata='sourceOption'
+            ></Select>
+            <el-input
+                placeholder='搜索执行人'
+                size='small'
+                clearable
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
+                prefix-icon='el-icon-search'
+                v-model='people'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <input-dialog :type='5' @confirm='confirm'></input-dialog>
+        </div>
+        <div ref='tableBox'>
+            <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='100'>
+                    <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='matters' label='位置名称' width='240' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='description' label='问题描述' show-overflow-tooltip resizable min-width='280'>
+                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='description' label='工单编号' show-overflow-tooltip resizable min-width='80'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.wonum' @click.stop='staff(row)' style='cursor:pointer;color: #0091ff;'>{{row.wonum}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='description' label='报修来源' show-overflow-tooltip resizable min-width='200'>
+                    <template slot-scope='{row}'>{{row.bxfwlymc || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='description' label='任务状态描述' show-overflow-tooltip resizable min-width='200'>
+                    <template slot-scope='{row}'>{{row.status || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='description' label='执行人' show-overflow-tooltip resizable min-width='80'>
+                    <template slot-scope='{row}'>{{row.lead || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='reportdate' label='要求完成时间' width='140'>
+                    <template slot-scope='{row}'>{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sjjssj' label='实际完工时间' width='140'>
+                    <template slot-scope='{row}'>{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='description' label='位置内码' show-overflow-tooltip resizable min-width='80'>
+                    <template slot-scope='{row}'>{{row.location || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='brand' label='报修照片' width='80'>
+                    <template slot-scope='{row}'>
+                        <div
+                            v-if='row.repair_photos_num'
+                            style='cursor:pointer;color: #0091ff;'
+                            @click.stop='clickPicRepair(row)'
+                        >{{row.repair_photos_num+'张'}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='brand' label='完工照片' width='80'>
+                    <template slot-scope='{row}'>
+                        <div
+                            v-if='row.finish_photos_num'
+                            style='cursor:pointer;color: #0091ff;'
+                            @click.stop='clickPicFinish(row)'
+                        >{{row.finish_photos_num+'张'}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total'
+                :page-size='size'
+                :current-page='currentPage'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+            <pic-large :imgUrl='imgUrl' ref='picLargeOpen'></pic-large>
+        </div>
     </div>
-    <div ref="tableBox">
-      <el-table :data="tableData" :border="true" style="width: 100%" @row-click="innerTable">
-        <el-table-column type="index" label="序号" width="60" :index="indexMethod"></el-table-column>
-        <el-table-column prop="sbmc" label="设备名称" show-overflow-tooltip resizable min-width="100">
-          <template slot-scope="{row}">{{row.sbmc || '--'}}</template>
-        </el-table-column>
-        <el-table-column prop="matters" label="位置名称" width="240" show-overflow-tooltip resizable>
-          <template slot-scope="{row}">{{row.wzjc || '--'}}</template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="问题描述"
-          show-overflow-tooltip
-          resizable
-          min-width="280"
-        >
-          <template slot-scope="{row}">{{row.description || '--'}}</template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="工单编号"
-          show-overflow-tooltip
-          resizable
-          min-width="80"
-        >
-          <template slot-scope="{row}">
-            <div
-              v-if="row.wonum"
-              @click.stop="staff(row)"
-              style="cursor:pointer;color: #0091ff;"
-            >{{row.wonum}}</div>
-            <div v-else>{{'--'}}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="报修来源"
-          show-overflow-tooltip
-          resizable
-          min-width="200"
-        >
-          <template slot-scope="{row}">{{row.bxfwlymc || '--'}}</template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="任务状态描述"
-          show-overflow-tooltip
-          resizable
-          min-width="200"
-        >
-          <template slot-scope="{row}">{{row.status || '--'}}</template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="执行人"
-          show-overflow-tooltip
-          resizable
-          min-width="80"
-        >
-          <template slot-scope="{row}">{{row.lead || '--'}}</template>
-        </el-table-column>
-        <el-table-column prop="reportdate" label="要求完成时间" width="140">
-          <template slot-scope="{row}">{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
-        </el-table-column>
-        <el-table-column prop="sjjssj" label="实际完工时间" width="140">
-          <template slot-scope="{row}">{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
-        </el-table-column>
-        <el-table-column prop="assetnum" label="设备内码" show-overflow-tooltip resizable width="80">
-          <template slot-scope="{row}">{{row.assetnum || '--'}}</template>
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          label="位置内码"
-          show-overflow-tooltip
-          resizable
-          min-width="80"
-        >
-          <template slot-scope="{row}">{{row.location || '--'}}</template>
-        </el-table-column>
-        <el-table-column prop="brand" label="报修照片" width="80">
-          <template slot-scope="{row}">
-            <div
-              v-if="row.repair_photos_num"
-              style="cursor:pointer;color: #0091ff;"
-             @click.stop='clickPicRepair(row)'
-            >{{row.repair_photos_num+'张'}}</div>
-            <div v-else>{{'--'}}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="brand" label="完工照片" width="80">
-          <template slot-scope="{row}">
-            <div
-              v-if="row.finish_photos_num"
-              style="cursor:pointer;color: #0091ff;"
-              @click.stop='clickPicFinish(row)'
-            >{{row.finish_photos_num+'张'}}</div>
-            <div v-else>{{'--'}}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="foot">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="total"
-        :page-size="size"
-        @prev-click="pageChanged"
-        @next-click="pageChanged"
-        @current-change="pageChanged"
-      ></el-pagination>
-      <pic-large :imgUrl="imgUrl" ref="picLargeOpen"></pic-large>
-    </div>
-  </div>
 </template>
 <script>
 import { queryWxzy, queryWxzyImg } from '@/api/equipmentList.js'
@@ -195,36 +156,36 @@ import { Select } from 'meri-design'
 import { querySelect } from '@/api/public.js'
 import { formatterTime, number_format } from '@/utils/format.js'
 export default {
-  components: { Select, inputDialog },
-  data() {
-    return {
-      tableData: [],
-      total: 0,
-      currentPage: 1,
-      reportdate: "",
-      sjjssj: "",
-      sbjc: "",
-      wzjc:"",
-      matters: "",
-      wonum2: "",
-      wonum: "",
-      sourceOption: [],
-      statusOption: [],
-      source: "全部",
-      formatterTime,
-      number_format,
-      imgUrl: [],
-      people: "",
-      locationName: "",
-      keyword: "",
-      status: "全部" //搜索状态描述
-    };
-  },
-  computed: {
-    ...mapGetters(["floorSelect"])
-  },
-  props: ["smsxt", "diff", "tabLabel", "size", "assetnum"],
-  methods: {
+    components: { Select, inputDialog },
+    data() {
+        return {
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            reportdate: '',
+            sjjssj: '',
+            sbjc: '',
+            wzjc: '',
+            matters: '',
+            wonum2: '',
+            wonum: '',
+            sourceOption: [],
+            statusOption: [],
+            source: '全部',
+            formatterTime,
+            number_format,
+            imgUrl: [],
+            people: '',
+            locationName: '',
+            keyword: '',
+            status: '全部', //搜索状态描述
+        }
+    },
+    computed: {
+        ...mapGetters(['floorSelect']),
+    },
+    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
+    methods: {
         //序号的方法
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
@@ -279,11 +240,10 @@ export default {
                 getParams.data.wotjyssjEndDate = this.real[1] + '000000'
             }
             if (this.source && this.source != '全部') {
-                getParams.data.bxfwlymc = this.source;
-                 getParams.data.bxfwly = this.source
-
+                getParams.data.bxfwlymc = this.source
+                getParams.data.bxfwly = this.source
             }
-             if (this.status && this.status != '全部') {
+            if (this.status && this.status != '全部') {
                 getParams.data.status = this.status
             }
             //输入框搜索
@@ -399,116 +359,113 @@ export default {
                     })
                 })
             })
-                  // 2任务状态
-      let postParams2 = [
-        {
-          columnName: { status: "status" },
-          params: {
-            smsxt: this.smsxt
-          },
-          tableName: "sms_wxzy" //视图名称
-        }
-      ];
-      querySelect({ data, postParams: postParams2 }).then(res => {
-        let bxfwlymc =
-          res.data && res.data.data && res.data.data.sms_wxzy
-            ? res.data.data.sms_wxzy.status
-            : [];
-        this.statusOption = [];
-        this.statusOption.push({
-          name: "全部",
-          id: "全部"
-        });
-        bxfwlymc.forEach(el => {
-          this.statusOption.push({
-            name: el.value,
-            id: el.key
-          });
-        });
-      });
+            // 2任务状态
+            let postParams2 = [
+                {
+                    columnName: { status: 'status' },
+                    params: {
+                        smsxt: this.smsxt,
+                    },
+                    tableName: 'sms_wxzy', //视图名称
+                },
+            ]
+            querySelect({ data, postParams: postParams2 }).then((res) => {
+                let bxfwlymc = res.data && res.data.data && res.data.data.sms_wxzy ? res.data.data.sms_wxzy.status : []
+                this.statusOption = []
+                this.statusOption.push({
+                    name: '全部',
+                    id: '全部',
+                })
+                bxfwlymc.forEach((el) => {
+                    this.statusOption.push({
+                        name: el.value,
+                        id: el.key,
+                    })
+                })
+            })
         },
-  },
-  watch: {
-    diff(newV, oldV) {
-      if (newV !== oldV) {
-        this.startMethods();
-      }
     },
-     assetnum(newV, oldV) {
+    watch: {
+        diff(newV, oldV) {
+            if (newV !== oldV) {
+                this.startMethods()
+            }
+        },
+        assetnum(newV, oldV) {
             if (newV !== oldV) {
                 // this.tabFind()
                 this.getList()
             }
         },
-    tabLabel(newV, oldV) {
-      if (newV !== oldV) {
-        this.startMethods();
-      }
-    }
-  },
-  mounted() {
-    this.startMethods();
-  }
-};
+        tabLabel(newV, oldV) {
+            if (newV !== oldV) {
+                this.startMethods()
+            }
+        },
+    },
+    mounted() {
+        this.startMethods()
+    },
+}
 </script>
 <style lang="less" scoped>
 .rcwx-list {
-  .eq-list-top {
-    display: flex;
-    margin-bottom: 12px;
-    .picker-box {
-      display: flex;
-      align-items: center;
-      background: #fff;
-      padding: 0 6px;
-      border: 1px solid #dcdfe6;
-      border-radius: 4px;
-      height: 32px;
-      box-sizing: border-box;
-      margin-right: 12px;
-      .picker-span {
-        margin-right: 6px;
-        color: rgba(0, 0, 0, 0.65);
-      }
+    .eq-list-top {
+        display: flex;
+        margin-bottom: 12px;
+        .picker-box {
+            display: flex;
+            align-items: center;
+            background: #fff;
+            padding: 0 6px;
+            border: 1px solid #dcdfe6;
+            border-radius: 4px;
+            height: 32px;
+            box-sizing: border-box;
+            margin-right: 12px;
+            .picker-span {
+                margin-right: 6px;
+                color: rgba(0, 0, 0, 0.65);
+            }
+        }
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
     }
-  }
-  td {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .foot {
-    height: 32px;
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 28px;
-  }
 }
 </style>
 <style lang="less" >
 .rcwx-list {
-  .picker-box {
-    .el-input__inner {
-      border: none;
-    }
-    .el-range-editor.el-input__inner {
-      padding: 3px 0px;
-    }
-    .el-icon-date {
-      display: none;
-    }
-    .el-range__close-icon {
-      position: absolute;
-      right: 0px;
-      top: 2px;
+    .picker-box {
+        .el-input__inner {
+            border: none;
+        }
+        .el-range-editor.el-input__inner {
+            padding: 3px 0px;
+        }
+        .el-icon-date {
+            display: none;
+        }
+        .el-range__close-icon {
+            position: absolute;
+            right: 0px;
+            top: 2px;
+        }
+        .el-range-editor--mini .el-range-input {
+            font-size: 14px;
+            color: rgb(31, 36, 41);
+        }
     }
-    .el-range-editor--mini .el-range-input {
-      font-size: 14px;
-      color: rgb(31, 36, 41);
+    /deep/.el-table td {
+        cursor: pointer;
     }
-  }
-  /deep/.el-table td {
-    cursor: pointer;
-  }
 }
 </style>

+ 4 - 3
src/views/equipment/table/standTable.vue

@@ -73,6 +73,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'
@@ -241,9 +242,9 @@ export default {
         margin-top: 28px;
     }
 }
- /deep/ .el-dialog__body {
-        padding: 0;
-    }
+/deep/ .el-dialog__body {
+    padding: 0;
+}
 @media screen and (max-width: 1600px) {
     /deep/ .el-dialog__body {
         padding: 0;

+ 2 - 1
src/views/equipment/table/wbTable.vue

@@ -126,6 +126,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'
@@ -222,7 +223,7 @@ export default {
                 },
             }
             //区分主要设备和全部设备
-            if(this.smsxt != '1008'){
+            if (this.smsxt != '1008') {
                 getParams.data.onlyMainAsset = true
             }
             if (this.diff) {

+ 1 - 0
src/views/equipment/table/wxTable.vue

@@ -126,6 +126,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'

+ 1 - 0
src/views/equipment/table/zwTable.vue

@@ -109,6 +109,7 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
+                :current-page='currentPage'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'

File diff suppressed because it is too large
+ 1224 - 1251
src/views/room/index.vue