Procházet zdrojové kódy

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep před 5 roky
rodič
revize
8c037d56b9

+ 2 - 2
src/components/business_space/newGraphy/canvasFun.vue

@@ -32,12 +32,12 @@
     <div v-if="config.isEdit&&config.divide" @click="clearDivide">
       <i class="iconfont icon-Erase"></i>
     </div>
-    <div v-if="config.isEdit" @click="undo">
+    <!-- <div v-if="config.isEdit" @click="undo">
       <i class="iconfont icon-Cancel"></i>
     </div>
     <div v-if="config.isEdit" @click="redo">
       <i class="iconfont icon-Anti-cancel"></i>
-    </div>
+    </div> -->
     <div @click="reduce">
       <i class="iconfont icon-narrow"></i>
     </div>

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

@@ -367,7 +367,7 @@ export default {
       })
     },
     // 获取当前分区下的业务空间
-    getBusinessSpace(other) {
+    getBusinessSpace() {
       this.canvasLoading = true
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
@@ -451,6 +451,7 @@ export default {
       this.scene.isSpaceSelectable = true;
       // 设置业务空间不可选
       this.scene.isZoneSelectable = false
+      this.view._needDraw = true;
     },
     // 查看未关联的业务空间--flag--查看-or-选择
     lookUnrelatBSpace(flag) {
@@ -753,7 +754,7 @@ export default {
       let selectSpace = this.scene.getSelectedSpaces();
       let selectLikeSpace = this.scene.getSelectedLikeSpace();
       //更新业务空间
-      let zoneObj = { Outline: [], Height: 0, State: this.confirmAndSaveFlag ? 0 : this.curZoneItem.Infected ? 1 : 0 }, IspaceIdList = [];
+      let zoneObj = { Outline: [], Height: 0, State: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
       // 空间
       selectSpace.map(t => {
         zoneObj.Outline.push(t.data.OutLine);

+ 43 - 45
src/views/ledger/spacelist/index.vue

@@ -12,8 +12,8 @@
           <span style="color: #999999;font-size: 14px;margin-right: 12px;">建筑楼层</span>
           <el-cascader :options="options" placeholder="请选择建筑楼层" v-model="buildFloorSelectd" @change="changeCascader">
             <template slot-scope="{ node, data }">
-              <i class="el-icon-warning-outline" v-if="data.Count" style="color:red;margin-right:10px;"></i>
               <span>{{ data.label }}</span>
+              <i class="el-icon-warning-outline" v-if="data.Count" style="color:red;margin-right:10px;"></i>
             </template>
           </el-cascader>
         </div>
@@ -48,7 +48,7 @@
         <handsontable-main @lookEqu="lookEqu" ref="handsontable" :zoneCode="activeName" :id="`handsontable${activeName}`"></handsontable-main>
       </div>
       <div class="infectedTips" v-show="isMyTab==1&&infectedTotal>0">
-        <p>因底图变化而受影响的业务空间{{infectedTotal.toString()}}个,本层受影响的业务空间{{infectedCurfloor.toString()}}个</p>
+        <p>因底图变化而受影响的业务空间{{infectedTotal.toString()}}个<span v-show="buildFloorSelectd.length>1">,本层受影响的业务空间{{infectedCurfloor.toString()}}个</span></p>
       </div>
     </div>
     <div v-show="needCalculate" style="display:flex;align-items:center;justify-content:center;height:100%;background-color:#fff;">
@@ -61,48 +61,48 @@
   </div>
 </template>
 <script>
-  // import noModelDialog from "@/components/business_space/dialogs/noModelDialog";
-  // import influenceDialog from "@/components/business_space/dialogs/influenceDialog";
-  // import detailsDialog from "@/components/business_space/dialogs/detailsDialog";
-  // import notRelated from "@/components/business_space/dialogs/notRelated";
-  // import facilityDialog from "@/components/business_space/dialogs/facilityDialog";
-  // import graphy from "@/components/business_space/graphy/business";
-  import graphy from "@/components/business_space/newGraphy/graphy";
-  import roomInFloorDialog from "@/components/business_space/newAddDialogs/roomInFloorDialog";
-  import handsontableMain from "@/components/business_space/business/handsontable";
-  import {
-    zoneCount,
-    getDataDictionary,
-    getrelationTypeProject,
-    getSpaceBdFlCount,
-    queryAllZoneType,
-    queryBFloorWithState,
-    zoneQuery
-  } from "@/api/scan/request";
-  import floorCascader from "@/components/ledger/lib/floorCascader";
-  import {mapGetters} from "vuex";
+// import noModelDialog from "@/components/business_space/dialogs/noModelDialog";
+// import influenceDialog from "@/components/business_space/dialogs/influenceDialog";
+// import detailsDialog from "@/components/business_space/dialogs/detailsDialog";
+// import notRelated from "@/components/business_space/dialogs/notRelated";
+// import facilityDialog from "@/components/business_space/dialogs/facilityDialog";
+// import graphy from "@/components/business_space/graphy/business";
+import graphy from "@/components/business_space/newGraphy/graphy";
+import roomInFloorDialog from "@/components/business_space/newAddDialogs/roomInFloorDialog";
+import handsontableMain from "@/components/business_space/business/handsontable";
+import {
+  zoneCount,
+  getDataDictionary,
+  getrelationTypeProject,
+  getSpaceBdFlCount,
+  queryAllZoneType,
+  queryBFloorWithState,
+  zoneQuery
+} from "@/api/scan/request";
+import floorCascader from "@/components/ledger/lib/floorCascader";
+import { mapGetters } from "vuex";
 
-  export default {
-    components: {
-      graphy,
-      handsontableMain,
-      roomInFloorDialog,
-      floorCascader,
-    },
-    computed: {
-      ...mapGetters('layout', ['projectId', 'userId', 'secret'])
-    },
-    data() {
-      return {
-        floor: {
-          influence: false, //受影响的业务空间弹窗
-          details: false, //详情弹窗
-          notRelated: false,
-          facility: false
-        },
-        param: {
-          ProjId: this.projectId, //项目id
-          UserId: this.userId, //用户id
+export default {
+  components: {
+    graphy,
+    handsontableMain,
+    roomInFloorDialog,
+    floorCascader,
+  },
+  computed: {
+    ...mapGetters('layout', ['projectId', 'userId', 'secret'])
+  },
+  data() {
+    return {
+      floor: {
+        influence: false, //受影响的业务空间弹窗
+        details: false, //详情弹窗
+        notRelated: false,
+        facility: false
+      },
+      param: {
+        ProjId: this.projectId, //项目id
+        UserId: this.userId, //用户id
         secret: this.secret
       },
       buildMess: {
@@ -334,8 +334,6 @@
     // },
     // 触发获取表头-获取初始化信息点
     initMessage() {
-  // this.inquireZone()
-      //
       let params = {
         data: {
           Orders: "sort asc",