update

src/views/equipment/table/djspTable.vue

@@ -79,10 +79,6 @@ export default {
                 }
             }
         },
-        pageChanged(page) {
-            this.currentPage = page
-            this.getList()
-        },
         getList() {
             let getParams = {
                 orderBy: `floor,0;welldesm,1;meterbox,1;`,

src/views/equipment/table/eqListTable.vue

@@ -5,8 +5,8 @@
             <el-input
                 placeholder='搜索设备名称'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -15,16 +15,16 @@
             <el-input
                 placeholder='搜索品牌型号'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
             <Select
-                @change='getList'
-                @cancel='getList'
+                @change='pageChanged(1)'
+                @cancel='pageChanged(1)'
                 v-model='floor'
                 style='margin-right:12px;'
                 width='160'
@@ -36,8 +36,8 @@
                 placeholder='搜索生产厂商'
                 clearable
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='manufacturer'
                 style='width:192px;'

src/views/equipment/table/otherTable.vue

@@ -9,8 +9,8 @@
                 prefix-icon='el-icon-search'
                 v-model='keyword'
                 clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
             ></el-input>
 
             <div class='picker-box'>
@@ -20,7 +20,7 @@
                     v-model='handledate'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='pageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -34,7 +34,7 @@
                 v-model='handleresults'
                 :selectdata='handleOption'
                 :placeholder='"请选择"'
-                @change='getList'
+                @change='pageChanged(1)'
             ></Select>
         </div>
         <div ref='tableBox'>

src/views/equipment/table/rcwbTable.vue

@@ -170,15 +170,7 @@ export default {
                 {
                     id: '2',
                     name: '全部',
-                },
-                {
-                    id: '1',
-                    name: '是',
-                },
-                {
-                    id: ' 0',
-                    name: '否',
-                },
+                }
             ],
             statusOption: [],
             status: '全部',
@@ -250,7 +242,7 @@ export default {
             let data = {
                 plazaId: this.plazaId,
             }
-            if(this.smsxt!='1008'){
+            if (this.smsxt != '1008') {
                 data.onlyMainAsset = true
             }
             querySelect({ data, postParams }).then((res) => {
@@ -275,7 +267,7 @@ export default {
                     zt.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value == '正常' ? '是' : '否',
+                            name: el.value == '正常' ? '正常' : '异常',
                         }
                         arr1.push(obj)
                     })
@@ -292,7 +284,7 @@ export default {
                 orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
             }
             //区分主要设备和全部设备
-            if(this.smsxt != '1008'){
+            if (this.smsxt != '1008') {
                 data.onlyMainAsset = true
             }
             if (this.assetnum) {

src/views/equipment/table/rcwxTable.vue

@@ -5,8 +5,8 @@
       <el-input
         placeholder="搜索设备名称或内码"
         size="small"
-        @keyup.enter.native="getList"
-        @blur="getList"
+        @keyup.enter.native="pageChanged(1)"
+        @blur="pageChanged(1)"
         clearable
         prefix-icon="el-icon-search"
         v-model="sbjc"
@@ -15,8 +15,8 @@
        <el-input
         placeholder="搜索位置名称或内码"
         size="small"
-        @keyup.enter.native="getList"
-        @blur="getList"
+        @keyup.enter.native="pageChanged(1)"
+        @blur="pageChanged(1)"
         clearable
         prefix-icon="el-icon-search"
         v-model="wzjc"
@@ -26,8 +26,8 @@
         placeholder="搜索描述"
         size="small"
         clearable
-        @keyup.enter.native="getList"
-        @blur="getList"
+        @keyup.enter.native="pageChanged(1)"
+        @blur="pageChanged(1)"
         prefix-icon="el-icon-search"
         v-model="matters"
         style="width:192px;margin-right:12px"
@@ -36,14 +36,14 @@
         placeholder="搜索工单编号"
         size="small"
         clearable
-        @keyup.enter.native="getList"
-        @blur="getList"
+        @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="getList"
+        @change="pageChanged(1)"
         style="margin-right:12px;"
         v-model="status"
         width="180"
@@ -52,7 +52,7 @@
         :selectdata="statusOption"
       ></Select>
       <Select
-        @change="getList"
+        @change="pageChanged(1)"
         style="margin-right:12px;"
         v-model="source"
         width="180"
@@ -64,8 +64,8 @@
         placeholder="搜索执行人"
         size="small"
         clearable
-        @keyup.enter.native="getList"
-        @blur="getList"
+        @keyup.enter.native="pageChanged(1)"
+        @blur="pageChanged(1)"
         prefix-icon="el-icon-search"
         v-model="people"
         style="width:192px;margin-right:12px"
@@ -246,7 +246,7 @@ export default {
             this.reportdate = reportdate
             this.sjjssj = real
             this.locationName = locationName
-            this.getList()
+            this.pageChanged(1)
         },
         pageChanged(page) {
             this.currentPage = page

src/views/equipment/table/standTable.vue

@@ -5,8 +5,8 @@
             <el-input
                 placeholder='搜索设备名称'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -16,15 +16,15 @@
                 placeholder='搜索品牌型号'
                 size='small'
                 clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
             <Select
-                @change='getList'
-                @cancel='getList'
+                @change='pageChanged(1)'
+                @cancel='pageChanged(1)'
                 v-model='floor'
                 style='margin-right:12px;'
                 width='160'
@@ -36,8 +36,8 @@
                 clearable
                 placeholder='搜索生产厂商'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='manufacturer'
                 style='width:192px;'
@@ -87,11 +87,9 @@
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import EqDetail from './eqDetaileDialog'
-
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
 import store from '../../../store/index'
-
 export default {
     data() {
         return {

src/views/equipment/table/wbTable.vue

@@ -5,8 +5,8 @@
             <el-input
                 placeholder='搜索设备名称编号'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -15,15 +15,15 @@
             <el-input
                 placeholder='搜索事项类型事项描述'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='matters'
                 style='width:192px;margin-right:12px'
             ></el-input>
             <Select
-                @change='getList'
+                @change='pageChanged(1)'
                 v-model='ischange'
                 style='margin-right:12px'
                 width='220'
@@ -39,7 +39,7 @@
                     v-model='reportdate'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='pageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -55,7 +55,7 @@
                     v-model='sjjssj'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='pageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -206,7 +206,7 @@ export default {
         //多余输入框监听
         confirm(gzglid) {
             this.gzglid = gzglid
-            this.getList()
+            this.pageChanged(1)
         },
         pageChanged(page) {
             this.currentPage = page

src/views/equipment/table/wxTable.vue

@@ -5,8 +5,8 @@
             <el-input
                 placeholder='搜索设备名称编号'
                 size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
@@ -16,14 +16,14 @@
                 placeholder='搜索事项类型事项描述'
                 size='small'
                 clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
                 prefix-icon='el-icon-search'
                 v-model='matters'
                 style='width:192px;margin-right:12px'
             ></el-input>
             <Select
-                @change='getList'
+                @change='pageChanged(1)'
                 style='margin-right:12px;'
                 v-model='ischange'
                 width='220'
@@ -39,7 +39,7 @@
                     v-model='reportdate'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='getLpageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -55,7 +55,7 @@
                     v-model='sjjssj'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='pageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -196,7 +196,7 @@ export default {
         //多余输入框监听
         confirm(wonum) {
             this.wonum = wonum
-            this.getList()
+            this.pageChanged(1)
         },
         pageChanged(page) {
             this.currentPage = page

src/views/equipment/table/zwTable.vue

@@ -8,10 +8,10 @@
                 v-model='nd'
                 type='year'
                 placeholder='请选择年度'
-                @change='getList'
+                @change='pageChanged(1)'
                 style='width:180px;margin-right:12px'
             ></el-date-picker>
-            <Select width='160' tipPlace='top' v-model='lb' caption='类别：' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='160' tipPlace='top' v-model='lb' caption='类别：' :selectdata='lbOption' :placeholder='"请选择"' @change='pageChanged(1)'></Select>
             <Select
                 width='160'
                 tipPlace='top'
@@ -20,7 +20,7 @@
                 :selectdata='xmOption'
                 :placeholder='"请选择"'
                 style='margin:0 12px'
-                @change='getList'
+                @change='pageChanged(1)'
             ></Select>
             <el-input
                 placeholder='搜索实施方案说明'
@@ -29,8 +29,8 @@
                 style='width:192px'
                 v-model='ssfasm'
                 clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
+                @keyup.enter.native='pageChanged(1)'
+                @blur='pageChanged(1)'
             ></el-input>
             <!-- 当前阶段 -->
             <Select
@@ -42,7 +42,7 @@
                 :placeholder='"请选择"'
                 :selectdata='sxjdOption'
                 style='margin:0 12px'
-                @change='getList'
+                @change='getLpageChanged(1)'
             ></Select>
             <!-- placeholder='选择立项时间' -->
             <div class='picker-box'>
@@ -52,7 +52,7 @@
                     v-model='lxsjwcsj'
                     value-format='yyyyMMdd'
                     type='daterange'
-                    @change='getList'
+                    @change='pageChanged(1)'
                     size='mini'
                     range-separator='-'
                     start-placeholder
@@ -163,7 +163,7 @@ export default {
             this.yssjwcsj = yssjwcsj
             this.status = status
             console.log(this.status)
-            this.getList()
+            this.pageChanged(1)
         },
         pageChanged(page) {
             this.currentPage = page