Browse Source

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu 4 years ago
parent
commit
1f97274529

+ 0 - 2
src/components/business_space/newGraphy/graphy.vue

@@ -435,7 +435,6 @@ export default {
           })
           // 绘制业务空间
           let tempArr = this.BSPRelaISPList.map((t, i) => {
-            console.log(t);
             return {
               RoomLocalName: t.localName || t.name,
               OutLine: t.outline,
@@ -826,7 +825,6 @@ export default {
         isMyTab: 1,
         buildFloorSelectd: this.buildFloor
       }
-
       this.$router.push({
         path: "/ledger/spaceDetail",
         query: query

+ 14 - 11
src/components/dialogs/list/batchDialog.vue

@@ -63,12 +63,14 @@
         <div class="checkbox">
           <p v-for="(item,index) in newEnclosure">
             <el-checkbox v-model="form[item.path]">
-              <span @click="multiple(item.path)" style="cursor: pointer">{{ item.name }}</span>
-              <span
-                class="text-color"
-                v-for="i in item.value"
-              >{{ i.Name | filterImgName }}</span>
             </el-checkbox>
+            <span style="cursor: pointer">{{ item.name }}</span>
+            <el-button @click="multiple(item.path)" type="text">请选择</el-button>
+            <span
+              class="text-color"
+              v-for="i in item.value"
+            >{{ i.name | filterImgName }}</span>
+
           </p>
         </div>
 
@@ -313,12 +315,13 @@ export default {
         });
         return false
       }
+
       let arr = []
       // dpSupplierId 供应商 dpManufacturerId 生产商 dpBrandId 品牌
       // dpSpecificationId 型号 dpInsurerId 保险商 dpMaintainerId 维修商
       this.multipleSelection.forEach(item => {
         let id = item.id
-        arr.push({ id })
+        arr.push({id})
       })
 
       let Id = {}
@@ -383,19 +386,19 @@ export default {
             insuranceFile: file
           }
         }
-
       }
-
       // this.information 多选信息
       let valuable = [], newValuable = []
-      valuable = this.newEnclosure.filter(i => this.form[i.path] && i.value).forEach(({ code, value }) => newValuable[code] = value);
-      // console.log( newValuable,'多选信息')
+
+      valuable = this.newEnclosure.filter(i => this.form[i.path] && i.value).forEach(({code, value}) => newValuable[code] = value);
+      console.log(newValuable, '多选信息', valuable)
+
       if (this.radio === 1) { //组装数据,根据是覆盖该是增量,1是增量
         //    1:单选数据
         let arr1 = this.deepCopy(arr).map(item => ({
           ...Id,
           ...item,
-          infos: { ...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc }
+          infos: {...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc}
         }))
         let arr2 = this.deepCopy(arr).map(item => ({
           ...item,

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

@@ -344,7 +344,7 @@ export default {
           this.getTableData();
           this.getAllData();
           //  信息维护
-          this.newEnclosure = res.content.filter(i => i.dataType == dataTypeMap.ATTACHMENT);
+          this.newEnclosure = res.content.filter(i => i.dataType == dataTypeMap.ATTACHMENT && i.editable == true);
         });
       }
     },
@@ -1093,7 +1093,6 @@ export default {
         path: this.$route.path,
         data: {equip: infos}
       });
-      console.log(val, '=================================')
       switch (val) {
         //操作
         case "caozuo":
@@ -1382,6 +1381,7 @@ export default {
       })
     },
     upDataDevice(type, data1, data2) {
+
       let param = {content: data1};
       let param1 = {content: data2};
       if (type === 1) {

+ 1 - 1
src/components/ledger/lib/uploadFiles.vue

@@ -149,7 +149,7 @@ export default {
           reader.onprogress = function (p) {
             // 这个事件在读取进行中定时触发
             let value = (p.loaded / size) * 100;
-            console.log(p.loaded,size,value,'loaded')
+            // console.log(p.loaded,size,value,'loaded')
           };
 
           reader.onload = function () {

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

@@ -31,132 +31,132 @@ export default {
         label: '未关联设备的资产'
       }],
       header1: [{
-        fieldName: "Building.BuildLocalName",
+        fieldName: "building.localName",
         headerName: "建筑"
       }, {
-        fieldName: "Floor.FloorLocalName",
+        fieldName: "floor.localName",
         headerName: "楼层"
       }, {
-        fieldName: "EquipCategory.EquipName",
+        fieldName: "equipCategory.name",
         headerName: "设备类"
       }, {
-        fieldName: "EquipLocalName",
+        fieldName: "localName",
         headerName: "设备本地名称"
       }, {
-        fieldName: "EquipLocalID",
+        fieldName: "localId",
         headerName: "设备本地编码"
       }, {
-        fieldName: "EquipID",
+        fieldName: "id",
         headerName: "设备id"
       }, {
-        fieldName: "BIMID",
+        fieldName: "bimId",
         headerName: "设备BIMID"
       }, {
-        fieldName: "Property.EquipFamilyList.0.FamilyName",
+        fieldName: "property.equipFamilyList.0.familyName",
         headerName: "资产设备族"
       }, {
-        fieldName: "Property.EquipLocalName",
+        fieldName: "property.localName",
         headerName: "资产本地名称"
       }, {
-        fieldName: "Property.EquipLocalID",
+        fieldName: "property.localId",
         headerName: "资产本地编码"
       }, {
-        fieldName: "Property.EquipID",
+        fieldName: "property.id",
         headerName: "资产id"
       }, {
-        fieldName: "Property.CreateTime",
+        fieldName: "property.createTime",
         headerName: "资产创建时间"
       }, {
-        fieldName: "Property.CodeType",
+        fieldName: "property.codeType",
         headerName: "资产现场验证状态"
       }, {
-        fieldName: "LedgerParam.Siteinstall.InstallLocation",
+        fieldName: "infos.installLocation",
         headerName: "安装位置"
       }],
       header2: [{
-        fieldName: "Building.BuildLocalName",
+        fieldName: "building.localName",
         headerName: "建筑"
       }, {
-        fieldName: "Floor.FloorLocalName",
+        fieldName: "floor.localName",
         headerName: "楼层"
       }, {
-        fieldName: "EquipCategory.EquipName",
+        fieldName: "equipCategory.name",
         headerName: "设备类"
       }, {
-        fieldName: "EquipLocalName",
+        fieldName: "localName",
         headerName: "设备本地名称"
       }, {
-        fieldName: "EquipLocalID",
+        fieldName: "localId",
         headerName: "设备本地编码"
       }, {
-        fieldName: "EquipID",
+        fieldName: "id",
         headerName: "设备id"
       }, {
-        fieldName: "BIMID",
+        fieldName: "bimId",
         headerName: "设备BIMID"
       }, {
-        fieldName: "Property.EquipFamilyList.0.FamilyName",
+        fieldName: "property.equipFamilyList.0.familyName",
         headerName: "资产设备族"
       }, {
-        fieldName: "Property.EquipLocalName",
+        fieldName: "property.localName",
         headerName: "资产本地名称"
       }, {
-        fieldName: "Property.EquipLocalID",
+        fieldName: "property.localId",
         headerName: "资产本地编码"
       }, {
-        fieldName: "Property.EquipID",
+        fieldName: "property.id",
         headerName: "资产id"
       }, {
-        fieldName: "Property.CreateTime",
+        fieldName: "property.createTime",
         headerName: "资产创建时间"
       }, {
-        fieldName: "Property.CodeType",
+        fieldName: "property.codeType",
         headerName: "资产现场验证状态"
       }, {
-        fieldName: "LedgerParam.Siteinstall.InstallLocation",
+        fieldName: "infos.installLocation",
         headerName: "安装位置"
       }],
       header3: [{
-        fieldName: "Building.BuildLocalName",
+        fieldName: "building.localName",
         headerName: "建筑"
       }, {
-        fieldName: "Floor.FloorLocalName",
+        fieldName: "floor.localName",
         headerName: "楼层"
       }, {
-        fieldName: "Equipment.EquipCategory.EquipName",
+        fieldName: "equipment.equipCategory.name",
         headerName: "设备类"
       }, {
-        fieldName: "Equipment.EquipLocalName",
+        fieldName: "equipment.localName",
         headerName: "设备本地名称"
       }, {
-        fieldName: "Equipment.EquipLocalID",
+        fieldName: "equipment.localId",
         headerName: "设备本地编码"
       }, {
-        fieldName: "Equipment.EquipID",
+        fieldName: "equipment.id",
         headerName: "设备id"
       }, {
-        fieldName: "Equipment.BIMID",
+        fieldName: "equipment.bimId",
         headerName: "设备BIMID"
       }, {
-        fieldName: "EquipFamilyList.0.FamilyName",
+        fieldName: "equipFamilyList.0.familyName",
         headerName: "资产设备族"
       }, {
-        fieldName: "EquipLocalName",
+        fieldName: "localName",
         headerName: "资产本地名称"
       }, {
-        fieldName: "EquipLocalID",
+        fieldName: "localId",
         headerName: "资产本地编码"
       }, {
-        fieldName: "EquipID",
+        fieldName: "id",
         headerName: "资产id"
       }, {
-        fieldName: "CreateTime",
+        fieldName: "createTime",
         headerName: "资产创建时间"
       }, {
-        fieldName: "CodeType",
+        fieldName: "codeType",
         headerName: "资产现场验证状态"
       }, {
-        fieldName: "LedgerParam.Siteinstall.InstallLocation",
+        fieldName: "infos.installLocation",
         headerName: "安装位置"
       }]
     }
@@ -179,37 +179,37 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            // projection: ["equipCode", "name"]
           },
           {
             name: "property",
             cascade: [
               {
                 name: "equipFamilyList",
-                projection: [ "family", "familyName" ]
+                // projection: [ "family", "familyName" ]
               }
             ],
-            projection: ["family", "equipLocalName", "equipLocalID", "equipID", "codeType", "createTime"]
+            // projection: ["family", "localName", "localId", "id", "codeType", "createTime"]
           },
           {
             name: "building",
-            projection: ["localName", "name", "id"]
+            // projection: ["localName", "name", "id"]
           },
           {
             name: "floor",
-            projection: ["localName", "name", "id"]
+            // projection: ["localName", "name", "id"]
           }
         ],
-        filters: " not propertyId isnull ",
-        orders: "createTime desc, equipID asc",
+        filters: "not propertyId isnull",
+        orders: "createTime desc, id asc",
         pageNumber: pageNum,
         pageSize: 1000,
-        projection: ["createTime", "buildingId", "floorId", "classCode", "equipLocalName", "equipLocalID", "equipID", "bimId", "infos"]
+        // projection: ["createTime", "buildingId", "floorId", "classCode", "localName", "localId", "id", "bimId", "infos"]
       }
       queryEquip(params, res => {
         this.dataList = this.dataList.concat(res.content.map((item) => {
           item.property.codeType = State[item.property.codeType]
-          // item.Property.Family = Family[item.Property.Family]
+          // item.property.Family = Family[item.property.Family]
           return item
         }))
         if (res.total / (res.pageSize * res.pageNumber) > 1) {
@@ -227,22 +227,22 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            // projection: ["equipCode", "name"]
           },
           {
             name: "building",
-            projection: ["localName", "name", "id"]
+            // projection: ["localName", "name", "id"]
           },
           {
             name: "floor",
-            projection: ["localName", "name", "id"]
+            // projection: ["localName", "name", "id"]
           }
         ],
         filters: " propertyId isnull ",
-        orders: "createTime desc, equipID asc",
+        orders: "createTime desc, id asc",
         pageNumber: pageNum,
         pageSize: 1000,
-        projection: ["createTime", "buildingId", "floorId", "classCode", "equipLocalName", "equipLocalID", "equipID", "bimId", "infos"]
+        // projection: ["createTime", "buildingId", "floorId", "classCode", "localName", "localId", "id", "bimId", "infos"]
       }
       queryEquip(params, res => {
         this.dataList = this.dataList.concat(res.content)
@@ -261,22 +261,22 @@ export default {
         cascade: [
           {
             name: "equipFamilyList",
-            projection: [ "family", "familyName" ]
+            // projection: [ "family", "familyName" ]
           },
           {
             name: "building",
-            projection: [ "localName", "name", "id" ]
+            // projection: [ "localName", "name", "id" ]
           },
           {
             name: "floor",
-            projection: [ "localName", "name", "id" ]
+            // projection: [ "localName", "name", "id" ]
           }
         ],
-        filters: " equipId isnull ",
-        orders: "createTime desc, equipID asc",
+        filters: "id isnull",
+        orders: "createTime desc, id asc",
         pageNumber: pageNum,
         pageSize: 1000,
-        projection: [ "buildingId", "floorId", "family", "equipLocalName", "equipLocalId", "equipId", "createTime", "codeType", "infos"]
+        // projection: [ "buildingId", "floorId", "family", "localName", "localId", "id", "createTime", "codeType", "infos"]
       }
       queryProperty(params, res => {
         this.dataList = this.dataList.concat(res.content.map((item) => {

+ 2 - 2
src/views/ledger/spacelist/index.vue

@@ -142,7 +142,6 @@ export default {
   created() {
     this.getRelations()
     this.childBackParam = this.$route.params;
-    console.log(this.childBackParam);
   },
   mounted() {
   },
@@ -307,7 +306,8 @@ export default {
         this.initMessage();
       } else {
         this.getInfected(this.buildFloorSelectd[1]);
-        ///
+        /// 
+        console.log(this.FloorMap, '========================');
         this.$refs.graphy.getData(this.buildFloorSelectd, this.FloorMap, this.activeTabType);
         this.childBackParam = {}
       }