Quellcode durchsuchen

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

zhangyu vor 4 Jahren
Ursprung
Commit
690f92e0c9

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

@@ -855,7 +855,6 @@ export default {
       }
       let pa = {
         content: [space],
-        // projection: ['state']
       }
       zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
@@ -1181,7 +1180,6 @@ export default {
       zoneObj.floorId = this.buildFloor[1];
       let pa = {
         content: [zoneObj],
-        // projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
       }
       if (!zoneObj.outline) {
         pa.nullItems = ['outline']

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

@@ -26,7 +26,7 @@
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- bim坐标弹框 -->
     <bimDialog :dialog="myDialog" :bimcodeobj="bimcodeobj" @closeBIM="closeBIM" :addBody="true"
-               ref="bimdialog"></bimDialog>
+               ref="bimdialog" :read="onlyRead ? true : false"></bimDialog>
     <!--      上传文件-->
     <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
                          :firmDataType="firmDataType"

+ 8 - 2
src/components/ledger/lib/bimDialog.vue

@@ -22,7 +22,7 @@
         <p v-show='!isdata'>当前楼层暂无平面图,请前往“建筑楼层管理”中给楼层添加平面图</p>
       </div>
     </div>
-    <div slot='footer' class='footer'>
+    <div slot='footer' class='footer' v-if="!read">
       <el-button @click='handleClose'>取 消</el-button>
       <el-button type='primary' @click='save'>确 定</el-button>
     </div>
@@ -51,6 +51,10 @@ export default {
     bimcodeobj: {
       default: {},
     },
+    read: {
+      default: true,
+      type: Boolean
+    }
   },
   data() {
     return {
@@ -154,7 +158,9 @@ export default {
       }
       this.view.fitSceneToView()
       this.drawMainScene.isSpaceSelectable = false
-      this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
+      if (!this.read) {
+        this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
+      }
       if (this.floorData.outline && this.floorData.outline.length) {
         let newArr = this.floorData.outline.map((t) => {
           return new SPoint(t.X, t.Y)

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

@@ -111,19 +111,19 @@
 </template>
 
 <script>
-  import {relAdd} from "../../../../api/relation/api";
+import {relAdd} from "../../../../api/relation/api";
 
-  export default {
-    name: "addRelationShip",
-    props: ['values'],
-    data() {
-      var checkCode = (rule, value, callback) => {
-        //TODO
-        callback()
-      }
-      var checkMain = (rule, value, callback) => {
-        //TODO
-        callback()
+export default {
+  name: "addRelationShip",
+  props: ['values'],
+  data() {
+    var checkCode = (rule, value, callback) => {
+      //TODO
+      callback()
+    }
+    var checkMain = (rule, value, callback) => {
+      //TODO
+      callback()
       }
       var codeList = (rule, value, callback) => {
         //TODO
@@ -140,10 +140,10 @@
           label: 'CADID图纸编码'
         }, {
           value: 'name',
-          label: '设备名称'
+          label: '名称'
         }, {
           value: 'id',
-          label: '设备ID'
+          label: 'ID'
         }, {
           value: 'localId',
           label: '本地编码'

+ 0 - 1
src/views/ledger/facility/addfacility.vue

@@ -227,7 +227,6 @@ export default {
         if (item.linkSystem && item.linkSystem.length) {
           item.SystemList = []
           item.linkSystem.map(t => {
-            // todo 测试 t.SysID === ? id
             item.SystemList.push(t.id)
           })
         }

+ 1 - 2
src/views/ledger/facility/batchPoint.vue

@@ -315,8 +315,7 @@ export default {
 				filters: `classCode='${this.classCode}'`,
 				pageSize: this.pageSize,
 				orders: 'createTime desc, id desc',
-				pageNumber: this.pageNumber,
-				// projection: ['category', 'localName', 'localId', 'id', 'bimId', 'cADID', 'locationJson', 'bimLocation'],
+				pageNumber: this.pageNumber
 			}
 			if (this.buildId == 'noKnow') {
 				params.filters += `;buildingId isNull`

+ 1 - 2
src/views/ready/buildfloor/drawGraphy/checkGraphy.vue

@@ -134,8 +134,7 @@ export default {
       }
       if (this.key) {
         let Param = {
-          Content: [{ FloorId: this.floor.FloorID, StructureInfo: { FloorMap: this.key } }],
-          Projection: ['FloorMap'],
+          content: [{ id: this.floor.FloorID, infos: { floorMap: this.key } }]
         }
         manageUpdateFloor(Param, (res) => {
           this.$message.success('更新成功')