浏览代码

合并冲突

zhangyu 4 年之前
父节点
当前提交
6fef1e0b5d

+ 6 - 3
src/api/scan/httpUtil.js

@@ -1,4 +1,4 @@
-import { Message } from 'element-ui';
+import {Message} from 'element-ui';
 import fetch from './fetch'
 import storage from '@/framework/utils/storage'
 
@@ -52,12 +52,13 @@ export default {
     let ProjectId = localStorage.getItem("projectId")
     // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
+    let group_code = localStorage.getItem("group_code")
     let vm = this;
     fetch({
       url: url,
       method: 'get',
       params: data,
-      headers: { 'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName }
+      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {
@@ -68,12 +69,14 @@ export default {
     let ProjectId = localStorage.getItem("projectId")
     // let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
+    let group_code = localStorage.getItem("group_code")
+
     let vm = this;
     fetch({
       url: url,
       method: 'post',
       data: data,
-      headers: { 'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName }
+      headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName, 'group_code': group_code}
     }).then((response) => {
       successResponse(vm, response, success, failed)
     }).catch(error => {

+ 5 - 5
src/components/business_space/business/handsontable.vue

@@ -95,7 +95,7 @@ import {
   zoneQuery,
   zoneUpdate
 } from "@/api/scan/request";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import dialogZone from "../../ledger/addDialog/dialogZone";
 
 export default {
@@ -112,11 +112,11 @@ export default {
     spaceCascader,
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -643,7 +643,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 4 - 1
src/components/business_space/newGraphy/createBSP.vue

@@ -4,7 +4,7 @@
     <el-input :placeholder="`请输入业务空间名称`" v-model="roomName"></el-input>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible=false">取 消</el-button>
-      <el-button size="small" type="primary" @click="confirm">确 定</el-button>
+      <el-button size="small" type="primary" @click="confirm" :disabled="confirmDisable">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -16,6 +16,7 @@ export default {
       title: '提示',
       dialogVisible: false,
       roomName: '',
+      confirmDisable: true
     };
   },
   methods: {
@@ -23,6 +24,7 @@ export default {
     showDialog(val) {
       this.roomName = val;
       this.dialogVisible = true;
+      this.confirmDisable = false;
     },
     // 确认
     confirm() {
@@ -30,6 +32,7 @@ export default {
         this.$message.warning("请填写空间名称");
         return
       }
+      this.confirmDisable = true
       this.$emit('createRoom', this.roomName);
       this.dialogVisible = false;
     }

+ 16 - 8
src/components/business_space/newGraphy/graphy.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="graphy" ref="graphy" v-loading="canvasLoading">
     <div v-show="!FloorMap">
-        <!-- 平面图其他分区 -->
+      <!-- 平面图其他分区 -->
       <!-- <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag">
         <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
         <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
@@ -71,8 +71,8 @@
             <el-button type="primary" v-show='curZoneItem.isInfected' @click="confirmAndSave">保存并确认业务空间</el-button>
           </div>
           <!-- 批量创建所选业务空间 -->
-          <div v-show="type==5">
-            <el-button type="primary" @click="groupCreateZone">批量创建所选业务空间</el-button>
+          <div v-if="type==5">
+            <el-button type="primary" @click.prevent.once="groupCreateZone">批量创建所选业务空间</el-button>
             <el-button plain @click="cancelGraphy">取 消</el-button>
           </div>
           <div style="position: absolute;right: 10px;">
@@ -444,11 +444,17 @@ export default {
               Infected: t.state
             }
           }).filter(item => item)
-          this.scene.removeAllZone();
-          this.scene.addZoneList(tempArr);
-          this.scene.click(this, this.canvasClick);
-          this.zoneList = this.scene.zoneList;
-          this.view._needDraw = true;
+          try {
+            this.scene.removeAllZone();
+            this.scene.addZoneList(tempArr);
+            this.scene.click(this, this.canvasClick);
+            this.zoneList = this.scene.zoneList;
+            this.view._needDraw = true;
+            this.fit();
+          } catch (err) {
+            console.log(err);
+            console.log(this)
+          }
           this.canvasLoading = false;
         }
       })
@@ -531,6 +537,8 @@ export default {
         this.scene.isSpaceSelectable = true;
         // 设置业务空间不可选
         this.scene.isZoneSelectable = false;
+        // 刷新
+        this.view.update()
       }
     },
     // 根据未关联元空间批量创建业务空间

+ 6 - 6
src/components/ledger/handsontables/assets.vue

@@ -129,7 +129,7 @@ import {
   queryProperty,
   updateProperty
 } from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/scan/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
@@ -143,7 +143,7 @@ import myPagination from "@/components/common/myPagination"
 import myCascader from "@/components/ledger/lib/assets"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import dieCascader from "@/components/ledger/lib/partsDieList"
-import { mapGetters } from "vuex"
+import {mapGetters} from "vuex"
 //图片查看
 import lookPic from "@/components/ledger/lib/lookImages"
 import Handsontable from "handsontable-pro"
@@ -173,11 +173,11 @@ export default {
     buildFloor.getData(this.buildFloorData)
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", 'group_code']),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -400,7 +400,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

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

@@ -151,7 +151,7 @@ export default {
     buildFloor.getData(this.buildFloorData);
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead
         ? [
@@ -459,7 +459,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 7 - 13
src/components/ledger/handsontables/system.vue

@@ -64,13 +64,8 @@
   </div>
 </template>
 <script>
-import {
-  BeatchQueryParam,
-  querySysLinkBuild,
-  updateGeneralSys,
-  deleteGeneralSys
-} from "@/api/scan/request"
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, deleteGeneralSys, querySysLinkBuild, updateGeneralSys} from "@/api/scan/request"
+import {getDataDictionary} from "@/api/dict";
 
 import myCascader from "@/components/ledger/lib/system";
 import tools from "@/utils/scan/tools";
@@ -88,7 +83,7 @@ import text from "@/utils/handsontable/mainText"
 import 'handsontable-pro/dist/handsontable.full.css'
 import editSysfloor from "@/components/ledger/lib/editSysFloor";
 
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -103,11 +98,11 @@ export default {
     editSysfloor
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   data() {
@@ -283,7 +278,6 @@ export default {
     },
     //选择设备类型-添加设备
     changeAddType(val) {
-      console.log(val, '=====================')
       this.addData.Category = val.classCode;
       this.addData.CategoryName = val.name;
       this.addData.showType = this.showType;
@@ -331,7 +325,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 94 - 72
src/framework/layout/layout-store.js

@@ -23,117 +23,135 @@ export default {
       "system:role:setOpts": true
     },
     projectId: 'Pj1101051029',
-    projects: [
+    group_code: '',
+    projects: [ // 14 全平台测试环境
       {
         id: "Pj1101051029",
         name: "北京万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj1101050029",
         name: "东坝万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj4403070003",
         name: "深圳龙岗万达广场",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "WD"
       },
       {
         id: "Pj5001120003",
         name: "香港置地约克北郡",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "XG"
       },
 
       {
         id: "Pj1101050013",
         name: "BIM测试项目_亚投行",
-        pwd: "saga123456"
+        pwd: "saga123456",
+        group_code: "BT"
+
       },
       {
         id: "Pj1101080259",
         name: "博锐尚格北京总部办公楼",
-        pwd: "saga123456"
-      },], // 14 全平台测试环境
-    // projects: [
+        pwd: "saga123456",
+        group_code: "BR"
+
+      },],
+    // projects: [// 39,18环境
     //   {
     //     id: "Pj1101051029",
     //     name: "北京万达广场",
-    //     pwd: "saga123456"
+    //     pwd: "saga123456",
+    //     group_code: "WD"
     //   }, {
     //     id: "Pj0001110001",
     //     name: "飞龙商场",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
     //     id: "Pj1101050029",
     //     name: "东坝万达广场",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
     //     id: "Pj4403070003",
     //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj4403050019",
-    //       name: "招商深圳太子广场汇港二期",
-    //       pwd: "saga123456"
-    //     },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj4403050019",
+    //     name: "招商深圳太子广场汇港二期",
+    //     pwd: "saga123456",
+    //     group_code: "ZS"
+    //   }, {
     //     id: "Pj5001120003",
     //     name: "香港置地约克北郡",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj3201110003",
-    //       name: "弘阳集团弘云智慧管理平台",
-    //       pwd: "saga123456"
-    //     }, {
-    //       id: "Pj3702020002",
-    //       name: "青岛海天中心",
-    //       pwd: "saga123456"
-    //     }, {
-    //       id: "Pj1101010006",
-    //       name: "亚投行",
-    //       pwd: "saga123456"
-    //     },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "XG"
+    //   }, {
+    //     id: "Pj3201110003",
+    //     name: "弘阳集团弘云智慧管理平台",
+    //     pwd: "saga123456",
+    //     group_code: "HY"
+    //   }, {
+    //     id: "Pj3702020002",
+    //     name: "青岛海天中心",
+    //     pwd: "saga123456",
+    //     group_code: "GX"
+    //   }, {
+    //     id: "Pj1101010006",
+    //     name: "亚投行",
+    //     pwd: "saga123456",
+    //     group_code: "BT"
+    //   }, {
     //     id: "Pj1101050013",
     //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456"
-    //   },
-    //   {
+    //     pwd: "saga123456",
+    //     group_code: "BT"
+    //   }, {
     //     id: "Pj1101080259",
     //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456"
-    //   },
-    //     {
-    //       id: "Pj1101150002",
-    //       name: "华润生命科学园",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3101150007",
-    //       name: "招商上海森兰花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj5101080004",
-    //       name: "成都招商花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3201130004",
-    //       name: "招商南京燕子矶花园城",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj3702120001",
-    //       name: "金融中心",
-    //       pwd: "saga123456"
-    //     },{
-    //       id: "Pj1101051130",
-    //       name: "万达模型测试项目2",
-    //       pwd: "saga123456"
-    //     }
-    // ],  // 39,18环境
+    //     pwd: "saga123456",
+    //     group_code: "BR"
+    //   }, {
+    //     id: "Pj1101150002",
+    //     name: "华润生命科学园",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3101150007",
+    //     name: "招商上海森兰花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj5101080004",
+    //     name: "成都招商花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3201130004",
+    //     name: "招商南京燕子矶花园城",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj3702120001",
+    //     name: "金融中心",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }, {
+    //     id: "Pj1101051130",
+    //     name: "万达模型测试项目2",
+    //     pwd: "saga123456",
+    //     group_code: "WD"
+    //   }
+    // ],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码
@@ -168,6 +186,7 @@ export default {
       }
       return state.projectId
     },
+    group_code: state => state.group_code,
     breadcrumb: state => {
       if (!state.breadcrumb) {
         let arr = storage.get(KEY_PAGE_BRANDCRUMB)
@@ -204,6 +223,8 @@ export default {
       state.projects.map((item) => {
         if (item.id == val) {
           state.secret = item.pwd
+          state.group_code = item.group_code
+          localStorage.setItem('group_code', item.group_code)
           localStorage.setItem('secret', item.pwd)
         }
       })
@@ -245,7 +266,8 @@ export default {
                 state.projects.push({
                   id: proj.ProjId,
                   name: proj.ProjLocalName,
-                  pwd: proj.Secret ? proj.Secret : ""
+                  pwd: proj.Secret ? proj.Secret : "",
+                  // group_code
                 })
               )
             }

+ 7 - 12
src/views/ledger/cenotelist/index.vue

@@ -55,18 +55,17 @@
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
-import text from "@/utils/handsontable/mainText"
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import handsonTable from "@/components/common/handsontable";
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import {
-  queryCenoteTableData,
-  updataCenoteTableData,
+  BeatchQueryParam,
   deleteCenoteTableData,
+  queryCenoteTableData,
   saveCenoteRelateSpace,
-  BeatchQueryParam
+  updataCenoteTableData
 } from "@/api/scan/request"
-import { mapGetters, mapActions } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -117,11 +116,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", [
-      "projectId",
-      "secret",
-      "userId"
-    ]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
         [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
@@ -489,7 +484,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

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

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建设备</el-button>
+      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建设备</el-button>
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>

+ 6 - 6
src/views/ledger/facility/details/index.vue

@@ -79,10 +79,10 @@ import exhibitionEnergy from "@/components/ledger/details/detail/exhibitionEnerg
 import exhibitionMaintain from "@/components/ledger/details/detail/exhibitionMaintain";
 import selectRadio from "@/components/ledger/details/detail/selectRadio";
 import tools from "@/utils/scan/tools"
-import { BeatchQueryParam } from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
-import { queryEquip } from "@/api/object/equip"
-import { mapGetters } from "vuex";
+import {BeatchQueryParam} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
+import {queryEquip} from "@/api/object/equip"
+import {mapGetters} from "vuex";
 
 export default {
   name: "deviceDetails",
@@ -105,7 +105,7 @@ export default {
     this.getData();
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"])
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"])
   },
   data() {
     return {
@@ -229,7 +229,7 @@ export default {
           }
         })
         let params = { //获取动态参数
-          groupCode: "WD",
+          groupCode: this.group_code,
           appId: "datacenter",
           projectId: this.projectId,
           data: []

+ 5 - 12
src/views/ledger/facility/parts/index.vue

@@ -46,9 +46,7 @@
 </template>
 <script>
 import tools from "@/utils/scan/tools";
-import handsonUtils from "@/utils/hasontableUtils";
 import showTools from "@/utils/handsontable/notShow";
-import text from "@/utils/handsontable/mainText";
 
 import qrcode from "@/components/ledger/lib/qrcode";
 import firm from "@/components/dialogs/list/firm";
@@ -62,14 +60,9 @@ import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog";
 import systemType from "@/components/dialogs/list/systemType";
 import handsonTable from "@/components/common/handsontable";
-import {
-  getEquipPartsType,
-  getEquipPartsCon,
-  deleteParts,
-  BeatchQueryParam
-} from "@/api/scan/request";
-import { getDataDictionary } from "@/api/dict";
-import { mapGetters, mapActions } from "vuex";
+import {BeatchQueryParam, deleteParts, getEquipPartsCon, getEquipPartsType} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -140,7 +133,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"])
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"])
   },
   created() {
     this.queryParam = this.$route.query;
@@ -477,7 +470,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = {
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 1 - 1
src/views/ledger/property/addproperty.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建资产</el-button>
+      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建资产</el-button>
     </el-row>
     <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
                          :dialog="myDialog"></upload-files-dialog>

+ 9 - 11
src/views/ledger/rentlist/index.vue

@@ -64,20 +64,18 @@
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
-import text from "@/utils/handsontable/mainText"
 import roomCountDrawer from "@/components/ledger/rentList/roomCountDrawer"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import handsonTable from "@/components/common/handsontable"
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 import {
-  getRentTableHeader,
-  queryRentTableData,
-  updataRentTableData,
+  BeatchQueryParam,
   deleteRentTableData,
+  queryRentTableData,
   saveRentRelateSpace,
-  BeatchQueryParam
+  updataRentTableData
 } from "@/api/scan/request"
-import { mapGetters, mapActions } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -130,11 +128,11 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapGetters("layout", ["projectId", "secret", "userId", "group_code"]),
     showTypes() {
       return this.onlyRead ?
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }]
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
+        [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
     }
   },
   created() {
@@ -520,7 +518,7 @@ export default {
     //获取动态参数
     getBatch(data) {
       let param = { //获取动态参数
-        groupCode: "WD",
+        groupCode: this.group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []

+ 18 - 21
src/views/ledger/spacelist/index.vue

@@ -10,8 +10,7 @@
       <div class="saga-build-mess">
         <div style="margin-left: 10px;float: left;">
           <span style="color: #999999;font-size: 14px;margin-right: 12px;">建筑楼层</span>
-          <el-cascader :options="options" @change="changeCascader" placeholder="请选择建筑楼层" ref="cascaderAddr"
-                       v-model="buildFloorSelectd">
+          <el-cascader :options="options" @change="changeCascader" placeholder="请选择建筑楼层" ref="cascaderAddr" v-model="buildFloorSelectd">
             <template slot-scope="{ node, data }">
               <span>{{ data.label }}</span>
               <i class="el-icon-warning-outline" v-if="data.count" style="color:red;margin-right:10px;"></i>
@@ -35,29 +34,26 @@
             <template v-for="(item,index) in tabsList">
               <el-tab-pane :name="item.code" :key="index">
                 <span slot="label"><i class="el-icon-warning-outline" v-if="item.count>0"
-                                      style="color:red;margin-right:10px;"></i>{{ item.name }}</span>
+                    style="color:red;margin-right:10px;"></i>{{ item.name }}</span>
               </el-tab-pane>
             </template>
           </el-tabs>
         </div>
       </el-row>
       <div v-show="isMyTab == 1" style="width:100%;height:100%">
-        <graphy @getSp="checkSpace" @dimension="checkSpace" @businessDetails="getBuinessDetails" ref="graphy"
-                @copyID="copyID"
-                @updateState="updateStateSuc"></graphy>
+        <graphy @getSp="checkSpace" @dimension="checkSpace" @businessDetails="getBuinessDetails" ref="graphy" @copyID="copyID"
+          @updateState="updateStateSuc"></graphy>
       </div>
       <div v-show="isMyTab == 2">
-        <handsontable-main @lookEqu="lookEqu" ref="handsontable" :zoneCode="activeName" :otherType="otherType"
-                           :id="`handsontable${activeName}`">
+        <handsontable-main @lookEqu="lookEqu" ref="handsontable" :zoneCode="activeName" :otherType="otherType" :id="`handsontable${activeName}`">
         </handsontable-main>
       </div>
       <div class="infectedTips" v-show="isMyTab==1&&infectedTotal>0">
-        <p>因底图变化而受影响的业务空间{{ infectedTotal.toString() }}个<span
-          v-show="buildFloorSelectd.length>1">,本层受影响的业务空间{{ infectedCurfloor.toString() }}个</span></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;">
+    <div v-show="needCalculate" style="display:flex;align-items:center;justify-content:center;height:100%;background-color:#fff;">
       <div class="center" style="flex:1">
         <i class="iconfont icon-jianzhu" style="font-size:50px;"></i>
         <p style="margin:10px 0;">空间关系已发生变化,请更新关系后再使用业务空间台账</p>
@@ -146,6 +142,7 @@ export default {
   created() {
     this.getRelations()
     this.childBackParam = this.$route.params;
+    console.log(this.childBackParam);
   },
   mounted() {
   },
@@ -247,17 +244,17 @@ export default {
     // 获取关系是否需要计算
     getRelations() {
       let pa = {
-        Filters: `RelationType in ["bd2sp","fl2sp"];ComputationalState>1`
+        filters: `relationType in ["bd2sp","fl2sp"];computationalState>1`
       }
       // 后台暂无接口提供 todo
-      // getrelationTypeProject(pa, res => {
-      //   if (res.Content.length) {
-      //     this.needCalculate = true;
-      //   } else {
-      //     this.needCalculate = false;
-      this.init()
-      //   }
-      // })
+      getrelationTypeProject(pa, res => {
+        if (res.content.length) {
+          this.needCalculate = true;
+        } else {
+          this.needCalculate = false;
+          this.init()
+        }
+      })
     },
     // 通过选中的tab-Code 获取选中的tab的所有数据
     getItemForType() {

+ 5 - 5
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -61,10 +61,10 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import tools from "@/utils/scan/tools";
-import { BeatchQueryParam, zoneDelete, zoneQuery } from '@/api/scan/request';
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, zoneDelete, zoneQuery} from '@/api/scan/request';
+import {getDataDictionary} from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable';
@@ -149,7 +149,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "userId", "secret"])
+    ...mapGetters("layout", ["projectId", "userId", "secret", 'group_code'])
   },
   components: {
     eqToSpaceTable,
@@ -234,7 +234,7 @@ export default {
           }
         })
         let params = { //获取动态参数
-          groupCode: "WD",
+          groupCode: this.group_code,
           appId: "datacenter",
           projectId: this.projectId,
           data: []

+ 2 - 2
src/views/ledger/spacelist/spaceadd/index.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建业务空间</el-button>
+      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建业务空间</el-button>
     </el-row>
 
     <!--二维码弹窗 -->
@@ -407,7 +407,7 @@ export default {
     },
     //上传图片弹窗触发事件
     imgChange(keys) {
-      this.setDataToMain(keys, 'Pic', this.row);
+      this.setDataToMain(keys, 'pic', this.row);
     },
     //判断是否有值,有值赋值
     setDataToMain(data, key, row) {

+ 1 - 1
src/views/ledger/system/addsystem.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建系统</el-button>
+      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建系统</el-button>
     </el-row>
 
     <!-- 关联楼层 -->

+ 5 - 4
src/views/screen/splitscreen/spaceledger/index.vue

@@ -117,12 +117,12 @@
 </template>
 
 <script>
-import { BeatchQueryParam, floorQuery, zoneQuery, zoneQueryOutline } from '@/api/scan/request'
-import { getDataDictionary } from "@/api/dict";
+import {BeatchQueryParam, floorQuery, zoneQuery, zoneQueryOutline} from '@/api/scan/request'
+import {getDataDictionary} from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
-import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib";
+import {DivideFloorScene, FloorView} from "@saga-web/cad-engine/lib";
 import tools from "@/utils/scan/tools";
 import exhibitionBaseInformation from "@/components/ledger/details/detail/exhibitionBaseInformation";
 
@@ -303,6 +303,7 @@ export default {
     getInFormationPoitnName() {// 获取动态数据
       let proId = localStorage.getItem('projectId');
       let secret = localStorage.getItem('secret');
+      let group_code = localStorage.getItem('group_code');
       let params = {
         filters: 'category != STATIC',
         orders: "sort asc",
@@ -311,7 +312,7 @@ export default {
         type: this.$route.query.zone
       }
       let param = {
-        groupCode: "WD",
+        groupCode: group_code,
         appId: "datacenter",
         projectId: this.projectId,
         data: []