Quellcode durchsuchen

add error catch and modify bind data

haojianlong vor 5 Jahren
Ursprung
Commit
1a92c97cfa

+ 1 - 1
package.json

@@ -28,7 +28,7 @@
         "@saga-web/base": "2.1.8",
         "@saga-web/draw": "2.1.56",
         "@saga-web/graphy": "2.1.28",
-        "@saga-web/cad-engine": "2.0.280"
+        "@saga-web/cad-engine": "2.0.282"
     },
     "devDependencies": {
         "ajv": "^6.9.1",

+ 3 - 0
src/api/model/file.js

@@ -81,6 +81,9 @@ let api = {
         if (data.FloorName) {
             Filters = `FolderId='${data.FolderId}';FloorName='${data.FloorName}';ProjectId='${data.ProjectId}'`;
         }
+        if (data.Status) {
+            Filters += `;Status in [${data.Status}]`
+        }
         let params = {
             Filters: Filters
         }

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

@@ -59,7 +59,9 @@ export default {
         return
       }
       let pa = {
-        Content: [{ FloorId: this.floor.FloorID, Id: this.modelIdToFloorId[this.jsonKey], BuildingId: this.floor.BuildID }]
+        FloorId: this.floor.FloorID,
+        Id: this.modelIdToFloorId[this.jsonKey],
+        BuildingId: this.floor.BuildID
       };
       bindFloorModel(pa, res => {
         this.$message.success("更新成功");
@@ -76,6 +78,7 @@ export default {
     handleItemChange(val) {
       let data = {
         FolderId: val[0],
+        Status: '3, 31, 4',
         ProjectId: this.projectId
       };
       request.queryFloorList(data, res => {

+ 5 - 5
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -61,7 +61,7 @@ export default {
       that.drawMainScene.getFloorData('/modelapi/base-graph/query', { ModelId: ModelId }).then(res => {
         that.canvasLoading = false;
         if (res.Result == 'failure') {
-          this.showTools = false;
+          that.showTools = false;
           that.$message.warning(res.Message);
           return;
         }
@@ -75,14 +75,14 @@ export default {
         if (flag) {
           that.view.scene = that.drawMainScene
           that.view.fitSceneToView();
-          that.view.maxScale = that.view.scale * 10;
-          that.view.minScale = that.view.scale;
           that.drawMainScene.isSpaceSelectable = false;
-          if (this.$refs.canvasFun) {
+          if (that.$refs.canvasFun) {
+            that.view.maxScale = that.view.scale * 10;
+            that.view.minScale = that.view.scale;
             that.$refs.canvasFun.everyScale = that.view.scale;
           }
           if (that.OutlineFlag) {
-            this.getFloorData()
+            that.getFloorData()
           }
         }
       })