Browse Source

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

haojianlong 4 years ago
parent
commit
76059f62a9

+ 4 - 2
src/api/relation/api.js

@@ -142,7 +142,8 @@ export function dictUpdate(param, success) {
 
 // 查询关系数据
 export function relQuery(param,success) {
-  let url = `${baseUrl}${dataCenter}/relation-manual-calc/rel-query`
+  // let url = `${baseUrl}${dataCenter}/relation-manual-calc/rel-query`
+  let url = `${baseUrl}${dataCenter}/rel-manual-calc/query`
   httpUtil.postJson(url,param,success)
 }
 //添加关系数据
@@ -151,7 +152,8 @@ export function relAdd(data) {
   let ProjectId = localStorage.getItem("projectId")
   return fetch({
     method: 'POST',
-    url: `${baseUrl}${dataCenter}/relation-manual-calc/rel-add`,
+    // url: `${baseUrl}${dataCenter}/relation-manual-calc/rel-add`,
+    url: `${baseUrl}${dataCenter}/rel-manual-calc/add`,
     data,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })

+ 4 - 4
src/api/scan/httpUtil.js

@@ -49,8 +49,8 @@ function downFile(blob, fileName) {
 
 export default {
   getJson: function (url, data, success, failed, err) {
-    // let ProjectId = localStorage.getItem("projectId")
-    let ProjectId = "Pj1101050029"
+    let ProjectId = localStorage.getItem("projectId")
+    // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
     let vm = this;
     fetch({
@@ -65,8 +65,8 @@ export default {
     });
   },
   postJson: function (url, data, success, failed, err) {
-    // let ProjectId = localStorage.getItem("projectId")
-    let ProjectId = "Pj1101050029"
+    let ProjectId = localStorage.getItem("projectId")
+    // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
     let vm = this;
     fetch({

+ 2 - 2
src/components/business_space/dialogs/addDialog/businessDialog.vue

@@ -672,7 +672,7 @@ export default {
         this.utilToKey(key, "website", data, "InsurerWeb")
         this.utilToKey(key, "phone", data, "InsurerFax")
         this.utilToKey(key, "man", data, "InsurerContactor")
-        this.utilToKey(key, "venderId", data, "DPInsurerID")
+        this.utilToKey(key, "venderId", data, "dpInsurerId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -686,7 +686,7 @@ export default {
         this.utilToKey(key, "phone", data, "MaintainerPhone")
         this.utilToKey(key, "fox", data, "MaintainerFax")
         this.utilToKey(key, "man", data, "MaintainerContactor")
-        this.utilToKey(key, "venderId", data, "DPMaintainerID")
+        this.utilToKey(key, "venderId", data, "dpMaintainerId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },

+ 20 - 20
src/components/data_admin/buildData/recommend-2.vue

@@ -209,7 +209,7 @@
                 console.log("修改厂商库中的值", this.obj, this.key)
                 let webArr = ["SupplierWeb", "InsurerWeb", "MaintainerWeb"],
                     //三大厂商的key
-                    keysArr = ["DPInsurerID", "DPSupplierID", "DPMaintainerID"]
+                    keysArr = ["dpInsurerId", "dpSupplierId", "dpMaintainerId"]
                 //如果是三大厂商的网址
                 if (webArr.indexOf(this.key) > -1) {
                     let param = {
@@ -263,7 +263,7 @@
             /**
              * @param arr 传入的数组
              * @param key 传入的key
-             * 
+             *
              * @return key 对应的key
              */
             getKey(arr, key) {
@@ -278,7 +278,7 @@
             },
             //有obj的信息时
             getDataForm() {
-                let idArr = ["DPManufacturerID", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "DPSpecificationID", "DPBrandID", "DPSpecificationID"]
+                let idArr = ["dpManufacturerId", "dpSupplierId", "dpInsurerId", "dpMaintainerId", "DPSpecificationID", "DPBrandID", "DPSpecificationID"]
                 //点击以下按钮触发按钮事件
                 let vendersArr = ["Manufacturer", "Supplier", "Maintainer", "Insurer", "Brand", "Specification"]
                 if (!!this.fm[this.obj.infosKey]) {
@@ -323,10 +323,10 @@
                 this.showBtn = false
                 this.elseBtnsShow = true
                 if (this.key == "Brand") {
-                    param.manufacturerID = this.fm.DPManufacturerID
+                    param.manufacturerID = this.fm.dpManufacturerId
                 }
                 if (this.key == "Specification") {
-                    param.manufacturerID = this.fm.DPManufacturerID
+                    param.manufacturerID = this.fm.dpManufacturerId
                     param.brandID = this.fm.DPBrandID
                     param.eqFamily = this.fm.Family
                 }
@@ -384,7 +384,7 @@
                 console.log(this.obj.infosKey, this.fm)
                 //型号
                 if (this.obj.infosKey == "DPSpecificationID") {
-                    if (!this.fm.DPManufacturerID) {
+                    if (!this.fm.dpManufacturerId) {
                         this.elseBtnsShow = true
                         this.objMsg = "生产厂家"
                     } else if (!this.fm.DPBrandID) {
@@ -398,17 +398,17 @@
                 }
                 //品牌
                 if (this.obj.infosKey == "DPBrandID") {
-                    if (!this.fm.DPManufacturerID) {
+                    if (!this.fm.dpManufacturerId) {
                         this.objMsg = "生产厂家"
                     }
                 }
                 //生产厂家
-                if (this.obj.infosKey == "DPManufacturerID") {
+                if (this.obj.infosKey == "dpManufacturerId") {
                     this.elseBtnsShow = false
                 }
                 //供应商
-                if (this.obj.infosKey == "DPSupplierID") {
-                    if (!this.fm.DPSupplierID) {
+                if (this.obj.infosKey == "dpSupplierId") {
+                    if (!this.fm.dpSupplierId) {
                         console.log("没有供应商id")
                         this.elseBtnsShow = false
                         if (this.key != "Supplier") {
@@ -418,8 +418,8 @@
                     }
                 }
                 //维修商
-                if (this.obj.infosKey == "DPMaintainerID") {
-                    if (!this.fm.DPMaintainerID) {
+                if (this.obj.infosKey == "dpMaintainerId") {
+                    if (!this.fm.dpMaintainerId) {
                         console.log("没有维修商id")
                         this.elseBtnsShow = false
                         if (this.key != "Maintainer") {
@@ -429,8 +429,8 @@
                     }
                 }
                 //保险公司
-                if (this.obj.infosKey == "DPInsurerID") {
-                    if (!this.fm.DPInsurerID) {
+                if (this.obj.infosKey == "dpInsurerId") {
+                    if (!this.fm.dpInsurerId) {
                         console.log("没有保险id")
                         this.elseBtnsShow = false
                         if (this.key != "Insurer") {
@@ -446,7 +446,7 @@
             getVendersList() {
                 //四大厂商名称
                 this.isChangeId = true
-                let venderIdArr = ["DPManufacturerID", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "DPBrandID"],
+                let venderIdArr = ["dpManufacturerId", "dpSupplierId", "dpInsurerId", "dpMaintainerId", "DPBrandID"],
                     vendersArr = ["Manufacturer", "Supplier", "Maintainer", "Insurer", "Brand"],
                     infosKey = this.obj.infosKey
                 this.showBtn = true
@@ -481,7 +481,7 @@
                             //厂商库中的值与现有的值相等
                             this.isChangeFor = true
                             this.isSameForCreate = true
-                            let keysBtns = ["DPBrandID", "DPManufacturerID"]
+                            let keysBtns = ["DPBrandID", "dpManufacturerId"]
                             if (keysBtns.indexOf(this.obj.infosKey) > -1) {
                                 this.elseBtnsShow = false
                             }
@@ -552,15 +552,15 @@
             create(item) {
                 // console.log(this.obj.infosKey)
                 // let param;
-                // if(this.obj.infosKey == "DPBrandID" || this.obj.infosKey == "DPManufacturerID"){
+                // if(this.obj.infosKey == "DPBrandID" || this.obj.infosKey == "dpManufacturerId"){
                 //     if(this.obj.infosKey == "DPBrandID"){
                 //         param = {
-                //             "venderId": this.fm.Infos.DPManufacturerID,     //String,必填,生产商id
-                //             "name": this.fm.Infos.Brand,              //String,必填,品牌名称   
+                //             "venderId": this.fm.Infos.dpManufacturerId,     //String,必填,生产商id
+                //             "name": this.fm.Infos.Brand,              //String,必填,品牌名称
                 //         }
                 //     }else{
                 //         param = {
-                //             "name": this.fm.Infos.Manufacturer,          
+                //             "name": this.fm.Infos.Manufacturer,
                 //         }
                 //     }
                 //     this.obj.createFunc(param,res=>{

+ 20 - 20
src/components/data_admin/buildData/recommend.vue

@@ -208,7 +208,7 @@
                 console.log("修改厂商库中的值", this.obj, this.key)
                 let webArr = ["SupplierWeb", "InsurerWeb", "MaintainerWeb"],
                     //三大厂商的key
-                    keysArr = ["DPInsurerID", "DPSupplierID", "DPMaintainerID"]
+                    keysArr = ["dpInsurerId", "dpSupplierId", "dpMaintainerId"]
                 //如果是三大厂商的网址
                 if (webArr.indexOf(this.key) > -1) {
                     let param = {
@@ -262,7 +262,7 @@
             /**
              * @param arr 传入的数组
              * @param key 传入的key
-             * 
+             *
              * @return key 对应的key
              */
             getKey(arr, key) {
@@ -277,7 +277,7 @@
             },
             //有obj的信息时
             getDataForm() {
-                let idArr = ["DPManufacturerID", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "DPSpecificationID", "DPBrandID", "DPSpecificationID"]
+                let idArr = ["dpManufacturerId", "dpSupplierId", "dpInsurerId", "dpMaintainerId", "DPSpecificationID", "DPBrandID", "DPSpecificationID"]
                 //点击以下按钮触发按钮事件
                 let vendersArr = ["Manufacturer", "Supplier", "Maintainer", "Insurer", "Brand", "Specification"]
                 if (!!this.fm.Infos[this.obj.infosKey]) {
@@ -322,10 +322,10 @@
                 this.showBtn = false
                 this.elseBtnsShow = true
                 if (this.key == "Brand") {
-                    param.manufacturerID = this.fm.Infos.DPManufacturerID
+                    param.manufacturerID = this.fm.Infos.dpManufacturerId
                 }
                 if (this.key == "Specification") {
-                    param.manufacturerID = this.fm.Infos.DPManufacturerID
+                    param.manufacturerID = this.fm.Infos.dpManufacturerId
                     param.brandID = this.fm.Infos.DPBrandID
                     param.eqFamily = this.fm.Family
                 }
@@ -383,7 +383,7 @@
                 console.log(this.obj.infosKey, this.fm.Infos)
                 //型号
                 if (this.obj.infosKey == "DPSpecificationID") {
-                    if (!this.fm.Infos.DPManufacturerID) {
+                    if (!this.fm.Infos.dpManufacturerId) {
                         this.elseBtnsShow = true
                         this.objMsg = "生产厂家"
                     } else if (!this.fm.Infos.DPBrandID) {
@@ -397,17 +397,17 @@
                 }
                 //品牌
                 if (this.obj.infosKey == "DPBrandID") {
-                    if (!this.fm.Infos.DPManufacturerID) {
+                    if (!this.fm.Infos.dpManufacturerId) {
                         this.objMsg = "生产厂家"
                     }
                 }
                 //生产厂家
-                if (this.obj.infosKey == "DPManufacturerID") {
+                if (this.obj.infosKey == "dpManufacturerId") {
                     this.elseBtnsShow = false
                 }
                 //供应商
-                if (this.obj.infosKey == "DPSupplierID") {
-                    if (!this.fm.Infos.DPSupplierID) {
+                if (this.obj.infosKey == "dpSupplierId") {
+                    if (!this.fm.Infos.dpSupplierId) {
                         console.log("没有供应商id")
                         this.elseBtnsShow = false
                         if (this.key != "Supplier") {
@@ -417,8 +417,8 @@
                     }
                 }
                 //维修商
-                if (this.obj.infosKey == "DPMaintainerID") {
-                    if (!this.fm.Infos.DPMaintainerID) {
+                if (this.obj.infosKey == "dpMaintainerId") {
+                    if (!this.fm.Infos.dpMaintainerId) {
                         console.log("没有维修商id")
                         this.elseBtnsShow = false
                         if (this.key != "Maintainer") {
@@ -428,8 +428,8 @@
                     }
                 }
                 //保险公司
-                if (this.obj.infosKey == "DPInsurerID") {
-                    if (!this.fm.Infos.DPInsurerID) {
+                if (this.obj.infosKey == "dpInsurerId") {
+                    if (!this.fm.Infos.dpInsurerId) {
                         console.log("没有保险id")
                         this.elseBtnsShow = false
                         if (this.key != "Insurer") {
@@ -445,7 +445,7 @@
             getVendersList() {
                 //四大厂商名称
                 this.isChangeId = true
-                let venderIdArr = ["DPManufacturerID", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "DPBrandID"],
+                let venderIdArr = ["dpManufacturerId", "dpSupplierId", "dpInsurerId", "dpMaintainerId", "DPBrandID"],
                     vendersArr = ["Manufacturer", "Supplier", "Maintainer", "Insurer", "Brand"],
                     infosKey = this.obj.infosKey
                 this.showBtn = true
@@ -480,7 +480,7 @@
                             //厂商库中的值与现有的值相等
                             this.isChangeFor = true
                             this.isSameForCreate = true
-                            let keysBtns = ["DPBrandID", "DPManufacturerID"]
+                            let keysBtns = ["DPBrandID", "dpManufacturerId"]
                             if (keysBtns.indexOf(this.obj.infosKey) > -1) {
                                 this.elseBtnsShow = false
                             }
@@ -551,15 +551,15 @@
             create(item) {
                 // console.log(this.obj.infosKey)
                 // let param;
-                // if(this.obj.infosKey == "DPBrandID" || this.obj.infosKey == "DPManufacturerID"){
+                // if(this.obj.infosKey == "DPBrandID" || this.obj.infosKey == "dpManufacturerId"){
                 //     if(this.obj.infosKey == "DPBrandID"){
                 //         param = {
-                //             "venderId": this.fm.Infos.DPManufacturerID,     //String,必填,生产商id
-                //             "name": this.fm.Infos.Brand,              //String,必填,品牌名称   
+                //             "venderId": this.fm.Infos.dpManufacturerId,     //String,必填,生产商id
+                //             "name": this.fm.Infos.Brand,              //String,必填,品牌名称
                 //         }
                 //     }else{
                 //         param = {
-                //             "name": this.fm.Infos.Manufacturer,          
+                //             "name": this.fm.Infos.Manufacturer,
                 //         }
                 //     }
                 //     this.obj.createFunc(param,res=>{

+ 2 - 2
src/components/data_admin/buildData/vendersChange.vue

@@ -200,7 +200,7 @@ export default {
     },
     //创建请求
     createOwn() {
-      let venderIdArr = ["dpManufacturerId", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "dpBrandId"]
+      let venderIdArr = ["dpManufacturerId", "dpSupplierId", "dpInsurerId", "dpMaintainerId", "dpBrandId"]
       console.log(this.fm)
       if (venderIdArr.indexOf(this.obj.infosKey) > -1) {
         let param = {}
@@ -359,7 +359,7 @@ export default {
       this.isCreateShow = false
       this.obj = {}
       this.obj = getJson(this.infosKey.split(".")[1])
-      let venders = ["DPSupplierID", "DPInsurerID", "dpManufacturerId"]
+      let venders = ["dpSupplierId", "dpInsurerId", "dpManufacturerId"]
       if (!!this.obj) {
         let param = {
           venderId: this.fm.Infos[this.obj.infosKey],

+ 2 - 2
src/components/dialogs/addDialog/businessDialog.vue

@@ -672,7 +672,7 @@ export default {
         this.utilToKey(key, "website", data, "InsurerWeb")
         this.utilToKey(key, "phone", data, "InsurerFax")
         this.utilToKey(key, "man", data, "InsurerContactor")
-        this.utilToKey(key, "venderId", data, "DPInsurerID")
+        this.utilToKey(key, "venderId", data, "dpInsurerId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -686,7 +686,7 @@ export default {
         this.utilToKey(key, "phone", data, "MaintainerPhone")
         this.utilToKey(key, "fox", data, "MaintainerFax")
         this.utilToKey(key, "man", data, "MaintainerContactor")
-        this.utilToKey(key, "venderId", data, "DPMaintainerID")
+        this.utilToKey(key, "venderId", data, "dpMaintainerId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },

+ 5 - 5
src/components/dialogs/addDialog/dialogAssets.vue

@@ -396,8 +396,8 @@ export default {
         if (!!item.Infos.dpManufacturerId) {
           item.Infos.dpManufacturerId = item.Infos.dpManufacturerId.split("-")[0]
         }
-        if (!!item.Infos.DPInsurerID) {
-          item.Infos.DPInsurerID = item.Infos.DPInsurerID.split("-")[0]
+        if (!!item.Infos.dpInsurerId) {
+          item.Infos.dpInsurerId = item.Infos.dpInsurerId.split("-")[0]
         }
         if (!!item.Infos.dpMaintainerId) {
           item.Infos.dpMaintainerId = item.Infos.dpMaintainerId.split("-")[0]
@@ -594,7 +594,7 @@ export default {
         let falg = null
         if (!!this.main[row.row].infos) {
           if (!!this.main[row.row].infos) {
-            falg = this.main[row.row].infos.DPInsurerID.split("-")[0]
+            falg = this.main[row.row].infos.dpInsurerId.split("-")[0]
           }
         }
         if (!!falg) {
@@ -647,7 +647,7 @@ export default {
       }
 
       if (
-        val == "infos.DPInsurerID"
+        val == "infos.dpInsurerId"
       ) {
         this.myDialog.insurer = true;
       }
@@ -765,7 +765,7 @@ export default {
         // this.utilToKey(key, "man", data, "InsurerContactor")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name
-          this.utilToKey(key, "venderId", data, "DPInsurerID")
+          this.utilToKey(key, "venderId", data, "dpInsurerId")
         }
       }
       tools.setItem(this.deviceType.code, this.main)

+ 15 - 12
src/components/dialogs/list/batchDialog.vue

@@ -315,20 +315,23 @@ export default {
       }
       let arr = []
       // dpSupplierId 供应商 dpManufacturerId 生产商 dpBrandId 品牌
-      // dpSpecificationId 型号 DPInsurerID 保险商 dpMaintainerId 维修商
+      // dpSpecificationId 型号 dpInsurerId 保险商 dpMaintainerId 维修商
       this.multipleSelection.forEach(item => {
-        let equipId = item.id
-        arr.push({ equipId })
+        // let equipId = item.id
+        // arr.push({ equipId })
+        let id = item.id
+        arr.push({ id })
       })
 
       let Id = {}
-      let single = {};
+      // let single = {};
+      let equipManufactor, supplyPurchase, operationMainte, insuranceDoc;
       // this.filterList 单选数组,取到需要数据
       // 过滤数组,取对象
       this.checkedCities.filter(item => item.num === 2).forEach(i => { //型号
         if (i.info) {
           let { venderName, brandName, Specification, venderId, brandId, specificationId } = i.info
-          single.equipManufactor = {
+          equipManufactor = {
             manufacturer: venderName,
             brand: brandName,
             specification: Specification
@@ -341,7 +344,7 @@ export default {
       this.checkedCities.filter(item => item.num === 8).forEach(i => {  //供应商8
         if (i.info) {
           let { website, name, venderId } = i.info
-          single.supplyPurchase = {
+          supplyPurchase = {
             supplierWeb: website,
             supplier: name,
 
@@ -352,7 +355,7 @@ export default {
       this.checkedCities.filter(item => item.num === 35).forEach(i => {  //维修商
         if (i.info) {
           let { name, venderId } = i.info
-          single.operationMainte = {
+          operationMainte = {
             maintainer: name
           }
           Id.dpMaintainerId = venderId
@@ -366,19 +369,19 @@ export default {
         insurance.forEach(i => {  //保险
           if (i.info) {
             let { website, name, venderId } = i.info
-            single.insuranceDoc = {
+            insuranceDoc = {
               insurer: name,
               insurerWeb: website,
               insuranceFile: file && file.length > 0 && this.radio === 2 ? file : ''
             }
-            Id.DPInsurerID = venderId
+            Id.dpInsurerId = venderId
 
           }
         })
       } else {
 
         if (this.radio === 2 && file && file.length > 0) {
-          single.insuranceDoc = {
+          insuranceDoc = {
             insuranceFile: file
           }
         }
@@ -394,7 +397,7 @@ export default {
         let arr1 = this.deepCopy(arr).map(item => ({
           ...Id,
           ...item,
-          infos: { ...single }
+          infos: { ...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc }
         }))
         let arr2 = this.deepCopy(arr).map(item => ({
           ...item,
@@ -405,7 +408,7 @@ export default {
       if (this.radio === 2) {
         let param = {}, singleList = {}
         this.newEnclosure.forEach(({ path, value }) => param[path] = value)
-        singleList.infos = { ...single }
+        singleList.infos = { ...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc }
         let pa = Object.assign(param, singleList)
         pa = tools.formatData(pa)
         let arr3 = this.deepCopy(arr).map(item => ({

+ 5 - 5
src/components/ledger/addDialog/dialogAssets.vue

@@ -399,8 +399,8 @@ export default {
         if (!!item.Infos.dpManufacturerId) {
           item.Infos.dpManufacturerId = item.Infos.dpManufacturerId.split("-")[0]
         }
-        if (!!item.Infos.DPInsurerID) {
-          item.Infos.DPInsurerID = item.Infos.DPInsurerID.split("-")[0]
+        if (!!item.Infos.dpInsurerId) {
+          item.Infos.dpInsurerId = item.Infos.dpInsurerId.split("-")[0]
         }
         if (!!item.Infos.dpMaintainerId) {
           item.Infos.dpMaintainerId = item.Infos.dpMaintainerId.split("-")[0]
@@ -598,7 +598,7 @@ export default {
         let falg = null
         if (!!this.main[row.row].infos) {
           if (!!this.main[row.row].infos) {
-            falg = this.main[row.row].infos.DPInsurerID.split("-")[0]
+            falg = this.main[row.row].infos.dpInsurerId.split("-")[0]
           }
         }
         if (!!falg) {
@@ -652,7 +652,7 @@ export default {
       }
 
       if (
-        val == "infos.DPInsurerID"
+        val == "infos.dpInsurerId"
       ) {
         this.myDialog.insurer = true;
       }
@@ -770,7 +770,7 @@ export default {
         // this.utilToKey(key, "man", data, "InsurerContactor")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name
-          this.utilToKey(key, "venderId", data, "DPInsurerID")
+          this.utilToKey(key, "venderId", data, "dpInsurerId")
         }
       }
       tools.setItem(this.deviceType.code, this.main)

+ 1 - 1
src/components/ledger/details/detail/exhibitionImage.vue

@@ -5,7 +5,7 @@
       <span>{{exhibitionImage.title}}</span>
     </p>
     <div class="image">
-      <lookImage  :exhibitionImage="exhibitionImage"/>
+      <lookImage :exhibitionImage="exhibitionImage"/>
     </div>
 
   </div>

+ 5 - 5
src/components/ledger/details/detail/lookFile.vue

@@ -8,7 +8,7 @@
             {{key}}
           </p>
           <div v-if="j.fileList !=undefined && j.fileList.length">
-            <div v-for="(item,index) in j.fileList" class="content">
+            <div v-for="(item,index) in j.fileList" class="content" :key="index">
               <!--          图标-->
               <div class="file-box" >
                 <div class="file-box-left ">
@@ -17,15 +17,15 @@
                   </div>
                 </div>
                 <div class="file-box-center">
-                  <p style="margin-top: 20px" :title="item.Name"> {{delFile(item.Name)}}</p>
-                  <p> {{item.CreateTime}}</p>
+                  <p style="margin-top: 20px" :title="item.name"> {{delFile(item.name)}}</p>
+                  <p> {{item.createTime}}</p>
                 </div>
                 <div class="file-box-right ">
                   <a
                     style="height: 88px;cursor: pointer;color: #555"
                     class="iconfont icon-download1 df fs20"
-                    :href="`/image-service/common/file_get/${item.Key}?systemId=dataPlatform`"
-                    :download="item.Name"
+                    :href="`/image-service/common/file_get/${item.key}?systemId=dataPlatform`"
+                    :download="item.name"
                   />
                 </div>
               </div>

+ 245 - 234
src/components/ledger/details/detail/lookImage.vue

@@ -6,13 +6,15 @@
           <div class="" v-for="(j,index) in val">
             <p class="title">
               <span class="iconfont icon-juxing"></span>
-              {{key}}
+              {{ key }}
             </p>
             <div v-if="j.PicList !=undefined && j.PicList.length >0">
               <template v-for="item in j.PicList">
                 <div class="point-look-image">
-                  <img @click="lookImg" :src="imageGetUrl + '&key=' +item.Key" alt v-load style="margin-bottom: 5px">
-                  <p class="pic-name">{{handleName(item.Name)}}</p>
+                  <img @click="lookImg"
+                       :src=handleLookImage(item.key) alt
+                       v-load style="margin-bottom: 5px">
+                  <p class="pic-name">{{ handleName(item.name) }}</p>
                 </div>
               </template>
             </div>
@@ -22,270 +24,279 @@
       </div>
       <div style="text-align: center" v-else>暂无数据</div>
     </div>
-    <details-dialog :title="'图片'" :iframeSrc="iframeSrc" :dialog="dialog" :setData="exhibitionImage.arr"></details-dialog>
+    <details-dialog :title="'图片'" :iframeSrc="iframeSrc" :dialog="dialog"
+                    :setData="exhibitionImage.arr"></details-dialog>
   </div>
 </template>
 <script>
-  import detailsDialog from "@/components/business_space/lib/detailsDia"
+import detailsDialog from "@/components/business_space/lib/detailsDia"
 
-  export default {
-    components: {
-      detailsDialog
+export default {
+  components: {
+    detailsDialog
+  },
+  props: ['exhibitionImage'],
+  data() {
+    return {
+      baseUrl: "",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imagesArr: [],
+      iframeSrc: "",
+      dialog: {
+        details: false
+      }
+    };
+  },
+  methods: {
+    handleLookImage(key) {
+      return `/image-service/common/image_get?systemId=dataPlatform&key=${key}`
     },
-    props: ['exhibitionImage'],
-    data() {
-      return {
-        baseUrl: "",
-        imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
-        imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
-        imagesArr: [],
-        iframeSrc: "",
-        dialog: {
-          details: false
-        }
-      };
+    handleName(val) {
+      return val && val.length > 10 ? val.substring(1, 10) + '...' : val
+    },
+    //查看图片
+    lookImg() {
+      this.dialog.details = true
+      this.iframeSrc = process.env.BASE_URL + ":8890/photo-View.html"
     },
-    methods: {
-      handleName(val) {
-        return val && val.length > 10 ? val.substring(1, 10) + '...' : val
-      },
-      //查看图片
-      lookImg() {
-        this.dialog.details = true
-        this.iframeSrc = process.env.BASE_URL + ":8890/photo-View.html"
-      },
 
-      //上传
-      uploadAndSubmit(item, key) {
-        let file = item.file;
-        // try sending
-        let reader = new FileReader();
+    //上传
+    uploadAndSubmit(item, key) {
+      let file = item.file;
+      // try sending
+      let reader = new FileReader();
 
-        let vm = this;
+      let vm = this;
 
-        let fileType = file.name.split(".");
-        let type = fileType[fileType.length - 1];
-        let CreateTime = tools.formatDate(new Date(file.lastModified))
+      let fileType = file.name.split(".");
+      let type = fileType[fileType.length - 1];
+      let CreateTime = tools.formatDate(new Date(file.lastModified))
 
-        let uploadKey = file.uid
-        if (!!key) {
-          uploadKey = key
-        }
+      let uploadKey = file.uid
+      if (!!key) {
+        uploadKey = key
+      }
 
-        reader.onloadstart = function () {
-          // 这个事件在读取开始时触发
-        };
-        reader.onprogress = function (p) {
-          // 这个事件在读取进行中定时触发
-        };
+      reader.onloadstart = function () {
+        // 这个事件在读取开始时触发
+      };
+      reader.onprogress = function (p) {
+        // 这个事件在读取进行中定时触发
+      };
 
-        reader.onload = function () {
-          // 这个事件在读取成功结束后触发
-        };
-        reader.onloadend = function () {
-          // 这个事件在读取结束后,无论成功或者失败都会触发
-          if (reader.error) {
-          } else {
-            // document.getElementById("bytesRead").textContent = file.size;
-            // 构造 XMLHttpRequest 对象,发送文件 Binary 数据
-            var xhr = new XMLHttpRequest();
-            xhr.open(
-              /* method */
-              "POST",
-              /* target url */
-              vm.imageUploadUrl + "&key=" + uploadKey + "." + type
-              /*, async, default to true */
-            );
-            //xhr.overrideMimeType("application/octet-stream");
-            xhr.send(reader.result);
-            xhr.onreadystatechange = function () {
-              if (xhr.readyState == 4) {
-                if (xhr.status == 200) {
-                  if (vm.type == 'image') {
-                    vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image",
-                      CreateTime
-                    });
-                  }
-                  if (type == 'mp4') {
-                    vm.videoPicArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "video",
-                      CreateTime
-                    });
-                    vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
-                  }
-                  // if (vm.type == "video" && type == "png") {
-                  //   vm.videoPicArr.push({
-                  //     Name: uploadKey + '',
-                  //     Key: uploadKey + "." + type,
-                  //     SystemId: "dataPlatform",
-                  //     Type: "image_video",
-                  //     CreateTime
-                  //   })
-                  // }
-                  vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);
+      reader.onload = function () {
+        // 这个事件在读取成功结束后触发
+      };
+      reader.onloadend = function () {
+        // 这个事件在读取结束后,无论成功或者失败都会触发
+        if (reader.error) {
+        } else {
+          // document.getElementById("bytesRead").textContent = file.size;
+          // 构造 XMLHttpRequest 对象,发送文件 Binary 数据
+          var xhr = new XMLHttpRequest();
+          xhr.open(
+            /* method */
+            "POST",
+            /* target url */
+            vm.imageUploadUrl + "&key=" + uploadKey + "." + type
+            /*, async, default to true */
+          );
+          //xhr.overrideMimeType("application/octet-stream");
+          xhr.send(reader.result);
+          xhr.onreadystatechange = function () {
+            if (xhr.readyState == 4) {
+              if (xhr.status == 200) {
+                if (vm.type == 'image') {
+                  vm.imagesArr.push({
+                    Name: uploadKey + '',
+                    Key: uploadKey + "." + type,
+                    SystemId: "dataPlatform",
+                    Type: "image",
+                    CreateTime
+                  });
+                }
+                if (type == 'mp4') {
+                  vm.videoPicArr.push({
+                    Name: uploadKey + '',
+                    Key: uploadKey + "." + type,
+                    SystemId: "dataPlatform",
+                    Type: "video",
+                    CreateTime
+                  });
+                  vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                 }
+                // if (vm.type == "video" && type == "png") {
+                //   vm.videoPicArr.push({
+                //     Name: uploadKey + '',
+                //     Key: uploadKey + "." + type,
+                //     SystemId: "dataPlatform",
+                //     Type: "image_video",
+                //     CreateTime
+                //   })
+                // }
+                vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);
               }
-            };
-          }
-        };
-        reader.readAsArrayBuffer(file);
-      },
-      dataURLtoBlob(dataURI, type) {
-        var binary = atob(dataURI.split(',')[1]);
-        var array = [];
-        for (var i = 0; i < binary.length; i++) {
-          array.push(binary.charCodeAt(i));
+            }
+          };
         }
-        return new Blob([new Uint8Array(array)], { type: type });
-      },
-
-      creatImg(reader, key) {
-        var videoDom = document.getElementById('video');
-        videoDom.src = reader;
-        let vm = this
-        videoDom.onloadeddata = function () {
-          // 这里可以打印视频时长
-          // 这里取得视频封面
-          var canvas = document.createElement('canvas');
-          canvas.width = 300;
-          canvas.height = 300 * this.videoHeight / this.videoWidth;
-          canvas.getContext('2d').drawImage(this, 0, 0, canvas.width, canvas.height);
-          //将canvas的base64位图片转换成图片png的file
-          var blob = vm.dataURLtoBlob(canvas.toDataURL('image/png'), "image/png")
-          //将其转换成file对象
-          var file = new File([blob], "video_image.png", { type: "image/png", lastModified: Date.now() })//blob转file
-          vm.uploadAndSubmit({ file: file }, key)
-        }
-      },
+      };
+      reader.readAsArrayBuffer(file);
     },
-    watch: {
-      keysArr: function (val) {
-        this.imageFalg();
+    dataURLtoBlob(dataURI, type) {
+      var binary = atob(dataURI.split(',')[1]);
+      var array = [];
+      for (var i = 0; i < binary.length; i++) {
+        array.push(binary.charCodeAt(i));
       }
+      return new Blob([new Uint8Array(array)], { type: type });
     },
-    //自定义指令
-    directives: {
-      load: function (el) {
-        let imgDom = document.createElement("img");
-        imgDom.style.position = "absolute";
-        imgDom.style.top = "-999px";
-        imgDom.style.opacity = 0;
-        imgDom.src = el.src;
-        el.src = "";
-        imgDom.onload = () => {
-          let width = imgDom.width;
-          let height = imgDom.height;
-          if (width > height) {
-            el.style.height = "100%";
-            el.style.width = "auto";
-            el.style.position = "absolute";
-            el.style.left = "50%";
-            el.style.top = "0";
-            el.style.transform = "translateX(-50%)";
-            el.style.webkitTransform = "translateX(-50%) translateY(0)";
-            el.style.MozTransform = "translateX(-50%) translateY(0)";
-            el.style.msTransform = "translateX(-50%) translateY(0)";
-            el.style.OTransform = "translateX(-50%) translateY(0)";
-          } else if (width < height) {
-            el.src = imgDom.src;
-            el.style.width = "100%";
-            el.style.height = "auto";
-            el.style.position = "absolute";
-            el.style.top = "50%";
-            el.style.left = "0";
-            el.style.transform = "translateY(-50%) translateX(0)";
-            el.style.webkitTransform = "translateY(-50%) translateX(0)";
-            el.style.MozTransform = "translateY(-50%) translateX(0)";
-            el.style.msTransform = "translateY(-50%) translateX(0)";
-            el.style.OTransform = "translateY(-50%) translateX(0)";
-          } else {
-            el.style.width = "100%";
-            el.style.height = "100%";
-            el.style.position = "absolute";
-            el.style.top = "0";
-            el.style.left = "0";
-            el.style.transform = "translateY(0) translateX(0)";
-            el.style.webkitTransform = "translateY(0) translateX(0)";
-            el.style.MozTransform = "translateY(0) translateX(0)";
-            el.style.msTransform = "translateY(0) translateX(0)";
-            el.style.OTransform = "translateY(0) translateX(0)";
-          }
-          el.src = imgDom.src;
-        };
+
+    creatImg(reader, key) {
+      var videoDom = document.getElementById('video');
+      videoDom.src = reader;
+      let vm = this
+      videoDom.onloadeddata = function () {
+        // 这里可以打印视频时长
+        // 这里取得视频封面
+        var canvas = document.createElement('canvas');
+        canvas.width = 300;
+        canvas.height = 300 * this.videoHeight / this.videoWidth;
+        canvas.getContext('2d').drawImage(this, 0, 0, canvas.width, canvas.height);
+        //将canvas的base64位图片转换成图片png的file
+        var blob = vm.dataURLtoBlob(canvas.toDataURL('image/png'), "image/png")
+        //将其转换成file对象
+        var file = new File([blob], "video_image.png", { type: "image/png", lastModified: Date.now() })//blob转file
+        vm.uploadAndSubmit({ file: file }, key)
       }
+    },
+  },
+  watch: {
+    keysArr: function (val) {
+      this.imageFalg();
+    }
+  },
+  //自定义指令
+  directives: {
+    load: function (el) {
+      let imgDom = document.createElement("img");
+      imgDom.style.position = "absolute";
+      imgDom.style.top = "-999px";
+      imgDom.style.opacity = 0;
+      imgDom.src = el.src;
+      el.src = "";
+      imgDom.onload = () => {
+        let width = imgDom.width;
+        let height = imgDom.height;
+        if (width > height) {
+          el.style.height = "100%";
+          el.style.width = "auto";
+          el.style.position = "absolute";
+          el.style.left = "50%";
+          el.style.top = "0";
+          el.style.transform = "translateX(-50%)";
+          el.style.webkitTransform = "translateX(-50%) translateY(0)";
+          el.style.MozTransform = "translateX(-50%) translateY(0)";
+          el.style.msTransform = "translateX(-50%) translateY(0)";
+          el.style.OTransform = "translateX(-50%) translateY(0)";
+        } else if (width < height) {
+          el.src = imgDom.src;
+          el.style.width = "100%";
+          el.style.height = "auto";
+          el.style.position = "absolute";
+          el.style.top = "50%";
+          el.style.left = "0";
+          el.style.transform = "translateY(-50%) translateX(0)";
+          el.style.webkitTransform = "translateY(-50%) translateX(0)";
+          el.style.MozTransform = "translateY(-50%) translateX(0)";
+          el.style.msTransform = "translateY(-50%) translateX(0)";
+          el.style.OTransform = "translateY(-50%) translateX(0)";
+        } else {
+          el.style.width = "100%";
+          el.style.height = "100%";
+          el.style.position = "absolute";
+          el.style.top = "0";
+          el.style.left = "0";
+          el.style.transform = "translateY(0) translateX(0)";
+          el.style.webkitTransform = "translateY(0) translateX(0)";
+          el.style.MozTransform = "translateY(0) translateX(0)";
+          el.style.msTransform = "translateY(0) translateX(0)";
+          el.style.OTransform = "translateY(0) translateX(0)";
+        }
+        el.src = imgDom.src;
+      };
     }
-  };
+  }
+};
 </script>
 <style lang="less">
-  #sagaUploads-look-image {
+#sagaUploads-look-image {
+  overflow: hidden;
+
+  .title {
+    /*border-left: 8px solid black;*/
+    margin: 10px 10px 10px 0;
+    font-weight: 600;
+    /*text-indent: 10px;*/
+    display: block;
     overflow: hidden;
+  }
 
-    .title {
-      /*border-left: 8px solid black;*/
-      margin: 10px 10px 10px 0;
-      font-weight: 600;
-      /*text-indent: 10px;*/
-      display: block;
-      overflow: hidden;
-    }
+  .avatar-uploader {
+    height: 180px;
+    width: 180px;
+    overflow: hidden;
 
-    .avatar-uploader {
-      height: 180px;
+    .el-upload {
       width: 180px;
-      overflow: hidden;
+      height: 180px;
 
-      .el-upload {
+      .el-upload-dragger {
         width: 180px;
         height: 180px;
 
-        .el-upload-dragger {
-          width: 180px;
-          height: 180px;
-          .el-icon-plus {
-            display: block;
-            width: 20px;
-            height: 20px;
-            font-size: 20px;
-            margin: 80px;
-          }
+        .el-icon-plus {
+          display: block;
+          width: 20px;
+          height: 20px;
+          font-size: 20px;
+          margin: 80px;
         }
       }
     }
-      .pic-name {
-        position: absolute;
-        right: 72px;
-        display: inline-block;
-        background: #fff;
-        color: #000;
-        padding: 3px;
-        z-index: 99;
-        border-radius: 8px;
-        bottom: 5px;
-      }
-    .point-look-image {
-      height: 180px;
-      margin-bottom: 10px;
-      position: relative;
-      overflow: hidden;
-      img {
-        z-index: 11;
-      }
-      i {
-        position: absolute;
-        bottom: 10px;
-        right: 10px;
-        background-color: #fff;
-        padding: 5px;
-        cursor: pointer;
-        z-index: 66;
-      }
+  }
+
+  .pic-name {
+    position: absolute;
+    right: 72px;
+    display: inline-block;
+    background: #fff;
+    color: #000;
+    padding: 3px;
+    z-index: 99;
+    border-radius: 8px;
+    bottom: 5px;
+  }
+
+  .point-look-image {
+    height: 180px;
+    margin-bottom: 10px;
+    position: relative;
+    overflow: hidden;
+
+    img {
+      z-index: 11;
+    }
+
+    i {
+      position: absolute;
+      bottom: 10px;
+      right: 10px;
+      background-color: #fff;
+      padding: 5px;
+      cursor: pointer;
+      z-index: 66;
     }
   }
+}
 </style>

+ 1 - 1
src/components/ledger/details/detail/lookVideo.vue

@@ -7,7 +7,7 @@
             <video
               width="100%"
               height="100%;"
-              :src="imageGetUrl + '&key=' +item.Key"
+              :src="imageGetUrl + '&key=' +item.key"
               controls="controls"
             >您的浏览器不支持 video 标签。</video>
           </div>

+ 10 - 0
src/components/ledger/handsontables/assets.vue

@@ -1383,6 +1383,11 @@ export default {
           });
         }
         if (filterParam1) {
+          param1.content.map(i => {
+            i.equipId = i.id
+            delete i.id
+            return i
+          })
           setTimeout(() => {
             propertyUpdate(param1, res => {
             })
@@ -1405,6 +1410,11 @@ export default {
     filterCheck(arr, type) {
       if (type === 'sole') {
         for (let i of arr.content) {
+          for (let j in i.infos) {
+            if (Array.isArray(i.infos[j]) && i.infos[j].length < 1) {
+              delete i.infos[j]
+            }
+          }
           return Object.keys(i.infos).length
         }
       } else if (type === 'multiple') {

+ 18 - 2
src/components/ledger/handsontables/device.vue

@@ -1787,6 +1787,11 @@ export default {
           });
         }
         if (filterParam1) {
+          param1.content.map(i => {
+            i.equipId = i.id
+            delete i.id
+            return i
+          })
           setTimeout(() => {
             queryUpdate(param1, res => {
             });
@@ -1801,22 +1806,33 @@ export default {
           });
         }
       }
+
       setTimeout(() => {
         this.getTableData();
         this.getAllData();
-      }, 10);
+      }, 1000);
     },
     filterCheck(arr, type) {
       if (type === "sole") {
         for (let i of arr.content) {
+          for (let j in i.infos) {
+            if (Array.isArray(i.infos[j]) && i.infos[j].length < 1) {
+              delete i.infos[j]
+            }
+          }
           return Object.keys(i.infos).length;
         }
       } else if (type === "multiple") {
         let nArr = [];
         arr.content.forEach(i => {
-          let { equipId, ...value } = i;
+          let { id, ...value } = i;
           nArr.push({ infos: value });
         });
+        // nArr.map(i => {
+        //   if (Array.isArray(i) && i.length < 1) {
+        //     console.log(i)
+        //   }
+        // })
         for (let j of nArr) {
           return Object.keys(j.infos).length;
         }

+ 4 - 4
src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -24,7 +24,7 @@
         </el-table-column>
         <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
                          min-width="100"></el-table-column>
-        <el-table-column prop="structureInfo.shaftFuncType" :label="`${inSpaceType}类`" show-overflow-tooltip
+        <el-table-column prop="infos.shaftFuncType" :label="`${inSpaceType}类`" show-overflow-tooltip
                          min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
@@ -118,7 +118,7 @@ export default {
     getTableData() {
       let params = {
         data: {
-          filters: this.cenoteType ? `projectId='${this.projectId}';structureInfo.shaftFuncType='${this.cenoteType}'` : `projectId='${this.projectId}'`,
+          filters: this.cenoteType ? `projectId='${this.projectId}';infos.shaftFuncType='${this.cenoteType}'` : `projectId='${this.projectId}'`,
           orders: "createTime desc, id asc",
           pageNumber: this.page.pageNumber,
           pageSize: this.page.pageSize,
@@ -132,8 +132,8 @@ export default {
       unSysShaft(params, res => {
         this.tableData = res.content
         this.tableData.forEach(item => {
-          if (item.structureInfo && item.structureInfo.shaftFuncType) {
-            item.structureInfo.shaftFuncType = this.shaftType[item.structureInfo.shaftFuncType]
+          if (item.infos && item.infos.shaftFuncType) {
+            item.infos.shaftFuncType = this.shaftType[item.infos.shaftFuncType]
           }
         })
         this.page.total = res.total

+ 44 - 44
src/components/relation/overview/CardList.vue

@@ -4,20 +4,20 @@
       :key="index"
       v-for="(item,index) in content"
     >
-      <p class="slave-relation-title">{{item.GraphTypeName}}
+      <p class="slave-relation-title">{{item.graphTypeName}}
       <span>(主要连接对象按照标准字典显示)</span>
       </p>
       <section
-        :key="child.GraphTypeId"
+        :key="child.graphTypeId"
         class="container"
-        v-for="(child,childIndex) in item.ChildGraphicTypeList"
+        v-for="(child,childIndex) in item.childGraphicTypeList"
       >
         <p class="relation-text">
           <span class="iconfont icon-juxing"></span>
           <span @click="toDetail(child)" style="cursor:pointer;">
-            {{child.GraphTypeName}}
+            {{child.graphTypeName}}
             <i class="icon-zuzhiguanxi iconfont"/></span>
-          <span class="pic-code">图类型编码:{{child.GraphTypeCode}}</span>
+          <span class="pic-code">图类型编码:{{child.graphTypeCode}}</span>
           <el-tooltip
             :content="child.Note"
             placement="top">
@@ -32,7 +32,7 @@
           <el-col
             :key="relation.Id"
             :span="8"
-            v-for="(relation,relIndex) in child.RelationTypeProjectList"
+            v-for="(relation,relIndex) in child.relationTypeProjectList"
           >
             <el-card
               class="card "
@@ -42,23 +42,23 @@
             >
               <!-- border:none-->
               <!--              <div v-show="relation.cardDisabled || relation.ComputationalState === 3 " class="mask"></div>-->
-              <div v-show="relation.ComputationalState === 3 " class="mask"></div>
+              <div v-show="relation.computationalState === 3 " class="mask"></div>
               <div style="overflow: hidden;">
                 <el-tooltip
-                  :content="relation.RelationTypeName"
+                  :content="relation.relationTypeName"
                   placement="top"
                 >
-                  <p class="relation-title reset-test reset-title">{{relation.RelationTypeName}}</p>
+                  <p class="relation-title reset-test reset-title">{{relation.relationTypeName}}</p>
                 </el-tooltip>
                 <el-tooltip
-                  :content="relation.RelationTypeCode"
+                  :content="relation.relationTypeCode"
                   placement="top"
                 >
-                  <p class="asc reset-title reset-test">边类型编码:{{relation.RelationTypeCode}}</p>
+                  <p class="asc reset-title reset-test">边类型编码:{{relation.relationTypeCode}}</p>
                 </el-tooltip>
                 <p class="relation-title-icon reset-test fr">
                   <el-tooltip
-                    :content="relation.Note"
+                    :content="relation.note"
                     placement="top"
                     style="z-index: 3;position:relative;"
                   >
@@ -72,10 +72,10 @@
                     <div class="grid-content">
                       <p class="object">主要连接对象</p>
                       <el-tooltip
-                        :content="relation.ConneObject"
+                        :content="relation.conneObject"
                         placement="top"
                       >
-                        <p class="group reset-title">{{relation.ConneObject}}</p>
+                        <p class="group reset-title">{{relation.conneObject}}</p>
                       </el-tooltip>
                     </div>
                   </el-col>
@@ -95,21 +95,21 @@
                 <p class="last-computed">
                   <!--  <span v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>-->
                   <!--                  <span v-show="relation.cardDisabled || relation.ComputationalState === 3">关系计算中...</span>-->
-                  <span v-show="relation.ComputationalState === 3">关系计算中...</span>
-                  <span v-show="relation.ComputationalState === 5">计算失败</span>
+                  <span v-show="relation.computationalState === 3">关系计算中...</span>
+                  <span v-show="relation.computationalState === 5">计算失败</span>
                   <span
-                    v-show="relation.ComputationalState !== 3  && relation.ComputingTime">最后一次计算时间 {{relation.ComputingTime}}</span>
+                    v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{relation.computingTime}}</span>
                   <el-tooltip
                     content="启动计算"
                     placement="top"
                   >
                     <el-badge
                       class="item float-right"
-                      :is-dot="relation.ComputationalState === 2 || relation.ComputationalState === 5"
+                      :is-dot="relation.computationalState === 2 || relation.computationalState === 5"
                     >
                       <el-button
                         @click="computed(relation)"
-                        :disabled="!relation.IsSource && !relation.IsAutomatic"
+                        :disabled="!relation.isSource && !relation.isAutomatic"
                         circle
                         type="primary"
                         plain
@@ -125,8 +125,8 @@
                     placement="top"
                   >
                     <el-button
-                      :disabled="relation.Manual === 1"
-                      :style="{'border':(relation.Manual=== 1? '1px solid #DCDFE6' :'')}"
+                      :disabled="relation.manual === 1"
+                      :style="{'border':(relation.manual=== 1? '1px solid #DCDFE6' :'')}"
                       @click="manual(relation)"
                       circle
                       class="float-right sm-button"
@@ -141,7 +141,7 @@
                   <el-tooltip
                     content="设定设备对象源/末端"
                     placement="top"
-                    v-if="relation.IsSource"
+                    v-if="relation.isSource"
                   >
                     <el-button
                       @click="equipment(relation)"
@@ -237,16 +237,16 @@
       },
       computed(relation) {
         this.isComputed = relation // 当前要计算的对象
-        if (relation.RelationType) {
+        if (relation.relationType) {
           this.$emit('calcSpecial', relation)
-          if (relation.IsSource) {
-            this.values.existComputed = `根据现有数据自动计算 <${relation.RelationTypeName}>`
+          if (relation.isSource) {
+            this.values.existComputed = `根据现有数据自动计算 <${relation.relationTypeName}>`
             this.$refs.maintain.dialogTableVisibleMore = true
             this.$refs.maintain.showCascader(relation)
             this.$refs.maintain.handleSourceQuery()
 
           } else {
-            this.values.autoComputed = `根据现有数据自动计算 <${relation.RelationTypeName}>`
+            this.values.autoComputed = `根据现有数据自动计算 <${relation.relationTypeName}>`
             this.$refs.maintain.dialogTableVisible = true
 
 
@@ -257,38 +257,38 @@
         }
       },
       equipment(relation) { //配置源端末端
-        this.values.equipmentSetting = `${relation.RelationTypeName} 源末端关系设置`
+        this.values.equipmentSetting = `${relation.relationTypeName} 源末端关系设置`
         this.$refs.maintain.dialogEquipmentOpen(relation)
         this.$refs.maintain.handleSourceQuery()
       },
       manual(relation) {
-        let {Manual, Prompting, RelationTypeName, ComputingTime} = relation;
-        let device = Prompting && Prompting.split(','),
-          tips = `请前往以下功能页面维护 <${RelationTypeName}>`,
-          optionTips = `请下载当前最新 <${RelationTypeName}> 数据进行手动维护`,
-          lastTime = `最后更新时间为 ${ComputingTime ? ComputingTime : ''}`
+        let {manual, prompting, relationTypeName, computingTime} = relation;
+        let device = prompting && prompting.split(','),
+          tips = `请前往以下功能页面维护 <${relationTypeName}>`,
+          optionTips = `请下载当前最新 <${relationTypeName}> 数据进行手动维护`,
+          lastTime = `最后更新时间为 ${computingTime ? computingTime : ''}`
 
-        if (Manual === 2) {
+        if (manual === 2) {
           this.values = {...this.values, device, tips}
           this.$refs.maintain.dialogManualTip = true
         }
-        if (Manual === 3) {
+        if (manual === 3) {
           // if (relation.RelManualType) {
-          if (relation.RelationType) {
+          if (relation.relationType) {
             this.values = {...this.values, optionTips, lastTime}
             // this.$refs.maintain.dialogManualOption = true //导出excel 弹窗
             this.$router.push({
               path:"relationShip"
             })
             console.log(relation,'relation')
-          localStorage.setItem('RelManualType',relation.RelManualType)
-          localStorage.setItem('RelationTypeName',relation.RelationTypeName)
-          localStorage.setItem('RelationType',relation.RelationType)
-          localStorage.setItem('ZoneType',relation.ZoneType ? relation.ZoneType : '')
-          localStorage.setItem('MainObject',relation.MainObject)
-          localStorage.setItem('FromObject', relation.FromObject)
+          localStorage.setItem('RelManualType',relation.relManualType)
+          localStorage.setItem('RelationTypeName',relation.relationTypeName)
+          localStorage.setItem('RelationType',relation.relationType)
+          localStorage.setItem('ZoneType',relation.zoneType ? relation.zoneType : '')
+          localStorage.setItem('MainObject',relation.mainObject)
+          localStorage.setItem('FromObject', relation.fromObject)
           localStorage.setItem('count', relation.count)
-          localStorage.setItem('ComputingTime', relation.ComputingTime ? relation.ComputingTime : '')
+          localStorage.setItem('ComputingTime', relation.computingTime ? relation.computingTime : '')
           } else {
             this.$message.warning("设计中")
             return false
@@ -307,8 +307,8 @@
         this.$router.push({
           name: 'relationDetail',
           query: {
-            type: detail.GraphTypeCode,
-            RelationTypeProjectList: detail.RelationTypeProjectList
+            type: detail.graphTypeCode,
+            RelationTypeProjectList: detail.relationTypeProjectList
           }
         })
       }

+ 12 - 12
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -207,26 +207,26 @@
               }
             }
             let param = {
-              FromContent:arr,
-              MainContent:this.ruleForm.main,
-              RelType:localStorage.getItem('RelManualType'),
-              Type:this.codeValue
+              fromContent:arr,
+              mainContent:this.ruleForm.main,
+              relType:localStorage.getItem('RelManualType'),
+              type:this.codeValue
             }
             //清空添加value
             let that = this
             relAdd(param).then(res => {
-              if (res.data.Result === "failure") {
-                if(res.data.ErrorType == 1) {
+              if (res.data.result === "failure") {
+                if(res.data.errorType == 1) {
                   // this.mainError = res.data.Message
-                  this.$nextTick(()=>{this.mainError = res.data.Message})
-                } else if(res.data.ErrorType == 2) {
-                  this.$nextTick(()=>{this.fromError = res.data.Message})
+                  this.$nextTick(()=>{this.mainError = res.data.message})
+                } else if(res.data.errorType == 2) {
+                  this.$nextTick(()=>{this.fromError = res.data.message})
                 } else {
-                  this.$message.error(res.data.Message);
+                  this.$message.error(res.data.message);
                 }
 
-              } else if (res.data.Result === "success") {
-                this.$message.success(res.data.Message);
+              } else if (res.data.result === "success") {
+                this.$message.success(res.data.message);
                 this.$emit('update')
                 that.addShipDialog = false
                 that.codeValue = ''

+ 2 - 2
src/framework/layout/layout-store.js

@@ -22,9 +22,9 @@ export default {
       "system:role:query": true,
       "system:role:setOpts": true
     },
-    projectId: 'Pj1101050029',
+    projectId: 'Pj1101051029',
     projects: [{
-      id: "Pj1101050029",
+      id: "Pj1101051029",
       name: "北京东坝万达广场",
       pwd: "saga123456"
     }],

+ 14 - 14
src/views/ledger/facility/parts/index.vue

@@ -364,20 +364,20 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
-        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
-        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
-        val == "LedgerParam.operationMainte.MaintainManual" || //维修保养手册
-        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
-        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
-        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
-        val == "LedgerParam.equipManufactor.OriginalCertificate" || //原厂证明
-        val == "LedgerParam.equipManufactor.TestReport" || //检测报告
-        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
-        val == "LedgerParam.Siteinstall.InstallInstruction" || //
-        val == 'LedgerParam.SupplyPurchase.SupplierContract' || //供应合同
-        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
-        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
+        val == "infos.insuranceFile" || //保险文件
+        val == "infos.archive" || //设备文档
+        val == "infos.checkReport" || //安装质检报告
+        val == "infos.maintainManual" || //维修保养手册
+        val == "infos.approachingAcceptance" || //进场验收单
+        val == "infos.acceptanceReport" || //验收报告
+        val == "infos.operationManual" || //操作说明书
+        val == "infos.originalCertificate" || //原厂证明
+        val == "infos.testReport" || //检测报告
+        val == "infos.productCertification" || //产品合格证
+        val == "infos.installInstruction" || //
+        val == 'infos.supplierContract' || //供应合同
+        val == "infos.drawing" || //设备图纸
+        val == "infos.installDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.filesArr = data ? data : [];

+ 14 - 14
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -511,20 +511,20 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
-        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
-        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
-        val == "LedgerParam.operationMainte.MaintainManual" || //维修保养手册
-        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
-        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
-        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
-        val == "LedgerParam.equipManufactor.OriginalCertificate" || //原厂证明
-        val == "LedgerParam.equipManufactor.TestReport" || //检测报告
-        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
-        val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
-        val == 'LedgerParam.SupplyPurchase.SupplierContract' || //供应合同
-        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
-        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
+        val == "infos.insuranceFile" || //保险文件
+        val == "infos.archive" || //设备文档
+        val == "infos.checkReport" || //安装质检报告
+        val == "infos.maintainManual" || //维修保养手册
+        val == "infos.approachingAcceptance" || //进场验收单
+        val == "infos.acceptanceReport" || //验收报告
+        val == "infos.operationManual" || //操作说明书
+        val == "infos.originalCertificate" || //原厂证明
+        val == "infos.testReport" || //检测报告
+        val == "infos.productCertification" || //产品合格证
+        val == "infos.installInstruction" || //
+        val == 'infos.supplierContract' || //供应合同
+        val == "infos.drawing" || //设备图纸
+        val == "infos.installDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.filesArr = data ? data : []

+ 1 - 2
src/views/ready/buildfloor/addFloor/index.vue

@@ -42,7 +42,7 @@ export default {
     showDialog(data) {
       this.floorData = data || {};
       this.floorData = tools.desFormatData(this.floorData)
-      this.floorData.Outline = this.floorData.Outline ? JSON.stringify(this.floorData.Outline) : null
+      // this.floorData.Outline = this.floorData.Outline ? JSON.stringify(this.floorData.Outline) : null
       //===测试代码===
       // this.floorData.DefaultQRCode = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
       // this.floorData.QRCodePic = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
@@ -69,7 +69,6 @@ export default {
       let form = this.$refs.formItems.form
       let newform = tools.formatData(form)
       newform.buildingId = this.curBuildId
-      newform.outline = newform.outline ? JSON.parse(newform.outline) : undefined
       let Param = {
         content: [newform]
       }

+ 19 - 19
src/views/relation/overview/index.vue

@@ -30,18 +30,18 @@ export default {
       content: [
         // {
         //     GraphTypeId: '3535436',//大分类id
-        //     GraphTypeName: '架构从属关系',//大分类名称
+        //     graphTypeName: '架构从属关系',//大分类名称
         //     GraphTypeCode: '',//大分类编码
         //     Note: '',//说明
         //     ParentId: '',//父id
-        //     ChildGraphicTypeList: [
+        //     childGraphicTypeList: [
         //         {
         //             GraphTypeId: '234534543',//图类型id
-        //             GraphTypeName: '建筑从属关系',//图类型名称
+        //             graphTypeName: '建筑从属关系',//图类型名称
         //             GraphTypeCode: 'ksaajdk',//图类型编码
         //             Note: '显示数字字典excel中的xxx',//说明
         //             ParentId: '3535436',//父id,GraphTypeId
-        //             RelationTypeProjectList: [
+        //             relationTypeProjectList: [
         //                 {
         //                     Id: '23445433534',
         //                     RelationTypeName: '项目下的建筑体',//关系类型名称
@@ -65,9 +65,9 @@ export default {
       countNumber: [
         //     {
         //     "GraphTypeId": "3243215",
-        //     "GraphTypeName": "从属关系",
+        //     "graphTypeName": "从属关系",
         //     "GraphTypeCode": "ksaajdk",
-        //     "RelationTypeProjectList": [
+        //     "relationTypeProjectList": [
         //         {
         //             "Id": "f3bed766a5ba45868d3a744fb8aaa0c8",
         //             "RelationTypeName": "项目下的建筑体",
@@ -119,35 +119,35 @@ export default {
       };
       graphic(dataNumber, res => {
         graphicNumber(dataNumber, resCount => {
-          this.countNumber = resCount.Content;
+          this.countNumber = resCount.content;
           this.loading = false;
-          this.transform(res.Content, this.countNumber);
-          this.content = res.Content;
+          this.transform(res.content, this.countNumber);
+          this.content = res.content;
         });
       });
     },
     transform(list1, list2) {
-      let countInfo = {}; // { GraphTypeName: { Id: count } }
+      let countInfo = {}; // { graphTypeName: { Id: count } }
       list2.forEach(item => {
-        countInfo[item.GraphTypeName] = countInfo[item.GraphTypeName] || {};
-        let rList = item.RelationTypeProjectList;
+        countInfo[item.graphTypeName] = countInfo[item.graphTypeName] || {};
+        let rList = item.relationTypeProjectList;
         rList.forEach(r => {
-          countInfo[item.GraphTypeName][r.Id] = r.Count;
+          countInfo[item.graphTypeName][r.id] = r.count;
         });
       });
       let changeList = [];
       list1.forEach(item => {
         // 这里保存的是引用
-        if (item.ChildGraphicTypeList) {
-          changeList.push(...item.ChildGraphicTypeList);
+        if (item.childGraphicTypeList) {
+          changeList.push(...item.childGraphicTypeList);
         }
       });
       changeList.length &&
         changeList.forEach(item => {
-          let name = item.GraphTypeName;
-          let rList = item.RelationTypeProjectList;
+          let name = item.graphTypeName;
+          let rList = item.relationTypeProjectList;
           rList.forEach(r => {
-            r.count = countInfo[name][r.Id];
+            r.count = countInfo[name][r.id];
             // this.$set(r, 'cardDisabled', false)
           });
         });
@@ -189,7 +189,7 @@ export default {
         //   blockQuery(data, res => {
         //     //    获取源端数据
         //     this.TableVisibleMoreLoading = false
-        //     this.source = res.Content
+        //     this.source = res.content
         //   })
         // })
       }

+ 26 - 26
src/views/relation/relationShip/index.vue

@@ -396,35 +396,35 @@
         this.loading = true
         let data = {
           projectId: this.projectId,
-          ObjectType: 1,
-          RelType: localStorage.getItem('RelManualType'),
-          PageSize: this.pageSize,
+          objectType: 1,
+          relType: localStorage.getItem('RelManualType'),
+          pageSize: this.pageSize,
           // PageSize: 10000000,
-          PageNumber: this.currentPage
+          pageNumber: this.currentPage
         };
         relQuery(data, res => {
           this.filterTable(res)
-          this.length = res.Total || 0
-          this.total = res.Total
+          this.length = res.total || 0
+          this.total = res.total
           this.loading = false
         })
       },
       filterTable(list) {
         let arr = []
-        if(list.Content.length) {
-          list.Content.forEach(i => {
-            i.ObjectInfo && i.ObjectInfo.forEach(j => {
+        if(list.content.length) {
+          list.content.forEach(i => {
+            i.objectInfo && i.objectInfo.forEach(j => {
               arr.push({
-                Name: i.Name,
-                LocalName: i.LocalName,
-                LocalID: i.LocalID,
-                CADID: i.CADID,
-                cName: j.Name,
-                cLocalName: j.LocalName,
-                cLocalID: j.LocalID,
-                cCADID: j.CADID,
-                Id: i.Id,
-                cId: j.Id
+                Name: i.name,
+                LocalName: i.localName,
+                LocalID: i.localId,
+                CADID: i.cadId,
+                cName: j.name,
+                cLocalName: j.localName,
+                cLocalID: j.localId,
+                cCADID: j.cadId,
+                Id: i.id,
+                cId: j.id
               })
             })
           })
@@ -446,18 +446,18 @@
         this.$refs.export.dialogExport = true
       },
       queryTable(i) {
-        let param = {}, RelType = localStorage.getItem('RelManualType');
+        let param = {}, relType = localStorage.getItem('RelManualType');
         if (i === 1) {
           param = {
-            ObjectType: 1,
-            RelType,
-            Vague: this.mainValue
+            objectType: 1,
+            relType,
+            vague: this.mainValue
           }
         } else {
           param = {
-            ObjectType: 2,
-            RelType,
-            Vague: this.formValue
+            objectType: 2,
+            relType,
+            vague: this.formValue
           }
         }
         relQuery(param, res => {