Browse Source

Merge branch 'dev' of git.sagacloud.cn:web/ibms into dev

zhangyu 4 years ago
parent
commit
1ef5d8a5d7

+ 1 - 1
config/dev.env.js

@@ -11,7 +11,7 @@ module.exports = merge(prodEnv, {
   // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
   SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
   BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-  MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+ MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })
 
 

+ 21 - 22
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -14,6 +14,7 @@
           <el-form-item label="资产本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
           <el-form-item label="资产本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
+          <el-form-item label="BIMID:" :title="detail.BIMID">{{ detail.BIMID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
           <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
@@ -92,29 +93,27 @@
 </template>
 
 <script>
-import { } from "@/api/scan/request"
-import { mapGetters } from "vuex"
-export default {
-  components: {
+  import {mapGetters} from "vuex"
 
-  },
-  created() {
-    let {ConfirmTime, PositivePhotoTime, QrCodeTime, NameplateTime, SidePhotoTime, VideoTime, EquipProblemTime, EquipProblem, TaskPicList} = this.detail;
-    let arr = []
-    QrCodeTime && arr.push({
-      timestamp: QrCodeTime,
-      time: new Date(QrCodeTime).getTime(),
-      content: '黏贴二维码',
-      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('带二维码的设备近景照片'))
-    })
-    PositivePhotoTime && arr.push({
-      timestamp: PositivePhotoTime,
-      time: new Date(PositivePhotoTime).getTime(),
-      content: '拍摄正面照片',
-      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备正面照片'))
-    })
-    NameplateTime && arr.push({
-      timestamp: NameplateTime,
+  export default {
+    components: {},
+    created() {
+      let {ConfirmTime, PositivePhotoTime, QrCodeTime, NameplateTime, SidePhotoTime, VideoTime, EquipProblemTime, EquipProblem, TaskPicList} = this.detail;
+      let arr = []
+      QrCodeTime && arr.push({
+        timestamp: QrCodeTime,
+        time: new Date(QrCodeTime).getTime(),
+        content: '黏贴二维码',
+        imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('带二维码的设备近景照片'))
+      })
+      PositivePhotoTime && arr.push({
+        timestamp: PositivePhotoTime,
+        time: new Date(PositivePhotoTime).getTime(),
+        content: '拍摄正面照片',
+        imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备正面照片'))
+      })
+      NameplateTime && arr.push({
+        timestamp: NameplateTime,
       time: new Date(NameplateTime).getTime(),
       content: '拍摄铭牌照片',
       imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('铭牌照片'))

+ 1 - 0
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -16,6 +16,7 @@
           <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
           <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
+          <el-form-item label="BIMID:" :title="detail.BIMID">{{ detail.BIMID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
           <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>

+ 2 - 2
src/components/ledger/details/detail/exhibitionEnergy.vue

@@ -6,7 +6,7 @@
         <div class="table-dynamic" v-for="(value,keys,index) in val.paths">
             <div class="table-title"> {{value.InfoPointName}}:</div>
           <p :style="{'color':value.value? '' :'#F56C6C'}">{{value.value? `表号功能号:${value.value} `:'未维护'}}</p>
-          <p v-if="value.data">{{value.data}}{{value.Unit}}</p>
+          <p v-if="value.data !== ''">{{value.data !== '' ? value.data :'--'}} {{value.Unit}}</p>
 <!--          <p v-else-if="value.error">{{value.error}}</p>-->
           <el-popover
             v-else-if="value.error"
@@ -71,7 +71,7 @@
       float: left;
       max-width: 200px;
       width: 100px;
-      height: 85px;
+      height: 60px;
     }
   }
 </style>

+ 2 - 1
src/components/ledger/details/detail/exhibitionEnergyO.vue

@@ -41,6 +41,7 @@
     }
 
     .table-dynamic {
+      overflow: hidden;
       height: 85px;
       width: 100%;
       margin: 5px 0;
@@ -52,7 +53,7 @@
       float: left;
       max-width: 200px;
       width: 100px;
-      height: 85px;
+      height: 95px;
     }
   }
 </style>

+ 16 - 3
src/components/ledger/lib/bimDialog.vue

@@ -67,7 +67,11 @@
             floorToMap: {},
         }
     },
-    created() {},
+    watch:{
+      bimcode:function(n,o){
+        this.init()
+      }
+    },
     mounted() {
         console.log(this.bimcodeobj)
         this.init()
@@ -190,8 +194,17 @@
                   FloorId: this.Buildfloor[1],
                   BIMLocation
                 },
-              ],
-              Projection: ['BIMLocation', 'BuildingId', 'FloorId'],
+              ] 
+            }
+            param.Projection = []
+            if(this.Buildfloor[0]){
+                param.Projection .push('BuildingId')
+            }
+            if(this.Buildfloor[1]){
+                param.Projection .push('FloorId')
+            }
+            if(BIMLocation){
+                param.Projection .push('BIMLocation')
             }
             updateEquip(param, (res) => {
               if (res.Result == 'success') {

File diff suppressed because it is too large
+ 518 - 508
src/views/ledger/facility/details/index.vue