Hwt 2 роки тому
батько
коміт
af9df4d32d

+ 12 - 6
operationSupport/src/components/common/Home.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zouwenying
  * @Date: 2020-10-22 15:51:29
- * @LastEditTime: 2021-04-19 10:58:38
- * @LastEditors: zwy
+ * @LastEditTime: 2022-08-16 18:38:03
+ * @LastEditors: D4THYL3
  * @Description: In User Settings Edit
  * @FilePath: \vue-manage-system-master\src\components\others\Home.vue
 -->
@@ -25,10 +25,11 @@
           name="move"
           mode="out-in"
         >
-          <!-- <keep-alive :include="tagsList">
-                            <router-view></router-view>
-                        </keep-alive> -->
-          <router-view></router-view>
+          <keep-alive :include="treeList">
+            <router-view></router-view>
+          </keep-alive>
+          <!-- <router-view v-else></router-view> -->
+          <!-- <router-view></router-view> -->
         </transition>
       </div>
     </div>
@@ -73,6 +74,11 @@ export default {
     collapse () {
       return this.$store.getters['getCollapse'];
     },
+    treeList () {
+      let resTree;
+      resTree = this.$store.getters['getTreeListAll'];
+      return resTree
+    },
     tagsList () {
       let arr = [],
         msg = this.$store.getters['getTagsList'];

+ 3 - 1
operationSupport/src/components/common/buildingTree.vue

@@ -64,7 +64,9 @@ export default {
       defaultProps: {
         children: 'children',
         label: 'name'
-      }
+      },
+
+      defaultCheckedKeys: [],
     };
   },
   watch: {

+ 10 - 3
operationSupport/src/store/store.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zouwenying
  * @Date: 2020-10-22 14:40:01
- * @LastEditTime: 2020-11-20 10:02:36
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-08-16 18:06:59
+ * @LastEditors: D4THYL3
  * @Description: In User Settings Edit
  * @FilePath: \vue-manage-system-master\src\store\store.js
  */
@@ -51,7 +51,8 @@ const store = new Vuex.Store({
         // 当前缩放比
         scale: document.body.clientWidth / 1920,
         dragItemData: {},
-        homeCommunityAll: ''
+        homeCommunityAll: '',
+        treeListAll: ''
     },
     getters: {
         getTheme(state) {
@@ -206,6 +207,9 @@ const store = new Vuex.Store({
         },
         getHomeCommunityAll(state) {
             return state.homeCommunityAll;
+        },
+        getTreeListAll(state) {
+            return state.treeListAll;
         }
     },
     mutations: {
@@ -280,6 +284,9 @@ const store = new Vuex.Store({
         },
         setHomeCommunityAll(state, data) {
             state.homeCommunityAll = data;
+        },
+        setTreeListAll(state, data) {
+            state.treeListAll = data;
         }
     },
     actions: {

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

@@ -378,9 +378,11 @@ export default {
       if (tagsList.length > 1) {
         tagsList.forEach((item, index) => {
           if (item.title == "房屋管理" || item.name == 'assetManagement/housingManagement/index') {
+            this.$store.commit('setTreeListAll', item.name);
             this.$router.push({
-              path: item.path
+              name: item.name,
             })
+
           }
           // if (item.title == activeRout.meta.title || item.path == activeRout.path) {
           //   tagsList.splice(index, 1);
@@ -389,6 +391,7 @@ export default {
           //   });
           // }
         });
+
       } else {
         this.$router.push({
           path: '/'

+ 11 - 4
operationSupport/src/views/assetManagement/housingManagement/index.vue

@@ -169,7 +169,7 @@ import saveEdits from './saveEdits.vue';
 
 export default {
   mixins: [list],
-  name: 'housingManagement',
+  name: 'assetManagement/housingManagement/index',
   data () {
     return {
       statusOptions: [
@@ -234,7 +234,8 @@ export default {
       selectRow: [],
       mixins_post: 'post',
       isAdd: true,
-      activeData: {}
+      activeData: {},
+      detailsType: 1
     };
   },
   components: {
@@ -245,7 +246,11 @@ export default {
       this.$router.push({
         path: '/housingManagement/details',
         query: {
-          id: row.id
+          id: row.id,
+          communityId: this.mixins_query.communityId,
+          buildingId: this.mixins_query.buildingId,
+          unitId: this.mixins_query.unitName,
+          roomId: this.mixins_query.id
         }
       });
     },
@@ -372,7 +377,9 @@ export default {
       buildingType: 1
     };
     this.communityNameList();
-    this.mixins_search('search');
+    this.mixins_search('search')
+
+
   }
 };
 </script>

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

@@ -447,8 +447,9 @@ export default {
       if (tagsList.length > 1) {
         tagsList.forEach((item) => {
           if (item.title == "商铺管理" || item.name == 'assetManagement/shopManagement/index') {
+            this.$store.commit('setTreeListAll', item.name);
             this.$router.push({
-              path: item.path
+              name: item.name
             })
           }
           // if (item.title == activeRout.meta.title || item.path == activeRout.path) {

+ 1 - 1
operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -158,7 +158,7 @@ import saveEdits from './saveEdits.vue';
 
 export default {
   mixins: [list],
-  name: 'shopManagement',
+  name: 'assetManagement/shopManagement/index',
   data () {
     return {
       statusOptions: [

+ 1 - 1
operationSupport/src/views/ownerManagement/stepPage/newAdd.vue

@@ -53,7 +53,7 @@
               <el-form-item label="备注">
                 <el-input
                   type="textarea"
-                  v-model="formData.remark"
+                  v-model="formData.remarks"
                   placeholder="请输入备注"
                 ></el-input>
               </el-form-item>