From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/mdc/base/DeviceCalendar.vue |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/mdc/base/DeviceCalendar.vue b/src/views/mdc/base/DeviceCalendar.vue
index bdf53ca..705dc5d 100644
--- a/src/views/mdc/base/DeviceCalendar.vue
+++ b/src/views/mdc/base/DeviceCalendar.vue
@@ -2,18 +2,17 @@
   <div style="width: 100%; height: 100%;">
     <a-card :bordered="false">
       <a-row type="flex" :gutter="16">
-        <a-col :md="4">
+        <a-col :md="5">
           <a-tabs :activeKey="activeKey" @change="tabChange">
             <a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
               <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
             </a-tab-pane>
-            <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
-              <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
-              ></depart-tree>
+            <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+              <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
             </a-tab-pane>
           </a-tabs>
         </a-col>
-        <a-col :md="20">
+        <a-col :md="19">
           <device-calendar-list ref="deviceList" :node='selectEquement' :Type="slectTypeTree"/>
         </a-col>
       </a-row>
@@ -32,6 +31,7 @@
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
   import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
   import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+  import {mapActions} from 'vuex'
   export default {
     name: 'DeviceCalendar',
     components: {
@@ -51,12 +51,29 @@
         slectTypeTree: '',
         url: {
           equipmentStatistics: '/mdc/equipment/equipmentStatistics'
-        }
+        },
+        isDepartType:'',
       }
     },
     created() {
+      this.queryTreeData()
     },
     methods: {
+      ...mapActions(['QueryDepartTree']),
+      queryTreeData() {
+        this.QueryDepartTree().then(res => {
+          if (res.success) {
+            this.isDepartType = res.result[0].value
+          } else {
+            // this.$message.warn(res.message)
+            this.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
+          }
+        }).finally(() =>{
+        })
+      },
       tabChange(val) {
         // console.log(val)
         this.activeKey = val

--
Gitblit v1.9.3