From 4ffc954f462cc5c7fb21b5ec3241ec98d0bad359 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 17 Aug 2022 12:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addMachine/addMachine.html       |  2 +-
 .../property/editMachine/editMachine.html     |  2 +-
 .../machineRecordManage.js                    | 29 ++++++++++---------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/public/components/property/addMachine/addMachine.html b/public/components/property/addMachine/addMachine.html
index 45979b397..81565a83e 100755
--- a/public/components/property/addMachine/addMachine.html
+++ b/public/components/property/addMachine/addMachine.html
@@ -32,7 +32,7 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addMachineInfo.typeId" @change="setAddMachineTypeCd(addMachineInfo.typeId)">
                                         <option selected disabled value="">{{vc.i18n('必填','addMachine')}}，请选择设备类型</option>
-                                        <option v-for="(item,index) in addMachineInfo.machineTypes" :key="index" :value="item.typeId" v-if="item.machineTypeCd == '9994'">
+                                        <option v-for="(item,index) in addMachineInfo.machineTypes" :key="index" :value="item.typeId">
                                             {{item.machineTypeName}}</option>
                                         </select>
                                     </select>
diff --git a/public/components/property/editMachine/editMachine.html b/public/components/property/editMachine/editMachine.html
index 8351b3428..f684c117d 100755
--- a/public/components/property/editMachine/editMachine.html
+++ b/public/components/property/editMachine/editMachine.html
@@ -31,7 +31,7 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="editMachineInfo.typeId" @change="setEditMachineTypeCd(editMachineInfo.typeId)">
                                         <option selected disabled value="">{{vc.i18n('必填，请选择设备类型','editMachine')}}</option>
-                                        <option v-for="(item,index) in editMachineInfo.machineTypes" :key="index" :value="item.typeId"  v-if="item.machineTypeCd == '9994'">
+                                        <option v-for="(item,index) in editMachineInfo.machineTypes" :key="index" :value="item.typeId"  >
                                             {{item.machineTypeName}}</option>
                                         </select>
                                     </select>
diff --git a/public/pages/property/machineRecordManage/machineRecordManage.js b/public/pages/property/machineRecordManage/machineRecordManage.js
index 9a9f950b6..b650599ab 100755
--- a/public/pages/property/machineRecordManage/machineRecordManage.js
+++ b/public/pages/property/machineRecordManage/machineRecordManage.js
@@ -1,7 +1,7 @@
 /**
  入驻小区
  **/
-(function (vc) {
+(function(vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
@@ -23,20 +23,20 @@
                 }
             }
         },
-        _initMethod: function () {
+        _initMethod: function() {
             vc.component._listMachineRecords(DEFAULT_PAGE, DEFAULT_ROWS);
         },
-        _initEvent: function () {
+        _initEvent: function() {
 
-            vc.on('machineRecordManage', 'listMachineRecord', function (_param) {
+            vc.on('machineRecordManage', 'listMachineRecord', function(_param) {
                 vc.component._listMachineRecords(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-            vc.on('pagination', 'page_event', function (_currentPage) {
+            vc.on('pagination', 'page_event', function(_currentPage) {
                 vc.component._listMachineRecords(_currentPage, DEFAULT_ROWS);
             });
         },
         methods: {
-            _listMachineRecords: function (_page, _rows) {
+            _listMachineRecords: function(_page, _rows) {
 
                 vc.component.machineRecordManageInfo.conditions.page = _page;
                 vc.component.machineRecordManageInfo.conditions.row = _rows;
@@ -46,9 +46,9 @@
                 };
 
                 //发送get请求
-                vc.http.apiGet('/machineRecord.listMachineRecords"',
+                vc.http.apiGet('/machineRecord.listMachineRecords',
                     param,
-                    function (json, res) {
+                    function(json, res) {
                         var _machineRecordManageInfo = JSON.parse(json);
                         vc.component.machineRecordManageInfo.total = _machineRecordManageInfo.total;
                         vc.component.machineRecordManageInfo.records = _machineRecordManageInfo.records;
@@ -58,18 +58,19 @@
                             dataCount: vc.component.machineRecordManageInfo.total,
                             currentPage: _page
                         });
-                    }, function (errInfo, error) {
+                    },
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );
             },
-            _queryMachineRecordMethod: function () {
+            _queryMachineRecordMethod: function() {
                 vc.component._listMachineRecords(DEFAULT_PAGE, DEFAULT_ROWS);
             },
-            _openMachineRecordDetailModel:function(_machineRecord){
-                vc.emit('machineRecordDetail', 'openMachineRecordDetailModal',_machineRecord);
+            _openMachineRecordDetailModel: function(_machineRecord) {
+                vc.emit('machineRecordDetail', 'openMachineRecordDetailModal', _machineRecord);
             },
-            _moreCondition: function () {
+            _moreCondition: function() {
                 if (vc.component.machineRecordManageInfo.moreCondition) {
                     vc.component.machineRecordManageInfo.moreCondition = false;
                 } else {
@@ -80,4 +81,4 @@
 
         }
     });
-})(window.vc);
+})(window.vc);
\ No newline at end of file