Browse Source

Merge branch 'dataType' of http://39.106.8.246:3003/web/adm into dataType

haojianlong 4 years ago
parent
commit
07d62926ae

+ 1 - 1
config/index.js

@@ -210,7 +210,7 @@ module.exports = {
         }
       },
       '/api': {
-        target: 'http://60.205.177.43:28888',
+        target: 'http://39.102.40.239:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"

+ 1 - 1
src/api/scan/request.js

@@ -75,7 +75,7 @@ export function dowmloadLog(
 
 //获取扫楼用户表格
 export function getUser(param, success) {
-  let url = `${api1}/service/user/query`
+  let url = `${scan}/service/user/query`
   http.postJson(url, param, success)
 }
 

+ 2 - 3
src/components/business_space/business/handsontable.vue

@@ -225,7 +225,7 @@ export default {
       if (this.buildFloorSelectd.length === 1) {
         switch (this.buildFloorSelectd[0]) {
           case 'noKnow':
-            this.zoneParam.BuildingId = 'isnull';
+            this.zoneParam.buildingId = 'isnull';
             break;
           case 'all':
             // params.BuildingId = '';
@@ -685,8 +685,7 @@ export default {
                       tools.setDataForKey(
                         item,
                         head.path,
-                        child.error
-                        // child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+                        child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
                       );
                     }
                   });

+ 1 - 2
src/components/ledger/handsontables/assets.vue

@@ -487,8 +487,7 @@ export default {
                       tools.setDataForKey(
                         item,
                         head.path,
-                        child.error
-                        // child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+                        child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
                       );
                     }
                   });

+ 99 - 87
src/components/ledger/handsontables/device.vue

@@ -4,7 +4,8 @@
       <div style="float:right;overflow:hidden;">
         <span>当前筛选条件下共{{ page.total || "--" }}设备</span>
       </div>
-      <el-select v-model="onlyRead" @change="getHeaderData(mess)" style="width:100px;margin-right:20px;vertical-align:bottom;">
+      <el-select v-model="onlyRead" @change="getHeaderData(mess)"
+                 style="width:100px;margin-right:20px;vertical-align:bottom;">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
@@ -24,27 +25,34 @@
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- bim坐标弹框 -->
-    <bimDialog :dialog="myDialog" :bimcodeobj="bimcodeobj" @closeBIM="closeBIM" :addBody="true" ref="bimdialog"></bimDialog>
+    <bimDialog :dialog="myDialog" :bimcodeobj="bimcodeobj" @closeBIM="closeBIM" :addBody="true"
+               ref="bimdialog"></bimDialog>
     <!-- 型号弹窗 -->
-    <firm :mess="{ deviceId: deviceType.assetType }" :firmDataType="firmDataType" ref="firm" @changeFirm="firmChange" :dialog="myDialog"></firm>
+    <firm :mess="{ deviceId: deviceType.assetType }" :firmDataType="firmDataType" ref="firm" @changeFirm="firmChange"
+          :dialog="myDialog"></firm>
     <!-- 供应商合同弹窗 -->
-    <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="myDialog" />
+    <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="myDialog"/>
     <!-- 供应商弹窗 -->
-    <supplier-dialog ref="supplier" :firmDataType="firmDataType" @changeSupplier="supplierChange" :dialog="myDialog" />
+    <supplier-dialog ref="supplier" :firmDataType="firmDataType" @changeSupplier="supplierChange" :dialog="myDialog"/>
 
-    <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog" />
+    <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog"/>
     <!--      上传文件-->
-    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr" :firmDataType="firmDataType"
-      :information="information" :infoType="infoType" :dialog="myDialog" />
+    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
+                         :firmDataType="firmDataType"
+                         :information="information" :infoType="infoType" :dialog="myDialog"/>
     <!--      上传图片-->
-    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog" :firmDataType="firmDataType"
-      :information="information" :infoType="infoType" />
+    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"
+                       :firmDataType="firmDataType"
+                       :information="information" :infoType="infoType"/>
     <!--      维修商信息-->
-    <maintainer-dialog @changeMaintainer="changeMaintainer" :firmDataType="firmDataType" ref="maintainer" :dialog="myDialog" />
-    <insurer-dialog @changeInsurer="changeInsurer" :firmDataType="firmDataType" ref="insurer" :dialog="myDialog" />
-    <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics" :firmDataType="firmDataType"
-      :information="information" :infoType="infoType" />
-    <div class="middle_sty" style="height: 91%; text-align:center" v-show="!mess.deviceId && (!tableData || !tableData.length)">
+    <maintainer-dialog @changeMaintainer="changeMaintainer" :firmDataType="firmDataType" ref="maintainer"
+                       :dialog="myDialog"/>
+    <insurer-dialog @changeInsurer="changeInsurer" :firmDataType="firmDataType" ref="insurer" :dialog="myDialog"/>
+    <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"
+                :firmDataType="firmDataType"
+                :information="information" :infoType="infoType"/>
+    <div class="middle_sty" style="height: 91%; text-align:center"
+         v-show="!mess.deviceId && (!tableData || !tableData.length)">
       <p>
         <i class="icon-wushuju iconfont"></i>
         请选择设备族
@@ -64,8 +72,9 @@
     </div>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
     <!-- 关联的系统 -->
-    <system-type :device="mess" :curDevice="curDevice" :dialog="myDialog" :type="onlyRead ? 'read' : 'edit'" @change="changeSystemType"
-      :list="systemList"></system-type>
+    <system-type :device="mess" :curDevice="curDevice" :dialog="myDialog" :type="onlyRead ? 'read' : 'edit'"
+                 @change="changeSystemType"
+                 :list="systemList"></system-type>
     <!-- 关联资产 -->
     <change-rea @changeProperty="changeProperty" :dialog="myDialog" :category="deviceType"></change-rea>
     <look-pic :dialog="myDialog" :keysArr="picsArr"></look-pic>
@@ -78,7 +87,8 @@
       </el-row>
       <el-row style="margin-top:20px;" v-show="updateInputShow">
-        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" placeholder="请输入内容" v-model="updateInput"></el-input>
+        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" placeholder="请输入内容"
+                  v-model="updateInput"></el-input>
       </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button @click="myDialog.update = false">取 消</el-button>
@@ -95,14 +105,16 @@
       </span>
     </el-dialog>
     <!--      维护信息弹窗-->
-    <batchDialog ref="batchDialogs" @code="fourVendors" :firmName="firmName" :allObject="allObject" :page="batchPage" :information="information"
-      :newEnclosure="newEnclosure" @getAllData="getAllData" @multiples="multiples" @upDataDevice="upDataDevice" />
+    <batchDialog ref="batchDialogs" @code="fourVendors" :firmName="firmName" :allObject="allObject" :page="batchPage"
+                 :information="information"
+                 :newEnclosure="newEnclosure" @getAllData="getAllData" @multiples="multiples"
+                 @upDataDevice="upDataDevice"/>
   </div>
 </template>
 <script>
-import { BeatchQueryParam, deleteEquip, getEquipBelongs, queryUpdate, updateEquip } from "@/api/scan/request";
-import { getEquipTableCon, queryEquip } from "@/api/object/equip";
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, deleteEquip, getEquipBelongs, queryUpdate, updateEquip} from "@/api/scan/request";
+import {getEquipTableCon, queryEquip} from "@/api/object/equip";
+import {getDataDictionary} from "@/api/dict";
 
 import tools from "@/utils/scan/tools";
 import handsonUtils from "@/utils/hasontableUtils";
@@ -127,7 +139,7 @@ import systemType from "@/components/dialogs/list/systemType";
 import myPagination from "@/components/ledger/lib/myPagination";
 import detailsDialog from "@/components/ledger/lib/detailsDia";
 import changeRea from "@/components/dialogs/changeRea";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 //图片查看
 import lookPic from "@/components/ledger/lib/lookImages";
 import Handsontable from "handsontable-pro";
@@ -168,13 +180,13 @@ export default {
     showTypes() {
       return this.onlyRead
         ? [
-          { value: "Visible", label: "只看采集信息" },
-          { value: "all", label: "全部" }
+          {value: "Visible", label: "只看采集信息"},
+          {value: "all", label: "全部"}
         ]
         : [
-          { value: "partInfo", label: "隐藏信息点" },
-          { value: "all", label: "全部" },
-          { value: "Visible", label: "只看采集信息" }
+          {value: "partInfo", label: "隐藏信息点"},
+          {value: "all", label: "全部"},
+          {value: "Visible", label: "只看采集信息"}
         ];
     },
     // batchDate() {
@@ -498,6 +510,7 @@ export default {
         if (head.category != 'STATIC') {
           data.map(item => {
             let cur = tools.dataForKey(item, head.path);
+
             if (cur) {
               param.data.push({
                 objectId: item.id,
@@ -532,11 +545,10 @@ export default {
                         item,
                         head.path,
                         child.error
-                        // child.error
-                        //   ? child.value
-                        //   ? "表号功能号格式错误"
-                        //   : "表号功能号不存在"
-                        //   : "暂未采集到实时数据"
+                          ? child.value
+                          ? "表号功能号格式错误"
+                          : "表号功能号不存在"
+                          : "暂未采集到实时数据"
                       );
                     }
                   });
@@ -795,7 +807,7 @@ export default {
         let infos = this.tableData[trimmedArr[sortArr[rowArr.row]]];
         this.getInfors(
           infos,
-          { row: sortArr[rowArr.row], col: rowArr.col },
+          {row: sortArr[rowArr.row], col: rowArr.col},
           el
         );
       } else if (isSort) {
@@ -804,14 +816,14 @@ export default {
         let infos = this.tableData[sortArr[rowArr.row]];
         this.getInfors(
           infos,
-          { row: sortArr[rowArr.row], col: rowArr.col },
+          {row: sortArr[rowArr.row], col: rowArr.col},
           el
         );
       } else if (trimmedArr.length) {
         let infos = this.tableData[trimmedArr[rowArr.row]];
         this.getInfors(
           infos,
-          { row: trimmedArr[rowArr.row], col: rowArr.col },
+          {row: trimmedArr[rowArr.row], col: rowArr.col},
           el
         );
       } else {
@@ -855,7 +867,7 @@ export default {
       let param = [];
       params.map(item => {
         this.deleteCode = item.classCode;
-        param.push({ id: item.id });
+        param.push({id: item.id});
       });
       this.$confirm("此操作将删除设备,是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -874,16 +886,16 @@ export default {
     async removeDevice(param) {
       await deleteEquip(param, res => {
         this.$message.success("删除成功");
-        this.$emit("close", { code: this.deleteCode });
+        this.$emit("close", {code: this.deleteCode});
         // this.getTableData()
       });
     },
     // 更新
     updateBusiness(data, change) {
       let param = {
-        content: [],
-        projection: []
-      },
+          content: [],
+          projection: []
+        },
         keyList = [];
       //生成要修改字段列表
       change.map(item => {
@@ -978,12 +990,12 @@ export default {
     forValue(arr, val) {
       let enclosure = [];
       arr &&
-        arr.length &&
-        arr.map(i => {
-          if (i.path == val) {
-            enclosure = i.value;
-          }
-        });
+      arr.length &&
+      arr.map(i => {
+        if (i.path == val) {
+          enclosure = i.value;
+        }
+      });
       return enclosure;
     },
     multiples(val) {
@@ -1118,7 +1130,7 @@ export default {
       this.firmDataType = "row";
       lStorage.set("screen_data", {
         path: this.$route.path,
-        data: { equip: infos }
+        data: {equip: infos}
       });
       console.log(val, '=================================')
       switch (val) {
@@ -1358,25 +1370,25 @@ export default {
     //如果选择供应商之后
     supplierChange(data, type) {
       if (type === "dialog") {
-        let firm = { ...data, num: 8 };
+        let firm = {...data, num: 8};
         this.firmName = firm;
       } else {
         tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId);
         tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name);
-        tools.setDataForKey(this.tableData[this.row], 'infos.supplierPhone', data.contacts[0]?data.contacts[0].phone:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.supplierContactor', data.contacts[0]?data.contacts[0].name:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.supplierWeb', data.website?data.website:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.supplierEmail', data.contacts[0]?data.contacts[0].email:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.supplierFax', data.contacts[0]?data.contacts[0].fax:null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.supplierPhone', data.contacts[0] ? data.contacts[0].phone : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.supplierContactor', data.contacts[0] ? data.contacts[0].name : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.supplierWeb', data.website ? data.website : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.supplierEmail', data.contacts[0] ? data.contacts[0].email : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.supplierFax', data.contacts[0] ? data.contacts[0].fax : null)
         this.handleUpdataTable(
           [
             [this.row, "dpSupplierId", null, data.venderId],
             [this.row, "infos.supplier", null, data.name],
-            [this.row, 'infos.supplierPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-            [this.row, 'infos.supplierContactor', null, data.contacts[0]?data.contacts[0].name:null],
-            [this.row, 'infos.supplierWeb', null, data.website?data.website:null],
-            [this.row, 'infos.supplierEmail', null, data.contacts[0]?data.contacts[0].email:null],
-            [this.row, 'infos.supplierFax', null, data.contacts[0]?data.contacts[0].fax:null],
+            [this.row, 'infos.supplierPhone', null, data.contacts[0] ? data.contacts[0].phone : null],
+            [this.row, 'infos.supplierContactor', null, data.contacts[0] ? data.contacts[0].name : null],
+            [this.row, 'infos.supplierWeb', null, data.website ? data.website : null],
+            [this.row, 'infos.supplierEmail', null, data.contacts[0] ? data.contacts[0].email : null],
+            [this.row, 'infos.supplierFax', null, data.contacts[0] ? data.contacts[0].fax : null],
           ],
           "edit"
         );
@@ -1384,7 +1396,7 @@ export default {
     },
     //供应合同编号
     supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data });
+      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", {id: data});
     },
     //保险单号-保险文件
     guaranteeChange(data) {
@@ -1437,25 +1449,25 @@ export default {
     //保险商变更
     changeInsurer(data, type) {
       if (type === "dialog") {
-        let firm = { ...data, num: 42 };
+        let firm = {...data, num: 42};
         this.firmName = firm;
       } else {
         tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId);
         tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name);
-        tools.setDataForKey(this.tableData[this.row], 'infos.insurerWeb', data.website?data.website:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.insurerEmail', data.contacts[0]?data.contacts[0].email:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.insurerFax', data.contacts[0]?data.contacts[0].fax:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.insurerPhone', data.contacts[0]?data.contacts[0].phone:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.insurerContactor', data.contacts[0]?data.contacts[0].name:null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.insurerWeb', data.website ? data.website : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.insurerEmail', data.contacts[0] ? data.contacts[0].email : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.insurerFax', data.contacts[0] ? data.contacts[0].fax : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.insurerPhone', data.contacts[0] ? data.contacts[0].phone : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.insurerContactor', data.contacts[0] ? data.contacts[0].name : null)
         this.handleUpdataTable(
           [
             [this.row, "dpInsurerId", null, data.venderId],
             [this.row, "infos.insurer", null, data.name],
-            [this.row, 'infos.insurerWeb', null, data.website?data.website:null],
-            [this.row, 'infos.insurerEmail', null, data.contacts[0]?data.contacts[0].email:null],
-            [this.row, 'infos.insurerFax', null, data.contacts[0]?data.contacts[0].fax:null],
-            [this.row, 'infos.insurerPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-            [this.row, 'infos.insurerContactor', null, data.contacts[0]?data.contacts[0].name:null],
+            [this.row, 'infos.insurerWeb', null, data.website ? data.website : null],
+            [this.row, 'infos.insurerEmail', null, data.contacts[0] ? data.contacts[0].email : null],
+            [this.row, 'infos.insurerFax', null, data.contacts[0] ? data.contacts[0].fax : null],
+            [this.row, 'infos.insurerPhone', null, data.contacts[0] ? data.contacts[0].phone : null],
+            [this.row, 'infos.insurerContactor', null, data.contacts[0] ? data.contacts[0].name : null],
           ],
           "edit"
         );
@@ -1464,25 +1476,25 @@ export default {
     //维修商变更
     changeMaintainer(data, type) {
       if (type === "dialog") {
-        let firm = { ...data, num: 35 };
+        let firm = {...data, num: 35};
         this.firmName = firm;
       } else {
         tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId);
         tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name);
-        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerWeb', data.website?data.website:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerContactor', data.contacts[0]?data.contacts[0].name:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerPhone', data.contacts[0]?data.contacts[0].phone:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerEmail', data.contacts[0]?data.contacts[0].email:null)
-        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerFax', data.contacts[0]?data.contacts[0].fax:null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerWeb', data.website ? data.website : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerContactor', data.contacts[0] ? data.contacts[0].name : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerPhone', data.contacts[0] ? data.contacts[0].phone : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerEmail', data.contacts[0] ? data.contacts[0].email : null)
+        tools.setDataForKey(this.tableData[this.row], 'infos.maintainerFax', data.contacts[0] ? data.contacts[0].fax : null)
         this.handleUpdataTable(
           [
             [this.row, "dpMaintainerId", null, data.venderId],
             [this.row, "infos.maintainer", null, data.name],
-            [this.row, 'infos.maintainerWeb', null, data.website?data.website:null],
-            [this.row, 'infos.maintainerContactor', null, data.contacts[0]?data.contacts[0].name:null],
-            [this.row, 'infos.maintainerPhone', null, data.contacts[0]?data.contacts[0].phone:null],
-            [this.row, 'infos.maintainerEmail', null, data.contacts[0]?data.contacts[0].email:null],
-            [this.row, 'infos.maintainerFax', null, data.contacts[0]?data.contacts[0].fax:null],
+            [this.row, 'infos.maintainerWeb', null, data.website ? data.website : null],
+            [this.row, 'infos.maintainerContactor', null, data.contacts[0] ? data.contacts[0].name : null],
+            [this.row, 'infos.maintainerPhone', null, data.contacts[0] ? data.contacts[0].phone : null],
+            [this.row, 'infos.maintainerEmail', null, data.contacts[0] ? data.contacts[0].email : null],
+            [this.row, 'infos.maintainerFax', null, data.contacts[0] ? data.contacts[0].fax : null],
           ],
           "edit"
         );
@@ -1577,8 +1589,8 @@ export default {
       })
     },
     upDataDevice(type, data1, data2) {
-      let param = { content: data1 };
-      let param1 = { content: data2 };
+      let param = {content: data1};
+      let param1 = {content: data2};
       if (type === 1) {
         //增量
         //LedgerParam
@@ -1627,8 +1639,8 @@ export default {
       } else if (type === "multiple") {
         let nArr = [];
         arr.content.forEach(i => {
-          let { id, ...value } = i;
-          nArr.push({ infos: value });
+          let {id, ...value} = i;
+          nArr.push({infos: value});
         });
         // nArr.map(i => {
         //   if (Array.isArray(i) && i.length < 1) {

+ 1 - 2
src/components/ledger/handsontables/system.vue

@@ -381,8 +381,7 @@ export default {
                       tools.setDataForKey(
                         item,
                         head.path,
-                        child.error
-                        // child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+                        child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
                       );
                     }
                   });

+ 1 - 0
src/components/ledger/lib/cascader.vue

@@ -114,6 +114,7 @@ export default {
           resolve(res)
         })
       })
+
       Promise.all([promise1, promise2]).then((res) => {
         let allData = res[0], data = res[1]
         this.options = this.formatOptions(allData.content)

+ 1 - 2
src/views/ledger/cenotelist/index.vue

@@ -528,8 +528,7 @@ export default {
                       tools.setDataForKey(
                         item,
                         head.path,
-                        child.error
-                        // child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+                        child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
                       );
                     }
                   });

+ 1 - 2
src/views/ledger/rentlist/index.vue

@@ -559,8 +559,7 @@ export default {
                       tools.setDataForKey(
                         item,
                         head.path,
-                        child.error
-                        // child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+                        child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
                       );
                     }
                   });