Browse Source

adm:feat > 修改接口丢失字段

shaun-sheep 4 years ago
parent
commit
a0c4db11a7

+ 1 - 1
src/api/object/equip.js

@@ -1,4 +1,4 @@
-import { baseUrl, compEquipQuery } from "@/api/scan/config";
+import { baseUrl, compEquipQuery, object } from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
 
 //设备清单 - 查询设备信息

+ 5 - 4
src/api/object/floor.js

@@ -1,19 +1,20 @@
-import { baseUrl, dataCenter } from "@/api/scan/config";
+import { baseUrl, dataCenter, object } from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
 
 //查询楼层信息
 export function floorQuery(param, success) {
-  let url = `${baseUrl}${dataCenter}/floor/query`;
+  let url = `${baseUrl}${object}/floor/query`;
   http.postJson(url, param, success);
 }
 
 //建筑楼层管理-创建楼层
 export function manageCreateFloor(param, success) {
-  let url = `${baseUrl}${dataCenter}/floor/create`;
+  let url = `${baseUrl}${object}/floor/create`;
   http.postJson(url, param, success)
 }
+
 //建筑楼层管理-修改楼层
 export function manageUpdateFloor(param, success) {
-  let url = `${baseUrl}${dataCenter}/floor/update`;
+  let url = `${baseUrl}${object}/floor/update`;
   http.postJson(url, param, success)
 }

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

@@ -1886,7 +1886,7 @@ export function unshaftInSys(param, success) {
 
 //设备所在的竖井,竖井一对多,此方不会覆盖以前的记录,累计添加
 export function linkEqSh(param, success) {
-  let url = `${baseUrl}${dataCenter}/eq-in-sh/link-eq-sh`;
+  let url = `${baseUrl}${dataCenter}/rel/eq-in-sh/link-eq-sh`;
   http.postJson(url, param, success)
 }
 

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

@@ -74,7 +74,6 @@ export default {
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
     getData() {
-
       // params.filters += `;buildingId isNull`;
 
 

+ 53 - 22
src/views/model/report/supplement.vue

@@ -4,28 +4,35 @@
     <div class="content-box" v-for="(item,index) in pageData" :key="index">
       <div class="content-top">
         <div class="details">
-          <h4>{{index |numTransformation(4)}}<el-badge value="待补充" class="item" type="success"></el-badge>
+          <h4>{{ index |numTransformation(4) }}
+            <el-badge value="待补充" class="item" type="success"></el-badge>
           </h4>
-          <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
-          <b>标记码:<span @dblclick="copyContent" id="copy">{{item.EquipID}}</span></b><span class="copy" @click="clickCopy">点击复制</span>
-          <input id="copyContent" type="text" @dblclick="copyContent" style="border:none;opacity:0;position:absolute;top:0;left:0;">
-          <p style="margin-top:30px;">建议使用的Revit族:{{item.Res}}</p>
-          <p>设计图纸中编码:{{item.CADID}}</p>
-          <p><span>资产族:{{item.FamilyName.Name}}</span></p>
-          <p><span style="width:500px;">资产ID:{{item.EquipID}}</span></p>
-          <p>现场发现人:{{item.FindPeople}}</p>
+          <h4>
+            {{ `${item.BuildingName}建筑模型` }}-{{
+              `${item.FloorName}层`
+            }}-{{ `${item.EquipLocalName ? item.EquipLocalName : item.EquipName}` }}</h4>
+          <b>标记码:<span @dblclick="copyContent" id="copy">{{ item.EquipID }}</span></b><span class="copy"
+                                                                                            @click="clickCopy">点击复制</span>
+          <input id="copyContent" type="text" @dblclick="copyContent"
+                 style="border:none;opacity:0;position:absolute;top:0;left:0;">
+          <p style="margin-top:30px;">建议使用的Revit族:{{ item.Res }}</p>
+          <p>设计图纸中编码:{{ item.CADID }}</p>
+          <p><span>资产族:{{ item.FamilyName.Name }}</span></p>
+          <p><span style="width:500px;">资产ID:{{ item.EquipID }}</span></p>
+          <p>现场发现人:{{ item.FindPeople }}</p>
         </div>
         <div class="plan">
-          <p>平面图上的位置:<span>{{item.local | localTransformation}}</span></p>
+          <p>平面图上的位置:<span>{{ item.local | localTransformation }}</span></p>
           <div class="img-box">
-            <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.ModelId"
-              :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
+            <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"
+                    :data-modelid="item.ModelId"
+                    :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
           </div>
         </div>
       </div>
       <div class="content-bottom">
         <div class="photo" v-for="(it,ind) in item.LedgerParam.PhotoDoc.Nameplate" :key="ind">
-          <p>{{it.name}}<span>拍摄时间:{{it.createTime | timeTransformation}}</span></p>
+          <p>{{ it.name }}<span>拍摄时间:{{ it.createTime | timeTransformation }}</span></p>
           <div class="img-box">
             <div class="img-content">
               <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="铭牌图片">
@@ -35,7 +42,7 @@
         <div class="photo" v-for="(photo,num) in item.LedgerParam.PhotoDoc.Pic" :key="num+photo">
           <div class="img-box" v-if="item.LedgerParam.PhotoDoc.Pic">
             <p v-if="item.LedgerParam.PhotoDoc.Pic && photo.type !== 'video'">
-              {{photo.name}}<span>拍摄时间:{{photo.createTime | timeTransformation}}</span>
+              {{ photo.name }}<span>拍摄时间:{{ photo.createTime | timeTransformation }}</span>
             </p>
             <div class="img-content" v-if="photo.type !=='video'">
               <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${photo.key}`" alt="现场图片">
@@ -53,9 +60,7 @@ import { toBeSupplementEquip } from "@/api/scan/request.js";
 import { LocationPointScene, FloorView } from "@saga-web/cad-engine/lib";
 
 export default {
-  components: {
-
-  },
+  components: {},
   data() {
     return {
       pageData: [],
@@ -89,8 +94,7 @@ export default {
       return str;
     },
     timeTransformation(time) {// 时间转换
-      time = time.substring(0, 16)
-      return time;
+      return time ? time.substring(0, 16) : ''
     }
   },
   mounted() {
@@ -230,7 +234,8 @@ export default {
         if (this.i !== this.pageData.length) {
           this.$nextTick(() => {
             this.getGraphy();
-          })        }
+          })
+        }
       })
     },
     clearGraphy(i) {
@@ -250,50 +255,63 @@ export default {
     margin-right: 0;
   }
 }
+
 .box {
   background: #f2f2f2;
   margin: 0 auto;
   height: 100%;
   overflow-y: auto;
+
   ul {
     .infinite-list-item {
       margin-bottom: 20px;
     }
   }
+
   .content-box {
     width: 1000px;
     margin: 0 auto;
     background: white;
     padding: 10px 4px 10px 20px;
     box-sizing: border-box;
+
     .content-top {
       display: flex;
+
       div {
         flex: 1;
       }
+
       .details {
         margin-right: 10px;
+
         .el-badge {
           margin: 10px 0 0 10px;
         }
+
         p {
           margin-top: 4px;
+
           span:nth-child(1) {
             display: inline-block;
             width: 200px;
           }
         }
+
         .copy {
           color: #409eff;
           margin-left: 20px;
         }
       }
+
       .plan {
         padding-left: 20px;
         box-sizing: border-box;
+
         p {
           width: 100%;
           margin: 10px 0 10px 0;
+
           span {
             float: right;
             padding-right: 20px;
@@ -302,36 +320,45 @@ export default {
         }
       }
     }
+
     .content-bottom {
       width: 100%;
       margin-top: 20px;
       overflow: hidden;
+
       .photo,
       .explain {
         float: left;
         width: 50%;
       }
+
       .photo {
         box-sizing: border-box;
         margin-bottom: 24px;
+
         p {
           margin-bottom: 10px;
         }
+
         span {
           float: right;
           padding-right: 20px;
           box-sizing: border-box;
         }
       }
+
       .explain {
         padding-right: 20px;
         box-sizing: border-box;
+
         .el-scrollbar {
           background: #f2f2f2;
         }
+
         p {
           margin-bottom: 10px;
         }
+
         .explain-content {
           padding: 10px;
           width: 100%;
@@ -342,17 +369,20 @@ export default {
     }
   }
 }
+
 .img-box {
   width: 100%;
+
   .img-content {
     overflow: hidden;
     position: relative;
-    width: calc(100%-20px);
+    width: calc(100% - 20px);
     height: 300px;
     vertical-align: middle;
     text-align: center;
     background: #ebeef5;
     margin-right: 20px;
+
     img {
       position: absolute;
       left: 50%;
@@ -363,7 +393,8 @@ export default {
     }
   }
 }
+
 canvas {
   position: static !important;
 }
-</style>
+</style>