修改变量名

src/components/business_space/table/addEquip.vue

@@ -117,7 +117,7 @@ export default {
     myPagination
   },
   computed: {
-        ...mapGetters("peojMess", [
+        ...mapGetters("layout", [
             "projectId",
             "secret",
             "userId"

src/components/business_space/table/businessTable.vue

@@ -59,7 +59,7 @@ export default {
     myPagination
   },
   computed: {
-            ...mapGetters("peojMess", [
+            ...mapGetters("layout", [
                 "projectId",
                 "secret",
                 "userId"

src/framework/layout/PageHeader.vue

@@ -41,15 +41,15 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('layout', ['sidebarClosed', 'userInfo', 'projects', 'currentProjectId'])
+        ...mapGetters('layout', ['sidebarClosed', 'userInfo', 'projects', 'projectId'])
     },
     watch: {
         selectedProjectId(n, o) {
-            this.setCurrentProjectId(n)
+            this.setprojectId(n)
         }
     },
     methods: {
-        ...mapMutations('layout', ['setSidebarClosed', 'setCurrentProjectId']),
+        ...mapMutations('layout', ['setSidebarClosed', 'setprojectId']),
         handleSelect() {},
         toggleSidebar() {
             this.setSidebarClosed(!this.sidebarClosed)
@@ -66,7 +66,7 @@ export default {
     },
     created() {
         // console.log('--------------------- PageHeader created')
-        this.selectedProjectId = this.currentProjectId
+        this.selectedProjectId = this.projectId
     },
     mounted() {},
     components: {}

src/framework/layout/layout-store.js

@@ -12,7 +12,7 @@ export default {
         sidebarSelected: '', // sidebar选中的选项
         userInfo: { username: 'admin' },
         permissions: { "system:role:delete": true, "system:role:create": true, "system:role:query": true, "system:role:setOpts": true },
-        currentProjectId: 'Pj4201050001',
+        projectId: 'Pj4201050001',
         projects: [{ name: '新华创新大厦', id: 'Pj1101080002' }, { name: '亚心医院', id: 'Pj4201050001' }],
         breadcrumb: [],
         secret: "saga123456", //密码
@@ -33,14 +33,14 @@ export default {
         userInfo: state => state.userInfo,
         permissions: state => state.permissions,
         projects: state => state.projects,
-        currentProjectId: state => {
-            if (!state.currentProjectId) {
+        projectId: state => {
+            if (!state.projectId) {
                 let pid = storage.get(KEY_PROJECT_SELECTED)
                 if (pid) {
-                    state.currentProjectId = pid
+                    state.projectId = pid
                 }
             }
-            return state.currentProjectId
+            return state.projectId
         },
         breadcrumb: state => {
             if (!state.breadcrumb) {
@@ -58,8 +58,8 @@ export default {
             state.sidebarSelected = val
             storage.set(KEY_MENU_SELECTED, val)
         },
-        setCurrentProjectId: (state, val) => {
-            state.currentProjectId = val
+        setprojectId: (state, val) => {
+            state.projectId = val
             storage.set(KEY_PROJECT_SELECTED, val)
         }
     },

src/views/business_space/business_list/index.vue

@@ -104,11 +104,7 @@
             facilityDialog
         },
         computed: {
-            ...mapGetters("peojMess", [
-                "projectId",
-                "secret",
-                "userId"
-            ])
+            ...mapGetters('layout', ['projectId', 'userId', 'secret'])
         },
         data() {
             return {

src/views/data_admin/buildAssets/NoMap.vue

@@ -71,14 +71,14 @@ export default {
         SagaStation
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'userId', 'secret'])
+        ...mapGetters('layout', ['projectId', 'userId', 'secret'])
     },
     methods: {
         look(row) {
             this.iframeSrc =
                 process.env.BASE_URL +
                 ':8889/#/details?perjectId=' +
-                this.currentProjectId +
+                this.projectId +
                 '&secret=' +
                 this.secret +
                 '&FmId=' +
@@ -100,7 +100,7 @@ export default {
             })
                 .then(() => {
                     let param = {
-                        ProjId: this.currentProjectId,
+                        ProjId: this.projectId,
                         UserId: this.userId
                     }
                     let paramList = [row.FmId]
@@ -136,7 +136,7 @@ export default {
                 PageNum: this.pageNum,
                 PageSize: this.pageSize,
                 Type: 3,
-                ProjId: this.currentProjectId,
+                ProjId: this.projectId,
                 UserId: this.userId
             }
             getErrAssets(param).then(res => {

src/views/data_admin/buildAssets/Nofind.vue

@@ -62,14 +62,14 @@ export default {
         SagaDialog
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'userId', 'secret'])
+        ...mapGetters('layout', ['projectId', 'userId', 'secret'])
     },
     methods: {
         look(row) {
             this.iframeSrc =
                 process.env.BASE_URL +
                 ':8889/#/details?perjectId=' +
-                this.currentProjectId +
+                this.projectId +
                 '&secret=' +
                 this.secret +
                 '&FmId=' +
@@ -86,7 +86,7 @@ export default {
             })
                 .then(() => {
                     let param = {
-                        ProjId: this.currentProjectId,
+                        ProjId: this.projectId,
                         UserId: this.userId
                     }
                     let paramList = [row.FmId]
@@ -119,7 +119,7 @@ export default {
                 PageNum: this.pageNum,
                 PageSize: this.pageSize,
                 Type: 1,
-                ProjId: this.currentProjectId,
+                ProjId: this.projectId,
                 UserId: this.userId
             }
             getErrAssets(param).then(res => {

src/views/data_admin/buildAssets/Nopaint.vue

@@ -61,14 +61,14 @@ export default {
         SagaDialog
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'userId', 'secret'])
+        ...mapGetters('layout', ['projectId', 'userId', 'secret'])
     },
     methods: {
         look(row) {
             this.iframeSrc =
                 process.env.BASE_URL +
                 ':8889/#/details?perjectId=' +
-                this.currentProjectId +
+                this.projectId +
                 '&secret=' +
                 this.secret +
                 '&FmId=' +
@@ -85,7 +85,7 @@ export default {
             })
                 .then(() => {
                     let param = {
-                        ProjId: this.currentProjectId,
+                        ProjId: this.projectId,
                         UserId: this.userId
                     }
                     let paramList = [row.FmId]
@@ -118,7 +118,7 @@ export default {
                 PageNum: this.pageNum,
                 PageSize: this.pageSize,
                 Type: 2,
-                ProjId: this.currentProjectId,
+                ProjId: this.projectId,
                 UserId: this.userId
             }
             getErrAssets(param).then(res => {

src/views/data_admin/buildAssets/Noverify.vue

@@ -89,14 +89,14 @@ export default {
         SagaDialog
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'userId', 'secret'])
+        ...mapGetters('layout', ['projectId', 'userId', 'secret'])
     },
     methods: {
         look(row) {
             this.iframeSrc =
                 process.env.BASE_URL +
                 ':8889/#/details?perjectId=' +
-                this.currentProjectId +
+                this.projectId +
                 '&secret=' +
                 this.secret +
                 '&FmId=' +
@@ -109,7 +109,7 @@ export default {
             this.iframeSrc =
                 process.env.BASE_URL +
                 ':8889/#/details?perjectId=' +
-                this.currentProjectId +
+                this.projectId +
                 '&secret=' +
                 this.secret +
                 '&FmId=' +
@@ -143,7 +143,7 @@ export default {
             })
                 .then(() => {
                     let param = {
-                        ProjId: this.currentProjectId,
+                        ProjId: this.projectId,
                         UserId: this.userId
                     }
                     delErrAssets(param, paramList).then(result => {

src/views/data_admin/buildAssets/Station.vue

@@ -27,7 +27,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'secret', 'userId'])
+        ...mapGetters('layout', ['projectId', 'secret', 'userId'])
     },
     props: {
         options: {
@@ -47,7 +47,7 @@ export default {
                     BuildId: this.itemObj.BuildId,
                     category: this.value,
                     secret: this.secret,
-                    perjectId: this.currentProjectId,
+                    perjectId: this.projectId,
                     BIMID: this.itemObj.FloorId,
                     BIMLocation: (this.itemObj.X || 0) + ',' + (this.itemObj.Y || 0) + ',' + (this.itemObj.Z || 0)
                 }
@@ -84,7 +84,7 @@ export default {
         //关联资产
         upDateTableMain(id) {
             let param = {
-                    ProjId: this.currentProjectId,
+                    ProjId: this.projectId,
                     UserId: this.userId
                 },
                 paramList = {}

src/views/data_admin/buildAssets/index.vue

@@ -55,7 +55,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('layout', ['currentProjectId', 'userId', 'secret'])
+        ...mapGetters('layout', ['projectId', 'userId', 'secret'])
     },
     components: {
         SagaNofind,
@@ -68,7 +68,7 @@ export default {
         //获取建筑列表
         getBuilding() {
             let param = {
-                ProjId: this.currentProjectId,
+                ProjId: this.projectId,
                 UserId: this.userId
             }
             getBuildSelect(param).then(res => {
@@ -82,9 +82,9 @@ export default {
         //获取所有楼层
         getFloors() {
             let param = {
-                ProjId: this.currentProjectId,
+                ProjId: this.projectId,
                 secret: this.secret,
-                id: this.currentProjectId,
+                id: this.projectId,
                 type: ['Fl']
             }
             getAllbusiness(param).then(res => {
@@ -129,7 +129,7 @@ export default {
         this.init()
     },
     watch: {
-        currentProjectId(){
+        projectId(){
             this.init()
         }
     }

src/views/data_admin/buildGraphy/buildGraphy.vue

@@ -42,12 +42,12 @@ export default {
   data() {
     return {
       param: {
-        ProjId: this.currentProjectId, //项目id
+        ProjId: this.projectId, //项目id
         UserId: this.userId //用户id
       },
       pointParam: {
         //point请求参数
-        ProjId: this.currentProjectId, //项目id
+        ProjId: this.projectId, //项目id
         UserId: this.userId, //用户id
         fllorName: ""
       },
@@ -57,7 +57,7 @@ export default {
   },
   computed: {
         ...mapGetters("layout", [
-        "currentProjectId",
+        "projectId",
         "userId",
         "secret"
     ])

src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -126,10 +126,10 @@ export default {
     };
   },
   computed: {
-      ...mapGetters('layout', ['currentProjectId', 'secret', 'userId'])
+      ...mapGetters('layout', ['projectId', 'secret', 'userId'])
   },
   created() {
-    this.param.ProjId = this.currentProjectId
+    this.param.ProjId = this.projectId
     this.param.secret = this.secret
     this.param.UserId = this.userId
    },

src/views/data_admin/buildGraphy/graphyTabs.vue

@@ -43,7 +43,7 @@ getLocation 定位
       <div class="qrcode">
         <div class="qrcode-view">
           <img
-            :src="'/ScanBuilding/service/qrcode/point?projectId=' + currentProjectId + '&pointId=' + pointDetails.PointId + '&FloorId=' + pointDetails.FloorId + '&width=200&height=200'"
+            :src="'/ScanBuilding/service/qrcode/point?projectId=' + projectId + '&pointId=' + pointDetails.PointId + '&FloorId=' + pointDetails.FloorId + '&width=200&height=200'"
             alt="点位标签二维码"
           >
         </div>
@@ -203,7 +203,7 @@ getLocation 定位
             };
         },
         computed: {
-            ...mapGetters('layout', ['currentProjectId', 'secret', 'userId'])
+            ...mapGetters('layout', ['projectId', 'secret', 'userId'])
         },
         methods: {
             //tabs被点击
@@ -292,7 +292,7 @@ getLocation 定位
             },
             getDetails(item) {
                 let params = {
-                    ProjId: this.currentProjectId,
+                    ProjId: this.projectId,
                     UserId: this.userId,
                     PointId: item.Id
                 };

src/views/data_admin/buildGraphy/index.vue

@@ -47,12 +47,12 @@
         data() {
             return {
                 param: {
-                    ProjId: this.currentProjectId, //项目id
+                    ProjId: this.projectId, //项目id
                     UserId: this.userId //用户id
                 },
                 pointParam: {
                     //point请求参数
-                    ProjId: this.currentProjectId, //项目id
+                    ProjId: this.projectId, //项目id
                     UserId: this.userId, //用户id
                     fllorName: ""
                 },
@@ -68,7 +68,7 @@
             this.getList()
         },
         computed: {
-            ...mapGetters('layout', ['currentProjectId', 'secret', 'userId'])
+            ...mapGetters('layout', ['projectId', 'secret', 'userId'])
         },
         methods: {
             //修改楼层
@@ -136,9 +136,9 @@
                 }
             },
             changeValue() {
-                this.$set(this.param, 'ProjId', this.currentProjectId)
+                this.$set(this.param, 'ProjId', this.projectId)
                 this.$set(this.param, 'UserId', this.userId)
-                this.$set(this.pointParam, 'ProjId', this.currentProjectId)
+                this.$set(this.pointParam, 'ProjId', this.projectId)
                 this.$set(this.pointParam, 'UserId', this.userId)
                 this.show = true
             },