Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/layout/components/RightSettings/index.vue

@@ -43,21 +43,40 @@ export default {
     listenDepotId() {
       return this.$store.state.depotId
     },
+    listenRelation() {
+      return this.$store.state.relation
+    },
   },
   watch: {
     listenHouseId: function (val) {
-      if(this.$store.state.relation && this.$store.state.relation == 'house'){
-        this.$refs.userManageTree.setCurrentKey(this.$store.state.houseId)
-      }else if(this.$store.state.relation && this.$store.state.relation == 'library'){
-        this.$refs.userManageTree.setCurrentKey(this.$store.state.depotId)
-      }
+      let that = this
+      setTimeout(function () {
+          if(that.$store.state.relation && that.$store.state.relation == 'house'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.houseId)
+          }else if(that.$store.state.relation && that.$store.state.relation == 'library'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.depotId)
+          }
+      }, 1000);
     },
     listenDepotId: function (val) {
-      if(this.$store.state.relation && this.$store.state.relation == 'house'){
-        this.$refs.userManageTree.setCurrentKey(this.$store.state.houseId)
-      }else if(this.$store.state.relation && this.$store.state.relation == 'library'){
-        this.$refs.userManageTree.setCurrentKey(this.$store.state.depotId)
-      }
+      let that = this
+      setTimeout(function () {
+          if(that.$store.state.relation && that.$store.state.relation == 'house'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.houseId)
+          }else if(that.$store.state.relation && that.$store.state.relation == 'library'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.depotId)
+          }
+      }, 1000);
+    },
+    listenRelation: function (val) {
+      let that = this
+      setTimeout(function () {
+          if(that.$store.state.relation && that.$store.state.relation == 'house'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.houseId)
+          }else if(that.$store.state.relation && that.$store.state.relation == 'library'){
+            that.$refs.userManageTree.setCurrentKey(that.$store.state.depotId)
+          }
+      }, 1000);
     },
   },
   created() {},

shanXiPlatform/src/router/index.js

@@ -834,7 +834,7 @@ export const constantRoutes = [
       component: Layout,
       // redirect: '/guide/index',
       name: 'FacilitiesEquipment',
-      meta: { title: '设施设备', icon: 'sheshi',noCache: true, affix: false, relation: 'house', istable: true},
+      meta: { title: '设施设备', icon: 'sheshi',noCache: true, affix: false,  istable: true},
       resourceCode: 242,
       //  设施设备/设施管理
       children: [
@@ -843,7 +843,7 @@ export const constantRoutes = [
           redirect: 'facilitiesManagement/newFacilities',
           component: facilitiesTabs,
           name: 'FacilitiesManagemen',
-          meta: { title: '设施管理', icon: 'dashboard', affix: false,istable: true},
+          meta: { title: '设施管理', icon: 'dashboard', affix: false,istable: true ,relation: 'library'},
           resourceCode: 243,
 
 
@@ -855,7 +855,7 @@ export const constantRoutes = [
               name: 'NewFacilities',
 
               hidden: true,
-              meta: { title: '最新设施检查记录', icon: 'dashboard', affix: false,relation: 'house', istable: true}
+              meta: { title: '最新设施检查记录', icon: 'dashboard', affix: false,relation: 'library', istable: true}
             },
 
 
@@ -866,7 +866,7 @@ export const constantRoutes = [
               name: 'AllFacilities',
 
               hidden: true,
-              meta: { title: '全部设施检查记录', icon: 'dashboard', affix: false ,relation: 'house', istable: true}
+              meta: { title: '全部设施检查记录', icon: 'dashboard', affix: false ,relation: 'library', istable: true}
             },
 
 

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/index.vue

@@ -88,13 +88,6 @@
             @click="moreRecords(4, scope.$index, scope.row)"
             >更多记录
           </el-button>
-          <!-- <el-button
-                size="mini"
-                type="danger"
-                plain
-                @click="handleDelete(scope.$index, scope.row)"
-                >删除</el-button
-              > -->
         </template>
       </el-table-column>
     </el-table>
@@ -146,6 +139,18 @@ export default {
     // 获取最新设施检查记录
     this.getNewFacilitycheck()
   },
+/* computed: {
+    depotIdVal() {
+      return this.$store.state.depotId
+    }
+  },
+  watch: {
+    depotIdVal: function(val) {
+      this.depotId = val
+      console.log(val,'val')
+      this.getNewList()
+    }
+  }, */
   methods: {
     //设施种类
     getFacilityList() {