Hwt 2 年之前
父節點
當前提交
672f184b98

+ 8 - 0
commandCenter/src/main.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2022-08-02 11:49:53
+ * @LastEditTime: 2022-08-17 15:21:48
+ * @LastEditors: D4THYL3
+ * @Description: In User Settings Edit
+ * @FilePath: \commandCenter\src\main.js
+ */
 import Vue from 'vue';
 import App from './App.vue';
 import router from './router';

+ 9 - 1
commandCenter/src/router/index.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2022-08-02 11:49:53
+ * @LastEditTime: 2022-08-17 15:27:23
+ * @LastEditors: D4THYL3
+ * @Description: In User Settings Edit
+ * @FilePath: \commandCenter\src\router\index.js
+ */
 import Vue from 'vue';
 import Router from 'vue-router';
 
@@ -10,7 +18,7 @@ const quietRoute = [
     {
         path: '/',
         component: () => import(/* webpackChunkName: "404" */ '@/components/common/Home.vue'),
-        redirect: '/homeIndex',
+        redirect: '/communityAssets',
         children: [
             {
                 path: '/homeIndex',

+ 3 - 3
commandCenter/src/views/communityAssets/assembly/householdIdentity.vue

@@ -42,7 +42,7 @@ export default {
           { value: 0, name: '业主' },
           { value: 0, name: '亲属' },
           { value: 0, name: '租客' },
-          { value: 0, name: '租户管理员' },
+          { value: 0, name: '承租人' },
           { value: 0, name: '普通员工' }
         ],
         {},
@@ -62,7 +62,7 @@ export default {
               { value: 0, name: '业主' },
               { value: 0, name: '亲属' },
               { value: 0, name: '租客' },
-              { value: 0, name: '租户管理员' },
+              { value: 0, name: '承租人' },
               { value: 0, name: '普通员工' }
             ],
             {},
@@ -77,7 +77,7 @@ export default {
         1: '业主',
         2: '亲属',
         3: '租客',
-        4: '租户管理员',
+        4: '承租人',
         5: '普通员工'
       };
       let newData = [];

+ 2 - 7
operationSupport/src/components/common/Home.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zouwenying
  * @Date: 2020-10-22 15:51:29
- * @LastEditTime: 2022-08-17 14:44:17
+ * @LastEditTime: 2022-08-17 16:21:23
  * @LastEditors: D4THYL3
  * @Description: In User Settings Edit
  * @FilePath: \vue-manage-system-master\src\components\others\Home.vue
@@ -76,12 +76,7 @@ export default {
     treeList () {
       let resTree;
       resTree = this.$store.getters['getTreeListAll'];
-      if (resTree == this.$route.name) {
-        return resTree;
-      } else {
-        resTree = '';
-        return resTree;
-      }
+      return resTree;
     },
     tagsList () {
       let arr = [],

+ 18 - 0
operationSupport/src/components/common/buildingTree.vue

@@ -171,6 +171,24 @@ export default {
   created () {
     this.getOrgTreeList();
   },
+  activated () {
+    // this.getOrgTreeList();
+    debugger;
+    // console.log('1111', 33333);
+    // let res = '';
+    // res = this.$store.getters['getTreeListAll'];
+    // if (res != '') {
+    //   this.$destroy()
+    // }
+  },
+  deactivated () {
+    debugger;
+    // let res = '';
+    // res = this.$store.getters['getTreeListAll'];
+    // if (res != '') {
+    //   this.$destroy(true)
+    // }
+  }
 };
 </script>
 

+ 2 - 1
operationSupport/src/views/assetManagement/housingManagement/details.vue

@@ -378,7 +378,8 @@ export default {
       if (tagsList.length > 1) {
         tagsList.forEach((item, index) => {
           if (item.title == "房屋管理" || item.name == 'assetManagement/housingManagement/index') {
-            this.$store.commit('setTreeListAll', item.name);
+            // get arr = this.$store.getters['getTreeListAll'];
+            this.$store.commit('setTreeListAll', [item.name]);
             this.$router.push({
               name: item.name,
             })

+ 1 - 2
operationSupport/src/views/assetManagement/housingManagement/index.vue

@@ -378,9 +378,8 @@ export default {
     };
     this.communityNameList();
     this.mixins_search('search')
+  },
 
-
-  }
 };
 </script>
 <style lang="scss" scoped>

+ 3 - 3
operationSupport/src/views/newWorkBench/components/householdIdentity.vue

@@ -50,7 +50,7 @@ export default {
           { value: 0, name: '业主' },
           { value: 0, name: '亲属' },
           { value: 0, name: '租客' },
-          { value: 0, name: '租户管理员' },
+          { value: 0, name: '承租人' },
           { value: 0, name: '普通员工' }
         ],
         {},
@@ -70,7 +70,7 @@ export default {
               { value: 0, name: '业主' },
               { value: 0, name: '亲属' },
               { value: 0, name: '租客' },
-              { value: 0, name: '租户管理员' },
+              { value: 0, name: '承租人' },
               { value: 0, name: '普通员工' }
             ],
             {},
@@ -85,7 +85,7 @@ export default {
         1: '业主',
         2: '亲属',
         3: '租客',
-        4: '租户管理员',
+        4: '承租人',
         5: '普通员工'
       };
       let newData = [];

+ 1 - 1
operationSupport/src/views/ownerManagement/index.vue

@@ -234,7 +234,7 @@
     </div>
 
     <add-owner
-      v-show="!!ownerStatus"
+      v-if="!!ownerStatus"
       :params="activeData"
       @clerOwnerStatus="clerOwnerStatus"
       :isAdd="isAdd"

+ 2 - 1
operationSupport/src/views/ownerManagement/landlordManagement/index.vue

@@ -169,7 +169,7 @@
     </div>
 
     <add-owner
-      v-show="!!ownerStatus"
+      v-if="!!ownerStatus"
       :params="activeData"
       @clerOwnerStatus="clerOwnerStatus"
       :isAdd="isAdd"
@@ -242,6 +242,7 @@ export default {
     },
     addOrEdit (todo, row) {
       if (todo == 'edit') {
+        debugger
         this.activeData = row.id;
         this.isAdd = false;
       }

+ 2 - 1
operationSupport/src/views/ownerManagement/landlordManagement/stepPage/add.vue

@@ -939,7 +939,8 @@ export default {
   },
   created () {
     this.getOrgTreeList();
-    if (!this.isAdd) {
+
+    if (!!this.isAdd) {
       this.getDetails();
     }
 

+ 3 - 1
operationSupport/src/views/patrolManagement/popups/pathSimplifierIns.js

@@ -99,6 +99,7 @@ export default {
 
                 // 初始化坐标点
                 if (that.lineArr.length > 0) {
+                    debugger;
                     that.actualList = that.lineArr;
 
                     //创建一个巡航轨迹路线
@@ -210,6 +211,7 @@ export default {
                 this.palyStayus = 2;
                 // 如果已经到了终点,重新定位坐标
                 if (this.isCursorAtPathEnd && this.actualList.length > 0) {
+                    debugger;
                     this.map.setCenter(this.actualList[0]);
                 }
             } else if (type === 'pause') {
@@ -217,7 +219,7 @@ export default {
                 this.palyStayus = 1;
             }
             this.navgtr[type]();
-            this.map.setFitView();
+            // this.map.setFitView();
         }
         // carReLocate() {
         //     // 鼠标从滑动条抬起时,重新定位