Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/cal/calendar/index.vue

 <template>
     <div class="app-container">
         <el-tabs type="border-card">
-            <el-tab-pane label="首页">
+            <!-- <el-tab-pane label="首页">
                 <CalendarTypeView></CalendarTypeView>
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="工作单元">
                 <TeamView></TeamView>
             </el-tab-pane>
@@ -15,11 +15,12 @@
 </template>
 
 <script>
-import CalendarTypeView from "./calendarType.vue"
+// import CalendarTypeView from "./calendarType.vue"
 import TeamView from "./team.vue"
 import UserView from "./person.vue"
 export default {
-    components:{CalendarTypeView,TeamView,UserView},
+    // components:{CalendarTypeView,TeamView,UserView},
+    components:{TeamView,UserView},
     data(){
         return {
 

src/views/mes/cal/calendar/team.vue

 <template>
       <div class="app-container">
-          <el-container>
-                  <el-aside width="200px">
+          <el-container class="el-container-cal">
+                  <el-aside width="200px" class="el-aside-cal">
                         <el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
                               <el-radio-button
                                     v-for="(item, index) in teamList"
+                                    :title="item"
                                     :key="index"
                                     :label="item"
                               >{{item}}</el-radio-button>
@@ -59,7 +60,7 @@ export default {
       data(){
             return {
                   // 遮罩层
-                  loading: true,
+                  loading: false,
                   date: new Date(),
                   teamList: [], //所有的班组
                   holidayList:[],//假日
@@ -85,7 +86,7 @@ export default {
             }
       },
       created() {
-            this.getList();
+            // this.getList();
             this.getTeams();
       },
       methods:{
@@ -156,6 +157,15 @@ export default {
 }
 </script>
 <style>
+      .el-aside-cal {
+        max-height: 700px;
+        padding: 0;
+      }
+      .el-aside-cal .el-radio-button__inner {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
       .grid-content{
             padding: 5px 0;
       }

src/views/mes/md/product/index.vue

@@ -7,9 +7,12 @@
           <el-input v-model="itemTypeName" placeholder="请输入分类名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
-        <div class="head-container">
-          <el-tree :data="itemTypeOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" />
+        <div class="head-container" style="overflow: auto;">
+          <el-tree :data="itemTypeOptions" :props="defaultProps" :expand-on-click-node="false" class="el-tree-pro" node-key="id"
+            :filter-node-method="filterNode" ref="tree" :default-expanded-keys="defaultExpandedKeys" @node-click="handleNodeClick" >
+            <span slot-scope="{ data }" :title="data.label"
+              >{{ data.label }}</span>
+          </el-tree>
         </div>
       </el-col>
       <!--物料数据-->
@@ -379,6 +382,7 @@ export default {
   data() {
     return {
       activeName: "BaseInfo",
+      defaultExpandedKeys: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -502,6 +506,10 @@ export default {
     getTreeselect() {
       treeselect().then((response) => {
         this.itemTypeOptions = response.data;
+        if(response.data.length > 0) {
+          this.defaultExpandedKeys.push(response.data[0]?.id)
+          console.log('this.defaultExpandedKeys', this.defaultExpandedKeys)
+        }
       });
     },
     // 筛选节点
@@ -773,3 +781,14 @@ export default {
   },
 };
 </script>
+<style scoped>
+.el-tree-pro {
+  height: 700px;
+  padding-right: 5px;
+}
+.el-tree-pro .el-tree-node__content span {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>
\ No newline at end of file