Browse Source

adm:feat > 资产,系统台账添加功能

shaun-sheep 4 years ago
parent
commit
f3b0aae130

+ 4 - 2
src/api/scan/request.js

@@ -1234,7 +1234,8 @@ export function queryLinkSys(param, success) {
 
 //查询系统信息 - 建筑楼层 - 系统一对多
 export function querySysLinkBuild(param, success) {
-  let url = `${baseUrl}/datacenter2/general-system/query-new`;
+  // let url = `${baseUrl}/datacenter2/general-system/query-new`;
+  let url = `${baseUrl}/datacenter2/object/general-system/query-new`;
   if (param.buildingId) {
     url += `?buildingId=${param.buildingId}`
   }
@@ -1406,7 +1407,8 @@ export function createGeneralSys(param, success) {
 
 //创建系统---处理建筑楼层(一对多)
 export function createSystemBuildFloor(param, success) {
-  let url = `${baseUrl}/datacenter2/general-system/create-bd-fl`
+  // let url = `${baseUrl}/datacenter2/general-system/create-bd-fl`
+  let url = `${baseUrl}/datacenter2/object/general-system/create-bd-fl`
   http.postJson(url, param, success)
 }
 

+ 1 - 1
src/components/dialogs/changeRea.vue

@@ -146,7 +146,7 @@ export default {
             projection: ["localName", "name", "id"]
           }
         ],
-        filters: `equipmentId isNull;family="${this.category.assetType}"`,
+        filters: `equipId isNull;family="${this.category.assetType}"`,
         pageNumber: this.page.currentPage,
         pageSize: this.page.size
       }

+ 16 - 14
src/components/ledger/handsontables/system.vue

@@ -211,10 +211,10 @@ export default {
       if (!!this.mess.deviceId) {
         let param = {
           data: {
-            PageSize: this.page.size,
-            Orders: "createTime desc, SysLocalName desc, SysLocalID desc, SysID desc",
-            PageNumber: this.page.currentPage,
-            Filters: `category='${this.mess.deviceId}'`
+            pageSize: this.page.size,
+            orders: "createTime desc, localName desc, localId desc, id desc",
+            pageNumber: this.page.currentPage,
+            filters: `classCode='${this.mess.deviceId}'`
           }
         }
         if (this.mess.buildId == "noKnow") {
@@ -229,12 +229,12 @@ export default {
         }
         querySysLinkBuild(param, res => {
           this.loading = false;
-          _this.tableData = res.Content;
-          _this.copyMain = tools.deepCopy(res.Content);
-          _this.page.total = res.Total;
-          if (res.Content && res.Content.length) {
+          _this.tableData = res.content;
+          _this.copyMain = tools.deepCopy(res.content);
+          _this.page.total = res.total;
+          if (res.content && res.content.length) {
             if (this.onlyRead) {
-              this.getBatch(res.Content)
+              this.getBatch(res.content)
             }
             _this.initTable();
           }
@@ -276,7 +276,8 @@ export default {
     },
     //选择设备类型-添加设备
     changeAddType(val) {
-      this.addData.Category = val.code;
+      console.log(val,'=====================')
+      this.addData.Category = val.classCode;
       this.addData.CategoryName = val.name;
       this.addData.showType = this.showType;
     },
@@ -313,7 +314,7 @@ export default {
       }
       if (this.showType == "all") {
         data.splice(3, 0, {
-          data: "BuildingFloorInfoList",
+          data: "buildingFloorInfoList",
           renderer: text.sysInBuildFloor,
           readOnly: this.onlyRead
         })
@@ -552,7 +553,8 @@ export default {
           })
           return false
         //设备二维码图片
-        case 'EquipQRCode':
+        // case 'EquipQRCode':
+        case "defaultQRCode":
           this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
           if (!!this.qrcodeUrl) {
             this.myDialog.qrcode = true;
@@ -561,12 +563,12 @@ export default {
           }
           return false
         //关联设备数量
-        case 'Count':
+        case 'count':
           if (!this.onlyRead) {
             this.myDialog.relevance = true
           }
           return false
-        case 'BuildingFloorInfoList':
+        case 'buildingFloorInfoList':
           if (!this.onlyRead) {
             this.$refs.editFloor.showDialog(this.tableData[row.row]);
           }

+ 37 - 37
src/components/ledger/lib/editSysFloor.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="所属建筑楼层" :visible.sync="connectDialogVis" width="50%" id="messageDialog">
     <div class="cascader-row">
-      <div style="line-height:32px;">添加{{system.SysLocalName}}所属建筑楼层 :</div>
+      <div style="line-height:32px;">添加{{ system.SysLocalName }}所属建筑楼层 :</div>
       <div style="width:70%">
         <bfCascader ref="bfCascader" :SysID="system.SysID"></bfCascader>
       </div>
@@ -15,45 +15,45 @@
   </el-dialog>
 </template>
 <script>
-  import bfCascader from './buildfloorCascader'
-  import {sysRelateBuild, sysRelateFloor} from "@/api/scan/request";
+import bfCascader from './buildfloorCascader'
+import { sysRelateBuild, sysRelateFloor } from "@/api/scan/request";
 
-  export default {
-    data() {
-      return {
-        buildName: '',
-        connectDialogVis: false,
-        system: {}
-      }
-    },
-    components: {
-      bfCascader
-    },
-    props: {
-      isCreate: {
-        default: false
-      }
-    },
-    methods: {
-      showDialog(system) {
-        this.system = system;
-        this.connectDialogVis = true;
-        this.$nextTick(() => {
+export default {
+  data() {
+    return {
+      buildName: '',
+      connectDialogVis: false,
+      system: {}
+    }
+  },
+  components: {
+    bfCascader
+  },
+  props: {
+    isCreate: {
+      default: false
+    }
+  },
+  methods: {
+    showDialog(system) {
+      this.system = system;
+      this.connectDialogVis = true;
+      this.$nextTick(() => {
         this.$refs.bfCascader.getCascader()
-        let arr = this.system.BuildingFloorInfoList || [];
+        let arr = this.system.buildingFloorInfoList || [];
         let value = []
-          if (arr.length) {
-            arr.map(t => {
-              if (t.FloorID) {
-                value.push([t.BuildID, t.FloorID]);
-              } else {
-                value.push([t.BuildID])
-              }
-            })
-          }
-          this.$refs.bfCascader.value = value
-          console.log(value)
-        })
+        if (arr.length) {
+          arr.map(t => {
+            if (t.FloorID) {
+              value.push([t.BuildID, t.FloorID]);
+            } else {
+              value.push([t.BuildID])
+            }
+          })
+        }
+        this.$refs.bfCascader.value = value
+        console.log(value)
+      })
     },
     save() {
       // 如果是创建

+ 4 - 4
src/components/ledger/lib/system.vue

@@ -3,8 +3,8 @@
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
     <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
                size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.code" :label="item.name"
-                 :value="item.code"></el-option>
+      <el-option v-for="item in options" :key="item.classCode" :label="item.name"
+                 :value="item.classCode"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
@@ -66,7 +66,7 @@ export default {
     changeVal(val) {
       let value = {}
       this.options.map(item => {
-        if (item.code == val) {
+        if (item.classCode == val) {
           value = item
         }
       })
@@ -103,7 +103,7 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.forEach(item => {
-        data.push({ code: item.code, name: item.name });
+        data.push({ classCode: item.classCode, name: item.name });
       });
       return data;
     }

+ 1 - 1
src/components/ledger/report/dataexport.vue

@@ -272,7 +272,7 @@ export default {
             projection: [ "localName", "name", "id" ]
           }
         ],
-        filters: " equipmentId isnull ",
+        filters: " equipId isnull ",
         orders: "createTime desc, equipID asc",
         pageNumber: pageNum,
         pageSize: 1000,

+ 173 - 173
src/utils/handsontable/notShow.js

@@ -3,7 +3,7 @@ import text from "@/utils/handsontable/mainText"
 import tools from "@/utils/scan/tools"
 import fieldData from "@/utils/handsontable/fillterField"
 
-let InputModeArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "L", "L1", "L2", "F1", "F2", "M", "Own"]
+let inputModeArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "L", "L1", "L2", "F1", "F2", "M", "Own"]
 //在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
 let noShowArr = [
   "specification",
@@ -140,7 +140,7 @@ let partsAddNoShow = [
   "InsurerFax",
 ]
 const showTools = {
-  InputModeArr: ["A1", "A2", "B1", "B2", "C5", "D1", "D1L", "D2", "E1", "E2", "L", "L1", "L2", "F1", "F2", "M"],
+  inputModeArr: ["A1", "A2", "B1", "B2", "C5", "D1", "D1L", "D2", "E1", "E2", "L", "L1", "L2", "F1", "F2", "M"],
   addArr: () => {
     return cutArr
   },
@@ -165,9 +165,9 @@ const showTools = {
   //几种类型不显示
   technologyParam: (item) => {
     if (
-      item.FirstTag == "控制参数" &&
-      item.FirstTag == "设定参数" &&
-      item.FirstTag == "运行参数"
+      item.firstTag == "控制参数" &&
+      item.firstTag == "设定参数" &&
+      item.firstTag == "运行参数"
     ) {
       return undefined
     }
@@ -337,49 +337,49 @@ const showTools = {
   changeTypes(arr, onlyRead, isWatch, allMess, falg = false, taizhang = false) {
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
-      if (item.InfoPointCode == "BIMLocation") {
+      if (item.code == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
           //固定不显示的code
-          if (!showTools.cantShow(item.InfoPointCode) && !onlyRead && !taizhang) {
+          if (!showTools.cantShow(item.code) && !onlyRead && !taizhang) {
             return undefined
           }
 
-          if (!showTools.isShow(item.InfoPointCode) && !taizhang && !taizhang) {
+          if (!showTools.isShow(item.code) && !taizhang && !taizhang) {
             if (isWatch && !onlyRead) {
               return undefined
             }
           }
 
-          if (item.InfoPointCode == "EquipQRCode") {
+          if (item.code == "EquipQRCode") {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               renderer: text.lookQRCode,
               readOnly: true
             }
           }
 
-          if (item.InputMode == "D1") {
+          if (item.inputMode == "D1") {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               chosenOptions: {
                 // multiple: true,//多选
-                data: item.DataSource || ""
+                data: item.dataSource || ""
               }
             };
-          } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+          } else if (item.inputMode == "A1" || item.inputMode == "A2") {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               type: "numeric",
               numericFormat: {
                 pattern: "0,0.00"
@@ -387,51 +387,51 @@ const showTools = {
                 // more cultures available on http://numbrojs.com/languages.html
               }
             };
-          } else if (item.InputMode == "C5") {
+          } else if (item.inputMode == "C5") {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               type: "date",
               dateFormat: "YYYY-MM-DD",
               correctFormat: true
             };
           } else if (
-            item.InputMode == "B1" ||
-            item.InputMode == "L" ||
-            item.InputMode == "L1" ||
-            item.InputMode == "L2" ||
-            item.InputMode == "M"
+            item.inputMode == "B1" ||
+            item.inputMode == "L" ||
+            item.inputMode == "L1" ||
+            item.inputMode == "L2" ||
+            item.inputMode == "M"
           ) {
             return {
-              data: "Infos." + item.InfoPointCode
+              data: "Infos." + item.code
             };
           } else if (
-            item.InputMode == "X"
-            // item.InputMode == "L1" ||
-            // item.InputMode == "L2"
+            item.inputMode == "X"
+            // item.inputMode == "L1" ||
+            // item.inputMode == "L2"
           ) {
             //   return undefined
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               readOnly: true
             };
-          } else if (item.InputMode == "D2") {
+          } else if (item.inputMode == "D2") {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               chosenOptions: {
                 multiple: true, //多选
-                data: item.DataSource || ""
+                data: item.dataSource || ""
               }
             };
-          } else if (item.InputMode == "Own" && !onlyRead) {
+          } else if (item.inputMode == "Own" && !onlyRead) {
             return {
-              data: "Infos." + item.InfoPointCode,
+              data: "Infos." + item.code,
               renderer: text.idType,
             }
           } else {
             return {
-              data: "infos." + item.InfoPointCode
+              data: "infos." + item.code
             }
           }
         } else {
@@ -449,85 +449,85 @@ const showTools = {
   showTypes(arr, onlyRead, isWatch, allMess, falg = false, typeArr = false) {
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
-      if (item.InfoPointCode == "BIMLocation") {
+      if (item.code == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
           //固定不显示的code
-          if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
+          if (!showTools.cantShow(item.code) && !onlyRead) {
             return undefined
           }
 
-          if (!showTools.isShow(item.InfoPointCode) && !onlyRead) {
+          if (!showTools.isShow(item.code) && !onlyRead) {
             if (isWatch && !onlyRead) {
               return undefined
             }
           }
 
-          if (item.InfoPointCode == "EquipQRCode" || item.InfoPointCode == "RoomQRCode") {
+          if (item.code == "EquipQRCode" || item.code == "RoomQRCode") {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: text.lookQRCode,
               readOnly: true
             }
           }
           //图片类型
           if (
-            item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic"
+            item.code == "InstallPic" ||
+            item.code == "Nameplate" ||
+            item.code == "Pic"
           ) {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: text.picType,
               readOnly: true
             }
           }
 
           //文件类型
-          if (item.InfoPointCode == "InsuranceFile" ||
-            item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport" ||
-            item.InfoPointCode == "MaintainManual" ||
-            item.InfoPointCode == "ApproachingAcceptance" ||
-            item.InfoPointCode == "AcceptanceReport" ||
-            item.InfoPointCode == "OperationManual" ||
-            item.InfoPointCode == "OriginalCertificate" ||
-            item.InfoPointCode == "TestReport" ||
-            item.InfoPointCode == "ProductCertification" ||
-            item.InfoPointCode == "InstallInstruction" ||
-            item.InfoPointCode == "SupplierContract" ||
-            item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+          if (item.code == "InsuranceFile" ||
+            item.code == "Archive" ||
+            item.code == "CheckReport" ||
+            item.code == "MaintainManual" ||
+            item.code == "ApproachingAcceptance" ||
+            item.code == "AcceptanceReport" ||
+            item.code == "OperationManual" ||
+            item.code == "OriginalCertificate" ||
+            item.code == "TestReport" ||
+            item.code == "ProductCertification" ||
+            item.code == "InstallInstruction" ||
+            item.code == "SupplierContract" ||
+            item.code == "Drawing" ||
+            item.code == "InstallDrawing"
 
           ) {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: text.fileType,
               readOnly: true
             }
           }
 
-          if (item.InputMode == "D1") {
+          if (item.inputMode == "D1") {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               chosenOptions: {
                 // multiple: true,//多选
-                data: item.DataSource || ""
+                data: item.dataSource || ""
               }
             };
-          } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+          } else if (item.inputMode == "A1" || item.inputMode == "A2") {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               type: "numeric",
               numericFormat: {
                 pattern: "0,0.00"
@@ -535,49 +535,49 @@ const showTools = {
                 // more cultures available on http://numbrojs.com/languages.html
               }
             };
-          } else if (item.InputMode == "C5") {
+          } else if (item.inputMode == "C5") {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               type: "date",
               dateFormat: "YYYY-MM-DD",
               correctFormat: true
             };
           } else if (
-            item.InputMode == "B1" ||
-            item.InputMode == "L" ||
-            item.InputMode == "L1" ||
-            item.InputMode == "L2" ||
-            item.InputMode == "M"
+            item.inputMode == "B1" ||
+            item.inputMode == "L" ||
+            item.inputMode == "L1" ||
+            item.inputMode == "L2" ||
+            item.inputMode == "M"
           ) {
             return {
-              data: "infos." + item.InfoPointCode
+              data: "infos." + item.code
             }
           } else if (
-            item.InputMode == "X" ||
-            item.InputMode == "F2"
+            item.inputMode == "X" ||
+            item.inputMode == "F2"
           ) {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               readOnly: true
             };
-          } else if (item.InputMode == "D2") {
+          } else if (item.inputMode == "D2") {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               chosenOptions: {
                 multiple: true, //多选
-                data: item.DataSource || ""
+                data: item.dataSource || ""
               }
             };
-          } else if (item.InputMode == "Own" && !onlyRead) {
+          } else if (item.inputMode == "Own" && !onlyRead) {
             return {
-              data: "infos." + item.InfoPointCode,
+              data: "infos." + item.code,
               renderer: text.idType,
             }
           } else {
             return {
-              data: "infos." + item.InfoPointCode
+              data: "infos." + item.code
             }
           }
         } else {
@@ -593,23 +593,23 @@ const showTools = {
   changeHeader(arr, readArr, onlyRead, isWatch, allMess, falg = false, taizhang = false) {
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
 
-      if (item.InfoPointCode == "BIMLocation") {
+      if (item.code == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
-          if (!showTools.cantShow(item.InfoPointCode) && !onlyRead && !taizhang) {
+          if (!showTools.cantShow(item.code) && !onlyRead && !taizhang) {
             return undefined
           }
 
-          if (!showTools.isShow(item.InfoPointCode) && !taizhang) {
+          if (!showTools.isShow(item.code) && !taizhang) {
             if (isWatch && !onlyRead) {
               return undefined
             }
@@ -632,29 +632,29 @@ const showTools = {
   showHeaderTypes(arr, typeArr, onlyRead, isWatch, allMess, falg = false) {
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
-      if (item.InfoPointCode == "BIMLocation") {
+      if (item.code == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
           //固定不显示的code
-          if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
+          if (!showTools.cantShow(item.code) && !onlyRead) {
             return undefined
           }
 
-          if (!showTools.isShow(item.InfoPointCode)) {
+          if (!showTools.isShow(item.code)) {
             if (isWatch && !onlyRead) {
               return undefined
             }
           }
 
-          if (item.InfoPointCode == "EquipQRCode") {
+          if (item.code == "EquipQRCode") {
             return {
               data: item.Path,
               renderer: text.lookQRCode,
@@ -664,9 +664,9 @@ const showTools = {
 
           //图片类型
           if (
-            item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic"
+            item.code == "InstallPic" ||
+            item.code == "Nameplate" ||
+            item.code == "Pic"
           ) {
             return {
               data: item.Path,
@@ -676,20 +676,20 @@ const showTools = {
           }
 
           //文件类型
-          if (item.InfoPointCode == "InsuranceFile" ||
-            item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport" ||
-            item.InfoPointCode == "MaintainManual" ||
-            item.InfoPointCode == "ApproachingAcceptance" ||
-            item.InfoPointCode == "AcceptanceReport" ||
-            item.InfoPointCode == "OperationManual" ||
-            item.InfoPointCode == "OriginalCertificate" ||
-            item.InfoPointCode == "TestReport" ||
-            item.InfoPointCode == "ProductCertification" ||
-            item.InfoPointCode == "InstallInstruction" ||
-            item.InfoPointCode == "SupplierContract" ||
-            item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+          if (item.code == "InsuranceFile" ||
+            item.code == "Archive" ||
+            item.code == "CheckReport" ||
+            item.code == "MaintainManual" ||
+            item.code == "ApproachingAcceptance" ||
+            item.code == "AcceptanceReport" ||
+            item.code == "OperationManual" ||
+            item.code == "OriginalCertificate" ||
+            item.code == "TestReport" ||
+            item.code == "ProductCertification" ||
+            item.code == "InstallInstruction" ||
+            item.code == "SupplierContract" ||
+            item.code == "Drawing" ||
+            item.code == "InstallDrawing"
           ) {
             return {
               data: item.Path,
@@ -698,17 +698,17 @@ const showTools = {
             }
           }
 
-          if (item.InputMode == "D1" || item.InputMode == "E1") { //单选
+          if (item.inputMode == "D1" || item.inputMode == "E1") { //单选
             return {
               data: item.Path,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               readOnly: onlyRead,
               chosenOptions: {
-                data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
+                data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
               }
             };
-          } else if (item.InputMode == "D2") {
+          } else if (item.inputMode == "D2") {
             return {
               data: item.Path,
               renderer: tools.customDropdownRenderer,
@@ -716,10 +716,10 @@ const showTools = {
               readOnly: onlyRead,
               chosenOptions: {
                 multiple: true, //多选
-                data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
+                data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
               }
             };
-          } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+          } else if (item.inputMode == "A1" || item.inputMode == "A2") {
             return {
               data: item.Path,
               type: "numeric",
@@ -728,7 +728,7 @@ const showTools = {
                 pattern: "0,0.00"
               }
             };
-          } else if (item.InputMode == "C5") {
+          } else if (item.inputMode == "C5") {
             return {
               data: item.Path,
               type: "date",
@@ -736,7 +736,7 @@ const showTools = {
               readOnly: onlyRead,
               correctFormat: true
             };
-          } else if (item.InputMode == "Own" && !onlyRead) {
+          } else if (item.inputMode == "Own" && !onlyRead) {
             return {
               data: item.Path,
               renderer: text.idType,
@@ -764,22 +764,22 @@ const showTools = {
     }
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
 
-      if (item.InfoPointCode == "BIMLocation") {
+      if (item.code == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
-          if (!showTools.fixedNoShowField(partsAddNoShow, item.InfoPointCode) && !onlyRead && !taizhang) {
+          if (!showTools.fixedNoShowField(partsAddNoShow, item.code) && !onlyRead && !taizhang) {
             return undefined
           }
-          if (!showTools.isShow(item.InfoPointCode) && !taizhang) {
+          if (!showTools.isShow(item.code) && !taizhang) {
             if (isWatch && !onlyRead) {
               return undefined
             }
@@ -804,27 +804,27 @@ const showTools = {
     }
     let data = arr.map(item => {
       if (falg) {
-        if (item.FirstTag == "控制参数" ||
-          item.FirstTag == "设定参数" ||
-          item.FirstTag == "运行参数") {
+        if (item.firstTag == "控制参数" ||
+          item.firstTag == "设定参数" ||
+          item.firstTag == "运行参数") {
           return undefined
         }
       }
       if (item.Path == "BIMLocation") {
         return undefined
       }
-      if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+      if (onlyRead || inputModeArr.indexOf(item.inputMode) > -1) {
         if (item.Visible || !allMess) {
           //固定不显示的code
-          if (!showTools.fixedNoShowField(partsAddNoShow, item.InfoPointCode) && !onlyRead && !taizhang) {
+          if (!showTools.fixedNoShowField(partsAddNoShow, item.code) && !onlyRead && !taizhang) {
             return undefined
           }
-          if (!showTools.isShow(item.InfoPointCode) && !taizhang) {
+          if (!showTools.isShow(item.code) && !taizhang) {
             if (isWatch && !onlyRead) {
               return undefined
             }
           }
-          if (item.InfoPointCode == "EquipQRCode") {
+          if (item.code == "EquipQRCode") {
             return {
               data: item.Path,
               renderer: text.lookQRCode,
@@ -833,9 +833,9 @@ const showTools = {
           }
           //图片类型
           if (
-            item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic"
+            item.code == "InstallPic" ||
+            item.code == "Nameplate" ||
+            item.code == "Pic"
           ) {
             return {
               data: item.Path,
@@ -845,20 +845,20 @@ const showTools = {
           }
 
           //文件类型
-          if (item.InfoPointCode == "InsuranceFile" ||
-            item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport" ||
-            item.InfoPointCode == "MaintainManual" ||
-            item.InfoPointCode == "ApproachingAcceptance" ||
-            item.InfoPointCode == "AcceptanceReport" ||
-            item.InfoPointCode == "OperationManual" ||
-            item.InfoPointCode == "OriginalCertificate" ||
-            item.InfoPointCode == "TestReport" ||
-            item.InfoPointCode == "ProductCertification" ||
-            item.InfoPointCode == "InstallInstruction" ||
-            item.InfoPointCode == "SupplierContract" ||
-            item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+          if (item.code == "InsuranceFile" ||
+            item.code == "Archive" ||
+            item.code == "CheckReport" ||
+            item.code == "MaintainManual" ||
+            item.code == "ApproachingAcceptance" ||
+            item.code == "AcceptanceReport" ||
+            item.code == "OperationManual" ||
+            item.code == "OriginalCertificate" ||
+            item.code == "TestReport" ||
+            item.code == "ProductCertification" ||
+            item.code == "InstallInstruction" ||
+            item.code == "SupplierContract" ||
+            item.code == "Drawing" ||
+            item.code == "InstallDrawing"
           ) {
             return {
               data: item.Path,
@@ -867,17 +867,17 @@ const showTools = {
             }
           }
 
-          if (item.InputMode == "D1" || item.InputMode == "E1") { //单选
+          if (item.inputMode == "D1" || item.inputMode == "E1") { //单选
             return {
               data: item.Path,
               renderer: tools.customDropdownRenderer,
               editor: "chosen",
               readOnly: onlyRead,
               chosenOptions: {
-                data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
+                data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
               }
             };
-          } else if (item.InputMode == "D2") {
+          } else if (item.inputMode == "D2") {
             return {
               data: item.Path,
               renderer: tools.customDropdownRenderer,
@@ -885,10 +885,10 @@ const showTools = {
               readOnly: onlyRead,
               chosenOptions: {
                 multiple: true, //多选
-                data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
+                data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
               }
             };
-          } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+          } else if (item.inputMode == "A1" || item.inputMode == "A2") {
             return {
               data: item.Path,
               type: "numeric",
@@ -897,7 +897,7 @@ const showTools = {
                 pattern: "0,0.00"
               }
             };
-          } else if (item.InputMode == "C5") {
+          } else if (item.inputMode == "C5") {
             return {
               data: item.Path,
               type: "date",
@@ -934,7 +934,7 @@ const showTools = {
       arr = this.arrToArr(arr, showType)
     }
     let data = arr.map(item => {
-      // if (type == "property" && item.FirstTag == "RunParam") { //资产台账不显示运行参数
+      // if (type == "property" && item.firstTag == "RunParam") { //资产台账不显示运行参数
       //     return undefined
       // }
       if (onlyRead) { //只读模式
@@ -1028,8 +1028,8 @@ const showTools = {
   },
   textFormat(item, onlyRead) {
     if (
-      // item.InfoPointCode == "EquipQRCode" ||
-      // item.InfoPointCode == "RoomQRCode"
+      // item.code == "EquipQRCode" ||
+      // item.code == "RoomQRCode"
       item.code == "defaultQRCode"
     ) {
       return {
@@ -1081,7 +1081,7 @@ const showTools = {
         editor: "chosen",
         readOnly: onlyRead,
         chosenOptions: {
-          data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
+          data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
         }
       };
     } else if (item.inputMode == "D2" || item.inputMode == "E2") { //多选输入
@@ -1092,7 +1092,7 @@ const showTools = {
         readOnly: onlyRead,
         chosenOptions: {
           multiple: true, //多选
-          data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
+          data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
         }
       };
     } else if (item.inputMode == "A1" || item.inputMode == "A2") { //数字输入
@@ -1134,8 +1134,8 @@ const showTools = {
   },
   inputModeFilter(item, onlyRead) {
     if (
-      // item.InfoPointCode == "EquipQRCode" ||
-      // item.InfoPointCode == "RoomQRCode"
+      // item.code == "EquipQRCode" ||
+      // item.code == "RoomQRCode"
       item.code == "defaultQRCode"
     ) {
       return {
@@ -1194,7 +1194,7 @@ const showTools = {
         readOnly: !item.editable
       }
     }
-    if (!item.inputMode){
+    if (!item.inputMode) {
       this.$message.error('新版字典不支持')
     }
 
@@ -1205,7 +1205,7 @@ const showTools = {
         editor: "chosen",
         readOnly: !item.editable,
         chosenOptions: {
-          data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
+          data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
         }
       };
     } else if (item.inputMode == "D2" || item.inputMode == "E2") { //多选输入
@@ -1216,7 +1216,7 @@ const showTools = {
         readOnly: !item.editable,
         chosenOptions: {
           multiple: true, //多选
-          data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
+          data: item.dataSource ? tools.formatdataSource(item.dataSource) : ""
         }
       };
     } else if (item.inputMode == "A1" || item.inputMode == "A2") { //数字输入

+ 3 - 2
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -84,6 +84,7 @@ export default {
     async handleCreateTableData() {
       let params = {}
       let flag = 0;//1.存在未填写竖井本地名称的数据;2.存在未选择竖井功能的数据
+      console.log(this.tableData,'table')
       let newData = this.tableData.filter((item) => {
         let keys = Object.keys(item)
         keys.map((key) => { //将值为空字符串的属性删除
@@ -91,9 +92,9 @@ export default {
             delete item[key]
           }
         })
-        if (!item.ShaftLocalName) {
+        if (!item.localName) {
           flag = 1
-        } else if (!item.hasOwnProperty('StructureInfo') || !item.StructureInfo.ShaftFuncType) {
+        } else if (!item.hasOwnProperty('structureInfo') || !item.structureInfo.shaftFuncType) {
           flag = 2
         }
         if (keys.length && Object.keys(item).length) {

+ 3 - 3
src/views/ledger/property/index.vue

@@ -87,10 +87,10 @@ export default {
     //获取header的list
     getNumber() {
       countProperty({}, res => {
-        this.mess.name[0].num = res.Count
+        this.mess.name[0].num = res.count
       })
-      countProperty({ "Filters": "not EquipmentId isNull" }, res => {
-        this.mess.name[1].num = res.Count
+      countProperty({ "filters": "not equipId isNull" }, res => {
+        this.mess.name[1].num = res.count
       })
     },
     //修改楼层

+ 14 - 16
src/views/ledger/report/index.vue

@@ -550,15 +550,15 @@ export default {
       })
     },
     getAssetsCount() {// 获取资产数据
-      countProperty(this.params, res => {
+      // countProperty(this.params, res => {
+      countProperty({}, res => {
         // 获取资产总数
-        this.assetsCount = res.Count;
+        this.assetsCount = res.count;
       })
 
       // 未关联资产
       let param = {
-        ProjectId: this.projectId,
-        Filters: " EquipmentId isnull"
+        filters: " equipId isnull"
       }
       let promise1 = new Promise((resolve) => {
         countProperty(param, res => {
@@ -568,8 +568,7 @@ export default {
 
       // 现场验证状态占比
       let par = {
-        ProjectId: this.projectId,
-        Filters: " taskState = 0 or taskState = 1"
+        filters: " taskState = 0 or taskState = 1"
       }
       let promise2 = new Promise((resolve) => {
         countProperty(par, res => {
@@ -579,7 +578,6 @@ export default {
 
       // 有无坐标占比
       let pa = {
-        ProjectId: this.projectId,
         Filters: " not BIMLocation isnull"
       }
       let promise3 = new Promise((resolve) => {
@@ -599,12 +597,12 @@ export default {
           tips: '资产未关联设备数量',
           contentValueO: '已关联:',
           contentValueT: '未关联:',
-          text: `${res0.Count}`,
-          needCountO: this.assetsCount - res0.Count,
-          needCountT: res0.Count
+          text: `${res0.count}`,
+          needCountO: this.assetsCount - res0.count,
+          needCountT: res0.count
         })
 
-        let text = res1.Count / this.assetsCount;
+        let text = res1.count / this.assetsCount;
         text = this.toPercent(text);
         this.assets.push({
           title: '现场验证状态占比',
@@ -612,11 +610,11 @@ export default {
           contentValueO: '已验证:',
           contentValueT: '未验证:',
           text: text,
-          needCountO: res1.Count,
-          needCountT: this.assetsCount - res1.Count
+          needCountO: res1.count,
+          needCountT: this.assetsCount - res1.count
         })
 
-        let text1 = res2.Count / this.assetsCount;
+        let text1 = res2.count / this.assetsCount;
         text1 = this.toPercent(text1);
         this.assets.push({
           title: '有无坐标占比',
@@ -624,8 +622,8 @@ export default {
           contentValueO: '有坐标:',
           contentValueT: '无坐标:',
           text: text1,
-          needCountO: res2.Count,
-          needCountT: this.assetsCount - res2.Count
+          needCountO: res2.count,
+          needCountT: this.assetsCount - res2.count
         })
       })
     },

+ 6 - 6
src/views/ledger/system/addsystem.vue

@@ -195,7 +195,6 @@ export default {
         return;
       }
       params.content = newData
-
       createSystemBuildFloor(params, res => {
         this.$message.success('创建成功')
         session.remove("systemAddData")
@@ -251,7 +250,7 @@ export default {
       let arr = tools.copyArr(list);
       let data = showTools.headerTypeFilter(arr, 'system', this.onlyRead, this.showType);
       data.unshift({
-        data: "BuildingFloorInfoList",
+        data: "buildingFloorInfoList",
         renderer: text.sysInBuildFloor
       });
       return data;
@@ -352,7 +351,8 @@ export default {
           this.$message("开发中...")
           break;
         //设备二维码图片
-        case 'EquipQRCode':
+        // case 'EquipQRCode':
+        case "defaultQRCode":
           this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
           if (!!this.qrcodeUrl) {
             this.myDialog.qrcode = true;
@@ -361,13 +361,13 @@ export default {
           }
           break;
         //关联设备数量
-        case 'Count':
+        case 'count':
           if (!this.onlyRead) {
             this.myDialog.relevance = true
           }
           break;
         //所属建筑楼层
-        case 'BuildingFloorInfoList':
+        case 'buildingFloorInfoList':
           if (!this.onlyRead) {
             this.$refs.editFloor.showDialog(this.tableData[row.row]);
           }
@@ -378,7 +378,7 @@ export default {
     },
     //建筑楼层
     relateSuccess(data) {
-      this.tableData[this.row].BuildingFloorInfoList = data
+      this.tableData[this.row].buildingFloorInfoList = data
       this.tableExample.render()
     }
   }

+ 1 - 1
src/views/ledger/system/index.vue

@@ -106,7 +106,7 @@ export default {
     },
     //修改设备族
     changeDevice(value) {
-      this.param.deviceId = value.Category
+      this.param.deviceId = value.classCode
       if (value) {
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);